Software / code / prosody
Changeset
4109:d26db1f936f8
mod_storage_sql: Create index when creating a new table
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 11 Jan 2011 04:19:26 +0000 |
| parents | 4108:e3e3aa286334 |
| children | 4110:8792da53e503 4111:4716c7645ad2 |
| files | plugins/mod_storage_sql.lua |
| diffstat | 1 files changed, 32 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_storage_sql.lua Tue Jan 11 04:19:03 2011 +0000 +++ b/plugins/mod_storage_sql.lua Tue Jan 11 04:19:26 2011 +0000 @@ -64,6 +64,37 @@ end end +local function create_table() + local create_sql = "CREATE TABLE `prosody` (`host` TEXT, `user` TEXT, `store` TEXT, `key` TEXT, `type` TEXT, `value` TEXT);"; + if params.driver == "PostgreSQL" then + create_sql = create_sql:gsub("`", "\""); + end + + local stmt = connection:prepare(create_sql); + if stmt then + local ok = stmt:execute(); + local commit_ok = connection:commit(); + if ok and commit_ok then + module:log("info", "Initialized new %s database with prosody table", params.driver); + local index_sql = "CREATE INDEX `prosody_index` ON `prosody` (`host`, `user`, `store`, `key`)"; + if params.driver == "PostgreSQL" then + index_sql = index_sql:gsub("`", "\""); + elseif params.driver == "MySQL" then + index_sql = index_sql:gsub("`([,)])", "`(20)%1"); + end + local stmt, err = connection:prepare(index_sql); + local ok, commit_ok, commit_err; + if stmt then + ok, err = stmt:execute(); + commit_ok, commit_err = connection:commit(); + end + if not(ok and commit_ok) then + module:log("warn", "Failed to create index (%s), lookups may not be optimised", err or commit_err); + end + end + end +end + do -- process options to get a db connection DBI = require "DBI"; @@ -78,19 +109,7 @@ assert(connect()); -- Automatically create table, ignore failure (table probably already exists) - local create_sql = "CREATE TABLE `prosody` (`host` TEXT, `user` TEXT, `store` TEXT, `key` TEXT, `type` TEXT, `value` TEXT);"; - if params.driver == "PostgreSQL" then - create_sql = create_sql:gsub("`", "\""); - end - - local stmt = connection:prepare(create_sql); - if stmt then - local ok = stmt:execute(); - local commit_ok = connection:commit(); - if ok and commit_ok then - module:log("info", "Initialized new %s database with prosody table", params.driver); - end - end + create_table(); end local function serialize(value)
