diff options
| author | Kim Alvefur <zash@zash.se> | 2019-05-31 00:04:05 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-05-31 00:04:05 +0200 |
| commit | 3eae084852f01a9ba0c99daf063a17435ee87995 (patch) | |
| tree | fec4eb7a94adb49a5976b35f5fec43de835f1990 | |
| parent | 88dd5657eb8796da0ffc8e626b64146991eac61d (diff) | |
| parent | e6815c87fb538b894839472820d97d644b20b241 (diff) | |
| download | prosody-3eae084852f01a9ba0c99daf063a17435ee87995.tar.gz prosody-3eae084852f01a9ba0c99daf063a17435ee87995.zip | |
Merge 0.11->trunk
| -rw-r--r-- | util/sql.lua | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/sql.lua b/util/sql.lua index 47900102..00c7b57f 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -238,6 +238,9 @@ function engine:transaction(...) end function engine:_create_index(index) local sql = "CREATE INDEX \""..index.name.."\" ON \""..index.table.."\" ("; + if self.params.driver ~= "MySQL" then + sql = sql:gsub("^CREATE INDEX", "%1 IF NOT EXISTS"); + end for i=1,#index do sql = sql.."\""..index[i].."\""; if i ~= #index then sql = sql..", "; end @@ -256,6 +259,9 @@ function engine:_create_index(index) end function engine:_create_table(table) local sql = "CREATE TABLE \""..table.name.."\" ("; + do + sql = sql:gsub("^CREATE TABLE", "%1 IF NOT EXISTS"); + end for i,col in ipairs(table.c) do local col_type = col.type; if col_type == "MEDIUMTEXT" and self.params.driver ~= "MySQL" then |