drizzle-kit 0.30.2-471d797 → 0.30.2-88fe396

package/bin.cjs

@@ -24024,7 +24024,7 @@ function fromJson(statements, dialect6, action, json2) {
   }).filter((it) => it !== "");
   return result;
 }
-var parseType, Convertor, PgCreateRoleConvertor, PgDropRoleConvertor, PgRenameRoleConvertor, PgAlterRoleConvertor, PgCreatePolicyConvertor, PgDropPolicyConvertor, PgRenamePolicyConvertor, PgAlterPolicyConvertor, PgCreateIndPolicyConvertor, PgDropIndPolicyConvertor, PgRenameIndPolicyConvertor, PgAlterIndPolicyConvertor, PgEnableRlsConvertor, PgDisableRlsConvertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SingleStoreCreateTableConvertor, SQLiteCreateTableConvertor, PgCreateViewConvertor, MySqlCreateViewConvertor, SqliteCreateViewConvertor, PgDropViewConvertor, MySqlDropViewConvertor, SqliteDropViewConvertor, MySqlAlterViewConvertor, PgRenameViewConvertor, MySqlRenameViewConvertor, PgAlterViewSchemaConvertor, PgAlterViewAddWithOptionConvertor, PgAlterViewDropWithOptionConvertor, PgAlterViewAlterTablespaceConvertor, PgAlterViewAlterUsingConvertor, PgAlterTableAlterColumnSetGenerated, PgAlterTableAlterColumnDropGenerated, PgAlterTableAlterColumnAlterGenerated, PgAlterTableAddUniqueConstraintConvertor, PgAlterTableDropUniqueConstraintConvertor, PgAlterTableAddCheckConstraintConvertor, PgAlterTableDeleteCheckConstraintConvertor, MySQLAlterTableAddUniqueConstraintConvertor, MySQLAlterTableDropUniqueConstraintConvertor, MySqlAlterTableAddCheckConstraintConvertor, SingleStoreAlterTableAddUniqueConstraintConvertor, SingleStoreAlterTableDropUniqueConstraintConvertor, MySqlAlterTableDeleteCheckConstraintConvertor, CreatePgSequenceConvertor, DropPgSequenceConvertor, RenamePgSequenceConvertor, MovePgSequenceConvertor, AlterPgSequenceConvertor, CreateTypeEnumConvertor, DropTypeEnumConvertor, AlterTypeAddValueConvertor, AlterTypeSetSchemaConvertor, AlterRenameTypeConvertor, AlterTypeDropValueConvertor, PgDropTableConvertor, MySQLDropTableConvertor, SingleStoreDropTableConvertor, SQLiteDropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, SingleStoreRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SingleStoreAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SingleStoreAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SingleStoreAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, PgAlterTableAlterColumnDropGeneratedConvertor, PgAlterTableAlterColumnSetExpressionConvertor, PgAlterTableAlterColumnAlterrGeneratedConvertor, SqliteAlterTableAlterColumnDropGeneratedConvertor, SqliteAlterTableAlterColumnSetExpressionConvertor, SqliteAlterTableAlterColumnAlterGeneratedConvertor, MySqlAlterTableAlterColumnAlterrGeneratedConvertor, MySqlAlterTableAddPk, MySqlAlterTableDropPk, LibSQLModifyColumn, MySqlModifyColumn, SingleStoreAlterTableAlterColumnAlterrGeneratedConvertor, SingleStoreAlterTableAddPk, SingleStoreAlterTableDropPk, SingleStoreModifyColumn, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetPrimaryKeyConvertor, PgAlterTableAlterColumnDropPrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, LibSQLCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSingleStoreIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MySqlDropIndexConvertor, SingleStoreDropIndexConvertor, SQLiteRecreateTableConvertor, LibSQLRecreateTableConvertor, convertors;
+var parseType, Convertor, PgCreateRoleConvertor, PgDropRoleConvertor, PgRenameRoleConvertor, PgAlterRoleConvertor, PgCreatePolicyConvertor, PgDropPolicyConvertor, PgRenamePolicyConvertor, PgAlterPolicyConvertor, PgCreateIndPolicyConvertor, PgDropIndPolicyConvertor, PgRenameIndPolicyConvertor, PgAlterIndPolicyConvertor, PgEnableRlsConvertor, PgDisableRlsConvertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SingleStoreCreateTableConvertor, SQLiteCreateTableConvertor, PgCreateViewConvertor, MySqlCreateViewConvertor, SqliteCreateViewConvertor, PgDropViewConvertor, MySqlDropViewConvertor, SqliteDropViewConvertor, MySqlAlterViewConvertor, PgRenameViewConvertor, MySqlRenameViewConvertor, PgAlterViewSchemaConvertor, PgAlterViewAddWithOptionConvertor, PgAlterViewDropWithOptionConvertor, PgAlterViewAlterTablespaceConvertor, PgAlterViewAlterUsingConvertor, PgAlterTableAlterColumnSetGenerated, PgAlterTableAlterColumnDropGenerated, PgAlterTableAlterColumnAlterGenerated, PgAlterTableAddUniqueConstraintConvertor, PgAlterTableDropUniqueConstraintConvertor, PgAlterTableAddCheckConstraintConvertor, PgAlterTableDeleteCheckConstraintConvertor, MySQLAlterTableAddUniqueConstraintConvertor, MySQLAlterTableDropUniqueConstraintConvertor, MySqlAlterTableAddCheckConstraintConvertor, SingleStoreAlterTableAddUniqueConstraintConvertor, SingleStoreAlterTableDropUniqueConstraintConvertor, MySqlAlterTableDeleteCheckConstraintConvertor, CreatePgSequenceConvertor, DropPgSequenceConvertor, RenamePgSequenceConvertor, MovePgSequenceConvertor, AlterPgSequenceConvertor, CreateTypeEnumConvertor, DropTypeEnumConvertor, AlterTypeAddValueConvertor, AlterTypeSetSchemaConvertor, AlterRenameTypeConvertor, AlterTypeDropValueConvertor, PgDropTableConvertor, MySQLDropTableConvertor, SingleStoreDropTableConvertor, SQLiteDropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, SingleStoreRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SingleStoreAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SingleStoreAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SingleStoreAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, PgAlterTableAlterColumnDropGeneratedConvertor, PgAlterTableAlterColumnSetExpressionConvertor, PgAlterTableAlterColumnAlterrGeneratedConvertor, SqliteAlterTableAlterColumnDropGeneratedConvertor, SqliteAlterTableAlterColumnSetExpressionConvertor, SqliteAlterTableAlterColumnAlterGeneratedConvertor, MySqlAlterTableAlterColumnAlterrGeneratedConvertor, MySqlAlterTableAddPk, MySqlAlterTableDropPk, LibSQLModifyColumn, MySqlModifyColumn, SingleStoreAlterTableAlterColumnAlterrGeneratedConvertor, SingleStoreAlterTableAddPk, SingleStoreAlterTableDropPk, SingleStoreModifyColumn, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetPrimaryKeyConvertor, PgAlterTableAlterColumnDropPrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, LibSQLCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSingleStoreIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MySqlDropIndexConvertor, SingleStoreDropIndexConvertor, SQLiteRecreateTableConvertor, LibSQLRecreateTableConvertor, SingleStoreRecreateTableConvertor, convertors;
 var init_sqlgenerator = __esm({
   "src/sqlgenerator.ts"() {
     "use strict";
@@ -24375,7 +24375,7 @@ var init_sqlgenerator = __esm({
         if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
           statement += ",\n";
           const compositePK5 = SingleStoreSquasher.unsquashPK(compositePKs[0]);
-          statement += `	CONSTRAINT \`${st.compositePkName}\` PRIMARY KEY(\`${compositePK5.columns.join(`\`,\``)}\`)`;
+          statement += `	CONSTRAINT \`${compositePK5.name}\` PRIMARY KEY(\`${compositePK5.columns.join(`\`,\``)}\`)`;
         }
         if (typeof uniqueConstraints !== "undefined" && uniqueConstraints.length > 0) {
           for (const uniqueConstraint5 of uniqueConstraints) {
@@ -25035,7 +25035,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
       }
       convert(statement) {
         const { tableNameFrom, tableNameTo } = statement;
-        return `RENAME TABLE \`${tableNameFrom}\` TO \`${tableNameTo}\`;`;
+        return `ALTER TABLE \`${tableNameFrom}\` RENAME TO \`${tableNameTo}\`;`;
       }
     };
     PgAlterTableRenameColumnConvertor = class extends Convertor {
@@ -25063,7 +25063,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
       }
       convert(statement) {
         const { tableName, oldColumnName, newColumnName } = statement;
-        return `ALTER TABLE \`${tableName}\` RENAME COLUMN \`${oldColumnName}\` TO \`${newColumnName}\`;`;
+        return `ALTER TABLE \`${tableName}\` CHANGE \`${oldColumnName}\` \`${newColumnName}\`;`;
       }
     };
     SQLiteAlterTableRenameColumnConvertor = class extends Convertor {
@@ -26378,10 +26378,52 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newC
         return sqlStatements;
       }
     };
+    SingleStoreRecreateTableConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "singlestore_recreate_table" && dialect6 === "singlestore";
+      }
+      convert(statement) {
+        const { tableName, columns, compositePKs, uniqueConstraints } = statement;
+        const columnNames = columns.map((it) => `\`${it.name}\``).join(", ");
+        const newTableName = `__new_${tableName}`;
+        const sqlStatements = [];
+        sqlStatements.push(
+          new SingleStoreCreateTableConvertor().convert({
+            type: "create_table",
+            tableName: newTableName,
+            columns,
+            compositePKs,
+            uniqueConstraints,
+            schema: ""
+          })
+        );
+        sqlStatements.push(
+          `INSERT INTO \`${newTableName}\`(${columnNames}) SELECT ${columnNames} FROM \`${tableName}\`;`
+        );
+        sqlStatements.push(
+          new SingleStoreDropTableConvertor().convert({
+            type: "drop_table",
+            tableName,
+            schema: ""
+          })
+        );
+        sqlStatements.push(
+          new SingleStoreRenameTableConvertor().convert({
+            fromSchema: "",
+            tableNameFrom: newTableName,
+            tableNameTo: tableName,
+            toSchema: "",
+            type: "rename_table"
+          })
+        );
+        return sqlStatements;
+      }
+    };
     convertors = [];
     convertors.push(new PgCreateTableConvertor());
     convertors.push(new MySqlCreateTableConvertor());
     convertors.push(new SingleStoreCreateTableConvertor());
+    convertors.push(new SingleStoreRecreateTableConvertor());
     convertors.push(new SQLiteCreateTableConvertor());
     convertors.push(new SQLiteRecreateTableConvertor());
     convertors.push(new LibSQLRecreateTableConvertor());
@@ -28390,7 +28432,7 @@ var init_jsonStatements = __esm({
 });
 
 // src/statementCombiner.ts
-var prepareLibSQLRecreateTable, prepareSQLiteRecreateTable, libSQLCombineStatements, sqliteCombineStatements;
+var prepareLibSQLRecreateTable, prepareSQLiteRecreateTable, libSQLCombineStatements, sqliteCombineStatements, prepareSingleStoreRecreateTable, singleStoreCombineStatements;
 var init_statementCombiner = __esm({
   "src/statementCombiner.ts"() {
     "use strict";
@@ -28669,6 +28711,101 @@ var init_statementCombiner = __esm({
       const rest = combinedStatements.filter((it) => it.type !== "rename_table" && it.type !== "alter_table_rename_column");
       return [...renamedTables, ...renamedColumns, ...rest];
     };
+    prepareSingleStoreRecreateTable = (table5) => {
+      const { name, columns, uniqueConstraints, indexes, compositePrimaryKeys } = table5;
+      const composites = Object.values(compositePrimaryKeys);
+      const statements = [
+        {
+          type: "singlestore_recreate_table",
+          tableName: name,
+          columns: Object.values(columns),
+          compositePKs: composites,
+          uniqueConstraints: Object.values(uniqueConstraints)
+        }
+      ];
+      if (Object.keys(indexes).length) {
+        statements.push(...prepareCreateIndexesJson(name, "", indexes));
+      }
+      return statements;
+    };
+    singleStoreCombineStatements = (statements, json2) => {
+      const newStatements = {};
+      for (const statement of statements) {
+        if (statement.type === "alter_table_alter_column_set_type" || statement.type === "alter_table_alter_column_set_notnull" || statement.type === "alter_table_alter_column_drop_notnull" || statement.type === "alter_table_alter_column_drop_autoincrement" || statement.type === "alter_table_alter_column_set_autoincrement" || statement.type === "alter_table_alter_column_drop_pk" || statement.type === "alter_table_alter_column_set_pk" || statement.type === "create_composite_pk" || statement.type === "alter_composite_pk" || statement.type === "delete_composite_pk") {
+          const tableName2 = statement.tableName;
+          const statementsForTable2 = newStatements[tableName2];
+          if (!statementsForTable2) {
+            newStatements[tableName2] = prepareSingleStoreRecreateTable(json2.tables[tableName2]);
+            continue;
+          }
+          if (!statementsForTable2.some(({ type }) => type === "recreate_table")) {
+            const wasRename = statementsForTable2.some(
+              ({ type }) => type === "rename_table" || type === "alter_table_rename_column"
+            );
+            const preparedStatements = prepareSingleStoreRecreateTable(json2.tables[tableName2]);
+            if (wasRename) {
+              newStatements[tableName2].push(...preparedStatements);
+            } else {
+              newStatements[tableName2] = preparedStatements;
+            }
+            continue;
+          }
+          continue;
+        }
+        if ((statement.type === "alter_table_alter_column_drop_default" || statement.type === "alter_table_alter_column_set_default") && statement.columnNotNull) {
+          const tableName2 = statement.tableName;
+          const statementsForTable2 = newStatements[tableName2];
+          if (!statementsForTable2) {
+            newStatements[tableName2] = prepareSingleStoreRecreateTable(json2.tables[tableName2]);
+            continue;
+          }
+          if (!statementsForTable2.some(({ type }) => type === "recreate_table")) {
+            const wasRename = statementsForTable2.some(({ type }) => type === "rename_table");
+            const preparedStatements = prepareSingleStoreRecreateTable(json2.tables[tableName2]);
+            if (wasRename) {
+              newStatements[tableName2].push(...preparedStatements);
+            } else {
+              newStatements[tableName2] = preparedStatements;
+            }
+            continue;
+          }
+          continue;
+        }
+        if (statement.type === "alter_table_add_column" && statement.column.primaryKey) {
+          const tableName2 = statement.tableName;
+          const statementsForTable2 = newStatements[tableName2];
+          if (!statementsForTable2) {
+            newStatements[tableName2] = prepareSingleStoreRecreateTable(json2.tables[tableName2]);
+            continue;
+          }
+          if (!statementsForTable2.some(({ type }) => type === "recreate_table")) {
+            const wasRename = statementsForTable2.some(({ type }) => type === "rename_table");
+            const preparedStatements = prepareSingleStoreRecreateTable(json2.tables[tableName2]);
+            if (wasRename) {
+              newStatements[tableName2].push(...preparedStatements);
+            } else {
+              newStatements[tableName2] = preparedStatements;
+            }
+            continue;
+          }
+          continue;
+        }
+        const tableName = statement.type === "rename_table" ? statement.tableNameTo : statement.tableName;
+        const statementsForTable = newStatements[tableName];
+        if (!statementsForTable) {
+          newStatements[tableName] = [statement];
+          continue;
+        }
+        if (!statementsForTable.some(({ type }) => type === "singlestore_recreate_table")) {
+          newStatements[tableName].push(statement);
+        }
+      }
+      const combinedStatements = Object.values(newStatements).flat();
+      const renamedTables = combinedStatements.filter((it) => it.type === "rename_table");
+      const renamedColumns = combinedStatements.filter((it) => it.type === "alter_table_rename_column");
+      const rest = combinedStatements.filter((it) => it.type !== "rename_table" && it.type !== "alter_table_rename_column");
+      return [...renamedTables, ...renamedColumns, ...rest];
+    };
   }
 });
 
@@ -30578,7 +30715,7 @@ var init_snapshotsDiffer = __esm({
           return [tableKey2, tableValue];
         }
       );
-      const diffResult = applyJsonDiff(tablesPatchedSnap1, json2);
+      const diffResult = applyJsonDiff(columnsPatchedSnap1, json2);
       const typedResult = diffResultSchemeSingleStore.parse(diffResult);
       const jsonStatements = [];
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
@@ -30742,7 +30879,8 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
-      const sqlStatements = fromJson(jsonStatements, "singlestore");
+      const combinedJsonStatements = singleStoreCombineStatements(jsonStatements, json2);
+      const sqlStatements = fromJson(combinedJsonStatements, "singlestore");
       const uniqueSqlStatements = [];
       sqlStatements.forEach((ss) => {
         if (!uniqueSqlStatements.includes(ss)) {
@@ -30754,7 +30892,7 @@ var init_snapshotsDiffer = __esm({
       });
       const _meta = prepareMigrationMeta([], rTables, rColumns);
       return {
-        statements: jsonStatements,
+        statements: combinedJsonStatements,
         sqlStatements: uniqueSqlStatements,
         _meta
       };
@@ -65729,13 +65867,28 @@ var init_pgPushUtils = __esm({
 });
 
 // src/cli/commands/singlestorePushUtils.ts
+function findColumnTypeAlternations(columns1, columns2) {
+  const changes = [];
+  for (const key in columns1) {
+    if (columns1.hasOwnProperty(key) && columns2.hasOwnProperty(key)) {
+      const col1 = columns1[key];
+      const col2 = columns2[key];
+      if (col1.type !== col2.type) {
+        changes.push(col2.name);
+      }
+    }
+  }
+  return changes;
+}
 var import_hanji8, filterStatements2, logSuggestionsAndReturn3;
 var init_singlestorePushUtils = __esm({
   "src/cli/commands/singlestorePushUtils.ts"() {
     "use strict";
     init_source();
     import_hanji8 = __toESM(require_hanji());
+    init_sqlgenerator();
     init_singlestoreSchema();
+    init_utils2();
     init_selector_ui();
     init_outputs();
     filterStatements2 = (statements, currentSchema, prevSchema) => {
@@ -65779,7 +65932,7 @@ var init_singlestorePushUtils = __esm({
         return true;
       });
     };
-    logSuggestionsAndReturn3 = async (db, statements, json2) => {
+    logSuggestionsAndReturn3 = async (db, statements, json2, json1) => {
       let shouldAskForApprove = false;
       const statementsToExecute = [];
       const infoToPrint = [];
@@ -65960,6 +66113,71 @@ var init_singlestorePushUtils = __esm({
               shouldAskForApprove = true;
             }
           }
+        } else if (statement.type === "singlestore_recreate_table") {
+          const tableName = statement.tableName;
+          const prevColumns = json1.tables[tableName].columns;
+          const currentColumns = json2.tables[tableName].columns;
+          const { removedColumns, addedColumns } = findAddedAndRemoved(
+            Object.keys(prevColumns),
+            Object.keys(currentColumns)
+          );
+          if (removedColumns.length) {
+            for (const removedColumn of removedColumns) {
+              const res = await db.query(
+                `select count(\`${tableName}\`.\`${removedColumn}\`) as count from \`${tableName}\``
+              );
+              const count = Number(res[0].count);
+              if (count > 0) {
+                infoToPrint.push(
+                  `\xB7 You're about to delete ${source_default.underline(
+                    removedColumn
+                  )} column in ${tableName} table with ${count} items`
+                );
+                columnsToRemove.push(removedColumn);
+                shouldAskForApprove = true;
+              }
+            }
+          }
+          if (addedColumns.length) {
+            for (const addedColumn of addedColumns) {
+              const [res] = await db.query(
+                `select count(*) as count from \`${tableName}\``
+              );
+              const columnConf = json2.tables[tableName].columns[addedColumn];
+              const count = Number(res.count);
+              if (count > 0 && columnConf.notNull && !columnConf.default) {
+                infoToPrint.push(
+                  `\xB7 You're about to add not-null ${source_default.underline(
+                    addedColumn
+                  )} column without default value to table, which contains ${count} items`
+                );
+                shouldAskForApprove = true;
+                tablesToTruncate.push(tableName);
+                statementsToExecute.push(`TRUNCATE TABLE \`${tableName}\`;`);
+              }
+            }
+          }
+          const columnWithChangedType = findColumnTypeAlternations(prevColumns, currentColumns);
+          for (const column9 of columnWithChangedType) {
+            const [res] = await db.query(
+              `select count(*) as count from \`${tableName}\` WHERE \`${tableName}\`.\`${column9}\` IS NOT NULL;`
+            );
+            const count = Number(res.count);
+            if (count > 0) {
+              infoToPrint.push(
+                `\xB7 You're about recreate ${source_default.underline(tableName)} table with data type changing for ${source_default.underline(
+                  column9
+                )} column, which contains ${count} items`
+              );
+              shouldAskForApprove = true;
+              tablesToTruncate.push(tableName);
+              statementsToExecute.push(`TRUNCATE TABLE \`${tableName}\`;`);
+            }
+          }
+        }
+        const stmnt = fromJson([statement], "singlestore", "push");
+        if (typeof stmnt !== "undefined") {
+          statementsToExecute.push(...stmnt);
         }
       }
       return {
@@ -67810,30 +68028,16 @@ var init_push = __esm({
           } = await logSuggestionsAndReturn3(
             db,
             filteredStatements,
-            statements.validatedCur
+            statements.validatedCur,
+            statements.validatedPrev
           );
-          const filteredSqlStatements = fromJson(filteredStatements, "singlestore");
-          const uniqueSqlStatementsToExecute = [];
-          statementsToExecute.forEach((ss) => {
-            if (!uniqueSqlStatementsToExecute.includes(ss)) {
-              uniqueSqlStatementsToExecute.push(ss);
-            }
-          });
-          const uniqueFilteredSqlStatements = [];
-          filteredSqlStatements.forEach((ss) => {
-            if (!uniqueFilteredSqlStatements.includes(ss)) {
-              uniqueFilteredSqlStatements.push(ss);
-            }
-          });
           if (verbose) {
             console.log();
             console.log(
               withStyle.warning("You are about to execute current statements:")
             );
             console.log();
-            console.log(
-              [...uniqueSqlStatementsToExecute, ...uniqueFilteredSqlStatements].map((s2) => source_default.blue(s2)).join("\n")
-            );
+            console.log(statementsToExecute.map((s2) => source_default.blue(s2)).join("\n"));
             console.log();
           }
           if (!force && strict) {
@@ -67868,12 +68072,9 @@ var init_push = __esm({
               process.exit(0);
             }
           }
-          for (const dStmnt of uniqueSqlStatementsToExecute) {
+          for (const dStmnt of statementsToExecute) {
             await db.query(dStmnt);
           }
-          for (const statement of uniqueFilteredSqlStatements) {
-            await db.query(statement);
-          }
           if (filteredStatements.length > 0) {
             (0, import_hanji13.render)(`[${source_default.green("\u2713")}] Changes applied`);
           } else {
@@ -74509,7 +74710,7 @@ var init_studio2 = __esm({
     };
     prepareSingleStoreSchema = async (path4) => {
       const imports = prepareFilenames(path4);
-      const singlestoreSchema3 = {
+      const singlestoreSchema2 = {
         public: {}
       };
       const relations4 = {};
@@ -74526,7 +74727,7 @@ var init_studio2 = __esm({
         i0values.forEach(([k, t2]) => {
           if ((0, import_drizzle_orm10.is)(t2, import_singlestore_core3.SingleStoreTable)) {
             const schema6 = (0, import_singlestore_core3.getTableConfig)(t2).schema || "public";
-            singlestoreSchema3[schema6][k] = t2;
+            singlestoreSchema2[schema6][k] = t2;
           }
           if ((0, import_drizzle_orm10.is)(t2, import_drizzle_orm10.Relations)) {
             relations4[k] = t2;
@@ -74534,7 +74735,7 @@ var init_studio2 = __esm({
         });
       }
       unregister();
-      return { schema: singlestoreSchema3, relations: relations4, files };
+      return { schema: singlestoreSchema2, relations: relations4, files };
     };
     getCustomDefaults = (schema6) => {
       const customDefaults = [];
@@ -74660,10 +74861,10 @@ var init_studio2 = __esm({
         schemaFiles
       };
     };
-    drizzleForSingleStore = async (credentials2, singlestoreSchema3, relations4, schemaFiles) => {
+    drizzleForSingleStore = async (credentials2, singlestoreSchema2, relations4, schemaFiles) => {
       const { connectToSingleStore: connectToSingleStore2 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
       const { proxy } = await connectToSingleStore2(credentials2);
-      const customDefaults = getCustomDefaults(singlestoreSchema3);
+      const customDefaults = getCustomDefaults(singlestoreSchema2);
       let dbUrl;
       if ("url" in credentials2) {
         dbUrl = credentials2.url;
@@ -74676,7 +74877,7 @@ var init_studio2 = __esm({
         dialect: "singlestore",
         proxy,
         customDefaults,
-        schema: singlestoreSchema3,
+        schema: singlestoreSchema2,
         relations: relations4,
         schemaFiles
       };
@@ -77382,7 +77583,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.30.2-471d797";
+  const envVersion = "0.30.2-88fe396";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.30.2-471d797",
+	"version": "0.30.2-88fe396",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",