# HG changeset patch # User Kim Alvefur # Date 1559253845 -7200 # Node ID e90c9857a8805b32e36feb49b4dfbe58a216ce76 # Parent e01f38acde74623abe4a22a015e7bb85f0733480# Parent 7dd0dddd8e0226e7cfd4f0c9f0dabb81ed90369c Merge 0.11->trunk diff -r e01f38acde74 -r e90c9857a880 util/sql.lua --- a/util/sql.lua Thu May 30 21:44:35 2019 +0200 +++ b/util/sql.lua Fri May 31 00:04:05 2019 +0200 @@ -238,6 +238,9 @@ 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 @@ 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