prosody
d0ab0069145f
plugins/mod_storage_sql2.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

plugins/mod_storage_sql2.lua @ 6916:d0ab0069145f

sessionmanager: Demote write error to debug message
author Kim Alvefur <zash@zash.se>
date Thu, 05 Nov 2015 13:35:16 +0100
parent 6761:b20efae224c9
child 6767:d01c29b62b16
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 local json = require "util.json";
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
3 local sql = require "util.sql";
5735
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
4 local xml_parse = require "util.xml".parse;
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
5 local uuid = require "util.uuid";
6165
6a184b16b717 core.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import from util.paths
Kim Alvefur <zash@zash.se>
parents: 6060
diff changeset
6 local resolve_relative_path = require "util.paths".resolve_relative_path;
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7
5735
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
8 local stanza_mt = require"util.stanza".stanza_mt;
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
9 local getmetatable = getmetatable;
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
10 local t_concat = table.concat;
5735
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
11 local function is_stanza(x) return getmetatable(x) == stanza_mt; end
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
12
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
13 local noop = function() end
5733
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
14 local unpack = unpack
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
15 local function iterator(result)
6754
c72b00dade25 mod_storage_sql2: Rename variable to avoid name clash
Matthew Wild <mwild1@gmail.com>
parents: 6746
diff changeset
16 return function(result_)
c72b00dade25 mod_storage_sql2: Rename variable to avoid name clash
Matthew Wild <mwild1@gmail.com>
parents: 6746
diff changeset
17 local row = result_();
5733
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
18 if row ~= nil then
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
19 return unpack(row);
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
20 end
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
21 end, result, nil;
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
22 end
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
23
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
24 local default_params = { driver = "SQLite3" };
5883
39b187e7e892 mod_storage_sql2, util.sql: Move code for setting encoding to util.sql
Kim Alvefur <zash@zash.se>
parents: 5882
diff changeset
25
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
26 local engine;
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
27
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
28 local function serialize(value)
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
29 local t = type(value);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
30 if t == "string" or t == "boolean" or t == "number" then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
31 return t, tostring(value);
5735
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
32 elseif is_stanza(value) then
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
33 return "xml", tostring(value);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
34 elseif t == "table" then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
35 local value,err = json.encode(value);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
36 if value then return "json", value; end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
37 return nil, err;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
38 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
39 return nil, "Unhandled value type: "..t;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
40 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
41 local function deserialize(t, value)
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
42 if t == "string" then return value;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
43 elseif t == "boolean" then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
44 if value == "true" then return true;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
45 elseif value == "false" then return false; end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
46 elseif t == "number" then return tonumber(value);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
47 elseif t == "json" then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
48 return json.decode(value);
5735
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
49 elseif t == "xml" then
24f4e73645fe mod_storage_sql2: Support XML serialization for stanzas.
Kim Alvefur <zash@zash.se>
parents: 5734
diff changeset
50 return xml_parse(value);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
51 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
52 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
53
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
54 local host = module.host;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
55 local user, store;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
56
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
57 local function keyval_store_get()
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
58 local haveany;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
59 local result = {};
5732
4aa1d6f5083a mod_storage_sql2: Make sure the user field is not NULL
Kim Alvefur <zash@zash.se>
parents: 5711
diff changeset
60 for row in engine:select("SELECT `key`,`type`,`value` FROM `prosody` WHERE `host`=? AND `user`=? AND `store`=?", host, user or "", store) do
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
61 haveany = true;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
62 local k = row[1];
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
63 local v = deserialize(row[2], row[3]);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
64 if k and v then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
65 if k ~= "" then result[k] = v; elseif type(v) == "table" then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
66 for a,b in pairs(v) do
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
67 result[a] = b;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
68 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
69 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
70 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
71 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
72 if haveany then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
73 return result;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
74 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
75 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
76 local function keyval_store_set(data)
5732
4aa1d6f5083a mod_storage_sql2: Make sure the user field is not NULL
Kim Alvefur <zash@zash.se>
parents: 5711
diff changeset
77 engine:delete("DELETE FROM `prosody` WHERE `host`=? AND `user`=? AND `store`=?", host, user or "", store);
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5765
diff changeset
78
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
79 if data and next(data) ~= nil then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
80 local extradata = {};
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
81 for key, value in pairs(data) do
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
82 if type(key) == "string" and key ~= "" then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
83 local t, value = serialize(value);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
84 assert(t, value);
5732
4aa1d6f5083a mod_storage_sql2: Make sure the user field is not NULL
Kim Alvefur <zash@zash.se>
parents: 5711
diff changeset
85 engine:insert("INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)", host, user or "", store, key, t, value);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
86 else
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
87 extradata[key] = value;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
88 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
89 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
90 if next(extradata) ~= nil then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
91 local t, extradata = serialize(extradata);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
92 assert(t, extradata);
5732
4aa1d6f5083a mod_storage_sql2: Make sure the user field is not NULL
Kim Alvefur <zash@zash.se>
parents: 5711
diff changeset
93 engine:insert("INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)", host, user or "", store, "", t, extradata);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
94 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
95 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
96 return true;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
97 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
98
6736
4aee55c0cc5c mod_storage_sql2: Add some comments
Matthew Wild <mwild1@gmail.com>
parents: 6532
diff changeset
99 --- Key/value store API (default store type)
4aee55c0cc5c mod_storage_sql2: Add some comments
Matthew Wild <mwild1@gmail.com>
parents: 6532
diff changeset
100
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
101 local keyval_store = {};
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
102 keyval_store.__index = keyval_store;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
103 function keyval_store:get(username)
6737
9f932a31eeba mod_storage_sql2: Some reformatting and variable name improvements
Matthew Wild <mwild1@gmail.com>
parents: 6736
diff changeset
104 user, store = username, self.store;
6282
bce801e40484 mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks daurnimator)
Kim Alvefur <zash@zash.se>
parents: 6165
diff changeset
105 local ok, result = engine:transaction(keyval_store_get);
6738
845bc5ba306d mod_storage_sql2: Improve logging when database read fails
Matthew Wild <mwild1@gmail.com>
parents: 6737
diff changeset
106 if not ok then
845bc5ba306d mod_storage_sql2: Improve logging when database read fails
Matthew Wild <mwild1@gmail.com>
parents: 6737
diff changeset
107 module:log("error", "Unable to read from database %s store for %s: %s", store, username or "<host>", result);
845bc5ba306d mod_storage_sql2: Improve logging when database read fails
Matthew Wild <mwild1@gmail.com>
parents: 6737
diff changeset
108 return nil, result;
845bc5ba306d mod_storage_sql2: Improve logging when database read fails
Matthew Wild <mwild1@gmail.com>
parents: 6737
diff changeset
109 end
845bc5ba306d mod_storage_sql2: Improve logging when database read fails
Matthew Wild <mwild1@gmail.com>
parents: 6737
diff changeset
110 return result;
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
111 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
112 function keyval_store:set(username, data)
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
113 user,store = username,self.store;
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
114 return engine:transaction(function()
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
115 return keyval_store_set(data);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
116 end);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
117 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
118 function keyval_store:users()
5733
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
119 local ok, result = engine:transaction(function()
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
120 return engine:select("SELECT DISTINCT `user` FROM `prosody` WHERE `host`=? AND `store`=?", host, self.store);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
121 end);
5733
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
122 if not ok then return ok, result end
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
123 return iterator(result);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
124 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
125
6736
4aee55c0cc5c mod_storage_sql2: Add some comments
Matthew Wild <mwild1@gmail.com>
parents: 6532
diff changeset
126 --- Archive store API
4aee55c0cc5c mod_storage_sql2: Add some comments
Matthew Wild <mwild1@gmail.com>
parents: 6532
diff changeset
127
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
128 local archive_store = {}
6726
e6e80ec50030 mod_storage_sql2: Add a 'caps' table for indicating support for optional features
Kim Alvefur <zash@zash.se>
parents: 6725
diff changeset
129 archive_store.caps = {
e6e80ec50030 mod_storage_sql2: Add a 'caps' table for indicating support for optional features
Kim Alvefur <zash@zash.se>
parents: 6725
diff changeset
130 total = true;
e6e80ec50030 mod_storage_sql2: Add a 'caps' table for indicating support for optional features
Kim Alvefur <zash@zash.se>
parents: 6725
diff changeset
131 };
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
132 archive_store.__index = archive_store
6725
41725f3df3cc mod_storage_sql2: Change order of arguments to :append to be the same as return values from :find iterator
Kim Alvefur <zash@zash.se>
parents: 6724
diff changeset
133 function archive_store:append(username, key, value, when, with)
41725f3df3cc mod_storage_sql2: Change order of arguments to :append to be the same as return values from :find iterator
Kim Alvefur <zash@zash.se>
parents: 6724
diff changeset
134 if type(when) ~= "number" then
6728
db28b8639737 mod_storage_sql2: Fix argument compat thing from 41725f3df3cc, it was backwards
Kim Alvefur <zash@zash.se>
parents: 6726
diff changeset
135 when, with, value = value, when, with;
5969
0a3b8003ac9c mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. Conflicting items are removed.
Kim Alvefur <zash@zash.se>
parents: 5968
diff changeset
136 end
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
137 local user,store = username,self.store;
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
138 return engine:transaction(function()
5996
e7efa9703a3f mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
Kim Alvefur <zash@zash.se>
parents: 5995
diff changeset
139 if key then
e7efa9703a3f mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
Kim Alvefur <zash@zash.se>
parents: 5995
diff changeset
140 engine:delete("DELETE FROM `prosodyarchive` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=?", host, user or "", store, key);
e7efa9703a3f mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
Kim Alvefur <zash@zash.se>
parents: 5995
diff changeset
141 else
e7efa9703a3f mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
Kim Alvefur <zash@zash.se>
parents: 5995
diff changeset
142 key = uuid.generate();
e7efa9703a3f mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
Kim Alvefur <zash@zash.se>
parents: 5995
diff changeset
143 end
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
144 local t, value = serialize(value);
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
145 engine:insert("INSERT INTO `prosodyarchive` (`host`, `user`, `store`, `when`, `with`, `key`, `type`, `value`) VALUES (?,?,?,?,?,?,?,?)", host, user or "", store, when, with, key, t, value);
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
146 return key;
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
147 end);
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
148 end
5847
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
149
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
150 -- Helpers for building the WHERE clause
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
151 local function archive_where(query, args, where)
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
152 -- Time range, inclusive
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
153 if query.start then
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
154 args[#args+1] = query.start
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
155 where[#where+1] = "`when` >= ?"
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
156 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
157
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
158 if query["end"] then
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
159 args[#args+1] = query["end"];
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
160 if query.start then
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
161 where[#where] = "`when` BETWEEN ? AND ?" -- is this inclusive?
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
162 else
5903
0e0aab930e10 mod_storage_sql2: Fix backwards comparison of timestamp
Kim Alvefur <zash@zash.se>
parents: 5894
diff changeset
163 where[#where+1] = "`when` <= ?"
5847
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
164 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
165 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
166
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
167 -- Related name
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
168 if query.with then
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
169 where[#where+1] = "`with` = ?";
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
170 args[#args+1] = query.with
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
171 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
172
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
173 -- Unique id
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
174 if query.key then
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
175 where[#where+1] = "`key` = ?";
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
176 args[#args+1] = query.key
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
177 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
178 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
179 local function archive_where_id_range(query, args, where)
5968
e1e9f1411442 mod_storage_sql2: Include user, host and store in id lookup
Kim Alvefur <zash@zash.se>
parents: 5913
diff changeset
180 local args_len = #args
5847
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
181 -- Before or after specific item, exclusive
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
182 if query.after then -- keys better be unique!
5985
98ed9fe368ac mod_storage_sql2: Fix SQL syntax
Kim Alvefur <zash@zash.se>
parents: 5979
diff changeset
183 where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ? AND `user` = ? AND `store` = ? LIMIT 1)"
5968
e1e9f1411442 mod_storage_sql2: Include user, host and store in id lookup
Kim Alvefur <zash@zash.se>
parents: 5913
diff changeset
184 args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.after, args[1], args[2], args[3];
e1e9f1411442 mod_storage_sql2: Include user, host and store in id lookup
Kim Alvefur <zash@zash.se>
parents: 5913
diff changeset
185 args_len = args_len + 4
5847
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
186 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
187 if query.before then
5985
98ed9fe368ac mod_storage_sql2: Fix SQL syntax
Kim Alvefur <zash@zash.se>
parents: 5979
diff changeset
188 where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ? AND `user` = ? AND `store` = ? LIMIT 1)"
5968
e1e9f1411442 mod_storage_sql2: Include user, host and store in id lookup
Kim Alvefur <zash@zash.se>
parents: 5913
diff changeset
189 args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.before, args[1], args[2], args[3];
5847
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
190 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
191 end
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
192
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
193 function archive_store:find(username, query)
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
194 query = query or {};
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
195 local user,store = username,self.store;
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
196 local total;
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
197 local ok, result = engine:transaction(function()
6724
a8dbfa14e1a8 mod_storage_sql2: Include 'with' field from iterator like some 3rd party archive-capable storage modules
Kim Alvefur <zash@zash.se>
parents: 6532
diff changeset
198 local sql_query = "SELECT `key`, `type`, `value`, `when`, `with` FROM `prosodyarchive` WHERE %s ORDER BY `sort_id` %s%s;";
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
199 local args = { host, user or "", store, };
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
200 local where = { "`host` = ?", "`user` = ?", "`store` = ?", };
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
201
5847
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
202 archive_where(query, args, where);
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
203
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
204 -- Total matching
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
205 if query.total then
6060
de4c83feb064 mod_storage_sql2: Build counter query without ORDER BY clause
Kim Alvefur <zash@zash.se>
parents: 6013
diff changeset
206 local stats = engine:select("SELECT COUNT(*) FROM `prosodyarchive` WHERE " .. t_concat(where, " AND "), unpack(args));
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
207 if stats then
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
208 local _total = stats()
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
209 total = _total and _total[1];
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
210 end
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
211 if query.limit == 0 then -- Skip the real query
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
212 return noop, total;
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
213 end
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
214 end
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
215
5847
6aaa7ad4463c mod_storage_sql2: Split out code for building WHERE clauses into separate functions
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
216 archive_where_id_range(query, args, where);
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
217
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
218 if query.limit then
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
219 args[#args+1] = query.limit;
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
220 end
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
221
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
222 sql_query = sql_query:format(t_concat(where, " AND "), query.reverse and "DESC" or "ASC", query.limit and " LIMIT ?" or "");
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
223 module:log("debug", sql_query);
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
224 return engine:select(sql_query, unpack(args));
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
225 end);
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
226 if not ok then return ok, result end
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
227 return function()
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
228 local row = result();
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
229 if row ~= nil then
6724
a8dbfa14e1a8 mod_storage_sql2: Include 'with' field from iterator like some 3rd party archive-capable storage modules
Kim Alvefur <zash@zash.se>
parents: 6532
diff changeset
230 return row[1], deserialize(row[2], row[3]), row[4], row[5];
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
231 end
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
232 end, total;
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
233 end
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
234
5848
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
235 function archive_store:delete(username, query)
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
236 query = query or {};
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
237 local user,store = username,self.store;
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
238 return engine:transaction(function()
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
239 local sql_query = "DELETE FROM `prosodyarchive` WHERE %s;";
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
240 local args = { host, user or "", store, };
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
241 local where = { "`host` = ?", "`user` = ?", "`store` = ?", };
6013
918ab89cb68d mod_storage_sql2: archive:delete() with username = true deletes for all users
Kim Alvefur <zash@zash.se>
parents: 5996
diff changeset
242 if user == true then
918ab89cb68d mod_storage_sql2: archive:delete() with username = true deletes for all users
Kim Alvefur <zash@zash.se>
parents: 5996
diff changeset
243 table.remove(args, 2);
918ab89cb68d mod_storage_sql2: archive:delete() with username = true deletes for all users
Kim Alvefur <zash@zash.se>
parents: 5996
diff changeset
244 table.remove(where, 2);
918ab89cb68d mod_storage_sql2: archive:delete() with username = true deletes for all users
Kim Alvefur <zash@zash.se>
parents: 5996
diff changeset
245 end
5848
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
246 archive_where(query, args, where);
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
247 archive_where_id_range(query, args, where);
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
248 sql_query = sql_query:format(t_concat(where, " AND "));
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
249 module:log("debug", sql_query);
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
250 return engine:delete(sql_query, unpack(args));
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
251 end);
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
252 end
06156bfd4eaf mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
Kim Alvefur <zash@zash.se>
parents: 5847
diff changeset
253
5734
49f1fed6e25e mod_storage_sql2: Keep available store types in a table
Kim Alvefur <zash@zash.se>
parents: 5733
diff changeset
254 local stores = {
49f1fed6e25e mod_storage_sql2: Keep available store types in a table
Kim Alvefur <zash@zash.se>
parents: 5733
diff changeset
255 keyval = keyval_store;
5741
c7a664e496b3 mod_storage_sql2: Add archive store with append and find methods
Kim Alvefur <zash@zash.se>
parents: 5740
diff changeset
256 archive = archive_store;
5734
49f1fed6e25e mod_storage_sql2: Keep available store types in a table
Kim Alvefur <zash@zash.se>
parents: 5733
diff changeset
257 };
49f1fed6e25e mod_storage_sql2: Keep available store types in a table
Kim Alvefur <zash@zash.se>
parents: 5733
diff changeset
258
6736
4aee55c0cc5c mod_storage_sql2: Add some comments
Matthew Wild <mwild1@gmail.com>
parents: 6532
diff changeset
259 --- Implement storage driver API
4aee55c0cc5c mod_storage_sql2: Add some comments
Matthew Wild <mwild1@gmail.com>
parents: 6532
diff changeset
260
4aee55c0cc5c mod_storage_sql2: Add some comments
Matthew Wild <mwild1@gmail.com>
parents: 6532
diff changeset
261 -- FIXME: Some of these operations need to operate on the archive store(s) too
4aee55c0cc5c mod_storage_sql2: Add some comments
Matthew Wild <mwild1@gmail.com>
parents: 6532
diff changeset
262
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
263 local driver = {};
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
264
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
265 function driver:open(store, typ)
5734
49f1fed6e25e mod_storage_sql2: Keep available store types in a table
Kim Alvefur <zash@zash.se>
parents: 5733
diff changeset
266 local store_mt = stores[typ or "keyval"];
49f1fed6e25e mod_storage_sql2: Keep available store types in a table
Kim Alvefur <zash@zash.se>
parents: 5733
diff changeset
267 if store_mt then
49f1fed6e25e mod_storage_sql2: Keep available store types in a table
Kim Alvefur <zash@zash.se>
parents: 5733
diff changeset
268 return setmetatable({ store = store }, store_mt);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
269 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
270 return nil, "unsupported-store";
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
271 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
272
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
273 function driver:stores(username)
6737
9f932a31eeba mod_storage_sql2: Some reformatting and variable name improvements
Matthew Wild <mwild1@gmail.com>
parents: 6736
diff changeset
274 local query = "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`" ..
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
275 (username == true and "!=?" or "=?");
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
276 if username == true or not username then
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
277 username = "";
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
278 end
5733
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
279 local ok, result = engine:transaction(function()
6737
9f932a31eeba mod_storage_sql2: Some reformatting and variable name improvements
Matthew Wild <mwild1@gmail.com>
parents: 6736
diff changeset
280 return engine:select(query, host, username);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
281 end);
5733
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
282 if not ok then return ok, result end
aeeced7b0149 mod_storage_sql2: Fix iteration over users and stores
Kim Alvefur <zash@zash.se>
parents: 5732
diff changeset
283 return iterator(result);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
284 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
285
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
286 function driver:purge(username)
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
287 return engine:transaction(function()
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
288 local stmt,err = engine:delete("DELETE FROM `prosody` WHERE `host`=? AND `user`=?", host, username);
6737
9f932a31eeba mod_storage_sql2: Some reformatting and variable name improvements
Matthew Wild <mwild1@gmail.com>
parents: 6736
diff changeset
289 return true, err;
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
290 end);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
291 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
292
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
293 --- Initialization
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
294
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
295
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
296 local function create_table(name)
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
297 local Table, Column, Index = sql.Table, sql.Column, sql.Index;
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
298
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
299 local ProsodyTable = Table {
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
300 name= name or "prosody";
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
301 Column { name="host", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
302 Column { name="user", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
303 Column { name="store", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
304 Column { name="key", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
305 Column { name="type", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
306 Column { name="value", type="MEDIUMTEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
307 Index { name="prosody_index", "host", "user", "store", "key" };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
308 };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
309 engine:transaction(function()
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
310 ProsodyTable:create(engine);
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
311 end);
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
312
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
313 local ProsodyArchiveTable = Table {
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
314 name="prosodyarchive";
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
315 Column { name="sort_id", type="INTEGER", primary_key=true, auto_increment=true };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
316 Column { name="host", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
317 Column { name="user", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
318 Column { name="store", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
319 Column { name="key", type="TEXT", nullable=false }; -- item id
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
320 Column { name="when", type="INTEGER", nullable=false }; -- timestamp
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
321 Column { name="with", type="TEXT", nullable=false }; -- related id
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
322 Column { name="type", type="TEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
323 Column { name="value", type="MEDIUMTEXT", nullable=false };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
324 Index { name="prosodyarchive_index", unique = true, "host", "user", "store", "key" };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
325 };
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
326 engine:transaction(function()
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
327 ProsodyArchiveTable:create(engine);
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
328 end);
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
329 end
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
330
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
331 local function upgrade_table(params, apply_changes)
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
332 local changes = false;
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
333 if params.driver == "MySQL" then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
334 local success,err = engine:transaction(function()
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
335 local result = engine:execute("SHOW COLUMNS FROM prosody WHERE Field='value' and Type='text'");
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
336 if result:rowcount() > 0 then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
337 changes = true;
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
338 if apply_changes then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
339 module:log("info", "Upgrading database schema...");
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
340 engine:execute("ALTER TABLE prosody MODIFY COLUMN `value` MEDIUMTEXT");
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
341 module:log("info", "Database table automatically upgraded");
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
342 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
343 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
344 return true;
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
345 end);
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
346 if not success then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
347 module:log("error", "Failed to check/upgrade database schema (%s), please see "
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
348 .."http://prosody.im/doc/mysql for help",
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
349 err or "unknown error");
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
350 return false;
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
351 end
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
352
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
353 -- COMPAT w/pre-0.10: Upgrade table to UTF-8 if not already
6761
b20efae224c9 mod_storage_sql2: Upgrade table if its charset does not match our connection's charset (thanks Zash)
Matthew Wild <mwild1@gmail.com>
parents: 6757
diff changeset
354 local check_encoding_query = "SELECT `COLUMN_NAME`,`COLUMN_TYPE`,`TABLE_NAME` FROM `information_schema`.`columns` WHERE `TABLE_NAME` LIKE 'prosody%%' AND ( `CHARACTER_SET_NAME`!='%s' OR `COLLATION_NAME`!='%s_bin' );";
b20efae224c9 mod_storage_sql2: Upgrade table if its charset does not match our connection's charset (thanks Zash)
Matthew Wild <mwild1@gmail.com>
parents: 6757
diff changeset
355 check_encoding_query = check_encoding_query:format(engine.charset, engine.charset);
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
356 success,err = engine:transaction(function()
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
357 local result = engine:execute(check_encoding_query);
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
358 local n_bad_columns = result:rowcount();
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
359 if n_bad_columns > 0 then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
360 changes = true;
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
361 if apply_changes then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
362 module:log("warn", "Found %d columns in prosody table requiring encoding change, updating now...", n_bad_columns);
6761
b20efae224c9 mod_storage_sql2: Upgrade table if its charset does not match our connection's charset (thanks Zash)
Matthew Wild <mwild1@gmail.com>
parents: 6757
diff changeset
363 local fix_column_query1 = "ALTER TABLE `%s` CHANGE `%s` `%s` BLOB;";
b20efae224c9 mod_storage_sql2: Upgrade table if its charset does not match our connection's charset (thanks Zash)
Matthew Wild <mwild1@gmail.com>
parents: 6757
diff changeset
364 local fix_column_query2 = "ALTER TABLE `%s` CHANGE `%s` `%s` %s CHARACTER SET '%s' COLLATE '%s_bin';";
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
365 for row in result:rows() do
6761
b20efae224c9 mod_storage_sql2: Upgrade table if its charset does not match our connection's charset (thanks Zash)
Matthew Wild <mwild1@gmail.com>
parents: 6757
diff changeset
366 local column_name, column_type, table_name = unpack(row);
b20efae224c9 mod_storage_sql2: Upgrade table if its charset does not match our connection's charset (thanks Zash)
Matthew Wild <mwild1@gmail.com>
parents: 6757
diff changeset
367 module:log("debug", "Fixing column %s in table %s", column_name, table_name);
b20efae224c9 mod_storage_sql2: Upgrade table if its charset does not match our connection's charset (thanks Zash)
Matthew Wild <mwild1@gmail.com>
parents: 6757
diff changeset
368 engine:execute(fix_column_query1:format(table_name, column_name, column_name));
b20efae224c9 mod_storage_sql2: Upgrade table if its charset does not match our connection's charset (thanks Zash)
Matthew Wild <mwild1@gmail.com>
parents: 6757
diff changeset
369 engine:execute(fix_column_query2:format(table_name, column_name, column_name, column_type, engine.charset, engine.charset));
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
370 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
371 module:log("info", "Database encoding upgrade complete!");
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
372 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
373 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
374 end);
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
375 success,err = engine:transaction(function() return engine:execute(check_encoding_query); end);
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
376 if not success then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
377 module:log("error", "Failed to check/upgrade database encoding: %s", err or "unknown error");
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
378 return false;
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
379 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
380 end
6755
b80202ad47e8 mod_storage_sql2: Add missing return to upgrade_table(), so we know if an upgrade is required
Matthew Wild <mwild1@gmail.com>
parents: 6754
diff changeset
381 return changes;
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
382 end
5494
9916f0a2d178 mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
383
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
384 local function normalize_params(params)
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
385 if params.driver == "SQLite3" then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
386 params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
387 end
6746
5e8a8319699d mod_storage_sql2: Validate configuration after normalizing SQLite3 database path (fixes traceback with default config)
Kim Alvefur <zash@zash.se>
parents: 6740
diff changeset
388 assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified");
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
389 return params;
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
390 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
391
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
392 function module.load()
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
393 if prosody.prosodyctl then return; end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
394 local params = normalize_params(module:get_option("sql", default_params));
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
395 engine = sql:create_engine(params, function (engine)
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
396 if module:get_option("sql_manage_tables", true) then
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
397 -- Automatically create table, ignore failure (table probably already exists)
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
398 -- FIXME: we should check in information_schema, etc.
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
399 create_table();
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
400 -- Check whether the table needs upgrading
6757
fc9c1a566a19 mod_storage_sql2: Don't upgrade tables without admin intervention
Matthew Wild <mwild1@gmail.com>
parents: 6756
diff changeset
401 if upgrade_table(params, false) then
fc9c1a566a19 mod_storage_sql2: Don't upgrade tables without admin intervention
Matthew Wild <mwild1@gmail.com>
parents: 6756
diff changeset
402 module:log("error", "Old database format detected. Please run: prosodyctl mod_%s upgrade", module.name);
6739
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
403 return false, "database upgrade needed";
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
404 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
405 end
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
406 end);
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
407
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
408 module:provides("storage", driver);
6216743c188c mod_storage_sql2: Break up monolithic code into functions, theoretically no functionality changes.
Matthew Wild <mwild1@gmail.com>
parents: 6738
diff changeset
409 end
6756
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
410
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
411 function module.command(arg)
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
412 local config = require "core.configmanager";
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
413 local prosodyctl = require "util.prosodyctl";
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
414 local command = table.remove(arg, 1);
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
415 if command == "upgrade" then
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
416 -- We need to find every unique dburi in the config
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
417 local uris = {};
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
418 for host in pairs(prosody.hosts) do
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
419 local params = config.get(host, "sql") or default_params;
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
420 uris[sql.db2uri(params)] = params;
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
421 end
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
422 print("We will check and upgrade the following databases:\n");
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
423 for _, params in pairs(uris) do
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
424 print("", "["..params.driver.."] "..params.database..(params.host and " on "..params.host or ""));
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
425 end
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
426 print("");
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
427 print("Ensure you have working backups of the above databases before continuing! ");
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
428 if not prosodyctl.show_yesno("Continue with the database upgrade? [yN]") then
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
429 print("Ok, no upgrade. But you do have backups, don't you? ...don't you?? :-)");
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
430 return;
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
431 end
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
432 -- Upgrade each one
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
433 for _, params in pairs(uris) do
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
434 print("Checking "..params.database.."...");
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
435 engine = sql:create_engine(params);
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
436 upgrade_table(params, true);
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
437 end
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
438 print("All done!");
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
439 else
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
440 print("Unknown command: "..command);
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
441 end
2e75b94e3a1e mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line
Matthew Wild <mwild1@gmail.com>
parents: 6755
diff changeset
442 end