drizzle-kit 0.30.2 → 0.30.3-2c67783

package/api.js

@@ -12121,7 +12121,7 @@ function fromJson(statements, dialect6, action, json22) {
   }).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";
@@ -12467,7 +12467,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) {
@@ -13122,7 +13122,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 {
@@ -13150,7 +13150,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 {
@@ -14460,10 +14460,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());
@@ -16459,7 +16501,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";
@@ -16738,6 +16780,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: name2, columns, uniqueConstraints, indexes, compositePrimaryKeys } = table5;
+      const composites = Object.values(compositePrimaryKeys);
+      const statements = [
+        {
+          type: "singlestore_recreate_table",
+          tableName: name2,
+          columns: Object.values(columns),
+          compositePKs: composites,
+          uniqueConstraints: Object.values(uniqueConstraints)
+        }
+      ];
+      if (Object.keys(indexes).length) {
+        statements.push(...prepareCreateIndexesJson(name2, "", indexes));
+      }
+      return statements;
+    };
+    singleStoreCombineStatements = (statements, json22) => {
+      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(json22.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(json22.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(json22.tables[tableName2]);
+            continue;
+          }
+          if (!statementsForTable2.some(({ type }) => type === "recreate_table")) {
+            const wasRename = statementsForTable2.some(({ type }) => type === "rename_table");
+            const preparedStatements = prepareSingleStoreRecreateTable(json22.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(json22.tables[tableName2]);
+            continue;
+          }
+          if (!statementsForTable2.some(({ type }) => type === "recreate_table")) {
+            const wasRename = statementsForTable2.some(({ type }) => type === "rename_table");
+            const preparedStatements = prepareSingleStoreRecreateTable(json22.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];
+    };
   }
 });
 
@@ -18683,7 +18820,7 @@ var init_snapshotsDiffer = __esm({
           return [tableKey2, tableValue];
         }
       );
-      const diffResult = applyJsonDiff(tablesPatchedSnap1, json22);
+      const diffResult = applyJsonDiff(columnsPatchedSnap1, json22);
       const typedResult = diffResultSchemeSingleStore.parse(diffResult);
       const jsonStatements = [];
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
@@ -18847,7 +18984,8 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
-      const sqlStatements = fromJson(jsonStatements, "singlestore");
+      const combinedJsonStatements = singleStoreCombineStatements(jsonStatements, json22);
+      const sqlStatements = fromJson(combinedJsonStatements, "singlestore");
       const uniqueSqlStatements = [];
       sqlStatements.forEach((ss) => {
         if (!uniqueSqlStatements.includes(ss)) {
@@ -18859,7 +18997,7 @@ var init_snapshotsDiffer = __esm({
       });
       const _meta = prepareMigrationMeta([], rTables, rColumns);
       return {
-        statements: jsonStatements,
+        statements: combinedJsonStatements,
         sqlStatements: uniqueSqlStatements,
         _meta
       };
@@ -21977,7 +22115,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.38.4";
+    version = "0.39.0";
   }
 });
 
@@ -22165,6 +22303,9 @@ function fillPlaceholders(params, values) {
 function isView(view4) {
   return typeof view4 === "object" && view4 !== null && IsDrizzleView in view4;
 }
+function getViewName(view4) {
+  return view4[ViewBaseConfig].name;
+}
 var _a19, FakePrimitiveParam, _a20, StringChunk, _a21, _SQL, SQL, _a22, Name, noopDecoder, noopEncoder, noopMapper, _a23, Param, _a24, Placeholder, IsDrizzleView, _a25, _b10, _c2, View3;
 var init_sql = __esm({
   "../drizzle-orm/dist/sql/sql.js"() {
@@ -25291,6 +25432,7 @@ __export(dist_exports, {
   getTableLikeName: () => getTableLikeName,
   getTableName: () => getTableName,
   getTableUniqueName: () => getTableUniqueName,
+  getViewName: () => getViewName,
   getViewSelectedFields: () => getViewSelectedFields,
   gt: () => gt,
   gte: () => gte,
@@ -25445,17 +25587,100 @@ var init_columns = __esm({
   }
 });
 
+// ../drizzle-orm/dist/selection-proxy.js
+var _a124, _SelectionProxyHandler, SelectionProxyHandler;
+var init_selection_proxy = __esm({
+  "../drizzle-orm/dist/selection-proxy.js"() {
+    "use strict";
+    init_alias();
+    init_column();
+    init_entity();
+    init_sql();
+    init_subquery();
+    init_view_common();
+    _a124 = entityKind;
+    _SelectionProxyHandler = class _SelectionProxyHandler {
+      constructor(config) {
+        __publicField(this, "config");
+        this.config = { ...config };
+      }
+      get(subquery, prop) {
+        if (prop === "_") {
+          return {
+            ...subquery["_"],
+            selectedFields: new Proxy(
+              subquery._.selectedFields,
+              this
+            )
+          };
+        }
+        if (prop === ViewBaseConfig) {
+          return {
+            ...subquery[ViewBaseConfig],
+            selectedFields: new Proxy(
+              subquery[ViewBaseConfig].selectedFields,
+              this
+            )
+          };
+        }
+        if (typeof prop === "symbol") {
+          return subquery[prop];
+        }
+        const columns = is(subquery, Subquery) ? subquery._.selectedFields : is(subquery, View3) ? subquery[ViewBaseConfig].selectedFields : subquery;
+        const value = columns[prop];
+        if (is(value, SQL.Aliased)) {
+          if (this.config.sqlAliasedBehavior === "sql" && !value.isSelectionField) {
+            return value.sql;
+          }
+          const newValue = value.clone();
+          newValue.isSelectionField = true;
+          return newValue;
+        }
+        if (is(value, SQL)) {
+          if (this.config.sqlBehavior === "sql") {
+            return value;
+          }
+          throw new Error(
+            `You tried to reference "${prop}" field from a subquery, which is a raw SQL field, but it doesn't have an alias declared. Please add an alias to the field using ".as('alias')" method.`
+          );
+        }
+        if (is(value, Column2)) {
+          if (this.config.alias) {
+            return new Proxy(
+              value,
+              new ColumnAliasProxyHandler(
+                new Proxy(
+                  value.table,
+                  new TableAliasProxyHandler(this.config.alias, this.config.replaceOriginalName ?? false)
+                )
+              )
+            );
+          }
+          return value;
+        }
+        if (typeof value !== "object" || value === null) {
+          return value;
+        }
+        return new Proxy(value, new _SelectionProxyHandler(this.config));
+      }
+    };
+    __publicField(_SelectionProxyHandler, _a124, "SelectionProxyHandler");
+    SelectionProxyHandler = _SelectionProxyHandler;
+  }
+});
+
 // ../drizzle-orm/dist/pg-core/query-builders/delete.js
-var _a124, _b97, PgDeleteBase;
+var _a125, _b97, PgDeleteBase;
 var init_delete = __esm({
   "../drizzle-orm/dist/pg-core/query-builders/delete.js"() {
     "use strict";
     init_entity();
     init_query_promise();
+    init_selection_proxy();
     init_table();
     init_tracing();
     init_utils2();
-    PgDeleteBase = class extends (_b97 = QueryPromise, _a124 = entityKind, _b97) {
+    PgDeleteBase = class extends (_b97 = QueryPromise, _a125 = entityKind, _b97) {
       constructor(table5, session, dialect6, withList) {
         super();
         __publicField(this, "config");
@@ -25503,6 +25728,7 @@ var init_delete = __esm({
         return this;
       }
       returning(fields = this.config.table[Table2.Symbol.Columns]) {
+        this.config.returningFields = fields;
         this.config.returning = orderSelectedFields(fields);
         return this;
       }
@@ -25528,11 +25754,22 @@ var init_delete = __esm({
         this.authToken = token;
         return this;
       }
+      /** @internal */
+      getSelectedFields() {
+        return this.config.returningFields ? new Proxy(
+          this.config.returningFields,
+          new SelectionProxyHandler({
+            alias: getTableName(this.config.table),
+            sqlAliasedBehavior: "alias",
+            sqlBehavior: "error"
+          })
+        ) : void 0;
+      }
       $dynamic() {
         return this;
       }
     };
-    __publicField(PgDeleteBase, _a124, "PgDelete");
+    __publicField(PgDeleteBase, _a125, "PgDelete");
   }
 });
 
@@ -25551,13 +25788,13 @@ function toCamelCase(input) {
 function noopCase(input) {
   return input;
 }
-var _a125, CasingCache;
+var _a126, CasingCache;
 var init_casing = __esm({
   "../drizzle-orm/dist/casing.js"() {
     "use strict";
     init_entity();
     init_table();
-    _a125 = entityKind;
+    _a126 = entityKind;
     CasingCache = class {
       constructor(casing2) {
         /** @internal */
@@ -25594,25 +25831,25 @@ var init_casing = __esm({
         this.cachedTables = {};
       }
     };
-    __publicField(CasingCache, _a125, "CasingCache");
+    __publicField(CasingCache, _a126, "CasingCache");
   }
 });
 
 // ../drizzle-orm/dist/pg-core/view-base.js
-var _a126, _b98, PgViewBase;
+var _a127, _b98, PgViewBase;
 var init_view_base = __esm({
   "../drizzle-orm/dist/pg-core/view-base.js"() {
     "use strict";
     init_entity();
     init_sql();
-    PgViewBase = class extends (_b98 = View3, _a126 = entityKind, _b98) {
+    PgViewBase = class extends (_b98 = View3, _a127 = entityKind, _b98) {
     };
-    __publicField(PgViewBase, _a126, "PgViewBase");
+    __publicField(PgViewBase, _a127, "PgViewBase");
   }
 });
 
 // ../drizzle-orm/dist/pg-core/dialect.js
-var _a127, PgDialect;
+var _a128, PgDialect;
 var init_dialect = __esm({
   "../drizzle-orm/dist/pg-core/dialect.js"() {
     "use strict";
@@ -25631,7 +25868,7 @@ var init_dialect = __esm({
     init_utils2();
     init_view_common();
     init_view_base();
-    _a127 = entityKind;
+    _a128 = entityKind;
     PgDialect = class {
       constructor(config) {
         /** @internal */
@@ -26723,89 +26960,7 @@ var init_dialect = __esm({
         };
       }
     };
-    __publicField(PgDialect, _a127, "PgDialect");
-  }
-});
-
-// ../drizzle-orm/dist/selection-proxy.js
-var _a128, _SelectionProxyHandler, SelectionProxyHandler;
-var init_selection_proxy = __esm({
-  "../drizzle-orm/dist/selection-proxy.js"() {
-    "use strict";
-    init_alias();
-    init_column();
-    init_entity();
-    init_sql();
-    init_subquery();
-    init_view_common();
-    _a128 = entityKind;
-    _SelectionProxyHandler = class _SelectionProxyHandler {
-      constructor(config) {
-        __publicField(this, "config");
-        this.config = { ...config };
-      }
-      get(subquery, prop) {
-        if (prop === "_") {
-          return {
-            ...subquery["_"],
-            selectedFields: new Proxy(
-              subquery._.selectedFields,
-              this
-            )
-          };
-        }
-        if (prop === ViewBaseConfig) {
-          return {
-            ...subquery[ViewBaseConfig],
-            selectedFields: new Proxy(
-              subquery[ViewBaseConfig].selectedFields,
-              this
-            )
-          };
-        }
-        if (typeof prop === "symbol") {
-          return subquery[prop];
-        }
-        const columns = is(subquery, Subquery) ? subquery._.selectedFields : is(subquery, View3) ? subquery[ViewBaseConfig].selectedFields : subquery;
-        const value = columns[prop];
-        if (is(value, SQL.Aliased)) {
-          if (this.config.sqlAliasedBehavior === "sql" && !value.isSelectionField) {
-            return value.sql;
-          }
-          const newValue = value.clone();
-          newValue.isSelectionField = true;
-          return newValue;
-        }
-        if (is(value, SQL)) {
-          if (this.config.sqlBehavior === "sql") {
-            return value;
-          }
-          throw new Error(
-            `You tried to reference "${prop}" field from a subquery, which is a raw SQL field, but it doesn't have an alias declared. Please add an alias to the field using ".as('alias')" method.`
-          );
-        }
-        if (is(value, Column2)) {
-          if (this.config.alias) {
-            return new Proxy(
-              value,
-              new ColumnAliasProxyHandler(
-                new Proxy(
-                  value.table,
-                  new TableAliasProxyHandler(this.config.alias, this.config.replaceOriginalName ?? false)
-                )
-              )
-            );
-          }
-          return value;
-        }
-        if (typeof value !== "object" || value === null) {
-          return value;
-        }
-        return new Proxy(value, new _SelectionProxyHandler(this.config));
-      }
-    };
-    __publicField(_SelectionProxyHandler, _a128, "SelectionProxyHandler");
-    SelectionProxyHandler = _SelectionProxyHandler;
+    __publicField(PgDialect, _a128, "PgDialect");
   }
 });
 
@@ -26890,22 +27045,23 @@ var init_select2 = __esm({
        */
       from(source) {
         const isPartialSelect = !!this.fields;
+        const src = source;
         let fields;
         if (this.fields) {
           fields = this.fields;
-        } else if (is(source, Subquery)) {
+        } else if (is(src, Subquery)) {
           fields = Object.fromEntries(
-            Object.keys(source._.selectedFields).map((key) => [key, source[key]])
+            Object.keys(src._.selectedFields).map((key) => [key, src[key]])
           );
-        } else if (is(source, PgViewBase)) {
-          fields = source[ViewBaseConfig].selectedFields;
-        } else if (is(source, SQL)) {
+        } else if (is(src, PgViewBase)) {
+          fields = src[ViewBaseConfig].selectedFields;
+        } else if (is(src, SQL)) {
           fields = {};
         } else {
-          fields = getTableColumns(source);
+          fields = getTableColumns(src);
         }
         return new PgSelectBase({
-          table: source,
+          table: src,
           fields,
           isPartialSelect,
           session: this.session,
@@ -27590,22 +27746,26 @@ var init_query_builder2 = __esm({
       constructor(dialect6) {
         __publicField(this, "dialect");
         __publicField(this, "dialectConfig");
-        this.dialect = is(dialect6, PgDialect) ? dialect6 : void 0;
-        this.dialectConfig = is(dialect6, PgDialect) ? void 0 : dialect6;
-      }
-      $with(alias) {
-        const queryBuilder = this;
-        return {
-          as(qb) {
+        __publicField(this, "$with", (alias, selection) => {
+          const queryBuilder = this;
+          const as = (qb) => {
             if (typeof qb === "function") {
               qb = qb(queryBuilder);
             }
             return new Proxy(
-              new WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true),
+              new WithSubquery(
+                qb.getSQL(),
+                selection ?? ("getSelectedFields" in qb ? qb.getSelectedFields() ?? {} : {}),
+                alias,
+                true
+              ),
               new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
             );
-          }
-        };
+          };
+          return { as };
+        });
+        this.dialect = is(dialect6, PgDialect) ? dialect6 : void 0;
+        this.dialectConfig = is(dialect6, PgDialect) ? void 0 : dialect6;
       }
       with(...queries) {
         const self2 = this;
@@ -27677,6 +27837,7 @@ var init_insert = __esm({
     "use strict";
     init_entity();
     init_query_promise();
+    init_selection_proxy();
     init_sql();
     init_table();
     init_tracing();
@@ -27751,6 +27912,7 @@ var init_insert = __esm({
         this.config = { table: table5, values, withList, select, overridingSystemValue_ };
       }
       returning(fields = this.config.table[Table2.Symbol.Columns]) {
+        this.config.returningFields = fields;
         this.config.returning = orderSelectedFields(fields);
         return this;
       }
@@ -27853,6 +28015,17 @@ var init_insert = __esm({
         this.authToken = token;
         return this;
       }
+      /** @internal */
+      getSelectedFields() {
+        return this.config.returningFields ? new Proxy(
+          this.config.returningFields,
+          new SelectionProxyHandler({
+            alias: getTableName(this.config.table),
+            sqlAliasedBehavior: "alias",
+            sqlBehavior: "error"
+          })
+        ) : void 0;
+      }
       $dynamic() {
         return this;
       }
@@ -27990,11 +28163,12 @@ var init_update = __esm({
         this.joinsNotNullableMap = typeof this.tableName === "string" ? { [this.tableName]: true } : {};
       }
       from(source) {
-        const tableName = getTableLikeName(source);
+        const src = source;
+        const tableName = getTableLikeName(src);
         if (typeof tableName === "string") {
           this.joinsNotNullableMap[tableName] = true;
         }
-        this.config.from = source;
+        this.config.from = src;
         return this;
       }
       getTableLikeFields(table5) {
@@ -28109,6 +28283,7 @@ var init_update = __esm({
             }
           }
         }
+        this.config.returningFields = fields;
         this.config.returning = orderSelectedFields(fields);
         return this;
       }
@@ -28134,6 +28309,17 @@ var init_update = __esm({
         this.authToken = token;
         return this;
       }
+      /** @internal */
+      getSelectedFields() {
+        return this.config.returningFields ? new Proxy(
+          this.config.returningFields,
+          new SelectionProxyHandler({
+            alias: getTableName(this.config.table),
+            sqlAliasedBehavior: "alias",
+            sqlBehavior: "error"
+          })
+        ) : void 0;
+      }
       $dynamic() {
         return this;
       }
@@ -28395,6 +28581,56 @@ var init_db = __esm({
     PgDatabase = class {
       constructor(dialect6, session, schema5) {
         __publicField(this, "query");
+        /**
+         * Creates a subquery that defines a temporary named result set as a CTE.
+         *
+         * It is useful for breaking down complex queries into simpler parts and for reusing the result set in subsequent parts of the query.
+         *
+         * See docs: {@link https://orm.drizzle.team/docs/select#with-clause}
+         *
+         * @param alias The alias for the subquery.
+         *
+         * Failure to provide an alias will result in a DrizzleTypeError, preventing the subquery from being referenced in other queries.
+         *
+         * @example
+         *
+         * ```ts
+         * // Create a subquery with alias 'sq' and use it in the select query
+         * const sq = db.$with('sq').as(db.select().from(users).where(eq(users.id, 42)));
+         *
+         * const result = await db.with(sq).select().from(sq);
+         * ```
+         *
+         * To select arbitrary SQL values as fields in a CTE and reference them in other CTEs or in the main query, you need to add aliases to them:
+         *
+         * ```ts
+         * // Select an arbitrary SQL value as a field in a CTE and reference it in the main query
+         * const sq = db.$with('sq').as(db.select({
+         *   name: sql<string>`upper(${users.name})`.as('name'),
+         * })
+         * .from(users));
+         *
+         * const result = await db.with(sq).select({ name: sq.name }).from(sq);
+         * ```
+         */
+        __publicField(this, "$with", (alias, selection) => {
+          const self2 = this;
+          const as = (qb) => {
+            if (typeof qb === "function") {
+              qb = qb(new QueryBuilder(self2.dialect));
+            }
+            return new Proxy(
+              new WithSubquery(
+                qb.getSQL(),
+                selection ?? ("getSelectedFields" in qb ? qb.getSelectedFields() ?? {} : {}),
+                alias,
+                true
+              ),
+              new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
+            );
+          };
+          return { as };
+        });
         __publicField(this, "authToken");
         this.dialect = dialect6;
         this.session = session;
@@ -28424,52 +28660,6 @@ var init_db = __esm({
           }
         }
       }
-      /**
-       * Creates a subquery that defines a temporary named result set as a CTE.
-       *
-       * It is useful for breaking down complex queries into simpler parts and for reusing the result set in subsequent parts of the query.
-       *
-       * See docs: {@link https://orm.drizzle.team/docs/select#with-clause}
-       *
-       * @param alias The alias for the subquery.
-       *
-       * Failure to provide an alias will result in a DrizzleTypeError, preventing the subquery from being referenced in other queries.
-       *
-       * @example
-       *
-       * ```ts
-       * // Create a subquery with alias 'sq' and use it in the select query
-       * const sq = db.$with('sq').as(db.select().from(users).where(eq(users.id, 42)));
-       *
-       * const result = await db.with(sq).select().from(sq);
-       * ```
-       *
-       * To select arbitrary SQL values as fields in a CTE and reference them in other CTEs or in the main query, you need to add aliases to them:
-       *
-       * ```ts
-       * // Select an arbitrary SQL value as a field in a CTE and reference it in the main query
-       * const sq = db.$with('sq').as(db.select({
-       *   name: sql<string>`upper(${users.name})`.as('name'),
-       * })
-       * .from(users));
-       *
-       * const result = await db.with(sq).select({ name: sq.name }).from(sq);
-       * ```
-       */
-      $with(alias) {
-        const self2 = this;
-        return {
-          as(qb) {
-            if (typeof qb === "function") {
-              qb = qb(new QueryBuilder(self2.dialect));
-            }
-            return new Proxy(
-              new WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true),
-              new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
-            );
-          }
-        };
-      }
       $count(source, filters) {
         return new PgCountBuilder({ source, filters, session: this.session });
       }
@@ -32273,7 +32463,7 @@ var init_dialect2 = __esm({
         const withSql = this.buildWithCTE(withList);
         const valuesSql = sql.join(valuesSqlList);
         const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
-        const onConflictSql = onConflict ? sql` on conflict ${onConflict}` : void 0;
+        const onConflictSql = onConflict?.length ? sql.join(onConflict) : void 0;
         return sql`${withSql}insert into ${table5} ${insertOrder} ${valuesSql}${onConflictSql}${returningSql}`;
       }
       sqlToQuery(sql2, invokeSource) {
@@ -33220,22 +33410,26 @@ var init_query_builder3 = __esm({
       constructor(dialect6) {
         __publicField(this, "dialect");
         __publicField(this, "dialectConfig");
-        this.dialect = is(dialect6, SQLiteDialect) ? dialect6 : void 0;
-        this.dialectConfig = is(dialect6, SQLiteDialect) ? void 0 : dialect6;
-      }
-      $with(alias) {
-        const queryBuilder = this;
-        return {
-          as(qb) {
+        __publicField(this, "$with", (alias, selection) => {
+          const queryBuilder = this;
+          const as = (qb) => {
             if (typeof qb === "function") {
               qb = qb(queryBuilder);
             }
             return new Proxy(
-              new WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true),
+              new WithSubquery(
+                qb.getSQL(),
+                selection ?? ("getSelectedFields" in qb ? qb.getSelectedFields() ?? {} : {}),
+                alias,
+                true
+              ),
               new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
             );
-          }
-        };
+          };
+          return { as };
+        });
+        this.dialect = is(dialect6, SQLiteDialect) ? dialect6 : void 0;
+        this.dialectConfig = is(dialect6, SQLiteDialect) ? void 0 : dialect6;
       }
       with(...queries) {
         const self2 = this;
@@ -33376,12 +33570,14 @@ var init_insert2 = __esm({
        * ```
        */
       onConflictDoNothing(config = {}) {
+        if (!this.config.onConflict)
+          this.config.onConflict = [];
         if (config.target === void 0) {
-          this.config.onConflict = sql`do nothing`;
+          this.config.onConflict.push(sql` on conflict do nothing`);
         } else {
           const targetSql = Array.isArray(config.target) ? sql`${config.target}` : sql`${[config.target]}`;
           const whereSql = config.where ? sql` where ${config.where}` : sql``;
-          this.config.onConflict = sql`${targetSql} do nothing${whereSql}`;
+          this.config.onConflict.push(sql` on conflict ${targetSql} do nothing${whereSql}`);
         }
         return this;
       }
@@ -33420,12 +33616,16 @@ var init_insert2 = __esm({
             'You cannot use both "where" and "targetWhere"/"setWhere" at the same time - "where" is deprecated, use "targetWhere" or "setWhere" instead.'
           );
         }
+        if (!this.config.onConflict)
+          this.config.onConflict = [];
         const whereSql = config.where ? sql` where ${config.where}` : void 0;
         const targetWhereSql = config.targetWhere ? sql` where ${config.targetWhere}` : void 0;
         const setWhereSql = config.setWhere ? sql` where ${config.setWhere}` : void 0;
         const targetSql = Array.isArray(config.target) ? sql`${config.target}` : sql`${[config.target]}`;
         const setSql = this.dialect.buildUpdateSet(this.config.table, mapUpdateSet(this.config.table, config.set));
-        this.config.onConflict = sql`${targetSql}${targetWhereSql} do update set ${setSql}${whereSql}${setWhereSql}`;
+        this.config.onConflict.push(
+          sql` on conflict ${targetSql}${targetWhereSql} do update set ${setSql}${whereSql}${setWhereSql}`
+        );
         return this;
       }
       /** @internal */
@@ -33916,6 +34116,56 @@ var init_db2 = __esm({
     BaseSQLiteDatabase = class {
       constructor(resultKind, dialect6, session, schema5) {
         __publicField(this, "query");
+        /**
+         * Creates a subquery that defines a temporary named result set as a CTE.
+         *
+         * It is useful for breaking down complex queries into simpler parts and for reusing the result set in subsequent parts of the query.
+         *
+         * See docs: {@link https://orm.drizzle.team/docs/select#with-clause}
+         *
+         * @param alias The alias for the subquery.
+         *
+         * Failure to provide an alias will result in a DrizzleTypeError, preventing the subquery from being referenced in other queries.
+         *
+         * @example
+         *
+         * ```ts
+         * // Create a subquery with alias 'sq' and use it in the select query
+         * const sq = db.$with('sq').as(db.select().from(users).where(eq(users.id, 42)));
+         *
+         * const result = await db.with(sq).select().from(sq);
+         * ```
+         *
+         * To select arbitrary SQL values as fields in a CTE and reference them in other CTEs or in the main query, you need to add aliases to them:
+         *
+         * ```ts
+         * // Select an arbitrary SQL value as a field in a CTE and reference it in the main query
+         * const sq = db.$with('sq').as(db.select({
+         *   name: sql<string>`upper(${users.name})`.as('name'),
+         * })
+         * .from(users));
+         *
+         * const result = await db.with(sq).select({ name: sq.name }).from(sq);
+         * ```
+         */
+        __publicField(this, "$with", (alias, selection) => {
+          const self2 = this;
+          const as = (qb) => {
+            if (typeof qb === "function") {
+              qb = qb(new QueryBuilder2(self2.dialect));
+            }
+            return new Proxy(
+              new WithSubquery(
+                qb.getSQL(),
+                selection ?? ("getSelectedFields" in qb ? qb.getSelectedFields() ?? {} : {}),
+                alias,
+                true
+              ),
+              new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
+            );
+          };
+          return { as };
+        });
         this.resultKind = resultKind;
         this.dialect = dialect6;
         this.session = session;
@@ -33945,52 +34195,6 @@ var init_db2 = __esm({
           }
         }
       }
-      /**
-       * Creates a subquery that defines a temporary named result set as a CTE.
-       *
-       * It is useful for breaking down complex queries into simpler parts and for reusing the result set in subsequent parts of the query.
-       *
-       * See docs: {@link https://orm.drizzle.team/docs/select#with-clause}
-       *
-       * @param alias The alias for the subquery.
-       *
-       * Failure to provide an alias will result in a DrizzleTypeError, preventing the subquery from being referenced in other queries.
-       *
-       * @example
-       *
-       * ```ts
-       * // Create a subquery with alias 'sq' and use it in the select query
-       * const sq = db.$with('sq').as(db.select().from(users).where(eq(users.id, 42)));
-       *
-       * const result = await db.with(sq).select().from(sq);
-       * ```
-       *
-       * To select arbitrary SQL values as fields in a CTE and reference them in other CTEs or in the main query, you need to add aliases to them:
-       *
-       * ```ts
-       * // Select an arbitrary SQL value as a field in a CTE and reference it in the main query
-       * const sq = db.$with('sq').as(db.select({
-       *   name: sql<string>`upper(${users.name})`.as('name'),
-       * })
-       * .from(users));
-       *
-       * const result = await db.with(sq).select({ name: sq.name }).from(sq);
-       * ```
-       */
-      $with(alias) {
-        const self2 = this;
-        return {
-          as(qb) {
-            if (typeof qb === "function") {
-              qb = qb(new QueryBuilder2(self2.dialect));
-            }
-            return new Proxy(
-              new WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true),
-              new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
-            );
-          }
-        };
-      }
       $count(source, filters) {
         return new SQLiteCountBuilder({ source, filters, session: this.session });
       }
@@ -38813,22 +39017,26 @@ var init_query_builder4 = __esm({
       constructor(dialect6) {
         __publicField(this, "dialect");
         __publicField(this, "dialectConfig");
-        this.dialect = is(dialect6, MySqlDialect) ? dialect6 : void 0;
-        this.dialectConfig = is(dialect6, MySqlDialect) ? void 0 : dialect6;
-      }
-      $with(alias) {
-        const queryBuilder = this;
-        return {
-          as(qb) {
+        __publicField(this, "$with", (alias, selection) => {
+          const queryBuilder = this;
+          const as = (qb) => {
             if (typeof qb === "function") {
               qb = qb(queryBuilder);
             }
             return new Proxy(
-              new WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true),
+              new WithSubquery(
+                qb.getSQL(),
+                selection ?? ("getSelectedFields" in qb ? qb.getSelectedFields() ?? {} : {}),
+                alias,
+                true
+              ),
               new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
             );
-          }
-        };
+          };
+          return { as };
+        });
+        this.dialect = is(dialect6, MySqlDialect) ? dialect6 : void 0;
+        this.dialectConfig = is(dialect6, MySqlDialect) ? void 0 : dialect6;
       }
       with(...queries) {
         const self2 = this;
@@ -39283,6 +39491,56 @@ var init_db3 = __esm({
     MySqlDatabase = class {
       constructor(dialect6, session, schema5, mode) {
         __publicField(this, "query");
+        /**
+         * Creates a subquery that defines a temporary named result set as a CTE.
+         *
+         * It is useful for breaking down complex queries into simpler parts and for reusing the result set in subsequent parts of the query.
+         *
+         * See docs: {@link https://orm.drizzle.team/docs/select#with-clause}
+         *
+         * @param alias The alias for the subquery.
+         *
+         * Failure to provide an alias will result in a DrizzleTypeError, preventing the subquery from being referenced in other queries.
+         *
+         * @example
+         *
+         * ```ts
+         * // Create a subquery with alias 'sq' and use it in the select query
+         * const sq = db.$with('sq').as(db.select().from(users).where(eq(users.id, 42)));
+         *
+         * const result = await db.with(sq).select().from(sq);
+         * ```
+         *
+         * To select arbitrary SQL values as fields in a CTE and reference them in other CTEs or in the main query, you need to add aliases to them:
+         *
+         * ```ts
+         * // Select an arbitrary SQL value as a field in a CTE and reference it in the main query
+         * const sq = db.$with('sq').as(db.select({
+         *   name: sql<string>`upper(${users.name})`.as('name'),
+         * })
+         * .from(users));
+         *
+         * const result = await db.with(sq).select({ name: sq.name }).from(sq);
+         * ```
+         */
+        __publicField(this, "$with", (alias, selection) => {
+          const self2 = this;
+          const as = (qb) => {
+            if (typeof qb === "function") {
+              qb = qb(new QueryBuilder3(self2.dialect));
+            }
+            return new Proxy(
+              new WithSubquery(
+                qb.getSQL(),
+                selection ?? ("getSelectedFields" in qb ? qb.getSelectedFields() ?? {} : {}),
+                alias,
+                true
+              ),
+              new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
+            );
+          };
+          return { as };
+        });
         this.dialect = dialect6;
         this.session = session;
         this.mode = mode;
@@ -39311,52 +39569,6 @@ var init_db3 = __esm({
           }
         }
       }
-      /**
-       * Creates a subquery that defines a temporary named result set as a CTE.
-       *
-       * It is useful for breaking down complex queries into simpler parts and for reusing the result set in subsequent parts of the query.
-       *
-       * See docs: {@link https://orm.drizzle.team/docs/select#with-clause}
-       *
-       * @param alias The alias for the subquery.
-       *
-       * Failure to provide an alias will result in a DrizzleTypeError, preventing the subquery from being referenced in other queries.
-       *
-       * @example
-       *
-       * ```ts
-       * // Create a subquery with alias 'sq' and use it in the select query
-       * const sq = db.$with('sq').as(db.select().from(users).where(eq(users.id, 42)));
-       *
-       * const result = await db.with(sq).select().from(sq);
-       * ```
-       *
-       * To select arbitrary SQL values as fields in a CTE and reference them in other CTEs or in the main query, you need to add aliases to them:
-       *
-       * ```ts
-       * // Select an arbitrary SQL value as a field in a CTE and reference it in the main query
-       * const sq = db.$with('sq').as(db.select({
-       *   name: sql<string>`upper(${users.name})`.as('name'),
-       * })
-       * .from(users));
-       *
-       * const result = await db.with(sq).select({ name: sq.name }).from(sq);
-       * ```
-       */
-      $with(alias) {
-        const self2 = this;
-        return {
-          as(qb) {
-            if (typeof qb === "function") {
-              qb = qb(new QueryBuilder3(self2.dialect));
-            }
-            return new Proxy(
-              new WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true),
-              new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
-            );
-          }
-        };
-      }
       $count(source, filters) {
         return new MySqlCountBuilder({ source, filters, session: this.session });
       }
@@ -43912,22 +44124,26 @@ var init_query_builder5 = __esm({
       constructor(dialect6) {
         __publicField(this, "dialect");
         __publicField(this, "dialectConfig");
-        this.dialect = is(dialect6, SingleStoreDialect) ? dialect6 : void 0;
-        this.dialectConfig = is(dialect6, SingleStoreDialect) ? void 0 : dialect6;
-      }
-      $with(alias) {
-        const queryBuilder = this;
-        return {
-          as(qb) {
+        __publicField(this, "$with", (alias, selection) => {
+          const queryBuilder = this;
+          const as = (qb) => {
             if (typeof qb === "function") {
               qb = qb(queryBuilder);
             }
             return new Proxy(
-              new WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true),
+              new WithSubquery(
+                qb.getSQL(),
+                selection ?? ("getSelectedFields" in qb ? qb.getSelectedFields() ?? {} : {}),
+                alias,
+                true
+              ),
               new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
             );
-          }
-        };
+          };
+          return { as };
+        });
+        this.dialect = is(dialect6, SingleStoreDialect) ? dialect6 : void 0;
+        this.dialectConfig = is(dialect6, SingleStoreDialect) ? void 0 : dialect6;
       }
       with(...queries) {
         const self2 = this;
@@ -44140,6 +44356,56 @@ var init_db4 = __esm({
         // We are waiting for SingleStore support for `json_array` function
         /**@inrernal */
         __publicField(this, "query");
+        /**
+         * Creates a subquery that defines a temporary named result set as a CTE.
+         *
+         * It is useful for breaking down complex queries into simpler parts and for reusing the result set in subsequent parts of the query.
+         *
+         * See docs: {@link https://orm.drizzle.team/docs/select#with-clause}
+         *
+         * @param alias The alias for the subquery.
+         *
+         * Failure to provide an alias will result in a DrizzleTypeError, preventing the subquery from being referenced in other queries.
+         *
+         * @example
+         *
+         * ```ts
+         * // Create a subquery with alias 'sq' and use it in the select query
+         * const sq = db.$with('sq').as(db.select().from(users).where(eq(users.id, 42)));
+         *
+         * const result = await db.with(sq).select().from(sq);
+         * ```
+         *
+         * To select arbitrary SQL values as fields in a CTE and reference them in other CTEs or in the main query, you need to add aliases to them:
+         *
+         * ```ts
+         * // Select an arbitrary SQL value as a field in a CTE and reference it in the main query
+         * const sq = db.$with('sq').as(db.select({
+         *   name: sql<string>`upper(${users.name})`.as('name'),
+         * })
+         * .from(users));
+         *
+         * const result = await db.with(sq).select({ name: sq.name }).from(sq);
+         * ```
+         */
+        __publicField(this, "$with", (alias, selection) => {
+          const self2 = this;
+          const as = (qb) => {
+            if (typeof qb === "function") {
+              qb = qb(new QueryBuilder4(self2.dialect));
+            }
+            return new Proxy(
+              new WithSubquery(
+                qb.getSQL(),
+                selection ?? ("getSelectedFields" in qb ? qb.getSelectedFields() ?? {} : {}),
+                alias,
+                true
+              ),
+              new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
+            );
+          };
+          return { as };
+        });
         this.dialect = dialect6;
         this.session = session;
         this._ = schema5 ? {
@@ -44153,52 +44419,6 @@ var init_db4 = __esm({
         };
         this.query = {};
       }
-      /**
-       * Creates a subquery that defines a temporary named result set as a CTE.
-       *
-       * It is useful for breaking down complex queries into simpler parts and for reusing the result set in subsequent parts of the query.
-       *
-       * See docs: {@link https://orm.drizzle.team/docs/select#with-clause}
-       *
-       * @param alias The alias for the subquery.
-       *
-       * Failure to provide an alias will result in a DrizzleTypeError, preventing the subquery from being referenced in other queries.
-       *
-       * @example
-       *
-       * ```ts
-       * // Create a subquery with alias 'sq' and use it in the select query
-       * const sq = db.$with('sq').as(db.select().from(users).where(eq(users.id, 42)));
-       *
-       * const result = await db.with(sq).select().from(sq);
-       * ```
-       *
-       * To select arbitrary SQL values as fields in a CTE and reference them in other CTEs or in the main query, you need to add aliases to them:
-       *
-       * ```ts
-       * // Select an arbitrary SQL value as a field in a CTE and reference it in the main query
-       * const sq = db.$with('sq').as(db.select({
-       *   name: sql<string>`upper(${users.name})`.as('name'),
-       * })
-       * .from(users));
-       *
-       * const result = await db.with(sq).select({ name: sq.name }).from(sq);
-       * ```
-       */
-      $with(alias) {
-        const self2 = this;
-        return {
-          as(qb) {
-            if (typeof qb === "function") {
-              qb = qb(new QueryBuilder4(self2.dialect));
-            }
-            return new Proxy(
-              new WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true),
-              new SelectionProxyHandler({ alias, sqlAliasedBehavior: "alias", sqlBehavior: "error" })
-            );
-          }
-        };
-      }
       $count(source, filters) {
         return new SingleStoreCountBuilder({ source, filters, session: this.session });
       }
@@ -45469,15 +45689,31 @@ var init_singlestoreImports = __esm({
 var singlestorePushUtils_exports = {};
 __export(singlestorePushUtils_exports, {
   filterStatements: () => filterStatements2,
+  findColumnTypeAlternations: () => findColumnTypeAlternations,
   logSuggestionsAndReturn: () => logSuggestionsAndReturn3
 });
+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_hanji10, filterStatements2, logSuggestionsAndReturn3;
 var init_singlestorePushUtils = __esm({
   "src/cli/commands/singlestorePushUtils.ts"() {
     "use strict";
     init_source();
     import_hanji10 = __toESM(require_hanji());
+    init_sqlgenerator();
     init_singlestoreSchema();
+    init_utils();
     init_selector_ui();
     init_outputs();
     filterStatements2 = (statements, currentSchema, prevSchema) => {
@@ -45521,7 +45757,7 @@ var init_singlestorePushUtils = __esm({
         return true;
       });
     };
-    logSuggestionsAndReturn3 = async (db, statements, json22) => {
+    logSuggestionsAndReturn3 = async (db, statements, json22, json1) => {
       let shouldAskForApprove = false;
       const statementsToExecute = [];
       const infoToPrint = [];
@@ -45702,6 +45938,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 = json22.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 count2 = Number(res[0].count);
+              if (count2 > 0) {
+                infoToPrint.push(
+                  `\xB7 You're about to delete ${source_default.underline(
+                    removedColumn
+                  )} column in ${tableName} table with ${count2} 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 = json22.tables[tableName].columns[addedColumn];
+              const count2 = Number(res.count);
+              if (count2 > 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 ${count2} items`
+                );
+                shouldAskForApprove = true;
+                tablesToTruncate.push(tableName);
+                statementsToExecute.push(`TRUNCATE TABLE \`${tableName}\`;`);
+              }
+            }
+          }
+          const columnWithChangedType = findColumnTypeAlternations(prevColumns, currentColumns);
+          for (const column5 of columnWithChangedType) {
+            const [res] = await db.query(
+              `select count(*) as count from \`${tableName}\` WHERE \`${tableName}\`.\`${column5}\` IS NOT NULL;`
+            );
+            const count2 = Number(res.count);
+            if (count2 > 0) {
+              infoToPrint.push(
+                `\xB7 You're about recreate ${source_default.underline(tableName)} table with data type changing for ${source_default.underline(
+                  column5
+                )} column, which contains ${count2} 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 {
@@ -46547,7 +46848,8 @@ var pushSingleStoreSchema = async (imports, drizzleInstance, databaseName) => {
   const { shouldAskForApprove, statementsToExecute, infoToPrint } = await logSuggestionsAndReturn4(
     db,
     statements,
-    validatedCur
+    validatedCur,
+    validatedPrev
   );
   return {
     hasDataLoss: shouldAskForApprove,