drizzle-kit 0.17.1-f8bb071 → 0.17.2-5f6da95

package/utils.js

@@ -7169,7 +7169,7 @@ var info = (msg, greyMsg = "") => {
 var originUUID = "00000000-0000-0000-0000-000000000000";
 var snapshotVersion = "5";
 
-// node_modules/.pnpm/zod@3.20.6/node_modules/zod/lib/index.mjs
+// node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
   util2.assertEqual = (val) => val;
@@ -7584,7 +7584,7 @@ var OK = (value) => ({ status: "valid", value });
 var isAborted = (x) => x.status === "aborted";
 var isDirty = (x) => x.status === "dirty";
 var isValid = (x) => x.status === "valid";
-var isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise;
+var isAsync = (x) => typeof Promise !== void 0 && x instanceof Promise;
 var errorUtil;
 (function(errorUtil2) {
   errorUtil2.errToObj = (message) => typeof message === "string" ? { message } : message || {};
@@ -7800,29 +7800,28 @@ var ZodType = class {
     return this._refinement(refinement);
   }
   optional() {
-    return ZodOptional.create(this, this._def);
+    return ZodOptional.create(this);
   }
   nullable() {
-    return ZodNullable.create(this, this._def);
+    return ZodNullable.create(this);
   }
   nullish() {
-    return this.nullable().optional();
+    return this.optional().nullable();
   }
   array() {
-    return ZodArray.create(this, this._def);
+    return ZodArray.create(this);
   }
   promise() {
-    return ZodPromise.create(this, this._def);
+    return ZodPromise.create(this);
   }
   or(option) {
-    return ZodUnion.create([this, option], this._def);
+    return ZodUnion.create([this, option]);
   }
   and(incoming) {
-    return ZodIntersection.create(this, incoming, this._def);
+    return ZodIntersection.create(this, incoming);
   }
   transform(transform) {
     return new ZodEffects({
-      ...processCreateParams(this._def),
       schema: this,
       typeName: ZodFirstPartyTypeKind.ZodEffects,
       effect: { type: "transform", transform }
@@ -7831,7 +7830,6 @@ var ZodType = class {
   default(def) {
     const defaultValueFunc = typeof def === "function" ? def : () => def;
     return new ZodDefault({
-      ...processCreateParams(this._def),
       innerType: this,
       defaultValue: defaultValueFunc,
       typeName: ZodFirstPartyTypeKind.ZodDefault
@@ -7841,15 +7839,14 @@ var ZodType = class {
     return new ZodBranded({
       typeName: ZodFirstPartyTypeKind.ZodBranded,
       type: this,
-      ...processCreateParams(this._def)
+      ...processCreateParams(void 0)
     });
   }
   catch(def) {
-    const catchValueFunc = typeof def === "function" ? def : () => def;
+    const defaultValueFunc = typeof def === "function" ? def : () => def;
     return new ZodCatch({
-      ...processCreateParams(this._def),
       innerType: this,
-      catchValue: catchValueFunc,
+      defaultValue: defaultValueFunc,
       typeName: ZodFirstPartyTypeKind.ZodCatch
     });
   }
@@ -7871,25 +7868,24 @@ var ZodType = class {
   }
 };
 var cuidRegex = /^c[^\s-]{8,}$/i;
-var cuid2Regex = /^[a-z][a-z0-9]*$/;
 var uuidRegex = /^([a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}|00000000-0000-0000-0000-000000000000)$/i;
-var emailRegex = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|([^-]([a-zA-Z0-9-]*\.)+[a-zA-Z]{2,}))$/;
+var emailRegex = /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
 var datetimeRegex = (args) => {
   if (args.precision) {
     if (args.offset) {
-      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}(([+-]\\d{2}(:?\\d{2})?)|Z)$`);
+      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}(([+-]\\d{2}:\\d{2})|Z)$`);
     } else {
       return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}Z$`);
     }
   } else if (args.precision === 0) {
     if (args.offset) {
-      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(([+-]\\d{2}(:?\\d{2})?)|Z)$`);
+      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(([+-]\\d{2}:\\d{2})|Z)$`);
     } else {
       return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$`);
     }
   } else {
     if (args.offset) {
-      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?(([+-]\\d{2}(:?\\d{2})?)|Z)$`);
+      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?(([+-]\\d{2}:\\d{2})|Z)$`);
     } else {
       return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?Z$`);
     }
@@ -8011,16 +8007,6 @@ var ZodString = class extends ZodType {
           });
           status.dirty();
         }
-      } else if (check.kind === "cuid2") {
-        if (!cuid2Regex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
-          addIssueToContext(ctx, {
-            validation: "cuid2",
-            code: ZodIssueCode.invalid_string,
-            message: check.message
-          });
-          status.dirty();
-        }
       } else if (check.kind === "url") {
         try {
           new URL(input.data);
@@ -8102,9 +8088,6 @@ var ZodString = class extends ZodType {
   cuid(message) {
     return this._addCheck({ kind: "cuid", ...errorUtil.errToObj(message) });
   }
-  cuid2(message) {
-    return this._addCheck({ kind: "cuid2", ...errorUtil.errToObj(message) });
-  }
   datetime(options) {
     var _a;
     if (typeof options === "string") {
@@ -8179,9 +8162,6 @@ var ZodString = class extends ZodType {
   get isCUID() {
     return !!this._def.checks.find((ch) => ch.kind === "cuid");
   }
-  get isCUID2() {
-    return !!this._def.checks.find((ch) => ch.kind === "cuid2");
-  }
   get minLength() {
     let min = null;
     for (const ch of this._def.checks) {
@@ -8412,22 +8392,7 @@ var ZodNumber = class extends ZodType {
     return max;
   }
   get isInt() {
-    return !!this._def.checks.find((ch) => ch.kind === "int" || ch.kind === "multipleOf" && util.isInteger(ch.value));
-  }
-  get isFinite() {
-    let max = null, min = null;
-    for (const ch of this._def.checks) {
-      if (ch.kind === "finite" || ch.kind === "int" || ch.kind === "multipleOf") {
-        return true;
-      } else if (ch.kind === "min") {
-        if (min === null || ch.value > min)
-          min = ch.value;
-      } else if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
-      }
-    }
-    return Number.isFinite(min) && Number.isFinite(max);
+    return !!this._def.checks.find((ch) => ch.kind === "int");
   }
 };
 ZodNumber.create = (params) => {
@@ -8784,13 +8749,13 @@ var ZodArray = class extends ZodType {
       }
     }
     if (ctx.common.async) {
-      return Promise.all([...ctx.data].map((item, i) => {
+      return Promise.all(ctx.data.map((item, i) => {
         return def.type._parseAsync(new ParseInputLazyPath(ctx, item, ctx.path, i));
       })).then((result2) => {
         return ParseStatus.mergeArray(status, result2);
       });
     }
-    const result = [...ctx.data].map((item, i) => {
+    const result = ctx.data.map((item, i) => {
       return def.type._parseSync(new ParseInputLazyPath(ctx, item, ctx.path, i));
     });
     return ParseStatus.mergeArray(status, result);
@@ -8839,6 +8804,15 @@ var objectUtil;
     };
   };
 })(objectUtil || (objectUtil = {}));
+var AugmentFactory = (def) => (augmentation) => {
+  return new ZodObject({
+    ...def,
+    shape: () => ({
+      ...def.shape(),
+      ...augmentation
+    })
+  });
+};
 function deepPartialify(schema3) {
   if (schema3 instanceof ZodObject) {
     const newShape = {};
@@ -8867,7 +8841,8 @@ var ZodObject = class extends ZodType {
     super(...arguments);
     this._cached = null;
     this.nonstrict = this.passthrough;
-    this.augment = this.extend;
+    this.augment = AugmentFactory(this._def);
+    this.extend = AugmentFactory(this._def);
   }
   _getCached() {
     if (this._cached !== null)
@@ -8996,14 +8971,8 @@ var ZodObject = class extends ZodType {
       unknownKeys: "passthrough"
     });
   }
-  extend(augmentation) {
-    return new ZodObject({
-      ...this._def,
-      shape: () => ({
-        ...this._def.shape(),
-        ...augmentation
-      })
-    });
+  setKey(key, schema3) {
+    return this.augment({ [key]: schema3 });
   }
   merge(merging) {
     const merged = new ZodObject({
@@ -9014,9 +8983,6 @@ var ZodObject = class extends ZodType {
     });
     return merged;
   }
-  setKey(key, schema3) {
-    return this.augment({ [key]: schema3 });
-  }
   catchall(index4) {
     return new ZodObject({
       ...this._def,
@@ -9025,10 +8991,9 @@ var ZodObject = class extends ZodType {
   }
   pick(mask) {
     const shape = {};
-    util.objectKeys(mask).forEach((key) => {
-      if (mask[key] && this.shape[key]) {
+    util.objectKeys(mask).map((key) => {
+      if (this.shape[key])
         shape[key] = this.shape[key];
-      }
     });
     return new ZodObject({
       ...this._def,
@@ -9037,8 +9002,8 @@ var ZodObject = class extends ZodType {
   }
   omit(mask) {
     const shape = {};
-    util.objectKeys(this.shape).forEach((key) => {
-      if (!mask[key]) {
+    util.objectKeys(this.shape).map((key) => {
+      if (util.objectKeys(mask).indexOf(key) === -1) {
         shape[key] = this.shape[key];
       }
     });
@@ -9052,14 +9017,24 @@ var ZodObject = class extends ZodType {
   }
   partial(mask) {
     const newShape = {};
-    util.objectKeys(this.shape).forEach((key) => {
-      const fieldSchema = this.shape[key];
-      if (mask && !mask[key]) {
-        newShape[key] = fieldSchema;
-      } else {
+    if (mask) {
+      util.objectKeys(this.shape).map((key) => {
+        if (util.objectKeys(mask).indexOf(key) === -1) {
+          newShape[key] = this.shape[key];
+        } else {
+          newShape[key] = this.shape[key].optional();
+        }
+      });
+      return new ZodObject({
+        ...this._def,
+        shape: () => newShape
+      });
+    } else {
+      for (const key in this.shape) {
+        const fieldSchema = this.shape[key];
         newShape[key] = fieldSchema.optional();
       }
-    });
+    }
     return new ZodObject({
       ...this._def,
       shape: () => newShape
@@ -9067,10 +9042,21 @@ var ZodObject = class extends ZodType {
   }
   required(mask) {
     const newShape = {};
-    util.objectKeys(this.shape).forEach((key) => {
-      if (mask && !mask[key]) {
-        newShape[key] = this.shape[key];
-      } else {
+    if (mask) {
+      util.objectKeys(this.shape).map((key) => {
+        if (util.objectKeys(mask).indexOf(key) === -1) {
+          newShape[key] = this.shape[key];
+        } else {
+          const fieldSchema = this.shape[key];
+          let newField = fieldSchema;
+          while (newField instanceof ZodOptional) {
+            newField = newField._def.innerType;
+          }
+          newShape[key] = newField;
+        }
+      });
+    } else {
+      for (const key in this.shape) {
         const fieldSchema = this.shape[key];
         let newField = fieldSchema;
         while (newField instanceof ZodOptional) {
@@ -9078,7 +9064,7 @@ var ZodObject = class extends ZodType {
         }
         newShape[key] = newField;
       }
-    });
+    }
     return new ZodObject({
       ...this._def,
       shape: () => newShape
@@ -9418,7 +9404,7 @@ var ZodTuple = class extends ZodType {
       });
       status.dirty();
     }
-    const items = [...ctx.data].map((item, itemIndex) => {
+    const items = ctx.data.map((item, itemIndex) => {
       const schema3 = this._def.items[itemIndex] || this._def.rest;
       if (!schema3)
         return null;
@@ -9785,7 +9771,6 @@ var ZodLiteral = class extends ZodType {
     if (input.data !== this._def.value) {
       const ctx = this._getOrReturnCtx(input);
       addIssueToContext(ctx, {
-        received: ctx.data,
         code: ZodIssueCode.invalid_literal,
         expected: this._def.value
       });
@@ -9859,12 +9844,6 @@ var ZodEnum = class extends ZodType {
     }
     return enumValues;
   }
-  extract(values) {
-    return ZodEnum.create(values);
-  }
-  exclude(values) {
-    return ZodEnum.create(this.options.filter((opt) => !values.includes(opt)));
-  }
 };
 ZodEnum.create = createZodEnum;
 var ZodNativeEnum = class extends ZodType {
@@ -9903,9 +9882,6 @@ ZodNativeEnum.create = (values, params) => {
   });
 };
 var ZodPromise = class extends ZodType {
-  unwrap() {
-    return this._def.type;
-  }
   _parse(input) {
     const { ctx } = this._processInputParams(input);
     if (ctx.parsedType !== ZodParsedType.promise && ctx.common.async === false) {
@@ -10119,29 +10095,23 @@ var ZodCatch = class extends ZodType {
     const result = this._def.innerType._parse({
       data: ctx.data,
       path: ctx.path,
-      parent: {
-        ...ctx,
-        common: {
-          ...ctx.common,
-          issues: []
-        }
-      }
+      parent: ctx
     });
     if (isAsync(result)) {
       return result.then((result2) => {
         return {
           status: "valid",
-          value: result2.status === "valid" ? result2.value : this._def.catchValue()
+          value: result2.status === "valid" ? result2.value : this._def.defaultValue()
         };
       });
     } else {
       return {
         status: "valid",
-        value: result.status === "valid" ? result.value : this._def.catchValue()
+        value: result.status === "valid" ? result.value : this._def.defaultValue()
       };
     }
   }
-  removeCatch() {
+  removeDefault() {
     return this._def.innerType;
   }
 };
@@ -10149,7 +10119,7 @@ ZodCatch.create = (type, params) => {
   return new ZodCatch({
     innerType: type,
     typeName: ZodFirstPartyTypeKind.ZodCatch,
-    catchValue: typeof params.catch === "function" ? params.catch : () => params.catch,
+    defaultValue: typeof params.default === "function" ? params.default : () => params.default,
     ...processCreateParams(params)
   });
 };
@@ -11095,19 +11065,6 @@ 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 } };
@@ -11231,24 +11188,23 @@ 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}`.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}`.replace(/  +/g, " ").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 += `	PRIMARY KEY(\`${compositePK4.columns.join("`,`")}\`)`;
+      statement += `ALTER TABLE ${tName} ADD PRIMARY KEY(\`${compositePK4.columns.join("`,`")}\`);`;
       statement += `
 `;
     }
-    statement += `);`;
-    statement += `
-`;
     return statement;
   }
 };
@@ -11339,7 +11295,7 @@ var DropTableConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName } = statement;
-    return `DROP TABLE \`${tableName}\`;`;
+    return `DROP TABLE ${tableName};`;
   }
 };
 var PgRenameTableConvertor = class extends Convertor {
@@ -11447,13 +11403,12 @@ var MySqlAlterTableAddColumnConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, column: column4 } = statement;
-    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};`;
+    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() + ";";
   }
 };
 var SQLiteAlterTableAddColumnConvertor = class extends Convertor {
@@ -11528,25 +11483,27 @@ var PgAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
     return `ALTER TABLE ${tableName} ALTER COLUMN "${columnName}" DROP DEFAULT;`;
   }
 };
-var MySqlAlterTableAddPk = class extends Convertor {
+var MySqlAlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
   can(statement, dialect3) {
-    return statement.type === "alter_table_alter_column_set_pk" && dialect3 === "mysql";
+    return statement.type === "alter_table_alter_column_set_default" && dialect3 === "mysql";
   }
   convert(statement) {
-    return `ALTER TABLE \`${statement.tableName}\` ADD PRIMARY KEY (\`${statement.columnName}\`);`;
+    const { tableName, columnName } = statement;
+    return `ALTER TABLE ${tableName} ALTER COLUMN \`${columnName}\` SET DEFAULT ${statement.newDefaultValue};`;
   }
 };
-var MySqlAlterTableDropPk = class extends Convertor {
+var MySqlAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
   can(statement, dialect3) {
-    return statement.type === "alter_table_alter_column_drop_pk" && dialect3 === "mysql";
+    return statement.type === "alter_table_alter_column_drop_default" && dialect3 === "mysql";
   }
   convert(statement) {
-    return `ALTER TABLE \`${statement.tableName}\` DROP PRIMARY KEY`;
+    const { tableName, columnName } = statement;
+    return `ALTER TABLE ${tableName} ALTER COLUMN \`${columnName}\` DROP DEFAULT;`;
   }
 };
 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" || statement.type === "alter_table_alter_column_set_default" || statement.type === "alter_table_alter_column_drop_default") && 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") && dialect3 === "mysql";
   }
   convert(statement) {
     const { tableName, columnName } = statement;
@@ -11555,7 +11512,6 @@ 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}` : "";
@@ -11585,31 +11541,19 @@ 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};`;
@@ -11900,6 +11844,7 @@ 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 {
@@ -12167,6 +12112,8 @@ 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());
@@ -12197,10 +12144,8 @@ convertors.push(new SqliteAlterTableAlterCompositePrimaryKeyConvertor());
 convertors.push(new PgAlterTableCreateCompositePrimaryKeyConvertor());
 convertors.push(new PgAlterTableDeleteCompositePrimaryKeyConvertor());
 convertors.push(new PgAlterTableAlterCompositePrimaryKeyConvertor());
-convertors.push(new MySqlAlterTableDeleteCompositePrimaryKeyConvertor());
-convertors.push(new MySqlAlterTableDropPk());
 convertors.push(new MySqlAlterTableCreateCompositePrimaryKeyConvertor());
-convertors.push(new MySqlAlterTableAddPk());
+convertors.push(new MySqlAlterTableDeleteCompositePrimaryKeyConvertor());
 convertors.push(new MySqlAlterTableAlterCompositePrimaryKeyConvertor());
 var fromJson = (statements, dialect3) => {
   const result = statements.map((statement) => {
@@ -12210,10 +12155,10 @@ var fromJson = (statements, dialect3) => {
     const convertor = filtered.length === 1 ? filtered[0] : void 0;
     if (!convertor) {
       console.log("no convertor:", statement.type, dialect3);
-      return "";
+      return "dry run";
     }
     return convertor.convert(statement);
-  }).filter((it) => it !== "");
+  });
   return result;
 };
 https:
@@ -12404,7 +12349,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, _m, _n, _o, _p;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   let statements = [];
   for (const column4 of columns) {
     const columnName = typeof column4.name !== "string" ? column4.name.new : column4.name;
@@ -12413,134 +12358,97 @@ 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;
-    const columnPk = json2.tables[tableName].columns[columnName].primaryKey;
-    if (((_a = column4.autoincrement) == null ? void 0 : _a.type) === "added") {
+    if (typeof column4.name !== "string") {
       statements.push({
-        type: "alter_table_alter_column_set_autoincrement",
+        type: "alter_table_rename_column",
         tableName,
-        columnName,
-        schema: schema3,
-        newDataType: columnType,
-        columnDefault,
-        columnOnUpdate,
-        columnNotNull,
-        columnAutoIncrement,
-        columnPk
+        oldColumnName: column4.name.old,
+        newColumnName: column4.name.new,
+        schema: schema3
       });
     }
-    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";
+    if (((_a = column4.type) == null ? void 0 : _a.type) === "changed") {
       statements.push({
-        type,
+        type: "alter_table_alter_column_set_type",
         tableName,
         columnName,
+        newDataType: column4.type.new,
         schema: schema3,
-        newDataType: columnType,
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        columnPk
+        columnAutoIncrement
       });
     }
-    if (((_c = column4.autoincrement) == null ? void 0 : _c.type) === "deleted") {
+    if (((_b = column4.default) == null ? void 0 : _b.type) === "added") {
       statements.push({
-        type: "alter_table_alter_column_drop_autoincrement",
+        type: "alter_table_alter_column_set_default",
         tableName,
         columnName,
-        schema: schema3,
-        newDataType: columnType,
-        columnDefault,
-        columnOnUpdate,
-        columnNotNull,
-        columnAutoIncrement,
-        columnPk
-      });
-    }
-  }
-  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_rename_column",
-        tableName,
-        oldColumnName: column4.name.old,
-        newColumnName: column4.name.new,
+        newDefaultValue: column4.default.value,
         schema: schema3
       });
     }
-    if (((_d = column4.type) == null ? void 0 : _d.type) === "changed") {
+    if (((_c = column4.default) == null ? void 0 : _c.type) === "changed") {
       statements.push({
-        type: "alter_table_alter_column_set_type",
+        type: "alter_table_alter_column_set_default",
         tableName,
         columnName,
-        newDataType: column4.type.new,
-        schema: schema3,
-        columnDefault,
-        columnOnUpdate,
-        columnNotNull,
-        columnAutoIncrement,
-        columnPk
+        newDefaultValue: column4.default.new,
+        schema: schema3
       });
     }
-    if (((_e = column4.primaryKey) == null ? void 0 : _e.type) === "deleted" || ((_f = column4.primaryKey) == null ? void 0 : _f.type) === "changed" && !column4.primaryKey.new) {
+    if (((_d = column4.default) == null ? void 0 : _d.type) === "deleted") {
       statements.push({
-        type: "alter_table_alter_column_drop_pk",
+        type: "alter_table_alter_column_drop_default",
         tableName,
-        columnName
+        columnName,
+        schema: schema3
       });
     }
-    if (((_g = column4.default) == null ? void 0 : _g.type) === "added") {
+    if (((_e = column4.notNull) == null ? void 0 : _e.type) === "added") {
       statements.push({
-        type: "alter_table_alter_column_set_default",
+        type: "alter_table_alter_column_set_notnull",
         tableName,
         columnName,
-        newDefaultValue: column4.default.value,
         schema: schema3,
+        newDataType: columnType,
+        columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        newDataType: columnType,
-        columnPk
+        columnAutoIncrement
       });
     }
-    if (((_h = column4.default) == null ? void 0 : _h.type) === "changed") {
+    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";
       statements.push({
-        type: "alter_table_alter_column_set_default",
+        type,
         tableName,
         columnName,
-        newDefaultValue: column4.default.new,
         schema: schema3,
+        newDataType: columnType,
+        columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        newDataType: columnType,
-        columnPk
+        columnAutoIncrement
       });
     }
-    if (((_i = column4.default) == null ? void 0 : _i.type) === "deleted") {
+    if (((_g = column4.notNull) == null ? void 0 : _g.type) === "deleted") {
       statements.push({
-        type: "alter_table_alter_column_drop_default",
+        type: "alter_table_alter_column_drop_notnull",
         tableName,
         columnName,
         schema: schema3,
+        newDataType: columnType,
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        newDataType: columnType,
-        columnPk
+        columnAutoIncrement
       });
     }
-    if (((_j = column4.notNull) == null ? void 0 : _j.type) === "added") {
+    if (((_h = column4.autoincrement) == null ? void 0 : _h.type) === "added") {
       statements.push({
-        type: "alter_table_alter_column_set_notnull",
+        type: "alter_table_alter_column_set_autoincrement",
         tableName,
         columnName,
         schema: schema3,
@@ -12548,12 +12456,11 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        columnPk
+        columnAutoIncrement
       });
     }
-    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";
+    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";
       statements.push({
         type,
         tableName,
@@ -12563,13 +12470,12 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        columnPk
+        columnAutoIncrement
       });
     }
-    if (((_l = column4.notNull) == null ? void 0 : _l.type) === "deleted") {
+    if (((_j = column4.autoincrement) == null ? void 0 : _j.type) === "deleted") {
       statements.push({
-        type: "alter_table_alter_column_drop_notnull",
+        type: "alter_table_alter_column_drop_autoincrement",
         tableName,
         columnName,
         schema: schema3,
@@ -12577,23 +12483,10 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        columnPk
+        columnAutoIncrement
       });
     }
-    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") {
+    if (((_k = column4.onUpdate) == null ? void 0 : _k.type) === "added") {
       statements.push({
         type: "alter_table_alter_column_set_on_update",
         tableName,
@@ -12603,11 +12496,10 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        columnPk
+        columnAutoIncrement
       });
     }
-    if (((_p = column4.onUpdate) == null ? void 0 : _p.type) === "deleted") {
+    if (((_l = column4.onUpdate) == null ? void 0 : _l.type) === "deleted") {
       statements.push({
         type: "alter_table_alter_column_drop_on_update",
         tableName,
@@ -12617,8 +12509,7 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         columnDefault,
         columnOnUpdate,
         columnNotNull,
-        columnAutoIncrement,
-        columnPk
+        columnAutoIncrement
       });
     }
   }
@@ -12850,7 +12741,6 @@ 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()
@@ -13183,7 +13073,6 @@ 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);
@@ -13193,6 +13082,7 @@ 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);