25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-02 16:37:52 +01:00

* src/odbc/odbc_queries.erl: Fix empty query that fails on MySQL (merged from trunk).

SVN Revision: 1598
This commit is contained in:
Jérôme Sautret 2008-10-03 15:47:30 +00:00
parent c9aef303a2
commit 096825fc55
2 changed files with 11 additions and 7 deletions

View File

@ -1,3 +1,7 @@
2008-10-03 Jerome Sautret <jerome.sautret@process-one.net>
* src/odbc/odbc_queries.erl: Fix empty query that fails on MySQL (merged from trunk).
2008-10-01 Mickael Remond <mremond@process-one.net> 2008-10-01 Mickael Remond <mremond@process-one.net>
* src/mod_shared_roster.erl: Correct roster push when changing * src/mod_shared_roster.erl: Correct roster push when changing

View File

@ -327,11 +327,11 @@ update_roster_sql(Username, SJID, ItemVals, ItemGroups) ->
" values (", ItemVals, ");"], " values (", ItemVals, ");"],
["delete from rostergroups " ["delete from rostergroups "
" where username='", Username, "' " " where username='", Username, "' "
" and jid='", SJID, "';"], " and jid='", SJID, "';"]] ++
[["insert into rostergroups(" [["insert into rostergroups("
" username, jid, grp) " " username, jid, grp) "
" values (", ItemGroup, ");"] || " values (", ItemGroup, ");"] ||
ItemGroup <- ItemGroups]]. ItemGroup <- ItemGroups].
roster_subscribe(_LServer, Username, SJID, ItemVals) -> roster_subscribe(_LServer, Username, SJID, ItemVals) ->
ejabberd_odbc:sql_query_t( ejabberd_odbc:sql_query_t(