summaryrefslogtreecommitdiff
path: root/src/ejabberd_sql.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_sql.erl')
-rw-r--r--src/ejabberd_sql.erl24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/ejabberd_sql.erl b/src/ejabberd_sql.erl
index 39c2eab7..446f4951 100644
--- a/src/ejabberd_sql.erl
+++ b/src/ejabberd_sql.erl
@@ -1005,22 +1005,14 @@ sqlite_to_odbc(_Host, _) ->
%% Open a database connection to PostgreSQL
pgsql_connect(Server, Port, DB, Username, Password, ConnectTimeout,
Transport, SSLOpts) ->
- case pgsql:connect([{host, Server},
- {database, DB},
- {user, Username},
- {password, Password},
- {port, Port},
- {transport, Transport},
- {connect_timeout, ConnectTimeout},
- {as_binary, true}|SSLOpts]) of
- {ok, Ref} ->
- pgsql:squery(Ref, [<<"alter database \"">>, DB, <<"\" set ">>,
- <<"standard_conforming_strings='off';">>]),
- pgsql:squery(Ref, [<<"set standard_conforming_strings to 'off';">>]),
- {ok, Ref};
- Err ->
- Err
- end.
+ pgsql:connect([{host, Server},
+ {database, DB},
+ {user, Username},
+ {password, Password},
+ {port, Port},
+ {transport, Transport},
+ {connect_timeout, ConnectTimeout},
+ {as_binary, true}|SSLOpts]).
%% Convert PostgreSQL query result to Erlang ODBC result formalism
pgsql_to_odbc({ok, PGSQLResult}) ->