drizzle-kit 0.18.0-a7a8954 → 0.18.1-c38539c

package/index.js

@@ -5914,7 +5914,7 @@ var require_hanji = __commonJS({
       }
     };
     exports.TaskTerminal = TaskTerminal;
-    function render5(view) {
+    function render6(view) {
       const { stdin, stdout, closable } = (0, readline_1.prepareReadLine)();
       if (view instanceof Prompt3) {
         const terminal = new Terminal(view, stdin, stdout, closable);
@@ -5926,7 +5926,7 @@ var require_hanji = __commonJS({
       closable.close();
       return;
     }
-    exports.render = render5;
+    exports.render = render6;
     function renderWithTask3(view, task) {
       return __awaiter(this, void 0, void 0, function* () {
         const terminal = new TaskTerminal(view, process.stdout);
@@ -21381,10 +21381,11 @@ var init_mysqlSerializer = __esm({
           }
         });
         const fks = foreignKeys.map((fk4) => {
+          var _a, _b;
           const name = fk4.getName();
           const tableFrom = tableName;
-          const onDelete = fk4.onDelete;
-          const onUpdate = fk4.onUpdate;
+          const onDelete = (_a = fk4.onDelete) != null ? _a : "no action";
+          const onUpdate = (_b = fk4.onUpdate) != null ? _b : "no action";
           const reference = fk4.reference();
           const referenceFT = reference.foreignTable;
           const tableTo = (0, import_drizzle_orm.getTableName)(referenceFT);
@@ -21973,7 +21974,7 @@ var init_pgSerializer = __esm({
               const columnDimensions = columnResponse.array_dimensions;
               let columnType = columnResponse.data_type;
               const primaryKey = tableConstraints.rows.filter(
-                (mapRow) => mapRow.constraint_type === "PRIMARY KEY"
+                (mapRow) => columnName === mapRow.column_name && mapRow.constraint_type === "PRIMARY KEY"
               );
               const cprimaryKey = tableConstraints.rows.filter(
                 (mapRow) => mapRow.constraint_type === "PRIMARY KEY"
@@ -22011,7 +22012,7 @@ var init_pgSerializer = __esm({
               columnToReturn[columnName] = {
                 name: columnName,
                 type: columnTypeMapped,
-                primaryKey: primaryKey.length === 1 && cprimaryKey.length < 1,
+                primaryKey: primaryKey.length === 1 && cprimaryKey.length < 2,
                 notNull: columnResponse.is_nullable === "NO"
               };
               if (!isSerial && typeof defaultValue !== "undefined") {
@@ -24191,7 +24192,7 @@ var init_migrate = __esm({
       let sql = sqlStatements.join(sqlDelimiter);
       if (type === "introspect") {
         sql = `-- Current sql file was generated after introspecting the database
--- If you want to run this migration please uncomment this code before executing migraitons
+-- If you want to run this migration please uncomment this code before executing migrations
 /*
 ${sql}
 */`;
@@ -24232,7 +24233,7 @@ ${sql}
 });
 
 // src/sqlgenerator.ts
-var pgNativeTypes, isPgNativeType, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, DropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, MySqlAlterTableAddPk, MySqlAlterTableDropPk, MySqlModifyColumn, SqliteAlterTableAlterColumnDropDefaultConvertor, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, SqliteAlterTableCreateCompositePrimaryKeyConvertor, SqliteAlterTableDeleteCompositePrimaryKeyConvertor, SqliteAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetPrimaryKeyConvertor, PgAlterTableAlterColumnDropPrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MysqlCreateSchemaConvertor, MysqlDropSchemaConvertor, MysqlAlterTableSetSchemaConvertor, MysqlAlterTableSetNewSchemaConvertor, MysqlAlterTableRemoveFromSchemaConvertor, MySqlDropIndexConvertor, convertors, fromJson;
+var pgNativeTypes, isPgNativeType, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, PgDropTableConvertor, MySQLDropTableConvertor, SQLiteDropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, MySqlAlterTableAddPk, MySqlAlterTableDropPk, MySqlModifyColumn, SqliteAlterTableAlterColumnDropDefaultConvertor, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, SqliteAlterTableCreateCompositePrimaryKeyConvertor, SqliteAlterTableDeleteCompositePrimaryKeyConvertor, SqliteAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetPrimaryKeyConvertor, PgAlterTableAlterColumnDropPrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MysqlCreateSchemaConvertor, MysqlDropSchemaConvertor, MysqlAlterTableSetSchemaConvertor, MysqlAlterTableSetNewSchemaConvertor, MysqlAlterTableRemoveFromSchemaConvertor, MySqlDropIndexConvertor, convertors, fromJson;
 var init_sqlgenerator = __esm({
   "src/sqlgenerator.ts"() {
     init_migrate();
@@ -24434,9 +24435,28 @@ var init_sqlgenerator = __esm({
         return `ALTER TYPE "${name}" ADD VALUE '${value}';`;
       }
     };
-    DropTableConvertor = class extends Convertor {
-      can(statement) {
-        return statement.type === "drop_table";
+    PgDropTableConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "drop_table" && dialect6 === "pg";
+      }
+      convert(statement) {
+        const { tableName, schema: schema4 } = statement;
+        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+        return `DROP TABLE ${tableNameWithSchema};`;
+      }
+    };
+    MySQLDropTableConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "drop_table" && dialect6 === "mysql";
+      }
+      convert(statement) {
+        const { tableName } = statement;
+        return `DROP TABLE \`${tableName}\`;`;
+      }
+    };
+    SQLiteDropTableConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "drop_table" && dialect6 === "sqlite";
       }
       convert(statement) {
         const { tableName } = statement;
@@ -24479,8 +24499,9 @@ var init_sqlgenerator = __esm({
         return statement.type === "alter_table_rename_column" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableName, oldColumnName, newColumnName } = statement;
-        return `ALTER TABLE "${tableName}" RENAME COLUMN "${oldColumnName}" TO "${newColumnName}";`;
+        const { tableName, oldColumnName, newColumnName, schema: schema4 } = statement;
+        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} RENAME COLUMN "${oldColumnName}" TO "${newColumnName}";`;
       }
     };
     MySqlAlterTableRenameColumnConvertor = class extends Convertor {
@@ -24506,8 +24527,9 @@ var init_sqlgenerator = __esm({
         return statement.type === "alter_table_drop_column" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableName, columnName } = statement;
-        return `ALTER TABLE "${tableName}" DROP COLUMN IF EXISTS "${columnName}";`;
+        const { tableName, columnName, schema: schema4 } = statement;
+        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} DROP COLUMN IF EXISTS "${columnName}";`;
       }
     };
     MySqlAlterTableDropColumnConvertor = class extends Convertor {
@@ -24533,12 +24555,13 @@ var init_sqlgenerator = __esm({
         return statement.type === "alter_table_add_column" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableName, column: column6 } = statement;
+        const { tableName, column: column6, schema: schema4 } = statement;
         const { name, type, notNull } = column6;
+        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         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};`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name}" ${fixedType}${defaultStatement}${notNullStatement};`;
       }
     };
     MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -24576,8 +24599,9 @@ var init_sqlgenerator = __esm({
         return statement.type === "alter_table_alter_column_set_type" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableName, columnName, newDataType } = statement;
-        return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" SET DATA TYPE ${newDataType};`;
+        const { tableName, columnName, newDataType, schema: schema4 } = statement;
+        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" SET DATA TYPE ${newDataType};`;
       }
     };
     SQLiteAlterTableAlterColumnSetTypeConvertor = class extends Convertor {
@@ -24600,8 +24624,9 @@ var init_sqlgenerator = __esm({
         return statement.type === "alter_table_alter_column_set_default" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableName, columnName } = statement;
-        return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" SET DEFAULT ${statement.newDefaultValue};`;
+        const { tableName, columnName, schema: schema4 } = statement;
+        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" SET DEFAULT ${statement.newDefaultValue};`;
       }
     };
     SqliteAlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
@@ -24624,8 +24649,9 @@ var init_sqlgenerator = __esm({
         return statement.type === "alter_table_alter_column_drop_default" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableName, columnName } = statement;
-        return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" DROP DEFAULT;`;
+        const { tableName, columnName, schema: schema4 } = statement;
+        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" DROP DEFAULT;`;
       }
     };
     MySqlAlterTableAddPk = class extends Convertor {
@@ -24736,7 +24762,8 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const { name, columns } = PgSquasher.unsquashPK(statement.data);
-        return `ALTER TABLE "${statement.tableName}" ADD CONSTRAINT "${statement.constraintName}" PRIMARY KEY("${columns.join('","')}");`;
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.constraintName}" PRIMARY KEY("${columns.join('","')}");`;
       }
     };
     PgAlterTableDeleteCompositePrimaryKeyConvertor = class extends Convertor {
@@ -24745,7 +24772,8 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const { name, columns } = PgSquasher.unsquashPK(statement.data);
-        return `ALTER TABLE "${statement.tableName}" DROP CONSTRAINT "${statement.constraintName}";`;
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${statement.constraintName}";`;
       }
     };
     PgAlterTableAlterCompositePrimaryKeyConvertor = class extends Convertor {
@@ -24757,8 +24785,9 @@ var init_sqlgenerator = __esm({
         const { name: newName, columns: newColumns } = PgSquasher.unsquashPK(
           statement.new
         );
-        return `ALTER TABLE "${statement.tableName}" DROP CONSTRAINT ${statement.oldConstraintName};
-${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.newConstraintName} PRIMARY KEY(${newColumns.join(",")});`;
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT ${statement.oldConstraintName};
+${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newConstraintName} PRIMARY KEY(${newColumns.join(",")});`;
       }
     };
     MySqlAlterTableCreateCompositePrimaryKeyConvertor = class extends Convertor {
@@ -24876,7 +24905,9 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
       }
       convert(statement) {
         const { tableName, columnName } = statement;
-        return `ALTER TABLE "${tableName}" ADD PRIMARY KEY ("${columnName}");`;
+        console.log(statement);
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD PRIMARY KEY ("${columnName}");`;
       }
     };
     PgAlterTableAlterColumnDropPrimaryKeyConvertor = class extends Convertor {
@@ -24909,7 +24940,8 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
       }
       convert(statement) {
         const { tableName, columnName } = statement;
-        return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" SET NOT NULL;`;
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" SET NOT NULL;`;
       }
     };
     SqliteAlterTableAlterColumnSetNotNullConvertor = class extends Convertor {
@@ -24933,7 +24965,8 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
       }
       convert(statement) {
         const { tableName, columnName } = statement;
-        return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" DROP NOT NULL;`;
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" DROP NOT NULL;`;
       }
     };
     SqliteAlterTableAlterColumnDropNotNullConvertor = class extends Convertor {
@@ -24969,7 +25002,9 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
         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}`;
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${tableFrom}"` : `"${tableFrom}"`;
+        const tableToNameWithSchema = statement.schema ? `"${statement.schema}"."${tableTo}"` : `"${tableTo}"`;
+        const alterStatement = `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
         let sql = "DO $$ BEGIN\n";
         sql += " " + alterStatement + ";\n";
         sql += "EXCEPTION\n";
@@ -25020,13 +25055,15 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
       convert(statement) {
         const newFk = PgSquasher.unsquashFK(statement.data);
         const oldFk = PgSquasher.unsquashFK(statement.oldFkey);
-        let sql = `ALTER TABLE "${oldFk.tableFrom}" DROP CONSTRAINT "${oldFk.name}";
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${oldFk.tableFrom}"` : `"${oldFk.tableFrom}"`;
+        let sql = `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${oldFk.name}";
 `;
         const onDeleteStatement = newFk.onDelete ? ` ON DELETE ${newFk.onDelete}` : "";
         const onUpdateStatement = newFk.onUpdate ? ` ON UPDATE ${newFk.onUpdate}` : "";
         const fromColumnsString = newFk.columnsFrom.map((it) => `"${it}"`).join(",");
         const toColumnsString = newFk.columnsTo.map((it) => `"${it}"`).join(",");
-        const alterStatement = `ALTER TABLE "${newFk.tableFrom}" ADD CONSTRAINT "${newFk.name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${newFk.tableTo}"(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
+        const tableFromNameWithSchema = statement.schema ? `"${statement.schema}"."${newFk.tableFrom}"` : `"${newFk.tableFrom}"`;
+        const alterStatement = `ALTER TABLE ${tableFromNameWithSchema} ADD CONSTRAINT "${newFk.name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${newFk.tableTo}"(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
         sql += "DO $$ BEGIN\n";
         sql += " " + alterStatement + ";\n";
         sql += "EXCEPTION\n";
@@ -25056,7 +25093,8 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
       convert(statement) {
         const tableFrom = statement.tableName;
         const { name } = PgSquasher.unsquashFK(statement.data);
-        return `ALTER TABLE "${tableFrom}" DROP CONSTRAINT "${name}";
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${tableFrom}"` : `"${tableFrom}"`;
+        return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${name}";
 `;
       }
     };
@@ -25093,7 +25131,8 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
         const { name, columns, isUnique } = PgSquasher.unsquashIdx(statement.data);
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
         const value = columns.map((it) => `"${it}"`).join(",");
-        return `CREATE ${indexPart} IF NOT EXISTS "${name}" ON "${statement.tableName}" (${value});`;
+        const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+        return `CREATE ${indexPart} IF NOT EXISTS "${name}" ON ${tableNameWithSchema} (${value});`;
       }
     };
     CreateMySqlIndexConvertor = class extends Convertor {
@@ -25177,8 +25216,9 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
         return statement.type === "alter_table_set_new_schema" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableName, to } = statement;
-        return `ALTER TABLE "${tableName}" SET SCHEMA "${to}";
+        const { tableName, to, from } = statement;
+        const tableNameWithSchema = from ? `"${from}"."${tableName}"` : `"${tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} SET SCHEMA "${to}";
 `;
       }
     };
@@ -25187,8 +25227,9 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
         return statement.type === "alter_table_remove_from_schema" && dialect6 === "pg";
       }
       convert(statement) {
-        const { tableName } = statement;
-        return `ALTER TABLE "${tableName}" SET SCHEMA public;
+        const { tableName, schema: schema4 } = statement;
+        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+        return `ALTER TABLE ${tableNameWithSchema} SET SCHEMA public;
 `;
       }
     };
@@ -25272,7 +25313,9 @@ ${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.new
     convertors.push(new MySqlCreateTableConvertor());
     convertors.push(new SQLiteCreateTableConvertor());
     convertors.push(new CreateTypeEnumConvertor());
-    convertors.push(new DropTableConvertor());
+    convertors.push(new PgDropTableConvertor());
+    convertors.push(new MySQLDropTableConvertor());
+    convertors.push(new SQLiteDropTableConvertor());
     convertors.push(new PgRenameTableConvertor());
     convertors.push(new MySqlRenameTableConvertor());
     convertors.push(new SqliteRenameTableConvertor());
@@ -25660,6 +25703,7 @@ var init_jsonStatements = __esm({
             tableName,
             columnName,
             newDefaultValue: column6.default.new,
+            oldDefaultValue: column6.default.old,
             schema: schema4,
             columnOnUpdate,
             columnNotNull,
@@ -25733,6 +25777,7 @@ var init_jsonStatements = __esm({
             setPkStatements.push({
               type: "alter_table_alter_column_set_pk",
               tableName,
+              schema: schema4,
               columnName
             });
           }
@@ -25799,15 +25844,21 @@ var init_jsonStatements = __esm({
       });
     };
     prepareAlterReferencesJson = (tableName, schema4, foreignKeys) => {
-      return Object.values(foreignKeys).map((fkData) => {
-        return {
-          type: "alter_reference",
-          tableName,
-          data: fkData.__new,
-          oldFkey: fkData.__old,
-          schema: schema4
-        };
-      });
+      const keys = Object.keys(foreignKeys);
+      const stmts = [];
+      if (keys.length > 0) {
+        stmts.push(
+          ...prepareDropReferencesJson(tableName, schema4, {
+            [keys[0]]: foreignKeys[keys[0]].__old
+          })
+        );
+        stmts.push(
+          ...prepareCreateReferencesJson(tableName, schema4, {
+            [keys[0]]: foreignKeys[keys[0]].__new
+          })
+        );
+      }
+      return stmts;
     };
     prepareDropIndexesJson = (tableName, schema4, indexes) => {
       return Object.values(indexes).map((indexData) => {
@@ -25847,33 +25898,36 @@ var init_jsonStatements = __esm({
         };
       });
     };
-    prepareAddCompositePrimaryKeyPg = (tableName, pks, json2) => {
+    prepareAddCompositePrimaryKeyPg = (tableName, schema4, pks, json2) => {
       return Object.values(pks).map((it) => {
         return {
           type: "create_composite_pk",
           tableName,
           data: it,
+          schema: schema4,
           constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it).columns.join("_")}`].name
         };
       });
     };
-    prepareDeleteCompositePrimaryKeyPg = (tableName, pks, json1) => {
+    prepareDeleteCompositePrimaryKeyPg = (tableName, schema4, pks, json1) => {
       return Object.values(pks).map((it) => {
         return {
           type: "delete_composite_pk",
           tableName,
           data: it,
+          schema: schema4,
           constraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it).columns.join("_")}`].name
         };
       });
     };
-    prepareAlterCompositePrimaryKeyPg = (tableName, pks, json1, json2) => {
+    prepareAlterCompositePrimaryKeyPg = (tableName, schema4, pks, json1, json2) => {
       return Object.values(pks).map((it) => {
         return {
           type: "alter_composite_pk",
           tableName,
           old: it.__old,
           new: it.__new,
+          schema: schema4,
           oldConstraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it.__old).columns.join("_")}`].name,
           newConstraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it.__new).columns.join("_")}`].name
         };
@@ -26158,6 +26212,7 @@ var init_snapshotsDiffer = __esm({
       const jsonRemoveTableFromSchemas = [];
       const jsonSetNewTableSchemas = [];
       allAlteredResolved.forEach((it) => {
+        const schemaUnwrapped = valueFromSelfOrPatchedNew(it.schema);
         let addedCompositePKs;
         let deletedCompositePKs;
         let alteredCompositePKs;
@@ -26177,16 +26232,19 @@ var init_snapshotsDiffer = __esm({
         } else if (dialect6 === "pg") {
           addedCompositePKs = prepareAddCompositePrimaryKeyPg(
             it.name,
+            schemaUnwrapped,
             it.addedCompositePKs,
             curFull
           );
           deletedCompositePKs = prepareDeleteCompositePrimaryKeyPg(
             it.name,
+            schemaUnwrapped,
             it.deletedCompositePKs,
             prevFull
           );
           alteredCompositePKs = prepareAlterCompositePrimaryKeyPg(
             it.name,
+            schemaUnwrapped,
             it.alteredCompositePKs,
             prevFull,
             curFull
@@ -26295,8 +26353,12 @@ var init_snapshotsDiffer = __esm({
           },
           {}
         );
-        jsonCreateIndexesForAllAlteredTables.push(...prepareCreateIndexesJson(it.name, schema4, createdIndexes || {}));
-        jsonDropIndexesForAllAlteredTables.push(...prepareDropIndexesJson(it.name, schema4, droppedIndexes || {}));
+        jsonCreateIndexesForAllAlteredTables.push(
+          ...prepareCreateIndexesJson(it.name, schema4, createdIndexes || {})
+        );
+        jsonDropIndexesForAllAlteredTables.push(
+          ...prepareDropIndexesJson(it.name, schema4, droppedIndexes || {})
+        );
       });
       const jsonCreateReferencesForCreatedTables = created.map((it) => {
         return prepareCreateReferencesJson(it.name, it.schema, it.foreignKeys);
@@ -26317,7 +26379,12 @@ var init_snapshotsDiffer = __esm({
         return [...forAdded, ...forAltered, ...alteredFKs];
       }).flat();
       const jsonCreateReferences = jsonCreateReferencesForCreatedTables;
-      const jsonAlterReferencesForAlteredTables = jsonReferencesForAllAlteredTables;
+      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+        (t) => t.type === "create_reference"
+      );
+      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+        (t) => t.type === "delete_reference"
+      );
       const createEnums = (_b = (_a = typedResult.addedEnums) == null ? void 0 : _a.map((it) => {
         return prepareCreateEnumJson(it.name, it.values);
       })) != null ? _b : [];
@@ -26365,15 +26432,16 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonRenameColumnsStatements);
       jsonStatements.push(...jsonDeletedCompositePKs);
+      jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
       jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
       jsonStatements.push(...jsonTableAlternations.alterColumns);
       jsonStatements.push(...jsonTableAlternations.createColumns);
-      jsonStatements.push(...jsonAlterReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesForCreatedTables);
+      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
+      jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
       jsonStatements.push(...jsonTableAlternations.dropColumns);
       if (dialect6 !== "sqlite")
         jsonStatements.push(...jsonCreateReferences);
-      jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonSetTableSchemas);
@@ -44143,7 +44211,10 @@ import { sql } from "drizzle-orm"
       return defaultValue;
     };
     column4 = (type, name, defaultValue, autoincrement, onUpdate) => {
-      const lowered = type.toLowerCase();
+      let lowered = type;
+      if (!type.startsWith("enum(")) {
+        lowered = type.toLowerCase();
+      }
       if (lowered === "serial") {
         return `${name.camelCase()}: serial("${name}")`;
       }
@@ -44226,7 +44297,7 @@ import { sql } from "drizzle-orm"
       }
       if (lowered === "date") {
         let out = `// you can use { mode: 'date' }, if you want to have Date as type for this column
-	${name}: date("${name}", { mode: 'string' })`;
+	${name.camelCase()}: date("${name}", { mode: 'string' })`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         out += defaultValue;
         return out;
@@ -44343,7 +44414,13 @@ import { sql } from "drizzle-orm"
       }, {});
       columns.forEach((it) => {
         statement += "	";
-        statement += column4(it.type, it.name, it.default, it.autoincrement, it.onUpdate);
+        statement += column4(
+          it.type,
+          it.name,
+          it.default,
+          it.autoincrement,
+          it.onUpdate
+        );
         statement += it.primaryKey ? ".primaryKey()" : "";
         statement += it.notNull ? ".notNull()" : "";
         const fks2 = fkByColumnName[it.name];
@@ -45458,10 +45535,10 @@ __export(mysqlIntrospect_exports, {
   mysqlIntrospect: () => mysqlIntrospect,
   mysqlPushIntrospect: () => mysqlPushIntrospect
 });
-var import_hanji4, import_promise, connectToMySQL, mysqlIntrospect, mysqlPushIntrospect;
+var import_hanji5, import_promise, connectToMySQL, mysqlIntrospect, mysqlPushIntrospect;
 var init_mysqlIntrospect = __esm({
   "src/cli/commands/mysqlIntrospect.ts"() {
-    import_hanji4 = __toESM(require_hanji());
+    import_hanji5 = __toESM(require_hanji());
     init_views();
     import_promise = __toESM(require_promise2());
     init_mysqlSerializer();
@@ -45491,7 +45568,7 @@ var init_mysqlIntrospect = __esm({
     mysqlIntrospect = async (config) => {
       const { client, databaseName } = await connectToMySQL(config);
       const progress = new IntrospectProgress();
-      const res = await (0, import_hanji4.renderWithTask)(
+      const res = await (0, import_hanji5.renderWithTask)(
         progress,
         fromDatabase(
           client,
@@ -50273,7 +50350,7 @@ var init_introspect = __esm({
         return out;
       }
       if (lowered === "date") {
-        let out = `${name}: date("${name}")`;
+        let out = `${name.camelCase()}: date("${name}")`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${defaultValue})` : "";
         out += defaultValue;
         return out;
@@ -50461,10 +50538,10 @@ __export(pgIntrospect_exports, {
   PgConfig2: () => PgConfig2,
   pgIntrospect: () => pgIntrospect
 });
-var import_hanji5, import_pg, PgConfig1, PgConfig2, Conf, pgIntrospect;
+var import_hanji6, import_pg, PgConfig1, PgConfig2, Conf, pgIntrospect;
 var init_pgIntrospect = __esm({
   "src/cli/commands/pgIntrospect.ts"() {
-    import_hanji5 = __toESM(require_hanji());
+    import_hanji6 = __toESM(require_hanji());
     init_lib();
     init_views();
     import_pg = __toESM(require_lib4());
@@ -50477,16 +50554,18 @@ var init_pgIntrospect = __esm({
       user: stringType().default("postgres"),
       password: stringType().optional(),
       database: stringType(),
-      ssl: coerce.boolean().optional()
+      ssl: coerce.boolean().optional(),
+      out: stringType().optional().default("./drizzle")
     }).strict();
     PgConfig2 = objectType({
-      connectionString: stringType()
+      connectionString: stringType(),
+      out: stringType().optional().default("./drizzle")
     }).strict();
     Conf = unionType([PgConfig1, PgConfig2]);
     pgIntrospect = async (config) => {
       const pool = new import_pg.Pool(config);
       const progress = new IntrospectProgress();
-      const res = await (0, import_hanji5.renderWithTask)(
+      const res = await (0, import_hanji6.renderWithTask)(
         progress,
         fromDatabase2(pool, (stage, count, status) => {
           progress.update(stage, count, status);
@@ -50565,7 +50644,7 @@ var checkHandler = (out, dialect6) => {
 };
 
 // src/cli/index.ts
-var import_hanji6 = __toESM(require_hanji());
+var import_hanji7 = __toESM(require_hanji());
 var import_path7 = __toESM(require("path"));
 
 // src/cli/utils.ts
@@ -50613,7 +50692,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.18.0",
+  version: "0.18.1",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Drizzle Team",
   license: "MIT",
@@ -50624,11 +50703,11 @@ var package_default = {
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
     push: "node -r esbuild-register ./src/cli/index.ts push:mysql",
     "migrate:old:mysql": "drizzle-kit generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
-    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
+    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg",
     "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite --out ./dev/migrations-sqlite --schema ./dev/migrations-sqlite/schema.ts",
     "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql",
     "check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
-    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql",
+    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --config drizzle.config2.ts",
     "introspect:pg": "node -r esbuild-register ./src/cli/index.ts introspect:pg --out ./dev/introspect-pg --connectionString=postgresql://postgres@localhost:5432/introspect",
     drop: "node -r esbuild-register ./src/cli/index.ts drop --out ./dev/migrations-pg",
     "up:pg": "node -r esbuild-register ./src/cli/index.ts up:pg --out ./dev/migrations-pg",
@@ -50792,10 +50871,11 @@ var import_path6 = require("path");
 init_source();
 var import_fs10 = require("fs");
 init_views();
+var import_hanji4 = __toESM(require_hanji());
 var prepareGenerateConfig = (options) => {
   var _a;
   const { schema: schema4, out, config, breakpoints, custom } = options;
-  if (!(schema4 || out)) {
+  if (!(schema4 && out)) {
     const drizzleConfig = drizzleConfigFromFile(config);
     if (!drizzleConfig.out) {
       console.log("You must specify 'out' param in config file");
@@ -50812,6 +50892,11 @@ var prepareGenerateConfig = (options) => {
     console.error(`'schema' param must be set`);
     process.exit(1);
   }
+  const fileNames = prepareFilenames(schema4);
+  if (fileNames.length === 0) {
+    (0, import_hanji4.render)(`[${source_default.blue("i")}] No schema file in ${schema4} was found`);
+    process.exit(0);
+  }
   if (!out) {
     console.error(`'out' param must be set`);
     process.exit(1);
@@ -50838,6 +50923,10 @@ var configCommonSchema = objectType({
   breakpoints: booleanType().optional(),
   tablesFilter: unionType([stringType(), stringType().array()]).optional()
 });
+var configIntrospectSchema = objectType({
+  out: stringType().optional().default("./drizzle"),
+  breakpoints: booleanType().optional()
+});
 var mysqlConnectionSchema = unionType([
   objectType({
     host: stringType(),
@@ -50855,6 +50944,10 @@ var mySqlCliConfigSchema = intersectionType(
   configCommonSchema,
   mysqlConnectionSchema
 );
+var mySqlIntrospectConfigSchema = intersectionType(
+  configIntrospectSchema,
+  mysqlConnectionSchema
+);
 var drizzleConfigFromFile = (configPath) => {
   var _a;
   const defaultTsConfigExists = (0, import_fs10.existsSync)((0, import_path6.join)((0, import_path6.resolve)("drizzle.config.ts")));
@@ -50888,9 +50981,53 @@ var drizzleConfigFromFile = (configPath) => {
   }
   return res.data;
 };
+var readDrizzleConfig = (configPath) => {
+  var _a;
+  const defaultTsConfigExists = (0, import_fs10.existsSync)((0, import_path6.join)((0, import_path6.resolve)("drizzle.config.ts")));
+  const defaultJsConfigExists = (0, import_fs10.existsSync)((0, import_path6.join)((0, import_path6.resolve)("drizzle.config.js")));
+  const defaultJsonConfigExists = (0, import_fs10.existsSync)(
+    (0, import_path6.join)((0, import_path6.resolve)("drizzle.config.json"))
+  );
+  const defaultConfigPath = defaultTsConfigExists ? "drizzle.config.ts" : defaultJsConfigExists ? "drizzle.config.js" : "drizzle.config.json";
+  if (!configPath) {
+    console.log(
+      source_default.gray(
+        `No config path provided, using default '${defaultConfigPath}'`
+      )
+    );
+  }
+  const path3 = (0, import_path6.join)((0, import_path6.resolve)(configPath != null ? configPath : defaultConfigPath));
+  if (!(0, import_fs10.existsSync)(path3)) {
+    console.log(source_default.red(`${path3} file does not exist`));
+    process.exit(1);
+  }
+  console.log(source_default.grey(`Reading config file '${path3}'`));
+  const { unregister } = safeRegister();
+  const required = require(path3);
+  const content = (_a = required.default) != null ? _a : required;
+  unregister();
+  return content;
+};
 
 // src/cli/commands/pushUtils.ts
 init_source();
+var filterStatements = (statements) => {
+  return statements.filter((statement) => {
+    if (statement.type === "alter_table_alter_column_set_type") {
+      if (statement.oldDataType.startsWith("tinyint") && statement.newDataType.startsWith("boolean")) {
+        return false;
+      }
+    } else if (statement.type === "alter_table_alter_column_set_default") {
+      if (statement.newDefaultValue === false && statement.oldDefaultValue === 0 && statement.newDataType === "boolean") {
+        return false;
+      }
+      if (statement.newDefaultValue === true && statement.oldDefaultValue === 1 && statement.newDataType === "boolean") {
+        return false;
+      }
+    }
+    return true;
+  });
+};
 var logSuggestionsAndReturn = async ({
   connection,
   statements
@@ -50955,9 +51092,7 @@ var logSuggestionsAndReturn = async ({
             statement.columnName
           )} column type from ${source_default.underline(
             statement.type
-          )} to ${source_default.underline(
-            statement.newDataType
-          )} with ${count} items`
+          )} to ${source_default.underline(statement.newDataType)} with ${count} items`
         );
         statementsToExecute.push(`truncate table ${statement.tableName};`);
         tablesToTruncate.push(statement.tableName);
@@ -51042,6 +51177,7 @@ var logSuggestionsAndReturn = async ({
 };
 
 // src/cli/index.ts
+init_serializer();
 var printVersions = () => {
   console.log(`${source_default.gray(versions())}
 `);
@@ -51055,7 +51191,7 @@ drizzle-orm: v${npmVersion}` : "";
 };
 var optionsSchema = objectType({
   schema: unionType([stringType(), stringType().array()]).optional(),
-  out: stringType().optional(),
+  out: stringType().optional().default("./drizzle"),
   config: stringType().optional(),
   breakpoints: booleanType().optional().default(false),
   custom: booleanType().optional().default(false)
@@ -51084,12 +51220,12 @@ var generateMysqlCommand = new Command("generate:mysql").option("--schema <schem
   const { prepareAndMigrateMySql: prepareAndMigrateMySql2 } = (init_migrate(), __toCommonJS(migrate_exports));
   await prepareAndMigrateMySql2(result);
 });
-var Select = class extends import_hanji6.Prompt {
+var Select = class extends import_hanji7.Prompt {
   constructor(items) {
     super();
     this.on("attach", (terminal) => terminal.toggleCursor("hide"));
     this.on("detach", () => clearInterval(this.timeout));
-    this.data = new import_hanji6.SelectState(
+    this.data = new import_hanji7.SelectState(
       items.map((it) => ({ label: it, value: `${it}-value` }))
     );
     this.data.bind(this);
@@ -51120,6 +51256,13 @@ var dbPushMysqlCommand = new Command("push:mysql").option(
   assertOrmCoreVersion();
   const { mysqlPushIntrospect: mysqlPushIntrospect2, connectToMySQL: connectToMySQL2 } = (init_mysqlIntrospect(), __toCommonJS(mysqlIntrospect_exports));
   const drizzleConfig = drizzleConfigFromFile(options.config);
+  const fileNames = prepareFilenames(drizzleConfig.schema);
+  if (fileNames.length === 0) {
+    (0, import_hanji7.render)(
+      `[${source_default.blue("i")}] No schema file in ${drizzleConfig.schema} was found`
+    );
+    process.exit(0);
+  }
   const connection = await connectToMySQL2(drizzleConfig);
   const filterConfig = drizzleConfig.tablesFilter;
   const tablesFilter = filterConfig ? typeof filterConfig === "string" ? [filterConfig] : filterConfig : [];
@@ -51132,8 +51275,9 @@ var dbPushMysqlCommand = new Command("push:mysql").option(
   try {
     if (typeof statements === "undefined") {
     } else if (statements.sqlStatements.length === 0) {
-      (0, import_hanji6.render)(`[${source_default.blue("i")}] No changes detected`);
+      (0, import_hanji7.render)(`[${source_default.blue("i")}] No changes detected`);
     } else {
+      const filteredStatements = filterStatements(statements.statements);
       const {
         shouldAskForApprove,
         statementsToExecute,
@@ -51143,7 +51287,7 @@ var dbPushMysqlCommand = new Command("push:mysql").option(
         schemasToRemove
       } = await logSuggestionsAndReturn({
         connection: connection.client,
-        statements: statements.statements
+        statements: filteredStatements
       });
       if (shouldAskForApprove) {
         console.log("\n");
@@ -51152,19 +51296,15 @@ var dbPushMysqlCommand = new Command("push:mysql").option(
             "THIS ACTION WILL CAUSE DATA LOSS AND CANNOT BE REVERTED\n"
           )
         );
-        console.log(
-          source_default.white(
-            "Do you still want to push changes?"
-          )
-        );
-        const { status, data } = await (0, import_hanji6.render)(
+        console.log(source_default.white("Do you still want to push changes?"));
+        const { status, data } = await (0, import_hanji7.render)(
           new Select([
             "No, abort",
             `Yes, I want to${tablesToRemove.length > 0 ? ` remove ${tablesToRemove.length} ${tablesToRemove.length > 1 ? "tables" : "table"},` : " "}${columnsToRemove.length > 0 ? ` remove ${columnsToRemove.length} ${columnsToRemove.length > 1 ? "columns" : "column"},` : " "}${tablesToTruncate.length > 0 ? ` truncate ${tablesToTruncate.length} ${tablesToTruncate.length > 1 ? "tables" : "table"}` : ""}`.replace(/(^,)|(,$)/g, "").replace(/ +(?= )/g, "")
           ])
         );
         if ((data == null ? void 0 : data.index) === 0) {
-          (0, import_hanji6.render)(`[${source_default.red("x")}] All changes were aborted`);
+          (0, import_hanji7.render)(`[${source_default.red("x")}] All changes were aborted`);
           process.exit(0);
         }
       }
@@ -51174,7 +51314,11 @@ var dbPushMysqlCommand = new Command("push:mysql").option(
       for (const statement of statements.sqlStatements) {
         await connection.client.query(statement);
       }
-      (0, import_hanji6.render)(`[${source_default.green("\u2713")}] Changes applied`);
+      if (filteredStatements.length > 0) {
+        (0, import_hanji7.render)(`[${source_default.green("\u2713")}] Changes applied`);
+      } else {
+        (0, import_hanji7.render)(`[${source_default.blue("i")}] No changes detected`);
+      }
     }
   } catch (e) {
     console.log(e);
@@ -51234,7 +51378,7 @@ var upMysqlCommand = new Command("up:mysql").option("--out <out>", `Output folde
   upgradeFolders("mysql", out);
   upMysqlHandler(out);
 });
-var upSqliteCommand = new Command("up:sqlite").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.json]`).action((options) => {
+var upSqliteCommand = new Command("up:sqlite").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.ts]`).action((options) => {
   printVersions();
   assertOrmCoreVersion();
   const params = checkSchema.parse(options);
@@ -51247,18 +51391,21 @@ var pt1 = objectType({
   out: stringType(),
   breakpoints: booleanType().optional().default(false)
 });
-var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Migrations folder`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option("--connectionString <connectionString>", "Postgres connection string").option("--host <host>", "Postgres host").option("--port <port>", "Postgres port").option("--user <user>", "Postgres user").option("--password <password>", "Postgres password").option("--database <database>", "Postgres database name").option("--ssl <ssl>", "Postgres ssl").action(async (options) => {
+var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Migrations folder`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option("--connectionString <connectionString>", "Postgres connection string").option("--host <host>", "Postgres host").option("--port <port>", "Postgres port").option("--user <user>", "Postgres user").option("--password <password>", "Postgres password").option("--database <database>", "Postgres database name").option("--ssl <ssl>", "Postgres ssl").option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   printVersions();
   assertPackages("drizzle-orm");
   assertOrmCoreVersion();
   const { pgIntrospect: pgIntrospect2, PgConfig2: PgConfig22, PgConfig1: PgConfig12 } = (init_pgIntrospect(), __toCommonJS(pgIntrospect_exports));
+  const drizzleConfig = readDrizzleConfig(options.config);
   const pgIntrospectConfig = unionType([
     pt1.extend(PgConfig22.shape),
     pt1.extend(PgConfig12.shape)
   ]);
-  const res = pgIntrospectConfig.safeParse(options);
+  const res = pgIntrospectConfig.safeParse(drizzleConfig);
   if (!res.success) {
-    console.log("Missing required params");
+    for (const issue of res.error.issues) {
+      console.log(issue.message);
+    }
     return;
   }
   const { snapshots, journal } = prepareOutFolder2(res.data.out, "pg");
@@ -51284,38 +51431,41 @@ var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Mi
       "introspect"
     );
   } else {
-    (0, import_hanji6.render)(
+    (0, import_hanji7.render)(
       `[${source_default.blue(
         "i"
       )}] No SQL generated, you already have migrations in project`
     );
   }
-  (0, import_hanji6.render)(
+  (0, import_hanji7.render)(
     `[${source_default.green(
       "\u2713"
     )}] You schema file is ready \u279C ${source_default.bold.underline.blue(
       schemaFile
     )} \u{1F680}`
   );
-  process.exit(1);
+  process.exit(0);
 });
 var introspectMySqlCommand = new Command("introspect:mysql").option(
   "--config <config>",
   "Path to a config.json file, drizzle.config.json by default"
-).action(async (options) => {
+).option("--out <out>", `Migrations folder`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option("--connectionString <connectionString>", "MySQL connection string").option("--host <host>", "MySQL host").option("--port <port>", "MySQL port").option("--user <user>", "MySQL user").option("--password <password>", "MySQL password").option("--database <database>", "MySQL database name").action(async (options) => {
   var _a;
   printVersions();
   assertPackages("drizzle-orm");
   assertOrmCoreVersion();
   const { mysqlIntrospect: mysqlIntrospect2 } = (init_mysqlIntrospect(), __toCommonJS(mysqlIntrospect_exports));
-  const drizzleConfig = drizzleConfigFromFile(options.config);
-  if (!drizzleConfig.out) {
-    console.log("You must specify 'out' path in your config file");
+  const drizzleConfig = readDrizzleConfig(options.config);
+  const res = mySqlIntrospectConfigSchema.safeParse(drizzleConfig);
+  if (!res.success) {
+    for (const issue of res.error.issues) {
+      console.log(issue.message);
+    }
     process.exit(1);
   }
-  const out = drizzleConfig.out;
+  const out = res.data.out;
   const { snapshots, journal } = prepareOutFolder2(out, "mysql");
-  const { schema: schema4, ts } = await mysqlIntrospect2(drizzleConfig);
+  const { schema: schema4, ts } = await mysqlIntrospect2(res.data);
   const schemaFile = import_path7.default.join(out, "schema.ts");
   (0, import_fs11.writeFileSync)(schemaFile, ts);
   console.log();
@@ -51333,17 +51483,17 @@ var introspectMySqlCommand = new Command("introspect:mysql").option(
       journal,
       _meta,
       out,
-      (_a = drizzleConfig.breakpoints) != null ? _a : false,
+      (_a = res.data.breakpoints) != null ? _a : false,
       "introspect"
     );
   } else {
-    (0, import_hanji6.render)(
+    (0, import_hanji7.render)(
       `[${source_default.blue(
         "i"
       )}] No SQL generated, you already have migrations in project`
     );
   }
-  (0, import_hanji6.render)(
+  (0, import_hanji7.render)(
     `[${source_default.green(
       "\u2713"
     )}] You schema file is ready \u279C ${source_default.bold.underline.blue(