diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-09 01:25:58 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-09 01:25:58 +0200 |
| commit | fcca450715b5ccb94002dc9dd2babfe214955f4b (patch) | |
| tree | a7e90b6f576bc528b0ad1033667f07f208df5497 /tools | |
| parent | 0bdb7ab1f9104098e894c2acd033bc205081f61a (diff) | |
| parent | 6dee387e59b090d0244d322fdf8e6a2077f2ef39 (diff) | |
| download | prosody-fcca450715b5ccb94002dc9dd2babfe214955f4b.tar.gz prosody-fcca450715b5ccb94002dc9dd2babfe214955f4b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/migration/migrator/prosody_sql.lua | 2 |
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 |