drizzle-kit 0.30.2-de3c537 → 0.30.2-efae52b

package/api.mjs

@@ -3474,17 +3474,17 @@ function processCreateParams(params) {
   if (errorMap2)
     return { errorMap: errorMap2, description };
   const customMap = (iss, ctx) => {
-    var _a413, _b303;
+    var _a415, _b305;
     const { message } = params;
     if (iss.code === "invalid_enum_value") {
       return { message: message !== null && message !== void 0 ? message : ctx.defaultError };
     }
     if (typeof ctx.data === "undefined") {
-      return { message: (_a413 = message !== null && message !== void 0 ? message : required_error) !== null && _a413 !== void 0 ? _a413 : ctx.defaultError };
+      return { message: (_a415 = message !== null && message !== void 0 ? message : required_error) !== null && _a415 !== void 0 ? _a415 : ctx.defaultError };
     }
     if (iss.code !== "invalid_type")
       return { message: ctx.defaultError };
-    return { message: (_b303 = message !== null && message !== void 0 ? message : invalid_type_error) !== null && _b303 !== void 0 ? _b303 : ctx.defaultError };
+    return { message: (_b305 = message !== null && message !== void 0 ? message : invalid_type_error) !== null && _b305 !== void 0 ? _b305 : ctx.defaultError };
   };
   return { errorMap: customMap, description };
 }
@@ -4146,11 +4146,11 @@ var init_lib = __esm({
         throw result.error;
       }
       safeParse(data, params) {
-        var _a413;
+        var _a415;
         const ctx = {
           common: {
             issues: [],
-            async: (_a413 = params === null || params === void 0 ? void 0 : params.async) !== null && _a413 !== void 0 ? _a413 : false,
+            async: (_a415 = params === null || params === void 0 ? void 0 : params.async) !== null && _a415 !== void 0 ? _a415 : false,
             contextualErrorMap: params === null || params === void 0 ? void 0 : params.errorMap
           },
           path: (params === null || params === void 0 ? void 0 : params.path) || [],
@@ -4472,7 +4472,7 @@ var init_lib = __esm({
           } else if (check.kind === "url") {
             try {
               new URL(input.data);
-            } catch (_a413) {
+            } catch (_a415) {
               ctx = this._getOrReturnCtx(input, ctx);
               addIssueToContext(ctx, {
                 validation: "url",
@@ -4642,7 +4642,7 @@ var init_lib = __esm({
         return this._addCheck({ kind: "ip", ...errorUtil.errToObj(options) });
       }
       datetime(options) {
-        var _a413, _b303;
+        var _a415, _b305;
         if (typeof options === "string") {
           return this._addCheck({
             kind: "datetime",
@@ -4655,8 +4655,8 @@ var init_lib = __esm({
         return this._addCheck({
           kind: "datetime",
           precision: typeof (options === null || options === void 0 ? void 0 : options.precision) === "undefined" ? null : options === null || options === void 0 ? void 0 : options.precision,
-          offset: (_a413 = options === null || options === void 0 ? void 0 : options.offset) !== null && _a413 !== void 0 ? _a413 : false,
-          local: (_b303 = options === null || options === void 0 ? void 0 : options.local) !== null && _b303 !== void 0 ? _b303 : false,
+          offset: (_a415 = options === null || options === void 0 ? void 0 : options.offset) !== null && _a415 !== void 0 ? _a415 : false,
+          local: (_b305 = options === null || options === void 0 ? void 0 : options.local) !== null && _b305 !== void 0 ? _b305 : false,
           ...errorUtil.errToObj(options === null || options === void 0 ? void 0 : options.message)
         });
       }
@@ -4819,11 +4819,11 @@ var init_lib = __esm({
       }
     };
     ZodString.create = (params) => {
-      var _a413;
+      var _a415;
       return new ZodString({
         checks: [],
         typeName: ZodFirstPartyTypeKind.ZodString,
-        coerce: (_a413 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a413 !== void 0 ? _a413 : false,
+        coerce: (_a415 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a415 !== void 0 ? _a415 : false,
         ...processCreateParams(params)
       });
     };
@@ -5216,11 +5216,11 @@ var init_lib = __esm({
       }
     };
     ZodBigInt.create = (params) => {
-      var _a413;
+      var _a415;
       return new ZodBigInt({
         checks: [],
         typeName: ZodFirstPartyTypeKind.ZodBigInt,
-        coerce: (_a413 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a413 !== void 0 ? _a413 : false,
+        coerce: (_a415 = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a415 !== void 0 ? _a415 : false,
         ...processCreateParams(params)
       });
     };
@@ -5700,8 +5700,8 @@ var init_lib = __esm({
           unknownKeys: "strict",
           ...message !== void 0 ? {
             errorMap: (issue, ctx) => {
-              var _a413, _b303, _c14, _d6;
-              const defaultError = (_c14 = (_b303 = (_a413 = this._def).errorMap) === null || _b303 === void 0 ? void 0 : _b303.call(_a413, issue, ctx).message) !== null && _c14 !== void 0 ? _c14 : ctx.defaultError;
+              var _a415, _b305, _c14, _d6;
+              const defaultError = (_c14 = (_b305 = (_a415 = this._def).errorMap) === null || _b305 === void 0 ? void 0 : _b305.call(_a415, issue, ctx).message) !== null && _c14 !== void 0 ? _c14 : ctx.defaultError;
               if (issue.code === "unrecognized_keys")
                 return {
                   message: (_d6 = errorUtil.errToObj(message).message) !== null && _d6 !== void 0 ? _d6 : defaultError
@@ -12126,7 +12126,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";
@@ -12472,7 +12472,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) {
@@ -13127,7 +13127,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 {
@@ -13155,7 +13155,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 {
@@ -14278,8 +14278,10 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newC
         return statement.type === "drop_index" && dialect6 === "postgresql";
       }
       convert(statement) {
+        const { schema: schema5 } = statement;
         const { name: name2 } = PgSquasher.unsquashIdx(statement.data);
-        return `DROP INDEX "${name2}";`;
+        const indexNameWithSchema = schema5 ? `"${schema5}"."${name2}"` : `"${name2}"`;
+        return `DROP INDEX ${indexNameWithSchema};`;
       }
     };
     PgCreateSchemaConvertor = class extends Convertor {
@@ -14463,10 +14465,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());
@@ -16462,7 +16506,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";
@@ -16741,6 +16785,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];
+    };
   }
 });
 
@@ -18686,7 +18825,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) => {
@@ -18850,7 +18989,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)) {
@@ -18862,7 +19002,7 @@ var init_snapshotsDiffer = __esm({
       });
       const _meta = prepareMigrationMeta([], rTables, rColumns);
       return {
-        statements: jsonStatements,
+        statements: combinedJsonStatements,
         sqlStatements: uniqueSqlStatements,
         _meta
       };
@@ -21980,7 +22120,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.38.3";
+    version = "0.38.4";
   }
 });
 
@@ -22168,6 +22308,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"() {
@@ -22462,8 +22605,8 @@ var init_sql = __esm({
       sql2.param = param2;
     })(sql || (sql = {}));
     ((SQL2) => {
-      var _a413;
-      _a413 = entityKind;
+      var _a415;
+      _a415 = entityKind;
       const _Aliased = class _Aliased {
         constructor(sql2, fieldAlias) {
           /** @internal */
@@ -22479,7 +22622,7 @@ var init_sql = __esm({
           return new _Aliased(this.sql, this.fieldAlias);
         }
       };
-      __publicField(_Aliased, _a413, "SQL.Aliased");
+      __publicField(_Aliased, _a415, "SQL.Aliased");
       let Aliased = _Aliased;
       SQL2.Aliased = Aliased;
     })(SQL || (SQL = {}));
@@ -25294,6 +25437,7 @@ __export(dist_exports, {
   getTableLikeName: () => getTableLikeName,
   getTableName: () => getTableName,
   getTableUniqueName: () => getTableUniqueName,
+  getViewName: () => getViewName,
   getViewSelectedFields: () => getViewSelectedFields,
   gt: () => gt,
   gte: () => gte,
@@ -25448,17 +25592,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");
@@ -25506,6 +25733,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;
       }
@@ -25531,11 +25759,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");
   }
 });
 
@@ -25554,13 +25793,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 */
@@ -25597,25 +25836,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";
@@ -25634,7 +25873,7 @@ var init_dialect = __esm({
     init_utils2();
     init_view_common();
     init_view_base();
-    _a127 = entityKind;
+    _a128 = entityKind;
     PgDialect = class {
       constructor(config) {
         /** @internal */
@@ -26726,89 +26965,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");
   }
 });
 
@@ -26893,22 +27050,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,
@@ -27593,22 +27751,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;
@@ -27680,6 +27842,7 @@ var init_insert = __esm({
     "use strict";
     init_entity();
     init_query_promise();
+    init_selection_proxy();
     init_sql();
     init_table();
     init_tracing();
@@ -27754,6 +27917,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;
       }
@@ -27856,6 +28020,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;
       }
@@ -27993,11 +28168,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) {
@@ -28112,6 +28288,7 @@ var init_update = __esm({
             }
           }
         }
+        this.config.returningFields = fields;
         this.config.returning = orderSelectedFields(fields);
         return this;
       }
@@ -28137,6 +28314,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;
       }
@@ -28398,6 +28586,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;
@@ -28427,52 +28665,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 });
       }
@@ -33223,22 +33415,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;
@@ -33919,6 +34115,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;
@@ -33948,52 +34194,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 });
       }
@@ -38816,22 +39016,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;
@@ -39286,6 +39490,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;
@@ -39314,52 +39568,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 });
       }
@@ -42151,17 +42359,68 @@ var init_varchar3 = __esm({
   }
 });
 
+// ../drizzle-orm/dist/singlestore-core/columns/vector.js
+function vector2(a, b) {
+  const { name: name2, config } = getColumnNameAndConfig(a, b);
+  return new SingleStoreVectorBuilder(name2, config);
+}
+var _a389, _b293, SingleStoreVectorBuilder, _a390, _b294, SingleStoreVector;
+var init_vector4 = __esm({
+  "../drizzle-orm/dist/singlestore-core/columns/vector.js"() {
+    "use strict";
+    init_entity();
+    init_utils2();
+    init_common5();
+    SingleStoreVectorBuilder = class extends (_b293 = SingleStoreColumnBuilder, _a389 = entityKind, _b293) {
+      constructor(name2, config) {
+        super(name2, "array", "SingleStoreVector");
+        this.config.dimensions = config.dimensions;
+        this.config.elementType = config.elementType;
+      }
+      /** @internal */
+      build(table5) {
+        return new SingleStoreVector(
+          table5,
+          this.config
+        );
+      }
+      /** @internal */
+      generatedAlwaysAs(as, config) {
+        throw new Error("not implemented");
+      }
+    };
+    __publicField(SingleStoreVectorBuilder, _a389, "SingleStoreVectorBuilder");
+    SingleStoreVector = class extends (_b294 = SingleStoreColumn, _a390 = entityKind, _b294) {
+      constructor() {
+        super(...arguments);
+        __publicField(this, "dimensions", this.config.dimensions);
+        __publicField(this, "elementType", this.config.elementType);
+      }
+      getSQLType() {
+        return `vector(${this.dimensions}, ${this.elementType || "F32"})`;
+      }
+      mapToDriverValue(value) {
+        return JSON.stringify(value);
+      }
+      mapFromDriverValue(value) {
+        return JSON.parse(value);
+      }
+    };
+    __publicField(SingleStoreVector, _a390, "SingleStoreVector");
+  }
+});
+
 // ../drizzle-orm/dist/singlestore-core/columns/year.js
 function year2(name2) {
   return new SingleStoreYearBuilder(name2 ?? "");
 }
-var _a389, _b293, SingleStoreYearBuilder, _a390, _b294, SingleStoreYear;
+var _a391, _b295, SingleStoreYearBuilder, _a392, _b296, SingleStoreYear;
 var init_year2 = __esm({
   "../drizzle-orm/dist/singlestore-core/columns/year.js"() {
     "use strict";
     init_entity();
     init_common5();
-    SingleStoreYearBuilder = class extends (_b293 = SingleStoreColumnBuilder, _a389 = entityKind, _b293) {
+    SingleStoreYearBuilder = class extends (_b295 = SingleStoreColumnBuilder, _a391 = entityKind, _b295) {
       constructor(name2) {
         super(name2, "number", "SingleStoreYear");
       }
@@ -42173,13 +42432,13 @@ var init_year2 = __esm({
         );
       }
     };
-    __publicField(SingleStoreYearBuilder, _a389, "SingleStoreYearBuilder");
-    SingleStoreYear = class extends (_b294 = SingleStoreColumn, _a390 = entityKind, _b294) {
+    __publicField(SingleStoreYearBuilder, _a391, "SingleStoreYearBuilder");
+    SingleStoreYear = class extends (_b296 = SingleStoreColumn, _a392 = entityKind, _b296) {
       getSQLType() {
         return `year`;
       }
     };
-    __publicField(SingleStoreYear, _a390, "SingleStoreYear");
+    __publicField(SingleStoreYear, _a392, "SingleStoreYear");
   }
 });
 
@@ -42211,22 +42470,23 @@ var init_columns4 = __esm({
     init_tinyint2();
     init_varbinary2();
     init_varchar3();
+    init_vector4();
     init_year2();
   }
 });
 
 // ../drizzle-orm/dist/singlestore-core/query-builders/count.js
-var _a391, _b295, _c12, _SingleStoreCountBuilder, SingleStoreCountBuilder;
+var _a393, _b297, _c12, _SingleStoreCountBuilder, SingleStoreCountBuilder;
 var init_count4 = __esm({
   "../drizzle-orm/dist/singlestore-core/query-builders/count.js"() {
     "use strict";
     init_entity();
     init_sql();
-    _SingleStoreCountBuilder = class _SingleStoreCountBuilder extends (_c12 = SQL, _b295 = entityKind, _a391 = Symbol.toStringTag, _c12) {
+    _SingleStoreCountBuilder = class _SingleStoreCountBuilder extends (_c12 = SQL, _b297 = entityKind, _a393 = Symbol.toStringTag, _c12) {
       constructor(params) {
         super(_SingleStoreCountBuilder.buildEmbeddedCount(params.source, params.filters).queryChunks);
         __publicField(this, "sql");
-        __publicField(this, _a391, "SingleStoreCountBuilder");
+        __publicField(this, _a393, "SingleStoreCountBuilder");
         __publicField(this, "session");
         this.params = params;
         this.mapWith(Number);
@@ -42264,13 +42524,13 @@ var init_count4 = __esm({
         );
       }
     };
-    __publicField(_SingleStoreCountBuilder, _b295, "SingleStoreCountBuilder");
+    __publicField(_SingleStoreCountBuilder, _b297, "SingleStoreCountBuilder");
     SingleStoreCountBuilder = _SingleStoreCountBuilder;
   }
 });
 
 // ../drizzle-orm/dist/singlestore-core/query-builders/delete.js
-var _a392, _b296, SingleStoreDeleteBase;
+var _a394, _b298, SingleStoreDeleteBase;
 var init_delete4 = __esm({
   "../drizzle-orm/dist/singlestore-core/query-builders/delete.js"() {
     "use strict";
@@ -42278,7 +42538,7 @@ var init_delete4 = __esm({
     init_query_promise();
     init_selection_proxy();
     init_table();
-    SingleStoreDeleteBase = class extends (_b296 = QueryPromise, _a392 = entityKind, _b296) {
+    SingleStoreDeleteBase = class extends (_b298 = QueryPromise, _a394 = entityKind, _b298) {
       constructor(table5, session, dialect6, withList) {
         super();
         __publicField(this, "config");
@@ -42368,12 +42628,12 @@ var init_delete4 = __esm({
         return this;
       }
     };
-    __publicField(SingleStoreDeleteBase, _a392, "SingleStoreDelete");
+    __publicField(SingleStoreDeleteBase, _a394, "SingleStoreDelete");
   }
 });
 
 // ../drizzle-orm/dist/singlestore-core/query-builders/insert.js
-var _a393, SingleStoreInsertBuilder, _a394, _b297, SingleStoreInsertBase;
+var _a395, SingleStoreInsertBuilder, _a396, _b299, SingleStoreInsertBase;
 var init_insert4 = __esm({
   "../drizzle-orm/dist/singlestore-core/query-builders/insert.js"() {
     "use strict";
@@ -42382,7 +42642,7 @@ var init_insert4 = __esm({
     init_sql();
     init_table();
     init_utils2();
-    _a393 = entityKind;
+    _a395 = entityKind;
     SingleStoreInsertBuilder = class {
       constructor(table5, session, dialect6) {
         __publicField(this, "shouldIgnore", false);
@@ -42411,8 +42671,8 @@ var init_insert4 = __esm({
         return new SingleStoreInsertBase(this.table, mappedValues, this.shouldIgnore, this.session, this.dialect);
       }
     };
-    __publicField(SingleStoreInsertBuilder, _a393, "SingleStoreInsertBuilder");
-    SingleStoreInsertBase = class extends (_b297 = QueryPromise, _a394 = entityKind, _b297) {
+    __publicField(SingleStoreInsertBuilder, _a395, "SingleStoreInsertBuilder");
+    SingleStoreInsertBase = class extends (_b299 = QueryPromise, _a396 = entityKind, _b299) {
       constructor(table5, values, ignore, session, dialect6) {
         super();
         __publicField(this, "config");
@@ -42493,7 +42753,7 @@ var init_insert4 = __esm({
         return this;
       }
     };
-    __publicField(SingleStoreInsertBase, _a394, "SingleStoreInsert");
+    __publicField(SingleStoreInsertBase, _a396, "SingleStoreInsert");
   }
 });
 
@@ -42526,6 +42786,7 @@ function getSingleStoreColumnBuilders() {
     tinyint: tinyint2,
     varbinary: varbinary2,
     varchar: varchar3,
+    vector: vector2,
     year: year2
   };
 }
@@ -42555,6 +42816,7 @@ var init_all4 = __esm({
     init_tinyint2();
     init_varbinary2();
     init_varchar3();
+    init_vector4();
     init_year2();
   }
 });
@@ -42579,20 +42841,20 @@ function singlestoreTableWithSchema(name2, columns, extraConfig, schema5, baseNa
   }
   return table5;
 }
-var _a395, _b298, _c13, _d5, SingleStoreTable;
+var _a397, _b300, _c13, _d5, SingleStoreTable;
 var init_table5 = __esm({
   "../drizzle-orm/dist/singlestore-core/table.js"() {
     "use strict";
     init_entity();
     init_table();
     init_all4();
-    SingleStoreTable = class extends (_d5 = Table2, _c13 = entityKind, _b298 = Table2.Symbol.Columns, _a395 = Table2.Symbol.ExtraConfigBuilder, _d5) {
+    SingleStoreTable = class extends (_d5 = Table2, _c13 = entityKind, _b300 = Table2.Symbol.Columns, _a397 = Table2.Symbol.ExtraConfigBuilder, _d5) {
       constructor() {
         super(...arguments);
         /** @internal */
-        __publicField(this, _b298);
+        __publicField(this, _b300);
         /** @internal */
-        __publicField(this, _a395);
+        __publicField(this, _a397);
       }
     };
     __publicField(SingleStoreTable, _c13, "SingleStoreTable");
@@ -42602,7 +42864,7 @@ var init_table5 = __esm({
 });
 
 // ../drizzle-orm/dist/singlestore-core/dialect.js
-var _a396, SingleStoreDialect;
+var _a398, SingleStoreDialect;
 var init_dialect4 = __esm({
   "../drizzle-orm/dist/singlestore-core/dialect.js"() {
     "use strict";
@@ -42620,7 +42882,7 @@ var init_dialect4 = __esm({
     init_view_common();
     init_common5();
     init_table5();
-    _a396 = entityKind;
+    _a398 = entityKind;
     SingleStoreDialect = class {
       constructor(config) {
         /** @internal */
@@ -43185,7 +43447,7 @@ var init_dialect4 = __esm({
         };
       }
     };
-    __publicField(SingleStoreDialect, _a396, "SingleStoreDialect");
+    __publicField(SingleStoreDialect, _a398, "SingleStoreDialect");
   }
 });
 
@@ -43207,7 +43469,7 @@ function createSetOperator4(type, isAll) {
     return leftSelect.addSetOperators(setOperators);
   };
 }
-var _a397, SingleStoreSelectBuilder, _a398, _b299, SingleStoreSelectQueryBuilderBase, _a399, _b300, SingleStoreSelectBase, getSingleStoreSetOperators, union4, unionAll4, intersect4, except4, minus;
+var _a399, SingleStoreSelectBuilder, _a400, _b301, SingleStoreSelectQueryBuilderBase, _a401, _b302, SingleStoreSelectBase, getSingleStoreSetOperators, union4, unionAll4, intersect4, except4, minus;
 var init_select5 = __esm({
   "../drizzle-orm/dist/singlestore-core/query-builders/select.js"() {
     "use strict";
@@ -43219,7 +43481,7 @@ var init_select5 = __esm({
     init_subquery();
     init_table();
     init_utils2();
-    _a397 = entityKind;
+    _a399 = entityKind;
     SingleStoreSelectBuilder = class {
       constructor(config) {
         __publicField(this, "fields");
@@ -43262,8 +43524,8 @@ var init_select5 = __esm({
         );
       }
     };
-    __publicField(SingleStoreSelectBuilder, _a397, "SingleStoreSelectBuilder");
-    SingleStoreSelectQueryBuilderBase = class extends (_b299 = TypedQueryBuilder, _a398 = entityKind, _b299) {
+    __publicField(SingleStoreSelectBuilder, _a399, "SingleStoreSelectBuilder");
+    SingleStoreSelectQueryBuilderBase = class extends (_b301 = TypedQueryBuilder, _a400 = entityKind, _b301) {
       constructor({ table: table5, fields, isPartialSelect, session, dialect: dialect6, withList, distinct }) {
         super();
         __publicField(this, "_");
@@ -43804,8 +44066,8 @@ var init_select5 = __esm({
         return this;
       }
     };
-    __publicField(SingleStoreSelectQueryBuilderBase, _a398, "SingleStoreSelectQueryBuilder");
-    SingleStoreSelectBase = class extends (_b300 = SingleStoreSelectQueryBuilderBase, _a399 = entityKind, _b300) {
+    __publicField(SingleStoreSelectQueryBuilderBase, _a400, "SingleStoreSelectQueryBuilder");
+    SingleStoreSelectBase = class extends (_b302 = SingleStoreSelectQueryBuilderBase, _a401 = entityKind, _b302) {
       constructor() {
         super(...arguments);
         __publicField(this, "execute", (placeholderValues) => {
@@ -43829,7 +44091,7 @@ var init_select5 = __esm({
         return query;
       }
     };
-    __publicField(SingleStoreSelectBase, _a399, "SingleStoreSelect");
+    __publicField(SingleStoreSelectBase, _a401, "SingleStoreSelect");
     applyMixins(SingleStoreSelectBase, [QueryPromise]);
     getSingleStoreSetOperators = () => ({
       union: union4,
@@ -43847,7 +44109,7 @@ var init_select5 = __esm({
 });
 
 // ../drizzle-orm/dist/singlestore-core/query-builders/query-builder.js
-var _a400, QueryBuilder4;
+var _a402, QueryBuilder4;
 var init_query_builder5 = __esm({
   "../drizzle-orm/dist/singlestore-core/query-builders/query-builder.js"() {
     "use strict";
@@ -43856,27 +44118,31 @@ var init_query_builder5 = __esm({
     init_dialect4();
     init_subquery();
     init_select5();
-    _a400 = entityKind;
+    _a402 = entityKind;
     QueryBuilder4 = class {
       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;
@@ -43922,7 +44188,7 @@ var init_query_builder5 = __esm({
         return this.dialect;
       }
     };
-    __publicField(QueryBuilder4, _a400, "SingleStoreQueryBuilder");
+    __publicField(QueryBuilder4, _a402, "SingleStoreQueryBuilder");
   }
 });
 
@@ -43934,7 +44200,7 @@ var init_select_types4 = __esm({
 });
 
 // ../drizzle-orm/dist/singlestore-core/query-builders/update.js
-var _a401, SingleStoreUpdateBuilder, _a402, _b301, SingleStoreUpdateBase;
+var _a403, SingleStoreUpdateBuilder, _a404, _b303, SingleStoreUpdateBase;
 var init_update4 = __esm({
   "../drizzle-orm/dist/singlestore-core/query-builders/update.js"() {
     "use strict";
@@ -43943,7 +44209,7 @@ var init_update4 = __esm({
     init_selection_proxy();
     init_table();
     init_utils2();
-    _a401 = entityKind;
+    _a403 = entityKind;
     SingleStoreUpdateBuilder = class {
       constructor(table5, session, dialect6, withList) {
         this.table = table5;
@@ -43961,8 +44227,8 @@ var init_update4 = __esm({
         );
       }
     };
-    __publicField(SingleStoreUpdateBuilder, _a401, "SingleStoreUpdateBuilder");
-    SingleStoreUpdateBase = class extends (_b301 = QueryPromise, _a402 = entityKind, _b301) {
+    __publicField(SingleStoreUpdateBuilder, _a403, "SingleStoreUpdateBuilder");
+    SingleStoreUpdateBase = class extends (_b303 = QueryPromise, _a404 = entityKind, _b303) {
       constructor(table5, set, session, dialect6, withList) {
         super();
         __publicField(this, "config");
@@ -44055,7 +44321,7 @@ var init_update4 = __esm({
         return this;
       }
     };
-    __publicField(SingleStoreUpdateBase, _a402, "SingleStoreUpdate");
+    __publicField(SingleStoreUpdateBase, _a404, "SingleStoreUpdate");
   }
 });
 
@@ -44073,7 +44339,7 @@ var init_query_builders4 = __esm({
 });
 
 // ../drizzle-orm/dist/singlestore-core/db.js
-var _a403, SingleStoreDatabase;
+var _a405, SingleStoreDatabase;
 var init_db4 = __esm({
   "../drizzle-orm/dist/singlestore-core/db.js"() {
     "use strict";
@@ -44083,12 +44349,62 @@ var init_db4 = __esm({
     init_subquery();
     init_count4();
     init_query_builders4();
-    _a403 = entityKind;
+    _a405 = entityKind;
     SingleStoreDatabase = class {
       constructor(dialect6, session, schema5) {
         // 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 ? {
@@ -44102,52 +44418,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 });
       }
@@ -44283,17 +44553,17 @@ var init_db4 = __esm({
         return this.session.transaction(transaction, config);
       }
     };
-    __publicField(SingleStoreDatabase, _a403, "SingleStoreDatabase");
+    __publicField(SingleStoreDatabase, _a405, "SingleStoreDatabase");
   }
 });
 
 // ../drizzle-orm/dist/singlestore-core/indexes.js
-var _a404, IndexBuilderOn4, _a405, IndexBuilder4, _a406, Index6;
+var _a406, IndexBuilderOn4, _a407, IndexBuilder4, _a408, Index6;
 var init_indexes4 = __esm({
   "../drizzle-orm/dist/singlestore-core/indexes.js"() {
     "use strict";
     init_entity();
-    _a404 = entityKind;
+    _a406 = entityKind;
     IndexBuilderOn4 = class {
       constructor(name2, unique) {
         this.name = name2;
@@ -44303,8 +44573,8 @@ var init_indexes4 = __esm({
         return new IndexBuilder4(this.name, columns, this.unique);
       }
     };
-    __publicField(IndexBuilderOn4, _a404, "SingleStoreIndexBuilderOn");
-    _a405 = entityKind;
+    __publicField(IndexBuilderOn4, _a406, "SingleStoreIndexBuilderOn");
+    _a407 = entityKind;
     IndexBuilder4 = class {
       constructor(name2, columns, unique) {
         /** @internal */
@@ -44332,26 +44602,26 @@ var init_indexes4 = __esm({
         return new Index6(this.config, table5);
       }
     };
-    __publicField(IndexBuilder4, _a405, "SingleStoreIndexBuilder");
-    _a406 = entityKind;
+    __publicField(IndexBuilder4, _a407, "SingleStoreIndexBuilder");
+    _a408 = entityKind;
     Index6 = class {
       constructor(config, table5) {
         __publicField(this, "config");
         this.config = { ...config, table: table5 };
       }
     };
-    __publicField(Index6, _a406, "SingleStoreIndex");
+    __publicField(Index6, _a408, "SingleStoreIndex");
   }
 });
 
 // ../drizzle-orm/dist/singlestore-core/primary-keys.js
-var _a407, PrimaryKeyBuilder4, _a408, PrimaryKey4;
+var _a409, PrimaryKeyBuilder4, _a410, PrimaryKey4;
 var init_primary_keys4 = __esm({
   "../drizzle-orm/dist/singlestore-core/primary-keys.js"() {
     "use strict";
     init_entity();
     init_table5();
-    _a407 = entityKind;
+    _a409 = entityKind;
     PrimaryKeyBuilder4 = class {
       constructor(columns, name2) {
         /** @internal */
@@ -44366,8 +44636,8 @@ var init_primary_keys4 = __esm({
         return new PrimaryKey4(table5, this.columns, this.name);
       }
     };
-    __publicField(PrimaryKeyBuilder4, _a407, "SingleStorePrimaryKeyBuilder");
-    _a408 = entityKind;
+    __publicField(PrimaryKeyBuilder4, _a409, "SingleStorePrimaryKeyBuilder");
+    _a410 = entityKind;
     PrimaryKey4 = class {
       constructor(table5, columns, name2) {
         __publicField(this, "columns");
@@ -44380,18 +44650,18 @@ var init_primary_keys4 = __esm({
         return this.name ?? `${this.table[SingleStoreTable.Symbol.Name]}_${this.columns.map((column5) => column5.name).join("_")}_pk`;
       }
     };
-    __publicField(PrimaryKey4, _a408, "SingleStorePrimaryKey");
+    __publicField(PrimaryKey4, _a410, "SingleStorePrimaryKey");
   }
 });
 
 // ../drizzle-orm/dist/singlestore-core/schema.js
-var _a409, SingleStoreSchema5;
+var _a411, SingleStoreSchema5;
 var init_schema3 = __esm({
   "../drizzle-orm/dist/singlestore-core/schema.js"() {
     "use strict";
     init_entity();
     init_table5();
-    _a409 = entityKind;
+    _a411 = entityKind;
     SingleStoreSchema5 = class {
       constructor(schemaName) {
         __publicField(this, "table", (name2, columns, extraConfig) => {
@@ -44404,12 +44674,12 @@ var init_schema3 = __esm({
       	return singlestoreViewWithSchema(name, columns, this.schemaName);
       }) as typeof singlestoreView; */
     };
-    __publicField(SingleStoreSchema5, _a409, "SingleStoreSchema");
+    __publicField(SingleStoreSchema5, _a411, "SingleStoreSchema");
   }
 });
 
 // ../drizzle-orm/dist/singlestore-core/session.js
-var _a410, SingleStorePreparedQuery, _a411, SingleStoreSession, _a412, _b302, SingleStoreTransaction;
+var _a412, SingleStorePreparedQuery, _a413, SingleStoreSession, _a414, _b304, SingleStoreTransaction;
 var init_session4 = __esm({
   "../drizzle-orm/dist/singlestore-core/session.js"() {
     "use strict";
@@ -44417,15 +44687,15 @@ var init_session4 = __esm({
     init_errors();
     init_sql();
     init_db4();
-    _a410 = entityKind;
+    _a412 = entityKind;
     SingleStorePreparedQuery = class {
       constructor() {
         /** @internal */
         __publicField(this, "joinsNotNullableMap");
       }
     };
-    __publicField(SingleStorePreparedQuery, _a410, "SingleStorePreparedQuery");
-    _a411 = entityKind;
+    __publicField(SingleStorePreparedQuery, _a412, "SingleStorePreparedQuery");
+    _a413 = entityKind;
     SingleStoreSession = class {
       constructor(dialect6) {
         this.dialect = dialect6;
@@ -44460,8 +44730,8 @@ var init_session4 = __esm({
         return parts.length ? sql`start transaction ${sql.raw(parts.join(" "))}` : void 0;
       }
     };
-    __publicField(SingleStoreSession, _a411, "SingleStoreSession");
-    SingleStoreTransaction = class extends (_b302 = SingleStoreDatabase, _a412 = entityKind, _b302) {
+    __publicField(SingleStoreSession, _a413, "SingleStoreSession");
+    SingleStoreTransaction = class extends (_b304 = SingleStoreDatabase, _a414 = entityKind, _b304) {
       constructor(dialect6, session, schema5, nestedIndex) {
         super(dialect6, session, schema5);
         this.schema = schema5;
@@ -44471,7 +44741,7 @@ var init_session4 = __esm({
         throw new TransactionRollbackError();
       }
     };
-    __publicField(SingleStoreTransaction, _a412, "SingleStoreTransaction");
+    __publicField(SingleStoreTransaction, _a414, "SingleStoreTransaction");
   }
 });
 
@@ -44648,7 +44918,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
               if (typeof column5.default === "string") {
                 columnToSet.default = `'${column5.default}'`;
               } else {
-                if (sqlTypeLowered === "json") {
+                if (sqlTypeLowered === "json" || Array.isArray(column5.default)) {
                   columnToSet.default = `'${JSON.stringify(column5.default)}'`;
                 } else if (column5.default instanceof Date) {
                   if (sqlTypeLowered === "date") {
@@ -45418,15 +45688,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) => {
@@ -45470,7 +45756,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 = [];
@@ -45651,6 +45937,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 {
@@ -46479,7 +46830,8 @@ var pushSingleStoreSchema = async (imports, drizzleInstance, databaseName) => {
   const { shouldAskForApprove, statementsToExecute, infoToPrint } = await logSuggestionsAndReturn4(
     db,
     statements,
-    validatedCur
+    validatedCur,
+    validatedPrev
   );
   return {
     hasDataLoss: shouldAskForApprove,