aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2005-10-15 19:50:02 +0000
committerAlexey Shchepin <alexey@process-one.net>2005-10-15 19:50:02 +0000
commit590b2c9348c2636206d7f8561efdcc4582e37f5b (patch)
treed621ee9533c276b0aa1bfd7c1058095925fa7404
parent* src/mod_roster_odbc.erl: Bugfix (diff)
* src/ejabberd_auth_odbc.erl: Minor fix
* src/odbc/ejabberd_odbc.erl: Updated pgsql support SVN Revision: 421
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd_auth_odbc.erl2
-rw-r--r--src/odbc/ejabberd_odbc.erl2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 817f42535..b955e6d3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-10-15 Alexey Shchepin <alexey@sevcom.net>
+ * src/ejabberd_auth_odbc.erl: Minor fix
+
+ * src/odbc/ejabberd_odbc.erl: Updated pgsql support
+
* src/mod_roster_odbc.erl: Bugfix
* src/ejabberd_c2s.erl: Updated to work correctly with
diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl
index 0622b6f07..3a76d283c 100644
--- a/src/ejabberd_auth_odbc.erl
+++ b/src/ejabberd_auth_odbc.erl
@@ -111,7 +111,7 @@ try_register(User, Server, Password) ->
jlib:nameprep(Server),
["insert into users(username, password) "
"values ('", Username, "', '", Pass, "')"]) of
- {updated, _} ->
+ {updated, 1} ->
{atomic, ok};
_ ->
{atomic, exists}
diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index edb865079..7b91abc8a 100644
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -153,6 +153,8 @@ pgsql_item_to_odbc("INSERT " ++ OIDN) ->
{updated, list_to_integer(N)};
pgsql_item_to_odbc("DELETE " ++ N) ->
{updated, list_to_integer(N)};
+pgsql_item_to_odbc({error, Error}) ->
+ {error, Error};
pgsql_item_to_odbc(_) ->
{updated,undefined}.