Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-postgresql-migrations' into 'main'

Browse Source 
database: fixes for postgresql

See merge request beeper/discord!2
This commit is contained in:
Gary Kramlich
2022-04-01 23:26:29 +00:00
parent 21fe76d5e4 f256ff94f7
commit d88a7d518b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/migrations/07-guilds.sql
View File

@@ -2,6 +2,6 @@ CREATE TABLE guild (
discord_id TEXT NOT NULL, discord_id TEXT NOT NULL,
guild_id TEXT NOT NULL, guild_id TEXT NOT NULL,
guild_name TEXT NOT NULL, guild_name TEXT NOT NULL,
bridge INTEGER(1) DEFAULT FALSE, bridge BOOLEAN DEFAULT FALSE,
PRIMARY KEY(discord_id, guild_id) PRIMARY KEY(discord_id, guild_id)
); );

6
database/userquery.go
View File

@@ -18,7 +18,7 @@ func (uq *UserQuery) New() *User {
} }
func (uq *UserQuery) GetByMXID(userID id.UserID) *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) row := uq.db.QueryRow(query, userID)
if row == nil { if row == nil {
return nil return nil
@@ -28,7 +28,7 @@ func (uq *UserQuery) GetByMXID(userID id.UserID) *User {
} }
func (uq *UserQuery) GetByID(id string) *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) row := uq.db.QueryRow(query, id)
if row == nil { if row == nil {
return nil return nil
@@ -38,7 +38,7 @@ func (uq *UserQuery) GetByID(id string) *User {
} }
func (uq *UserQuery) GetAll() []*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 { if err != nil || rows == nil {
return nil return nil
} }