Inlined storage/sql.go into both implementations that use it (#3235)

Inlined storage/sql.go into both implementations that use it (#3235) #1019