drizzle-kit 1.0.0-beta.2-84ab15f → 1.0.0-beta.2-b2cf0ac

package/api-postgres.js

@@ -15624,8 +15624,8 @@ var init_views = __esm({
 `;
         if (d6.with) cause += `| with: ${formatOptionChanges(d6.with.from, d6.with.to)}`;
       }
-      if (st.type === "recreate_view") {
-        const { from, to } = st;
+      if (st.type === "drop_view" && st.cause) {
+        const { cause: from, view: to } = st;
         const key = `${to.schema}.${to.name}`;
         title += `${key} view changed:`;
         cause += `\u2502 definition: [${from.definition}] -> [${to.definition}]
@@ -22799,7 +22799,7 @@ function fromJson(statements) {
   };
   return result2;
 }
-var convertor, createSchemaConvertor, dropSchemaConvertor, renameSchemaConvertor, createViewConvertor, dropViewConvertor, renameViewConvertor, moveViewConvertor, alterViewConvertor, recreateViewConvertor, createTableConvertor, dropTableConvertor, renameTableConvertor, moveTableConvertor, addColumnConvertor, dropColumnConvertor, renameColumnConvertor, recreateColumnConvertor, recreateIndexConvertor, alterColumnConvertor, createIndexConvertor, dropIndexConvertor, renameIndexConvertor, addPrimaryKeyConvertor, dropPrimaryKeyConvertor, recreatePrimaryKeyConvertor, renameConstraintConvertor, createForeignKeyConvertor, recreateFKConvertor, dropForeignKeyConvertor, addCheckConvertor, dropCheckConvertor, recreateCheckConvertor, addUniqueConvertor, dropUniqueConvertor, createEnumConvertor, dropEnumConvertor, renameEnumConvertor, moveEnumConvertor, alterEnumConvertor, recreateEnumConvertor, createSequenceConvertor, dropSequenceConvertor, renameSequenceConvertor, moveSequenceConvertor, alterSequenceConvertor, createRoleConvertor, dropRoleConvertor, renameRoleConvertor, alterRoleConvertor, grantPrivilegeConvertor, revokePrivilegeConvertor, regrantPrivilegeConvertor, createPolicyConvertor, dropPolicyConvertor, renamePolicyConvertor, alterPolicyConvertor, recreatePolicy, toggleRlsConvertor, convertors;
+var convertor, createSchemaConvertor, dropSchemaConvertor, renameSchemaConvertor, createViewConvertor, dropViewConvertor, renameViewConvertor, moveViewConvertor, alterViewConvertor, createTableConvertor, dropTableConvertor, renameTableConvertor, moveTableConvertor, addColumnConvertor, dropColumnConvertor, renameColumnConvertor, recreateColumnConvertor, recreateIndexConvertor, alterColumnConvertor, createIndexConvertor, dropIndexConvertor, renameIndexConvertor, addPrimaryKeyConvertor, dropPrimaryKeyConvertor, recreatePrimaryKeyConvertor, renameConstraintConvertor, createForeignKeyConvertor, recreateFKConvertor, dropForeignKeyConvertor, addCheckConvertor, dropCheckConvertor, recreateCheckConvertor, addUniqueConvertor, dropUniqueConvertor, createEnumConvertor, dropEnumConvertor, renameEnumConvertor, moveEnumConvertor, alterEnumConvertor, recreateEnumConvertor, createSequenceConvertor, dropSequenceConvertor, renameSequenceConvertor, moveSequenceConvertor, alterSequenceConvertor, createRoleConvertor, dropRoleConvertor, renameRoleConvertor, alterRoleConvertor, grantPrivilegeConvertor, revokePrivilegeConvertor, regrantPrivilegeConvertor, createPolicyConvertor, dropPolicyConvertor, renamePolicyConvertor, alterPolicyConvertor, recreatePolicy, toggleRlsConvertor, convertors;
 var init_convertor = __esm({
   "src/dialects/postgres/convertor.ts"() {
     "use strict";
@@ -22888,11 +22888,6 @@ var init_convertor = __esm({
       }
       return statements;
     });
-    recreateViewConvertor = convertor("recreate_view", (st) => {
-      const drop = dropViewConvertor.convert({ view: st.from });
-      const create2 = createViewConvertor.convert({ view: st.to });
-      return [drop, create2];
-    });
     createTableConvertor = convertor("create_table", (st) => {
       const { schema: schema6, name, columns, pk, uniques, checks, policies, isRlsEnabled } = st.table;
       const statements = [];
@@ -23002,7 +22997,7 @@ var init_convertor = __esm({
       return [drop, add];
     });
     alterColumnConvertor = convertor("alter_column", (st) => {
-      const { diff: diff2, to: column8, isEnum, wasEnum } = st;
+      const { diff: diff2, to: column8, isEnum, wasEnum, wasSerial } = st;
       const statements = [];
       const key = column8.schema !== "public" ? `"${column8.schema}"."${column8.table}"` : `"${column8.table}"`;
       const recreateDefault = diff2.type && (isEnum || wasEnum) && (column8.default || diff2.default && diff2.default.from);
@@ -23012,13 +23007,18 @@ var init_convertor = __esm({
       if (diff2.type) {
         const typeSchema = column8.typeSchema && column8.typeSchema !== "public" ? `"${column8.typeSchema}".` : "";
         const textProxy = wasEnum && isEnum ? "text::" : "";
-        const suffix = isEnum ? ` USING "${column8.name}"::${textProxy}${typeSchema}"${column8.type}"${"[]".repeat(column8.dimensions)}` : "";
+        const suffix = isEnum ? ` USING "${column8.name}"::${textProxy}${typeSchema}"${column8.type}"${"[]".repeat(column8.dimensions)}` : ` USING "${column8.name}"::${column8.type}${"[]".repeat(column8.dimensions)}`;
         let type;
         if (diff2.type) {
           type = diff2.typeSchema?.to && diff2.typeSchema.to !== "public" ? `"${diff2.typeSchema.to}"."${diff2.type.to}"` : isEnum ? `"${diff2.type.to}"` : diff2.type.to;
         } else {
           type = `${typeSchema}${column8.typeSchema ? `"${column8.type}"` : column8.type}`;
         }
+        if (wasSerial) {
+          statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column8.name}" DROP DEFAULT`);
+          const sequenceKey = column8.schema !== "public" ? `"${column8.schema}"."${column8.table}_${column8.name}_seq"` : `"${column8.table}_${column8.name}_seq"`;
+          statements.push(`DROP SEQUENCE ${sequenceKey}`);
+        }
         statements.push(
           `ALTER TABLE ${key} ALTER COLUMN "${column8.name}" SET DATA TYPE ${type}${"[]".repeat(column8.dimensions)}${suffix};`
         );
@@ -23053,6 +23053,11 @@ var init_convertor = __esm({
           const cycle = identity.cycle ? ` CYCLE` : "";
           const identityStatement = `GENERATED ${typeClause} AS IDENTITY (sequence name ${identityWithSchema}${incrementClause}${minClause}${maxClause}${startWith}${cache6}${cycle})`;
           statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column8.name}" ADD ${identityStatement};`);
+          if (wasSerial && column8.identity) {
+            statements.push(
+              `SELECT setval('${column8.identity.name}'::regclass, (SELECT COALESCE(MAX(id), 1) FROM ${key}), false);`
+            );
+          }
         } else if (diff2.identity.to === null) {
           statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column8.name}" DROP IDENTITY;`);
         } else {
@@ -23391,7 +23396,6 @@ var init_convertor = __esm({
       renameViewConvertor,
       moveViewConvertor,
       alterViewConvertor,
-      recreateViewConvertor,
       createTableConvertor,
       dropTableConvertor,
       renameTableConvertor,
@@ -24298,11 +24302,15 @@ var init_diff = __esm({
         return ddl22.columns.hasDiff(it);
       }).map((it) => {
         const column8 = it.$right;
+        const wasSerial = isSerialType(it.$left.type);
+        const isEnum = ddl22.enums.one({ schema: column8.typeSchema ?? "public", name: column8.type }) !== null;
+        const wasEnum = (it.type && ddl1.enums.one({ schema: column8.typeSchema ?? "public", name: it.type.from }) !== null) ?? false;
         return prepareStatement("alter_column", {
           diff: it,
-          isEnum: ddl22.enums.one({ schema: column8.typeSchema ?? "public", name: column8.type }) !== null,
-          wasEnum: (it.type && ddl1.enums.one({ schema: column8.typeSchema ?? "public", name: it.type.from }) !== null) ?? false,
-          to: column8
+          to: column8,
+          isEnum,
+          wasEnum,
+          wasSerial
         });
       });
       const createSequences = createdSequences.map((it) => prepareStatement("create_sequence", { sequence: it }));
@@ -24329,7 +24337,7 @@ var init_diff = __esm({
       const renameSchemas = renamedSchemas.map((it) => prepareStatement("rename_schema", it));
       const createTables = createdTables.map((it) => prepareStatement("create_table", { table: tableFromDDL(it, ddl22) }));
       const createViews = createdViews.map((it) => prepareStatement("create_view", { view: it }));
-      const jsonDropViews = deletedViews.map((it) => prepareStatement("drop_view", { view: it }));
+      const jsonDropViews = deletedViews.map((it) => prepareStatement("drop_view", { view: it, cause: null }));
       const jsonRenameViews = renamedViews.map((it) => prepareStatement("rename_view", it));
       const jsonMoveViews = movedViews.map(
         (it) => prepareStatement("move_view", { fromSchema: it.from.schema, toSchema: it.to.schema, view: it.to })
@@ -24354,7 +24362,7 @@ var init_diff = __esm({
           view: it.view
         });
       });
-      const jsonRecreateViews = viewsAlters.filter((it) => it.diff.definition).map((entry) => {
+      viewsAlters.filter((it) => it.diff.definition).forEach((entry) => {
         const it = entry.view;
         const schemaRename = renamedSchemas.find((r7) => r7.to.name === it.schema);
         const schema6 = schemaRename ? schemaRename.from.name : it.schema;
@@ -24368,7 +24376,8 @@ var init_diff = __esm({
 				${schema6}:${name}
 				`);
         }
-        return prepareStatement("recreate_view", { from, to: it });
+        jsonDropViews.push(prepareStatement("drop_view", { view: it, cause: from }));
+        createViews.push(prepareStatement("create_view", { view: it }));
       });
       const columnsToRecreate = columnAlters.filter((it) => it.generated && it.generated.to !== null).filter((it) => {
         return !(it.generated?.to && it.generated.from && mode === "push");
@@ -24419,7 +24428,6 @@ var init_diff = __esm({
       jsonStatements.push(...jsonDropViews);
       jsonStatements.push(...jsonRenameViews);
       jsonStatements.push(...jsonMoveViews);
-      jsonStatements.push(...jsonRecreateViews);
       jsonStatements.push(...jsonAlterViews);
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonDropPoliciesStatements);
@@ -24983,12 +24991,6 @@ var init_introspect = __esm({
           values: it.values
         });
       }
-      let columnsCount = 0;
-      let indexesCount = 0;
-      let foreignKeysCount = 0;
-      let tableCount = 0;
-      let checksCount = 0;
-      let viewsCount = 0;
       for (const seq of sequencesList) {
         const depend = dependList.find((it) => it.oid === seq.oid);
         if (depend && (depend.deptype === "a" || depend.deptype === "i")) {
@@ -25006,7 +25008,6 @@ var init_introspect = __esm({
           cacheSize: Number(stringFromDatabaseIdentityProperty(seq.cacheSize) ?? 1)
         });
       }
-      progressCallback("enums", Object.keys(groupedEnums).length, "done");
       for (const dbRole of rolesList) {
         roles.push({
           entityType: "roles",
@@ -25049,7 +25050,6 @@ var init_introspect = __esm({
           withCheck: it.withCheck ?? null
         });
       }
-      progressCallback("policies", policiesList.length, "done");
       for (const column8 of columnsList.filter((x6) => x6.kind === "r" || x6.kind === "p")) {
         const type = column8.type;
         if (!(type === "smallint" || type === "bigint" || type === "integer")) {
@@ -25328,10 +25328,6 @@ ${JSON.stringify(column8.metadata)}`
           forPK
         });
       }
-      progressCallback("columns", columnsCount, "fetching");
-      progressCallback("checks", checksCount, "fetching");
-      progressCallback("indexes", indexesCount, "fetching");
-      progressCallback("tables", tableCount, "done");
       for (const it of columnsList.filter((x6) => x6.kind === "m" || x6.kind === "v")) {
         const view6 = viewsList.find((x6) => x6.oid === it.tableId);
         const typeDimensions = it.type.split("[]").length - 1;
@@ -25355,7 +25351,6 @@ ${JSON.stringify(column8.metadata)}`
         });
       }
       for (const view6 of viewsList) {
-        tableCount += 1;
         const accessMethod = view6.accessMethod === 0 ? null : ams.find((it) => it.oid === view6.accessMethod);
         const tablespace = view6.tablespaceid === 0 ? null : tablespaces.find((it) => it.oid === view6.tablespaceid).name;
         const definition = parseViewDefinition(view6.definition);
@@ -25407,11 +25402,14 @@ ${JSON.stringify(column8.metadata)}`
           withNoData: null
         });
       }
-      progressCallback("columns", columnsCount, "done");
-      progressCallback("indexes", indexesCount, "done");
-      progressCallback("fks", foreignKeysCount, "done");
-      progressCallback("checks", checksCount, "done");
-      progressCallback("views", viewsCount, "done");
+      progressCallback("tables", filteredTables.length, "done");
+      progressCallback("columns", columnsList.length, "done");
+      progressCallback("checks", checks.length, "done");
+      progressCallback("indexes", indexes.length, "fetching");
+      progressCallback("views", viewsList.length, "done");
+      progressCallback("fks", fks.length, "done");
+      progressCallback("enums", Object.keys(groupedEnums).length, "done");
+      progressCallback("policies", policiesList.length, "done");
       const resultSchemas = schemas.filter((x6) => filter2({ type: "schema", name: x6.name }));
       const resultTables = tables.filter((x6) => filter2({ type: "table", schema: x6.schema, name: x6.name }));
       const resultEnums = enums.filter((x6) => resultSchemas.some((s7) => s7.name === x6.schema));
@@ -149567,7 +149565,7 @@ var init_push_postgres = __esm({
     suggestions = async (db, jsonStatements) => {
       const grouped = [];
       const filtered = jsonStatements.filter((it) => {
-        if (it.type === "recreate_view") return false;
+        if (it.type === "drop_view" && it.cause) return false;
         if (it.type === "alter_column" && it.diff.generated) return false;
         return true;
       });

package/api-postgres.mjs

@@ -15630,8 +15630,8 @@ var init_views = __esm({
 `;
         if (d6.with) cause += `| with: ${formatOptionChanges(d6.with.from, d6.with.to)}`;
       }
-      if (st.type === "recreate_view") {
-        const { from, to } = st;
+      if (st.type === "drop_view" && st.cause) {
+        const { cause: from, view: to } = st;
         const key = `${to.schema}.${to.name}`;
         title += `${key} view changed:`;
         cause += `\u2502 definition: [${from.definition}] -> [${to.definition}]
@@ -22835,7 +22835,7 @@ function fromJson(statements) {
   };
   return result2;
 }
-var convertor, createSchemaConvertor, dropSchemaConvertor, renameSchemaConvertor, createViewConvertor, dropViewConvertor, renameViewConvertor, moveViewConvertor, alterViewConvertor, recreateViewConvertor, createTableConvertor, dropTableConvertor, renameTableConvertor, moveTableConvertor, addColumnConvertor, dropColumnConvertor, renameColumnConvertor, recreateColumnConvertor, recreateIndexConvertor, alterColumnConvertor, createIndexConvertor, dropIndexConvertor, renameIndexConvertor, addPrimaryKeyConvertor, dropPrimaryKeyConvertor, recreatePrimaryKeyConvertor, renameConstraintConvertor, createForeignKeyConvertor, recreateFKConvertor, dropForeignKeyConvertor, addCheckConvertor, dropCheckConvertor, recreateCheckConvertor, addUniqueConvertor, dropUniqueConvertor, createEnumConvertor, dropEnumConvertor, renameEnumConvertor, moveEnumConvertor, alterEnumConvertor, recreateEnumConvertor, createSequenceConvertor, dropSequenceConvertor, renameSequenceConvertor, moveSequenceConvertor, alterSequenceConvertor, createRoleConvertor, dropRoleConvertor, renameRoleConvertor, alterRoleConvertor, grantPrivilegeConvertor, revokePrivilegeConvertor, regrantPrivilegeConvertor, createPolicyConvertor, dropPolicyConvertor, renamePolicyConvertor, alterPolicyConvertor, recreatePolicy, toggleRlsConvertor, convertors;
+var convertor, createSchemaConvertor, dropSchemaConvertor, renameSchemaConvertor, createViewConvertor, dropViewConvertor, renameViewConvertor, moveViewConvertor, alterViewConvertor, createTableConvertor, dropTableConvertor, renameTableConvertor, moveTableConvertor, addColumnConvertor, dropColumnConvertor, renameColumnConvertor, recreateColumnConvertor, recreateIndexConvertor, alterColumnConvertor, createIndexConvertor, dropIndexConvertor, renameIndexConvertor, addPrimaryKeyConvertor, dropPrimaryKeyConvertor, recreatePrimaryKeyConvertor, renameConstraintConvertor, createForeignKeyConvertor, recreateFKConvertor, dropForeignKeyConvertor, addCheckConvertor, dropCheckConvertor, recreateCheckConvertor, addUniqueConvertor, dropUniqueConvertor, createEnumConvertor, dropEnumConvertor, renameEnumConvertor, moveEnumConvertor, alterEnumConvertor, recreateEnumConvertor, createSequenceConvertor, dropSequenceConvertor, renameSequenceConvertor, moveSequenceConvertor, alterSequenceConvertor, createRoleConvertor, dropRoleConvertor, renameRoleConvertor, alterRoleConvertor, grantPrivilegeConvertor, revokePrivilegeConvertor, regrantPrivilegeConvertor, createPolicyConvertor, dropPolicyConvertor, renamePolicyConvertor, alterPolicyConvertor, recreatePolicy, toggleRlsConvertor, convertors;
 var init_convertor = __esm({
   "src/dialects/postgres/convertor.ts"() {
     "use strict";
@@ -22924,11 +22924,6 @@ var init_convertor = __esm({
       }
       return statements;
     });
-    recreateViewConvertor = convertor("recreate_view", (st) => {
-      const drop = dropViewConvertor.convert({ view: st.from });
-      const create2 = createViewConvertor.convert({ view: st.to });
-      return [drop, create2];
-    });
     createTableConvertor = convertor("create_table", (st) => {
       const { schema: schema6, name, columns, pk, uniques, checks, policies, isRlsEnabled } = st.table;
       const statements = [];
@@ -23038,7 +23033,7 @@ var init_convertor = __esm({
       return [drop, add];
     });
     alterColumnConvertor = convertor("alter_column", (st) => {
-      const { diff: diff2, to: column8, isEnum, wasEnum } = st;
+      const { diff: diff2, to: column8, isEnum, wasEnum, wasSerial } = st;
       const statements = [];
       const key = column8.schema !== "public" ? `"${column8.schema}"."${column8.table}"` : `"${column8.table}"`;
       const recreateDefault = diff2.type && (isEnum || wasEnum) && (column8.default || diff2.default && diff2.default.from);
@@ -23048,13 +23043,18 @@ var init_convertor = __esm({
       if (diff2.type) {
         const typeSchema = column8.typeSchema && column8.typeSchema !== "public" ? `"${column8.typeSchema}".` : "";
         const textProxy = wasEnum && isEnum ? "text::" : "";
-        const suffix = isEnum ? ` USING "${column8.name}"::${textProxy}${typeSchema}"${column8.type}"${"[]".repeat(column8.dimensions)}` : "";
+        const suffix = isEnum ? ` USING "${column8.name}"::${textProxy}${typeSchema}"${column8.type}"${"[]".repeat(column8.dimensions)}` : ` USING "${column8.name}"::${column8.type}${"[]".repeat(column8.dimensions)}`;
         let type;
         if (diff2.type) {
           type = diff2.typeSchema?.to && diff2.typeSchema.to !== "public" ? `"${diff2.typeSchema.to}"."${diff2.type.to}"` : isEnum ? `"${diff2.type.to}"` : diff2.type.to;
         } else {
           type = `${typeSchema}${column8.typeSchema ? `"${column8.type}"` : column8.type}`;
         }
+        if (wasSerial) {
+          statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column8.name}" DROP DEFAULT`);
+          const sequenceKey = column8.schema !== "public" ? `"${column8.schema}"."${column8.table}_${column8.name}_seq"` : `"${column8.table}_${column8.name}_seq"`;
+          statements.push(`DROP SEQUENCE ${sequenceKey}`);
+        }
         statements.push(
           `ALTER TABLE ${key} ALTER COLUMN "${column8.name}" SET DATA TYPE ${type}${"[]".repeat(column8.dimensions)}${suffix};`
         );
@@ -23089,6 +23089,11 @@ var init_convertor = __esm({
           const cycle = identity.cycle ? ` CYCLE` : "";
           const identityStatement = `GENERATED ${typeClause} AS IDENTITY (sequence name ${identityWithSchema}${incrementClause}${minClause}${maxClause}${startWith}${cache6}${cycle})`;
           statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column8.name}" ADD ${identityStatement};`);
+          if (wasSerial && column8.identity) {
+            statements.push(
+              `SELECT setval('${column8.identity.name}'::regclass, (SELECT COALESCE(MAX(id), 1) FROM ${key}), false);`
+            );
+          }
         } else if (diff2.identity.to === null) {
           statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column8.name}" DROP IDENTITY;`);
         } else {
@@ -23427,7 +23432,6 @@ var init_convertor = __esm({
       renameViewConvertor,
       moveViewConvertor,
       alterViewConvertor,
-      recreateViewConvertor,
       createTableConvertor,
       dropTableConvertor,
       renameTableConvertor,
@@ -24334,11 +24338,15 @@ var init_diff = __esm({
         return ddl22.columns.hasDiff(it);
       }).map((it) => {
         const column8 = it.$right;
+        const wasSerial = isSerialType(it.$left.type);
+        const isEnum = ddl22.enums.one({ schema: column8.typeSchema ?? "public", name: column8.type }) !== null;
+        const wasEnum = (it.type && ddl1.enums.one({ schema: column8.typeSchema ?? "public", name: it.type.from }) !== null) ?? false;
         return prepareStatement("alter_column", {
           diff: it,
-          isEnum: ddl22.enums.one({ schema: column8.typeSchema ?? "public", name: column8.type }) !== null,
-          wasEnum: (it.type && ddl1.enums.one({ schema: column8.typeSchema ?? "public", name: it.type.from }) !== null) ?? false,
-          to: column8
+          to: column8,
+          isEnum,
+          wasEnum,
+          wasSerial
         });
       });
       const createSequences = createdSequences.map((it) => prepareStatement("create_sequence", { sequence: it }));
@@ -24365,7 +24373,7 @@ var init_diff = __esm({
       const renameSchemas = renamedSchemas.map((it) => prepareStatement("rename_schema", it));
       const createTables = createdTables.map((it) => prepareStatement("create_table", { table: tableFromDDL(it, ddl22) }));
       const createViews = createdViews.map((it) => prepareStatement("create_view", { view: it }));
-      const jsonDropViews = deletedViews.map((it) => prepareStatement("drop_view", { view: it }));
+      const jsonDropViews = deletedViews.map((it) => prepareStatement("drop_view", { view: it, cause: null }));
       const jsonRenameViews = renamedViews.map((it) => prepareStatement("rename_view", it));
       const jsonMoveViews = movedViews.map(
         (it) => prepareStatement("move_view", { fromSchema: it.from.schema, toSchema: it.to.schema, view: it.to })
@@ -24390,7 +24398,7 @@ var init_diff = __esm({
           view: it.view
         });
       });
-      const jsonRecreateViews = viewsAlters.filter((it) => it.diff.definition).map((entry) => {
+      viewsAlters.filter((it) => it.diff.definition).forEach((entry) => {
         const it = entry.view;
         const schemaRename = renamedSchemas.find((r7) => r7.to.name === it.schema);
         const schema6 = schemaRename ? schemaRename.from.name : it.schema;
@@ -24404,7 +24412,8 @@ var init_diff = __esm({
 				${schema6}:${name}
 				`);
         }
-        return prepareStatement("recreate_view", { from, to: it });
+        jsonDropViews.push(prepareStatement("drop_view", { view: it, cause: from }));
+        createViews.push(prepareStatement("create_view", { view: it }));
       });
       const columnsToRecreate = columnAlters.filter((it) => it.generated && it.generated.to !== null).filter((it) => {
         return !(it.generated?.to && it.generated.from && mode === "push");
@@ -24455,7 +24464,6 @@ var init_diff = __esm({
       jsonStatements.push(...jsonDropViews);
       jsonStatements.push(...jsonRenameViews);
       jsonStatements.push(...jsonMoveViews);
-      jsonStatements.push(...jsonRecreateViews);
       jsonStatements.push(...jsonAlterViews);
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonDropPoliciesStatements);
@@ -25019,12 +25027,6 @@ var init_introspect = __esm({
           values: it.values
         });
       }
-      let columnsCount = 0;
-      let indexesCount = 0;
-      let foreignKeysCount = 0;
-      let tableCount = 0;
-      let checksCount = 0;
-      let viewsCount = 0;
       for (const seq of sequencesList) {
         const depend = dependList.find((it) => it.oid === seq.oid);
         if (depend && (depend.deptype === "a" || depend.deptype === "i")) {
@@ -25042,7 +25044,6 @@ var init_introspect = __esm({
           cacheSize: Number(stringFromDatabaseIdentityProperty(seq.cacheSize) ?? 1)
         });
       }
-      progressCallback("enums", Object.keys(groupedEnums).length, "done");
       for (const dbRole of rolesList) {
         roles.push({
           entityType: "roles",
@@ -25085,7 +25086,6 @@ var init_introspect = __esm({
           withCheck: it.withCheck ?? null
         });
       }
-      progressCallback("policies", policiesList.length, "done");
       for (const column8 of columnsList.filter((x6) => x6.kind === "r" || x6.kind === "p")) {
         const type = column8.type;
         if (!(type === "smallint" || type === "bigint" || type === "integer")) {
@@ -25364,10 +25364,6 @@ ${JSON.stringify(column8.metadata)}`
           forPK
         });
       }
-      progressCallback("columns", columnsCount, "fetching");
-      progressCallback("checks", checksCount, "fetching");
-      progressCallback("indexes", indexesCount, "fetching");
-      progressCallback("tables", tableCount, "done");
       for (const it of columnsList.filter((x6) => x6.kind === "m" || x6.kind === "v")) {
         const view6 = viewsList.find((x6) => x6.oid === it.tableId);
         const typeDimensions = it.type.split("[]").length - 1;
@@ -25391,7 +25387,6 @@ ${JSON.stringify(column8.metadata)}`
         });
       }
       for (const view6 of viewsList) {
-        tableCount += 1;
         const accessMethod = view6.accessMethod === 0 ? null : ams.find((it) => it.oid === view6.accessMethod);
         const tablespace = view6.tablespaceid === 0 ? null : tablespaces.find((it) => it.oid === view6.tablespaceid).name;
         const definition = parseViewDefinition(view6.definition);
@@ -25443,11 +25438,14 @@ ${JSON.stringify(column8.metadata)}`
           withNoData: null
         });
       }
-      progressCallback("columns", columnsCount, "done");
-      progressCallback("indexes", indexesCount, "done");
-      progressCallback("fks", foreignKeysCount, "done");
-      progressCallback("checks", checksCount, "done");
-      progressCallback("views", viewsCount, "done");
+      progressCallback("tables", filteredTables.length, "done");
+      progressCallback("columns", columnsList.length, "done");
+      progressCallback("checks", checks.length, "done");
+      progressCallback("indexes", indexes.length, "fetching");
+      progressCallback("views", viewsList.length, "done");
+      progressCallback("fks", fks.length, "done");
+      progressCallback("enums", Object.keys(groupedEnums).length, "done");
+      progressCallback("policies", policiesList.length, "done");
       const resultSchemas = schemas.filter((x6) => filter2({ type: "schema", name: x6.name }));
       const resultTables = tables.filter((x6) => filter2({ type: "table", schema: x6.schema, name: x6.name }));
       const resultEnums = enums.filter((x6) => resultSchemas.some((s7) => s7.name === x6.schema));
@@ -149600,7 +149598,7 @@ var init_push_postgres = __esm({
     suggestions = async (db, jsonStatements) => {
       const grouped = [];
       const filtered = jsonStatements.filter((it) => {
-        if (it.type === "recreate_view") return false;
+        if (it.type === "drop_view" && it.cause) return false;
         if (it.type === "alter_column" && it.diff.generated) return false;
         return true;
       });

package/bin.cjs

@@ -23346,8 +23346,8 @@ var init_views = __esm({
 `;
         if (d5.with) cause += `| with: ${formatOptionChanges(d5.with.from, d5.with.to)}`;
       }
-      if (st2.type === "recreate_view") {
-        const { from, to: to2 } = st2;
+      if (st2.type === "drop_view" && st2.cause) {
+        const { cause: from, view: to2 } = st2;
         const key = `${to2.schema}.${to2.name}`;
         title += `${key} view changed:`;
         cause += `\u2502 definition: [${from.definition}] -> [${to2.definition}]
@@ -38780,7 +38780,7 @@ function fromJson(statements) {
   };
   return result2;
 }
-var convertor, createSchemaConvertor, dropSchemaConvertor, renameSchemaConvertor, createViewConvertor, dropViewConvertor, renameViewConvertor, moveViewConvertor, alterViewConvertor, recreateViewConvertor, createTableConvertor, dropTableConvertor, renameTableConvertor, moveTableConvertor, addColumnConvertor, dropColumnConvertor, renameColumnConvertor, recreateColumnConvertor, recreateIndexConvertor, alterColumnConvertor, createIndexConvertor, dropIndexConvertor, renameIndexConvertor, addPrimaryKeyConvertor, dropPrimaryKeyConvertor, recreatePrimaryKeyConvertor, renameConstraintConvertor, createForeignKeyConvertor, recreateFKConvertor, dropForeignKeyConvertor, addCheckConvertor, dropCheckConvertor, recreateCheckConvertor, addUniqueConvertor, dropUniqueConvertor, createEnumConvertor, dropEnumConvertor, renameEnumConvertor, moveEnumConvertor, alterEnumConvertor, recreateEnumConvertor, createSequenceConvertor, dropSequenceConvertor, renameSequenceConvertor, moveSequenceConvertor, alterSequenceConvertor, createRoleConvertor, dropRoleConvertor, renameRoleConvertor, alterRoleConvertor, grantPrivilegeConvertor, revokePrivilegeConvertor, regrantPrivilegeConvertor, createPolicyConvertor, dropPolicyConvertor, renamePolicyConvertor, alterPolicyConvertor, recreatePolicy, toggleRlsConvertor, convertors;
+var convertor, createSchemaConvertor, dropSchemaConvertor, renameSchemaConvertor, createViewConvertor, dropViewConvertor, renameViewConvertor, moveViewConvertor, alterViewConvertor, createTableConvertor, dropTableConvertor, renameTableConvertor, moveTableConvertor, addColumnConvertor, dropColumnConvertor, renameColumnConvertor, recreateColumnConvertor, recreateIndexConvertor, alterColumnConvertor, createIndexConvertor, dropIndexConvertor, renameIndexConvertor, addPrimaryKeyConvertor, dropPrimaryKeyConvertor, recreatePrimaryKeyConvertor, renameConstraintConvertor, createForeignKeyConvertor, recreateFKConvertor, dropForeignKeyConvertor, addCheckConvertor, dropCheckConvertor, recreateCheckConvertor, addUniqueConvertor, dropUniqueConvertor, createEnumConvertor, dropEnumConvertor, renameEnumConvertor, moveEnumConvertor, alterEnumConvertor, recreateEnumConvertor, createSequenceConvertor, dropSequenceConvertor, renameSequenceConvertor, moveSequenceConvertor, alterSequenceConvertor, createRoleConvertor, dropRoleConvertor, renameRoleConvertor, alterRoleConvertor, grantPrivilegeConvertor, revokePrivilegeConvertor, regrantPrivilegeConvertor, createPolicyConvertor, dropPolicyConvertor, renamePolicyConvertor, alterPolicyConvertor, recreatePolicy, toggleRlsConvertor, convertors;
 var init_convertor = __esm({
   "src/dialects/postgres/convertor.ts"() {
     "use strict";
@@ -38870,11 +38870,6 @@ var init_convertor = __esm({
       }
       return statements;
     });
-    recreateViewConvertor = convertor("recreate_view", (st2) => {
-      const drop = dropViewConvertor.convert({ view: st2.from });
-      const create2 = createViewConvertor.convert({ view: st2.to });
-      return [drop, create2];
-    });
     createTableConvertor = convertor("create_table", (st2) => {
       var _a5, _b;
       const { schema: schema6, name, columns, pk, uniques, checks, policies, isRlsEnabled } = st2.table;
@@ -38986,7 +38981,7 @@ var init_convertor = __esm({
     });
     alterColumnConvertor = convertor("alter_column", (st2) => {
       var _a5;
-      const { diff: diff2, to: column12, isEnum, wasEnum } = st2;
+      const { diff: diff2, to: column12, isEnum, wasEnum, wasSerial } = st2;
       const statements = [];
       const key = column12.schema !== "public" ? `"${column12.schema}"."${column12.table}"` : `"${column12.table}"`;
       const recreateDefault = diff2.type && (isEnum || wasEnum) && (column12.default || diff2.default && diff2.default.from);
@@ -38996,13 +38991,18 @@ var init_convertor = __esm({
       if (diff2.type) {
         const typeSchema = column12.typeSchema && column12.typeSchema !== "public" ? `"${column12.typeSchema}".` : "";
         const textProxy = wasEnum && isEnum ? "text::" : "";
-        const suffix = isEnum ? ` USING "${column12.name}"::${textProxy}${typeSchema}"${column12.type}"${"[]".repeat(column12.dimensions)}` : "";
+        const suffix = isEnum ? ` USING "${column12.name}"::${textProxy}${typeSchema}"${column12.type}"${"[]".repeat(column12.dimensions)}` : ` USING "${column12.name}"::${column12.type}${"[]".repeat(column12.dimensions)}`;
         let type;
         if (diff2.type) {
           type = ((_a5 = diff2.typeSchema) == null ? void 0 : _a5.to) && diff2.typeSchema.to !== "public" ? `"${diff2.typeSchema.to}"."${diff2.type.to}"` : isEnum ? `"${diff2.type.to}"` : diff2.type.to;
         } else {
           type = `${typeSchema}${column12.typeSchema ? `"${column12.type}"` : column12.type}`;
         }
+        if (wasSerial) {
+          statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column12.name}" DROP DEFAULT`);
+          const sequenceKey = column12.schema !== "public" ? `"${column12.schema}"."${column12.table}_${column12.name}_seq"` : `"${column12.table}_${column12.name}_seq"`;
+          statements.push(`DROP SEQUENCE ${sequenceKey}`);
+        }
         statements.push(
           `ALTER TABLE ${key} ALTER COLUMN "${column12.name}" SET DATA TYPE ${type}${"[]".repeat(column12.dimensions)}${suffix};`
         );
@@ -39037,6 +39037,11 @@ var init_convertor = __esm({
           const cycle = identity.cycle ? ` CYCLE` : "";
           const identityStatement = `GENERATED ${typeClause} AS IDENTITY (sequence name ${identityWithSchema}${incrementClause}${minClause}${maxClause}${startWith}${cache4}${cycle})`;
           statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column12.name}" ADD ${identityStatement};`);
+          if (wasSerial && column12.identity) {
+            statements.push(
+              `SELECT setval('${column12.identity.name}'::regclass, (SELECT COALESCE(MAX(id), 1) FROM ${key}), false);`
+            );
+          }
         } else if (diff2.identity.to === null) {
           statements.push(`ALTER TABLE ${key} ALTER COLUMN "${column12.name}" DROP IDENTITY;`);
         } else {
@@ -39377,7 +39382,6 @@ var init_convertor = __esm({
       renameViewConvertor,
       moveViewConvertor,
       alterViewConvertor,
-      recreateViewConvertor,
       createTableConvertor,
       dropTableConvertor,
       renameTableConvertor,
@@ -40283,11 +40287,15 @@ var init_diff = __esm({
         return ddl22.columns.hasDiff(it2);
       }).map((it2) => {
         const column12 = it2.$right;
+        const wasSerial = isSerialType(it2.$left.type);
+        const isEnum = ddl22.enums.one({ schema: column12.typeSchema ?? "public", name: column12.type }) !== null;
+        const wasEnum = (it2.type && ddl1.enums.one({ schema: column12.typeSchema ?? "public", name: it2.type.from }) !== null) ?? false;
         return prepareStatement("alter_column", {
           diff: it2,
-          isEnum: ddl22.enums.one({ schema: column12.typeSchema ?? "public", name: column12.type }) !== null,
-          wasEnum: (it2.type && ddl1.enums.one({ schema: column12.typeSchema ?? "public", name: it2.type.from }) !== null) ?? false,
-          to: column12
+          to: column12,
+          isEnum,
+          wasEnum,
+          wasSerial
         });
       });
       const createSequences = createdSequences.map((it2) => prepareStatement("create_sequence", { sequence: it2 }));
@@ -40314,7 +40322,7 @@ var init_diff = __esm({
       const renameSchemas = renamedSchemas.map((it2) => prepareStatement("rename_schema", it2));
       const createTables = createdTables.map((it2) => prepareStatement("create_table", { table: tableFromDDL3(it2, ddl22) }));
       const createViews = createdViews.map((it2) => prepareStatement("create_view", { view: it2 }));
-      const jsonDropViews = deletedViews.map((it2) => prepareStatement("drop_view", { view: it2 }));
+      const jsonDropViews = deletedViews.map((it2) => prepareStatement("drop_view", { view: it2, cause: null }));
       const jsonRenameViews = renamedViews.map((it2) => prepareStatement("rename_view", it2));
       const jsonMoveViews = movedViews.map(
         (it2) => prepareStatement("move_view", { fromSchema: it2.from.schema, toSchema: it2.to.schema, view: it2.to })
@@ -40339,7 +40347,7 @@ var init_diff = __esm({
           view: it2.view
         });
       });
-      const jsonRecreateViews = viewsAlters.filter((it2) => it2.diff.definition).map((entry) => {
+      viewsAlters.filter((it2) => it2.diff.definition).forEach((entry) => {
         const it2 = entry.view;
         const schemaRename = renamedSchemas.find((r6) => r6.to.name === it2.schema);
         const schema6 = schemaRename ? schemaRename.from.name : it2.schema;
@@ -40353,7 +40361,8 @@ var init_diff = __esm({
 				${schema6}:${name}
 				`);
         }
-        return prepareStatement("recreate_view", { from, to: it2 });
+        jsonDropViews.push(prepareStatement("drop_view", { view: it2, cause: from }));
+        createViews.push(prepareStatement("create_view", { view: it2 }));
       });
       const columnsToRecreate = columnAlters.filter((it2) => it2.generated && it2.generated.to !== null).filter((it2) => {
         var _a5;
@@ -40405,7 +40414,6 @@ var init_diff = __esm({
       jsonStatements.push(...jsonDropViews);
       jsonStatements.push(...jsonRenameViews);
       jsonStatements.push(...jsonMoveViews);
-      jsonStatements.push(...jsonRecreateViews);
       jsonStatements.push(...jsonAlterViews);
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonDropPoliciesStatements);
@@ -45155,7 +45163,7 @@ function fromJson5(statements) {
   };
   return result2;
 }
-var convertor5, createSchemaConvertor2, dropSchemaConvertor2, renameSchemaConvertor2, createViewConvertor2, dropViewConvertor2, renameViewConvertor2, moveViewConvertor2, recreateViewConvertor2, createTableConvertor2, dropTableConvertor2, renameTableConvertor2, moveTableConvertor2, addColumnConvertor2, dropColumnConvertor2, renameColumnConvertor2, recreateColumnConvertor2, alterColumnConvertor2, alterColumnAddNotNullConvertor, alterColumnDropNotNullConvertor, createIndexConvertor2, dropIndexConvertor2, recreateIndexConvertor2, renameIndexConvertor2, addPrimaryKeyConvertor2, dropPrimaryKeyConvertor2, alterPrimaryKeyConvertor, recreatePrimaryKeyConvertor2, renameConstraintConvertor2, createForeignKeyConvertor2, recreateFKConvertor2, dropForeignKeyConvertor2, addCheckConvertor2, dropCheckConvertor2, recreateCheckConvertor2, createEnumConvertor2, dropEnumConvertor2, renameEnumConvertor2, moveEnumConvertor2, alterEnumConvertor2, recreateEnumConvertor2, createSequenceConvertor2, dropSequenceConvertor2, renameSequenceConvertor2, moveSequenceConvertor2, alterSequenceConvertor2, createRoleConvertor2, dropRoleConvertor2, alterRoleConvertor2, createPolicyConvertor2, dropPolicyConvertor2, renamePolicyConvertor2, alterPolicyConvertor2, recreatePolicy2, toggleRlsConvertor2, convertors5;
+var convertor5, createSchemaConvertor2, dropSchemaConvertor2, renameSchemaConvertor2, createViewConvertor2, dropViewConvertor2, renameViewConvertor2, moveViewConvertor2, recreateViewConvertor, createTableConvertor2, dropTableConvertor2, renameTableConvertor2, moveTableConvertor2, addColumnConvertor2, dropColumnConvertor2, renameColumnConvertor2, recreateColumnConvertor2, alterColumnConvertor2, alterColumnAddNotNullConvertor, alterColumnDropNotNullConvertor, createIndexConvertor2, dropIndexConvertor2, recreateIndexConvertor2, renameIndexConvertor2, addPrimaryKeyConvertor2, dropPrimaryKeyConvertor2, alterPrimaryKeyConvertor, recreatePrimaryKeyConvertor2, renameConstraintConvertor2, createForeignKeyConvertor2, recreateFKConvertor2, dropForeignKeyConvertor2, addCheckConvertor2, dropCheckConvertor2, recreateCheckConvertor2, createEnumConvertor2, dropEnumConvertor2, renameEnumConvertor2, moveEnumConvertor2, alterEnumConvertor2, recreateEnumConvertor2, createSequenceConvertor2, dropSequenceConvertor2, renameSequenceConvertor2, moveSequenceConvertor2, alterSequenceConvertor2, createRoleConvertor2, dropRoleConvertor2, alterRoleConvertor2, createPolicyConvertor2, dropPolicyConvertor2, renamePolicyConvertor2, alterPolicyConvertor2, recreatePolicy2, toggleRlsConvertor2, convertors5;
 var init_convertor5 = __esm({
   "src/dialects/cockroach/convertor.ts"() {
     "use strict";
@@ -45206,7 +45214,7 @@ var init_convertor5 = __esm({
       const from = fromSchema === "public" ? `"${view6.name}"` : `"${fromSchema}"."${view6.name}"`;
       return `ALTER${view6.materialized ? " MATERIALIZED" : ""} VIEW ${from} SET SCHEMA "${toSchema}";`;
     });
-    recreateViewConvertor2 = convertor5("recreate_view", (st2) => {
+    recreateViewConvertor = convertor5("recreate_view", (st2) => {
       const drop = dropViewConvertor2.convert({ view: st2.from });
       const create2 = createViewConvertor2.convert({ view: st2.to });
       return [drop, create2];
@@ -45639,7 +45647,7 @@ var init_convertor5 = __esm({
       dropViewConvertor2,
       renameViewConvertor2,
       moveViewConvertor2,
-      recreateViewConvertor2,
+      recreateViewConvertor,
       createTableConvertor2,
       dropTableConvertor2,
       renameTableConvertor2,
@@ -169553,12 +169561,6 @@ var init_introspect2 = __esm({
           values: it2.values
         });
       }
-      let columnsCount = 0;
-      let indexesCount = 0;
-      let foreignKeysCount = 0;
-      let tableCount = 0;
-      let checksCount = 0;
-      let viewsCount = 0;
       for (const seq of sequencesList) {
         const depend = dependList.find((it2) => it2.oid === seq.oid);
         if (depend && (depend.deptype === "a" || depend.deptype === "i")) {
@@ -169576,7 +169578,6 @@ var init_introspect2 = __esm({
           cacheSize: Number(stringFromDatabaseIdentityProperty(seq.cacheSize) ?? 1)
         });
       }
-      progressCallback("enums", Object.keys(groupedEnums).length, "done");
       for (const dbRole of rolesList) {
         roles.push({
           entityType: "roles",
@@ -169619,7 +169620,6 @@ var init_introspect2 = __esm({
           withCheck: it2.withCheck ?? null
         });
       }
-      progressCallback("policies", policiesList.length, "done");
       for (const column12 of columnsList.filter((x6) => x6.kind === "r" || x6.kind === "p")) {
         const type = column12.type;
         if (!(type === "smallint" || type === "bigint" || type === "integer")) {
@@ -169898,10 +169898,6 @@ ${JSON.stringify(column12.metadata)}`
           forPK
         });
       }
-      progressCallback("columns", columnsCount, "fetching");
-      progressCallback("checks", checksCount, "fetching");
-      progressCallback("indexes", indexesCount, "fetching");
-      progressCallback("tables", tableCount, "done");
       for (const it2 of columnsList.filter((x6) => x6.kind === "m" || x6.kind === "v")) {
         const view6 = viewsList.find((x6) => x6.oid === it2.tableId);
         const typeDimensions = it2.type.split("[]").length - 1;
@@ -169925,7 +169921,6 @@ ${JSON.stringify(column12.metadata)}`
         });
       }
       for (const view6 of viewsList) {
-        tableCount += 1;
         const accessMethod = view6.accessMethod === 0 ? null : ams.find((it2) => it2.oid === view6.accessMethod);
         const tablespace = view6.tablespaceid === 0 ? null : tablespaces.find((it2) => it2.oid === view6.tablespaceid).name;
         const definition = parseViewDefinition(view6.definition);
@@ -169977,11 +169972,14 @@ ${JSON.stringify(column12.metadata)}`
           withNoData: null
         });
       }
-      progressCallback("columns", columnsCount, "done");
-      progressCallback("indexes", indexesCount, "done");
-      progressCallback("fks", foreignKeysCount, "done");
-      progressCallback("checks", checksCount, "done");
-      progressCallback("views", viewsCount, "done");
+      progressCallback("tables", filteredTables.length, "done");
+      progressCallback("columns", columnsList.length, "done");
+      progressCallback("checks", checks.length, "done");
+      progressCallback("indexes", indexes.length, "fetching");
+      progressCallback("views", viewsList.length, "done");
+      progressCallback("fks", fks.length, "done");
+      progressCallback("enums", Object.keys(groupedEnums).length, "done");
+      progressCallback("policies", policiesList.length, "done");
       const resultSchemas = schemas.filter((x6) => filter2({ type: "schema", name: x6.name }));
       const resultTables = tables.filter((x6) => filter2({ type: "table", schema: x6.schema, name: x6.name }));
       const resultEnums = enums.filter((x6) => resultSchemas.some((s6) => s6.name === x6.schema));
@@ -170231,7 +170229,7 @@ var init_push_postgres = __esm({
     suggestions2 = async (db, jsonStatements) => {
       const grouped = [];
       const filtered = jsonStatements.filter((it2) => {
-        if (it2.type === "recreate_view") return false;
+        if (it2.type === "drop_view" && it2.cause) return false;
         if (it2.type === "alter_column" && it2.diff.generated) return false;
         return true;
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "1.0.0-beta.2-84ab15f",
+  "version": "1.0.0-beta.2-b2cf0ac",
   "homepage": "https://orm.drizzle.team",
   "keywords": [
     "drizzle",