diff options
Diffstat (limited to 'src/ejabberd_sm_sql.erl')
| -rw-r--r-- | src/ejabberd_sm_sql.erl | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/ejabberd_sm_sql.erl b/src/ejabberd_sm_sql.erl index dfc0eb2a1..3d4e224d4 100644 --- a/src/ejabberd_sm_sql.erl +++ b/src/ejabberd_sm_sql.erl @@ -29,11 +29,11 @@ %%%=================================================================== -spec init() -> ok | {error, any()}. init() -> - Node = ejabberd_odbc:escape(jlib:atom_to_binary(node())), + Node = ejabberd_sql:escape(jlib:atom_to_binary(node())), ?INFO_MSG("Cleaning SQL SM table...", []), lists:foldl( fun(Host, ok) -> - case ejabberd_odbc:sql_query( + case ejabberd_sql:sql_query( Host, [<<"delete from sm where node='">>, Node, <<"'">>]) of {updated, _} -> ok; @@ -47,14 +47,14 @@ init() -> set_session(#session{sid = {Now, Pid}, usr = {U, LServer, R}, priority = Priority, info = Info}) -> - Username = ejabberd_odbc:escape(U), - Resource = ejabberd_odbc:escape(R), - InfoS = ejabberd_odbc:encode_term(Info), + Username = ejabberd_sql:escape(U), + Resource = ejabberd_sql:escape(R), + InfoS = ejabberd_sql:encode_term(Info), PrioS = enc_priority(Priority), TS = now_to_timestamp(Now), PidS = list_to_binary(erlang:pid_to_list(Pid)), - Node = ejabberd_odbc:escape(jlib:atom_to_binary(node(Pid))), - case odbc_queries:update( + Node = ejabberd_sql:escape(jlib:atom_to_binary(node(Pid))), + case sql_queries:update( LServer, <<"sm">>, [<<"usec">>, <<"pid">>, <<"node">>, <<"username">>, @@ -70,12 +70,12 @@ set_session(#session{sid = {Now, Pid}, usr = {U, LServer, R}, delete_session(_LUser, LServer, _LResource, {Now, Pid}) -> TS = now_to_timestamp(Now), PidS = list_to_binary(erlang:pid_to_list(Pid)), - case ejabberd_odbc:sql_query( + case ejabberd_sql:sql_query( LServer, [<<"select usec, pid, username, resource, priority, info ">>, <<"from sm where usec='">>, TS, <<"' and pid='">>,PidS, <<"'">>]) of {selected, _, [Row]} -> - ejabberd_odbc:sql_query( + ejabberd_sql:sql_query( LServer, [<<"delete from sm where usec='">>, TS, <<"' and pid='">>, PidS, <<"'">>]), {ok, row_to_session(LServer, Row)}; @@ -93,7 +93,7 @@ get_sessions() -> end, ejabberd_sm:get_vh_by_backend(?MODULE)). get_sessions(LServer) -> - case ejabberd_odbc:sql_query( + case ejabberd_sql:sql_query( LServer, [<<"select usec, pid, username, ">>, <<"resource, priority, info from sm">>]) of {selected, _, Rows} -> @@ -104,8 +104,8 @@ get_sessions(LServer) -> end. get_sessions(LUser, LServer) -> - Username = ejabberd_odbc:escape(LUser), - case ejabberd_odbc:sql_query( + Username = ejabberd_sql:escape(LUser), + case ejabberd_sql:sql_query( LServer, [<<"select usec, pid, username, ">>, <<"resource, priority, info from sm where ">>, <<"username='">>, Username, <<"'">>]) of @@ -117,9 +117,9 @@ get_sessions(LUser, LServer) -> end. get_sessions(LUser, LServer, LResource) -> - Username = ejabberd_odbc:escape(LUser), - Resource = ejabberd_odbc:escape(LResource), - case ejabberd_odbc:sql_query( + Username = ejabberd_sql:escape(LUser), + Resource = ejabberd_sql:escape(LResource), + case ejabberd_sql:sql_query( LServer, [<<"select usec, pid, username, ">>, <<"resource, priority, info from sm where ">>, <<"username='">>, Username, <<"' and resource='">>, @@ -162,7 +162,7 @@ row_to_session(LServer, [USec, PidS, User, Resource, PrioS, InfoS]) -> Now = timestamp_to_now(USec), Pid = erlang:list_to_pid(binary_to_list(PidS)), Priority = dec_priority(PrioS), - Info = ejabberd_odbc:decode_term(InfoS), + Info = ejabberd_sql:decode_term(InfoS), #session{sid = {Now, Pid}, us = {User, LServer}, usr = {User, LServer, Resource}, priority = Priority, |