From: Jerome Sautret <jerome.sautret@process-one.net>
Date: Tue, 28 Feb 2017 11:19:07 +0000 (+0100)
Subject: Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266)
X-Git-Tag: 17.03~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6a9ef5bc107cb5668de5c1c48a8cceac92a86c0;p=ejabberd

Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266)
---

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(),