drizzle-kit 0.9.32 → 0.9.35

package/index.js

@@ -167389,7 +167389,7 @@ var CreateTableConvertor = class extends Convertor {
       const primaryKeyStatement = column.primaryKey ? "PRIMARY KEY" : "";
       const notNullStatement = column.notNull ? "NOT NULL" : "";
       const defaultStatement = column.defaultValue ? `DEFAULT ${column.defaultValue}` : "";
-      statement += "	" + `${column.name} ${column.type} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim();
+      statement += "	" + `"${column.name}" ${column.type} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim();
       statement += (i === columns.length - 1 ? "" : ",") + "\n";
     }
     statement += `);`;
@@ -167453,7 +167453,7 @@ var AlterTableRenameColumnConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, oldColumnName, newColumnName } = statement;
-    return `ALTER TABLE ${tableName} RENAME COLUMN ${oldColumnName} TO ${newColumnName};`;
+    return `ALTER TABLE ${tableName} RENAME COLUMN "${oldColumnName}" TO "${newColumnName}";`;
   }
 };
 var AlterTableDropColumnConvertor = class extends Convertor {
@@ -167462,7 +167462,7 @@ var AlterTableDropColumnConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    return `ALTER TABLE ${tableName} DROP COLUMN IF EXISTS ${columnName};`;
+    return `ALTER TABLE ${tableName} DROP COLUMN IF EXISTS "${columnName}";`;
   }
 };
 var AlterTableAddColumnConvertor = class extends Convertor {
@@ -167475,7 +167475,7 @@ var AlterTableAddColumnConvertor = class extends Convertor {
     const defaultValue = column.defaultValue;
     const defaultStatement = `${defaultValue ? `DEFAULT ${defaultValue}` : ""}`;
     const notNullStatement = `${notNull ? "NOT NULL" : ""}`;
-    return `ALTER TABLE ${tableName} ADD COLUMN ${name} ${type2} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim() + ";";
+    return `ALTER TABLE ${tableName} ADD COLUMN "${name}" ${type2} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim() + ";";
   }
 };
 var AlterTableAlterColumnSetTypeConvertor = class extends Convertor {
@@ -167484,7 +167484,7 @@ var AlterTableAlterColumnSetTypeConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName, newDataType } = statement;
-    return `ALTER TABLE ${tableName} ALTER COLUMN ${columnName} SET DATA TYPE ${newDataType};`;
+    return `ALTER TABLE ${tableName} ALTER COLUMN "${columnName}" SET DATA TYPE ${newDataType};`;
   }
 };
 var AlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
@@ -167493,7 +167493,7 @@ var AlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    return `ALTER TABLE ${tableName} ALTER COLUMN ${columnName} SET DEFAULT ${statement.newDefaultValue};`;
+    return `ALTER TABLE ${tableName} ALTER COLUMN "${columnName}" SET DEFAULT ${statement.newDefaultValue};`;
   }
 };
 var AlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
@@ -167502,7 +167502,7 @@ var AlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    return `ALTER TABLE ${tableName} ALTER COLUMN ${columnName} DROP DEFAULT;`;
+    return `ALTER TABLE ${tableName} ALTER COLUMN "${columnName}" DROP DEFAULT;`;
   }
 };
 var AlterTableAlterColumnSetNotNullConvertor = class extends Convertor {
@@ -167511,7 +167511,7 @@ var AlterTableAlterColumnSetNotNullConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    return `ALTER TABLE ${tableName} ALTER COLUMN ${columnName} SET NOT NULL;`;
+    return `ALTER TABLE ${tableName} ALTER COLUMN "${columnName}" SET NOT NULL;`;
   }
 };
 var AlterTableAlterColumnDropNotNullConvertor = class extends Convertor {
@@ -167520,7 +167520,7 @@ var AlterTableAlterColumnDropNotNullConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    return `ALTER TABLE ${tableName} ALTER COLUMN ${columnName} DROP NOT NULL;`;
+    return `ALTER TABLE ${tableName} ALTER COLUMN "${columnName}" DROP NOT NULL;`;
   }
 };
 var CreateForeignKeyConvertor = class extends Convertor {
@@ -167531,7 +167531,12 @@ var CreateForeignKeyConvertor = class extends Convertor {
     const { fromTable, toTable, fromColumn, toColumn, foreignKeyName, onDelete, onUpdate } = statement;
     const onDeleteStatement = onDelete || "";
     const onUpdateStatement = onUpdate || "";
-    return `ALTER TABLE ${fromTable} ADD CONSTRAINT ${foreignKeyName} FOREIGN KEY (${fromColumn}) REFERENCES ${toTable}(${toColumn}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim() + ";";
+    let sql = "DO $$ BEGIN\n";
+    sql += ` ALTER TABLE ${fromTable} ADD CONSTRAINT ${foreignKeyName} FOREIGN KEY (${fromColumn}) REFERENCES ${toTable}(${toColumn}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim() + ";\n";
+    sql += "EXCEPTION\n";
+    sql += " WHEN duplicate_object THEN null;\n";
+    sql += "END $$;\n";
+    return sql;
   }
 };
 var CreateIndexConvertor = class extends Convertor {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.9.32",
+  "version": "0.9.35",
   "main": "index.js",
   "repository": "https://github.com/lambda-direct/drizzle-kit",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
@@ -35,7 +35,8 @@
     "@types/js-yaml": "^4.0.3",
     "@types/pg": "^8.6.1",
     "@typescript-eslint/eslint-plugin": "4.4.1",
-    "drizzle-orm": "^0.10.14",
+    "drizzle-kit": "^0.9.34",
+    "drizzle-orm": "^0.10.19",
     "esbuild-register": "^3.3.2",
     "eslint": "^7.2.0",
     "eslint-config-airbnb": "18.2.1",