3
0
mirror of https://github.com/ergochat/ergo.git synced 2025-12-31 23:38:00 +01:00

consistent casing for SQL queries (#2315)

Makes it easier to read diffs with other database backends
This commit is contained in:
Shivaram Lingamneni 2025-12-29 00:03:58 -05:00 committed by GitHub
parent 05b41e18af
commit b7ede0730f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -128,7 +128,7 @@ func (m *MySQL) Open() (err error) {
func (mysql *MySQL) fixSchemas() (err error) { func (mysql *MySQL) fixSchemas() (err error) {
_, err = mysql.db.Exec(`CREATE TABLE IF NOT EXISTS metadata ( _, err = mysql.db.Exec(`CREATE TABLE IF NOT EXISTS metadata (
key_name VARCHAR(32) primary key, key_name VARCHAR(32) PRIMARY KEY,
value VARCHAR(32) NOT NULL value VARCHAR(32) NOT NULL
) CHARSET=ascii COLLATE=ascii_bin;`) ) CHARSET=ascii COLLATE=ascii_bin;`)
if err != nil { if err != nil {
@ -136,17 +136,17 @@ func (mysql *MySQL) fixSchemas() (err error) {
} }
var schema string var schema string
err = mysql.db.QueryRow(`select value from metadata where key_name = ?;`, keySchemaVersion).Scan(&schema) err = mysql.db.QueryRow(`SELECT value FROM metadata WHERE key_name = ?;`, keySchemaVersion).Scan(&schema)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
err = mysql.createTables() err = mysql.createTables()
if err != nil { if err != nil {
return return
} }
_, err = mysql.db.Exec(`insert into metadata (key_name, value) values (?, ?);`, keySchemaVersion, latestDbSchema) _, err = mysql.db.Exec(`INSERT INTO metadata (key_name, value) VALUES (?, ?);`, keySchemaVersion, latestDbSchema)
if err != nil { if err != nil {
return return
} }
_, err = mysql.db.Exec(`insert into metadata (key_name, value) values (?, ?);`, keySchemaMinorVersion, latestDbMinorVersion) _, err = mysql.db.Exec(`INSERT INTO metadata (key_name, value) VALUES (?, ?);`, keySchemaMinorVersion, latestDbMinorVersion)
if err != nil { if err != nil {
return return
} }
@ -159,7 +159,7 @@ func (mysql *MySQL) fixSchemas() (err error) {
} }
var minorVersion string var minorVersion string
err = mysql.db.QueryRow(`select value from metadata where key_name = ?;`, keySchemaMinorVersion).Scan(&minorVersion) err = mysql.db.QueryRow(`SELECT value FROM metadata WHERE key_name = ?;`, keySchemaMinorVersion).Scan(&minorVersion)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
// XXX for now, the only minor version upgrade is the account tracking tables // XXX for now, the only minor version upgrade is the account tracking tables
err = mysql.createComplianceTables() err = mysql.createComplianceTables()
@ -170,7 +170,7 @@ func (mysql *MySQL) fixSchemas() (err error) {
if err != nil { if err != nil {
return return
} }
_, err = mysql.db.Exec(`insert into metadata (key_name, value) values (?, ?);`, keySchemaMinorVersion, latestDbMinorVersion) _, err = mysql.db.Exec(`INSERT INTO metadata (key_name, value) VALUES (?, ?);`, keySchemaMinorVersion, latestDbMinorVersion)
if err != nil { if err != nil {
return return
} }
@ -180,7 +180,7 @@ func (mysql *MySQL) fixSchemas() (err error) {
if err != nil { if err != nil {
return return
} }
_, err = mysql.db.Exec(`update metadata set value = ? where key_name = ?;`, latestDbMinorVersion, keySchemaMinorVersion) _, err = mysql.db.Exec(`UPDATE metadata SET value = ? WHERE key_name = ?;`, latestDbMinorVersion, keySchemaMinorVersion)
if err != nil { if err != nil {
return return
} }