Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Add print_sql_schema ejabberdctl command

Browse Source
This commit is contained in:
Alexey Shchepin 2024-01-24 22:49:59 +03:00
parent 6eff14a71d
commit 66d701e788
26 changed files with 293 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ejabberd_sql.hrl
View File

@ -68,3 +68,8 @@
update = []}). update = []}).
-record(sql_references, {table :: binary(), -record(sql_references, {table :: binary(),
column :: binary()}). column :: binary()}).
-record(sql_schema_info,
{db_type :: pgsql | mysql | sqlite,
db_version :: any(),
new_schema = true :: boolean()}).

5
src/ejabberd_auth_sql.erl
View File

@ -34,6 +34,7 @@
get_users/2, count_users/2, get_password/2, get_users/2, count_users/2, get_password/2,
remove_user/2, store_type/1, plain_password_required/1, remove_user/2, store_type/1, plain_password_required/1,
export/1, which_users_exists/2]). export/1, which_users_exists/2]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/scram.hrl"). -include_lib("xmpp/include/scram.hrl").
-include("logger.hrl"). -include("logger.hrl").
@ -46,10 +47,10 @@
%%% API %%% API
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
start(Host) -> start(Host) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

6
src/ejabberd_ctl.erl
View File

@ -157,6 +157,9 @@ process(["mnesia", Arg], _Version) ->
end, end,
?STATUS_SUCCESS; ?STATUS_SUCCESS;
process(["print_sql_schema", DBType, DBVersion, NewSchema], _Version) ->
ejabberd_sql_schema:print_schema(DBType, DBVersion, NewSchema);
%% The arguments --long and --dual are not documented because they are %% The arguments --long and --dual are not documented because they are
%% automatically selected depending in the number of columns of the shell %% automatically selected depending in the number of columns of the shell
process(["help" | Mode], Version) -> process(["help" | Mode], Version) ->
@ -555,7 +558,8 @@ print_usage(HelpMode, MaxC, ShCode, Version) ->
{"status", [], "Get ejabberd status"}, {"status", [], "Get ejabberd status"},
{"stop", [], "Stop ejabberd"}, {"stop", [], "Stop ejabberd"},
{"restart", [], "Restart ejabberd"}, {"restart", [], "Restart ejabberd"},
{"mnesia", ["[info]"], "show information of Mnesia system"}] ++ {"mnesia", ["[info]"], "show information of Mnesia system"},
{"print_sql_schema", ["db_type", "db_version", "new_schema"], "print SQL schema for the given RDBMS"}] ++
get_list_commands(Version), get_list_commands(Version),
print( print(

5
src/ejabberd_oauth_sql.erl
View File

@ -34,6 +34,7 @@
lookup_client/1, lookup_client/1,
store_client/1, store_client/1,
remove_client/1, revoke/1]). remove_client/1, revoke/1]).
-export([sql_schemas/0]).
-include("ejabberd_oauth.hrl"). -include("ejabberd_oauth.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -42,10 +43,10 @@
init() -> init() ->
ejabberd_sql_schema:update_schema( ejabberd_sql_schema:update_schema(
ejabberd_config:get_myname(), ?MODULE, schemas()), ejabberd_config:get_myname(), ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/ejabberd_router_sql.erl
View File

@ -27,6 +27,7 @@
%% API %% API
-export([init/0, register_route/5, unregister_route/3, find_routes/1, -export([init/0, register_route/5, unregister_route/3, find_routes/1,
get_all_routes/0]). get_all_routes/0]).
-export([sql_schemas/0]).
-include("logger.hrl"). -include("logger.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -38,7 +39,7 @@
%%%=================================================================== %%%===================================================================
init() -> init() ->
ejabberd_sql_schema:update_schema( ejabberd_sql_schema:update_schema(
ejabberd_config:get_myname(), ?MODULE, schemas()), ejabberd_config:get_myname(), ?MODULE, sql_schemas()),
Node = erlang:atom_to_binary(node(), latin1), Node = erlang:atom_to_binary(node(), latin1),
?DEBUG("Cleaning SQL 'route' table...", []), ?DEBUG("Cleaning SQL 'route' table...", []),
case ejabberd_sql:sql_query( case ejabberd_sql:sql_query(
@ -50,7 +51,7 @@ init() ->
Err Err
end. end.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/ejabberd_sm_sql.erl
View File

@ -34,6 +34,7 @@
get_sessions/0, get_sessions/0,
get_sessions/1, get_sessions/1,
get_sessions/2]). get_sessions/2]).
-export([sql_schemas/0]).
-include("ejabberd_sm.hrl"). -include("ejabberd_sm.hrl").
-include("logger.hrl"). -include("logger.hrl").
@ -48,7 +49,7 @@ init() ->
?DEBUG("Cleaning SQL SM table...", []), ?DEBUG("Cleaning SQL SM table...", []),
lists:foldl( lists:foldl(
fun(Host, ok) -> fun(Host, ok) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
case ejabberd_sql:sql_query( case ejabberd_sql:sql_query(
Host, ?SQL("delete from sm where node=%(Node)s")) of Host, ?SQL("delete from sm where node=%(Node)s")) of
{updated, _} -> {updated, _} ->
@ -61,7 +62,7 @@ init() ->
Err Err
end, ok, ejabberd_sm:get_vh_by_backend(?MODULE)). end, ok, ejabberd_sm:get_vh_by_backend(?MODULE)).
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

53
src/ejabberd_sql.erl
View File

@ -56,7 +56,8 @@
init_mssql/1, init_mssql/1,
keep_alive/2, keep_alive/2,
to_list/2, to_list/2,
to_array/2]). to_array/2,
parse_mysql_version/2]).
%% gen_fsm callbacks %% gen_fsm callbacks
-export([init/1, handle_event/3, handle_sync_event/4, -export([init/1, handle_event/3, handle_sync_event/4,
@ -1134,6 +1135,31 @@ to_odbc({error, Reason}) when is_list(Reason) ->
to_odbc(Res) -> to_odbc(Res) ->
Res. Res.
parse_mysql_version(SVersion, DefaultUpsert) ->
case re:run(SVersion, <<"(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-([^-]*))?">>,
[{capture, all_but_first, binary}]) of
{match, [V1, V2, V3, Type]} ->
V = ((bin_to_int(V1)*1000)+bin_to_int(V2))*1000+bin_to_int(V3),
TypeA = binary_to_atom(Type, utf8),
Flags = case TypeA of
'MariaDB' -> DefaultUpsert;
_ when V >= 5007026 andalso V < 8000000 -> 1;
_ when V >= 8000020 -> 1;
_ -> DefaultUpsert
end,
{ok, {V, TypeA, Flags}};
{match, [V1, V2, V3]} ->
V = ((bin_to_int(V1)*1000)+bin_to_int(V2))*1000+bin_to_int(V3),
Flags = case V of
_ when V >= 5007026 andalso V < 8000000 -> 1;
_ when V >= 8000020 -> 1;
_ -> DefaultUpsert
end,
{ok, {V, unknown, Flags}};
_ ->
error
end.
get_db_version(#state{db_type = pgsql} = State) -> get_db_version(#state{db_type = pgsql} = State) ->
case pgsql:squery(State#state.db_ref, case pgsql:squery(State#state.db_ref,
<<"select current_setting('server_version_num')">>) of <<"select current_setting('server_version_num')">>) of
@ -1159,27 +1185,10 @@ get_db_version(#state{db_type = mysql, host = Host} = State) ->
[{timeout, 5000}, [{timeout, 5000},
{result_type, binary}])) of {result_type, binary}])) of
{selected, _, [SVersion]} -> {selected, _, [SVersion]} ->
case re:run(SVersion, <<"(\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:-([^-]*))?">>, case parse_mysql_version(SVersion, DefaultUpsert) of
[{capture, all_but_first, binary}]) of {ok, V} ->
{match, [V1, V2, V3, Type]} -> State#state{db_version = V};
V = ((bin_to_int(V1)*1000)+bin_to_int(V2))*1000+bin_to_int(V3), error ->
TypeA = binary_to_atom(Type, utf8),
Flags = case TypeA of
'MariaDB' -> DefaultUpsert;
_ when V >= 5007026 andalso V < 8000000 -> 1;
_ when V >= 8000020 -> 1;
_ -> DefaultUpsert
end,
State#state{db_version = {V, TypeA, Flags}};
{match, [V1, V2, V3]} ->
V = ((bin_to_int(V1)*1000)+bin_to_int(V2))*1000+bin_to_int(V3),
Flags = case V of
_ when V >= 5007026 andalso V < 8000000 -> 1;
_ when V >= 8000020 -> 1;
_ -> DefaultUpsert
end,
State#state{db_version = {V, unknown, Flags}};
_ ->
?WARNING_MSG("Error parsing mysql version: ~p", [SVersion]), ?WARNING_MSG("Error parsing mysql version: ~p", [SVersion]),
State State
end; end;

244
src/ejabberd_sql_schema.erl
View File

@ -28,10 +28,12 @@
-author('alexey@process-one.net'). -author('alexey@process-one.net').
-export([start/1, update_schema/3, -export([start/1, update_schema/3,
get_table_schema/2, get_table_indices/2, test/0]). get_table_schema/2, get_table_indices/2, print_schema/3,
test/0]).
-include("logger.hrl"). -include("logger.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
-include("ejabberd_ctl.hrl").
start(Host) -> start(Host) ->
case should_update_schema(Host) of case should_update_schema(Host) of
@ -40,8 +42,17 @@ start(Host) ->
true -> true ->
ok; ok;
false -> false ->
Table = filter_table_sh(schema_table()), SchemaInfo =
Res = create_table(Host, Table), ejabberd_sql:sql_query(
Host,
fun(DBType, DBVersion) ->
#sql_schema_info{
db_type = DBType,
db_version = DBVersion,
new_schema = ejabberd_sql:use_new_schema()}
end),
Table = filter_table_sh(SchemaInfo, schema_table()),
Res = create_table(Host, SchemaInfo, Table),
case Res of case Res of
{error, Error} -> {error, Error} ->
?ERROR_MSG("Failed to create table ~s: ~p", ?ERROR_MSG("Failed to create table ~s: ~p",
@ -249,8 +260,8 @@ table_exists(Host, Table) ->
end end
end). end).
filter_table_sh(Table) -> filter_table_sh(SchemaInfo, Table) ->
case {ejabberd_sql:use_new_schema(), Table#sql_table.name} of case {SchemaInfo#sql_schema_info.new_schema, Table#sql_table.name} of
{true, _} -> {true, _} ->
Table; Table;
{_, <<"route">>} -> {_, <<"route">>} ->
@ -383,7 +394,7 @@ get_current_version(Host, Module, Schemas) ->
Version Version
end. end.
format_type(pgsql, _DBVersion, Column) -> format_type(#sql_schema_info{db_type = pgsql}, Column) ->
case Column#sql_column.type of case Column#sql_column.type of
text -> <<"text">>; text -> <<"text">>;
{text, _} -> <<"text">>; {text, _} -> <<"text">>;
@ -397,7 +408,7 @@ format_type(pgsql, _DBVersion, Column) ->
{char, N} -> [<<"character(">>, integer_to_binary(N), <<")">>]; {char, N} -> [<<"character(">>, integer_to_binary(N), <<")">>];
bigserial -> <<"bigserial">> bigserial -> <<"bigserial">>
end; end;
format_type(sqlite, _DBVersion, Column) -> format_type(#sql_schema_info{db_type = sqlite}, Column) ->
case Column#sql_column.type of case Column#sql_column.type of
text -> <<"text">>; text -> <<"text">>;
{text, _} -> <<"text">>; {text, _} -> <<"text">>;
@ -411,7 +422,7 @@ format_type(sqlite, _DBVersion, Column) ->
{char, N} -> [<<"character(">>, integer_to_binary(N), <<")">>]; {char, N} -> [<<"character(">>, integer_to_binary(N), <<")">>];
bigserial -> <<"integer primary key autoincrement">> bigserial -> <<"integer primary key autoincrement">>
end; end;
format_type(mysql, _DBVersion, Column) -> format_type(#sql_schema_info{db_type = mysql}, Column) ->
case Column#sql_column.type of case Column#sql_column.type of
text -> <<"text">>; text -> <<"text">>;
{text, big} -> <<"mediumtext">>; {text, big} -> <<"mediumtext">>;
@ -429,7 +440,7 @@ format_type(mysql, _DBVersion, Column) ->
bigserial -> <<"bigint auto_increment primary key">> bigserial -> <<"bigint auto_increment primary key">>
end. end.
format_default(pgsql, _DBVersion, Column) -> format_default(#sql_schema_info{db_type = pgsql}, Column) ->
case Column#sql_column.type of case Column#sql_column.type of
text -> <<"''">>; text -> <<"''">>;
{text, _} -> <<"''">>; {text, _} -> <<"''">>;
@ -443,7 +454,7 @@ format_default(pgsql, _DBVersion, Column) ->
%{char, N} -> <<"''">>; %{char, N} -> <<"''">>;
%bigserial -> <<"0">> %bigserial -> <<"0">>
end; end;
format_default(sqlite, _DBVersion, Column) -> format_default(#sql_schema_info{db_type = sqlite}, Column) ->
case Column#sql_column.type of case Column#sql_column.type of
text -> <<"''">>; text -> <<"''">>;
{text, _} -> <<"''">>; {text, _} -> <<"''">>;
@ -457,7 +468,7 @@ format_default(sqlite, _DBVersion, Column) ->
%{char, N} -> <<"''">>; %{char, N} -> <<"''">>;
%bigserial -> <<"0">> %bigserial -> <<"0">>
end; end;
format_default(mysql, _DBVersion, Column) -> format_default(#sql_schema_info{db_type = mysql}, Column) ->
case Column#sql_column.type of case Column#sql_column.type of
text -> <<"('')">>; text -> <<"('')">>;
{text, _} -> <<"('')">>; {text, _} -> <<"('')">>;
@ -472,20 +483,20 @@ format_default(mysql, _DBVersion, Column) ->
%bigserial -> <<"0">> %bigserial -> <<"0">>
end. end.
escape_name(pgsql, _DBVersion, <<"type">>) -> escape_name(#sql_schema_info{db_type = pgsql}, <<"type">>) ->
<<"\"type\"">>; <<"\"type\"">>;
escape_name(_DBType, _DBVersion, ColumnName) -> escape_name(_SchemaInfo, ColumnName) ->
ColumnName. ColumnName.
format_column_def(DBType, DBVersion, Column) -> format_column_def(SchemaInfo, Column) ->
[<<" ">>, [<<" ">>,
escape_name(DBType, DBVersion, Column#sql_column.name), <<" ">>, escape_name(SchemaInfo, Column#sql_column.name), <<" ">>,
format_type(DBType, DBVersion, Column), format_type(SchemaInfo, Column),
<<" NOT NULL">>, <<" NOT NULL">>,
case Column#sql_column.default of case Column#sql_column.default of
false -> []; false -> [];
true -> true ->
[<<" DEFAULT ">>, format_default(DBType, DBVersion, Column)] [<<" DEFAULT ">>, format_default(SchemaInfo, Column)]
end, end,
case lists:keyfind(sql_references, 1, Column#sql_column.opts) of case lists:keyfind(sql_references, 1, Column#sql_column.opts) of
false -> []; false -> [];
@ -511,7 +522,7 @@ format_mysql_index_column(Table, ColumnName) ->
ColumnName ColumnName
end. end.
format_create_index(pgsql, _DBVersion, Table, Index) -> format_create_index(#sql_schema_info{db_type = pgsql}, Table, Index) ->
TableName = Table#sql_table.name, TableName = Table#sql_table.name,
Unique = Unique =
case Index#sql_index.unique of case Index#sql_index.unique of
@ -528,7 +539,7 @@ format_create_index(pgsql, _DBVersion, Table, Index) ->
<<", ">>, <<", ">>,
Index#sql_index.columns), Index#sql_index.columns),
<<");">>]; <<");">>];
format_create_index(sqlite, _DBVersion, Table, Index) -> format_create_index(#sql_schema_info{db_type = sqlite}, Table, Index) ->
TableName = Table#sql_table.name, TableName = Table#sql_table.name,
Unique = Unique =
case Index#sql_index.unique of case Index#sql_index.unique of
@ -545,7 +556,7 @@ format_create_index(sqlite, _DBVersion, Table, Index) ->
<<", ">>, <<", ">>,
Index#sql_index.columns), Index#sql_index.columns),
<<");">>]; <<");">>];
format_create_index(mysql, _DBVersion, Table, Index) -> format_create_index(#sql_schema_info{db_type = mysql}, Table, Index) ->
TableName = Table#sql_table.name, TableName = Table#sql_table.name,
Unique = Unique =
case Index#sql_index.unique of case Index#sql_index.unique of
@ -567,7 +578,7 @@ format_create_index(mysql, _DBVersion, Table, Index) ->
end, Index#sql_index.columns)), end, Index#sql_index.columns)),
<<");">>]. <<");">>].
format_primary_key(mysql, _DBVersion, Table) -> format_primary_key(#sql_schema_info{db_type = mysql}, Table) ->
case lists:filter( case lists:filter(
fun(#sql_index{meta = #{primary_key := true}}) -> true; fun(#sql_index{meta = #{primary_key := true}}) -> true;
(_) -> false (_) -> false
@ -584,7 +595,7 @@ format_primary_key(mysql, _DBVersion, Table) ->
end, I#sql_index.columns)), end, I#sql_index.columns)),
<<")">>]] <<")">>]]
end; end;
format_primary_key(_DBType, _DBVersion, Table) -> format_primary_key(_SchemaInfo, Table) ->
case lists:filter( case lists:filter(
fun(#sql_index{meta = #{primary_key := true}}) -> true; fun(#sql_index{meta = #{primary_key := true}}) -> true;
(_) -> false (_) -> false
@ -597,16 +608,17 @@ format_primary_key(_DBType, _DBVersion, Table) ->
<<")">>]] <<")">>]]
end. end.
format_add_primary_key(sqlite = DBType, DBVersion, Table, Index) -> format_add_primary_key(#sql_schema_info{db_type = sqlite} = SchemaInfo,
format_create_index(DBType, DBVersion, Table, Index); Table, Index) ->
format_add_primary_key(mysql, _DBVersion, Table, Index) -> format_create_index(SchemaInfo, Table, Index);
format_add_primary_key(#sql_schema_info{db_type = pgsql}, Table, Index) ->
TableName = Table#sql_table.name, TableName = Table#sql_table.name,
[<<"ALTER TABLE ">>, TableName, <<" ADD PRIMARY KEY (">>, [<<"ALTER TABLE ">>, TableName, <<" ADD PRIMARY KEY (">>,
lists:join( lists:join(
<<", ">>, <<", ">>,
Index#sql_index.columns), Index#sql_index.columns),
<<");">>]; <<");">>];
format_add_primary_key(_DBType, _DBVersion, Table, Index) -> format_add_primary_key(#sql_schema_info{db_type = mysql}, Table, Index) ->
TableName = Table#sql_table.name, TableName = Table#sql_table.name,
[<<"ALTER TABLE ">>, TableName, <<" ADD PRIMARY KEY (">>, [<<"ALTER TABLE ">>, TableName, <<" ADD PRIMARY KEY (">>,
lists:join( lists:join(
@ -617,16 +629,16 @@ format_add_primary_key(_DBType, _DBVersion, Table, Index) ->
end, Index#sql_index.columns)), end, Index#sql_index.columns)),
<<");">>]. <<");">>].
format_create_table(pgsql = DBType, DBVersion, Table) -> format_create_table(#sql_schema_info{db_type = pgsql} = SchemaInfo, Table) ->
TableName = Table#sql_table.name, TableName = Table#sql_table.name,
[iolist_to_binary( [iolist_to_binary(
[<<"CREATE TABLE ">>, TableName, <<" (\n">>, [<<"CREATE TABLE ">>, TableName, <<" (\n">>,
lists:join( lists:join(
<<",\n">>, <<",\n">>,
lists:map( lists:map(
fun(C) -> format_column_def(DBType, DBVersion, C) end, fun(C) -> format_column_def(SchemaInfo, C) end,
Table#sql_table.columns) ++ Table#sql_table.columns) ++
format_primary_key(DBType, DBVersion, Table)), format_primary_key(SchemaInfo, Table)),
<<"\n);\n">>])] ++ <<"\n);\n">>])] ++
lists:flatmap( lists:flatmap(
fun(#sql_index{meta = #{primary_key := true}}) -> fun(#sql_index{meta = #{primary_key := true}}) ->
@ -635,20 +647,20 @@ format_create_table(pgsql = DBType, DBVersion, Table) ->
[]; [];
(I) -> (I) ->
[iolist_to_binary( [iolist_to_binary(
[format_create_index(DBType, DBVersion, Table, I), [format_create_index(SchemaInfo, Table, I),
<<"\n">>])] <<"\n">>])]
end, end,
Table#sql_table.indices); Table#sql_table.indices);
format_create_table(sqlite = DBType, DBVersion, Table) -> format_create_table(#sql_schema_info{db_type = sqlite} = SchemaInfo, Table) ->
TableName = Table#sql_table.name, TableName = Table#sql_table.name,
[iolist_to_binary( [iolist_to_binary(
[<<"CREATE TABLE ">>, TableName, <<" (\n">>, [<<"CREATE TABLE ">>, TableName, <<" (\n">>,
lists:join( lists:join(
<<",\n">>, <<",\n">>,
lists:map( lists:map(
fun(C) -> format_column_def(DBType, DBVersion, C) end, fun(C) -> format_column_def(SchemaInfo, C) end,
Table#sql_table.columns) ++ Table#sql_table.columns) ++
format_primary_key(DBType, DBVersion, Table)), format_primary_key(SchemaInfo, Table)),
<<"\n);\n">>])] ++ <<"\n);\n">>])] ++
lists:flatmap( lists:flatmap(
fun(#sql_index{meta = #{primary_key := true}}) -> fun(#sql_index{meta = #{primary_key := true}}) ->
@ -657,20 +669,20 @@ format_create_table(sqlite = DBType, DBVersion, Table) ->
[]; [];
(I) -> (I) ->
[iolist_to_binary( [iolist_to_binary(
[format_create_index(DBType, DBVersion, Table, I), [format_create_index(SchemaInfo, Table, I),
<<"\n">>])] <<"\n">>])]
end, end,
Table#sql_table.indices); Table#sql_table.indices);
format_create_table(mysql = DBType, DBVersion, Table) -> format_create_table(#sql_schema_info{db_type = mysql} = SchemaInfo, Table) ->
TableName = Table#sql_table.name, TableName = Table#sql_table.name,
[iolist_to_binary( [iolist_to_binary(
[<<"CREATE TABLE ">>, TableName, <<" (\n">>, [<<"CREATE TABLE ">>, TableName, <<" (\n">>,
lists:join( lists:join(
<<",\n">>, <<",\n">>,
lists:map( lists:map(
fun(C) -> format_column_def(DBType, DBVersion, C) end, fun(C) -> format_column_def(SchemaInfo, C) end,
Table#sql_table.columns) ++ Table#sql_table.columns) ++
format_primary_key(DBType, DBVersion, Table)), format_primary_key(SchemaInfo, Table)),
<<"\n) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;\n">>])] ++ <<"\n) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;\n">>])] ++
lists:flatmap( lists:flatmap(
fun(#sql_index{meta = #{primary_key := true}}) -> fun(#sql_index{meta = #{primary_key := true}}) ->
@ -679,20 +691,16 @@ format_create_table(mysql = DBType, DBVersion, Table) ->
[]; [];
(I) -> (I) ->
[iolist_to_binary( [iolist_to_binary(
[format_create_index(DBType, DBVersion, Table, I), [format_create_index(SchemaInfo, Table, I),
<<"\n">>])] <<"\n">>])]
end, end,
Table#sql_table.indices). Table#sql_table.indices).
%format_create_table(DBType, _DBVersion, Table) ->
% ?ERROR_MSG("Can't create SQL table ~p on ~p",
% [Table#sql_table.name, DBType]),
% error.
create_table(Host, Table) -> create_table(Host, SchemaInfo, Table) ->
ejabberd_sql:sql_query( ejabberd_sql:sql_query(
Host, Host,
fun(DBType, DBVersion) -> fun() ->
SQLs = format_create_table(DBType, DBVersion, Table), SQLs = format_create_table(SchemaInfo, Table),
?INFO_MSG("Creating table ~s:~n~s~n", ?INFO_MSG("Creating table ~s:~n~s~n",
[Table#sql_table.name, SQLs]), [Table#sql_table.name, SQLs]),
lists:foreach( lists:foreach(
@ -700,15 +708,18 @@ create_table(Host, Table) ->
case Table#sql_table.post_create of case Table#sql_table.post_create of
undefined -> undefined ->
ok; ok;
F -> F when is_function(F, 1) ->
F(DBType, DBVersion) PostSQLs = F(SchemaInfo),
lists:foreach(
fun(SQL) -> ejabberd_sql:sql_query_t(SQL) end,
PostSQLs)
end end
end). end).
create_tables(Host, Module, Schema) -> create_tables(Host, Module, SchemaInfo, Schema) ->
lists:foreach( lists:foreach(
fun(Table) -> fun(Table) ->
Res = create_table(Host, Table), Res = create_table(Host, SchemaInfo, Table),
case Res of case Res of
{error, Error} -> {error, Error} ->
?ERROR_MSG("Failed to create table ~s: ~p", ?ERROR_MSG("Failed to create table ~s: ~p",
@ -740,10 +751,10 @@ should_update_schema(Host) ->
false false
end. end.
preprocess_table(Host, Table) -> preprocess_table(SchemaInfo, Table) ->
Table1 = filter_table_sh(Table), Table1 = filter_table_sh(SchemaInfo, Table),
ImplicitPK = ImplicitPK =
case ejabberd_option:sql_type(Host) of case SchemaInfo#sql_schema_info.db_type of
pgsql -> false; pgsql -> false;
sqlite -> sqlite ->
case lists:keyfind(bigserial, #sql_column.type, case lists:keyfind(bigserial, #sql_column.type,
@ -782,18 +793,30 @@ preprocess_table(Host, Table) ->
end, end,
Table1#sql_table{indices = Indices}. Table1#sql_table{indices = Indices}.
preprocess_schemas(Host, Schemas) -> preprocess_schemas(SchemaInfo, Schemas) ->
lists:map( lists:map(
fun(Schema) -> fun(Schema) ->
Schema#sql_schema{ Schema#sql_schema{
tables = lists:map(fun(T) -> preprocess_table(Host, T) end, tables = lists:map(
Schema#sql_schema.tables)} fun(T) ->
preprocess_table(SchemaInfo, T)
end,
Schema#sql_schema.tables)}
end, Schemas). end, Schemas).
update_schema(Host, Module, RawSchemas) -> update_schema(Host, Module, RawSchemas) ->
case should_update_schema(Host) of case should_update_schema(Host) of
true -> true ->
Schemas = preprocess_schemas(Host, RawSchemas), SchemaInfo =
ejabberd_sql:sql_query(
Host,
fun(DBType, DBVersion) ->
#sql_schema_info{
db_type = DBType,
db_version = DBVersion,
new_schema = ejabberd_sql:use_new_schema()}
end),
Schemas = preprocess_schemas(SchemaInfo, RawSchemas),
Version = get_current_version(Host, Module, Schemas), Version = get_current_version(Host, Module, Schemas),
LastSchema = lists:max(Schemas), LastSchema = lists:max(Schemas),
LastVersion = LastSchema#sql_schema.version, LastVersion = LastSchema#sql_schema.version,
@ -801,7 +824,7 @@ update_schema(Host, Module, RawSchemas) ->
_ when Version < 0 -> _ when Version < 0 ->
?ERROR_MSG("Can't update SQL schema for module ~p, please do it manually", [Module]); ?ERROR_MSG("Can't update SQL schema for module ~p, please do it manually", [Module]);
0 -> 0 ->
create_tables(Host, Module, LastSchema); create_tables(Host, Module, SchemaInfo, LastSchema);
LastVersion -> LastVersion ->
ok; ok;
_ when LastVersion < Version -> _ when LastVersion < Version ->
@ -811,7 +834,8 @@ update_schema(Host, Module, RawSchemas) ->
fun(Schema) -> fun(Schema) ->
if if
Schema#sql_schema.version > Version -> Schema#sql_schema.version > Version ->
do_update_schema(Host, Module, Schema); do_update_schema(Host, Module,
SchemaInfo, Schema);
true -> true ->
ok ok
end end
@ -821,7 +845,7 @@ update_schema(Host, Module, RawSchemas) ->
ok ok
end. end.
do_update_schema(Host, Module, Schema) -> do_update_schema(Host, Module, SchemaInfo, Schema) ->
lists:foreach( lists:foreach(
fun({add_column, TableName, ColumnName}) -> fun({add_column, TableName, ColumnName}) ->
{value, Table} = {value, Table} =
@ -833,9 +857,9 @@ do_update_schema(Host, Module, Schema) ->
Res = Res =
ejabberd_sql:sql_query( ejabberd_sql:sql_query(
Host, Host,
fun(DBType, DBVersion) -> fun(DBType, _DBVersion) ->
Def = format_column_def(DBType, DBVersion, Column), Def = format_column_def(SchemaInfo, Column),
Default = format_default(DBType, DBVersion, Column), Default = format_default(SchemaInfo, Column),
SQLs = SQLs =
[[<<"ALTER TABLE ">>, [[<<"ALTER TABLE ">>,
TableName, TableName,
@ -914,11 +938,11 @@ do_update_schema(Host, Module, Schema) ->
Res = Res =
ejabberd_sql:sql_query( ejabberd_sql:sql_query(
Host, Host,
fun(DBType, DBVersion) -> fun() ->
case Index#sql_index.meta of case Index#sql_index.meta of
#{primary_key := true} -> #{primary_key := true} ->
SQL1 = format_add_primary_key( SQL1 = format_add_primary_key(
DBType, DBVersion, Table, Index), SchemaInfo, Table, Index),
SQL = iolist_to_binary(SQL1), SQL = iolist_to_binary(SQL1),
?INFO_MSG("Add primary key ~s/~p:~n~s~n", ?INFO_MSG("Add primary key ~s/~p:~n~s~n",
[Table#sql_table.name, [Table#sql_table.name,
@ -927,7 +951,7 @@ do_update_schema(Host, Module, Schema) ->
ejabberd_sql:sql_query_t(SQL); ejabberd_sql:sql_query_t(SQL);
_ -> _ ->
SQL1 = format_create_index( SQL1 = format_create_index(
DBType, DBVersion, Table, Index), SchemaInfo, Table, Index),
SQL = iolist_to_binary(SQL1), SQL = iolist_to_binary(SQL1),
?INFO_MSG("Create index ~s/~p:~n~s~n", ?INFO_MSG("Create index ~s/~p:~n~s~n",
[Table#sql_table.name, [Table#sql_table.name,
@ -993,6 +1017,96 @@ do_update_schema(Host, Module, Schema) ->
end, Schema#sql_schema.update), end, Schema#sql_schema.update),
store_version(Host, Module, Schema#sql_schema.version). store_version(Host, Module, Schema#sql_schema.version).
print_schema(SDBType, SDBVersion, SNewSchema) ->
{DBType, DBVersion} =
case SDBType of
"pgsql" ->
case string:split(SDBVersion, ".") of
[SMajor, SMinor] ->
try {list_to_integer(SMajor), list_to_integer(SMinor)} of
{Major, Minor} ->
{pgsql, Major * 10000 + Minor}
catch _:_ ->
io:format("pgsql version be in the form of "
"Major.Minor, e.g. 16.1~n"),
{error, error}
end;
_ ->
io:format("pgsql version be in the form of "
"Major.Minor, e.g. 16.1~n"),
{error, error}
end;
"mysql" ->
case ejabberd_sql:parse_mysql_version(SDBVersion, 0) of
{ok, V} ->
{mysql, V};
error ->
io:format("pgsql version be in the same form as "
"SELECT VERSION() returns~n"),
{error, error}
end;
"sqlite" ->
{sqlite, undefined};
_ ->
io:format("db_type must be one of the following: "
"'pgsql', 'mysql', 'sqlite'~n"),
{error, error}
end,
NewSchema =
case SNewSchema of
"0" -> false;
"1" -> true;
"false" -> false;
"true" -> true;
_ ->
io:format("new_schema must be one of the following: "
"'0', '1', 'false', 'true'~n"),
error
end,
case {DBType, NewSchema} of
{error, _} -> ?STATUS_ERROR;
{_, error} -> ?STATUS_ERROR;
_ ->
SchemaInfo =
#sql_schema_info{
db_type = DBType,
db_version = DBVersion,
new_schema = NewSchema},
Mods = ejabberd_config:beams(all),
lists:foreach(
fun(Mod) ->
case erlang:function_exported(Mod, sql_schemas, 0) of
true ->
Schemas = Mod:sql_schemas(),
Schemas2 = preprocess_schemas(SchemaInfo, Schemas),
Schema = lists:max(Schemas2),
SQLs =
lists:flatmap(
fun(Table) ->
SQLs = format_create_table(SchemaInfo, Table),
PostSQLs =
case Table#sql_table.post_create of
undefined ->
[];
F when is_function(F, 1) ->
PSQLs = F(SchemaInfo),
lists:map(
fun(S) ->
[S, <<"\n">>]
end, PSQLs)
end,
SQLs ++ PostSQLs
end, Schema#sql_schema.tables),
io:format("~s~n", [SQLs]);
false ->
ok
end
end, Mods),
?STATUS_SUCCESS
end.
test() -> test() ->
Schemas = Schemas =
[#sql_schema{ [#sql_schema{

5
src/mod_announce_sql.erl
View File

@ -31,6 +31,7 @@
-export([init/2, set_motd_users/2, set_motd/2, delete_motd/1, -export([init/2, set_motd_users/2, set_motd/2, delete_motd/1,
get_motd/1, is_motd_user/2, set_motd_user/2, import/3, get_motd/1, is_motd_user/2, set_motd_user/2, import/3,
export/1]). export/1]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
-include("mod_announce.hrl"). -include("mod_announce.hrl").
@ -41,10 +42,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_bosh_sql.erl
View File

@ -29,6 +29,7 @@
%% API %% API
-export([init/0, open_session/2, close_session/1, find_session/1]). -export([init/0, open_session/2, close_session/1, find_session/1]).
-export([sql_schemas/0]).
-include("logger.hrl"). -include("logger.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -38,7 +39,7 @@
%%%=================================================================== %%%===================================================================
init() -> init() ->
ejabberd_sql_schema:update_schema( ejabberd_sql_schema:update_schema(
ejabberd_config:get_myname(), ?MODULE, schemas()), ejabberd_config:get_myname(), ?MODULE, sql_schemas()),
Node = erlang:atom_to_binary(node(), latin1), Node = erlang:atom_to_binary(node(), latin1),
?DEBUG("Cleaning SQL 'bosh' table...", []), ?DEBUG("Cleaning SQL 'bosh' table...", []),
case ejabberd_sql:sql_query( case ejabberd_sql:sql_query(
@ -50,7 +51,7 @@ init() ->
Err Err
end. end.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_caps_sql.erl
View File

@ -29,6 +29,7 @@
%% API %% API
-export([init/2, caps_read/2, caps_write/3, export/1, import/3]). -export([init/2, caps_read/2, caps_write/3, export/1, import/3]).
-export([sql_schemas/0]).
-include("mod_caps.hrl"). -include("mod_caps.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -38,10 +39,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_last_sql.erl
View File

@ -30,6 +30,7 @@
%% API %% API
-export([init/2, get_last/2, store_last_info/4, remove_user/2, -export([init/2, get_last/2, store_last_info/4, remove_user/2,
import/2, export/1]). import/2, export/1]).
-export([sql_schemas/0]).
-include("mod_last.hrl"). -include("mod_last.hrl").
-include("logger.hrl"). -include("logger.hrl").
@ -39,10 +40,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

18
src/mod_mam_sql.erl
View File

@ -32,6 +32,7 @@
extended_fields/0, store/10, write_prefs/4, get_prefs/2, select/7, export/1, remove_from_archive/3, extended_fields/0, store/10, write_prefs/4, get_prefs/2, select/7, export/1, remove_from_archive/3,
is_empty_for_user/2, is_empty_for_room/3, select_with_mucsub/6, is_empty_for_user/2, is_empty_for_room/3, select_with_mucsub/6,
delete_old_messages_batch/4, count_messages_to_delete/3]). delete_old_messages_batch/4, count_messages_to_delete/3]).
-export([sql_schemas/0]).
-include_lib("stdlib/include/ms_transform.hrl"). -include_lib("stdlib/include/ms_transform.hrl").
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
@ -44,10 +45,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 2, version = 2,
tables = tables =
@ -79,11 +80,10 @@ schemas() ->
columns = [<<"server_host">>, <<"username">>, <<"origin_id">>]} columns = [<<"server_host">>, <<"username">>, <<"origin_id">>]}
], ],
post_create = post_create =
fun(mysql, _) -> fun(#sql_schema_info{db_type = mysql}) ->
ejabberd_sql:sql_query_t( [<<"CREATE FULLTEXT INDEX i_archive_txt ON archive(txt);">>];
<<"CREATE FULLTEXT INDEX i_archive_txt ON archive(txt);">>); (_) ->
(_, _) -> []
ok
end}, end},
#sql_table{ #sql_table{
name = <<"archive_prefs">>, name = <<"archive_prefs">>,
@ -131,10 +131,10 @@ schemas() ->
columns = [<<"server_host">>, <<"timestamp">>]} columns = [<<"server_host">>, <<"timestamp">>]}
], ],
post_create = post_create =
fun(mysql, _) -> fun(#sql_schema_info{db_type = mysql}) ->
ejabberd_sql:sql_query_t( ejabberd_sql:sql_query_t(
<<"CREATE FULLTEXT INDEX i_archive_txt ON archive(txt);">>); <<"CREATE FULLTEXT INDEX i_archive_txt ON archive(txt);">>);
(_, _) -> (_) ->
ok ok
end}, end},
#sql_table{ #sql_table{

5
src/mod_mix_pam_sql.erl
View File

@ -26,6 +26,7 @@
%% API %% API
-export([init/2, add_channel/3, get_channel/2, -export([init/2, add_channel/3, get_channel/2,
get_channels/1, del_channel/2, del_channels/1]). get_channels/1, del_channel/2, del_channels/1]).
-export([sql_schemas/0]).
-include("logger.hrl"). -include("logger.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -34,10 +35,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_mix_sql.erl
View File

@ -27,6 +27,7 @@
-export([set_channel/6, get_channels/2, get_channel/3, del_channel/3]). -export([set_channel/6, get_channels/2, get_channel/3, del_channel/3]).
-export([set_participant/6, get_participant/4, get_participants/3, del_participant/4]). -export([set_participant/6, get_participant/4, get_participants/3, del_participant/4]).
-export([subscribe/5, unsubscribe/4, unsubscribe/5, get_subscribed/4]). -export([subscribe/5, unsubscribe/4, unsubscribe/5, get_subscribed/4]).
-export([sql_schemas/0]).
-include("logger.hrl"). -include("logger.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -35,10 +36,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_mqtt_sql.erl
View File

@ -25,6 +25,7 @@
-export([init/0]). -export([init/0]).
-export([subscribe/4, unsubscribe/2, find_subscriber/2]). -export([subscribe/4, unsubscribe/2, find_subscriber/2]).
-export([open_session/1, close_session/1, lookup_session/1, get_sessions/2]). -export([open_session/1, close_session/1, lookup_session/1, get_sessions/2]).
-export([sql_schemas/0]).
-include("logger.hrl"). -include("logger.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -37,10 +38,10 @@ init() ->
{error, db_failure}. {error, db_failure}.
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_muc_sql.erl
View File

@ -42,6 +42,7 @@
find_online_room_by_pid/2, remove_user/2]). find_online_room_by_pid/2, remove_user/2]).
-export([set_affiliation/6, set_affiliations/4, get_affiliation/5, -export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
get_affiliations/3, search_affiliation/4]). get_affiliations/3, search_affiliation/4]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/jid.hrl"). -include_lib("xmpp/include/jid.hrl").
-include("mod_muc.hrl"). -include("mod_muc.hrl").
@ -52,7 +53,7 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, Opts) -> init(Host, Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
case gen_mod:ram_db_mod(Opts, mod_muc) of case gen_mod:ram_db_mod(Opts, mod_muc) of
?MODULE -> ?MODULE ->
clean_tables(Host); clean_tables(Host);
@ -60,7 +61,7 @@ init(Host, Opts) ->
ok ok
end. end.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_offline_sql.erl
View File

@ -31,6 +31,7 @@
remove_old_messages/2, remove_user/2, read_message_headers/2, remove_old_messages/2, remove_user/2, read_message_headers/2,
read_message/3, remove_message/3, read_all_messages/2, read_message/3, remove_message/3, read_all_messages/2,
remove_all_messages/2, count_messages/2, import/1, export/1, remove_old_messages_batch/3]). remove_all_messages/2, count_messages/2, import/1, export/1, remove_old_messages_batch/3]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
-include("mod_offline.hrl"). -include("mod_offline.hrl").
@ -41,10 +42,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

6
src/mod_privacy_sql.erl
View File

@ -34,6 +34,8 @@
-export([item_to_raw/1, raw_to_item/1]). -export([item_to_raw/1, raw_to_item/1]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
-include("mod_privacy.hrl"). -include("mod_privacy.hrl").
-include("logger.hrl"). -include("logger.hrl").
@ -43,10 +45,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_private_sql.erl
View File

@ -28,6 +28,7 @@
%% API %% API
-export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2, -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
import/3, export/1]). import/3, export/1]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
-include("mod_private.hrl"). -include("mod_private.hrl").
@ -38,10 +39,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_proxy65_sql.erl
View File

@ -26,6 +26,7 @@
%% API %% API
-export([init/0, register_stream/2, unregister_stream/1, activate_stream/4]). -export([init/0, register_stream/2, unregister_stream/1, activate_stream/4]).
-export([sql_schemas/0]).
-include("logger.hrl"). -include("logger.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -35,7 +36,7 @@
%%%=================================================================== %%%===================================================================
init() -> init() ->
ejabberd_sql_schema:update_schema( ejabberd_sql_schema:update_schema(
ejabberd_config:get_myname(), ?MODULE, schemas()), ejabberd_config:get_myname(), ?MODULE, sql_schemas()),
NodeS = erlang:atom_to_binary(node(), latin1), NodeS = erlang:atom_to_binary(node(), latin1),
?DEBUG("Cleaning SQL 'proxy65' table...", []), ?DEBUG("Cleaning SQL 'proxy65' table...", []),
case ejabberd_sql:sql_query( case ejabberd_sql:sql_query(
@ -49,7 +50,7 @@ init() ->
Err Err
end. end.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_pubsub_sql.erl
View File

@ -20,6 +20,7 @@
%% API %% API
-export([init/3]). -export([init/3]).
-export([sql_schemas/0]).
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -27,13 +28,13 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(_Host, ServerHost, _Opts) -> init(_Host, ServerHost, _Opts) ->
ejabberd_sql_schema:update_schema(ServerHost, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(ServerHost, ?MODULE, sql_schemas()),
ok. ok.
%%%=================================================================== %%%===================================================================
%%% Internal functions %%% Internal functions
%%%=================================================================== %%%===================================================================
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_push_sql.erl
View File

@ -30,6 +30,7 @@
-export([init/2, store_session/6, lookup_session/4, lookup_session/3, -export([init/2, store_session/6, lookup_session/4, lookup_session/3,
lookup_sessions/3, lookup_sessions/2, lookup_sessions/1, lookup_sessions/3, lookup_sessions/2, lookup_sessions/1,
delete_session/3, delete_old_sessions/2, export/1]). delete_session/3, delete_old_sessions/2, export/1]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
-include("logger.hrl"). -include("logger.hrl").
@ -40,10 +41,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_roster_sql.erl
View File

@ -34,6 +34,7 @@
update_roster/4, del_roster/3, transaction/2, update_roster/4, del_roster/3, transaction/2,
process_rosteritems/5, process_rosteritems/5,
import/3, export/1, raw_to_record/2]). import/3, export/1, raw_to_record/2]).
-export([sql_schemas/0]).
-include("mod_roster.hrl"). -include("mod_roster.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").
@ -44,10 +45,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_shared_roster_sql.erl
View File

@ -34,6 +34,7 @@
get_user_displayed_groups/3, is_user_in_group/3, get_user_displayed_groups/3, is_user_in_group/3,
add_user_to_group/3, remove_user_from_group/3, import/3, add_user_to_group/3, remove_user_from_group/3, import/3,
export/1]). export/1]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/jid.hrl"). -include_lib("xmpp/include/jid.hrl").
-include("mod_roster.hrl"). -include("mod_roster.hrl").
@ -44,10 +45,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =

5
src/mod_vcard_sql.erl
View File

@ -31,6 +31,7 @@
-export([init/2, stop/1, get_vcard/2, set_vcard/4, search/4, remove_user/2, -export([init/2, stop/1, get_vcard/2, set_vcard/4, search/4, remove_user/2,
search_fields/1, search_reported/1, import/3, export/1]). search_fields/1, search_reported/1, import/3, export/1]).
-export([is_search_supported/1]). -export([is_search_supported/1]).
-export([sql_schemas/0]).
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
-include("mod_vcard.hrl"). -include("mod_vcard.hrl").
@ -42,10 +43,10 @@
%%% API %%% API
%%%=================================================================== %%%===================================================================
init(Host, _Opts) -> init(Host, _Opts) ->
ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()), ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
ok. ok.
schemas() -> sql_schemas() ->
[#sql_schema{ [#sql_schema{
version = 1, version = 1,
tables = tables =