drizzle-kit 0.17.4-de5b618 → 0.17.4

package/index.js

@@ -13631,10 +13631,10 @@ var init_sqlgenerator = __esm({
       convert(statement) {
         const { tableName, column: column6 } = statement;
         const { name, type, notNull } = column6;
-        const defaultStatement = `${column6.default !== void 0 ? `DEFAULT ${column6.default}` : ""}`;
+        const defaultStatement = `${column6.default !== void 0 ? ` DEFAULT ${column6.default}` : ""}`;
         const fixedType = isPgNativeType(column6.type) ? column6.type : `"${column6.type}"`;
-        const notNullStatement = `${notNull ? "NOT NULL" : ""}`;
-        return `ALTER TABLE "${tableName}" ADD COLUMN "${name}" ${fixedType} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim() + ";";
+        const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+        return `ALTER TABLE "${tableName}" ADD COLUMN "${name}" ${fixedType}${defaultStatement}${notNullStatement};`;
       }
     };
     MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -13659,11 +13659,11 @@ var init_sqlgenerator = __esm({
         const { tableName, column: column6, referenceData } = statement;
         const { name, type, notNull, primaryKey } = column6;
         const defaultStatement = `${column6.default !== void 0 ? ` DEFAULT ${column6.default}` : ""}`;
-        const notNullStatement = `${notNull ? "NOT NULL" : ""}`;
+        const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
         const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
         const referenceAsObject = referenceData ? SQLiteSquasher.unsquashFK(referenceData) : void 0;
         const referenceStatement = `${referenceAsObject ? ` REFERENCES ${referenceAsObject.tableTo}(${referenceAsObject.columnsTo})` : ""}`;
-        return `ALTER TABLE ${tableName} ADD \`${name}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${referenceStatement}`;
+        return `ALTER TABLE ${tableName} ADD \`${name}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${referenceStatement};`;
       }
     };
     PgAlterTableAlterColumnSetTypeConvertor = class extends Convertor {
@@ -14016,11 +14016,11 @@ ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.newConstraintNam
           onDelete,
           onUpdate
         } = PgSquasher.unsquashFK(statement.data);
-        const onDeleteStatement = onDelete ? `ON DELETE ${onDelete}` : "";
-        const onUpdateStatement = onUpdate ? `ON UPDATE ${onUpdate}` : "";
+        const onDeleteStatement = onDelete ? ` ON DELETE ${onDelete}` : "";
+        const onUpdateStatement = onUpdate ? ` ON UPDATE ${onUpdate}` : "";
         const fromColumnsString = columnsFrom.map((it) => `"${it}"`).join(",");
         const toColumnsString = columnsTo.map((it) => `"${it}"`).join(",");
-        const alterStatement = `ALTER TABLE "${tableFrom}" ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${tableTo}"(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
+        const alterStatement = `ALTER TABLE "${tableFrom}" ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${tableTo}"(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
         let sql = "DO $$ BEGIN\n";
         sql += " " + alterStatement + ";\n";
         sql += "EXCEPTION\n";
@@ -26343,8 +26343,8 @@ var init_pgSerializer = __esm({
               FROM   pg_constraint 
               WHERE  contype = 'p' 
               AND    connamespace = 'public'::regnamespace  
-              AND    conrelid::regclass::text = $1;`,
-                  [tableName]
+              AND    (conrelid::regclass::text = $1 OR conrelid::regclass::text = $2);`,
+                  [`"${tableName}"`, tableName]
                 );
                 primaryKeys[`${tableName}_${cprimaryKey.map((pk) => pk.column_name).join("_")}`] = {
                   name: tableCompositePkName.rows[0].primary_key,
@@ -48811,6 +48811,7 @@ var init_mysql_introspect = __esm({
             patched = patched.startsWith("decimal(") ? "decimal" : patched;
             patched = patched.startsWith("smallint(") ? "smallint" : patched;
             patched = patched.startsWith("enum(") ? "mysqlEnum" : patched;
+            patched = patched.startsWith("datetime(") ? "datetime" : patched;
             patched = patched.startsWith("varbinary(") ? "varbinary" : patched;
             return patched;
           }).filter((type) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.17.4-de5b618",
+  "version": "0.17.4",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/utils.js

@@ -11390,10 +11390,10 @@ var PgAlterTableAddColumnConvertor = class extends Convertor {
   convert(statement) {
     const { tableName, column: column4 } = statement;
     const { name, type, notNull } = column4;
-    const defaultStatement = `${column4.default !== void 0 ? `DEFAULT ${column4.default}` : ""}`;
+    const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
     const fixedType = isPgNativeType(column4.type) ? column4.type : `"${column4.type}"`;
-    const notNullStatement = `${notNull ? "NOT NULL" : ""}`;
-    return `ALTER TABLE "${tableName}" ADD COLUMN "${name}" ${fixedType} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim() + ";";
+    const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+    return `ALTER TABLE "${tableName}" ADD COLUMN "${name}" ${fixedType}${defaultStatement}${notNullStatement};`;
   }
 };
 var MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -11418,11 +11418,11 @@ var SQLiteAlterTableAddColumnConvertor = class extends Convertor {
     const { tableName, column: column4, referenceData } = statement;
     const { name, type, notNull, primaryKey } = column4;
     const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
-    const notNullStatement = `${notNull ? "NOT NULL" : ""}`;
+    const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
     const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
     const referenceAsObject = referenceData ? SQLiteSquasher.unsquashFK(referenceData) : void 0;
     const referenceStatement = `${referenceAsObject ? ` REFERENCES ${referenceAsObject.tableTo}(${referenceAsObject.columnsTo})` : ""}`;
-    return `ALTER TABLE ${tableName} ADD \`${name}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${referenceStatement}`;
+    return `ALTER TABLE ${tableName} ADD \`${name}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${referenceStatement};`;
   }
 };
 var PgAlterTableAlterColumnSetTypeConvertor = class extends Convertor {
@@ -11775,11 +11775,11 @@ var PgCreateForeignKeyConvertor = class extends Convertor {
       onDelete,
       onUpdate
     } = PgSquasher.unsquashFK(statement.data);
-    const onDeleteStatement = onDelete ? `ON DELETE ${onDelete}` : "";
-    const onUpdateStatement = onUpdate ? `ON UPDATE ${onUpdate}` : "";
+    const onDeleteStatement = onDelete ? ` ON DELETE ${onDelete}` : "";
+    const onUpdateStatement = onUpdate ? ` ON UPDATE ${onUpdate}` : "";
     const fromColumnsString = columnsFrom.map((it) => `"${it}"`).join(",");
     const toColumnsString = columnsTo.map((it) => `"${it}"`).join(",");
-    const alterStatement = `ALTER TABLE "${tableFrom}" ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${tableTo}"(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
+    const alterStatement = `ALTER TABLE "${tableFrom}" ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${tableTo}"(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
     let sql = "DO $$ BEGIN\n";
     sql += " " + alterStatement + ";\n";
     sql += "EXCEPTION\n";