api.spaceplanner.app

commit 7590095c9ec4d08196ab17b669c22a0b33245e4d
parent a81e9b3e98a83bdd0af38719eae29d84a63531e3
Author: Jacob R. Edwards <jacob@jacobedwards.org>
Date:   Mon, 23 Sep 2024 15:40:51 -0700

Use the database's spaceplanner schema at all times

I had added spaceplanner to the search_path but don't want to do
that really.

Diffstat:
M
internal/backend/settings.go
 | 
4
++--
M
internal/backend/user.go
 | 
6
+++---

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/internal/backend/settings.go b/internal/backend/settings.go
@@ -33,7 +33,7 @@ func (e *Env) UpdateUserSetting(tx *sql.Tx, username string, key string, value a
 }
 
 func (e *Env) UpdateUserSettings(tx *sql.Tx, username string, settings map[string]interface{}) error {
-	stmt, err := e.CacheTxStmt(tx, "set_user_settings", `INSERT INTO user_settings VALUES ($1, $2, $3, $4, $5)
+	stmt, err := e.CacheTxStmt(tx, "set_user_settings", `INSERT INTO spaceplanner.user_settings VALUES ($1, $2, $3, $4, $5)
 		ON CONFLICT (username, name) DO UPDATE
 		SET (strval, numval, boolval) = (EXCLUDED.strval, EXCLUDED.numval, EXCLUDED.boolval)`)
 	if err != nil {
@@ -58,7 +58,7 @@ func (e *Env) UpdateUserSettings(tx *sql.Tx, username string, settings map[strin
 }
 
 func (e *Env) GetUserSettings(tx *sql.Tx, username string, names ...string) (map[string]interface{}, error) {
-	stmt, err := e.CacheTxStmt(tx, "get_user_settings", `SELECT * FROM user_settings WHERE
+	stmt, err := e.CacheTxStmt(tx, "get_user_settings", `SELECT * FROM spaceplanner.user_settings WHERE
 		user_settings.username = $1 AND
 		(ARRAY_LENGTH($2::varchar[], 1) IS NULL OR user_settings.name = ANY ($2))`)
 	if err != nil {
diff --git a/internal/backend/user.go b/internal/backend/user.go
@@ -65,7 +65,7 @@ func (e *Env) DeleteUser(username string) error {
 	}
 	defer tx.Rollback()
 
-	del, err := e.CacheTxStmt(tx, "delete_user", "DELETE FROM users WHERE users.name = $1")
+	del, err := e.CacheTxStmt(tx, "delete_user", "DELETE FROM spaceplanner.users WHERE users.name = $1")
 	if err != nil {
 		return err
 	}
@@ -91,7 +91,7 @@ func (e *Env) GetUser(tx *sql.Tx, username string) (User, error) {
 		return User{}, errors.New("Empty username")
 	}
 
-	stmt, err := e.CacheTxStmt(tx, "get_user", "SELECT name, hash, stripe_customer_id FROM users WHERE users.name = $1")
+	stmt, err := e.CacheTxStmt(tx, "get_user", "SELECT name, hash, stripe_customer_id FROM spaceplanner.users WHERE users.name = $1")
 	if err != nil {
 		return User{}, err
 	}
@@ -231,7 +231,7 @@ safely ignore this message (and sorry to bother).`, e.Config.SMTP.Name, e.Config
 func (e *Env) UserEmails(username string) (UserEmails, error) {
 	get, err := e.CacheTxStmt(nil, "get_both_emails", `
 	SELECT users.verified_email, user_settings.strval AS setting
-		FROM users LEFT OUTER JOIN user_settings
+		FROM spaceplanner.users LEFT OUTER JOIN user_settings
 		ON users.name = user_settings.username AND user_settings.name = 'email'
 		WHERE users.name = $1`)
 	if err != nil {