Revert "remove sqlx"

sreya · sreya · commit 8c3ee6a70b6c · 2022-09-19T22:31:28.000Z
This reverts commit 1f4ceee.
diff --git a/coderd/database/db.go b/coderd/database/db.go
@@ -13,6 +13,7 @@ import (
 	"database/sql"
 	"errors"
 
+	"github.com/jmoiron/sqlx"
 	"golang.org/x/xerrors"
 )
 
@@ -36,7 +37,7 @@ type DBTX interface {
 func New(sdb *sql.DB) Store {
 	return &sqlQuerier{
 		db:  sdb,
-		sdb: sdb,
+		sdb: sqlx.NewDb(sdb, "postgres"),
 	}
 }
 
@@ -48,13 +49,13 @@ type querier interface {
 }
 
 type sqlQuerier struct {
-	sdb *sql.DB
+	sdb *sqlx.DB
 	db  DBTX
 }
 
 // InTx performs database operations inside a transaction.
 func (q *sqlQuerier) InTx(function func(Store) error) error {
-	if _, ok := q.db.(*sql.Tx); ok {
+	if _, ok := q.db.(*sqlx.Tx); ok {
 		// If the current inner "db" is already a transaction, we just reuse it.
 		// We do not need to handle commit/rollback as the outer tx will handle
 		// that.

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`"database/sql"`
`14`	`14`	`"errors"`
`15`	`15`
	`16`	`+ "github.com/jmoiron/sqlx"`
`16`	`17`	`"golang.org/x/xerrors"`
`17`	`18`	`)`
`18`	`19`
`@@ -36,7 +37,7 @@ type DBTX interface {`
`36`	`37`	`func New(sdb *sql.DB) Store {`
`37`	`38`	`return &sqlQuerier{`
`38`	`39`	`db: sdb,`
`39`		`- sdb: sdb,`
	`40`	`+ sdb: sqlx.NewDb(sdb, "postgres"),`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`
`@@ -48,13 +49,13 @@ type querier interface {`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`type sqlQuerier struct {`
`51`		`- sdb *sql.DB`
	`52`	`+ sdb *sqlx.DB`
`52`	`53`	`db DBTX`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`// InTx performs database operations inside a transaction.`
`56`	`57`	`func (q *sqlQuerier) InTx(function func(Store) error) error {`
`57`		`- if _, ok := q.db.(*sql.Tx); ok {`
	`58`	`+ if _, ok := q.db.(*sqlx.Tx); ok {`
`58`	`59`	`// If the current inner "db" is already a transaction, we just reuse it.`
`59`	`60`	`// We do not need to handle commit/rollback as the outer tx will handle`
`60`	`61`	`// that.`