From d6a9ef5bc107cb5668de5c1c48a8cceac92a86c0 Mon Sep 17 00:00:00 2001 From: Jerome Sautret Date: Tue, 28 Feb 2017 12:19:07 +0100 Subject: [PATCH] Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266) --- src/ejabberd_sql.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ejabberd_sql.erl b/src/ejabberd_sql.erl index 46dd68297..51ff9d436 100644 --- a/src/ejabberd_sql.erl +++ b/src/ejabberd_sql.erl @@ -576,7 +576,8 @@ sql_query_internal(Query) -> to_odbc(odbc:sql_query(State#state.db_ref, [Query], (?TRANSACTION_TIMEOUT) - 1000)); 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 -> R = mysql_to_odbc(p1_mysql_conn:squery(State#state.db_ref, [Query], self(),