aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolay Bondarenko <misterionkell@gmail.com>2014-08-08 13:39:44 +0400
committerNikolay Bondarenko <misterionkell@gmail.com>2014-08-08 13:39:44 +0400
commit5d0de39127d973d2176361d57fe2cb89417eb657 (patch)
treec6588bcad6b1452920f6dccb578ff50aab9dda4a
parentmod_offline now uses gen_server (diff)
parentFix odbc update_t and update insert case return value (diff)
Merge pull request #1 from vesvalo/master
Fix odbc update_t and update insert case return value
-rw-r--r--src/odbc_queries.erl16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/odbc_queries.erl b/src/odbc_queries.erl
index e0637f840..09549c0a2 100644
--- a/src/odbc_queries.erl
+++ b/src/odbc_queries.erl
@@ -97,10 +97,14 @@ update_t(Table, Fields, Vals, Where) ->
of
{updated, 1} -> ok;
_ ->
- ejabberd_odbc:sql_query_t([<<"insert into ">>, Table,
+ Res = ejabberd_odbc:sql_query_t([<<"insert into ">>, Table,
<<"(">>, join(Fields, <<", ">>),
<<") values ('">>, join(Vals, <<"', '">>),
- <<"');">>])
+ <<"');">>]),
+ case Res of
+ {updated,1} -> ok;
+ _ -> Res
+ end
end.
update(LServer, Table, Fields, Vals, Where) ->
@@ -115,10 +119,14 @@ update(LServer, Table, Fields, Vals, Where) ->
of
{updated, 1} -> ok;
_ ->
- ejabberd_odbc:sql_query(LServer,
+ Res = ejabberd_odbc:sql_query(LServer,
[<<"insert into ">>, Table, <<"(">>,
join(Fields, <<", ">>), <<") values ('">>,
- join(Vals, <<"', '">>), <<"');">>])
+ join(Vals, <<"', '">>), <<"');">>]),
+ case Res of
+ {updated,1} -> ok;
+ _ -> Res
+ end
end.
%% F can be either a fun or a list of queries