prosody
9dc05d3efdc9
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

Comparison

plugins/mod_storage_sql2.lua @ 6749:9dc05d3efdc9

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Jul 2015 18:00:05 +0200
parent 6745:6728ad041761
parent 6746:5e8a8319699d
child 6767:d01c29b62b16
comparison
equal deleted inserted replaced
6745:6728ad041761 6749:9dc05d3efdc9
411 end 411 end
412 end 412 end
413 end 413 end
414 414
415 local function normalize_params(params) 415 local function normalize_params(params)
416 assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified");
417 if params.driver == "SQLite3" then 416 if params.driver == "SQLite3" then
418 params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite"); 417 params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
419 end 418 end
419 assert(params.driver and params.database, "Configuration error: Both the SQL driver and the database need to be specified");
420 return params; 420 return params;
421 end 421 end
422 422
423 function module.load() 423 function module.load()
424 if prosody.prosodyctl then return; end 424 if prosody.prosodyctl then return; end