drizzle-kit 0.20.7-3bc340d → 0.20.7-4f47c46

package/bin.cjs

@@ -11995,9 +11995,9 @@ We have encountered a collision between the index name on columns ${source_defau
       }
       try {
         const fks = await db.execute(
-          `SELECT INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.COLUMN_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME,information_schema.referential_constraints.UPDATE_RULE, information_schema.referential_constraints.DELETE_RULE
+          `SELECT INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.COLUMN_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME,INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.UPDATE_RULE, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.DELETE_RULE
 		FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
-		LEFT JOIN information_schema.referential_constraints on information_schema.referential_constraints.constraint_name = information_schema.KEY_COLUMN_USAGE.CONSTRAINT_NAME
+		LEFT JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS on INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME = INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME
 		WHERE INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA = ? AND INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME != 'PRIMARY' and INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME is not null;
 		`,
           [inputSchema]
@@ -12180,6 +12180,7 @@ var init_pgSerializer = __esm({
     };
     generatePgSnapshot = (tables, enums, schemas, schemaFilter) => {
       const result = {};
+      const indexesInSchema = {};
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -12331,6 +12332,24 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
               return it.name;
             }
           });
+          if (typeof indexesInSchema[schema4 ?? "public"] !== "undefined") {
+            if (indexesInSchema[schema4 ?? "public"].includes(name)) {
+              console.log(
+                `
+${withStyle.errorWarning(
+                  `We've found duplicated index name across ${source_default.underline.blue(
+                    schema4 ?? "public"
+                  )} schema. Please rename your index in either the ${source_default.underline.blue(
+                    tableName
+                  )} table or the table with the duplicated index name`
+                )}`
+              );
+              process.exit(1);
+            }
+            indexesInSchema[schema4 ?? "public"].push(name);
+          } else {
+            indexesInSchema[schema4 ?? "public"] = [name];
+          }
           indexesObject[name] = {
             name,
             columns: indexColumns,
@@ -15458,7 +15477,7 @@ var init_sqlgenerator = __esm({
         if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
           statement += ",\n";
           const compositePK4 = PgSquasher.unsquashPK(compositePKs[0]);
-          statement += `	CONSTRAINT ${st.compositePkName} PRIMARY KEY("${compositePK4.columns.join(`","`)}")`;
+          statement += `	CONSTRAINT "${st.compositePkName}" PRIMARY KEY("${compositePK4.columns.join(`","`)}")`;
         }
         if (typeof uniqueConstraints !== "undefined" && uniqueConstraints.length > 0) {
           for (const uniqueConstraint4 of uniqueConstraints) {
@@ -17850,13 +17869,14 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonRenameColumnsStatements);
-      jsonStatements.push(...jsonDeletedCompositePKs);
       if (dialect6 !== "mysql") {
         jsonStatements.push(...jsonDeletedUniqueConstraints);
       }
       jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
       jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
+      jsonStatements.push(...jsonDeletedCompositePKs);
       jsonStatements.push(...jsonTableAlternations.alterColumns);
+      jsonStatements.push(...jsonAddedCompositePKs);
       if (dialect6 === "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);
         jsonStatements.push(...jsonDeletedUniqueConstraints);
@@ -17868,7 +17888,6 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations.dropColumns);
       if (dialect6 !== "sqlite")
         jsonStatements.push(...jsonCreateReferences);
-      jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAlteredCompositePKs);
       if (dialect6 !== "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);
@@ -62383,6 +62402,7 @@ init_source();
 var import_hanji9 = __toESM(require_hanji());
 init_mysqlSchema();
 init_selector_ui();
+init_outputs();
 var filterStatements = (statements, currentSchema, prevSchema) => {
   return statements.filter((statement) => {
     if (statement.type === "alter_table_alter_column_set_type") {
@@ -62426,7 +62446,8 @@ var filterStatements = (statements, currentSchema, prevSchema) => {
 };
 var logSuggestionsAndReturn = async ({
   connection,
-  statements
+  statements,
+  json2
 }) => {
   let shouldAskForApprove = false;
   const statementsToExecute = [];
@@ -62533,6 +62554,16 @@ var logSuggestionsAndReturn = async ({
       const res = await connection.query(
         `select count(*) as count from \`${statement.tableName}\``
       );
+      if (Object.values(json2.tables[statement.tableName].columns).filter(
+        (column7) => column7.autoincrement
+      ).length > 0) {
+        console.log(
+          `${withStyle.errorWarning(
+            `You have removed the primary key from a ${statement.tableName} table without removing the auto-increment property from this table. As the database error states: 'there can be only one auto column, and it must be defined as a key. Make sure to remove autoincrement from ${statement.tableName} table`
+          )}`
+        );
+        process.exit(1);
+      }
       const count = Number(res[0][0].count);
       if (count > 0) {
         infoToPrint.push(
@@ -62543,6 +62574,17 @@ var logSuggestionsAndReturn = async ({
         tablesToTruncate.push(statement.tableName);
         shouldAskForApprove = true;
       }
+    } else if (statement.type === "delete_composite_pk") {
+      if (Object.values(json2.tables[statement.tableName].columns).filter(
+        (column7) => column7.autoincrement
+      ).length > 0) {
+        console.log(
+          `${withStyle.errorWarning(
+            `You have removed the primary key from a ${statement.tableName} table without removing the auto-increment property from this table. As the database error states: 'there can be only one auto column, and it must be defined as a key. Make sure to remove autoincrement from ${statement.tableName} table`
+          )}`
+        );
+        process.exit(1);
+      }
     } else if (statement.type === "alter_table_add_column") {
       if (statement.column.notNull && typeof statement.column.default === "undefined") {
         const res = await connection.query(
@@ -63015,7 +63057,8 @@ var dbPushMysqlCommand = new import_commander.Command("push:mysql").option(
         schemasToRemove
       } = await logSuggestionsAndReturn({
         connection: connection.client,
-        statements: filteredStatements
+        statements: filteredStatements,
+        json2: statements == null ? void 0 : statements.validatedCur
       });
       const filteredSqlStatements = filteredStatements.map(
         (filteredStatement) => fromJson([filteredStatement], "mysql")[0]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.7-3bc340d",
+  "version": "0.20.7-4f47c46",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/utils.js

@@ -11721,9 +11721,9 @@ We have encountered a collision between the index name on columns ${source_defau
       }
       try {
         const fks = await db.execute(
-          `SELECT INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.COLUMN_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME,information_schema.referential_constraints.UPDATE_RULE, information_schema.referential_constraints.DELETE_RULE
+          `SELECT INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.COLUMN_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME,INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.UPDATE_RULE, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.DELETE_RULE
 		FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
-		LEFT JOIN information_schema.referential_constraints on information_schema.referential_constraints.constraint_name = information_schema.KEY_COLUMN_USAGE.CONSTRAINT_NAME
+		LEFT JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS on INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME = INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME
 		WHERE INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA = ? AND INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME != 'PRIMARY' and INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME is not null;
 		`,
           [inputSchema]
@@ -11906,6 +11906,7 @@ var init_pgSerializer = __esm({
     };
     generatePgSnapshot = (tables, enums, schemas, schemaFilter) => {
       const result = {};
+      const indexesInSchema = {};
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -12057,6 +12058,24 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
               return it.name;
             }
           });
+          if (typeof indexesInSchema[schema4 ?? "public"] !== "undefined") {
+            if (indexesInSchema[schema4 ?? "public"].includes(name)) {
+              console.log(
+                `
+${withStyle.errorWarning(
+                  `We've found duplicated index name across ${source_default.underline.blue(
+                    schema4 ?? "public"
+                  )} schema. Please rename your index in either the ${source_default.underline.blue(
+                    tableName
+                  )} table or the table with the duplicated index name`
+                )}`
+              );
+              process.exit(1);
+            }
+            indexesInSchema[schema4 ?? "public"].push(name);
+          } else {
+            indexesInSchema[schema4 ?? "public"] = [name];
+          }
           indexesObject[name] = {
             name,
             columns: indexColumns,
@@ -15176,7 +15195,7 @@ var init_sqlgenerator = __esm({
         if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
           statement += ",\n";
           const compositePK4 = PgSquasher.unsquashPK(compositePKs[0]);
-          statement += `	CONSTRAINT ${st.compositePkName} PRIMARY KEY("${compositePK4.columns.join(`","`)}")`;
+          statement += `	CONSTRAINT "${st.compositePkName}" PRIMARY KEY("${compositePK4.columns.join(`","`)}")`;
         }
         if (typeof uniqueConstraints !== "undefined" && uniqueConstraints.length > 0) {
           for (const uniqueConstraint4 of uniqueConstraints) {
@@ -17568,13 +17587,14 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonRenameColumnsStatements);
-      jsonStatements.push(...jsonDeletedCompositePKs);
       if (dialect6 !== "mysql") {
         jsonStatements.push(...jsonDeletedUniqueConstraints);
       }
       jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
       jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
+      jsonStatements.push(...jsonDeletedCompositePKs);
       jsonStatements.push(...jsonTableAlternations.alterColumns);
+      jsonStatements.push(...jsonAddedCompositePKs);
       if (dialect6 === "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);
         jsonStatements.push(...jsonDeletedUniqueConstraints);
@@ -17586,7 +17606,6 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations.dropColumns);
       if (dialect6 !== "sqlite")
         jsonStatements.push(...jsonCreateReferences);
-      jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAlteredCompositePKs);
       if (dialect6 !== "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);