drizzle-kit 0.22.7-28915b7 → 0.22.7-7d90fee

package/bin.cjs

@@ -22390,7 +22390,6 @@ function mapSqlToSqliteType(sqlType) {
   }
 }
 function extractGeneratedColumns(input) {
-  console.log("input", input);
   const columns = {};
   const lines = input.split(/,\s*(?![^()]*\))/);
   for (const line of lines) {
@@ -22412,7 +22411,6 @@ function extractGeneratedColumns(input) {
       };
     }
   }
-  console.log("columns", columns);
   return columns;
 }
 var import_drizzle_orm7, import_sqlite_core2, dialect6, generateSqliteSnapshot, fromDatabase3;
@@ -23285,8 +23283,6 @@ var init_sqlgenerator = __esm({
         const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
         const unsquashedIdentity = PgSquasher.unsquashIdentity(identity);
         const unsquashedOldIdentity = PgSquasher.unsquashIdentity(oldIdentity);
-        const identityWithSchema = schema5 ? `"${schema5}"."${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"` : `"${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"`;
-        const oldIdentityWithSchema = schema5 ? `"${schema5}"."${unsquashedOldIdentity == null ? void 0 : unsquashedOldIdentity.name}"` : `"${unsquashedOldIdentity == null ? void 0 : unsquashedOldIdentity.name}"`;
         const statementsToReturn = [];
         if (unsquashedOldIdentity.type !== unsquashedIdentity.type) {
           statementsToReturn.push(
@@ -23595,14 +23591,18 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const { tableName, column: column7, schema: schema5 } = statement;
-        const { name, type, notNull, generated } = column7;
+        const { name, type, notNull, generated, primaryKey, identity } = column7;
+        const primaryKeyStatement = primaryKey ? " PRIMARY KEY" : "";
         const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
         const defaultStatement = `${column7.default !== void 0 ? ` DEFAULT ${column7.default}` : ""}`;
         const schemaPrefix = column7.typeSchema && column7.typeSchema !== "public" ? `"${column7.typeSchema}".` : "";
         const fixedType = isPgNativeType(column7.type) ? column7.type : `${schemaPrefix}"${column7.type}"`;
         const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+        const unsquashedIdentity = identity ? PgSquasher.unsquashIdentity(identity) : void 0;
+        const identityWithSchema = schema5 ? `"${schema5}"."${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"` : `"${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"`;
+        const identityStatement = unsquashedIdentity ? ` GENERATED ${unsquashedIdentity.type === "always" ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY (sequence name ${identityWithSchema}${unsquashedIdentity.increment ? ` INCREMENT BY ${unsquashedIdentity.increment}` : ""}${unsquashedIdentity.minValue ? ` MINVALUE ${unsquashedIdentity.minValue}` : ""}${unsquashedIdentity.maxValue ? ` MAXVALUE ${unsquashedIdentity.maxValue}` : ""}${unsquashedIdentity.startWith ? ` START WITH ${unsquashedIdentity.startWith}` : ""}${unsquashedIdentity.cache ? ` CACHE ${unsquashedIdentity.cache}` : ""}${unsquashedIdentity.cycle ? ` CYCLE` : ""})` : "";
         const generatedStatement = ` GENERATED ALWAYS AS (${generated == null ? void 0 : generated.as}) STORED`;
-        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name}" ${fixedType}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""};`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name}" ${fixedType}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""}${identityStatement};`;
       }
     };
     MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -23930,8 +23930,8 @@ var init_sqlgenerator = __esm({
           columnPk,
           columnGenerated
         } = statement;
-        const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
-        const addColumnStatement = new PgAlterTableAddColumnConvertor().convert({
+        const tableNameWithSchema = schema5 ? `\`${schema5}\`.\`${tableName}\`` : `\`${tableName}\``;
+        const addColumnStatement = new MySqlAlterTableAddColumnConvertor().convert({
           schema: schema5,
           tableName,
           column: {
@@ -23947,7 +23947,7 @@ var init_sqlgenerator = __esm({
           type: "alter_table_add_column"
         });
         return [
-          `ALTER TABLE ${tableNameWithSchema} drop column "${columnName}";`,
+          `ALTER TABLE ${tableNameWithSchema} drop column \`${columnName}\`;`,
           addColumnStatement
         ];
       }
@@ -29557,6 +29557,13 @@ var init_snapshotsDiffer = __esm({
             return false;
           }
         }
+        if (st.type === "alter_table_alter_column_set_notnull") {
+          if (jsonStatements.find(
+            (it) => it.type === "alter_table_alter_column_set_identity" && it.tableName === st.tableName && it.schema === st.schema
+          )) {
+            return false;
+          }
+        }
         return true;
       });
       const sqlStatements = fromJson(filteredJsonStatements, "postgresql");
@@ -122123,7 +122130,7 @@ var init_pgPushUtils = __esm({
             }
           }
         }
-        const stmnt = fromJson([statement], "postgresql")[0];
+        const stmnt = fromJson([statement], "postgresql");
         if (typeof stmnt !== "undefined") {
           if (statement.type === "drop_table") {
             statementsToExecute.push(
@@ -122133,7 +122140,7 @@ var init_pgPushUtils = __esm({
               )} CASCADE;`
             );
           } else {
-            statementsToExecute.push(stmnt);
+            statementsToExecute.push(...stmnt);
           }
         }
       }
@@ -124256,7 +124263,9 @@ var init_push = __esm({
               }
               await db2.query("commit");
             } catch (e2) {
+              console.error(e2);
               await db2.query("rollback");
+              process.exit(1);
             }
           } else if (credentials2.driver === "turso") {
             await db2.batch(statementsToExecute.map((it) => ({ query: it })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.22.7-28915b7",
+  "version": "0.22.7-7d90fee",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/payload.js

@@ -23102,6 +23102,13 @@ var init_snapshotsDiffer = __esm({
             return false;
           }
         }
+        if (st.type === "alter_table_alter_column_set_notnull") {
+          if (jsonStatements.find(
+            (it) => it.type === "alter_table_alter_column_set_identity" && it.tableName === st.tableName && it.schema === st.schema
+          )) {
+            return false;
+          }
+        }
         return true;
       });
       const sqlStatements = fromJson(filteredJsonStatements, "postgresql");
@@ -24231,8 +24238,6 @@ var init_sqlgenerator = __esm({
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const unsquashedIdentity = PgSquasher.unsquashIdentity(identity);
         const unsquashedOldIdentity = PgSquasher.unsquashIdentity(oldIdentity);
-        const identityWithSchema = schema4 ? `"${schema4}"."${unsquashedIdentity?.name}"` : `"${unsquashedIdentity?.name}"`;
-        const oldIdentityWithSchema = schema4 ? `"${schema4}"."${unsquashedOldIdentity?.name}"` : `"${unsquashedOldIdentity?.name}"`;
         const statementsToReturn = [];
         if (unsquashedOldIdentity.type !== unsquashedIdentity.type) {
           statementsToReturn.push(
@@ -24541,14 +24546,18 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const { tableName, column: column4, schema: schema4 } = statement;
-        const { name: name2, type, notNull, generated } = column4;
+        const { name: name2, type, notNull, generated, primaryKey, identity } = column4;
+        const primaryKeyStatement = primaryKey ? " PRIMARY KEY" : "";
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
         const schemaPrefix = column4.typeSchema && column4.typeSchema !== "public" ? `"${column4.typeSchema}".` : "";
         const fixedType = isPgNativeType(column4.type) ? column4.type : `${schemaPrefix}"${column4.type}"`;
         const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+        const unsquashedIdentity = identity ? PgSquasher.unsquashIdentity(identity) : void 0;
+        const identityWithSchema = schema4 ? `"${schema4}"."${unsquashedIdentity?.name}"` : `"${unsquashedIdentity?.name}"`;
+        const identityStatement = unsquashedIdentity ? ` GENERATED ${unsquashedIdentity.type === "always" ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY (sequence name ${identityWithSchema}${unsquashedIdentity.increment ? ` INCREMENT BY ${unsquashedIdentity.increment}` : ""}${unsquashedIdentity.minValue ? ` MINVALUE ${unsquashedIdentity.minValue}` : ""}${unsquashedIdentity.maxValue ? ` MAXVALUE ${unsquashedIdentity.maxValue}` : ""}${unsquashedIdentity.startWith ? ` START WITH ${unsquashedIdentity.startWith}` : ""}${unsquashedIdentity.cache ? ` CACHE ${unsquashedIdentity.cache}` : ""}${unsquashedIdentity.cycle ? ` CYCLE` : ""})` : "";
         const generatedStatement = ` GENERATED ALWAYS AS (${generated?.as}) STORED`;
-        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name2}" ${fixedType}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""};`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name2}" ${fixedType}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""}${identityStatement};`;
       }
     };
     MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -24876,8 +24885,8 @@ var init_sqlgenerator = __esm({
           columnPk,
           columnGenerated
         } = statement;
-        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
-        const addColumnStatement = new PgAlterTableAddColumnConvertor().convert({
+        const tableNameWithSchema = schema4 ? `\`${schema4}\`.\`${tableName}\`` : `\`${tableName}\``;
+        const addColumnStatement = new MySqlAlterTableAddColumnConvertor().convert({
           schema: schema4,
           tableName,
           column: {
@@ -24893,7 +24902,7 @@ var init_sqlgenerator = __esm({
           type: "alter_table_add_column"
         });
         return [
-          `ALTER TABLE ${tableNameWithSchema} drop column "${columnName}";`,
+          `ALTER TABLE ${tableNameWithSchema} drop column \`${columnName}\`;`,
           addColumnStatement
         ];
       }
@@ -29069,7 +29078,6 @@ function mapSqlToSqliteType(sqlType) {
   }
 }
 function extractGeneratedColumns(input) {
-  console.log("input", input);
   const columns = {};
   const lines = input.split(/,\s*(?![^()]*\))/);
   for (const line of lines) {
@@ -29091,7 +29099,6 @@ function extractGeneratedColumns(input) {
       };
     }
   }
-  console.log("columns", columns);
   return columns;
 }
 var dialect5, generateSqliteSnapshot, fromDatabase2;
@@ -34672,7 +34679,7 @@ var pgSuggestions = async (db, statements) => {
         }
       }
     }
-    const stmnt = fromJson([statement], "postgresql")[0];
+    const stmnt = fromJson([statement], "postgresql");
     if (typeof stmnt !== "undefined") {
       if (statement.type === "drop_table") {
         statementsToExecute.push(
@@ -34682,7 +34689,7 @@ var pgSuggestions = async (db, statements) => {
           )} CASCADE;`
         );
       } else {
-        statementsToExecute.push(stmnt);
+        statementsToExecute.push(...stmnt);
       }
     }
   }

package/payload.mjs

@@ -23107,6 +23107,13 @@ var init_snapshotsDiffer = __esm({
             return false;
           }
         }
+        if (st.type === "alter_table_alter_column_set_notnull") {
+          if (jsonStatements.find(
+            (it) => it.type === "alter_table_alter_column_set_identity" && it.tableName === st.tableName && it.schema === st.schema
+          )) {
+            return false;
+          }
+        }
         return true;
       });
       const sqlStatements = fromJson(filteredJsonStatements, "postgresql");
@@ -24236,8 +24243,6 @@ var init_sqlgenerator = __esm({
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const unsquashedIdentity = PgSquasher.unsquashIdentity(identity);
         const unsquashedOldIdentity = PgSquasher.unsquashIdentity(oldIdentity);
-        const identityWithSchema = schema4 ? `"${schema4}"."${unsquashedIdentity?.name}"` : `"${unsquashedIdentity?.name}"`;
-        const oldIdentityWithSchema = schema4 ? `"${schema4}"."${unsquashedOldIdentity?.name}"` : `"${unsquashedOldIdentity?.name}"`;
         const statementsToReturn = [];
         if (unsquashedOldIdentity.type !== unsquashedIdentity.type) {
           statementsToReturn.push(
@@ -24546,14 +24551,18 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const { tableName, column: column4, schema: schema4 } = statement;
-        const { name: name2, type, notNull, generated } = column4;
+        const { name: name2, type, notNull, generated, primaryKey, identity } = column4;
+        const primaryKeyStatement = primaryKey ? " PRIMARY KEY" : "";
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
         const schemaPrefix = column4.typeSchema && column4.typeSchema !== "public" ? `"${column4.typeSchema}".` : "";
         const fixedType = isPgNativeType(column4.type) ? column4.type : `${schemaPrefix}"${column4.type}"`;
         const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+        const unsquashedIdentity = identity ? PgSquasher.unsquashIdentity(identity) : void 0;
+        const identityWithSchema = schema4 ? `"${schema4}"."${unsquashedIdentity?.name}"` : `"${unsquashedIdentity?.name}"`;
+        const identityStatement = unsquashedIdentity ? ` GENERATED ${unsquashedIdentity.type === "always" ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY (sequence name ${identityWithSchema}${unsquashedIdentity.increment ? ` INCREMENT BY ${unsquashedIdentity.increment}` : ""}${unsquashedIdentity.minValue ? ` MINVALUE ${unsquashedIdentity.minValue}` : ""}${unsquashedIdentity.maxValue ? ` MAXVALUE ${unsquashedIdentity.maxValue}` : ""}${unsquashedIdentity.startWith ? ` START WITH ${unsquashedIdentity.startWith}` : ""}${unsquashedIdentity.cache ? ` CACHE ${unsquashedIdentity.cache}` : ""}${unsquashedIdentity.cycle ? ` CYCLE` : ""})` : "";
         const generatedStatement = ` GENERATED ALWAYS AS (${generated?.as}) STORED`;
-        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name2}" ${fixedType}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""};`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name2}" ${fixedType}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""}${identityStatement};`;
       }
     };
     MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -24881,8 +24890,8 @@ var init_sqlgenerator = __esm({
           columnPk,
           columnGenerated
         } = statement;
-        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
-        const addColumnStatement = new PgAlterTableAddColumnConvertor().convert({
+        const tableNameWithSchema = schema4 ? `\`${schema4}\`.\`${tableName}\`` : `\`${tableName}\``;
+        const addColumnStatement = new MySqlAlterTableAddColumnConvertor().convert({
           schema: schema4,
           tableName,
           column: {
@@ -24898,7 +24907,7 @@ var init_sqlgenerator = __esm({
           type: "alter_table_add_column"
         });
         return [
-          `ALTER TABLE ${tableNameWithSchema} drop column "${columnName}";`,
+          `ALTER TABLE ${tableNameWithSchema} drop column \`${columnName}\`;`,
           addColumnStatement
         ];
       }
@@ -29074,7 +29083,6 @@ function mapSqlToSqliteType(sqlType) {
   }
 }
 function extractGeneratedColumns(input) {
-  console.log("input", input);
   const columns = {};
   const lines = input.split(/,\s*(?![^()]*\))/);
   for (const line of lines) {
@@ -29096,7 +29104,6 @@ function extractGeneratedColumns(input) {
       };
     }
   }
-  console.log("columns", columns);
   return columns;
 }
 var dialect5, generateSqliteSnapshot, fromDatabase2;
@@ -34663,7 +34670,7 @@ var pgSuggestions = async (db, statements) => {
         }
       }
     }
-    const stmnt = fromJson([statement], "postgresql")[0];
+    const stmnt = fromJson([statement], "postgresql");
     if (typeof stmnt !== "undefined") {
       if (statement.type === "drop_table") {
         statementsToExecute.push(
@@ -34673,7 +34680,7 @@ var pgSuggestions = async (db, statements) => {
           )} CASCADE;`
         );
       } else {
-        statementsToExecute.push(stmnt);
+        statementsToExecute.push(...stmnt);
       }
     }
   }