projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ejabberdsql2prosody: Allow for multiple INSERTs to the same table
[prosody.git]
/
tools
/
ejabberdsql2prosody.lua
diff --git
a/tools/ejabberdsql2prosody.lua
b/tools/ejabberdsql2prosody.lua
index def3a907351f693863d756bed573657ad3a73aa5..5b9752692eea59d272c8257b188ae7474851fb92 100644
(file)
--- a/
tools/ejabberdsql2prosody.lua
+++ b/
tools/ejabberdsql2prosody.lua
@@
-136,7
+136,14
@@
local function readFile(filename)
while true do
local tname, tuples = readInsert();
if tname then
while true do
local tname, tuples = readInsert();
if tname then
- t[tname] = tuples;
+ if t[name] then
+ local t_name = t[name];
+ for i=1,#tuples do
+ table.insert(t_name, tuples[i]);
+ end
+ else
+ t[tname] = tuples;
+ end
elseif peek() == nil then
break;
end
elseif peek() == nil then
break;
end
@@
-214,7
+221,7
@@
end
function roster_group(node, host, jid, group)
local roster = dm.load(node, host, "roster") or {};
local item = roster[jid];
function roster_group(node, host, jid, group)
local roster = dm.load(node, host, "roster") or {};
local item = roster[jid];
- if not item then print("Warning: No roster item "..jid.." for user "..
user
..", can't put in group "..group); return; end
+ if not item then print("Warning: No roster item "..jid.." for user "..
node
..", can't put in group "..group); return; end
item.groups[group] = true;
local ret, err = dm.store(node, host, "roster", roster);
print("["..(err or "success").."] roster-group: " ..node.."@"..host.." - "..jid.." - "..group);
item.groups[group] = true;
local ret, err = dm.store(node, host, "roster", roster);
print("["..(err or "success").."] roster-group: " ..node.."@"..host.." - "..jid.." - "..group);