1 files changed, 28 insertions, 28 deletions

diff --git a/internal/db/bundb/user.go b/internal/db/bundb/user.go
index c2ea5a67d..4b38d48fa 100644
--- a/internal/db/bundb/user.go
+++ b/internal/db/bundb/user.go
@@ -30,125 +30,125 @@ import (
 )
 
 type userDB struct {
-	conn  *DBConn
+	db    *WrappedDB
 	state *state.State
 }
 
-func (u *userDB) GetUserByID(ctx context.Context, id string) (*gtsmodel.User, db.Error) {
+func (u *userDB) GetUserByID(ctx context.Context, id string) (*gtsmodel.User, error) {
 	return u.state.Caches.GTS.User().Load("ID", func() (*gtsmodel.User, error) {
 		var user gtsmodel.User
 
-		q := u.conn.
+		q := u.db.
 			NewSelect().
 			Model(&user).
 			Relation("Account").
 			Where("? = ?", bun.Ident("user.id"), id)
 
 		if err := q.Scan(ctx); err != nil {
-			return nil, u.conn.ProcessError(err)
+			return nil, u.db.ProcessError(err)
 		}
 
 		return &user, nil
 	}, id)
 }
 
-func (u *userDB) GetUserByAccountID(ctx context.Context, accountID string) (*gtsmodel.User, db.Error) {
+func (u *userDB) GetUserByAccountID(ctx context.Context, accountID string) (*gtsmodel.User, error) {
 	return u.state.Caches.GTS.User().Load("AccountID", func() (*gtsmodel.User, error) {
 		var user gtsmodel.User
 
-		q := u.conn.
+		q := u.db.
 			NewSelect().
 			Model(&user).
 			Relation("Account").
 			Where("? = ?", bun.Ident("user.account_id"), accountID)
 
 		if err := q.Scan(ctx); err != nil {
-			return nil, u.conn.ProcessError(err)
+			return nil, u.db.ProcessError(err)
 		}
 
 		return &user, nil
 	}, accountID)
 }
 
-func (u *userDB) GetUserByEmailAddress(ctx context.Context, emailAddress string) (*gtsmodel.User, db.Error) {
+func (u *userDB) GetUserByEmailAddress(ctx context.Context, emailAddress string) (*gtsmodel.User, error) {
 	return u.state.Caches.GTS.User().Load("Email", func() (*gtsmodel.User, error) {
 		var user gtsmodel.User
 
-		q := u.conn.
+		q := u.db.
 			NewSelect().
 			Model(&user).
 			Relation("Account").
 			Where("? = ?", bun.Ident("user.email"), emailAddress)
 
 		if err := q.Scan(ctx); err != nil {
-			return nil, u.conn.ProcessError(err)
+			return nil, u.db.ProcessError(err)
 		}
 
 		return &user, nil
 	}, emailAddress)
 }
 
-func (u *userDB) GetUserByExternalID(ctx context.Context, id string) (*gtsmodel.User, db.Error) {
+func (u *userDB) GetUserByExternalID(ctx context.Context, id string) (*gtsmodel.User, error) {
 	return u.state.Caches.GTS.User().Load("ExternalID", func() (*gtsmodel.User, error) {
 		var user gtsmodel.User
 
-		q := u.conn.
+		q := u.db.
 			NewSelect().
 			Model(&user).
 			Relation("Account").
 			Where("? = ?", bun.Ident("user.external_id"), id)
 
 		if err := q.Scan(ctx); err != nil {
-			return nil, u.conn.ProcessError(err)
+			return nil, u.db.ProcessError(err)
 		}
 
 		return &user, nil
 	}, id)
 }
 
-func (u *userDB) GetUserByConfirmationToken(ctx context.Context, confirmationToken string) (*gtsmodel.User, db.Error) {
+func (u *userDB) GetUserByConfirmationToken(ctx context.Context, confirmationToken string) (*gtsmodel.User, error) {
 	return u.state.Caches.GTS.User().Load("ConfirmationToken", func() (*gtsmodel.User, error) {
 		var user gtsmodel.User
 
-		q := u.conn.
+		q := u.db.
 			NewSelect().
 			Model(&user).
 			Relation("Account").
 			Where("? = ?", bun.Ident("user.confirmation_token"), confirmationToken)
 
 		if err := q.Scan(ctx); err != nil {
-			return nil, u.conn.ProcessError(err)
+			return nil, u.db.ProcessError(err)
 		}
 
 		return &user, nil
 	}, confirmationToken)
 }
 
-func (u *userDB) GetAllUsers(ctx context.Context) ([]*gtsmodel.User, db.Error) {
+func (u *userDB) GetAllUsers(ctx context.Context) ([]*gtsmodel.User, error) {
 	var users []*gtsmodel.User
-	q := u.conn.
+	q := u.db.
 		NewSelect().
 		Model(&users).
 		Relation("Account")
 
 	if err := q.Scan(ctx); err != nil {
-		return nil, u.conn.ProcessError(err)
+		return nil, u.db.ProcessError(err)
 	}
 
 	return users, nil
 }
 
-func (u *userDB) PutUser(ctx context.Context, user *gtsmodel.User) db.Error {
+func (u *userDB) PutUser(ctx context.Context, user *gtsmodel.User) error {
 	return u.state.Caches.GTS.User().Store(user, func() error {
-		_, err := u.conn.
+		_, err := u.db.
 			NewInsert().
 			Model(user).
 			Exec(ctx)
-		return u.conn.ProcessError(err)
+		return u.db.ProcessError(err)
 	})
 }
 
-func (u *userDB) UpdateUser(ctx context.Context, user *gtsmodel.User, columns ...string) db.Error {
+func (u *userDB) UpdateUser(ctx context.Context, user *gtsmodel.User, columns ...string) error {
 	// Update the user's last-updated
 	user.UpdatedAt = time.Now()
 
@@ -158,17 +158,17 @@ func (u *userDB) UpdateUser(ctx context.Context, user *gtsmodel.User, columns ..
 	}
 
 	return u.state.Caches.GTS.User().Store(user, func() error {
-		_, err := u.conn.
+		_, err := u.db.
 			NewUpdate().
 			Model(user).
 			Where("? = ?", bun.Ident("user.id"), user.ID).
 			Column(columns...).
 			Exec(ctx)
-		return u.conn.ProcessError(err)
+		return u.db.ProcessError(err)
 	})
 }
 
-func (u *userDB) DeleteUserByID(ctx context.Context, userID string) db.Error {
+func (u *userDB) DeleteUserByID(ctx context.Context, userID string) error {
 	defer u.state.Caches.GTS.User().Invalidate("ID", userID)
 
 	// Load user into cache before attempting a delete,
@@ -184,9 +184,9 @@ func (u *userDB) DeleteUserByID(ctx context.Context, userID string) db.Error {
 	}
 
 	// Finally delete user from DB.
-	_, err = u.conn.NewDelete().
+	_, err = u.db.NewDelete().
 		TableExpr("? AS ?", bun.Ident("users"), bun.Ident("user")).
 		Where("? = ?", bun.Ident("user.id"), userID).
 		Exec(ctx)
-	return u.conn.ProcessError(err)
+	return u.db.ProcessError(err)
 }