Software / code / prosody
Changeset
5914:eda2556aa139
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 11 Nov 2013 23:28:53 +0100 |
| parents | 5911:7051dc27e531 (current diff) 5913:6865eecaf5a5 (diff) |
| children | 5917:99bf636fce46 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_storage_sql2.lua Sun Nov 10 23:10:46 2013 +0000 +++ b/plugins/mod_storage_sql2.lua Mon Nov 11 23:28:53 2013 +0100 @@ -44,7 +44,7 @@ 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 };
--- a/util/sql.lua Sun Nov 10 23:10:46 2013 +0000 +++ b/util/sql.lua Mon Nov 11 23:28:53 2013 +0100 @@ -264,13 +264,14 @@ 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";
