drizzle-kit 1.0.0-beta.2-f9236e3 → 1.0.0-beta.2-2dc306e

package/api-postgres.js

@@ -7723,10 +7723,11 @@ var init_grammar = __esm({
       return {
         bool: (key) => {
           if (key in it) {
-            if (it[key] === "true") {
+            const value = it[key];
+            if (value === "true" || value === "1" || value === "on" || value === "yes") {
               return true;
             }
-            if (it[key] === "false") {
+            if (value === "false" || value === "0" || value === "off" || value === "no") {
               return false;
             }
             throw new Error(`Invalid options boolean value for ${key}: ${it[key]}`);
@@ -23001,7 +23002,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);
@@ -23011,13 +23012,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};`
         );
@@ -23052,6 +23058,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 {
@@ -24297,11 +24308,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 }));
@@ -24982,12 +24997,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")) {
@@ -25005,7 +25014,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",
@@ -25048,7 +25056,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")) {
@@ -25327,10 +25334,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;
@@ -25354,7 +25357,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);
@@ -25406,11 +25408,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));

package/api-postgres.mjs

@@ -7729,10 +7729,11 @@ var init_grammar = __esm({
       return {
         bool: (key) => {
           if (key in it) {
-            if (it[key] === "true") {
+            const value = it[key];
+            if (value === "true" || value === "1" || value === "on" || value === "yes") {
               return true;
             }
-            if (it[key] === "false") {
+            if (value === "false" || value === "0" || value === "off" || value === "no") {
               return false;
             }
             throw new Error(`Invalid options boolean value for ${key}: ${it[key]}`);
@@ -23037,7 +23038,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);
@@ -23047,13 +23048,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};`
         );
@@ -23088,6 +23094,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 {
@@ -24333,11 +24344,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 }));
@@ -25018,12 +25033,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")) {
@@ -25041,7 +25050,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",
@@ -25084,7 +25092,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")) {
@@ -25363,10 +25370,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;
@@ -25390,7 +25393,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);
@@ -25442,11 +25444,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));

package/bin.cjs

@@ -22636,10 +22636,11 @@ var init_grammar2 = __esm({
       return {
         bool: (key) => {
           if (key in it2) {
-            if (it2[key] === "true") {
+            const value = it2[key];
+            if (value === "true" || value === "1" || value === "on" || value === "yes") {
               return true;
             }
-            if (it2[key] === "false") {
+            if (value === "false" || value === "0" || value === "off" || value === "no") {
               return false;
             }
             throw new Error(`Invalid options boolean value for ${key}: ${it2[key]}`);
@@ -38985,7 +38986,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);
@@ -38995,13 +38996,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};`
         );
@@ -39036,6 +39042,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 {
@@ -40282,11 +40293,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 }));
@@ -169552,12 +169567,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")) {
@@ -169575,7 +169584,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",
@@ -169618,7 +169626,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")) {
@@ -169897,10 +169904,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;
@@ -169924,7 +169927,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);
@@ -169976,11 +169978,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));

package/package.json

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