mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_storage_sql: Support SQLite3 without LuaDBI

Browse source
This commit is contained in:
Kim Alvefur 2023-01-19 16:56:12 +01:00
parent 2dada39e39
commit 4c14111c76
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -34,6 +34,7 @@ TRUNK
- Support sub-second precision timestamps - Support sub-second precision timestamps
- mod_blocklist: New option 'migrate_legacy_blocking' to disable migration from mod_privacy - mod_blocklist: New option 'migrate_legacy_blocking' to disable migration from mod_privacy
- Ability to use SQLite3 storage using LuaSQLite3 instead of LuaDBI
## Removed ## Removed

9
plugins/mod_storage_sql.lua
View file

@ -1,9 +1,11 @@
-- luacheck: ignore 212/self -- luacheck: ignore 212/self
local deps = require "util.dependencies";
local cache = require "util.cache"; local cache = require "util.cache";
local json = require "util.json"; local json = require "util.json";
local sql = require "util.sql"; local sqlite = deps.softreq "util.sqlite3";
local dbisql = (sqlite and deps.softreq or require) "util.sql";
local xml_parse = require "util.xml".parse; local xml_parse = require "util.xml".parse;
local uuid = require "util.uuid"; local uuid = require "util.uuid";
local resolve_relative_path = require "util.paths".resolve_relative_path; local resolve_relative_path = require "util.paths".resolve_relative_path;
@ -692,6 +694,7 @@ end
local function create_table(engine) -- luacheck: ignore 431/engine local function create_table(engine) -- luacheck: ignore 431/engine
local sql = engine.params.driver == "SQLite3" and sqlite or dbisql;
local Table, Column, Index = sql.Table, sql.Column, sql.Index; local Table, Column, Index = sql.Table, sql.Column, sql.Index;
local ProsodyTable = Table { local ProsodyTable = Table {
@ -732,6 +735,7 @@ end
local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore 431/engine local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore 431/engine
local changes = false; local changes = false;
if params.driver == "MySQL" then if params.driver == "MySQL" then
local sql = dbisql;
local success,err = engine:transaction(function() local success,err = engine:transaction(function()
do do
local result = assert(engine:execute("SHOW COLUMNS FROM \"prosody\" WHERE \"Field\"='value' and \"Type\"='text'")); local result = assert(engine:execute("SHOW COLUMNS FROM \"prosody\" WHERE \"Field\"='value' and \"Type\"='text'"));
@ -831,6 +835,7 @@ end
function module.load() function module.load()
local engines = module:shared("/*/sql/connections"); local engines = module:shared("/*/sql/connections");
local params = normalize_params(module:get_option("sql", default_params)); local params = normalize_params(module:get_option("sql", default_params));
local sql = params.driver == "SQLite3" and sqlite or dbisql;
local db_uri = sql.db2uri(params); local db_uri = sql.db2uri(params);
engine = engines[db_uri]; engine = engines[db_uri];
if not engine then if not engine then
@ -869,6 +874,7 @@ function module.command(arg)
local uris = {}; local uris = {};
for host in pairs(prosody.hosts) do -- luacheck: ignore 431/host for host in pairs(prosody.hosts) do -- luacheck: ignore 431/host
local params = normalize_params(config.get(host, "sql") or default_params); local params = normalize_params(config.get(host, "sql") or default_params);
local sql = engine.params.driver == "SQLite3" and sqlite or dbisql;
uris[sql.db2uri(params)] = params; uris[sql.db2uri(params)] = params;
end end
print("We will check and upgrade the following databases:\n"); print("We will check and upgrade the following databases:\n");
@ -884,6 +890,7 @@ function module.command(arg)
-- Upgrade each one -- Upgrade each one
for _, params in pairs(uris) do for _, params in pairs(uris) do
print("Checking "..params.database.."..."); print("Checking "..params.database.."...");
local sql = params.driver == "SQLite3" and sqlite or dbisql;
engine = sql:create_engine(params); engine = sql:create_engine(params);
upgrade_table(engine, params, true); upgrade_table(engine, params, true);
end end