Revert "sql"

This reverts commit 55ae74217653ab29b44dfb7876e169c9cbf3852d.
Revert "Revert "sql""

This reverts commit dd2783b97f315fcedd9e5a7a7ea54848d8d864b1.