From 4e7a81891fadb603dd36e2b27ffc005fdbe70b6c Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Fri, 1 Apr 2022 15:13:45 -0600 Subject: [PATCH 1/2] database/migrations: fix migration 07 for postgresql --- database/migrations/07-guilds.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/07-guilds.sql b/database/migrations/07-guilds.sql index 25a868e..0cabe37 100644 --- a/database/migrations/07-guilds.sql +++ b/database/migrations/07-guilds.sql @@ -2,6 +2,6 @@ CREATE TABLE guild ( discord_id TEXT NOT NULL, guild_id TEXT NOT NULL, guild_name TEXT NOT NULL, - bridge INTEGER(1) DEFAULT FALSE, + bridge BOOLEAN DEFAULT FALSE, PRIMARY KEY(discord_id, guild_id) ); From f256ff94f740e8a42dfd503c99741443e4de2614 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Fri, 1 Apr 2022 16:36:55 -0600 Subject: [PATCH 2/2] database/userquery: fix selects from user table --- database/userquery.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/userquery.go b/database/userquery.go index e9c8baa..8d67145 100644 --- a/database/userquery.go +++ b/database/userquery.go @@ -18,7 +18,7 @@ func (uq *UserQuery) New() *User { } func (uq *UserQuery) GetByMXID(userID id.UserID) *User { - query := "SELECT mxid, id, management_room, token FROM user WHERE mxid=$1" + query := `SELECT mxid, id, management_room, token FROM "user" WHERE mxid=$1` row := uq.db.QueryRow(query, userID) if row == nil { return nil @@ -28,7 +28,7 @@ func (uq *UserQuery) GetByMXID(userID id.UserID) *User { } func (uq *UserQuery) GetByID(id string) *User { - query := "SELECT mxid, id, management_room, token FROM user WHERE id=$1" + query := `SELECT mxid, id, management_room, token FROM "user" WHERE id=$1` row := uq.db.QueryRow(query, id) if row == nil { return nil @@ -38,7 +38,7 @@ func (uq *UserQuery) GetByID(id string) *User { } func (uq *UserQuery) GetAll() []*User { - rows, err := uq.db.Query("SELECT mxid, id, management_room, token FROM user") + rows, err := uq.db.Query(`SELECT mxid, id, management_room, token FROM "user"`) if err != nil || rows == nil { return nil }