Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-02 16:37:52 +01:00
Code Releases Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
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
@ -8,7 +12,7 @@
* src/*/Makefile.win32: Provide explicit beam filenames because * src/*/Makefile.win32: Provide explicit beam filenames because
nmake does not accept wildcards (thanks to Attila nmake does not accept wildcards (thanks to Attila
Vangel)(EJAB-543) Vangel)(EJAB-543)
2008-09-29 Badlop <badlop@process-one.net> 2008-09-29 Badlop <badlop@process-one.net>
* contrib/ejabberd-modules.repo: Include 2.0.x branches * contrib/ejabberd-modules.repo: Include 2.0.x branches
@ -190,7 +194,7 @@
* src/mod_register.erl: When a registration is blocked due to IP * src/mod_register.erl: When a registration is blocked due to IP
limitation, return description in error stanza (EJAB-692) limitation, return description in error stanza (EJAB-692)
2008-07-24 Christophe Romain <christophe.romain@process-one.net> 2008-07-24 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: Allow owner to subscribe/get its own * src/mod_pubsub/mod_pubsub.erl: Allow owner to subscribe/get its own
@ -228,7 +232,7 @@
subscribing to a node sends only last items (EJAB-700) subscribing to a node sends only last items (EJAB-700)
* src/mod_pubsub/node_pep.erl: added acl and jid match on node * src/mod_pubsub/node_pep.erl: added acl and jid match on node
creation permission (EJAB-663) creation permission (EJAB-663)
* src/mod_pubsub/node_default.erl: fix node creation permission * src/mod_pubsub/node_default.erl: fix node creation permission
issue for service issue for service
2008-07-22 Badlop <badlop@process-one.net> 2008-07-22 Badlop <badlop@process-one.net>
@ -247,7 +251,7 @@
2008-07-17 Christophe Romain <christophe.romain@process-one.net> 2008-07-17 Christophe Romain <christophe.romain@process-one.net>
* src/web/Makefile.in: use -DSSL39 if compiling with R12 * src/web/Makefile.in: use -DSSL39 if compiling with R12
2008-07-16 Badlop <badlop@process-one.net> 2008-07-16 Badlop <badlop@process-one.net>
@ -255,7 +259,7 @@
2008-07-16 Alexey Shchepin <alexey@process-one.net> 2008-07-16 Alexey Shchepin <alexey@process-one.net>
* src/web/ejabberd_http_poll.erl: Report connection's IP address * src/web/ejabberd_http_poll.erl: Report connection's IP address
* src/ejabberd_c2s.erl: Rolled back the previous IP getting patch * src/ejabberd_c2s.erl: Rolled back the previous IP getting patch
* src/ejabberd_sm.erl: Likewise * src/ejabberd_sm.erl: Likewise

4
src/odbc/odbc_queries.erl
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(