From ecad5ce774bd938058a31d79b21dffbc8508a2a3 Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Mon, 13 Jun 2022 07:15:59 +0200 Subject: [PATCH] Rename column --- .../2022060815233800_userprofile_servername.go | 8 ++++---- userapi/storage/postgres/profile_table.go | 14 +++++++------- .../2022060815233800_userprofile_servername.go | 6 +++--- userapi/storage/sqlite3/profile_table.go | 14 +++++++------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/userapi/storage/postgres/deltas/2022060815233800_userprofile_servername.go b/userapi/storage/postgres/deltas/2022060815233800_userprofile_servername.go index 0f9a769d6..e1871ddf3 100644 --- a/userapi/storage/postgres/deltas/2022060815233800_userprofile_servername.go +++ b/userapi/storage/postgres/deltas/2022060815233800_userprofile_servername.go @@ -16,10 +16,10 @@ func LoadProfilePrimaryKey(m *sqlutil.Migrations, s gomatrixserverlib.ServerName } func UpProfilePrimaryKey(tx *sql.Tx) error { - _, err := tx.Exec(fmt.Sprintf(`ALTER TABLE account_profiles ADD COLUMN IF NOT EXISTS servername TEXT NOT NULL DEFAULT '%s'; + _, err := tx.Exec(fmt.Sprintf(`ALTER TABLE account_profiles ADD COLUMN IF NOT EXISTS server_name TEXT NOT NULL DEFAULT '%s'; ALTER TABLE account_profiles DROP CONSTRAINT account_profiles_pkey; - ALTER TABLE account_profiles ADD PRIMARY KEY (localpart, servername); - ALTER TABLE account_profiles ALTER COLUMN servername DROP DEFAULT;`, serverName)) + ALTER TABLE account_profiles ADD PRIMARY KEY (localpart, server_name); + ALTER TABLE account_profiles ALTER COLUMN server_name DROP DEFAULT;`, serverName)) if err != nil { return fmt.Errorf("failed to execute upgrade: %w", err) } @@ -27,7 +27,7 @@ func UpProfilePrimaryKey(tx *sql.Tx) error { } func DownProfilePrimaryKey(tx *sql.Tx) error { - _, err := tx.Exec(`ALTER TABLE account_profiles DROP COLUMN IF EXISTS servername; + _, err := tx.Exec(`ALTER TABLE account_profiles DROP COLUMN IF EXISTS server_name; ALTER TABLE account_profiles ADD PRIMARY KEY(localpart);`) if err != nil { return fmt.Errorf("failed to execute downgrade: %w", err) diff --git a/userapi/storage/postgres/profile_table.go b/userapi/storage/postgres/profile_table.go index 1fab35cfe..46a36ce94 100644 --- a/userapi/storage/postgres/profile_table.go +++ b/userapi/storage/postgres/profile_table.go @@ -32,29 +32,29 @@ CREATE TABLE IF NOT EXISTS account_profiles ( -- The Matrix user ID localpart for this account localpart TEXT NOT NULL, -- The server this user belongs to - servername TEXT NOT NULL, + server_name TEXT NOT NULL, -- The display name for this account display_name TEXT, -- The URL of the avatar for this account avatar_url TEXT, - PRIMARY KEY (localpart, servername) + PRIMARY KEY (localpart, server_name) ); ` const insertProfileSQL = "" + - "INSERT INTO account_profiles(localpart, display_name, avatar_url, servername) VALUES ($1, $2, $3, $4)" + "INSERT INTO account_profiles(localpart, display_name, avatar_url, server_name) VALUES ($1, $2, $3, $4)" const selectProfileByLocalpartSQL = "" + - "SELECT localpart, display_name, avatar_url FROM account_profiles WHERE localpart = $1 AND servername = $2" + "SELECT localpart, display_name, avatar_url FROM account_profiles WHERE localpart = $1 AND server_name = $2" const setAvatarURLSQL = "" + - "UPDATE account_profiles SET avatar_url = $1 WHERE localpart = $2 AND servername = $3" + "UPDATE account_profiles SET avatar_url = $1 WHERE localpart = $2 AND server_name = $3" const setDisplayNameSQL = "" + - "UPDATE account_profiles SET display_name = $1 WHERE localpart = $2 AND servername = $3" + "UPDATE account_profiles SET display_name = $1 WHERE localpart = $2 AND server_name = $3" const selectProfilesBySearchSQL = "" + - "SELECT localpart, display_name, avatar_url, servername FROM account_profiles WHERE localpart LIKE $1 OR display_name LIKE $1 LIMIT $2" + "SELECT localpart, display_name, avatar_url, server_name FROM account_profiles WHERE localpart LIKE $1 OR display_name LIKE $1 LIMIT $2" type profilesStatements struct { serverNoticesLocalpart string diff --git a/userapi/storage/sqlite3/deltas/2022060815233800_userprofile_servername.go b/userapi/storage/sqlite3/deltas/2022060815233800_userprofile_servername.go index 529ac5799..08ee1c98c 100644 --- a/userapi/storage/sqlite3/deltas/2022060815233800_userprofile_servername.go +++ b/userapi/storage/sqlite3/deltas/2022060815233800_userprofile_servername.go @@ -20,14 +20,14 @@ func UpProfilePrimaryKey(tx *sql.Tx) error { ALTER TABLE account_profiles RENAME TO account_profiles_tmp; CREATE TABLE IF NOT EXISTS account_profiles ( localpart TEXT NOT NULL, - servername TEXT NOT NULL, + server_name TEXT NOT NULL, display_name TEXT, avatar_url TEXT, - PRIMARY KEY (localpart, servername) + PRIMARY KEY (localpart, server_name) ); INSERT INTO account_profiles ( - localpart, servername, display_name, avatar_url + localpart, server_name, display_name, avatar_url ) SELECT localpart, '%s', display_name, avatar_url FROM account_profiles_tmp; diff --git a/userapi/storage/sqlite3/profile_table.go b/userapi/storage/sqlite3/profile_table.go index 7995c4f7c..4a1b9e775 100644 --- a/userapi/storage/sqlite3/profile_table.go +++ b/userapi/storage/sqlite3/profile_table.go @@ -32,29 +32,29 @@ CREATE TABLE IF NOT EXISTS account_profiles ( -- The Matrix user ID localpart for this account localpart TEXT NOT NULL, -- The server this user belongs to - servername TEXT NOT NULL, + server_name TEXT NOT NULL, -- The display name for this account display_name TEXT, -- The URL of the avatar for this account avatar_url TEXT, - PRIMARY KEY (localpart, servername) + PRIMARY KEY (localpart, server_name) ); ` const insertProfileSQL = "" + - "INSERT INTO account_profiles(localpart, display_name, avatar_url, servername) VALUES ($1, $2, $3, $4)" + "INSERT INTO account_profiles(localpart, display_name, avatar_url, server_name) VALUES ($1, $2, $3, $4)" const selectProfileByLocalpartSQL = "" + - "SELECT localpart, display_name, avatar_url FROM account_profiles WHERE localpart = $1 AND servername = $2" + "SELECT localpart, display_name, avatar_url FROM account_profiles WHERE localpart = $1 AND server_name = $2" const setAvatarURLSQL = "" + - "UPDATE account_profiles SET avatar_url = $1 WHERE localpart = $2 AND servername = $3" + "UPDATE account_profiles SET avatar_url = $1 WHERE localpart = $2 AND server_name = $3" const setDisplayNameSQL = "" + - "UPDATE account_profiles SET display_name = $1 WHERE localpart = $2 AND servername = $3" + "UPDATE account_profiles SET display_name = $1 WHERE localpart = $2 AND server_name = $3" const selectProfilesBySearchSQL = "" + - "SELECT localpart, display_name, avatar_url, servername FROM account_profiles WHERE localpart LIKE $1 OR display_name LIKE $1 LIMIT $2" + "SELECT localpart, display_name, avatar_url, server_name FROM account_profiles WHERE localpart LIKE $1 OR display_name LIKE $1 LIMIT $2" type profilesStatements struct { db *sql.DB