projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with 0.5
[prosody.git]
/
tools
/
ejabberdsql2prosody.lua
diff --git
a/tools/ejabberdsql2prosody.lua
b/tools/ejabberdsql2prosody.lua
index b30773317d14e07bd29dc65624dfd1b73aec8612..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