drizzle-kit 0.17.0 → 0.17.1-6474464

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.17.0",
+  "version": "0.17.1-6474464",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -9,12 +9,13 @@
   },
   "scripts": {
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
+    "push": "node -r esbuild-register ./src/cli/index.ts push:mysql",
     "migrate:old:mysql": "drizzle-kit generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
     "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
     "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite --out ./dev/migrations-sqlite --schema ./dev/migrations-sqlite/schema.ts",
-    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
+    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/introspect-mysql --schema ./dev/introspect-mysql/schema.ts",
     "check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
-    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --out ./dev/introspect-mysql --connectionString",
+    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql",
     "introspect:pg": "node -r esbuild-register ./src/cli/index.ts introspect:pg --out ./dev/introspect-pg --connectionString=postgresql://postgres@localhost:5432/introspect",
     "up:pg": "node -r esbuild-register ./src/cli/index.ts up:pg --out ./dev/migrations-pg",
     "up:mysql": "node -r esbuild-register ./src/cli/index.ts up:mysql --out ./dev/migrations-mysql",
@@ -28,9 +29,10 @@
     "sim": "node -r esbuild-register ./dev/simulate.ts",
     "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
     "test": "ava test --timeout=60s",
-    "build": "pnpm build:cli && pnpm build:utils",
+    "build": "pnpm build:cli && pnpm build:utils && pnpm build:cli-types",
     "build:cli": "esbuild ./src/cli/index.ts --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --external:drizzle-orm-pg --external:drizzle-orm-sqlite --external:drizzle-orm-mysql --external:drizzle-orm --external:pg-native",
     "build:utils": "esbuild ./src/utils.ts --bundle --platform=node --target=node10.4 --outfile=./dist/utils.js",
+    "build:cli-types": "tsc -p tsconfig.cli-types.json",
     "pack": "build && package",
     "tsc": "tsc -p tsconfig.build.json",
     "pub": "cp package.json readme.md dist/ && cd dist && npm publish"
@@ -55,19 +57,22 @@
     "glob": "^8.1.0",
     "hanji": "^0.0.5",
     "json-diff": "0.9.0",
+    "minimatch": "^7.4.3",
     "zod": "^3.20.2"
   },
   "devDependencies": {
     "@types/dockerode": "^3.3.14",
     "@types/glob": "^8.1.0",
+    "@types/minimatch": "^5.1.2",
     "@types/node": "^18.11.15",
     "@types/pg": "^8.6.5",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",
     "ava": "^5.1.0",
     "dockerode": "^3.3.4",
+    "dotenv": "^16.0.3",
     "drizzle-kit": "^0.16.8",
-    "drizzle-orm": "0.21.0-26e3751",
+    "drizzle-orm": "0.23.2",
     "esbuild": "^0.15.7",
     "esbuild-register": "^3.3.3",
     "eslint": "^8.29.0",

package/readme.md

@@ -13,7 +13,7 @@ For schema file:
 ```typescript
 // ./src/db/schema.ts
 
-import { integer, pgTable, serial, text, varchar } from "drizzle-orm-pg";
+import { integer, pgTable, serial, text, varchar } from "drizzle-orm/pg-core";
 
 const users = pgTable("users", {
     id: serial("id").primaryKey(),
@@ -62,7 +62,7 @@ npm install -D drizzle-kit
 Running with CLI options
 
 ```shell
-npm exec drizzle-kit generate --out migrations-folder --dialect pg --schema src/db/schema.ts
+npx drizzle-kit generate:pg --out migrations-folder --schema src/db/schema.ts
 ```
 
 Or put your file to `drizzle.config.json` configuration file:

package/utils.js

@@ -11095,6 +11095,19 @@ var alternationsInColumn = (column4) => {
       return { ...others, notNull: { type: "deleted", value: it.notNull__deleted } };
     }
     return it;
+  }).map((it) => {
+    if ("primaryKey" in it) {
+      return { ...it, primaryKey: { type: "changed", old: it.primaryKey.__old, new: it.primaryKey.__new } };
+    }
+    if ("primaryKey__added" in it) {
+      const { notNull__added, ...others } = it;
+      return { ...others, primaryKey: { type: "added", value: it.primaryKey__added } };
+    }
+    if ("primaryKey__deleted" in it) {
+      const { notNull__deleted, ...others } = it;
+      return { ...others, primaryKey: { type: "deleted", value: it.primaryKey__deleted } };
+    }
+    return it;
   }).map((it) => {
     if ("onUpdate" in it) {
       return { ...it, onUpdate: { type: "changed", old: it.onUpdate.__old, new: it.onUpdate.__new } };
@@ -11218,23 +11231,24 @@ var MySqlCreateTableConvertor = class extends Convertor {
 `;
     for (let i = 0; i < columns.length; i++) {
       const column4 = columns[i];
-      const primaryKeyStatement = column4.primaryKey ? "PRIMARY KEY" : "";
-      const notNullStatement = column4.notNull ? "NOT NULL" : "";
-      const defaultStatement = column4.default !== void 0 ? `DEFAULT ${column4.default}` : "";
-      const onUpdateStatement = column4.onUpdate ? `ON UPDATE CURRENT_TIMESTAMP` : "";
-      const autoincrementStatement = column4.autoincrement ? "AUTO_INCREMENT" : "";
-      statement += "	" + `\`${column4.name}\` ${column4.type} ${autoincrementStatement} ${primaryKeyStatement} ${notNullStatement} ${defaultStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
-      statement += (i === columns.length - 1 ? "" : ",") + "\n";
+      const primaryKeyStatement = column4.primaryKey ? " PRIMARY KEY" : "";
+      const notNullStatement = column4.notNull ? " NOT NULL" : "";
+      const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
+      const onUpdateStatement = column4.onUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      const autoincrementStatement = column4.autoincrement ? " AUTO_INCREMENT" : "";
+      statement += "	" + `\`${column4.name}\` ${column4.type}${autoincrementStatement}${primaryKeyStatement}${notNullStatement}${defaultStatement}${onUpdateStatement}`.trim();
+      statement += i === columns.length - 1 ? "" : ",\n";
     }
-    statement += `);`;
-    statement += `
-`;
     if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
+      statement += ",\n";
       const compositePK4 = MySqlSquasher.unsquashPK(compositePKs[0]);
-      statement += `ALTER TABLE ${tName} ADD PRIMARY KEY(\`${compositePK4.columns.join("`,`")}\`);`;
+      statement += `	PRIMARY KEY(\`${compositePK4.columns.join("`,`")}\`)`;
       statement += `
 `;
     }
+    statement += `);`;
+    statement += `
+`;
     return statement;
   }
 };
@@ -11325,7 +11339,7 @@ var DropTableConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName } = statement;
-    return `DROP TABLE ${tableName};`;
+    return `DROP TABLE \`${tableName}\`;`;
   }
 };
 var PgRenameTableConvertor = class extends Convertor {
@@ -11433,12 +11447,13 @@ var MySqlAlterTableAddColumnConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, column: column4 } = statement;
-    const { name, type, notNull, primaryKey, autoincrement } = column4;
-    const defaultStatement = `${column4.default !== void 0 ? `DEFAULT ${column4.default}` : ""}`;
-    const notNullStatement = `${notNull ? "NOT NULL" : ""}`;
-    const primaryKeyStatement = `${primaryKey ? "PRIMARY KEY" : ""}`;
-    const autoincrementStatement = `${autoincrement ? "AUTO_INCREMENT" : ""}`;
-    return `ALTER TABLE ${tableName} ADD \`${name}\` ${type} ${primaryKeyStatement} ${autoincrementStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim() + ";";
+    const { name, type, notNull, primaryKey, autoincrement, onUpdate } = column4;
+    const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
+    const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+    const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
+    const autoincrementStatement = `${autoincrement ? " AUTO_INCREMENT" : ""}`;
+    const onUpdateStatement = `${onUpdate ? " ON UPDATE CURRENT_TIMESTAMP" : ""}`;
+    return `ALTER TABLE ${tableName} ADD \`${name}\` ${type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}${onUpdateStatement};`;
   }
 };
 var SQLiteAlterTableAddColumnConvertor = class extends Convertor {
@@ -11513,27 +11528,25 @@ var PgAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
     return `ALTER TABLE ${tableName} ALTER COLUMN "${columnName}" DROP DEFAULT;`;
   }
 };
-var MySqlAlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
+var MySqlAlterTableAddPk = class extends Convertor {
   can(statement, dialect3) {
-    return statement.type === "alter_table_alter_column_set_default" && dialect3 === "mysql";
+    return statement.type === "alter_table_alter_column_set_pk" && dialect3 === "mysql";
   }
   convert(statement) {
-    const { tableName, columnName } = statement;
-    return `ALTER TABLE ${tableName} ALTER COLUMN \`${columnName}\` SET DEFAULT ${statement.newDefaultValue};`;
+    return `ALTER TABLE \`${statement.tableName}\` ADD PRIMARY KEY (\`${statement.columnName}\`);`;
   }
 };
-var MySqlAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
+var MySqlAlterTableDropPk = class extends Convertor {
   can(statement, dialect3) {
-    return statement.type === "alter_table_alter_column_drop_default" && dialect3 === "mysql";
+    return statement.type === "alter_table_alter_column_drop_pk" && dialect3 === "mysql";
   }
   convert(statement) {
-    const { tableName, columnName } = statement;
-    return `ALTER TABLE ${tableName} ALTER COLUMN \`${columnName}\` DROP DEFAULT;`;
+    return `ALTER TABLE \`${statement.tableName}\` DROP PRIMARY KEY`;
   }
 };
 var MySqlModifyColumn = class extends Convertor {
   can(statement, dialect3) {
-    return (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_on_update" || statement.type === "alter_table_alter_column_set_on_update" || statement.type === "alter_table_alter_column_set_autoincrement" || statement.type === "alter_table_alter_column_drop_autoincrement") && dialect3 === "mysql";
+    return (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_on_update" || statement.type === "alter_table_alter_column_set_on_update" || statement.type === "alter_table_alter_column_set_autoincrement" || statement.type === "alter_table_alter_column_drop_autoincrement" || statement.type === "alter_table_alter_column_set_default" || statement.type === "alter_table_alter_column_drop_default") && dialect3 === "mysql";
   }
   convert(statement) {
     const { tableName, columnName } = statement;
@@ -11542,6 +11555,7 @@ var MySqlModifyColumn = class extends Convertor {
     let columnNotNull = "";
     let columnOnUpdate = "";
     let columnAutoincrement = "";
+    let primaryKey = statement.columnPk ? " PRIMARY KEY" : "";
     if (statement.type === "alter_table_alter_column_drop_notnull") {
       columnType = ` ${statement.newDataType}`;
       columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
@@ -11571,19 +11585,31 @@ var MySqlModifyColumn = class extends Convertor {
       columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
       columnType = ` ${statement.newDataType}`;
       columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
-      columnAutoincrement = "AUTO_INCREMENT";
+      columnAutoincrement = " AUTO_INCREMENT";
     } else if (statement.type === "alter_table_alter_column_drop_autoincrement") {
       columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
       columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
       columnType = ` ${statement.newDataType}`;
       columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
       columnAutoincrement = "";
+    } else if (statement.type === "alter_table_alter_column_set_default") {
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = ` DEFAULT ${statement.newDefaultValue}`;
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
+    } else if (statement.type === "alter_table_alter_column_drop_default") {
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = "";
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
     } else {
       columnType = ` ${statement.newDataType}`;
       columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
       columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
       columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
-      columnAutoincrement = statement.columnAutoIncrement ? "AUTO_INCREMENT" : "";
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
     }
     columnDefault = columnDefault instanceof Date ? columnDefault.toISOString() : columnDefault;
     return `ALTER TABLE ${tableName} MODIFY COLUMN \`${columnName}\`${columnType}${columnAutoincrement}${columnNotNull}${columnDefault}${columnOnUpdate};`;
@@ -11874,7 +11900,6 @@ var PgAlterForeignKeyConvertor = class extends Convertor {
     sql += " WHEN duplicate_object THEN null;\n";
     sql += "END $$;\n";
     return sql;
-    throw new Error("TODO");
   }
 };
 var SqliteAlterForeignKeyConvertor = class extends Convertor {
@@ -12142,8 +12167,6 @@ convertors.push(new PgAlterTableAlterColumnDropNotNullConvertor());
 convertors.push(new PgAlterTableAlterColumnSetDefaultConvertor());
 convertors.push(new PgAlterTableAlterColumnDropDefaultConvertor());
 convertors.push(new MySqlModifyColumn());
-convertors.push(new MySqlAlterTableAlterColumnSetDefaultConvertor());
-convertors.push(new MySqlAlterTableAlterColumnDropDefaultConvertor());
 convertors.push(new PgCreateForeignKeyConvertor());
 convertors.push(new MySqlCreateForeignKeyConvertor());
 convertors.push(new PgAlterForeignKeyConvertor());
@@ -12174,8 +12197,10 @@ convertors.push(new SqliteAlterTableAlterCompositePrimaryKeyConvertor());
 convertors.push(new PgAlterTableCreateCompositePrimaryKeyConvertor());
 convertors.push(new PgAlterTableDeleteCompositePrimaryKeyConvertor());
 convertors.push(new PgAlterTableAlterCompositePrimaryKeyConvertor());
-convertors.push(new MySqlAlterTableCreateCompositePrimaryKeyConvertor());
 convertors.push(new MySqlAlterTableDeleteCompositePrimaryKeyConvertor());
+convertors.push(new MySqlAlterTableDropPk());
+convertors.push(new MySqlAlterTableCreateCompositePrimaryKeyConvertor());
+convertors.push(new MySqlAlterTableAddPk());
 convertors.push(new MySqlAlterTableAlterCompositePrimaryKeyConvertor());
 var fromJson = (statements, dialect3) => {
   const result = statements.map((statement) => {
@@ -12185,10 +12210,10 @@ var fromJson = (statements, dialect3) => {
     const convertor = filtered.length === 1 ? filtered[0] : void 0;
     if (!convertor) {
       console.log("no convertor:", statement.type, dialect3);
-      return "dry run";
+      return "";
     }
     return convertor.convert(statement);
-  });
+  }).filter((it) => it !== "");
   return result;
 };
 https:
@@ -12379,7 +12404,7 @@ var _prepareSQLiteAddColumns = (tableName, columns, referenceData) => {
   });
 };
 var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   let statements = [];
   for (const column4 of columns) {
     const columnName = typeof column4.name !== "string" ? column4.name.new : column4.name;
@@ -12388,97 +12413,134 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
     const columnOnUpdate = json2.tables[tableName].columns[columnName].onUpdate;
     const columnNotNull = json2.tables[tableName].columns[columnName].notNull;
     const columnAutoIncrement = json2.tables[tableName].columns[columnName].autoincrement;
-    if (typeof column4.name !== "string") {
+    const columnPk = json2.tables[tableName].columns[columnName].primaryKey;
+    if (((_a = column4.autoincrement) == null ? void 0 : _a.type) === "added") {
       statements.push({
-        type: "alter_table_rename_column",
+        type: "alter_table_alter_column_set_autoincrement",
         tableName,
-        oldColumnName: column4.name.old,
-        newColumnName: column4.name.new,
-        schema: schema3
+        columnName,
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement,
+        columnPk
       });
     }
-    if (((_a = column4.type) == null ? void 0 : _a.type) === "changed") {
+    if (((_b = column4.autoincrement) == null ? void 0 : _b.type) === "changed") {
+      const type = column4.autoincrement.new ? "alter_table_alter_column_set_autoincrement" : "alter_table_alter_column_drop_autoincrement";
       statements.push({
-        type: "alter_table_alter_column_set_type",
+        type,
         tableName,
         columnName,
-        newDataType: column4.type.new,
         schema: schema3,
+        newDataType: columnType,
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        columnPk
       });
     }
-    if (((_b = column4.default) == null ? void 0 : _b.type) === "added") {
+    if (((_c = column4.autoincrement) == null ? void 0 : _c.type) === "deleted") {
       statements.push({
-        type: "alter_table_alter_column_set_default",
+        type: "alter_table_alter_column_drop_autoincrement",
         tableName,
         columnName,
-        newDefaultValue: column4.default.value,
-        schema: schema3
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement,
+        columnPk
       });
     }
-    if (((_c = column4.default) == null ? void 0 : _c.type) === "changed") {
+  }
+  for (const column4 of columns) {
+    const columnName = typeof column4.name !== "string" ? column4.name.new : column4.name;
+    const columnType = json2.tables[tableName].columns[columnName].type;
+    const columnDefault = json2.tables[tableName].columns[columnName].default;
+    const columnOnUpdate = json2.tables[tableName].columns[columnName].onUpdate;
+    const columnNotNull = json2.tables[tableName].columns[columnName].notNull;
+    const columnAutoIncrement = json2.tables[tableName].columns[columnName].autoincrement;
+    const columnPk = json2.tables[tableName].columns[columnName].primaryKey;
+    if (typeof column4.name !== "string") {
       statements.push({
-        type: "alter_table_alter_column_set_default",
+        type: "alter_table_rename_column",
         tableName,
-        columnName,
-        newDefaultValue: column4.default.new,
+        oldColumnName: column4.name.old,
+        newColumnName: column4.name.new,
         schema: schema3
       });
     }
-    if (((_d = column4.default) == null ? void 0 : _d.type) === "deleted") {
+    if (((_d = column4.type) == null ? void 0 : _d.type) === "changed") {
       statements.push({
-        type: "alter_table_alter_column_drop_default",
+        type: "alter_table_alter_column_set_type",
         tableName,
         columnName,
-        schema: schema3
+        newDataType: column4.type.new,
+        schema: schema3,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement,
+        columnPk
       });
     }
-    if (((_e = column4.notNull) == null ? void 0 : _e.type) === "added") {
+    if (((_e = column4.primaryKey) == null ? void 0 : _e.type) === "deleted" || ((_f = column4.primaryKey) == null ? void 0 : _f.type) === "changed" && !column4.primaryKey.new) {
       statements.push({
-        type: "alter_table_alter_column_set_notnull",
+        type: "alter_table_alter_column_drop_pk",
+        tableName,
+        columnName
+      });
+    }
+    if (((_g = column4.default) == null ? void 0 : _g.type) === "added") {
+      statements.push({
+        type: "alter_table_alter_column_set_default",
         tableName,
         columnName,
+        newDefaultValue: column4.default.value,
         schema: schema3,
-        newDataType: columnType,
-        columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        newDataType: columnType,
+        columnPk
       });
     }
-    if (((_f = column4.notNull) == null ? void 0 : _f.type) === "changed") {
-      const type = column4.notNull.new ? "alter_table_alter_column_set_notnull" : "alter_table_alter_column_drop_notnull";
+    if (((_h = column4.default) == null ? void 0 : _h.type) === "changed") {
       statements.push({
-        type,
+        type: "alter_table_alter_column_set_default",
         tableName,
         columnName,
+        newDefaultValue: column4.default.new,
         schema: schema3,
-        newDataType: columnType,
-        columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        newDataType: columnType,
+        columnPk
       });
     }
-    if (((_g = column4.notNull) == null ? void 0 : _g.type) === "deleted") {
+    if (((_i = column4.default) == null ? void 0 : _i.type) === "deleted") {
       statements.push({
-        type: "alter_table_alter_column_drop_notnull",
+        type: "alter_table_alter_column_drop_default",
         tableName,
         columnName,
         schema: schema3,
-        newDataType: columnType,
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        newDataType: columnType,
+        columnPk
       });
     }
-    if (((_h = column4.autoincrement) == null ? void 0 : _h.type) === "added") {
+    if (((_j = column4.notNull) == null ? void 0 : _j.type) === "added") {
       statements.push({
-        type: "alter_table_alter_column_set_autoincrement",
+        type: "alter_table_alter_column_set_notnull",
         tableName,
         columnName,
         schema: schema3,
@@ -12486,11 +12548,12 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        columnPk
       });
     }
-    if (((_i = column4.autoincrement) == null ? void 0 : _i.type) === "changed") {
-      const type = column4.autoincrement.new ? "alter_table_alter_column_set_notnull" : "alter_table_alter_column_drop_notnull";
+    if (((_k = column4.notNull) == null ? void 0 : _k.type) === "changed") {
+      const type = column4.notNull.new ? "alter_table_alter_column_set_notnull" : "alter_table_alter_column_drop_notnull";
       statements.push({
         type,
         tableName,
@@ -12500,12 +12563,13 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        columnPk
       });
     }
-    if (((_j = column4.autoincrement) == null ? void 0 : _j.type) === "deleted") {
+    if (((_l = column4.notNull) == null ? void 0 : _l.type) === "deleted") {
       statements.push({
-        type: "alter_table_alter_column_drop_autoincrement",
+        type: "alter_table_alter_column_drop_notnull",
         tableName,
         columnName,
         schema: schema3,
@@ -12513,10 +12577,23 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        columnPk
       });
     }
-    if (((_k = column4.onUpdate) == null ? void 0 : _k.type) === "added") {
+    if (((_m = column4.primaryKey) == null ? void 0 : _m.type) === "added" || ((_n = column4.primaryKey) == null ? void 0 : _n.type) === "changed" && column4.primaryKey.new) {
+      const wasAutoincrement = statements.filter(
+        (it) => it.type === "alter_table_alter_column_set_autoincrement"
+      );
+      if (wasAutoincrement.length === 0) {
+        statements.push({
+          type: "alter_table_alter_column_set_pk",
+          tableName,
+          columnName
+        });
+      }
+    }
+    if (((_o = column4.onUpdate) == null ? void 0 : _o.type) === "added") {
       statements.push({
         type: "alter_table_alter_column_set_on_update",
         tableName,
@@ -12526,10 +12603,11 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        columnPk
       });
     }
-    if (((_l = column4.onUpdate) == null ? void 0 : _l.type) === "deleted") {
+    if (((_p = column4.onUpdate) == null ? void 0 : _p.type) === "deleted") {
       statements.push({
         type: "alter_table_alter_column_drop_on_update",
         tableName,
@@ -12539,7 +12617,8 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement
+        columnAutoIncrement,
+        columnPk
       });
     }
   }
@@ -12771,6 +12850,7 @@ var alteredColumnSchema = objectType({
   name: makeSelfOrChanged(stringType()),
   type: makeChanged(stringType()).optional(),
   default: makePatched(anyType()).optional(),
+  primaryKey: makePatched(booleanType()).optional(),
   notNull: makePatched(booleanType()).optional(),
   onUpdate: makePatched(booleanType()).optional(),
   autoincrement: makePatched(booleanType()).optional()
@@ -13103,6 +13183,7 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   jsonStatements.push(...jsonDropTables);
   jsonStatements.push(...jsonRenameTables);
   jsonStatements.push(...jsonRenameColumnsStatements);
+  jsonStatements.push(...jsonDeletedCompositePKs);
   jsonStatements.push(...jsonTableAlternations.alterColumns);
   jsonStatements.push(...jsonTableAlternations.createColumns);
   jsonStatements.push(...jsonAlterReferencesForAlteredTables);
@@ -13112,7 +13193,6 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
   jsonStatements.push(...jsonCreateIndexesForCreatedTables);
   jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
-  jsonStatements.push(...jsonDeletedCompositePKs);
   jsonStatements.push(...jsonAddedCompositePKs);
   jsonStatements.push(...jsonAlteredCompositePKs);
   jsonStatements.push(...jsonSetTableSchemas);