diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-21 14:52:43 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-21 14:52:43 +0100 |
| commit | 69b0605179de0b6ca719732d3d05e796816e0cad (patch) | |
| tree | 85a3c7b4d4efadd9c68b69eac3178dca98372e19 /plugins | |
| parent | 26f7bd10b05b0d95d6f8c588463e5c93382cdd75 (diff) | |
| parent | c00adb21f49071216704b0c304da2fb4f52f81d4 (diff) | |
| download | prosody-69b0605179de0b6ca719732d3d05e796816e0cad.tar.gz prosody-69b0605179de0b6ca719732d3d05e796816e0cad.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_storage_sql.lua | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 70f1ab83..4f46b3f6 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -82,16 +82,14 @@ local function keyval_store_set(data) local extradata = {}; for key, value in pairs(data) do if type(key) == "string" and key ~= "" then - local t, value = serialize(value); - assert(t, value); + local t, value = assert(serialize(value)); engine:insert("INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)", host, user or "", store, key, t, value); else extradata[key] = value; end end if next(extradata) ~= nil then - local t, extradata = serialize(extradata); - assert(t, extradata); + local t, extradata = assert(serialize(extradata)); engine:insert("INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)", host, user or "", store, "", t, extradata); end end @@ -197,7 +195,7 @@ function archive_store:append(username, key, value, when, with) else key = uuid.generate(); end - local t, value = serialize(value); + local t, value = assert(serialize(value)); engine:insert("INSERT INTO `prosodyarchive` (`host`, `user`, `store`, `when`, `with`, `key`, `type`, `value`) VALUES (?,?,?,?,?,?,?,?)", host, user or "", store, when, with, key, t, value); return key; end); |