Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-14 22:00:16 +02:00
Code Releases Activity

Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266)

Browse Source
This commit is contained in:
Jerome Sautret 2017-02-28 12:19:07 +01:00
parent ac74b7dca1
commit d6a9ef5bc1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ejabberd_sql.erl
View File

@ -576,7 +576,8 @@ sql_query_internal(Query) ->
to_odbc(odbc:sql_query(State#state.db_ref, [Query], to_odbc(odbc:sql_query(State#state.db_ref, [Query],
(?TRANSACTION_TIMEOUT) - 1000)); (?TRANSACTION_TIMEOUT) - 1000));
pgsql -> pgsql ->
pgsql_to_odbc(pgsql:squery(State#state.db_ref, Query)); pgsql_to_odbc(pgsql:squery(State#state.db_ref, Query,
(?TRANSACTION_TIMEOUT) - 1000));
mysql -> mysql ->
R = mysql_to_odbc(p1_mysql_conn:squery(State#state.db_ref, R = mysql_to_odbc(p1_mysql_conn:squery(State#state.db_ref,
[Query], self(), [Query], self(),