Merge 0.9->0.10

[prosody.git] / util / sql.lua

diff --git a/util/sql.lua b/util/sql.lua
index 972940f78281ad4a1361801bf4102ed37074dd15..453597da3f117ded9c1f06ef4df5017afdb839eb 100644 (file)
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -156,6 +156,7 @@ function engine:connect()
        dbh:autocommit(false); -- don't commit automatically
        self.conn = dbh;
        self.prepared = {};
+       self:set_encoding();
        return true;
 end
 function engine:execute(sql, ...)
@@ -251,14 +252,32 @@ function engine:_create_index(index)
        elseif self.params.driver == "MySQL" then
                sql = sql:gsub("`([,)])", "`(20)%1");
        end
+       if index.unique then
+               sql = sql:gsub("^CREATE", "CREATE UNIQUE");
+       end
        --print(sql);
        return self:execute(sql);
 end
 function engine:_create_table(table)
        local sql = "CREATE TABLE `"..table.name.."` (";
        for i,col in ipairs(table.c) do
-               sql = sql.."`"..col.name.."` "..col.type;
+               local col_type = col.type;
+               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 == "MySQL" then
+                               sql = sql.." AUTO_INCREMENT";
+                       elseif self.params.driver == "SQLite3" then
+                               sql = sql.." AUTOINCREMENT";
+                       end
+               end
                if i ~= #table.c then sql = sql..", "; end
        end
        sql = sql.. ");"
@@ -277,15 +296,26 @@ function engine:_create_table(table)
        return success;
 end
 function engine:set_encoding() -- to UTF-8
-       if self.params.driver == "SQLite3" then return end
-       local set_names_query = "SET NAMES 'utf8';";
-       if self.params.driver == "MySQL" then
-               set_names_query = set_names_query:gsub(";$", " COLLATE 'utf8_bin';");
+       local driver = self.params.driver;
+       if driver == "SQLite3" then
+               return self:transaction(function()
+                       if self:select"PRAGMA encoding;"()[1] == "UTF-8" then
+                               self.charset = "utf8";
+                       end
+               end);
        end
-       local success,err = engine:transaction(function() return engine:execute(set_names_query); end);
-       if not success then
-               log("error", "Failed to set database connection encoding to UTF8: %s", err);
+       local set_names_query = "SET NAMES '%s';"
+       local charset = "utf8";
+       if driver == "MySQL" then
+               set_names_query = set_names_query:gsub(";$", " COLLATE 'utf8_bin';");
+               local ok, charsets = self:transaction(function()
+                       return self:select"SELECT `CHARACTER_SET_NAME` FROM `information_schema`.`CHARACTER_SETS` WHERE `CHARACTER_SET_NAME` LIKE 'utf8%' ORDER BY MAXLEN DESC LIMIT 1;";
+               end);
+               local row = ok and charsets();
+               charset = row and row[1] or charset;
        end
+       self.charset = charset;
+       return self:transaction(function() return self:execute(set_names_query:format(charset)); end);
 end
 local engine_mt = { __index = engine };