diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2016-02-12 16:25:09 +0300 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2016-03-02 00:12:11 +0300 |
| commit | 99255631ddca2fbae2642bb7edcc35c7fe7458da (patch) | |
| tree | 8ab8954f5c472705bb4ae6fcec753e09b1af4316 /src/odbc_queries.erl | |
| parent | Use 'any' to match any DBMS in sql_query (diff) | |
Updated some mod_offline SQL queries to the new API
Diffstat (limited to 'src/odbc_queries.erl')
| -rw-r--r-- | src/odbc_queries.erl | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/odbc_queries.erl b/src/odbc_queries.erl index 2f488a0bd..ee8fa1690 100644 --- a/src/odbc_queries.erl +++ b/src/odbc_queries.erl @@ -25,6 +25,8 @@ -module(odbc_queries). +-compile([{parse_transform, ejabberd_sql_pt}]). + -behaviour(ejabberd_config). -author("mremond@process-one.net"). @@ -60,6 +62,7 @@ -include("ejabberd.hrl"). -include("logger.hrl"). +-include("ejabberd_sql_pt.hrl"). %% Almost a copy of string:join/2. %% We use this version because string:join/2 is relatively @@ -291,23 +294,22 @@ add_spool_sql(Username, XML) -> add_spool(LServer, Queries) -> ejabberd_odbc:sql_transaction(LServer, Queries). -get_and_del_spool_msg_t(LServer, Username) -> +get_and_del_spool_msg_t(LServer, LUser) -> F = fun () -> Result = - ejabberd_odbc:sql_query_t([<<"select username, xml from spool where " - "username='">>, - Username, - <<"' order by seq;">>]), - ejabberd_odbc:sql_query_t([<<"delete from spool where username='">>, - Username, <<"';">>]), + ejabberd_odbc:sql_query_t( + ?SQL("select @(username)s, @(xml)s from spool where " + "username=%(LUser)s order by seq;")), + ejabberd_odbc:sql_query_t( + ?SQL("delete from spool where username=%(LUser)s;")), Result end, ejabberd_odbc:sql_transaction(LServer, F). -del_spool_msg(LServer, Username) -> - ejabberd_odbc:sql_query(LServer, - [<<"delete from spool where username='">>, Username, - <<"';">>]). +del_spool_msg(LServer, LUser) -> + ejabberd_odbc:sql_query( + LServer, + ?SQL("delete from spool where username=%(LUser)s")). get_roster(LServer, Username) -> ejabberd_odbc:sql_query(LServer, |