aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-03-31 19:08:16 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-03-31 19:08:16 +0300
commit178a0a3e1b7d685b5fb85411304dba8ea86ac50c (patch)
treecd7dc412b28fa55f49c7f6840d8754cf925ee4c6
parentAdd Redis as mod_proxy65 RAM backend (diff)
parentAdd ejabberd_sql:abort/1 and ejabberd_sql:restart/1 (diff)
Merge branch 'master' of github.com:processone/ejabberd
-rw-r--r--src/ejabberd_sql.erl8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ejabberd_sql.erl b/src/ejabberd_sql.erl
index ab0601a6c..b9dbbe7ce 100644
--- a/src/ejabberd_sql.erl
+++ b/src/ejabberd_sql.erl
@@ -39,6 +39,8 @@
sql_query_t/1,
sql_transaction/2,
sql_bloc/2,
+ abort/1,
+ restart/1,
sql_query_to_iolist/1,
escape/1,
standard_escape/1,
@@ -190,6 +192,12 @@ sql_query_t(Query) ->
_ -> QRes
end.
+abort(Reason) ->
+ exit(Reason).
+
+restart(Reason) ->
+ throw({aborted, Reason}).
+
%% Escape character that will confuse an SQL engine
escape(S) ->
<< <<(sql_queries:escape(Char))/binary>> || <<Char>> <= S >>.