aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-09 01:25:58 +0200
committerKim Alvefur <zash@zash.se>2017-04-09 01:25:58 +0200
commitf01822fbfc55fa0cdde361c179f02b044ceb7bcf (patch)
treea7e90b6f576bc528b0ad1033667f07f208df5497 /tools
parentf2f1aa7473e3e9c668a77044c93560e3c914cc50 (diff)
parent54fea3aeec367884bd249ca317662eac07c66861 (diff)
downloadprosody-f01822fbfc55fa0cdde361c179f02b044ceb7bcf.tar.gz
prosody-f01822fbfc55fa0cdde361c179f02b044ceb7bcf.zip
Merge 0.10->trunk
Diffstat (limited to 'tools')
-rw-r--r--tools/migration/migrator/prosody_sql.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/migration/migrator/prosody_sql.lua b/tools/migration/migrator/prosody_sql.lua
index 3324c819..eed499d2 100644
--- a/tools/migration/migrator/prosody_sql.lua
+++ b/tools/migration/migrator/prosody_sql.lua
@@ -161,7 +161,7 @@ local function writer(output, iter)
local insert_sql = "INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)";
return function(item)
- if not item then return end -- end of input
+ if not item then assert(engine.conn:commit()) return end -- end of input
local host = item.host or "";
local user = item.user or "";
for store, data in pairs(item.stores) do