yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 01:39:35 +02:00
Code Issues Releases Wiki Activity

Update code for switching to new schema type to users table changes

Browse source
This commit is contained in:
Paweł Chmielowski 2025-05-12 18:47:18 +02:00
parent 128103b7b2
commit d65cafae64
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/pg.new.sql
View file

@ -20,7 +20,7 @@
-- ALTER TABLE users ADD COLUMN server_host text NOT NULL DEFAULT '<HOST>'; -- ALTER TABLE users ADD COLUMN server_host text NOT NULL DEFAULT '<HOST>';
-- ALTER TABLE users DROP CONSTRAINT users_pkey; -- ALTER TABLE users DROP CONSTRAINT users_pkey;
-- ALTER TABLE users ADD PRIMARY KEY (server_host, username); -- ALTER TABLE users ADD PRIMARY KEY (server_host, username, "type");
-- ALTER TABLE users ALTER COLUMN server_host DROP DEFAULT; -- ALTER TABLE users ALTER COLUMN server_host DROP DEFAULT;
-- ALTER TABLE last ADD COLUMN server_host text NOT NULL DEFAULT '<HOST>'; -- ALTER TABLE last ADD COLUMN server_host text NOT NULL DEFAULT '<HOST>';

5
src/mod_admin_update_sql.erl
View file

@ -130,7 +130,7 @@ update_tables(State) ->
case add_sh_column(State, "users") of case add_sh_column(State, "users") of
true -> true ->
drop_pkey(State, "users"), drop_pkey(State, "users"),
add_pkey(State, "users", ["server_host", "username"]), add_pkey(State, "users", ["server_host", "username", "type"]),
drop_sh_default(State, "users"); drop_sh_default(State, "users");
false -> false ->
ok ok
@ -443,7 +443,8 @@ drop_pkey(#state{dbtype = mysql} = State, Table) ->
["ALTER TABLE ", Table, " DROP PRIMARY KEY;"]). ["ALTER TABLE ", Table, " DROP PRIMARY KEY;"]).
add_pkey(#state{dbtype = pgsql} = State, Table, Cols) -> add_pkey(#state{dbtype = pgsql} = State, Table, Cols) ->
SCols = string:join(Cols, ", "), Cols2 = lists:map(fun("type") -> "\"type\""; (V) -> V end, Cols),
SCols = string:join(Cols2, ", "),
sql_query( sql_query(
State#state.host, State#state.host,
["ALTER TABLE ", Table, " ADD PRIMARY KEY (", SCols, ");"]); ["ALTER TABLE ", Table, " ADD PRIMARY KEY (", SCols, ");"]);