Merge 0.9->0.10

[prosody.git] / plugins / mod_storage_sql2.lua

diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index dcd7a45a5d81550bd9566b76077f8037c08f493e..7a2ec4a76e9fa307eec850adab21ee921f35220b 100644 (file)
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -27,7 +27,7 @@ local engine; -- TODO create engine
 
 local function create_table()
        local Table,Column,Index = mod_sql.Table,mod_sql.Column,mod_sql.Index;
-       --[[
+
        local ProsodyTable = Table {
                name="prosody";
                Column { name="host", type="TEXT", nullable=false };
@@ -40,31 +40,11 @@ local function create_table()
        };
        engine:transaction(function()
                ProsodyTable:create(engine);
-       end);]]
-
-       local create_sql = "CREATE TABLE `prosody` (`host` TEXT, `user` TEXT, `store` TEXT, `key` TEXT, `type` TEXT, `value` TEXT);";
-       if params.driver == "PostgreSQL" then
-               create_sql = create_sql:gsub("`", "\"");
-       elseif params.driver == "MySQL" then
-               create_sql = create_sql:gsub("`value` TEXT", "`value` MEDIUMTEXT")
-                       :gsub(";$", " CHARACTER SET 'utf8' COLLATE 'utf8_bin';");
-       end
-
-       local index_sql = "CREATE INDEX `prosody_index` ON `prosody` (`host`, `user`, `store`, `key`)";
-       if params.driver == "PostgreSQL" then
-               index_sql = index_sql:gsub("`", "\"");
-       elseif params.driver == "MySQL" then
-               index_sql = index_sql:gsub("`([,)])", "`(20)%1");
-       end
-
-       local success,err = engine:transaction(function()
-               engine:execute(create_sql);
-               engine:execute(index_sql);
        end);
 
        local ProsodyArchiveTable = Table {
                name="prosodyarchive";
-               Column { name="sort_id", type="INTEGER PRIMARY KEY AUTOINCREMENT", nullable=false };
+               Column { name="sort_id", type="INTEGER", primary_key=true, auto_increment=true };
                Column { name="host", type="TEXT", nullable=false };
                Column { name="user", type="TEXT", nullable=false };
                Column { name="store", type="TEXT", nullable=false };
@@ -73,7 +53,7 @@ local function create_table()
                Column { name="with", type="TEXT", nullable=false }; -- related id
                Column { name="type", type="TEXT", nullable=false };
                Column { name="value", type="MEDIUMTEXT", nullable=false };
-               Index { name="prosodyarchive_index", "host", "user", "store", "key" };
+               Index { name="prosodyarchive_index", unique = true, "host", "user", "store", "key" };
        };
        engine:transaction(function()
                ProsodyArchiveTable:create(engine);
@@ -236,10 +216,17 @@ end
 
 local archive_store = {}
 archive_store.__index = archive_store
-function archive_store:append(username, when, with, value)
+function archive_store:append(username, key, when, with, value)
+       if value == nil then -- COMPAT early versions
+               when, with, value, key = key, when, with, value
+       end
        local user,store = username,self.store;
        return engine:transaction(function()
-               local key = uuid.generate();
+               if key then
+                       engine:delete("DELETE FROM `prosodyarchive` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=?", host, user or "", store, key);
+               else
+                       key = uuid.generate();
+               end
                local t, value = 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;
@@ -259,7 +246,7 @@ local function archive_where(query, args, where)
                if query.start then
                        where[#where] = "`when` BETWEEN ? AND ?" -- is this inclusive?
                else
-                       where[#where+1] = "`when` >= ?"
+                       where[#where+1] = "`when` <= ?"
                end
        end
 
@@ -276,14 +263,16 @@ local function archive_where(query, args, where)
        end
 end
 local function archive_where_id_range(query, args, where)
+       local args_len = #args
        -- Before or after specific item, exclusive
        if query.after then  -- keys better be unique!
-               where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? LIMIT 1)"
-               args[#args+1] = query.after
+               where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ? AND `user` = ? AND `store` = ? LIMIT 1)"
+               args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.after, args[1], args[2], args[3];
+               args_len = args_len + 4
        end
        if query.before then
-               where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? LIMIT 1)"
-               args[#args+1] = query.before
+               where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ? AND `user` = ? AND `store` = ? LIMIT 1)"
+               args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.before, args[1], args[2], args[3];
        end
 end
 
@@ -336,6 +325,10 @@ function archive_store:delete(username, query)
                local sql_query = "DELETE FROM `prosodyarchive` WHERE %s;";
                local args = { host, user or "", store, };
                local where = { "`host` = ?", "`user` = ?", "`store` = ?", };
+               if user == true then
+                       table.remove(args, 2);
+                       table.remove(where, 2);
+               end
                archive_where(query, args, where);
                archive_where_id_range(query, args, where);
                sql_query = sql_query:format(t_concat(where, " AND "));