diff options
| author | Kim Alvefur <zash@zash.se> | 2013-11-11 23:28:53 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-11-11 23:28:53 +0100 |
| commit | 7ab93b50b0c0f8592fb036cdc45e3b8a620d2f91 (patch) | |
| tree | b88d7632488c3ce383c723be20db538dd29ade44 | |
| parent | c71bff87a6601ab98221fed02f8c9b2a97a45d6f (diff) | |
| parent | b8218da015567c95dbc958d4d3885cf3ccb36050 (diff) | |
| download | prosody-7ab93b50b0c0f8592fb036cdc45e3b8a620d2f91.tar.gz prosody-7ab93b50b0c0f8592fb036cdc45e3b8a620d2f91.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 2 | ||||
| -rw-r--r-- | util/sql.lua | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index 824ab859..e03b1fd6 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -44,7 +44,7 @@ local function create_table() local ProsodyArchiveTable = Table { name="prosodyarchive"; - Column { name="sort_id", type="INTEGER", primary_key=true, auto_increment=true, nullable=false }; + Column { name="sort_id", type="INTEGER", primary_key=true, auto_increment=true }; Column { name="host", type="TEXT", nullable=false }; Column { name="user", type="TEXT", nullable=false }; Column { name="store", type="TEXT", nullable=false }; diff --git a/util/sql.lua b/util/sql.lua index 07b1a4e0..a7f46421 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -264,13 +264,14 @@ function engine:_create_table(table) if col_type == "MEDIUMTEXT" and self.params.driver ~= "MySQL" then col_type = "TEXT"; -- MEDIUMTEXT is MySQL-specific end + if col.auto_increment == true and self.params.driver == "PostgreSQL" then + col_type = "BIGSERIAL"; + end sql = sql.."`"..col.name.."` "..col_type; if col.nullable == false then sql = sql.." NOT NULL"; end if col.primary_key == true then sql = sql.." PRIMARY KEY"; end if col.auto_increment == true then - if self.params.driver == "PostgreSQL" then - sql = sql.." SERIAL"; - elseif self.params.driver == "MySQL" then + if self.params.driver == "MySQL" then sql = sql.." AUTO_INCREMENT"; elseif self.params.driver == "SQLite3" then sql = sql.." AUTOINCREMENT"; |