drizzle-kit 0.16.9-fcedf83 → 0.17.0-6323eb6

package/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -613,7 +614,7 @@ var require_command = __commonJS({
   "node_modules/.pnpm/commander@9.5.0/node_modules/commander/lib/command.js"(exports) {
     var EventEmitter = require("events").EventEmitter;
     var childProcess = require("child_process");
-    var path4 = require("path");
+    var path2 = require("path");
     var fs7 = require("fs");
     var process3 = require("process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
@@ -1053,10 +1054,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path4.resolve(baseDir, baseName);
+          const localBin = path2.resolve(baseDir, baseName);
           if (fs7.existsSync(localBin))
             return localBin;
-          if (sourceExt.includes(path4.extname(baseName)))
+          if (sourceExt.includes(path2.extname(baseName)))
             return void 0;
           const foundExt = sourceExt.find((ext) => fs7.existsSync(`${localBin}${ext}`));
           if (foundExt)
@@ -1074,19 +1075,19 @@ Expecting one of '${allowedValues.join("', '")}'`);
           } catch (err2) {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path4.resolve(path4.dirname(resolvedScriptPath), executableDir);
+          executableDir = path2.resolve(path2.dirname(resolvedScriptPath), executableDir);
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path4.basename(this._scriptPath, path4.extname(this._scriptPath));
+            const legacyName = path2.basename(this._scriptPath, path2.extname(this._scriptPath));
             if (legacyName !== this._name) {
               localFile = findFile(executableDir, `${legacyName}-${subcommand._name}`);
             }
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path4.extname(executableFile));
+        launchWithNode = sourceExt.includes(path2.extname(executableFile));
         let proc;
         if (process3.platform !== "win32") {
           if (launchWithNode) {
@@ -1658,13 +1659,13 @@ Expecting one of '${allowedValues.join("', '")}'`);
         return this;
       }
       nameFromFilename(filename) {
-        this._name = path4.basename(filename, path4.extname(filename));
+        this._name = path2.basename(filename, path2.extname(filename));
         return this;
       }
-      executableDir(path5) {
-        if (path5 === void 0)
+      executableDir(path3) {
+        if (path3 === void 0)
           return this._executableDir;
-        this._executableDir = path5;
+        this._executableDir = path3;
         return this;
       }
       helpInformation(contextOptions) {
@@ -1817,7 +1818,7 @@ var require_commander = __commonJS({
   }
 });
 
-// node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs
+// node_modules/.pnpm/zod@3.20.6/node_modules/zod/lib/index.mjs
 function getErrorMap() {
   return overrideErrorMap;
 }
@@ -1930,9 +1931,9 @@ function createZodEnum(values, params) {
     ...processCreateParams(params)
   });
 }
-var util, ZodParsedType, getParsedType, ZodIssueCode, ZodError, errorMap, overrideErrorMap, makeIssue, ParseStatus, INVALID, DIRTY, OK, isAborted, isDirty, isValid, isAsync, errorUtil, ParseInputLazyPath, handleResult, ZodType, cuidRegex, uuidRegex, emailRegex, datetimeRegex, ZodString, ZodNumber, ZodBigInt, ZodBoolean, ZodDate, ZodSymbol, ZodUndefined, ZodNull, ZodAny, ZodUnknown, ZodNever, ZodVoid, ZodArray, objectUtil, AugmentFactory, ZodObject, ZodUnion, getDiscriminator, ZodDiscriminatedUnion, ZodIntersection, ZodTuple, ZodRecord, ZodMap, ZodSet, ZodFunction, ZodLazy, ZodLiteral, ZodEnum, ZodNativeEnum, ZodPromise, ZodEffects, ZodOptional, ZodNullable, ZodDefault, ZodCatch, ZodNaN, BRAND, ZodBranded, ZodPipeline, late, ZodFirstPartyTypeKind, stringType, numberType, nanType, bigIntType, booleanType, dateType, symbolType, undefinedType, nullType, anyType, unknownType, neverType, voidType, arrayType, objectType, strictObjectType, unionType, discriminatedUnionType, intersectionType, tupleType, recordType, mapType, setType, functionType, lazyType, literalType, enumType, nativeEnumType, promiseType, effectsType, optionalType, nullableType, preprocessType, pipelineType, coerce;
+var util, ZodParsedType, getParsedType, ZodIssueCode, ZodError, errorMap, overrideErrorMap, makeIssue, ParseStatus, INVALID, DIRTY, OK, isAborted, isDirty, isValid, isAsync, errorUtil, ParseInputLazyPath, handleResult, ZodType, cuidRegex, cuid2Regex, uuidRegex, emailRegex, datetimeRegex, ZodString, ZodNumber, ZodBigInt, ZodBoolean, ZodDate, ZodSymbol, ZodUndefined, ZodNull, ZodAny, ZodUnknown, ZodNever, ZodVoid, ZodArray, objectUtil, ZodObject, ZodUnion, getDiscriminator, ZodDiscriminatedUnion, ZodIntersection, ZodTuple, ZodRecord, ZodMap, ZodSet, ZodFunction, ZodLazy, ZodLiteral, ZodEnum, ZodNativeEnum, ZodPromise, ZodEffects, ZodOptional, ZodNullable, ZodDefault, ZodCatch, ZodNaN, BRAND, ZodBranded, ZodPipeline, late, ZodFirstPartyTypeKind, stringType, numberType, nanType, bigIntType, booleanType, dateType, symbolType, undefinedType, nullType, anyType, unknownType, neverType, voidType, arrayType, objectType, strictObjectType, unionType, discriminatedUnionType, intersectionType, tupleType, recordType, mapType, setType, functionType, lazyType, literalType, enumType, nativeEnumType, promiseType, effectsType, optionalType, nullableType, preprocessType, pipelineType, coerce;
 var init_lib = __esm({
-  "node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs"() {
+  "node_modules/.pnpm/zod@3.20.6/node_modules/zod/lib/index.mjs"() {
     (function(util2) {
       util2.assertEqual = (val) => val;
       function assertIs(_arg) {
@@ -2252,8 +2253,8 @@ var init_lib = __esm({
     };
     overrideErrorMap = errorMap;
     makeIssue = (params) => {
-      const { data, path: path4, errorMaps, issueData } = params;
-      const fullPath = [...path4, ...issueData.path || []];
+      const { data, path: path2, errorMaps, issueData } = params;
+      const fullPath = [...path2, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -2329,16 +2330,16 @@ var init_lib = __esm({
     isAborted = (x) => x.status === "aborted";
     isDirty = (x) => x.status === "dirty";
     isValid = (x) => x.status === "valid";
-    isAsync = (x) => typeof Promise !== void 0 && x instanceof Promise;
+    isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise;
     (function(errorUtil2) {
       errorUtil2.errToObj = (message) => typeof message === "string" ? { message } : message || {};
       errorUtil2.toString = (message) => typeof message === "string" ? message : message === null || message === void 0 ? void 0 : message.message;
     })(errorUtil || (errorUtil = {}));
     ParseInputLazyPath = class {
-      constructor(parent, value, path4, key) {
+      constructor(parent, value, path2, key) {
         this.parent = parent;
         this.data = value;
-        this._path = path4;
+        this._path = path2;
         this._key = key;
       }
       get path() {
@@ -2525,28 +2526,29 @@ var init_lib = __esm({
         return this._refinement(refinement);
       }
       optional() {
-        return ZodOptional.create(this);
+        return ZodOptional.create(this, this._def);
       }
       nullable() {
-        return ZodNullable.create(this);
+        return ZodNullable.create(this, this._def);
       }
       nullish() {
-        return this.optional().nullable();
+        return this.nullable().optional();
       }
       array() {
-        return ZodArray.create(this);
+        return ZodArray.create(this, this._def);
       }
       promise() {
-        return ZodPromise.create(this);
+        return ZodPromise.create(this, this._def);
       }
       or(option) {
-        return ZodUnion.create([this, option]);
+        return ZodUnion.create([this, option], this._def);
       }
       and(incoming) {
-        return ZodIntersection.create(this, incoming);
+        return ZodIntersection.create(this, incoming, this._def);
       }
       transform(transform) {
         return new ZodEffects({
+          ...processCreateParams(this._def),
           schema: this,
           typeName: ZodFirstPartyTypeKind.ZodEffects,
           effect: { type: "transform", transform }
@@ -2555,6 +2557,7 @@ var init_lib = __esm({
       default(def) {
         const defaultValueFunc = typeof def === "function" ? def : () => def;
         return new ZodDefault({
+          ...processCreateParams(this._def),
           innerType: this,
           defaultValue: defaultValueFunc,
           typeName: ZodFirstPartyTypeKind.ZodDefault
@@ -2564,14 +2567,15 @@ var init_lib = __esm({
         return new ZodBranded({
           typeName: ZodFirstPartyTypeKind.ZodBranded,
           type: this,
-          ...processCreateParams(void 0)
+          ...processCreateParams(this._def)
         });
       }
       catch(def) {
-        const defaultValueFunc = typeof def === "function" ? def : () => def;
+        const catchValueFunc = typeof def === "function" ? def : () => def;
         return new ZodCatch({
+          ...processCreateParams(this._def),
           innerType: this,
-          defaultValue: defaultValueFunc,
+          catchValue: catchValueFunc,
           typeName: ZodFirstPartyTypeKind.ZodCatch
         });
       }
@@ -2593,24 +2597,25 @@ var init_lib = __esm({
       }
     };
     cuidRegex = /^c[^\s-]{8,}$/i;
+    cuid2Regex = /^[a-z][a-z0-9]*$/;
     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;
-    emailRegex = /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
+    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,}))$/;
     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$`);
         }
@@ -2732,6 +2737,16 @@ var init_lib = __esm({
               });
               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);
@@ -2813,6 +2828,9 @@ var init_lib = __esm({
       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") {
@@ -2887,6 +2905,9 @@ var init_lib = __esm({
       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) {
@@ -3109,7 +3130,22 @@ var init_lib = __esm({
         return max;
       }
       get isInt() {
-        return !!this._def.checks.find((ch) => ch.kind === "int");
+        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);
       }
     };
     ZodNumber.create = (params) => {
@@ -3466,13 +3502,13 @@ var init_lib = __esm({
           }
         }
         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);
@@ -3520,22 +3556,12 @@ var init_lib = __esm({
         };
       };
     })(objectUtil || (objectUtil = {}));
-    AugmentFactory = (def) => (augmentation) => {
-      return new ZodObject({
-        ...def,
-        shape: () => ({
-          ...def.shape(),
-          ...augmentation
-        })
-      });
-    };
     ZodObject = class extends ZodType {
       constructor() {
         super(...arguments);
         this._cached = null;
         this.nonstrict = this.passthrough;
-        this.augment = AugmentFactory(this._def);
-        this.extend = AugmentFactory(this._def);
+        this.augment = this.extend;
       }
       _getCached() {
         if (this._cached !== null)
@@ -3664,8 +3690,14 @@ var init_lib = __esm({
           unknownKeys: "passthrough"
         });
       }
-      setKey(key, schema4) {
-        return this.augment({ [key]: schema4 });
+      extend(augmentation) {
+        return new ZodObject({
+          ...this._def,
+          shape: () => ({
+            ...this._def.shape(),
+            ...augmentation
+          })
+        });
       }
       merge(merging) {
         const merged = new ZodObject({
@@ -3676,6 +3708,9 @@ var init_lib = __esm({
         });
         return merged;
       }
+      setKey(key, schema4) {
+        return this.augment({ [key]: schema4 });
+      }
       catchall(index4) {
         return new ZodObject({
           ...this._def,
@@ -3684,9 +3719,10 @@ var init_lib = __esm({
       }
       pick(mask) {
         const shape = {};
-        util.objectKeys(mask).map((key) => {
-          if (this.shape[key])
+        util.objectKeys(mask).forEach((key) => {
+          if (mask[key] && this.shape[key]) {
             shape[key] = this.shape[key];
+          }
         });
         return new ZodObject({
           ...this._def,
@@ -3695,8 +3731,8 @@ var init_lib = __esm({
       }
       omit(mask) {
         const shape = {};
-        util.objectKeys(this.shape).map((key) => {
-          if (util.objectKeys(mask).indexOf(key) === -1) {
+        util.objectKeys(this.shape).forEach((key) => {
+          if (!mask[key]) {
             shape[key] = this.shape[key];
           }
         });
@@ -3710,24 +3746,14 @@ var init_lib = __esm({
       }
       partial(mask) {
         const newShape = {};
-        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];
+        util.objectKeys(this.shape).forEach((key) => {
+          const fieldSchema = this.shape[key];
+          if (mask && !mask[key]) {
+            newShape[key] = fieldSchema;
+          } else {
             newShape[key] = fieldSchema.optional();
           }
-        }
+        });
         return new ZodObject({
           ...this._def,
           shape: () => newShape
@@ -3735,21 +3761,10 @@ var init_lib = __esm({
       }
       required(mask) {
         const newShape = {};
-        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) {
+        util.objectKeys(this.shape).forEach((key) => {
+          if (mask && !mask[key]) {
+            newShape[key] = this.shape[key];
+          } else {
             const fieldSchema = this.shape[key];
             let newField = fieldSchema;
             while (newField instanceof ZodOptional) {
@@ -3757,7 +3772,7 @@ var init_lib = __esm({
             }
             newShape[key] = newField;
           }
-        }
+        });
         return new ZodObject({
           ...this._def,
           shape: () => newShape
@@ -4059,7 +4074,7 @@ var init_lib = __esm({
           });
           status.dirty();
         }
-        const items = ctx.data.map((item, itemIndex) => {
+        const items = [...ctx.data].map((item, itemIndex) => {
           const schema4 = this._def.items[itemIndex] || this._def.rest;
           if (!schema4)
             return null;
@@ -4426,6 +4441,7 @@ var init_lib = __esm({
         if (input.data !== this._def.value) {
           const ctx = this._getOrReturnCtx(input);
           addIssueToContext(ctx, {
+            received: ctx.data,
             code: ZodIssueCode.invalid_literal,
             expected: this._def.value
           });
@@ -4492,6 +4508,12 @@ var init_lib = __esm({
         }
         return enumValues;
       }
+      extract(values) {
+        return ZodEnum.create(values);
+      }
+      exclude(values) {
+        return ZodEnum.create(this.options.filter((opt) => !values.includes(opt)));
+      }
     };
     ZodEnum.create = createZodEnum;
     ZodNativeEnum = class extends ZodType {
@@ -4530,6 +4552,9 @@ var init_lib = __esm({
       });
     };
     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) {
@@ -4743,23 +4768,29 @@ var init_lib = __esm({
         const result = this._def.innerType._parse({
           data: ctx.data,
           path: ctx.path,
-          parent: ctx
+          parent: {
+            ...ctx,
+            common: {
+              ...ctx.common,
+              issues: []
+            }
+          }
         });
         if (isAsync(result)) {
           return result.then((result2) => {
             return {
               status: "valid",
-              value: result2.status === "valid" ? result2.value : this._def.defaultValue()
+              value: result2.status === "valid" ? result2.value : this._def.catchValue()
             };
           });
         } else {
           return {
             status: "valid",
-            value: result.status === "valid" ? result.value : this._def.defaultValue()
+            value: result.status === "valid" ? result.value : this._def.catchValue()
           };
         }
       }
-      removeDefault() {
+      removeCatch() {
         return this._def.innerType;
       }
     };
@@ -4767,7 +4798,7 @@ var init_lib = __esm({
       return new ZodCatch({
         innerType: type,
         typeName: ZodFirstPartyTypeKind.ZodCatch,
-        defaultValue: typeof params.default === "function" ? params.default : () => params.default,
+        catchValue: typeof params.catch === "function" ? params.catch : () => params.catch,
         ...processCreateParams(params)
       });
     };
@@ -4939,7 +4970,10 @@ var init_lib = __esm({
     coerce = {
       string: (arg) => ZodString.create({ ...arg, coerce: true }),
       number: (arg) => ZodNumber.create({ ...arg, coerce: true }),
-      boolean: (arg) => ZodBoolean.create({ ...arg, coerce: true }),
+      boolean: (arg) => ZodBoolean.create({
+        ...arg,
+        coerce: true
+      }),
       bigint: (arg) => ZodBigInt.create({ ...arg, coerce: true }),
       date: (arg) => ZodDate.create({ ...arg, coerce: true })
     };
@@ -5982,6 +6016,7 @@ var require_hanji = __commonJS({
 var import_hanji, err, info, error, schema, isRenamePromptItem, ResolveColumnSelect, ResolveTableSelect, ResolveSchemasSelect, Spinner, IntrospectProgress, DropMigrationView, trimmedRange;
 var init_views = __esm({
   "src/cli/views.ts"() {
+    "use strict";
     init_source();
     import_hanji = __toESM(require_hanji());
     err = (msg) => {
@@ -6303,15 +6338,17 @@ Is ${source_default.bold.blue(
 var originUUID, snapshotVersion;
 var init_global = __esm({
   "src/global.ts"() {
+    "use strict";
     originUUID = "00000000-0000-0000-0000-000000000000";
     snapshotVersion = "5";
   }
 });
 
 // src/serializer/mysqlSchema.ts
-var index, fk, column, tableV3, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternal, schemaV3, schemaV4, schema2, tableSquashed, schemaSquashed, MySqlSquasher, squashMysqlScheme, mysqlSchema, mysqlSchemaV4, mysqlSchemaV3, backwardCompatibleMysqlSchema, dryMySql;
+var index, fk, column, tableV3, compositePK, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternal, schemaV3, schemaV4, schema2, tableSquashed, schemaSquashed, MySqlSquasher, squashMysqlScheme, mysqlSchema, mysqlSchemaV4, mysqlSchemaV3, backwardCompatibleMysqlSchema, dryMySql;
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
+    "use strict";
     init_global();
     init_utils();
     init_lib();
@@ -6347,12 +6384,17 @@ var init_mysqlSchema = __esm({
       indexes: recordType(stringType(), index),
       foreignKeys: recordType(stringType(), fk)
     }).strict();
+    compositePK = objectType({
+      name: stringType(),
+      columns: stringType().array()
+    }).strict();
     table = objectType({
       name: stringType(),
       schema: stringType().optional(),
       columns: recordType(stringType(), column),
       indexes: recordType(stringType(), index),
-      foreignKeys: recordType(stringType(), fk)
+      foreignKeys: recordType(stringType(), fk),
+      compositePrimaryKeys: recordType(stringType(), compositePK)
     }).strict();
     dialect = literalType("mysql");
     schemaHash = objectType({
@@ -6389,7 +6431,8 @@ var init_mysqlSchema = __esm({
       schema: stringType().optional(),
       columns: recordType(stringType(), column),
       indexes: recordType(stringType(), stringType()),
-      foreignKeys: recordType(stringType(), stringType())
+      foreignKeys: recordType(stringType(), stringType()),
+      compositePrimaryKeys: recordType(stringType(), stringType())
     }).strict();
     schemaSquashed = objectType({
       version: literalType("5"),
@@ -6415,6 +6458,13 @@ var init_mysqlSchema = __esm({
         };
         return index.parse(destructed);
       },
+      squashPK: (pk) => {
+        return `${pk.name};${pk.columns.join(",")}`;
+      },
+      unsquashPK: (pk) => {
+        const splitted = pk.split(";");
+        return { name: splitted[0], columns: splitted[1].split(",") };
+      },
       squashFK: (fk4) => {
         var _a, _b;
         return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${(_a = fk4.onUpdate) != null ? _a : ""};${(_b = fk4.onDelete) != null ? _b : ""}`;
@@ -6450,6 +6500,9 @@ var init_mysqlSchema = __esm({
           const squashedFKs = mapValues(it[1].foreignKeys, (fk4) => {
             return MySqlSquasher.squashFK(fk4);
           });
+          const squashedPKs = mapValues(it[1].compositePrimaryKeys, (pk) => {
+            return MySqlSquasher.squashPK(pk);
+          });
           return [
             it[0],
             {
@@ -6457,7 +6510,8 @@ var init_mysqlSchema = __esm({
               schema: it[1].schema,
               columns: it[1].columns,
               indexes: squashedIndexes,
-              foreignKeys: squashedFKs
+              foreignKeys: squashedFKs,
+              compositePrimaryKeys: squashedPKs
             }
           ];
         })
@@ -6490,9 +6544,10 @@ var init_mysqlSchema = __esm({
 });
 
 // src/serializer/pgSchema.ts
-var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index2, fk2, column2, tableV32, table2, schemaHash2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternal, tableSquashed2, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
+var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index2, fk2, column2, tableV32, compositePK2, table2, schemaHash2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternal, tableSquashed2, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
   "src/serializer/pgSchema.ts"() {
+    "use strict";
     init_global();
     init_utils();
     init_lib();
@@ -6580,12 +6635,17 @@ var init_pgSchema = __esm({
       indexes: recordType(stringType(), index2),
       foreignKeys: recordType(stringType(), fk2)
     }).strict();
+    compositePK2 = objectType({
+      name: stringType(),
+      columns: stringType().array()
+    }).strict();
     table2 = objectType({
       name: stringType(),
       schema: stringType(),
       columns: recordType(stringType(), column2),
       indexes: recordType(stringType(), index2),
-      foreignKeys: recordType(stringType(), fk2)
+      foreignKeys: recordType(stringType(), fk2),
+      compositePrimaryKeys: recordType(stringType(), compositePK2)
     }).strict();
     schemaHash2 = objectType({
       id: stringType(),
@@ -6621,7 +6681,8 @@ var init_pgSchema = __esm({
       schema: stringType(),
       columns: recordType(stringType(), column2),
       indexes: recordType(stringType(), stringType()),
-      foreignKeys: recordType(stringType(), stringType())
+      foreignKeys: recordType(stringType(), stringType()),
+      compositePrimaryKeys: recordType(stringType(), stringType())
     }).strict();
     pgSchemaSquashed = objectType({
       version: literalType("5"),
@@ -6658,6 +6719,12 @@ var init_pgSchema = __esm({
         var _a, _b;
         return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${(_a = fk4.onUpdate) != null ? _a : ""};${(_b = fk4.onDelete) != null ? _b : ""}`;
       },
+      squashPK: (pk) => {
+        return `${pk.columns.join(",")}`;
+      },
+      unsquashPK: (pk) => {
+        return { name: "", columns: pk.split(",") };
+      },
       unsquashFK: (input) => {
         const [
           name,
@@ -6689,6 +6756,9 @@ var init_pgSchema = __esm({
           const squashedFKs = mapValues(it[1].foreignKeys, (fk4) => {
             return PgSquasher.squashFK(fk4);
           });
+          const squashedPKs = mapValues(it[1].compositePrimaryKeys, (pk) => {
+            return PgSquasher.squashPK(pk);
+          });
           return [
             it[0],
             {
@@ -6696,7 +6766,8 @@ var init_pgSchema = __esm({
               schema: it[1].schema,
               columns: it[1].columns,
               indexes: squashedIndexes,
-              foreignKeys: squashedFKs
+              foreignKeys: squashedFKs,
+              compositePrimaryKeys: squashedPKs
             }
           ];
         })
@@ -6727,9 +6798,10 @@ var init_pgSchema = __esm({
 });
 
 // src/serializer/sqliteSchema.ts
-var index3, fk3, compositePK, column3, tableV33, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, latestVersion, schemaInternal2, schemaV32, schemaV42, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV3, sqliteSchemaV4, sqliteSchema, backwardCompatibleSqliteSchema;
+var index3, fk3, compositePK3, column3, tableV33, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, latestVersion, schemaInternal2, schemaV32, schemaV42, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV3, sqliteSchemaV4, sqliteSchema, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
+    "use strict";
     init_global();
     init_utils();
     init_lib();
@@ -6748,7 +6820,7 @@ var init_sqliteSchema = __esm({
       onUpdate: stringType().optional(),
       onDelete: stringType().optional()
     }).strict();
-    compositePK = objectType({
+    compositePK3 = objectType({
       columns: stringType().array()
     }).strict();
     column3 = objectType({
@@ -6770,7 +6842,7 @@ var init_sqliteSchema = __esm({
       columns: recordType(stringType(), column3),
       indexes: recordType(stringType(), index3),
       foreignKeys: recordType(stringType(), fk3),
-      compositePrimaryKeys: recordType(stringType(), compositePK)
+      compositePrimaryKeys: recordType(stringType(), compositePK3)
     }).strict();
     dialect2 = enumType(["sqlite"]);
     schemaHash3 = objectType({
@@ -6889,7 +6961,7 @@ var init_sqliteSchema = __esm({
         })
       );
       return {
-        version: json.version,
+        version: "5",
         dialect: json.dialect,
         tables: mappedTables,
         enums: json.enums
@@ -9852,7 +9924,7 @@ var require_get = __commonJS({
           return lastId;
         },
         delete: function(id) {
-          var index4 = 0, set = map, i, args = cache[id], length = args.length, path4 = [];
+          var index4 = 0, set = map, i, args = cache[id], length = args.length, path2 = [];
           if (length === 0) {
             delete set[length];
           } else if (set = set[length]) {
@@ -9861,7 +9933,7 @@ var require_get = __commonJS({
               if (i === -1) {
                 return;
               }
-              path4.push(set, i);
+              path2.push(set, i);
               set = set[1][i];
               ++index4;
             }
@@ -9872,9 +9944,9 @@ var require_get = __commonJS({
             id = set[1][i];
             set[0].splice(i, 1);
             set[1].splice(i, 1);
-            while (!set[0].length && path4.length) {
-              i = path4.pop();
-              set = path4.pop();
+            while (!set[0].length && path2.length) {
+              i = path2.pop();
+              set = path2.pop();
               set[0].splice(i, 1);
               set[1].splice(i, 1);
             }
@@ -9966,13 +10038,13 @@ var require_get_fixed = __commonJS({
           return lastId;
         },
         delete: function(id) {
-          var index4 = 0, set = map, i, path4 = [], args = cache[id];
+          var index4 = 0, set = map, i, path2 = [], args = cache[id];
           while (index4 < length - 1) {
             i = indexOf.call(set[0], args[index4]);
             if (i === -1) {
               return;
             }
-            path4.push(set, i);
+            path2.push(set, i);
             set = set[1][i];
             ++index4;
           }
@@ -9983,9 +10055,9 @@ var require_get_fixed = __commonJS({
           id = set[1][i];
           set[0].splice(i, 1);
           set[1].splice(i, 1);
-          while (!set[0].length && path4.length) {
-            i = path4.pop();
-            set = path4.pop();
+          while (!set[0].length && path2.length) {
+            i = path2.pop();
+            set = path2.pop();
             set[0].splice(i, 1);
             set[1].splice(i, 1);
           }
@@ -13097,6 +13169,7 @@ function applyJsonDiff(json1, json2) {
 var import_json_diff, findAlternationsInTable, alternationsInColumn;
 var init_jsonDiffer = __esm({
   "src/jsonDiffer.js"() {
+    "use strict";
     import_json_diff = __toESM(require_lib());
     "use-strict";
     findAlternationsInTable = (table4, tableSchema) => {
@@ -13238,9 +13311,10 @@ var init_jsonDiffer = __esm({
 });
 
 // src/sqlgenerator.ts
-var pgNativeTypes, isPgNativeType, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, DropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, MySqlAlterTableAlterColumnSetDefaultConvertor, MySqlAlterTableAlterColumnDropDefaultConvertor, MySqlModifyColumn, SqliteAlterTableAlterColumnDropDefaultConvertor, SqliteAlterTableCreateCompositePrimaryKeyConvertor, SqliteAlterTableDeleteCompositePrimaryKeyConvertor, SqliteAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MysqlCreateSchemaConvertor, MysqlDropSchemaConvertor, MysqlAlterTableSetSchemaConvertor, MysqlAlterTableSetNewSchemaConvertor, MysqlAlterTableRemoveFromSchemaConvertor, MySqlDropIndexConvertor, convertors, fromJson;
+var pgNativeTypes, isPgNativeType, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, DropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, MySqlAlterTableAlterColumnSetDefaultConvertor, MySqlAlterTableAlterColumnDropDefaultConvertor, MySqlModifyColumn, SqliteAlterTableAlterColumnDropDefaultConvertor, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, SqliteAlterTableCreateCompositePrimaryKeyConvertor, SqliteAlterTableDeleteCompositePrimaryKeyConvertor, SqliteAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MysqlCreateSchemaConvertor, MysqlDropSchemaConvertor, MysqlAlterTableSetSchemaConvertor, MysqlAlterTableSetNewSchemaConvertor, MysqlAlterTableRemoveFromSchemaConvertor, MySqlDropIndexConvertor, convertors, fromJson;
 var init_sqlgenerator = __esm({
   "src/sqlgenerator.ts"() {
+    "use strict";
     init_mysqlSchema();
     init_pgSchema();
     init_sqliteSchema();
@@ -13270,13 +13344,26 @@ var init_sqlgenerator = __esm({
       "interval",
       "bigint",
       "bigserial",
-      "double precision"
+      "double precision",
+      "interval year",
+      "interval month",
+      "interval day",
+      "interval hour",
+      "interval minute",
+      "interval second",
+      "interval year to month",
+      "interval day to hour",
+      "interval day to minute",
+      "interval day to second",
+      "interval hour to minute",
+      "interval hour to second",
+      "interval minute to second"
     ]);
     isPgNativeType = (it) => {
       if (pgNativeTypes.has(it))
         return true;
       const toCheck = it.replace(/ /g, "");
-      return toCheck.startsWith("varchar(") || toCheck.startsWith("numeric(") || toCheck.startsWith("timestamp(");
+      return toCheck.startsWith("varchar(") || toCheck.startsWith("char(") || toCheck.startsWith("numeric(") || toCheck.startsWith("timestamp(");
     };
     Convertor = class {
     };
@@ -13285,7 +13372,7 @@ var init_sqlgenerator = __esm({
         return statement.type === "create_table" && dialect6 === "pg";
       }
       convert(st) {
-        const { tableName, schema: schema4, columns } = st;
+        const { tableName, schema: schema4, columns, compositePKs } = st;
         let statement = "";
         const name = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         statement += `CREATE TABLE IF NOT EXISTS ${name} (
@@ -13295,13 +13382,19 @@ var init_sqlgenerator = __esm({
           const primaryKeyStatement = column6.primaryKey ? "PRIMARY KEY" : "";
           const notNullStatement = column6.notNull ? "NOT NULL" : "";
           const defaultStatement = column6.default !== void 0 ? `DEFAULT ${column6.default}` : "";
-          const type = isPgNativeType(column6.type) ? column6.type : `"${column6.type}"`;
+          const type = isPgNativeType(column6.type) ? column6.type : `${column6.type}`;
           statement += "	" + `"${column6.name}" ${type} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim();
           statement += (i === columns.length - 1 ? "" : ",") + "\n";
         }
         statement += `);`;
         statement += `
 `;
+        if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
+          const compositePK4 = PgSquasher.unsquashPK(compositePKs[0]);
+          statement += `ALTER TABLE ${name} ADD CONSTRAINT "${st.compositePkName}" PRIMARY KEY("${compositePK4.columns.join('","')}");`;
+          statement += `
+`;
+        }
         return statement;
       }
     };
@@ -13310,7 +13403,7 @@ var init_sqlgenerator = __esm({
         return statement.type === "create_table" && dialect6 === "mysql";
       }
       convert(st) {
-        const { tableName, columns, schema: schema4 } = st;
+        const { tableName, columns, schema: schema4, compositePKs } = st;
         let statement = "";
         const tName = schema4 ? `\`${schema4}\`.\`${tableName}\`` : `\`${tableName}\``;
         statement += `CREATE TABLE ${tName} (
@@ -13328,6 +13421,12 @@ var init_sqlgenerator = __esm({
         statement += `);`;
         statement += `
 `;
+        if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
+          const compositePK4 = MySqlSquasher.unsquashPK(compositePKs[0]);
+          statement += `ALTER TABLE ${tName} ADD PRIMARY KEY(\`${compositePK4.columns.join("`,`")}\`);`;
+          statement += `
+`;
+        }
         return statement;
       }
     };
@@ -13697,6 +13796,67 @@ var init_sqlgenerator = __esm({
 */`;
       }
     };
+    PgAlterTableCreateCompositePrimaryKeyConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "create_composite_pk" && dialect6 === "pg";
+      }
+      convert(statement) {
+        const { name, columns } = PgSquasher.unsquashPK(statement.data);
+        return `ALTER TABLE "${statement.tableName}" ADD CONSTRAINT "${statement.constraintName}" PRIMARY KEY("${columns.join('","')}");`;
+      }
+    };
+    PgAlterTableDeleteCompositePrimaryKeyConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "delete_composite_pk" && dialect6 === "pg";
+      }
+      convert(statement) {
+        const { name, columns } = PgSquasher.unsquashPK(statement.data);
+        return `ALTER TABLE "${statement.tableName}" DROP CONSTRAINT "${statement.constraintName}";`;
+      }
+    };
+    PgAlterTableAlterCompositePrimaryKeyConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "alter_composite_pk" && dialect6 === "pg";
+      }
+      convert(statement) {
+        const { name, columns } = PgSquasher.unsquashPK(statement.old);
+        const { name: newName, columns: newColumns } = PgSquasher.unsquashPK(
+          statement.new
+        );
+        return `ALTER TABLE "${statement.tableName}" DROP CONSTRAINT ${statement.oldConstraintName};
+ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.newConstraintName} PRIMARY KEY(${newColumns.join(",")});`;
+      }
+    };
+    MySqlAlterTableCreateCompositePrimaryKeyConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "create_composite_pk" && dialect6 === "mysql";
+      }
+      convert(statement) {
+        const { name, columns } = MySqlSquasher.unsquashPK(statement.data);
+        return `ALTER TABLE \`${statement.tableName}\` ADD PRIMARY KEY(\`${columns.join("`,`")}\`);`;
+      }
+    };
+    MySqlAlterTableDeleteCompositePrimaryKeyConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "delete_composite_pk" && dialect6 === "mysql";
+      }
+      convert(statement) {
+        const { name, columns } = MySqlSquasher.unsquashPK(statement.data);
+        return `ALTER TABLE \`${statement.tableName}\` DROP PRIMARY KEY;`;
+      }
+    };
+    MySqlAlterTableAlterCompositePrimaryKeyConvertor = class extends Convertor {
+      can(statement, dialect6) {
+        return statement.type === "alter_composite_pk" && dialect6 === "mysql";
+      }
+      convert(statement) {
+        const { name, columns } = MySqlSquasher.unsquashPK(statement.old);
+        const { name: newName, columns: newColumns } = MySqlSquasher.unsquashPK(
+          statement.new
+        );
+        return `ALTER TABLE \`${statement.tableName}\` DROP PRIMARY KEY, ADD PRIMARY KEY(\`${newColumns.join("`,`")}\`);`;
+      }
+    };
     SqliteAlterTableCreateCompositePrimaryKeyConvertor = class extends Convertor {
       can(statement, dialect6) {
         return statement.type === "create_composite_pk" && dialect6 === "sqlite";
@@ -14203,6 +14363,12 @@ var init_sqlgenerator = __esm({
     convertors.push(new SqliteAlterTableCreateCompositePrimaryKeyConvertor());
     convertors.push(new SqliteAlterTableDeleteCompositePrimaryKeyConvertor());
     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 MySqlAlterTableAlterCompositePrimaryKeyConvertor());
     fromJson = (statements, dialect6) => {
       const result = statements.map((statement) => {
         const filtered = convertors.filter((it) => {
@@ -14245,17 +14411,37 @@ drop type __venum;
 });
 
 // src/jsonStatements.ts
-var prepareCreateTableJson, prepareSQLiteCreateTable, prepareDropTableJson, prepareRenameTableJson, prepareCreateEnumJson, prepareAddValuesToEnumJson, prepareCreateSchemasJson, prepareRenameSchemasJson, prepareDeleteSchemasJson, prepareRenameColumns, prepareAlterTableColumnsJson, _prepareDropColumns, _prepareAddColumns, _prepareSQLiteAddColumns, _prepareAlterColumns, prepareCreateIndexesJson, prepareCreateReferencesJson, prepareDropReferencesJson, prepareAlterReferencesJson, prepareDropIndexesJson, prepareAddCompositePrimaryKeySqlite, prepareDeleteCompositePrimaryKeySqlite, prepareAlterCompositePrimaryKeySqlite;
+var preparePgCreateTableJson, prepareMySqlCreateTableJson, prepareSQLiteCreateTable, prepareDropTableJson, prepareRenameTableJson, prepareCreateEnumJson, prepareAddValuesToEnumJson, prepareCreateSchemasJson, prepareRenameSchemasJson, prepareDeleteSchemasJson, prepareRenameColumns, prepareAlterTableColumnsJson, _prepareDropColumns, _prepareAddColumns, _prepareSQLiteAddColumns, _prepareAlterColumns, prepareCreateIndexesJson, prepareCreateReferencesJson, prepareDropReferencesJson, prepareAlterReferencesJson, prepareDropIndexesJson, prepareAddCompositePrimaryKeySqlite, prepareDeleteCompositePrimaryKeySqlite, prepareAlterCompositePrimaryKeySqlite, prepareAddCompositePrimaryKeyPg, prepareDeleteCompositePrimaryKeyPg, prepareAlterCompositePrimaryKeyPg, prepareAddCompositePrimaryKeyMySql, prepareDeleteCompositePrimaryKeyMySql, prepareAlterCompositePrimaryKeyMySql;
 var init_jsonStatements = __esm({
   "src/jsonStatements.ts"() {
+    "use strict";
+    init_mysqlSchema();
+    init_pgSchema();
     init_sqliteSchema();
-    prepareCreateTableJson = (table4) => {
-      const { name, schema: schema4, columns } = table4;
+    preparePgCreateTableJson = (table4, json2) => {
+      const { name, schema: schema4, columns, compositePrimaryKeys } = table4;
       return {
         type: "create_table",
         tableName: name,
         schema: schema4,
-        columns: Object.values(columns)
+        columns: Object.values(columns),
+        compositePKs: Object.values(compositePrimaryKeys),
+        compositePkName: Object.values(compositePrimaryKeys).length > 0 ? json2.tables[name].compositePrimaryKeys[`${name}_${PgSquasher.unsquashPK(
+          Object.values(compositePrimaryKeys)[0]
+        ).columns.join("_")}`].name : ""
+      };
+    };
+    prepareMySqlCreateTableJson = (table4, json2) => {
+      const { name, schema: schema4, columns, compositePrimaryKeys } = table4;
+      return {
+        type: "create_table",
+        tableName: name,
+        schema: schema4,
+        columns: Object.values(columns),
+        compositePKs: Object.values(compositePrimaryKeys),
+        compositePkName: Object.values(compositePrimaryKeys).length > 0 ? json2.tables[name].compositePrimaryKeys[`${name}_${MySqlSquasher.unsquashPK(
+          Object.values(compositePrimaryKeys)[0]
+        ).columns.join("_")}`].name : ""
       };
     };
     prepareSQLiteCreateTable = (table4) => {
@@ -14639,6 +14825,70 @@ var init_jsonStatements = __esm({
         };
       });
     };
+    prepareAddCompositePrimaryKeyPg = (tableName, pks, json2) => {
+      return Object.values(pks).map((it) => {
+        return {
+          type: "create_composite_pk",
+          tableName,
+          data: it,
+          constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it).columns.join("_")}`].name
+        };
+      });
+    };
+    prepareDeleteCompositePrimaryKeyPg = (tableName, pks, json1) => {
+      return Object.values(pks).map((it) => {
+        return {
+          type: "delete_composite_pk",
+          tableName,
+          data: it,
+          constraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it).columns.join("_")}`].name
+        };
+      });
+    };
+    prepareAlterCompositePrimaryKeyPg = (tableName, pks, json1, json2) => {
+      return Object.values(pks).map((it) => {
+        return {
+          type: "alter_composite_pk",
+          tableName,
+          old: it.__old,
+          new: it.__new,
+          oldConstraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it.__old).columns.join("_")}`].name,
+          newConstraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it.__new).columns.join("_")}`].name
+        };
+      });
+    };
+    prepareAddCompositePrimaryKeyMySql = (tableName, pks, json2) => {
+      return Object.values(pks).map((it) => {
+        return {
+          type: "create_composite_pk",
+          tableName,
+          data: it,
+          constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${MySqlSquasher.unsquashPK(it).columns.join("_")}`].name
+        };
+      });
+    };
+    prepareDeleteCompositePrimaryKeyMySql = (tableName, pks, json1) => {
+      return Object.values(pks).map((it) => {
+        return {
+          type: "delete_composite_pk",
+          tableName,
+          data: it,
+          constraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${MySqlSquasher.unsquashPK(it).columns.join("_")}`].name
+        };
+      });
+    };
+    prepareAlterCompositePrimaryKeyMySql = (tableName, pks, json1, json2) => {
+      return Object.values(pks).map((it) => {
+        return {
+          type: "alter_composite_pk",
+          tableName,
+          old: it.__old,
+          new: it.__new,
+          oldConstraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${MySqlSquasher.unsquashPK(it.__old).columns.join("_")}`].name,
+          newConstraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${MySqlSquasher.unsquashPK(it.__new).columns.join("_")}`].name
+        };
+      });
+    };
   }
 });
 
@@ -14646,6 +14896,7 @@ var init_jsonStatements = __esm({
 var makeChanged, makeSelfOrChanged, makePatched, makeSelfOrPatched, valueFromSelfOrPatchedNew, columnSchema, alteredColumnSchema, enumSchema2, changedEnumSchema, tableScheme, alteredTableScheme, diffResultScheme, applySnapshotsDiff;
 var init_snapshotsDiffer = __esm({
   "src/snapshotsDiffer.ts"() {
+    "use strict";
     init_sqlgenerator();
     init_lib();
     init_jsonDiffer();
@@ -14790,7 +15041,7 @@ var init_snapshotsDiffer = __esm({
       addedSchemas: stringType().array(),
       deletedSchemas: stringType().array()
     }).strict();
-    applySnapshotsDiff = async (json1, json2, dialect6, schemasResolver, tablesResolver, columnsResolver) => {
+    applySnapshotsDiff = async (json1, json2, dialect6, schemasResolver, tablesResolver, columnsResolver, prevFull, curFull) => {
       var _a, _b, _c, _d;
       const diffResult = applyJsonDiff(json1, json2);
       if (Object.keys(diffResult).length === 0) {
@@ -14820,9 +15071,6 @@ var init_snapshotsDiffer = __esm({
       const jsonSQLiteCreateTables = created.map((it) => {
         return prepareSQLiteCreateTable(it);
       });
-      const jsonCreateTables = created.map((it) => {
-        return prepareCreateTableJson(it);
-      });
       const jsonCreateIndexesForCreatedTables = created.map((it) => {
         return prepareCreateIndexesJson(it.name, it.schema, it.indexes);
       }).flat();
@@ -14880,18 +15128,57 @@ var init_snapshotsDiffer = __esm({
       const jsonRemoveTableFromSchemas = [];
       const jsonSetNewTableSchemas = [];
       allAlteredResolved.forEach((it) => {
-        const addedCompositePKs = prepareAddCompositePrimaryKeySqlite(
-          it.name,
-          it.addedCompositePKs
-        );
-        const deletedCompositePKs = prepareDeleteCompositePrimaryKeySqlite(
-          it.name,
-          it.deletedCompositePKs
-        );
-        const alteredCompositePKs = prepareAlterCompositePrimaryKeySqlite(
-          it.name,
-          it.alteredCompositePKs
-        );
+        let addedCompositePKs;
+        let deletedCompositePKs;
+        let alteredCompositePKs;
+        if (dialect6 === "sqlite") {
+          addedCompositePKs = prepareAddCompositePrimaryKeySqlite(
+            it.name,
+            it.addedCompositePKs
+          );
+          deletedCompositePKs = prepareDeleteCompositePrimaryKeySqlite(
+            it.name,
+            it.deletedCompositePKs
+          );
+          alteredCompositePKs = prepareAlterCompositePrimaryKeySqlite(
+            it.name,
+            it.alteredCompositePKs
+          );
+        } else if (dialect6 === "pg") {
+          addedCompositePKs = prepareAddCompositePrimaryKeyPg(
+            it.name,
+            it.addedCompositePKs,
+            curFull
+          );
+          deletedCompositePKs = prepareDeleteCompositePrimaryKeyPg(
+            it.name,
+            it.deletedCompositePKs,
+            prevFull
+          );
+          alteredCompositePKs = prepareAlterCompositePrimaryKeyPg(
+            it.name,
+            it.alteredCompositePKs,
+            prevFull,
+            curFull
+          );
+        } else {
+          addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
+            it.name,
+            it.addedCompositePKs,
+            curFull
+          );
+          deletedCompositePKs = prepareDeleteCompositePrimaryKeyMySql(
+            it.name,
+            it.deletedCompositePKs,
+            prevFull
+          );
+          alteredCompositePKs = prepareAlterCompositePrimaryKeyMySql(
+            it.name,
+            it.alteredCompositePKs,
+            prevFull,
+            curFull
+          );
+        }
         if (it.schema && typeof it.schema !== "string") {
           switch (it.schema.type) {
             case "added": {
@@ -15014,8 +15301,16 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonAlterEnumsWithAddedValues);
       if (dialect6 === "sqlite") {
         jsonStatements.push(...jsonSQLiteCreateTables);
+      } else if (dialect6 === "pg") {
+        const jsonPgCreateTables = created.map((it) => {
+          return preparePgCreateTableJson(it, curFull);
+        });
+        jsonStatements.push(...jsonPgCreateTables);
       } else {
-        jsonStatements.push(...jsonCreateTables);
+        const jsonMySqlCreateTables = created.map((it) => {
+          return prepareMySqlCreateTableJson(it, curFull);
+        });
+        jsonStatements.push(...jsonMySqlCreateTables);
       }
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonRenameTables);
@@ -15044,7 +15339,11 @@ var init_snapshotsDiffer = __esm({
         }
       });
       const _meta = prepareMigrationMeta(rSchemas, rTables, rColumns);
-      return { statements: jsonStatements, sqlStatements: uniqueSqlStatements, _meta };
+      return {
+        statements: jsonStatements,
+        sqlStatements: uniqueSqlStatements,
+        _meta
+      };
     };
   }
 });
@@ -15053,6 +15352,7 @@ var init_snapshotsDiffer = __esm({
 var prepareMigrationMetadata, adjectives, heroes;
 var init_words = __esm({
   "src/utils/words.ts"() {
+    "use strict";
     prepareMigrationMetadata = (idx) => {
       const prefix = idx.toFixed(0).padStart(4, "0");
       const suffix = `${adjectives.random()}_${heroes.random()}`;
@@ -16370,18 +16670,373 @@ var init_words = __esm({
   }
 });
 
+// src/cli/commands/pgUp.ts
+var import_crypto, import_fs, upPgHandlerV4toV5, upPgHandler, upPgHandlerV4, updateUpToV4, update1to2, update2to3, update3to4;
+var init_pgUp = __esm({
+  "src/cli/commands/pgUp.ts"() {
+    "use strict";
+    init_source();
+    import_crypto = require("crypto");
+    import_fs = require("fs");
+    init_global();
+    init_pgSchema();
+    init_utils();
+    upPgHandlerV4toV5 = (obj) => {
+      const mappedTables = {};
+      for (const [key, table4] of Object.entries(obj.tables)) {
+        const mappedColumns = {};
+        for (const [ckey, column6] of Object.entries(table4.columns)) {
+          let newDefault = column6.default;
+          let newType = column6.type;
+          if (column6.type.toLowerCase() === "date") {
+            if (typeof column6.default !== "undefined") {
+              if (column6.default.startsWith("'") && column6.default.endsWith("'")) {
+                newDefault = `'${column6.default.substring(1, column6.default.length - 1).split("T")[0]}'`;
+              } else {
+                newDefault = column6.default.split("T")[0];
+              }
+            }
+          } else if (column6.type.toLowerCase().startsWith("timestamp")) {
+            if (typeof column6.default !== "undefined") {
+              if (column6.default.startsWith("'") && column6.default.endsWith("'")) {
+                newDefault = `'${column6.default.substring(1, column6.default.length - 1).replace("T", " ").slice(0, 23)}'`;
+              } else {
+                newDefault = column6.default.replace("T", " ").slice(0, 23);
+              }
+            }
+            newType = column6.type.toLowerCase().replace("timestamp (", "timestamp(");
+          } else if (column6.type.toLowerCase().startsWith("time")) {
+            newType = column6.type.toLowerCase().replace("time (", "time(");
+          } else if (column6.type.toLowerCase().startsWith("interval")) {
+            newType = column6.type.toLowerCase().replace(" (", "(");
+          }
+          mappedColumns[ckey] = { ...column6, default: newDefault, type: newType };
+        }
+        mappedTables[key] = { ...table4, columns: mappedColumns };
+      }
+      return {
+        version: "5",
+        dialect: obj.dialect,
+        id: obj.id,
+        prevId: obj.prevId,
+        tables: mappedTables,
+        enums: obj.enums,
+        schemas: obj.schemas,
+        _meta: {
+          schemas: {},
+          tables: {},
+          columns: {}
+        }
+      };
+    };
+    upPgHandler = (out) => {
+    };
+    upPgHandlerV4 = (out) => {
+      const snapshots = snapshotsPriorV4(out);
+      const report = validateWithReport(snapshots, "pg");
+      let prevId = originUUID;
+      report.nonLatest.map((it) => ({
+        path: it,
+        raw: report.rawMap[it]
+      })).forEach((it) => {
+        const path2 = it.path;
+        const result = updateUpToV4(it.raw, prevId);
+        prevId = result.id;
+        console.log(`[${source_default.green("\u2713")}] ${path2}`);
+        (0, import_fs.writeFileSync)(path2, JSON.stringify(result, null, 2));
+      });
+      console.log("Everything's fine \u{1F436}\u{1F525}");
+    };
+    updateUpToV4 = (json, prevId) => {
+      const version = Number(json["version"]);
+      if (version === 1) {
+        const v1 = pgSchemaV1.parse(json);
+        const v2 = update1to2(v1);
+        const v3 = update2to3(v2, prevId);
+        const v4 = update3to4(v3);
+        return v4;
+      }
+      if (version === 2) {
+        const v2 = pgSchemaV2.parse(json);
+        const v3 = update2to3(v2, prevId);
+        const v4 = update3to4(v3);
+        return v4;
+      }
+      if (version === 3) {
+        return update3to4(pgSchemaV3.parse(json));
+      }
+      return pgSchemaV4.parse(json);
+    };
+    update1to2 = (json) => {
+      const tables = Object.fromEntries(
+        Object.entries(json.tables).map((it) => {
+          const table4 = it[1];
+          const columns = Object.fromEntries(
+            Object.entries(table4.columns).map((it2) => {
+              const ref = it2[1].references;
+              const fkName = ref == null ? void 0 : ref.foreignKeyName;
+              const table5 = ref == null ? void 0 : ref.table;
+              const column6 = ref == null ? void 0 : ref.column;
+              const onDelete = ref == null ? void 0 : ref.onDelete;
+              const onUpdate = ref == null ? void 0 : ref.onDelete;
+              const newRef = ref ? `${fkName};${table5};${column6};${onDelete != null ? onDelete : ""};${onUpdate != null ? onUpdate : ""}` : void 0;
+              return [it2[0], { ...it2[1], references: newRef }];
+            })
+          );
+          return [it[0], { name: table4.name, columns, indexes: table4.indexes }];
+        })
+      );
+      return { version: "2", tables, enums: json.enums };
+    };
+    update2to3 = (json, prevId) => {
+      const tables = Object.fromEntries(
+        Object.entries(json.tables).map((table4) => {
+          const { name, columns, indexes } = table4[1];
+          let refs = [];
+          const newColumns = Object.fromEntries(
+            Object.entries(columns).map((it) => {
+              const {
+                name: name2,
+                type,
+                primaryKey,
+                notNull,
+                default: defaultValue,
+                references: references2
+              } = it[1];
+              const newColumn = {
+                name: name2,
+                type,
+                primaryKey,
+                notNull,
+                default: defaultValue
+              };
+              if (references2) {
+                refs.push({ column: name2, value: references2 });
+              }
+              return [it[0], newColumn];
+            })
+          );
+          const tableName = name;
+          const fks = Object.fromEntries(
+            refs.map((it) => {
+              const [name2, table5, column6, onDelete, onUpdate] = it.value.split(";");
+              const fk4 = {
+                name: name2,
+                tableFrom: tableName,
+                columnsFrom: [it.column],
+                tableTo: table5,
+                columnsTo: [column6],
+                onUpdate,
+                onDelete
+              };
+              return [name2, fk4];
+            })
+          );
+          const idxs = Object.fromEntries(
+            Object.entries(indexes).map((it) => {
+              const { columns: columns2, isUnique, name: name2 } = it[1];
+              const mappedColumns = Object.entries(columns2).map((it2) => {
+                return it2[1].name;
+              });
+              const index4 = {
+                name: name2,
+                isUnique,
+                columns: mappedColumns
+              };
+              return [it[0], index4];
+            })
+          );
+          const newTable = {
+            name,
+            columns: newColumns,
+            indexes: idxs,
+            foreignKeys: fks
+          };
+          return [table4[0], newTable];
+        })
+      );
+      return {
+        version: "3",
+        dialect: "pg",
+        id: (0, import_crypto.randomUUID)(),
+        prevId,
+        tables,
+        enums: json.enums
+      };
+    };
+    update3to4 = (json) => {
+      const tables = Object.fromEntries(
+        Object.entries(json.tables).map((table4) => {
+          const { name, columns, foreignKeys, indexes } = table4[1];
+          const newColumns = Object.fromEntries(
+            Object.entries(columns).map((it) => {
+              const {
+                name: name2,
+                type,
+                primaryKey,
+                notNull,
+                default: defaultValue
+              } = it[1];
+              const newColumn = {
+                name: name2,
+                type,
+                primaryKey,
+                notNull,
+                default: defaultValue
+              };
+              return [it[0], newColumn];
+            })
+          );
+          const newTable = {
+            name,
+            schema: "",
+            columns: newColumns,
+            indexes,
+            foreignKeys
+          };
+          return [table4[0], newTable];
+        })
+      );
+      return {
+        version: "4",
+        dialect: "pg",
+        id: (0, import_crypto.randomUUID)(),
+        prevId: json.prevId,
+        tables,
+        enums: json.enums,
+        schemas: {}
+      };
+    };
+  }
+});
+
+// src/cli/commands/mysqlUp.ts
+var import_fs2, upMysqlHandler, upMySqlHandlerV4toV5, upMysqlHandlerV4, updateToLatestV4, updateV3toV4;
+var init_mysqlUp = __esm({
+  "src/cli/commands/mysqlUp.ts"() {
+    "use strict";
+    init_source();
+    import_fs2 = __toESM(require("fs"));
+    init_mysqlSchema();
+    init_utils();
+    upMysqlHandler = (out) => {
+    };
+    upMySqlHandlerV4toV5 = (obj) => {
+      const mappedTables = {};
+      for (const [key, table4] of Object.entries(obj.tables)) {
+        const mappedColumns = {};
+        for (const [ckey, column6] of Object.entries(table4.columns)) {
+          let newDefault = column6.default;
+          let newType = column6.type;
+          let newAutoIncrement = column6.autoincrement;
+          if (column6.type.toLowerCase().startsWith("datetime")) {
+            if (typeof column6.default !== "undefined") {
+              if (column6.default.startsWith("'") && column6.default.endsWith("'")) {
+                newDefault = `'${column6.default.substring(1, column6.default.length - 1).replace("T", " ").slice(0, 23)}'`;
+              } else {
+                newDefault = column6.default.replace("T", " ").slice(0, 23);
+              }
+            }
+            newType = column6.type.toLowerCase().replace("datetime (", "datetime(");
+          } else if (column6.type.toLowerCase() === "date") {
+            if (typeof column6.default !== "undefined") {
+              if (column6.default.startsWith("'") && column6.default.endsWith("'")) {
+                newDefault = `'${column6.default.substring(1, column6.default.length - 1).split("T")[0]}'`;
+              } else {
+                newDefault = column6.default.split("T")[0];
+              }
+            }
+            newType = column6.type.toLowerCase().replace("date (", "date(");
+          } else if (column6.type.toLowerCase().startsWith("timestamp")) {
+            if (typeof column6.default !== "undefined") {
+              if (column6.default.startsWith("'") && column6.default.endsWith("'")) {
+                newDefault = `'${column6.default.substring(1, column6.default.length - 1).replace("T", " ").slice(0, 23)}'`;
+              } else {
+                newDefault = column6.default.replace("T", " ").slice(0, 23);
+              }
+            }
+            newType = column6.type.toLowerCase().replace("timestamp (", "timestamp(");
+          } else if (column6.type.toLowerCase().startsWith("time")) {
+            newType = column6.type.toLowerCase().replace("time (", "time(");
+          } else if (column6.type.toLowerCase().startsWith("decimal")) {
+            newType = column6.type.toLowerCase().replace(", ", ",");
+          } else if (column6.type.toLowerCase().startsWith("enum")) {
+            newType = column6.type.toLowerCase();
+          } else if (column6.type.toLowerCase().startsWith("serial")) {
+            newAutoIncrement = true;
+          }
+          mappedColumns[ckey] = {
+            ...column6,
+            default: newDefault,
+            type: newType,
+            autoincrement: newAutoIncrement
+          };
+        }
+        mappedTables[key] = { ...table4, columns: mappedColumns };
+      }
+      return {
+        version: "5",
+        dialect: obj.dialect,
+        id: obj.id,
+        prevId: obj.prevId,
+        tables: mappedTables,
+        schemas: obj.schemas,
+        _meta: {
+          schemas: {},
+          tables: {},
+          columns: {}
+        }
+      };
+    };
+    upMysqlHandlerV4 = (out) => {
+      const snapshots = snapshotsPriorV4(out);
+      const report = validateWithReport(snapshots, "mysql");
+      report.nonLatest.map((it) => ({
+        path: it,
+        raw: report.rawMap[it]
+      })).forEach((it) => {
+        const path2 = it.path;
+        const result = updateToLatestV4(it.raw);
+        console.log(`[${source_default.green("\u2713")}] ${path2}`);
+        import_fs2.default.writeFileSync(path2, JSON.stringify(result, null, 2));
+      });
+      console.log("Everything's fine \u{1F436}\u{1F525}");
+    };
+    updateToLatestV4 = (json) => {
+      const version = Number(json["version"]);
+      if (version === 3) {
+        const v3 = mysqlSchemaV3.parse(json);
+        const v4 = updateV3toV4(v3);
+        return v4;
+      }
+      return mysqlSchemaV4.parse(json);
+    };
+    updateV3toV4 = (old) => {
+      return {
+        ...old,
+        version: "4",
+        schemas: {}
+      };
+    };
+  }
+});
+
 // src/cli/commands/upFolders.ts
-var import_fs, import_path, schemasResolverWithSQL, resolveSchemas, resolveTablesWithSQL, resolveTables, resolveColumnsWithSQL, resolveColumns, fullfill, fullfillpg, fullfillmysql, upgradeFolders;
+var import_fs3, import_path, schemasResolverWithSQL, resolveSchemas, resolveTablesWithSQL, resolveTables, resolveColumnsWithSQL, resolveColumns, fullfill, fullfillpg, fullfillmysql, fullfillsqlite, upgradeFolders;
 var init_upFolders = __esm({
   "src/cli/commands/upFolders.ts"() {
-    import_fs = require("fs");
+    "use strict";
+    import_fs3 = require("fs");
     import_path = require("path");
     init_jsonDiffer();
     init_mysqlSchema();
+    init_sqliteSchema();
     init_snapshotsDiffer();
     init_utils();
     init_words();
+    init_pgUp();
     init_pgSchema();
+    init_mysqlUp();
     schemasResolverWithSQL = (missingSchemas, newSchemas, sql) => {
       return resolveSchemas(
         missingSchemas,
@@ -16449,6 +17104,10 @@ var init_upFolders = __esm({
             {
               value: it,
               sql: `RENAME TABLE ${mysqlSchemaPrefix}\`${it.name}\` TO ${mysqlSchemaPrefix}\`${created.name}\`;`
+            },
+            {
+              value: it,
+              sql: `ALTER TABLE ${it.name} RENAME TO ${created.name};`
             }
           ];
         }).flat();
@@ -16559,25 +17218,15 @@ var init_upFolders = __esm({
       if (dialect6 === "mysql") {
         return fullfillmysql(prev, cur, sql);
       }
+      if (dialect6 === "sqlite") {
+        return fullfillsqlite(prev, cur, sql);
+      }
       throw new Error("");
     };
     fullfillpg = (prev, cur, sql) => {
       const b = pgSchemaV4.parse(cur);
       if (!prev) {
-        return {
-          version: "5",
-          dialect: b.dialect,
-          id: b.id,
-          prevId: b.prevId,
-          tables: b.tables,
-          enums: b.enums,
-          schemas: b.schemas,
-          _meta: {
-            schemas: {},
-            tables: {},
-            columns: {}
-          }
-        };
+        return upPgHandlerV4toV5(b);
       }
       const a = pgSchemaV4.parse(prev);
       const json1 = squashPgScheme(a);
@@ -16616,7 +17265,12 @@ var init_upFolders = __esm({
       });
       const rColumns = allAltered.map((table4) => {
         const name = table4.name;
-        const result = resolveColumnsWithSQL(name, table4.deleted, table4.added, sql);
+        const result = resolveColumnsWithSQL(
+          name,
+          table4.deleted,
+          table4.added,
+          sql
+        );
         const tableName = table4.name;
         const schema4 = typeof table4.schema === "string" ? table4.schema : "";
         return result.renamed.map((it) => {
@@ -16627,30 +17281,93 @@ var init_upFolders = __esm({
         });
       }).flat();
       const _meta = prepareMigrationMeta(rSchemas, rTables, rColumns);
+      const bUpV5 = upPgHandlerV4toV5(b);
       const bpatched = {
         version: "5",
-        dialect: b.dialect,
-        id: b.id,
-        prevId: b.prevId,
-        tables: b.tables,
-        enums: b.enums,
-        schemas: b.schemas,
+        dialect: bUpV5.dialect,
+        id: bUpV5.id,
+        prevId: bUpV5.prevId,
+        tables: bUpV5.tables,
+        enums: bUpV5.enums,
+        schemas: bUpV5.schemas,
         _meta
       };
       pgSchema.parse(bpatched);
-      return {
+      return bUpV5;
+    };
+    fullfillmysql = (prev, cur, sql) => {
+      const b = mysqlSchemaV4.parse(cur);
+      if (!prev) {
+        return upMySqlHandlerV4toV5(b);
+      }
+      const a = mysqlSchemaV4.parse(prev);
+      const json1 = squashMysqlScheme(a);
+      const json2 = squashMysqlScheme(b);
+      const diffResult = applyJsonDiff(json1, json2);
+      const parseResult = diffResultScheme.safeParse(diffResult);
+      if (!parseResult.success) {
+        parseResult.error.errors.forEach((it) => {
+          console.error(it);
+        });
+        throw new Error();
+      }
+      const typedResult = parseResult.data;
+      const { renamed: renamedSchemas } = schemasResolverWithSQL(
+        typedResult.deletedSchemas.map((it) => ({ name: it })),
+        typedResult.addedSchemas.map((it) => ({ name: it })),
+        sql
+      );
+      const { renamed } = resolveTablesWithSQL(
+        typedResult.deletedTables,
+        typedResult.addedTables,
+        sql
+      );
+      const renamedWithAlternations = Object.values(
+        alteredTableScheme.array().parse(diffForRenamedTables(renamed))
+      );
+      const allAltered = typedResult.alteredTablesWithColumns.concat(
+        renamedWithAlternations
+      );
+      const rSchemas = renamedSchemas.map((it) => ({
+        from: it.from.name,
+        to: it.to.name
+      }));
+      const rTables = renamed.map((it) => {
+        return { from: it.from, to: it.to };
+      });
+      const rColumns = allAltered.map((table4) => {
+        const name = table4.name;
+        const result = resolveColumnsWithSQL(
+          name,
+          table4.deleted,
+          table4.added,
+          sql
+        );
+        const tableName = table4.name;
+        const schema4 = typeof table4.schema === "string" ? table4.schema : "";
+        return result.renamed.map((it) => {
+          return {
+            from: { schema: schema4, table: tableName, column: it.from.name },
+            to: { schema: schema4, table: tableName, column: it.to.name }
+          };
+        });
+      }).flat();
+      const _meta = prepareMigrationMeta(rSchemas, rTables, rColumns);
+      const bUpV5 = upMySqlHandlerV4toV5(b);
+      const bpatched = {
         version: "5",
-        dialect: b.dialect,
-        id: b.id,
-        prevId: b.prevId,
-        tables: b.tables,
-        enums: b.enums,
-        schemas: b.schemas,
+        dialect: bUpV5.dialect,
+        id: bUpV5.id,
+        prevId: bUpV5.prevId,
+        tables: bUpV5.tables,
+        schemas: bUpV5.schemas,
         _meta
       };
+      mysqlSchema.parse(bpatched);
+      return bUpV5;
     };
-    fullfillmysql = (prev, cur, sql) => {
-      const b = mysqlSchemaV4.parse(cur);
+    fullfillsqlite = (prev, cur, sql) => {
+      const b = sqliteSchemaV4.parse(cur);
       if (!prev) {
         return {
           version: "5",
@@ -16658,17 +17375,16 @@ var init_upFolders = __esm({
           id: b.id,
           prevId: b.prevId,
           tables: b.tables,
-          schemas: b.schemas,
+          enums: {},
           _meta: {
-            schemas: {},
             tables: {},
             columns: {}
           }
         };
       }
-      const a = mysqlSchemaV4.parse(prev);
-      const json1 = squashMysqlScheme(a);
-      const json2 = squashMysqlScheme(b);
+      const a = sqliteSchemaV4.parse(prev);
+      const json1 = squashSqliteScheme(a);
+      const json2 = squashSqliteScheme(b);
       const diffResult = applyJsonDiff(json1, json2);
       const parseResult = diffResultScheme.safeParse(diffResult);
       if (!parseResult.success) {
@@ -16703,7 +17419,12 @@ var init_upFolders = __esm({
       });
       const rColumns = allAltered.map((table4) => {
         const name = table4.name;
-        const result = resolveColumnsWithSQL(name, table4.deleted, table4.added, sql);
+        const result = resolveColumnsWithSQL(
+          name,
+          table4.deleted,
+          table4.added,
+          sql
+        );
         const tableName = table4.name;
         const schema4 = typeof table4.schema === "string" ? table4.schema : "";
         return result.renamed.map((it) => {
@@ -16720,22 +17441,22 @@ var init_upFolders = __esm({
         id: b.id,
         prevId: b.prevId,
         tables: b.tables,
-        schemas: b.schemas,
+        enums: {},
         _meta
       };
-      mysqlSchema.parse(bpatched);
+      sqliteSchema.parse(bpatched);
       return {
         version: "5",
         dialect: b.dialect,
         id: b.id,
         prevId: b.prevId,
         tables: b.tables,
-        schemas: b.schemas,
+        enums: {},
         _meta
       };
     };
     upgradeFolders = (dialect6, out) => {
-      const oldMigrationFolders = (0, import_fs.readdirSync)(out).filter(
+      const oldMigrationFolders = (0, import_fs3.readdirSync)(out).filter(
         (it) => it.length === 14 && /^\d+$/.test(it)
       );
       oldMigrationFolders.sort();
@@ -16748,17 +17469,18 @@ var init_upFolders = __esm({
           date.setUTCHours(Number(it.substring(8, 10)));
           date.setUTCMinutes(Number(it.substring(10, 12)));
           date.setUTCSeconds(Number(it.substring(12, 14)));
-          const path4 = (0, import_path.join)(out, it);
+          const path2 = (0, import_path.join)(out, it);
           const pathJson = (0, import_path.join)(out, it, "snapshot.json");
           const pathSQL = (0, import_path.join)(out, it, "migration.sql");
-          const snapshot = JSON.parse((0, import_fs.readFileSync)(pathJson).toString());
-          const sql = (0, import_fs.readFileSync)(pathSQL).toString();
+          const snapshot = JSON.parse((0, import_fs3.readFileSync)(pathJson).toString());
+          const sql = (0, import_fs3.readFileSync)(pathSQL).toString();
           res2.entries.push({
             idx: res2.idx,
+            version: snapshot["version"],
             json: snapshot,
             date,
             sql,
-            path: path4
+            path: path2
           });
           res2.idx += 1;
           return res2;
@@ -16769,8 +17491,8 @@ var init_upFolders = __esm({
         }
       );
       const metaFolder = (0, import_path.join)(`${out}`, "meta");
-      if (!(0, import_fs.existsSync)(metaFolder)) {
-        (0, import_fs.mkdirSync)(metaFolder, { recursive: true });
+      if (!(0, import_fs3.existsSync)(metaFolder)) {
+        (0, import_fs3.mkdirSync)(metaFolder, { recursive: true });
       }
       const journal = dryJournal(dialect6);
       let prev = void 0;
@@ -16778,29 +17500,31 @@ var init_upFolders = __esm({
         const { prefix, suffix, tag } = prepareMigrationMetadata(it.idx);
         journal.entries.push({
           idx: it.idx,
+          version: it.version,
           when: +it.date,
           tag,
           breakpoints: false
         });
         const patchedJSON = fullfill(prev, it.json, it.sql, dialect6);
-        (0, import_fs.writeFileSync)(
+        (0, import_fs3.writeFileSync)(
           (0, import_path.join)(`${out}`, "meta", `${prefix}_snapshot.json`),
           JSON.stringify(patchedJSON)
         );
-        (0, import_fs.writeFileSync)((0, import_path.join)(`${out}`, `${tag}.sql`), it.sql);
-        (0, import_fs.rmSync)(it.path, { recursive: true });
+        (0, import_fs3.writeFileSync)((0, import_path.join)(`${out}`, `${tag}.sql`), it.sql);
+        (0, import_fs3.rmSync)(it.path, { recursive: true });
         prev = it.json;
       });
-      (0, import_fs.writeFileSync)((0, import_path.join)(metaFolder, "_journal.json"), JSON.stringify(journal));
+      (0, import_fs3.writeFileSync)((0, import_path.join)(metaFolder, "_journal.json"), JSON.stringify(journal));
     };
   }
 });
 
 // src/utils.ts
-var import_fs2, import_path2, assertV1OutFolder, dryJournal, snapshotsPriorV4, prepareOutFolder, mapValues, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
+var import_fs4, import_path2, assertV1OutFolder, dryJournal, snapshotsPriorV4, prepareOutFolder2, mapValues, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
 var init_utils = __esm({
   "src/utils.ts"() {
-    import_fs2 = require("fs");
+    "use strict";
+    import_fs4 = require("fs");
     init_views();
     init_mysqlSchema();
     init_pgSchema();
@@ -16811,9 +17535,9 @@ var init_utils = __esm({
     init_upFolders();
     init_snapshotsDiffer();
     assertV1OutFolder = (out, dialect6) => {
-      if (!(0, import_fs2.existsSync)(out))
+      if (!(0, import_fs4.existsSync)(out))
         return;
-      const oldMigrationFolders = (0, import_fs2.readdirSync)(out).filter(
+      const oldMigrationFolders = (0, import_fs4.readdirSync)(out).filter(
         (it) => it.length === 14 && /^\d+$/.test(it)
       );
       if (oldMigrationFolders.length > 0) {
@@ -16833,7 +17557,7 @@ var init_utils = __esm({
       };
     };
     snapshotsPriorV4 = (out) => {
-      const oldMigrationFolders = (0, import_fs2.readdirSync)(out).filter(
+      const oldMigrationFolders = (0, import_fs4.readdirSync)(out).filter(
         (it) => it.length === 14 && /^\d+$/.test(it)
       );
       oldMigrationFolders.sort();
@@ -16843,15 +17567,15 @@ var init_utils = __esm({
         return pathJson;
       });
     };
-    prepareOutFolder = (out, dialect6) => {
+    prepareOutFolder2 = (out, dialect6) => {
       const meta = (0, import_path2.join)(out, "meta");
       const journalPath = (0, import_path2.join)(meta, "_journal.json");
-      if (!(0, import_fs2.existsSync)((0, import_path2.join)(out, "meta"))) {
-        (0, import_fs2.mkdirSync)(meta, { recursive: true });
-        (0, import_fs2.writeFileSync)(journalPath, JSON.stringify(dryJournal(dialect6)));
+      if (!(0, import_fs4.existsSync)((0, import_path2.join)(out, "meta"))) {
+        (0, import_fs4.mkdirSync)(meta, { recursive: true });
+        (0, import_fs4.writeFileSync)(journalPath, JSON.stringify(dryJournal(dialect6)));
       }
-      const journal = JSON.parse((0, import_fs2.readFileSync)(journalPath).toString());
-      const snapshots = (0, import_fs2.readdirSync)(meta).filter((it) => !it.startsWith("_")).map((it) => (0, import_path2.join)(meta, it));
+      const journal = JSON.parse((0, import_fs4.readFileSync)(journalPath).toString());
+      const snapshots = (0, import_fs4.readdirSync)(meta).filter((it) => !it.startsWith("_")).map((it) => (0, import_path2.join)(meta, it));
       snapshots.sort();
       return { meta, snapshots, journal };
     };
@@ -16867,7 +17591,7 @@ var init_utils = __esm({
         case "pg":
           return { validator: backwardCompatiblePgSchema, version: 5 };
         case "sqlite":
-          return { validator: backwardCompatibleSqliteSchema, version: 4 };
+          return { validator: backwardCompatibleSqliteSchema, version: 5 };
         case "mysql":
           return { validator: backwardCompatibleMysqlSchema, version: 5 };
       }
@@ -16877,7 +17601,7 @@ var init_utils = __esm({
       const result = snapshots.reduce(
         (accum, it) => {
           var _a;
-          const raw = JSON.parse((0, import_fs2.readFileSync)(`./${it}`).toString());
+          const raw = JSON.parse((0, import_fs4.readFileSync)(`./${it}`).toString());
           accum.rawMap[it] = raw;
           if (raw["version"] && Number(raw["version"]) > version) {
             console.log(
@@ -16916,7 +17640,7 @@ var init_utils = __esm({
       return result;
     };
     prepareMigrationFolder = (outFolder = "drizzle", dialect6) => {
-      const { snapshots, journal } = prepareOutFolder(outFolder, dialect6);
+      const { snapshots, journal } = prepareOutFolder2(outFolder, dialect6);
       const report = validateWithReport(snapshots, dialect6);
       if (report.nonLatest.length > 0) {
         console.log(
@@ -17900,16 +18624,16 @@ var require_node2 = __commonJS({
       }
       exports2.urlGenerate = urlGenerate;
       function normalize(aPath) {
-        var path4 = aPath;
+        var path2 = aPath;
         var url = urlParse(aPath);
         if (url) {
           if (!url.path) {
             return aPath;
           }
-          path4 = url.path;
+          path2 = url.path;
         }
-        var isAbsolute = exports2.isAbsolute(path4);
-        var parts = path4.split(/\/+/);
+        var isAbsolute = exports2.isAbsolute(path2);
+        var parts = path2.split(/\/+/);
         for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
           part = parts[i];
           if (part === ".") {
@@ -17926,15 +18650,15 @@ var require_node2 = __commonJS({
             }
           }
         }
-        path4 = parts.join("/");
-        if (path4 === "") {
-          path4 = isAbsolute ? "/" : ".";
+        path2 = parts.join("/");
+        if (path2 === "") {
+          path2 = isAbsolute ? "/" : ".";
         }
         if (url) {
-          url.path = path4;
+          url.path = path2;
           return urlGenerate(url);
         }
-        return path4;
+        return path2;
       }
       exports2.normalize = normalize;
       function join22(aRoot, aPath) {
@@ -19464,7 +20188,7 @@ var require_node2 = __commonJS({
     });
     var require_source_map_support = __commonJS2((exports2, module22) => {
       var SourceMapConsumer = require_source_map().SourceMapConsumer;
-      var path4 = require("path");
+      var path2 = require("path");
       var fs32;
       try {
         fs32 = require("fs");
@@ -19537,15 +20261,15 @@ var require_node2 = __commonJS({
       function supportRelativeURL(file, url) {
         if (!file)
           return url;
-        var dir = path4.dirname(file);
+        var dir = path2.dirname(file);
         var match = /^\w+:\/\/[^\/]*/.exec(dir);
         var protocol = match ? match[0] : "";
         var startPath = dir.slice(protocol.length);
         if (protocol && /^\/\w\:/.test(startPath)) {
           protocol += "/";
-          return protocol + path4.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
+          return protocol + path2.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
         }
-        return protocol + path4.resolve(dir.slice(protocol.length), url);
+        return protocol + path2.resolve(dir.slice(protocol.length), url);
       }
       function retrieveSourceMapURL(source) {
         var fileData;
@@ -20340,9 +21064,9 @@ var require_node2 = __commonJS({
       "use strict";
       Object.defineProperty(exports2, "__esModule", { value: true });
       var fs32 = require("fs");
-      function fileExistsSync(path4) {
+      function fileExistsSync(path2) {
         try {
-          var stats = fs32.statSync(path4);
+          var stats = fs32.statSync(path2);
           return stats.isFile();
         } catch (err2) {
           return false;
@@ -20356,8 +21080,8 @@ var require_node2 = __commonJS({
         return require(packageJsonPath);
       }
       exports2.readJsonFromDiskSync = readJsonFromDiskSync;
-      function readJsonFromDiskAsync(path4, callback) {
-        fs32.readFile(path4, "utf8", function(err2, result) {
+      function readJsonFromDiskAsync(path2, callback) {
+        fs32.readFile(path2, "utf8", function(err2, result) {
           if (err2 || !result) {
             return callback();
           }
@@ -20366,8 +21090,8 @@ var require_node2 = __commonJS({
         });
       }
       exports2.readJsonFromDiskAsync = readJsonFromDiskAsync;
-      function fileExistsAsync(path22, callback2) {
-        fs32.stat(path22, function(err2, stats) {
+      function fileExistsAsync(path2, callback2) {
+        fs32.stat(path2, function(err2, stats) {
           if (err2) {
             return callback2(void 0, false);
           }
@@ -20375,15 +21099,15 @@ var require_node2 = __commonJS({
         });
       }
       exports2.fileExistsAsync = fileExistsAsync;
-      function removeExtension(path4) {
-        return path4.substring(0, path4.lastIndexOf(".")) || path4;
+      function removeExtension(path2) {
+        return path2.substring(0, path2.lastIndexOf(".")) || path2;
       }
       exports2.removeExtension = removeExtension;
     });
     var require_mapping_entry = __commonJS2((exports2) => {
       "use strict";
       Object.defineProperty(exports2, "__esModule", { value: true });
-      var path4 = require("path");
+      var path2 = require("path");
       function getAbsoluteMappingEntries(absoluteBaseUrl, paths, addMatchAll) {
         var sortedKeys = sortByLongestPrefix(Object.keys(paths));
         var absolutePaths = [];
@@ -20392,7 +21116,7 @@ var require_node2 = __commonJS({
           absolutePaths.push({
             pattern: key,
             paths: paths[key].map(function(pathToResolve) {
-              return path4.join(absoluteBaseUrl, pathToResolve);
+              return path2.join(absoluteBaseUrl, pathToResolve);
             })
           });
         }
@@ -20418,11 +21142,11 @@ var require_node2 = __commonJS({
     var require_try_path = __commonJS2((exports2) => {
       "use strict";
       Object.defineProperty(exports2, "__esModule", { value: true });
-      var path4 = require("path");
+      var path2 = require("path");
       var path_1 = require("path");
       var filesystem_1 = require_filesystem();
       function getPathsToTry(extensions, absolutePathMappings, requestedModule) {
-        if (!absolutePathMappings || !requestedModule || requestedModule[0] === "." || requestedModule[0] === path4.sep) {
+        if (!absolutePathMappings || !requestedModule || requestedModule[0] === "." || requestedModule[0] === path2.sep) {
           return void 0;
         }
         var pathsToTry = [];
@@ -20438,9 +21162,9 @@ var require_node2 = __commonJS({
               }));
               pathsToTry.push({
                 type: "package",
-                path: path4.join(physicalPath, "/package.json")
+                path: path2.join(physicalPath, "/package.json")
               });
-              var indexPath = path4.join(physicalPath, "/index");
+              var indexPath = path2.join(physicalPath, "/index");
               pathsToTry.push.apply(pathsToTry, extensions.map(function(e) {
                 return { type: "index", path: indexPath + e };
               }));
@@ -20487,7 +21211,7 @@ var require_node2 = __commonJS({
     var require_match_path_sync = __commonJS2((exports2) => {
       "use strict";
       Object.defineProperty(exports2, "__esModule", { value: true });
-      var path4 = require("path");
+      var path2 = require("path");
       var Filesystem = require_filesystem();
       var MappingEntry = require_mapping_entry();
       var TryPath = require_try_path();
@@ -20529,7 +21253,7 @@ var require_node2 = __commonJS({
           var mainFieldName = mainFields[index4];
           var candidateMapping = packageJson[mainFieldName];
           if (candidateMapping && typeof candidateMapping === "string") {
-            var candidateFilePath = path4.join(path4.dirname(packageJsonPath), candidateMapping);
+            var candidateFilePath = path2.join(path2.dirname(packageJsonPath), candidateMapping);
             if (fileExists(candidateFilePath)) {
               return candidateFilePath;
             }
@@ -20568,7 +21292,7 @@ var require_node2 = __commonJS({
     var require_match_path_async = __commonJS2((exports2) => {
       "use strict";
       Object.defineProperty(exports2, "__esModule", { value: true });
-      var path4 = require("path");
+      var path2 = require("path");
       var TryPath = require_try_path();
       var MappingEntry = require_mapping_entry();
       var Filesystem = require_filesystem();
@@ -20619,7 +21343,7 @@ var require_node2 = __commonJS({
         if (typeof mainFieldMapping !== "string") {
           return tryNext();
         }
-        var mappedFilePath = path4.join(path4.dirname(packageJsonPath), mainFieldMapping);
+        var mappedFilePath = path2.join(path2.dirname(packageJsonPath), mainFieldMapping);
         fileExistsAsync(mappedFilePath, function(err2, exists) {
           if (err2) {
             return doneCallback(err2);
@@ -21839,7 +22563,7 @@ var require_node2 = __commonJS({
         return t;
       };
       Object.defineProperty(exports2, "__esModule", { value: true });
-      var path4 = require("path");
+      var path2 = require("path");
       var fs32 = require("fs");
       var JSON5 = require_lib32();
       var StripBom = require_strip_bom();
@@ -21869,24 +22593,24 @@ var require_node2 = __commonJS({
       }
       function resolveConfigPath(cwd, filename) {
         if (filename) {
-          var absolutePath = fs32.lstatSync(filename).isDirectory() ? path4.resolve(filename, "./tsconfig.json") : path4.resolve(cwd, filename);
+          var absolutePath = fs32.lstatSync(filename).isDirectory() ? path2.resolve(filename, "./tsconfig.json") : path2.resolve(cwd, filename);
           return absolutePath;
         }
         if (fs32.statSync(cwd).isFile()) {
-          return path4.resolve(cwd);
+          return path2.resolve(cwd);
         }
         var configAbsolutePath = walkForTsConfig(cwd);
-        return configAbsolutePath ? path4.resolve(configAbsolutePath) : void 0;
+        return configAbsolutePath ? path2.resolve(configAbsolutePath) : void 0;
       }
       function walkForTsConfig(directory, existsSync4) {
         if (existsSync4 === void 0) {
           existsSync4 = fs32.existsSync;
         }
-        var configPath = path4.join(directory, "./tsconfig.json");
+        var configPath = path2.join(directory, "./tsconfig.json");
         if (existsSync4(configPath)) {
           return configPath;
         }
-        var parentDirectory = path4.join(directory, "../");
+        var parentDirectory = path2.join(directory, "../");
         if (directory === parentDirectory) {
           return void 0;
         }
@@ -21913,15 +22637,15 @@ var require_node2 = __commonJS({
           if (typeof extendedConfig === "string" && extendedConfig.indexOf(".json") === -1) {
             extendedConfig += ".json";
           }
-          var currentDir = path4.dirname(configFilePath);
-          var extendedConfigPath = path4.join(currentDir, extendedConfig);
+          var currentDir = path2.dirname(configFilePath);
+          var extendedConfigPath = path2.join(currentDir, extendedConfig);
           if (extendedConfig.indexOf("/") !== -1 && extendedConfig.indexOf(".") !== -1 && !existsSync4(extendedConfigPath)) {
-            extendedConfigPath = path4.join(currentDir, "node_modules", extendedConfig);
+            extendedConfigPath = path2.join(currentDir, "node_modules", extendedConfig);
           }
           var base = loadTsconfig(extendedConfigPath, existsSync4, readFileSync4) || {};
           if (base.compilerOptions && base.compilerOptions.baseUrl) {
-            var extendsDir = path4.dirname(extendedConfig);
-            base.compilerOptions.baseUrl = path4.join(extendsDir, base.compilerOptions.baseUrl);
+            var extendsDir = path2.dirname(extendedConfig);
+            base.compilerOptions.baseUrl = path2.join(extendsDir, base.compilerOptions.baseUrl);
           }
           return __assign({}, base, config, { compilerOptions: __assign({}, base.compilerOptions, config.compilerOptions) });
         }
@@ -22146,7 +22870,7 @@ var require_node2 = __commonJS({
       "use strict";
       Object.defineProperty(exports2, "__esModule", { value: true });
       var TsConfigLoader = require_tsconfig_loader();
-      var path4 = require("path");
+      var path2 = require("path");
       var options_1 = require_options();
       function loadConfig2(cwd) {
         if (cwd === void 0) {
@@ -22158,7 +22882,7 @@ var require_node2 = __commonJS({
       function configLoader(_a) {
         var cwd = _a.cwd, explicitParams = _a.explicitParams, _b = _a.tsConfigLoader, tsConfigLoader = _b === void 0 ? TsConfigLoader.tsConfigLoader : _b;
         if (explicitParams) {
-          var absoluteBaseUrl_1 = path4.isAbsolute(explicitParams.baseUrl) ? explicitParams.baseUrl : path4.join(cwd, explicitParams.baseUrl);
+          var absoluteBaseUrl_1 = path2.isAbsolute(explicitParams.baseUrl) ? explicitParams.baseUrl : path2.join(cwd, explicitParams.baseUrl);
           return {
             resultType: "success",
             configFileAbsolutePath: "",
@@ -22187,8 +22911,8 @@ var require_node2 = __commonJS({
             message: "Missing baseUrl in compilerOptions"
           };
         }
-        var tsConfigDir = path4.dirname(loadResult.tsConfigPath);
-        var absoluteBaseUrl = path4.join(tsConfigDir, loadResult.baseUrl);
+        var tsConfigDir = path2.dirname(loadResult.tsConfigPath);
+        var absoluteBaseUrl = path2.join(tsConfigDir, loadResult.baseUrl);
         return {
           resultType: "success",
           configFileAbsolutePath: loadResult.tsConfigPath,
@@ -22389,8 +23113,8 @@ var require_node2 = __commonJS({
     });
     var getOptions = (cwd) => {
       var _a, _b, _c, _d;
-      const { data, path: path4 } = joycon.loadSync(["tsconfig.json", "jsconfig.json"], cwd);
-      if (path4 && data) {
+      const { data, path: path2 } = joycon.loadSync(["tsconfig.json", "jsconfig.json"], cwd);
+      if (path2 && data) {
         return {
           jsxFactory: (_a = data.compilerOptions) == null ? void 0 : _a.jsxFactory,
           jsxFragment: (_b = data.compilerOptions) == null ? void 0 : _b.jsxFragmentFactory,
@@ -23056,8 +23780,8 @@ var require_minimatch = __commonJS({
       return new Minimatch(pattern, options).match(p);
     };
     module2.exports = minimatch;
-    var path4 = require_path();
-    minimatch.sep = path4.sep;
+    var path2 = require_path();
+    minimatch.sep = path2.sep;
     var GLOBSTAR = Symbol("globstar **");
     minimatch.GLOBSTAR = GLOBSTAR;
     var expand = require_brace_expansion();
@@ -23573,8 +24297,8 @@ var require_minimatch = __commonJS({
         if (f === "/" && partial)
           return true;
         const options = this.options;
-        if (path4.sep !== "/") {
-          f = f.split(path4.sep).join("/");
+        if (path2.sep !== "/") {
+          f = f.split(path2.sep).join("/");
         }
         f = f.split(slashSplit);
         this.debug(this.pattern, "split", f);
@@ -23672,7 +24396,7 @@ var require_common2 = __commonJS({
       return Object.prototype.hasOwnProperty.call(obj, field);
     }
     var fs7 = require("fs");
-    var path4 = require("path");
+    var path2 = require("path");
     var minimatch = require_minimatch();
     var isAbsolute = require("path").isAbsolute;
     var Minimatch = minimatch.Minimatch;
@@ -23739,13 +24463,13 @@ var require_common2 = __commonJS({
       self2.changedCwd = false;
       var cwd = process.cwd();
       if (!ownProp(options, "cwd"))
-        self2.cwd = path4.resolve(cwd);
+        self2.cwd = path2.resolve(cwd);
       else {
-        self2.cwd = path4.resolve(options.cwd);
+        self2.cwd = path2.resolve(options.cwd);
         self2.changedCwd = self2.cwd !== cwd;
       }
-      self2.root = options.root || path4.resolve(self2.cwd, "/");
-      self2.root = path4.resolve(self2.root);
+      self2.root = options.root || path2.resolve(self2.cwd, "/");
+      self2.root = path2.resolve(self2.root);
       self2.cwdAbs = isAbsolute(self2.cwd) ? self2.cwd : makeAbs(self2, self2.cwd);
       self2.nomount = !!options.nomount;
       if (process.platform === "win32") {
@@ -23827,30 +24551,30 @@ var require_common2 = __commonJS({
     function makeAbs(self2, f) {
       var abs = f;
       if (f.charAt(0) === "/") {
-        abs = path4.join(self2.root, f);
+        abs = path2.join(self2.root, f);
       } else if (isAbsolute(f) || f === "") {
         abs = f;
       } else if (self2.changedCwd) {
-        abs = path4.resolve(self2.cwd, f);
+        abs = path2.resolve(self2.cwd, f);
       } else {
-        abs = path4.resolve(f);
+        abs = path2.resolve(f);
       }
       if (process.platform === "win32")
         abs = abs.replace(/\\/g, "/");
       return abs;
     }
-    function isIgnored(self2, path5) {
+    function isIgnored(self2, path3) {
       if (!self2.ignore.length)
         return false;
       return self2.ignore.some(function(item) {
-        return item.matcher.match(path5) || !!(item.gmatcher && item.gmatcher.match(path5));
+        return item.matcher.match(path3) || !!(item.gmatcher && item.gmatcher.match(path3));
       });
     }
-    function childrenIgnored(self2, path5) {
+    function childrenIgnored(self2, path3) {
       if (!self2.ignore.length)
         return false;
       return self2.ignore.some(function(item) {
-        return !!(item.gmatcher && item.gmatcher.match(path5));
+        return !!(item.gmatcher && item.gmatcher.match(path3));
       });
     }
   }
@@ -23866,7 +24590,7 @@ var require_sync = __commonJS({
     var Minimatch = minimatch.Minimatch;
     var Glob = require_glob().Glob;
     var util2 = require("util");
-    var path4 = require("path");
+    var path2 = require("path");
     var assert = require("assert");
     var isAbsolute = require("path").isAbsolute;
     var common = require_common2();
@@ -23994,7 +24718,7 @@ var require_sync = __commonJS({
               e = prefix + e;
           }
           if (e.charAt(0) === "/" && !this.nomount) {
-            e = path4.join(this.root, e);
+            e = path2.join(this.root, e);
           }
           this._emitMatch(index4, e);
         }
@@ -24143,9 +24867,9 @@ var require_sync = __commonJS({
       if (prefix && isAbsolute(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
-          prefix = path4.join(this.root, prefix);
+          prefix = path2.join(this.root, prefix);
         } else {
-          prefix = path4.resolve(this.root, prefix);
+          prefix = path2.resolve(this.root, prefix);
           if (trail)
             prefix += "/";
         }
@@ -24340,7 +25064,7 @@ var require_glob = __commonJS({
     var Minimatch = minimatch.Minimatch;
     var inherits = require_inherits();
     var EE = require("events").EventEmitter;
-    var path4 = require("path");
+    var path2 = require("path");
     var assert = require("assert");
     var isAbsolute = require("path").isAbsolute;
     var globSync = require_sync();
@@ -24623,7 +25347,7 @@ var require_glob = __commonJS({
               e = prefix + e;
           }
           if (e.charAt(0) === "/" && !this.nomount) {
-            e = path4.join(this.root, e);
+            e = path2.join(this.root, e);
           }
           this._emitMatch(index4, e);
         }
@@ -24810,9 +25534,9 @@ var require_glob = __commonJS({
       if (prefix && isAbsolute(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
-          prefix = path4.join(this.root, prefix);
+          prefix = path2.join(this.root, prefix);
         } else {
-          prefix = path4.resolve(this.root, prefix);
+          prefix = path2.resolve(this.root, prefix);
           if (trail)
             prefix += "/";
         }
@@ -24894,6 +25618,7 @@ __export(mysqlImports_exports, {
 var import_mysql_core, prepareFromMySqlImports;
 var init_mysqlImports = __esm({
   "src/serializer/mysqlImports.ts"() {
+    "use strict";
     import_mysql_core = require("drizzle-orm/mysql-core");
     prepareFromMySqlImports = (imports) => {
       const tables = [];
@@ -24934,20 +25659,21 @@ function clearDefaults(defaultValue, collate) {
   if (defaultValue.startsWith(collate)) {
     resultDefault = resultDefault.substring(collate.length, defaultValue.length).replace(/\\/g, "");
     if (resultDefault.startsWith("'") && resultDefault.endsWith("'")) {
-      return `("${resultDefault.substring(1, resultDefault.length - 1)}")`;
+      return `('${resultDefault.substring(1, resultDefault.length - 1)}')`;
     } else {
-      return `("${resultDefault}")`;
+      return `('${resultDefault}')`;
     }
   } else {
     return `(${resultDefault})`;
   }
 }
-var import_mysql_core2, import_table, import_utils7, import_sql, import_common, import_date, dialect3, indexName, generateMySqlSnapshot, fromDatabase;
+var import_mysql_core2, import_table, import_utils9, import_sql, import_common, import_date, dialect3, indexName, generateMySqlSnapshot, fromDatabase;
 var init_mysqlSerializer = __esm({
   "src/serializer/mysqlSerializer.ts"() {
+    "use strict";
     import_mysql_core2 = require("drizzle-orm/mysql-core");
     import_table = require("drizzle-orm/table");
-    import_utils7 = require("drizzle-orm/mysql-core/utils");
+    import_utils9 = require("drizzle-orm/mysql-core/utils");
     import_sql = require("drizzle-orm/sql");
     import_common = require("drizzle-orm/mysql-core/columns/common");
     import_date = require("drizzle-orm/mysql-core/columns/date.common");
@@ -24963,11 +25689,13 @@ var init_mysqlSerializer = __esm({
           columns,
           indexes,
           foreignKeys,
-          schema: schema4
-        } = (0, import_utils7.getTableConfig)(table4);
+          schema: schema4,
+          primaryKeys
+        } = (0, import_utils9.getTableConfig)(table4);
         const columnsObject = {};
         const indexesObject = {};
         const foreignKeysObject = {};
+        const primaryKeysObject = {};
         columns.forEach((column6) => {
           const notNull = column6.notNull;
           const primaryKey = column6.primary;
@@ -24990,23 +25718,34 @@ var init_mysqlSerializer = __esm({
               }).join();
             } else {
               if (typeof column6.default === "string") {
-                columnToSet.default = `"${column6.default}"`;
+                columnToSet.default = `'${column6.default}'`;
               } else {
                 if (sqlTypeLowered === "json") {
                   columnToSet.default = `'${JSON.stringify(column6.default)}'`;
                 } else if (column6.default instanceof Date) {
-                  columnToSet.default = `'${column6.default.toISOString()}'`;
+                  if (sqlTypeLowered === "date") {
+                    columnToSet.default = `'${column6.default.toISOString().split("T")[0]}'`;
+                  } else if (sqlTypeLowered.startsWith("datetime") || sqlTypeLowered.startsWith("timestamp")) {
+                    columnToSet.default = `'${column6.default.toISOString().replace("T", " ").slice(0, 23)}'`;
+                  }
                 } else {
                   columnToSet.default = column6.default;
                 }
               }
-            }
-            if (["blob", "text", "json"].includes(column6.getSQLType())) {
-              columnToSet.default = `(${columnToSet.default})`;
+              if (["blob", "text", "json"].includes(column6.getSQLType())) {
+                columnToSet.default = `(${columnToSet.default})`;
+              }
             }
           }
           columnsObject[column6.name] = columnToSet;
         });
+        primaryKeys.map((pk) => {
+          const columnNames = pk.columns.map((c) => c.name);
+          primaryKeysObject[`${tableName}_${columnNames.join("_")}`] = {
+            name: `${tableName}_${columnNames.join("_")}`,
+            columns: columnNames
+          };
+        });
         const fks = foreignKeys.map((fk4) => {
           const name = fk4.getName();
           const tableFrom = tableName;
@@ -25055,7 +25794,8 @@ var init_mysqlSerializer = __esm({
           schema: schema4,
           columns: columnsObject,
           indexes: indexesObject,
-          foreignKeys: foreignKeysObject
+          foreignKeys: foreignKeysObject,
+          compositePrimaryKeys: primaryKeysObject
         };
       }
       const schemas = Object.fromEntries(
@@ -25084,13 +25824,18 @@ var init_mysqlSerializer = __esm({
       let tablesCount = /* @__PURE__ */ new Set();
       let indexesCount = 0;
       let foreignKeysCount = 0;
+      const tableToPk = {};
       for (const column6 of response) {
         columnsCount += 1;
-        progressCallback("columns", columnsCount, "fetching");
+        if (progressCallback) {
+          progressCallback("columns", columnsCount, "fetching");
+        }
         const schema4 = column6["TABLE_SCHEMA"];
         const tableName = column6["TABLE_NAME"];
         tablesCount.add(`${schema4}.${tableName}`);
-        progressCallback("columns", tablesCount.size, "fetching");
+        if (progressCallback) {
+          progressCallback("columns", tablesCount.size, "fetching");
+        }
         const columnName = column6["COLUMN_NAME"];
         const isNullable = column6["IS_NULLABLE"] === "YES";
         const dataType = column6["DATA_TYPE"];
@@ -25100,16 +25845,27 @@ var init_mysqlSerializer = __esm({
         const isDefaultAnExpression = column6["EXTRA"] === "DEFAULT_GENERATED";
         const columnDefault = column6["COLUMN_DEFAULT"];
         const collation = column6["CHARACTER_SET_NAME"];
+        if (isPrimary) {
+          if (typeof tableToPk[tableName] === "undefined") {
+            tableToPk[tableName] = [columnName];
+          } else {
+            tableToPk[tableName].push(columnName);
+          }
+        }
         if (schema4 !== inputSchema) {
           schemas.push(schema4);
         }
         const table4 = result[tableName];
+        let changedType = columnType.replace("bigint unsigned", "serial");
+        if (columnType.startsWith("tinyint")) {
+          changedType = "tinyint";
+        }
         const newColumn = {
-          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `"${columnDefault}"`,
+          default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) ? Number(columnDefault) : isDefaultAnExpression ? clearDefaults(columnDefault, collation) : `'${columnDefault}'`,
           autoincrement: isAutoincrement,
           name: columnName,
-          type: columnType.replace("bigint unsigned", "serial"),
-          primaryKey: isPrimary,
+          type: changedType,
+          primaryKey: false,
           notNull: !isNullable
         };
         if (!table4) {
@@ -25119,6 +25875,7 @@ var init_mysqlSerializer = __esm({
             columns: {
               [columnName]: newColumn
             },
+            compositePrimaryKeys: {},
             indexes: {},
             foreignKeys: {}
           };
@@ -25126,8 +25883,23 @@ var init_mysqlSerializer = __esm({
           result[tableName].columns[columnName] = newColumn;
         }
       }
-      progressCallback("columns", columnsCount, "done");
-      progressCallback("tables", tablesCount.size, "done");
+      for (const [key, value] of Object.entries(tableToPk)) {
+        if (value.length > 1) {
+          result[key].compositePrimaryKeys = {
+            [`${key}_${value.join("_")}`]: {
+              name: `${key}_${value.join("_")}`,
+              columns: value
+            }
+          };
+        } else if (value.length === 1) {
+          result[key].columns[value[0]].primaryKey = true;
+        } else {
+        }
+      }
+      if (progressCallback) {
+        progressCallback("columns", columnsCount, "done");
+        progressCallback("tables", tablesCount.size, "done");
+      }
       try {
         const fks = await db.execute(
           `SELECT INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.COLUMN_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME,information_schema.referential_constraints.UPDATE_RULE, information_schema.referential_constraints.DELETE_RULE
@@ -25140,7 +25912,9 @@ var init_mysqlSerializer = __esm({
         const fkRows = fks[0];
         for (const fkRow of fkRows) {
           foreignKeysCount += 1;
-          progressCallback("fks", foreignKeysCount, "fetching");
+          if (progressCallback) {
+            progressCallback("fks", foreignKeysCount, "fetching");
+          }
           const tableSchema = fkRow["TABLE_SCHEMA"];
           const tableName = fkRow["TABLE_NAME"];
           const constraintName = fkRow["CONSTRAINT_NAME"];
@@ -25179,7 +25953,9 @@ var init_mysqlSerializer = __esm({
       } catch (e) {
         console.log(`Can't proccess foreign keys`);
       }
-      progressCallback("fks", foreignKeysCount, "done");
+      if (progressCallback) {
+        progressCallback("fks", foreignKeysCount, "done");
+      }
       const idxs = await db.execute(
         `select * from INFORMATION_SCHEMA.STATISTICS
 	WHERE INFORMATION_SCHEMA.STATISTICS.TABLE_SCHEMA = ? and INFORMATION_SCHEMA.STATISTICS.INDEX_NAME != 'PRIMARY';`,
@@ -25198,7 +25974,9 @@ var init_mysqlSerializer = __esm({
         if (tableInResult.columns[columnName].type === "serial")
           continue;
         indexesCount += 1;
-        progressCallback("indexes", indexesCount, "fetching");
+        if (progressCallback) {
+          progressCallback("indexes", indexesCount, "fetching");
+        }
         if (typeof tableInResult.indexes[constraintName] !== "undefined") {
           tableInResult.indexes[constraintName].columns.push(columnName);
         } else {
@@ -25209,8 +25987,10 @@ var init_mysqlSerializer = __esm({
           };
         }
       }
-      progressCallback("indexes", indexesCount, "done");
-      progressCallback("enums", 0, "done");
+      if (progressCallback) {
+        progressCallback("indexes", indexesCount, "done");
+        progressCallback("enums", 0, "done");
+      }
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
         version: "5",
@@ -25235,6 +26015,7 @@ __export(pgImports_exports, {
 var import_pg_core, prepareFromPgImports;
 var init_pgImports = __esm({
   "src/serializer/pgImports.ts"() {
+    "use strict";
     import_pg_core = require("drizzle-orm/pg-core");
     prepareFromPgImports = (imports) => {
       const tables = [];
@@ -25270,11 +26051,12 @@ __export(pgSerializer_exports, {
   generatePgSnapshot: () => generatePgSnapshot,
   indexName: () => indexName2
 });
-var import_pg_core2, import_utils8, import_sql2, import_table2, dialect4, indexName2, generatePgSnapshot, fromDatabase2, defaultForColumn;
+var import_pg_core2, import_utils10, import_sql2, import_table2, dialect4, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
+    "use strict";
     import_pg_core2 = require("drizzle-orm/pg-core");
-    import_utils8 = require("drizzle-orm/pg-core/utils");
+    import_utils10 = require("drizzle-orm/pg-core/utils");
     import_sql2 = require("drizzle-orm/sql");
     import_table2 = require("drizzle-orm/table");
     dialect4 = new import_pg_core2.PgDialect();
@@ -25290,11 +26072,13 @@ var init_pgSerializer = __esm({
           indexes,
           foreignKeys,
           checks,
-          schema: schema4
-        } = (0, import_utils8.getTableConfig)(table4);
+          schema: schema4,
+          primaryKeys
+        } = (0, import_utils10.getTableConfig)(table4);
         const columnsObject = {};
         const indexesObject = {};
         const foreignKeysObject = {};
+        const primaryKeysObject = {};
         columns.forEach((column6) => {
           const notNull = column6.notNull;
           const primaryKey = column6.primary;
@@ -25322,7 +26106,13 @@ var init_pgSerializer = __esm({
                     column6.default
                   )}'::${sqlTypeLowered}`;
                 } else if (column6.default instanceof Date) {
-                  columnToSet.default = `'${column6.default.toISOString()}'`;
+                  if (sqlTypeLowered === "date") {
+                    columnToSet.default = `'${column6.default.toISOString().split("T")[0]}'`;
+                  } else if (sqlTypeLowered === "timestamp") {
+                    columnToSet.default = `'${column6.default.toISOString().replace("T", " ").slice(0, 23)}'`;
+                  } else {
+                    columnToSet.default = `'${column6.default.toISOString()}'`;
+                  }
                 } else {
                   columnToSet.default = column6.default;
                 }
@@ -25331,6 +26121,13 @@ var init_pgSerializer = __esm({
           }
           columnsObject[column6.name] = columnToSet;
         });
+        primaryKeys.map((pk) => {
+          const columnNames = pk.columns.map((c) => c.name);
+          primaryKeysObject[`${tableName}_${columnNames.join("_")}`] = {
+            name: `${tableName}_${columnNames.join("_")}`,
+            columns: columnNames
+          };
+        });
         const fks = foreignKeys.map((fk4) => {
           const name = fk4.getName();
           const tableFrom = tableName;
@@ -25379,7 +26176,8 @@ var init_pgSerializer = __esm({
           schema: schema4 != null ? schema4 : "",
           columns: columnsObject,
           indexes: indexesObject,
-          foreignKeys: foreignKeysObject
+          foreignKeys: foreignKeysObject,
+          compositePrimaryKeys: primaryKeysObject
         };
       }
       const enumsToReturn = enums.reduce((map, obj) => {
@@ -25407,16 +26205,25 @@ var init_pgSerializer = __esm({
         }
       };
     };
+    trimChar = (str, char) => {
+      let start = 0;
+      let end = str.length;
+      while (start < end && str[start] === char)
+        ++start;
+      while (end > start && str[end - 1] === char)
+        --end;
+      return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
+    };
     fromDatabase2 = async (db, progressCallback) => {
       const result = {};
       const allTables = await db.query(
         `SELECT table_schema, table_name FROM information_schema.tables WHERE table_schema = 'public';`
       );
-      const schemas = new Set(
-        allTables.rows.map((it) => it.table_schema)
-      );
+      const schemas = new Set(allTables.rows.map((it) => it.table_schema));
       schemas.delete("public");
-      progressCallback("tables", allTables.rows.length, "done");
+      if (progressCallback) {
+        progressCallback("tables", allTables.rows.length, "done");
+      }
       let columnsCount = 0;
       let indexesCount = 0;
       let foreignKeysCount = 0;
@@ -25428,8 +26235,9 @@ var init_pgSerializer = __esm({
             const columnToReturn = {};
             const indexToReturn = {};
             const foreignKeysToReturn = {};
+            const primaryKeys = {};
             const tableResponse = await db.query(
-              `SELECT a.attrelid::regclass::text, a.attname, is_nullable
+              `SELECT a.attrelid::regclass::text, a.attname, is_nullable, a.attndims as array_dimensions
       , CASE WHEN a.atttypid = ANY ('{int,int8,int2}'::regtype[])
            AND EXISTS (
               SELECT FROM pg_attrdef ad
@@ -25447,7 +26255,7 @@ var init_pgSerializer = __esm({
                  WHEN 'int2'::regtype THEN 'smallserial'
               END
          ELSE format_type(a.atttypid, a.atttypmod)
-         END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, INFORMATION_SCHEMA.COLUMNS.column_name, INFORMATION_SCHEMA.COLUMNS.column_default
+         END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, INFORMATION_SCHEMA.COLUMNS.column_name, INFORMATION_SCHEMA.COLUMNS.column_default, INFORMATION_SCHEMA.COLUMNS.data_type as additional_dt
  FROM  pg_attribute  a
  JOIN INFORMATION_SCHEMA.COLUMNS ON INFORMATION_SCHEMA.COLUMNS.column_name = a.attname
  WHERE  a.attrelid = '"${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}'
@@ -25464,7 +26272,9 @@ var init_pgSerializer = __esm({
     WHERE tc.table_name = '${tableName}';`
             );
             columnsCount += tableResponse.rows.length;
-            progressCallback("columns", columnsCount, "fetching");
+            if (progressCallback) {
+              progressCallback("columns", columnsCount, "fetching");
+            }
             const tableForeignKeys = await db.query(
               `SELECT
       tc.table_schema,
@@ -25488,7 +26298,9 @@ var init_pgSerializer = __esm({
   WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='${tableName}';`
             );
             foreignKeysCount += tableForeignKeys.rows.length;
-            progressCallback("fks", foreignKeysCount, "fetching");
+            if (progressCallback) {
+              progressCallback("fks", foreignKeysCount, "fetching");
+            }
             for (const fk4 of tableForeignKeys.rows) {
               const columnFrom = fk4.column_name;
               const tableTo = fk4.foreign_table_name;
@@ -25519,19 +26331,49 @@ var init_pgSerializer = __esm({
             }
             for (const columnResponse of tableResponse.rows) {
               const columnName = columnResponse.attname;
-              const columnType = columnResponse.data_type;
+              const columnAdditionalDT = columnResponse.additional_dt;
+              const columnDimensions = columnResponse.array_dimensions;
+              let columnType = columnResponse.data_type;
               const primaryKey = tableConstraints.rows.filter(
-                (mapRow) => columnName === mapRow.column_name && mapRow.constraint_type === "PRIMARY KEY"
+                (mapRow) => mapRow.constraint_type === "PRIMARY KEY"
+              );
+              const cprimaryKey = tableConstraints.rows.filter(
+                (mapRow) => mapRow.constraint_type === "PRIMARY KEY"
               );
+              if (cprimaryKey.length > 1) {
+                const tableCompositePkName = await db.query(
+                  `SELECT conname AS primary_key
+              FROM   pg_constraint 
+              WHERE  contype = 'p' 
+              AND    connamespace = 'public'::regnamespace  
+              AND    conrelid::regclass::text = $1;`,
+                  [tableName]
+                );
+                primaryKeys[`${tableName}_${cprimaryKey.map((pk) => pk.column_name).join("_")}`] = {
+                  name: tableCompositePkName.rows[0].primary_key,
+                  columns: cprimaryKey.map((c) => c.column_name)
+                };
+              }
               const uniqueKey = tableConstraints.rows.filter(
                 (mapRow) => columnName === mapRow.column_name && mapRow.constraint_type === "UNIQUE"
               );
               const defaultValue = defaultForColumn(columnResponse);
               const isSerial = columnType === "serial";
+              let columnTypeMapped = columnType;
+              if (columnTypeMapped.startsWith("numeric(")) {
+                columnTypeMapped = columnTypeMapped.replace(",", ", ");
+              }
+              if (columnAdditionalDT === "ARRAY") {
+                for (let i = 1; i < Number(columnDimensions); i++) {
+                  columnTypeMapped += "[]";
+                }
+              }
+              columnTypeMapped = columnTypeMapped.replace("character varying", "varchar").replace(" without time zone", "").replace("character", "char");
+              columnTypeMapped = trimChar(columnTypeMapped, '"');
               columnToReturn[columnName] = {
                 name: columnName,
-                type: columnType.replace("character varying", "varchar").trimChar('"'),
-                primaryKey: !!primaryKey[0],
+                type: columnTypeMapped,
+                primaryKey: primaryKey.length === 1 && cprimaryKey.length < 1,
                 notNull: columnResponse.is_nullable === "NO"
               };
               if (!isSerial && typeof defaultValue !== "undefined") {
@@ -25576,13 +26418,16 @@ var init_pgSerializer = __esm({
               }
             }
             indexesCount += Object.keys(indexToReturn).length;
-            progressCallback("indexes", indexesCount, "fetching");
+            if (progressCallback) {
+              progressCallback("indexes", indexesCount, "fetching");
+            }
             result[tableName] = {
               name: tableName,
               schema: tableSchema !== "public" ? tableSchema : "",
               columns: columnToReturn,
               indexes: indexToReturn,
-              foreignKeys: foreignKeysToReturn
+              foreignKeys: foreignKeysToReturn,
+              compositePrimaryKeys: primaryKeys
             };
           } catch (e) {
             rej(e);
@@ -25593,9 +26438,11 @@ var init_pgSerializer = __esm({
       });
       for await (const _ of all) {
       }
-      progressCallback("columns", columnsCount, "done");
-      progressCallback("indexes", indexesCount, "done");
-      progressCallback("fks", foreignKeysCount, "done");
+      if (progressCallback) {
+        progressCallback("columns", columnsCount, "done");
+        progressCallback("indexes", indexesCount, "done");
+        progressCallback("fks", foreignKeysCount, "done");
+      }
       const allEnums = await db.query(
         `select n.nspname as enum_schema,
   t.typname as enum_name,
@@ -25617,7 +26464,9 @@ var init_pgSerializer = __esm({
           };
         }
       }
-      progressCallback("enums", Object.keys(enumsToReturn).length, "done");
+      if (progressCallback) {
+        progressCallback("enums", Object.keys(enumsToReturn).length, "done");
+      }
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
         version: "5",
@@ -25632,12 +26481,47 @@ var init_pgSerializer = __esm({
         }
       };
     };
+    columnToDefault = {
+      "numeric(": "::numeric",
+      "time without time zone": "::time without time zone",
+      "timestamp without time zone": "::timestamp without time zone",
+      "character(": "::bpchar"
+    };
     defaultForColumn = (column6) => {
       if (column6.data_type === "serial" || column6.data_type === "smallserial" || column6.data_type === "bigserial") {
         return void 0;
       }
-      const defaultValue = column6.column_default === null ? void 0 : column6.column_default;
-      return defaultValue;
+      const hasDifferentDefaultCast = Object.keys(columnToDefault).find(
+        (it) => column6.data_type.startsWith(it)
+      );
+      if (column6.column_default === null) {
+        return void 0;
+      }
+      const columnDefaultAsString = column6.column_default.toString();
+      if (columnDefaultAsString.endsWith(
+        hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : column6.data_type
+      )) {
+        const nonPrefixPart = column6.column_default.length - (hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : `::${column6.data_type}`).length - 1;
+        const rt = column6.column_default.toString().substring(1, nonPrefixPart);
+        if (/^-?[\d.]+(?:e-?\d+)?$/.test(rt) && !column6.data_type.startsWith("numeric")) {
+          return Number(rt);
+        } else if (column6.data_type === "json" || column6.data_type === "jsonb") {
+          const jsonWithoutSpaces = JSON.stringify(JSON.parse(rt));
+          return `'${jsonWithoutSpaces}'${hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : `::${column6.data_type}`}`;
+        } else if (column6.data_type === "boolean") {
+          return column6.column_default === "true";
+        } else {
+          return `'${rt}'`;
+        }
+      } else {
+        if (/^-?[\d.]+(?:e-?\d+)?$/.test(columnDefaultAsString) && !column6.data_type.startsWith("numeric")) {
+          return Number(columnDefaultAsString);
+        } else if (column6.data_type === "boolean") {
+          return column6.column_default === "true";
+        } else {
+          return `${columnDefaultAsString}`;
+        }
+      }
     };
   }
 });
@@ -25650,6 +26534,7 @@ __export(sqliteImports_exports, {
 var import_sqlite_core, prepareFromSqliteImports;
 var init_sqliteImports = __esm({
   "src/serializer/sqliteImports.ts"() {
+    "use strict";
     import_sqlite_core = require("drizzle-orm/sqlite-core");
     prepareFromSqliteImports = (imports) => {
       const tables = [];
@@ -25673,13 +26558,14 @@ var sqliteSerializer_exports = {};
 __export(sqliteSerializer_exports, {
   generateSqliteSnapshot: () => generateSqliteSnapshot
 });
-var import_table3, import_sql3, import_sqlite_core2, import_utils9, dialect5, generateSqliteSnapshot;
+var import_table3, import_sql3, import_sqlite_core2, import_utils11, dialect5, generateSqliteSnapshot;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
+    "use strict";
     import_table3 = require("drizzle-orm/table");
     import_sql3 = require("drizzle-orm/sql");
     import_sqlite_core2 = require("drizzle-orm/sqlite-core");
-    import_utils9 = require("drizzle-orm/sqlite-core/utils");
+    import_utils11 = require("drizzle-orm/sqlite-core/utils");
     dialect5 = new import_sqlite_core2.SQLiteSyncDialect();
     generateSqliteSnapshot = (tables, enums) => {
       const result = {};
@@ -25689,7 +26575,7 @@ var init_sqliteSerializer = __esm({
         const indexesObject = {};
         const foreignKeysObject = {};
         const primaryKeysObject = {};
-        (0, import_utils9.getTableColumns)(table4).forEach((column6) => {
+        (0, import_utils11.getTableColumns)(table4).forEach((column6) => {
           const notNull = column6.notNull;
           const primaryKey = column6.primary;
           const columnToSet = {
@@ -25716,7 +26602,7 @@ var init_sqliteSerializer = __esm({
           }
           columnsObject[column6.name] = columnToSet;
         });
-        const foreignKeys = (0, import_utils9.getTableForeignKeys)(table4).map((fk4) => {
+        const foreignKeys = (0, import_utils11.getTableForeignKeys)(table4).map((fk4) => {
           const name = fk4.getName();
           const tableFrom = tableName;
           const onDelete = fk4.onDelete;
@@ -25739,7 +26625,7 @@ var init_sqliteSerializer = __esm({
         foreignKeys.forEach((it) => {
           foreignKeysObject[it.name] = it;
         });
-        (0, import_utils9.getTableIndexes)(table4).forEach((value) => {
+        (0, import_utils11.getTableIndexes)(table4).forEach((value) => {
           var _a;
           const columns = value.config.columns;
           const name = value.config.name;
@@ -25763,7 +26649,7 @@ var init_sqliteSerializer = __esm({
             where
           };
         });
-        (0, import_utils9.getTableCompositePrimaryKeys)(table4).forEach((it) => {
+        (0, import_utils11.getTableCompositePrimaryKeys)(table4).forEach((it) => {
           primaryKeysObject[it.getName()] = {
             columns: it.columns.map((it2) => it2.name)
           };
@@ -25791,10 +26677,11 @@ var init_sqliteSerializer = __esm({
 });
 
 // src/serializer/index.ts
-var import_fs3, import_node, import_path3, import_glob, safeRegister, serializeMySql, serializePg, serializeSQLite, prepareFilenames;
+var import_fs5, import_node, import_path3, import_glob, safeRegister, serializeMySql, serializePg, serializeSQLite, prepareFilenames;
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
-    import_fs3 = __toESM(require("fs"));
+    "use strict";
+    import_fs5 = __toESM(require("fs"));
     import_node = __toESM(require_node2());
     import_path3 = __toESM(require("path"));
     import_glob = __toESM(require_glob());
@@ -25810,8 +26697,8 @@ var init_serializer = __esm({
         } };
       }
     };
-    serializeMySql = (path4) => {
-      const filenames = prepareFilenames(path4);
+    serializeMySql = (path2) => {
+      const filenames = prepareFilenames(path2);
       const { unregister } = safeRegister();
       const { prepareFromMySqlImports: prepareFromMySqlImports2 } = (init_mysqlImports(), __toCommonJS(mysqlImports_exports));
       const { generateMySqlSnapshot: generateMySqlSnapshot2 } = (init_mysqlSerializer(), __toCommonJS(mysqlSerializer_exports));
@@ -25819,8 +26706,8 @@ var init_serializer = __esm({
       unregister();
       return generateMySqlSnapshot2(tables, enums, schemas);
     };
-    serializePg = (path4) => {
-      const filenames = prepareFilenames(path4);
+    serializePg = (path2) => {
+      const filenames = prepareFilenames(path2);
       const { unregister } = safeRegister();
       const { prepareFromPgImports: prepareFromPgImports2 } = (init_pgImports(), __toCommonJS(pgImports_exports));
       const { generatePgSnapshot: generatePgSnapshot2 } = (init_pgSerializer(), __toCommonJS(pgSerializer_exports));
@@ -25828,8 +26715,8 @@ var init_serializer = __esm({
       unregister();
       return generatePgSnapshot2(tables, enums, schemas);
     };
-    serializeSQLite = (path4) => {
-      const filenames = prepareFilenames(path4);
+    serializeSQLite = (path2) => {
+      const filenames = prepareFilenames(path2);
       const { unregister } = safeRegister();
       const { prepareFromSqliteImports: prepareFromSqliteImports2 } = (init_sqliteImports(), __toCommonJS(sqliteImports_exports));
       const { generateSqliteSnapshot: generateSqliteSnapshot2 } = (init_sqliteSerializer(), __toCommonJS(sqliteSerializer_exports));
@@ -25837,16 +26724,16 @@ var init_serializer = __esm({
       unregister();
       return generateSqliteSnapshot2(tables, enums);
     };
-    prepareFilenames = (path4) => {
-      if (typeof path4 === "string") {
-        path4 = [path4];
+    prepareFilenames = (path2) => {
+      if (typeof path2 === "string") {
+        path2 = [path2];
       }
-      const result = path4.reduce((result2, cur) => {
+      const result = path2.reduce((result2, cur) => {
         const globbed = import_glob.default.sync(cur);
         globbed.forEach((it) => {
-          const fileName = import_fs3.default.lstatSync(it).isDirectory() ? null : import_path3.default.resolve(it);
-          const filenames = fileName ? [fileName] : import_fs3.default.readdirSync(it).map((file) => import_path3.default.join(import_path3.default.resolve(it), file));
-          filenames.filter((file) => !import_fs3.default.lstatSync(file).isDirectory()).forEach((file) => result2.add(file));
+          const fileName = import_fs5.default.lstatSync(it).isDirectory() ? null : import_path3.default.resolve(it);
+          const filenames = fileName ? [fileName] : import_fs5.default.readdirSync(it).map((file) => import_path3.default.join(import_path3.default.resolve(it), file));
+          filenames.filter((file) => !import_fs5.default.lstatSync(file).isDirectory()).forEach((file) => result2.add(file));
         });
         return result2;
       }, /* @__PURE__ */ new Set());
@@ -25856,11 +26743,12 @@ var init_serializer = __esm({
 });
 
 // src/migrationPreparator.ts
-var import_fs4, import_crypto, prepareMySqlMigrationSnapshot, prepareSqliteMigrationSnapshot, preparePgMigrationSnapshot, preparePrevSnapshot;
+var import_fs6, import_crypto2, prepareMySqlMigrationSnapshot, prepareSqliteMigrationSnapshot, preparePgMigrationSnapshot, preparePrevSnapshot;
 var init_migrationPreparator = __esm({
   "src/migrationPreparator.ts"() {
-    import_fs4 = __toESM(require("fs"));
-    import_crypto = require("crypto");
+    "use strict";
+    import_fs6 = __toESM(require("fs"));
+    import_crypto2 = require("crypto");
     init_serializer();
     init_pgSchema();
     init_sqliteSchema();
@@ -25870,7 +26758,7 @@ var init_migrationPreparator = __esm({
         preparePrevSnapshot(migrationFolders, dryMySql)
       );
       const serialized = serializeMySql(schemaPath);
-      const id = (0, import_crypto.randomUUID)();
+      const id = (0, import_crypto2.randomUUID)();
       const idPrev = prevSnapshot.id;
       const { version, dialect: dialect6, ...rest } = serialized;
       const result = { version, dialect: dialect6, id, prevId: idPrev, ...rest };
@@ -25881,7 +26769,7 @@ var init_migrationPreparator = __esm({
         preparePrevSnapshot(snapshots, drySQLite)
       );
       const serialized = serializeSQLite(schemaPath);
-      const id = (0, import_crypto.randomUUID)();
+      const id = (0, import_crypto2.randomUUID)();
       const idPrev = prevSnapshot.id;
       const { version, dialect: dialect6, ...rest } = serialized;
       const result = {
@@ -25896,7 +26784,7 @@ var init_migrationPreparator = __esm({
     preparePgMigrationSnapshot = (snapshots, schemaPath) => {
       const prevSnapshot = pgSchema.parse(preparePrevSnapshot(snapshots, dryPg));
       const serialized = serializePg(schemaPath);
-      const id = (0, import_crypto.randomUUID)();
+      const id = (0, import_crypto2.randomUUID)();
       const idPrev = prevSnapshot.id;
       const { version, dialect: dialect6, ...rest } = serialized;
       const result = { version, dialect: dialect6, id, prevId: idPrev, ...rest };
@@ -25908,7 +26796,7 @@ var init_migrationPreparator = __esm({
         prevSnapshot = defaultPrev;
       } else {
         const lastSnapshot = snapshots[snapshots.length - 1];
-        prevSnapshot = JSON.parse(import_fs4.default.readFileSync(lastSnapshot).toString());
+        prevSnapshot = JSON.parse(import_fs6.default.readFileSync(lastSnapshot).toString());
       }
       return prevSnapshot;
     };
@@ -25925,10 +26813,11 @@ __export(migrate_exports, {
   prepareSnapshotFolderName: () => prepareSnapshotFolderName,
   writeResult: () => writeResult
 });
-var import_fs5, import_path4, import_hanji2, prepareAndMigratePg, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, writeResult, prepareSnapshotFolderName, two;
+var import_fs7, import_path4, import_hanji2, prepareAndMigratePg, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, writeResult, prepareSnapshotFolderName, two;
 var init_migrate = __esm({
   "src/cli/commands/migrate.ts"() {
-    import_fs5 = __toESM(require("fs"));
+    "use strict";
+    import_fs7 = __toESM(require("fs"));
     init_migrationPreparator();
     init_snapshotsDiffer();
     import_path4 = __toESM(require("path"));
@@ -25954,7 +26843,9 @@ var init_migrate = __esm({
         const { sqlStatements, _meta } = await prepareSQL(
           squashedPrev,
           squashedCur,
-          "pg"
+          "pg",
+          validatedPrev,
+          validatedCur
         );
         writeResult(
           cur,
@@ -25982,7 +26873,9 @@ var init_migrate = __esm({
         const { sqlStatements, _meta } = await prepareSQL(
           squashedPrev,
           squashedCur,
-          "mysql"
+          "mysql",
+          validatedPrev,
+          validatedCur
         );
         writeResult(
           cur,
@@ -26010,7 +26903,7 @@ var init_migrate = __esm({
         const { sqlStatements, _meta } = await prepareSQL(
           squashedPrev,
           squashedCur,
-          "mysql"
+          "sqlite"
         );
         writeResult(
           cur,
@@ -26024,7 +26917,7 @@ var init_migrate = __esm({
         console.error(e);
       }
     };
-    prepareSQL = async (prev, cur, dialect6) => {
+    prepareSQL = async (prev, cur, dialect6, prevFull, curFull) => {
       const schemasResolver = async (input) => {
         try {
           const { created, deleted, renamed } = await promptSchemasConflict(
@@ -26069,7 +26962,9 @@ var init_migrate = __esm({
         dialect6,
         schemasResolver,
         tablesResolver,
-        columnsResolver
+        columnsResolver,
+        prevFull,
+        curFull
       );
     };
     promptColumnsConflicts = async (tableName, newColumns, missingColumns) => {
@@ -26205,19 +27100,19 @@ var init_migrate = __esm({
       return result;
     };
     writeResult = (cur, sqlStatements, journal, _meta, outFolder, breakpoints) => {
-      var _a, _b;
       console.log(schema(cur));
       if (sqlStatements.length === 0) {
         console.log("No schema changes, nothing to migrate \u{1F634}");
         return;
       }
-      const idx = (_b = (_a = journal.entries[journal.entries.length - 1]) == null ? void 0 : _a.idx) != null ? _b : 0;
+      const lastEntryInJournal = journal.entries[journal.entries.length - 1];
+      const idx = typeof lastEntryInJournal === "undefined" ? 0 : lastEntryInJournal.idx + 1;
       const { prefix, tag } = prepareMigrationMetadata(idx);
       const toSave = JSON.parse(JSON.stringify(cur));
       toSave["_meta"] = _meta;
       const metaFolderPath = (0, import_path4.join)(outFolder, "meta");
       const metaJournal = (0, import_path4.join)(metaFolderPath, "_journal.json");
-      import_fs5.default.writeFileSync(
+      import_fs7.default.writeFileSync(
         (0, import_path4.join)(metaFolderPath, `${prefix}_snapshot.json`),
         JSON.stringify(toSave, null, 2)
       );
@@ -26225,12 +27120,13 @@ var init_migrate = __esm({
       const sql = sqlStatements.join(sqlDelimiter);
       journal.entries.push({
         idx,
+        version: cur.version,
         when: +new Date(),
         tag,
         breakpoints
       });
-      import_fs5.default.writeFileSync(metaJournal, JSON.stringify(journal, null, 2));
-      import_fs5.default.writeFileSync(`${outFolder}/${tag}.sql`, sql);
+      import_fs7.default.writeFileSync(metaJournal, JSON.stringify(journal, null, 2));
+      import_fs7.default.writeFileSync(`${outFolder}/${tag}.sql`, sql);
       (0, import_hanji2.render)(
         `[${source_default.green(
           "\u2713"
@@ -26343,6 +27239,7 @@ var init_camelcase = __esm({
 // src/@types/utils.ts
 var init_utils2 = __esm({
   "src/@types/utils.ts"() {
+    "use strict";
     init_camelcase();
     String.prototype.trimChar = function(char) {
       let start = 0;
@@ -27754,7 +28651,7 @@ var require_split2 = __commonJS({
 var require_helper = __commonJS({
   "node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/helper.js"(exports, module2) {
     "use strict";
-    var path4 = require("path");
+    var path2 = require("path");
     var Stream = require("stream").Stream;
     var split = require_split2();
     var util2 = require("util");
@@ -27793,7 +28690,7 @@ var require_helper = __commonJS({
     };
     module2.exports.getFileName = function(rawEnv) {
       var env2 = rawEnv || process.env;
-      var file = env2.PGPASSFILE || (isWin ? path4.join(env2.APPDATA || "./", "postgresql", "pgpass.conf") : path4.join(env2.HOME || "./", ".pgpass"));
+      var file = env2.PGPASSFILE || (isWin ? path2.join(env2.APPDATA || "./", "postgresql", "pgpass.conf") : path2.join(env2.HOME || "./", ".pgpass"));
       return file;
     };
     module2.exports.usePgPass = function(stats, fname) {
@@ -27920,7 +28817,7 @@ var require_helper = __commonJS({
 var require_lib2 = __commonJS({
   "node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/index.js"(exports, module2) {
     "use strict";
-    var path4 = require("path");
+    var path2 = require("path");
     var fs7 = require("fs");
     var helper = require_helper();
     module2.exports = function(connInfo, cb) {
@@ -30743,9 +31640,10 @@ var require_lib3 = __commonJS({
 });
 
 // src/introspect.ts
-var pgImportsList, objToStatement, objToStatement2, timeConfig, importsPatch, relations, schemaToTypeScript, isCyclic, isSelf, column4, createTableColumns, createTableIndexes, createTableFKs;
+var pgImportsList, objToStatement2, timeConfig, possibleIntervals, intervalStrToObj, intervalConfig, importsPatch, relations, schemaToTypeScript, isCyclic, isSelf, column4, dimensionsInArray, createTableColumns, createTableIndexes, createTablePKs, createTableFKs;
 var init_introspect = __esm({
   "src/introspect.ts"() {
+    "use strict";
     init_utils2();
     init_pgSerializer();
     pgImportsList = /* @__PURE__ */ new Set([
@@ -30757,7 +31655,9 @@ var init_introspect = __esm({
       "boolean",
       "text",
       "varchar",
+      "char",
       "serial",
+      "smallserial",
       "bigserial",
       "decimal",
       "numeric",
@@ -30768,33 +31668,75 @@ var init_introspect = __esm({
       "timestamp",
       "date",
       "interval",
+      "cidr",
+      "inet",
+      "macaddr",
+      "macaddr8",
       "bigint",
-      "bigserial",
       "doublePrecision",
       "uuid"
     ]);
-    objToStatement = (json) => {
+    objToStatement2 = (json) => {
       json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
       const keys = Object.keys(json);
       if (keys.length === 0)
         return;
       let statement = "{ ";
-      statement += keys.map((it) => `"${it}": "${json[it]}"`).join(", ");
+      statement += keys.map((it) => `${it}: "${json[it]}"`).join(", ");
       statement += " }";
       return statement;
     };
-    objToStatement2 = (json) => {
+    timeConfig = (json) => {
       json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
       const keys = Object.keys(json);
       if (keys.length === 0)
         return;
       let statement = "{ ";
-      statement += keys.map((it) => `${it}: "${json[it]}"`).join(", ");
+      statement += keys.map((it) => `${it}: ${json[it]}`).join(", ");
       statement += " }";
       return statement;
     };
-    timeConfig = (json) => {
-      json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
+    possibleIntervals = [
+      "year",
+      "month",
+      "day",
+      "hour",
+      "minute",
+      "second",
+      "year to month",
+      "day to hour",
+      "day to minute",
+      "day to second",
+      "hour to minute",
+      "hour to second",
+      "minute to second"
+    ];
+    intervalStrToObj = (str) => {
+      if (str.startsWith("interval(")) {
+        return {
+          precision: Number(str.substring("interval(".length, str.length - 1))
+        };
+      }
+      const splitted = str.split(" ");
+      if (splitted.length === 1) {
+        return {};
+      }
+      const rest = splitted.slice(1, splitted.length).join(" ");
+      if (possibleIntervals.includes(rest)) {
+        return { fields: `"${rest}"` };
+      }
+      for (const s of possibleIntervals) {
+        if (rest.startsWith(`${s}(`)) {
+          return {
+            fields: `"${s}"`,
+            precision: Number(rest.substring(s.length + 1, rest.length - 1))
+          };
+        }
+      }
+      return {};
+    };
+    intervalConfig = (str) => {
+      let json = intervalStrToObj(str);
       const keys = Object.keys(json);
       if (keys.length === 0)
         return;
@@ -30805,7 +31747,10 @@ var init_introspect = __esm({
     };
     importsPatch = {
       "double precision": "doublePrecision",
-      "timestamp without time zone": "timestamp"
+      "timestamp without time zone": "timestamp",
+      "timestamp with time zone": "timestamp",
+      "time without time zone": "time",
+      "time with time zone": "time"
     };
     relations = /* @__PURE__ */ new Set();
     schemaToTypeScript = (schema4) => {
@@ -30827,13 +31772,20 @@ var init_introspect = __esm({
             (idx) => idx.isUnique ? "uniqueIndex" : "index"
           );
           const fkImpots = Object.values(it.foreignKeys).map((it2) => "foreignKey");
+          const pkImports = Object.values(it.compositePrimaryKeys).map(
+            (it2) => "primaryKey"
+          );
           res.pg.push(...idxImports);
           res.pg.push(...fkImpots);
+          res.pg.push(...pkImports);
           const columnImports = Object.values(it.columns).map((col) => {
             var _a;
             let patched = (_a = importsPatch[col.type]) != null ? _a : col.type;
             patched = patched.startsWith("varchar(") ? "varchar" : patched;
+            patched = patched.startsWith("char(") ? "char" : patched;
             patched = patched.startsWith("numeric(") ? "numeric" : patched;
+            patched = patched.startsWith("time(") ? "time" : patched;
+            patched = patched.startsWith("timestamp(") ? "timestamp" : patched;
             return patched;
           }).filter((type) => {
             return pgImportsList.has(type);
@@ -30866,12 +31818,13 @@ var init_introspect = __esm({
         const filteredFKs = Object.values(table4.foreignKeys).filter((it) => {
           return it.columnsFrom.length > 1 || isSelf(it);
         });
-        if (Object.keys(table4.indexes).length > 0 || filteredFKs.length > 0) {
+        if (Object.keys(table4.indexes).length > 0 || filteredFKs.length > 0 || Object.keys(table4.compositePrimaryKeys).length > 0) {
           statement += ",\n";
           statement += "(table) => {\n";
           statement += "	return {\n";
           statement += createTableIndexes(table4.name, Object.values(table4.indexes));
           statement += createTableFKs(Object.values(filteredFKs));
+          statement += createTablePKs(Object.values(table4.compositePrimaryKeys));
           statement += "	}\n";
           statement += "}";
         }
@@ -30908,43 +31861,48 @@ var init_introspect = __esm({
     };
     column4 = (type, name, enumTypes, defaultValue) => {
       const lowered = type.toLowerCase();
-      if (lowered === "serial") {
+      if (lowered.startsWith("serial")) {
         return `${name.camelCase()}: serial("${name}")`;
       }
-      if (lowered === "bigserial") {
+      if (lowered.startsWith("smallserial")) {
+        return `${name.camelCase()}: smallserial("${name}")`;
+      }
+      if (lowered.startsWith("bigserial")) {
         return `${name.camelCase()}: bigserial("${name}", { mode: "bigint" })`;
       }
-      if (lowered === "integer") {
+      if (lowered.startsWith("integer")) {
         let out = `${name.camelCase()}: integer("${name}")`;
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
-      if (lowered === "smallint") {
+      if (lowered.startsWith("smallint")) {
         let out = `${name.camelCase()}: smallint("${name}")`;
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
-      if (lowered === "bigint") {
-        let out = `${name.camelCase()}: bigint("${name}", { mode: "bigint" })`;
-        out += defaultValue ? `.default(BigInt(${defaultValue}))` : "";
+      if (lowered.startsWith("bigint")) {
+        let out = `// You can use { mode: "bigint" } if numbers are exceeding js number limitations
+	`;
+        out += `${name.camelCase()}: bigint("${name}", { mode: "number" })`;
+        out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
-      if (lowered === "boolean") {
+      if (lowered.startsWith("boolean")) {
         let out = `${name.camelCase()}: boolean("${name}")`;
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
-      if (lowered === "double precision") {
+      if (lowered.startsWith("double precision")) {
         let out = `${name.camelCase()}: doublePrecision("${name}")`;
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
-      if (lowered === "real") {
+      if (lowered.startsWith("real")) {
         let out = `${name.camelCase()}: real("${name}")`;
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
-      if (lowered === "uuid") {
+      if (lowered.startsWith("uuid")) {
         let out = `${name.camelCase()}: uuid("${name}")`;
         out += defaultValue === "gen_random_uuid()" ? ".defaultRandom()" : defaultValue ? `.default(sql\`${defaultValue}\`)` : "";
         return out;
@@ -30956,25 +31914,31 @@ var init_introspect = __esm({
           params = { precision, scale };
         }
         let out = params ? `${name.camelCase()}: numeric("${name}", ${timeConfig(params)})` : `${name.camelCase()}: numeric("${name}")`;
+        defaultValue = defaultValue ? defaultValue.startsWith(`'`) && defaultValue.endsWith(`'`) ? defaultValue.substring(1, defaultValue.length - 1) : defaultValue : void 0;
+        out += defaultValue ? `.default('${defaultValue}')` : "";
         return out;
       }
       if (lowered.startsWith("timestamp")) {
         const withTimezone = lowered.includes("with time zone");
-        const split = lowered.split(" ");
-        let precision = split.length >= 2 ? Number(split[1].substring(1, 2)) : null;
+        let precision = lowered.startsWith("timestamp(") ? Number(
+          lowered.split(" ")[0].substring("timestamp(".length, lowered.split(" ")[0].length - 1)
+        ) : null;
         precision = precision ? precision : null;
-        const params = timeConfig({ precision, withTimezone });
+        const params = timeConfig({
+          precision,
+          withTimezone,
+          mode: "'string'"
+        });
         let out = params ? `${name.camelCase()}: timestamp("${name}", ${params})` : `${name.camelCase()}: timestamp("${name}")`;
-        defaultValue = (defaultValue == null ? void 0 : defaultValue.endsWith("::timestamp without time zone")) ? defaultValue.substring(0, defaultValue.length - 29) : defaultValue;
-        defaultValue = (defaultValue == null ? void 0 : defaultValue.endsWith("::timestamp with time zone")) ? defaultValue.substring(0, defaultValue.length - 26) : defaultValue;
         defaultValue = defaultValue === "now()" || defaultValue === "CURRENT_TIMESTAMP" ? ".defaultNow()" : defaultValue ? `.default(${defaultValue})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered.startsWith("time")) {
         const withTimezone = lowered.includes("with time zone");
-        const split = lowered.split(" ");
-        let precision = split.length >= 2 ? Number(split[1].substring(1, 2)) : null;
+        let precision = lowered.startsWith("time(") ? Number(
+          lowered.split(" ")[0].substring("time(".length, lowered.split(" ")[0].length - 1)
+        ) : null;
         precision = precision ? precision : null;
         const params = timeConfig({ precision, withTimezone });
         let out = params ? `${name.camelCase()}: time("${name}", ${params})` : `${name.camelCase()}: time("${name}")`;
@@ -30983,12 +31947,8 @@ var init_introspect = __esm({
         return out;
       }
       if (lowered.startsWith("interval")) {
-        const withTimezone = lowered.includes("with time zone");
-        const split = lowered.split(" ");
-        let precision = split.length >= 2 ? Number(split[1].substring(1, 2)) : null;
-        precision = precision ? precision : null;
-        const params = timeConfig({ precision, withTimezone });
-        let out = params ? `${name.camelCase()}: interval(${name}, ${params})` : `${name.camelCase()}: interval("${name}")`;
+        const params = intervalConfig(lowered);
+        let out = params ? `${name.camelCase()}: interval("${name}", ${params})` : `${name.camelCase()}: interval("${name}")`;
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
@@ -30998,7 +31958,7 @@ var init_introspect = __esm({
         out += defaultValue;
         return out;
       }
-      if (lowered === "text") {
+      if (lowered.startsWith("text")) {
         let out = `${name.camelCase()}: text("${name}")`;
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
@@ -31006,37 +31966,83 @@ var init_introspect = __esm({
       if (lowered === "json") {
         let out = `${name.camelCase()}: json("${name}")`;
         defaultValue = (defaultValue == null ? void 0 : defaultValue.endsWith("::json")) ? defaultValue.substring(1, defaultValue.length - 7) : defaultValue;
-        const def = defaultValue ? objToStatement(JSON.parse(defaultValue)) : null;
+        const def = defaultValue ? defaultValue : null;
         out += defaultValue ? `.default(${def})` : "";
         return out;
       }
       if (lowered === "jsonb") {
         let out = `${name.camelCase()}: jsonb("${name}")`;
         defaultValue = (defaultValue == null ? void 0 : defaultValue.endsWith("::jsonb")) ? defaultValue.substring(1, defaultValue.length - 8) : defaultValue;
-        const def = defaultValue ? objToStatement(JSON.parse(defaultValue)) : null;
+        const def = defaultValue ? defaultValue : null;
         out += defaultValue ? `.default(${def})` : "";
         return out;
       }
+      if (lowered.startsWith("inet")) {
+        let out = `${name.camelCase()}: inet("${name}")`;
+        out += defaultValue ? `.default(${defaultValue})` : "";
+        return out;
+      }
+      if (lowered.startsWith("cidr")) {
+        let out = `${name.camelCase()}: cidr("${name}")`;
+        out += defaultValue ? `.default(${defaultValue})` : "";
+        return out;
+      }
+      if (lowered.startsWith("macaddr")) {
+        let out = `${name.camelCase()}: macaddr("${name}")`;
+        out += defaultValue ? `.default(${defaultValue})` : "";
+        return out;
+      }
+      if (lowered.startsWith("macaddr8")) {
+        let out = `${name.camelCase()}: macaddr8("${name}")`;
+        out += defaultValue ? `.default(${defaultValue})` : "";
+        return out;
+      }
       if (lowered.startsWith("varchar")) {
         const split = lowered.split(" ");
         let out;
-        if (split[1]) {
-          out = `${name.camelCase()}: varchar("${name}", { size: ${split[1]} })`;
+        if (lowered.length !== 7) {
+          out = `${name.camelCase()}: varchar("${name}", { length: ${lowered.substring(
+            8,
+            lowered.length - 1
+          )} })`;
         } else {
           out = `${name.camelCase()}: varchar("${name}")`;
         }
-        defaultValue = (defaultValue == null ? void 0 : defaultValue.endsWith("::character varying")) ? defaultValue.substring(0, defaultValue.length - 19) : defaultValue;
+        out += defaultValue ? `.default(${defaultValue})` : "";
+        return out;
+      }
+      if (lowered.startsWith("char")) {
+        let out;
+        if (lowered.length !== 4) {
+          out = `${name.camelCase()}: char("${name}", { length: ${lowered.substring(
+            5,
+            lowered.length - 1
+          )} })`;
+        } else {
+          out = `${name.camelCase()}: char("${name}")`;
+        }
         out += defaultValue ? `.default(${defaultValue})` : "";
         return out;
       }
       if (enumTypes.has(type)) {
-        return `${name.camelCase()}: ${type.camelCase()}("${name}")`;
+        let out = `${name.camelCase()}: ${type.camelCase()}("${name}")`;
+        out += defaultValue ? `.default(${defaultValue})` : "";
+        return out;
       }
       let unknown = `// TODO: failed to parse database type '${type}'
 `;
       unknown += `	${name.camelCase()}: unknown("${name}")`;
       return unknown;
     };
+    dimensionsInArray = (str) => {
+      let res = "";
+      for (let i = 0; i < str.length; i++) {
+        if (str[i] === "[" && str[i + 1] === "]") {
+          res += ".array()";
+        }
+      }
+      return res;
+    };
     createTableColumns = (columns, fks, enumTypes) => {
       let statement = "";
       const oneColumnsFKs = Object.values(fks).filter((it) => {
@@ -31052,6 +32058,7 @@ var init_introspect = __esm({
         const columnStatement = column4(it.type, it.name, enumTypes, it.default);
         statement += "	";
         statement += columnStatement;
+        statement += dimensionsInArray(it.type);
         statement += it.primaryKey ? ".primaryKey()" : "";
         statement += it.notNull ? ".notNull()" : "";
         const fks2 = fkByColumnName[it.name];
@@ -31086,6 +32093,21 @@ var init_introspect = __esm({
         statement += `${escapedIndexName})`;
         statement += `.on(${it.columns.map((it2) => `table.${it2.camelCase()}`).join(", ")}),`;
         statement += `
+`;
+      });
+      return statement;
+    };
+    createTablePKs = (pks) => {
+      let statement = "";
+      pks.forEach((it) => {
+        let idxKey = it.name.camelCase();
+        statement += `		${idxKey}: `;
+        statement += "primaryKey(";
+        statement += `${it.columns.map((c) => {
+          return `table.${c.camelCase()}`;
+        }).join(", ")}`;
+        statement += ")";
+        statement += `
 `;
       });
       return statement;
@@ -31122,6 +32144,7 @@ __export(pgIntrospect_exports, {
 var import_hanji4, import_pg, PgConfig1, PgConfig2, Conf, pgIntrospect;
 var init_pgIntrospect = __esm({
   "src/cli/commands/pgIntrospect.ts"() {
+    "use strict";
     import_hanji4 = __toESM(require_hanji());
     init_lib();
     init_views();
@@ -43284,12 +44307,12 @@ var require_query4 = __commonJS({
         this._fields.push([]);
         return this.readField;
       }
-      _streamLocalInfile(connection, path4) {
+      _streamLocalInfile(connection, path2) {
         if (this._streamFactory) {
-          this._localStream = this._streamFactory(path4);
+          this._localStream = this._streamFactory(path2);
         } else {
           this._localStreamError = new Error(
-            `As a result of LOCAL INFILE command server wants to read ${path4} file, but as of v2.0 you must provide streamFactory option returning ReadStream.`
+            `As a result of LOCAL INFILE command server wants to read ${path2} file, but as of v2.0 you must provide streamFactory option returning ReadStream.`
           );
           connection.writePacket(EmptyPacket);
           return this.infileOk;
@@ -44514,30 +45537,35 @@ var require_connection_config = __commonJS({
   }
 });
 
-// node_modules/.pnpm/lru-cache@7.14.1/node_modules/lru-cache/index.js
+// node_modules/.pnpm/lru-cache@7.18.1/node_modules/lru-cache/index.js
 var require_lru_cache2 = __commonJS({
-  "node_modules/.pnpm/lru-cache@7.14.1/node_modules/lru-cache/index.js"(exports, module2) {
+  "node_modules/.pnpm/lru-cache@7.18.1/node_modules/lru-cache/index.js"(exports, module2) {
     var perf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
     var hasAbortController = typeof AbortController === "function";
     var AC = hasAbortController ? AbortController : class AbortController {
       constructor() {
         this.signal = new AS();
       }
-      abort() {
-        this.signal.dispatchEvent("abort");
+      abort(reason = new Error("This operation was aborted")) {
+        this.signal.reason = this.signal.reason || reason;
+        this.signal.aborted = true;
+        this.signal.dispatchEvent({
+          type: "abort",
+          target: this.signal
+        });
       }
     };
     var hasAbortSignal = typeof AbortSignal === "function";
     var hasACAbortSignal = typeof AC.AbortSignal === "function";
     var AS = hasAbortSignal ? AbortSignal : hasACAbortSignal ? AC.AbortController : class AbortSignal {
       constructor() {
+        this.reason = void 0;
         this.aborted = false;
         this._listeners = [];
       }
-      dispatchEvent(type) {
-        if (type === "abort") {
+      dispatchEvent(e) {
+        if (e.type === "abort") {
           this.aborted = true;
-          const e = { type, target: this };
           this.onabort(e);
           this._listeners.forEach((f) => f(e), this);
         }
@@ -44631,7 +45659,10 @@ var require_lru_cache2 = __commonJS({
           fetchMethod,
           fetchContext,
           noDeleteOnFetchRejection,
-          noDeleteOnStaleGet
+          noDeleteOnStaleGet,
+          allowStaleOnFetchRejection,
+          allowStaleOnFetchAbort,
+          ignoreFetchAbort
         } = options;
         const { length, maxAge, stale } = options instanceof LRUCache ? {} : options;
         if (max !== 0 && !isPosInt(max)) {
@@ -44690,6 +45721,9 @@ var require_lru_cache2 = __commonJS({
         this.noDisposeOnSet = !!noDisposeOnSet;
         this.noUpdateTTL = !!noUpdateTTL;
         this.noDeleteOnFetchRejection = !!noDeleteOnFetchRejection;
+        this.allowStaleOnFetchRejection = !!allowStaleOnFetchRejection;
+        this.allowStaleOnFetchAbort = !!allowStaleOnFetchAbort;
+        this.ignoreFetchAbort = !!ignoreFetchAbort;
         if (this.maxEntrySize !== 0) {
           if (this.maxSize !== 0) {
             if (!isPosInt(this.maxSize)) {
@@ -44766,6 +45800,14 @@ var require_lru_cache2 = __commonJS({
         this.updateItemAge = (index4) => {
           this.starts[index4] = this.ttls[index4] !== 0 ? perf.now() : 0;
         };
+        this.statusTTL = (status, index4) => {
+          if (status) {
+            status.ttl = this.ttls[index4];
+            status.start = this.starts[index4];
+            status.now = cachedNow || getNow();
+            status.remainingTTL = status.now + status.ttl - status.start;
+          }
+        };
         let cachedNow = 0;
         const getNow = () => {
           const n = perf.now();
@@ -44792,11 +45834,13 @@ var require_lru_cache2 = __commonJS({
           return this.ttls[index4] !== 0 && this.starts[index4] !== 0 && (cachedNow || getNow()) - this.starts[index4] > this.ttls[index4];
         };
       }
-      updateItemAge(index4) {
+      updateItemAge(_index) {
       }
-      setItemTTL(index4, ttl, start) {
+      statusTTL(_status, _index) {
       }
-      isStale(index4) {
+      setItemTTL(_index, _ttl, _start) {
+      }
+      isStale(_index) {
         return false;
       }
       initializeSizeTracking() {
@@ -44823,13 +45867,13 @@ var require_lru_cache2 = __commonJS({
               }
             } else {
               throw new TypeError(
-                "invalid size value (must be positive integer)"
+                "invalid size value (must be positive integer). When maxSize or maxEntrySize is used, sizeCalculation or size must be set."
               );
             }
           }
           return size;
         };
-        this.addItemSize = (index4, size) => {
+        this.addItemSize = (index4, size, status) => {
           this.sizes[index4] = size;
           if (this.maxSize) {
             const maxSize = this.maxSize - this.sizes[index4];
@@ -44838,13 +45882,17 @@ var require_lru_cache2 = __commonJS({
             }
           }
           this.calculatedSize += this.sizes[index4];
+          if (status) {
+            status.entrySize = size;
+            status.totalCalculatedSize = this.calculatedSize;
+          }
         };
       }
-      removeItemSize(index4) {
+      removeItemSize(_index) {
       }
-      addItemSize(index4, size) {
+      addItemSize(_index, _size) {
       }
-      requireSize(k, v, size, sizeCalculation) {
+      requireSize(_k, _v, size, sizeCalculation) {
         if (size || sizeCalculation) {
           throw new TypeError(
             "cannot set size without setting maxSize or maxEntrySize on cache"
@@ -44890,32 +45938,44 @@ var require_lru_cache2 = __commonJS({
       }
       *entries() {
         for (const i of this.indexes()) {
-          yield [this.keyList[i], this.valList[i]];
+          if (!this.isBackgroundFetch(this.valList[i])) {
+            yield [this.keyList[i], this.valList[i]];
+          }
         }
       }
       *rentries() {
         for (const i of this.rindexes()) {
-          yield [this.keyList[i], this.valList[i]];
+          if (!this.isBackgroundFetch(this.valList[i])) {
+            yield [this.keyList[i], this.valList[i]];
+          }
         }
       }
       *keys() {
         for (const i of this.indexes()) {
-          yield this.keyList[i];
+          if (!this.isBackgroundFetch(this.valList[i])) {
+            yield this.keyList[i];
+          }
         }
       }
       *rkeys() {
         for (const i of this.rindexes()) {
-          yield this.keyList[i];
+          if (!this.isBackgroundFetch(this.valList[i])) {
+            yield this.keyList[i];
+          }
         }
       }
       *values() {
         for (const i of this.indexes()) {
-          yield this.valList[i];
+          if (!this.isBackgroundFetch(this.valList[i])) {
+            yield this.valList[i];
+          }
         }
       }
       *rvalues() {
         for (const i of this.rindexes()) {
-          yield this.valList[i];
+          if (!this.isBackgroundFetch(this.valList[i])) {
+            yield this.valList[i];
+          }
         }
       }
       [Symbol.iterator]() {
@@ -44958,6 +46018,8 @@ var require_lru_cache2 = __commonJS({
           const key = this.keyList[i];
           const v = this.valList[i];
           const value = this.isBackgroundFetch(v) ? v.__staleWhileFetching : v;
+          if (value === void 0)
+            continue;
           const entry = { value };
           if (this.ttls) {
             entry.ttl = this.ttls[i];
@@ -44981,7 +46043,7 @@ var require_lru_cache2 = __commonJS({
           this.set(key, entry.value, entry);
         }
       }
-      dispose(v, k, reason) {
+      dispose(_v, _k, _reason) {
       }
       set(k, v, {
         ttl = this.ttl,
@@ -44989,10 +46051,15 @@ var require_lru_cache2 = __commonJS({
         noDisposeOnSet = this.noDisposeOnSet,
         size = 0,
         sizeCalculation = this.sizeCalculation,
-        noUpdateTTL = this.noUpdateTTL
+        noUpdateTTL = this.noUpdateTTL,
+        status
       } = {}) {
         size = this.requireSize(k, v, size, sizeCalculation);
         if (this.maxEntrySize && size > this.maxEntrySize) {
+          if (status) {
+            status.set = "miss";
+            status.maxEntrySizeExceeded = true;
+          }
           this.delete(k);
           return this;
         }
@@ -45006,13 +46073,17 @@ var require_lru_cache2 = __commonJS({
           this.prev[index4] = this.tail;
           this.tail = index4;
           this.size++;
-          this.addItemSize(index4, size);
+          this.addItemSize(index4, size, status);
+          if (status) {
+            status.set = "add";
+          }
           noUpdateTTL = false;
         } else {
+          this.moveToTail(index4);
           const oldVal = this.valList[index4];
           if (v !== oldVal) {
             if (this.isBackgroundFetch(oldVal)) {
-              oldVal.__abortController.abort();
+              oldVal.__abortController.abort(new Error("replaced"));
             } else {
               if (!noDisposeOnSet) {
                 this.dispose(oldVal, k, "set");
@@ -45023,9 +46094,16 @@ var require_lru_cache2 = __commonJS({
             }
             this.removeItemSize(index4);
             this.valList[index4] = v;
-            this.addItemSize(index4, size);
+            this.addItemSize(index4, size, status);
+            if (status) {
+              status.set = "replace";
+              const oldValue = oldVal && this.isBackgroundFetch(oldVal) ? oldVal.__staleWhileFetching : oldVal;
+              if (oldValue !== void 0)
+                status.oldValue = oldValue;
+            }
+          } else if (status) {
+            status.set = "update";
           }
-          this.moveToTail(index4);
         }
         if (ttl !== 0 && this.ttl === 0 && !this.ttls) {
           this.initializeTTLTracking();
@@ -45033,6 +46111,7 @@ var require_lru_cache2 = __commonJS({
         if (!noUpdateTTL) {
           this.setItemTTL(index4, ttl, start);
         }
+        this.statusTTL(status, index4);
         if (this.disposeAfter) {
           while (this.disposed.length) {
             this.disposeAfter(...this.disposed.shift());
@@ -45064,7 +46143,7 @@ var require_lru_cache2 = __commonJS({
         const k = this.keyList[head];
         const v = this.valList[head];
         if (this.isBackgroundFetch(v)) {
-          v.__abortController.abort();
+          v.__abortController.abort(new Error("evicted"));
         } else {
           this.dispose(v, k, "evict");
           if (this.disposeAfter) {
@@ -45082,15 +46161,23 @@ var require_lru_cache2 = __commonJS({
         this.size--;
         return head;
       }
-      has(k, { updateAgeOnHas = this.updateAgeOnHas } = {}) {
+      has(k, { updateAgeOnHas = this.updateAgeOnHas, status } = {}) {
         const index4 = this.keyMap.get(k);
         if (index4 !== void 0) {
           if (!this.isStale(index4)) {
             if (updateAgeOnHas) {
               this.updateItemAge(index4);
             }
+            if (status)
+              status.has = "hit";
+            this.statusTTL(status, index4);
             return true;
+          } else if (status) {
+            status.has = "stale";
+            this.statusTTL(status, index4);
           }
+        } else if (status) {
+          status.has = "miss";
         }
         return false;
       }
@@ -45107,37 +46194,96 @@ var require_lru_cache2 = __commonJS({
           return v;
         }
         const ac = new AC();
+        if (options.signal) {
+          options.signal.addEventListener(
+            "abort",
+            () => ac.abort(options.signal.reason)
+          );
+        }
         const fetchOpts = {
           signal: ac.signal,
           options,
           context
         };
-        const cb = (v2) => {
-          if (!ac.signal.aborted) {
-            this.set(k, v2, fetchOpts.options);
+        const cb = (v2, updateCache = false) => {
+          const { aborted } = ac.signal;
+          const ignoreAbort = options.ignoreFetchAbort && v2 !== void 0;
+          if (options.status) {
+            if (aborted && !updateCache) {
+              options.status.fetchAborted = true;
+              options.status.fetchError = ac.signal.reason;
+              if (ignoreAbort)
+                options.status.fetchAbortIgnored = true;
+            } else {
+              options.status.fetchResolved = true;
+            }
+          }
+          if (aborted && !ignoreAbort && !updateCache) {
+            return fetchFail(ac.signal.reason);
+          }
+          if (this.valList[index4] === p) {
+            if (v2 === void 0) {
+              if (p.__staleWhileFetching) {
+                this.valList[index4] = p.__staleWhileFetching;
+              } else {
+                this.delete(k);
+              }
+            } else {
+              if (options.status)
+                options.status.fetchUpdated = true;
+              this.set(k, v2, fetchOpts.options);
+            }
           }
           return v2;
         };
         const eb = (er) => {
+          if (options.status) {
+            options.status.fetchRejected = true;
+            options.status.fetchError = er;
+          }
+          return fetchFail(er);
+        };
+        const fetchFail = (er) => {
+          const { aborted } = ac.signal;
+          const allowStaleAborted = aborted && options.allowStaleOnFetchAbort;
+          const allowStale = allowStaleAborted || options.allowStaleOnFetchRejection;
+          const noDelete = allowStale || options.noDeleteOnFetchRejection;
           if (this.valList[index4] === p) {
-            const del = !options.noDeleteOnFetchRejection || p.__staleWhileFetching === void 0;
+            const del = !noDelete || p.__staleWhileFetching === void 0;
             if (del) {
               this.delete(k);
-            } else {
+            } else if (!allowStaleAborted) {
               this.valList[index4] = p.__staleWhileFetching;
             }
           }
-          if (p.__returned === p) {
+          if (allowStale) {
+            if (options.status && p.__staleWhileFetching !== void 0) {
+              options.status.returnedStale = true;
+            }
+            return p.__staleWhileFetching;
+          } else if (p.__returned === p) {
             throw er;
           }
         };
-        const pcall = (res) => res(this.fetchMethod(k, v, fetchOpts));
+        const pcall = (res, rej) => {
+          this.fetchMethod(k, v, fetchOpts).then((v2) => res(v2), rej);
+          ac.signal.addEventListener("abort", () => {
+            if (!options.ignoreFetchAbort || options.allowStaleOnFetchAbort) {
+              res();
+              if (options.allowStaleOnFetchAbort) {
+                res = (v2) => cb(v2, true);
+              }
+            }
+          });
+        };
+        if (options.status)
+          options.status.fetchDispatched = true;
         const p = new Promise(pcall).then(cb, eb);
         p.__abortController = ac;
         p.__staleWhileFetching = v;
         p.__returned = null;
         if (index4 === void 0) {
-          this.set(k, p, fetchOpts.options);
+          this.set(k, p, { ...fetchOpts.options, status: void 0 });
           index4 = this.keyMap.get(k);
         } else {
           this.valList[index4] = p;
@@ -45160,14 +46306,22 @@ var require_lru_cache2 = __commonJS({
         sizeCalculation = this.sizeCalculation,
         noUpdateTTL = this.noUpdateTTL,
         noDeleteOnFetchRejection = this.noDeleteOnFetchRejection,
+        allowStaleOnFetchRejection = this.allowStaleOnFetchRejection,
+        ignoreFetchAbort = this.ignoreFetchAbort,
+        allowStaleOnFetchAbort = this.allowStaleOnFetchAbort,
         fetchContext = this.fetchContext,
-        forceRefresh = false
+        forceRefresh = false,
+        status,
+        signal
       } = {}) {
         if (!this.fetchMethod) {
+          if (status)
+            status.fetch = "get";
           return this.get(k, {
             allowStale,
             updateAgeOnGet,
-            noDeleteOnStaleGet
+            noDeleteOnStaleGet,
+            status
           });
         }
         const options = {
@@ -45179,49 +46333,84 @@ var require_lru_cache2 = __commonJS({
           size,
           sizeCalculation,
           noUpdateTTL,
-          noDeleteOnFetchRejection
+          noDeleteOnFetchRejection,
+          allowStaleOnFetchRejection,
+          allowStaleOnFetchAbort,
+          ignoreFetchAbort,
+          status,
+          signal
         };
         let index4 = this.keyMap.get(k);
         if (index4 === void 0) {
+          if (status)
+            status.fetch = "miss";
           const p = this.backgroundFetch(k, index4, options, fetchContext);
           return p.__returned = p;
         } else {
           const v = this.valList[index4];
           if (this.isBackgroundFetch(v)) {
-            return allowStale && v.__staleWhileFetching !== void 0 ? v.__staleWhileFetching : v.__returned = v;
-          }
-          if (!forceRefresh && !this.isStale(index4)) {
+            const stale = allowStale && v.__staleWhileFetching !== void 0;
+            if (status) {
+              status.fetch = "inflight";
+              if (stale)
+                status.returnedStale = true;
+            }
+            return stale ? v.__staleWhileFetching : v.__returned = v;
+          }
+          const isStale = this.isStale(index4);
+          if (!forceRefresh && !isStale) {
+            if (status)
+              status.fetch = "hit";
             this.moveToTail(index4);
             if (updateAgeOnGet) {
               this.updateItemAge(index4);
             }
+            this.statusTTL(status, index4);
             return v;
           }
           const p = this.backgroundFetch(k, index4, options, fetchContext);
-          return allowStale && p.__staleWhileFetching !== void 0 ? p.__staleWhileFetching : p.__returned = p;
+          const hasStale = p.__staleWhileFetching !== void 0;
+          const staleVal = hasStale && allowStale;
+          if (status) {
+            status.fetch = hasStale && isStale ? "stale" : "refresh";
+            if (staleVal && isStale)
+              status.returnedStale = true;
+          }
+          return staleVal ? p.__staleWhileFetching : p.__returned = p;
         }
       }
       get(k, {
         allowStale = this.allowStale,
         updateAgeOnGet = this.updateAgeOnGet,
-        noDeleteOnStaleGet = this.noDeleteOnStaleGet
+        noDeleteOnStaleGet = this.noDeleteOnStaleGet,
+        status
       } = {}) {
         const index4 = this.keyMap.get(k);
         if (index4 !== void 0) {
           const value = this.valList[index4];
           const fetching = this.isBackgroundFetch(value);
+          this.statusTTL(status, index4);
           if (this.isStale(index4)) {
+            if (status)
+              status.get = "stale";
             if (!fetching) {
               if (!noDeleteOnStaleGet) {
                 this.delete(k);
               }
+              if (status)
+                status.returnedStale = allowStale;
               return allowStale ? value : void 0;
             } else {
+              if (status) {
+                status.returnedStale = allowStale && value.__staleWhileFetching !== void 0;
+              }
               return allowStale ? value.__staleWhileFetching : void 0;
             }
           } else {
+            if (status)
+              status.get = "hit";
             if (fetching) {
-              return void 0;
+              return value.__staleWhileFetching;
             }
             this.moveToTail(index4);
             if (updateAgeOnGet) {
@@ -45229,6 +46418,8 @@ var require_lru_cache2 = __commonJS({
             }
             return value;
           }
+        } else if (status) {
+          status.get = "miss";
         }
       }
       connect(p, n) {
@@ -45262,7 +46453,7 @@ var require_lru_cache2 = __commonJS({
               this.removeItemSize(index4);
               const v = this.valList[index4];
               if (this.isBackgroundFetch(v)) {
-                v.__abortController.abort();
+                v.__abortController.abort(new Error("deleted"));
               } else {
                 this.dispose(v, k, "delete");
                 if (this.disposeAfter) {
@@ -45296,7 +46487,7 @@ var require_lru_cache2 = __commonJS({
         for (const index4 of this.rindexes({ allowStale: true })) {
           const v = this.valList[index4];
           if (this.isBackgroundFetch(v)) {
-            v.__abortController.abort();
+            v.__abortController.abort(new Error("deleted"));
           } else {
             const k = this.keyList[index4];
             this.dispose(v, k, "delete");
@@ -47366,9 +48557,10 @@ var require_promise2 = __commonJS({
 });
 
 // src/mysql-introspect.ts
-var mysqlImportsList, objToStatement22, timeConfig2, binaryConfig, importsPatch2, relations2, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault, column5, createTableColumns2, createTableIndexes2, createTableFKs2;
+var mysqlImportsList, objToStatement22, timeConfig2, binaryConfig, importsPatch2, relations2, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault, mapColumnDefaultForJson, column5, createTableColumns2, createTableIndexes2, createTablePKs2, createTableFKs2;
 var init_mysql_introspect = __esm({
   "src/mysql-introspect.ts"() {
+    "use strict";
     init_utils2();
     init_mysqlSerializer();
     mysqlImportsList = /* @__PURE__ */ new Set([
@@ -47398,7 +48590,8 @@ var init_mysql_introspect = __esm({
       "tinyint",
       "varbinary",
       "varchar",
-      "year"
+      "year",
+      "enum"
     ]);
     objToStatement22 = (json) => {
       json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
@@ -47453,8 +48646,10 @@ var init_mysql_introspect = __esm({
             (idx) => idx.isUnique ? "uniqueIndex" : "index"
           );
           const fkImpots = Object.values(it.foreignKeys).map((it2) => "foreignKey");
+          const pkImports = Object.values(it.compositePrimaryKeys).map((it2) => "primaryKey");
           res.mysql.push(...idxImports);
           res.mysql.push(...fkImpots);
+          res.mysql.push(...pkImports);
           const columnImports = Object.values(it.columns).map((col) => {
             var _a;
             let patched = (_a = importsPatch2[col.type]) != null ? _a : col.type;
@@ -47463,6 +48658,7 @@ var init_mysql_introspect = __esm({
             patched = patched.startsWith("binary(") ? "binary" : patched;
             patched = patched.startsWith("decimal(") ? "decimal" : patched;
             patched = patched.startsWith("smallint(") ? "smallint" : patched;
+            patched = patched.startsWith("enum(") ? "mysqlEnum" : patched;
             patched = patched.startsWith("varbinary(") ? "varbinary" : patched;
             return patched;
           }).filter((type) => {
@@ -47496,12 +48692,13 @@ var init_mysql_introspect = __esm({
         const filteredFKs = Object.values(table4.foreignKeys).filter((it) => {
           return it.columnsFrom.length > 1 || isSelf2(it);
         });
-        if (Object.keys(table4.indexes).length > 0 || filteredFKs.length > 0) {
+        if (Object.keys(table4.indexes).length > 0 || filteredFKs.length > 0 || Object.keys(table4.compositePrimaryKeys).length > 0) {
           statement += ",\n";
           statement += "(table) => {\n";
           statement += "	return {\n";
           statement += createTableIndexes2(table4.name, Object.values(table4.indexes));
           statement += createTableFKs2(Object.values(filteredFKs));
+          statement += createTablePKs2(Object.values(table4.compositePrimaryKeys));
           statement += "	}\n";
           statement += "}";
         }
@@ -47539,34 +48736,45 @@ import { sql } from "drizzle-orm/sql"
       }
       return defaultValue;
     };
-    column5 = (type, name, defaultValue) => {
+    mapColumnDefaultForJson = (defaultValue) => {
+      if (typeof defaultValue === "string" && defaultValue.startsWith("('") && defaultValue.endsWith("')")) {
+        return defaultValue.substring(2, defaultValue.length - 2);
+      }
+      return defaultValue;
+    };
+    column5 = (type, name, defaultValue, autoincrement) => {
       const lowered = type.toLowerCase();
       if (lowered === "serial") {
         return `${name.camelCase()}: serial("${name}")`;
       }
       if (lowered.startsWith("int")) {
         let out = `${name.camelCase()}: int("${name}")`;
+        out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("tinyint")) {
         let out = `${name.camelCase()}: tinyint("${name}")`;
+        out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("smallint")) {
         let out = `${name.camelCase()}: smallint("${name}")`;
+        out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("mediumint")) {
         let out = `${name.camelCase()}: mediumint("${name}")`;
+        out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("bigint")) {
-        let out = `${name.camelCase()}: bigint("${name}", { mode: "bigint" })`;
-        out += defaultValue ? `.default(BigInt(${mapColumnDefault(defaultValue)}))` : "";
+        let out = `${name.camelCase()}: bigint("${name}", { mode: "number" })`;
+        out += autoincrement ? `.autoincrement()` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered === "boolean") {
@@ -47574,8 +48782,13 @@ import { sql } from "drizzle-orm/sql"
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
-      if (lowered === "double") {
-        let out = `${name.camelCase()}: double("${name}")`;
+      if (lowered.startsWith("double")) {
+        let params;
+        if (lowered.length > 6) {
+          const [precision, scale] = lowered.slice(7, lowered.length - 1).split(",");
+          params = { precision, scale };
+        }
+        let out = params ? `${name.camelCase()}: double("${name}", ${timeConfig2(params)})` : `${name.camelCase()}: double("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
@@ -47593,7 +48806,7 @@ import { sql } from "drizzle-orm/sql"
         const keyLength = "timestamp".length + 1;
         let fsp = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
         fsp = fsp ? fsp : null;
-        const params = timeConfig2({ fsp });
+        const params = timeConfig2({ fsp, mode: "'string'" });
         let out = params ? `${name.camelCase()}: timestamp("${name}", ${params})` : `${name.camelCase()}: timestamp("${name}")`;
         defaultValue = defaultValue === "now()" || defaultValue === "(CURRENT_TIMESTAMP)" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         out += defaultValue;
@@ -47601,9 +48814,9 @@ import { sql } from "drizzle-orm/sql"
       }
       if (lowered.startsWith("time")) {
         const keyLength = "time".length + 1;
-        let precision = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
-        precision = precision ? precision : null;
-        const params = timeConfig2({ precision });
+        let fsp = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
+        fsp = fsp ? fsp : null;
+        const params = timeConfig2({ fsp });
         let out = params ? `${name.camelCase()}: time("${name}", ${params})` : `${name.camelCase()}: time("${name}")`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         out += defaultValue;
@@ -47643,6 +48856,7 @@ import { sql } from "drizzle-orm/sql"
       }
       if (lowered === "json") {
         let out = `${name.camelCase()}: json("${name}")`;
+        out += defaultValue ? `.default(${mapColumnDefaultForJson(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("varchar")) {
@@ -47663,7 +48877,12 @@ import { sql } from "drizzle-orm/sql"
       }
       if (lowered.startsWith("datetime")) {
         let out = `// you can use { mode: 'date' }, if you want to have Date as type for this column
-	${name}: datetime("${name}", { mode: 'string' } )`;
+	`;
+        const fsp = lowered.startsWith("datetime(") ? lowered.substring("datetime".length + 1, lowered.length - 1) : void 0;
+        out = fsp ? `${name.camelCase()}: datetime("${name}", { mode: 'string', fsp: ${lowered.substring(
+          "datetime".length + 1,
+          lowered.length - 1
+        )} })` : `${name.camelCase()}: datetime("${name}", { mode: 'string'})`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         out += defaultValue;
         return out;
@@ -47675,6 +48894,8 @@ import { sql } from "drizzle-orm/sql"
           params = { precision, scale };
         }
         let out = params ? `${name.camelCase()}: decimal("${name}", ${timeConfig2(params)})` : `${name.camelCase()}: decimal("${name}")`;
+        defaultValue = defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue;
         return out;
       }
       if (lowered.startsWith("binary")) {
@@ -47687,6 +48908,12 @@ import { sql } from "drizzle-orm/sql"
         out += defaultValue;
         return out;
       }
+      if (lowered.startsWith("enum")) {
+        const values = lowered.substring("enum".length + 1, lowered.length - 1);
+        let out = `${name.camelCase()}: mysqlEnum("${name}", [${values}])`;
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        return out;
+      }
       if (lowered.startsWith("varbinary")) {
         const keyLength = "varbinary".length + 1;
         let length = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
@@ -47714,7 +48941,7 @@ import { sql } from "drizzle-orm/sql"
       }, {});
       columns.forEach((it) => {
         statement += "	";
-        statement += column5(it.type, it.name, it.default);
+        statement += column5(it.type, it.name, it.default, it.autoincrement);
         statement += it.primaryKey ? ".primaryKey()" : "";
         statement += it.notNull ? ".notNull()" : "";
         const fks2 = fkByColumnName[it.name];
@@ -47749,6 +48976,21 @@ import { sql } from "drizzle-orm/sql"
         statement += `${escapedIndexName})`;
         statement += `.on(${it.columns.map((it2) => `table.${it2.camelCase()}`).join(", ")}),`;
         statement += `
+`;
+      });
+      return statement;
+    };
+    createTablePKs2 = (pks) => {
+      let statement = "";
+      pks.forEach((it) => {
+        let idxKey = it.name.camelCase();
+        statement += `		${idxKey}: `;
+        statement += "primaryKey(";
+        statement += `${it.columns.map((c) => {
+          return `table.${c.camelCase()}`;
+        }).join(", ")}`;
+        statement += ")";
+        statement += `
 `;
       });
       return statement;
@@ -47785,6 +49027,7 @@ __export(mysqlIntrospect_exports, {
 var import_hanji5, import_promise, MySQLConfig1, MySQLConfig2, Conf2, mysqlIntrospect;
 var init_mysqlIntrospect = __esm({
   "src/cli/commands/mysqlIntrospect.ts"() {
+    "use strict";
     import_hanji5 = __toESM(require_hanji());
     init_lib();
     init_views();
@@ -47862,7 +49105,7 @@ init_lib();
 // src/cli/commands/check.ts
 init_utils();
 var checkHandler = (out, dialect6) => {
-  const { snapshots } = prepareOutFolder(out, dialect6);
+  const { snapshots } = prepareOutFolder2(out, dialect6);
   const report = validateWithReport(snapshots, dialect6);
   if (report.nonLatest.length > 0) {
     console.log(
@@ -47899,7 +49142,7 @@ var checkHandler = (out, dialect6) => {
 // src/cli/index.ts
 var import_hanji6 = __toESM(require_hanji());
 init_views();
-var import_path8 = __toESM(require("path"));
+var import_path6 = __toESM(require("path"));
 
 // src/cli/utils.ts
 init_views();
@@ -47946,7 +49189,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.16.9",
+  version: "0.17.0",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Drizzle Team",
   license: "MIT",
@@ -47954,11 +49197,15 @@ var package_default = {
     "drizzle-kit": "./index.js"
   },
   scripts: {
-    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate --out ./dev/migrations --dialect pg --schema ./dev/data",
-    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/migrations --schema ./dev/migrations/schema.ts",
+    "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
+    "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/introspect-pg --schema ./dev/introspect-pg/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/migrations --connectionString ",
-    "up:pg": "node -r esbuild-register ./src/cli/index.ts up --out ./dev/equedi --dialect pg",
+    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --out ./dev/introspect-mysql --connectionString",
+    "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",
     "check:equedi": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/equedi --dialect pg",
     run: "node -r esbuild-register index.ts",
     watch: "esbuild ./src/clie/index.ts --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --external:pg-native --sourcemap --watch",
@@ -47968,7 +49215,7 @@ var package_default = {
     "prepare-snapshot": "node -r esbuild-register ./dev/prepare-snapshot prepare ./dev/data",
     sim: "node -r esbuild-register ./dev/simulate.ts",
     "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
-    test: "ava test",
+    test: "ava test --timeout=60s",
     build: "pnpm build:cli && pnpm build:utils",
     "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",
@@ -48008,7 +49255,7 @@ var package_default = {
     ava: "^5.1.0",
     dockerode: "^3.3.4",
     "drizzle-kit": "^0.16.8",
-    "drizzle-orm": "0.21.0-2e66963",
+    "drizzle-orm": "0.21.0-26e3751",
     esbuild: "^0.15.7",
     "esbuild-register": "^3.3.3",
     eslint: "^8.29.0",
@@ -48029,228 +49276,39 @@ init_migrate();
 init_utils2();
 init_pgSchema();
 init_utils();
-
-// src/cli/commands/pgUp.ts
-init_source();
-var import_crypto2 = require("crypto");
-var import_fs6 = require("fs");
-init_global();
-init_pgSchema();
-init_utils();
-var upPgHandler = (out) => {
-};
-var upPgHandlerV4 = (out) => {
-  const snapshots = snapshotsPriorV4(out);
-  const report = validateWithReport(snapshots, "pg");
-  let prevId = originUUID;
-  report.nonLatest.map((it) => ({
-    path: it,
-    raw: report.rawMap[it]
-  })).forEach((it) => {
-    const path4 = it.path;
-    const result = updateUpToV4(it.raw, prevId);
-    prevId = result.id;
-    console.log(`[${source_default.green("\u2713")}] ${path4}`);
-    (0, import_fs6.writeFileSync)(path4, JSON.stringify(result, null, 2));
-  });
-  console.log("Everything's fine \u{1F436}\u{1F525}");
-};
-var updateUpToV4 = (json, prevId) => {
-  const version = Number(json["version"]);
-  if (version === 1) {
-    const v1 = pgSchemaV1.parse(json);
-    const v2 = update1to2(v1);
-    const v3 = update2to3(v2, prevId);
-    const v4 = update3to4(v3);
-    return v4;
-  }
-  if (version === 2) {
-    const v2 = pgSchemaV2.parse(json);
-    const v3 = update2to3(v2, prevId);
-    const v4 = update3to4(v3);
-    return v4;
-  }
-  if (version === 3) {
-    return update3to4(pgSchemaV3.parse(json));
-  }
-  return pgSchemaV4.parse(json);
-};
-var update1to2 = (json) => {
-  const tables = Object.fromEntries(
-    Object.entries(json.tables).map((it) => {
-      const table4 = it[1];
-      const columns = Object.fromEntries(
-        Object.entries(table4.columns).map((it2) => {
-          const ref = it2[1].references;
-          const fkName = ref == null ? void 0 : ref.foreignKeyName;
-          const table5 = ref == null ? void 0 : ref.table;
-          const column6 = ref == null ? void 0 : ref.column;
-          const onDelete = ref == null ? void 0 : ref.onDelete;
-          const onUpdate = ref == null ? void 0 : ref.onDelete;
-          const newRef = ref ? `${fkName};${table5};${column6};${onDelete != null ? onDelete : ""};${onUpdate != null ? onUpdate : ""}` : void 0;
-          return [it2[0], { ...it2[1], references: newRef }];
-        })
-      );
-      return [it[0], { name: table4.name, columns, indexes: table4.indexes }];
-    })
-  );
-  return { version: "2", tables, enums: json.enums };
-};
-var update2to3 = (json, prevId) => {
-  const tables = Object.fromEntries(
-    Object.entries(json.tables).map((table4) => {
-      const { name, columns, indexes } = table4[1];
-      let refs = [];
-      const newColumns = Object.fromEntries(
-        Object.entries(columns).map((it) => {
-          const {
-            name: name2,
-            type,
-            primaryKey,
-            notNull,
-            default: defaultValue,
-            references: references2
-          } = it[1];
-          const newColumn = {
-            name: name2,
-            type,
-            primaryKey,
-            notNull,
-            default: defaultValue
-          };
-          if (references2) {
-            refs.push({ column: name2, value: references2 });
-          }
-          return [it[0], newColumn];
-        })
-      );
-      const tableName = name;
-      const fks = Object.fromEntries(
-        refs.map((it) => {
-          const [name2, table5, column6, onDelete, onUpdate] = it.value.split(";");
-          const fk4 = {
-            name: name2,
-            tableFrom: tableName,
-            columnsFrom: [it.column],
-            tableTo: table5,
-            columnsTo: [column6],
-            onUpdate,
-            onDelete
-          };
-          return [name2, fk4];
-        })
-      );
-      const idxs = Object.fromEntries(
-        Object.entries(indexes).map((it) => {
-          const { columns: columns2, isUnique, name: name2 } = it[1];
-          const mappedColumns = Object.entries(columns2).map((it2) => {
-            return it2[1].name;
-          });
-          const index4 = {
-            name: name2,
-            isUnique,
-            columns: mappedColumns
-          };
-          return [it[0], index4];
-        })
-      );
-      const newTable = {
-        name,
-        columns: newColumns,
-        indexes: idxs,
-        foreignKeys: fks
-      };
-      return [table4[0], newTable];
-    })
-  );
-  return {
-    version: "3",
-    dialect: "pg",
-    id: (0, import_crypto2.randomUUID)(),
-    prevId,
-    tables,
-    enums: json.enums
-  };
-};
-var update3to4 = (json) => {
-  const tables = Object.fromEntries(
-    Object.entries(json.tables).map((table4) => {
-      const { name, columns, foreignKeys, indexes } = table4[1];
-      const newColumns = Object.fromEntries(
-        Object.entries(columns).map((it) => {
-          const {
-            name: name2,
-            type,
-            primaryKey,
-            notNull,
-            default: defaultValue
-          } = it[1];
-          const newColumn = {
-            name: name2,
-            type,
-            primaryKey,
-            notNull,
-            default: defaultValue
-          };
-          return [it[0], newColumn];
-        })
-      );
-      const newTable = {
-        name,
-        schema: "",
-        columns: newColumns,
-        indexes,
-        foreignKeys
-      };
-      return [table4[0], newTable];
-    })
-  );
-  return {
-    version: "4",
-    dialect: "pg",
-    id: (0, import_crypto2.randomUUID)(),
-    prevId: json.prevId,
-    tables,
-    enums: json.enums,
-    schemas: {}
-  };
-};
+init_pgUp();
 
 // src/cli/commands/sqliteUp.ts
 init_source();
-var import_fs7 = __toESM(require("fs"));
-var import_path5 = __toESM(require("path"));
+var import_fs8 = __toESM(require("fs"));
 init_sqliteSchema();
 init_utils();
 var upSqliteHandler = (out) => {
-  const { snapshots } = prepareOutFolder(out, "sqlite");
+};
+var upSqliteHandlerV4 = (out) => {
+  const snapshots = snapshotsPriorV4(out);
   const report = validateWithReport(snapshots, "sqlite");
   report.nonLatest.map((it) => ({
-    folder: it,
+    path: it,
     raw: report.rawMap[it]
   })).forEach((it) => {
-    const folder = it.folder;
-    const result = updateToLatest(it.raw);
-    console.log(
-      `[${source_default.green("\u2713")}] ${import_path5.default.join(out, folder, "snapshot.json")}`
-    );
-    import_fs7.default.writeFileSync(
-      import_path5.default.join(out, folder, "snapshot.json"),
-      JSON.stringify(result, null, 2)
-    );
+    const path2 = it.path;
+    const result = updateToLatestV42(it.raw);
+    console.log(`[${source_default.green("\u2713")}] ${path2}`);
+    import_fs8.default.writeFileSync(path2, JSON.stringify(result, null, 2));
   });
   console.log("Everything's fine \u{1F436}\u{1F525}");
 };
-var updateToLatest = (json) => {
+var updateToLatestV42 = (json) => {
   const version = Number(json["version"]);
   if (version === 3) {
     const v3 = sqliteSchemaV3.parse(json);
-    const v4 = updateV3toV4(v3);
+    const v4 = updateV3toV42(v3);
     return v4;
   }
   return sqliteSchemaV4.parse(json);
 };
-var updateV3toV4 = (old) => {
+var updateV3toV42 = (old) => {
   const mappedTables = Object.fromEntries(
     Object.entries(old.tables).map((it) => {
       const mappedTable = { ...it[1], compositePrimaryKeys: {} };
@@ -48264,51 +49322,8 @@ var updateV3toV4 = (old) => {
   };
 };
 
-// src/cli/commands/mysqlUp.ts
-init_source();
-var import_fs8 = __toESM(require("fs"));
-var import_path6 = __toESM(require("path"));
-init_mysqlSchema();
-init_utils();
-var upMysqlHandler = (out) => {
-};
-var upMysqlHandlerV4 = (out) => {
-  const { snapshots } = prepareOutFolder(out, "mysql");
-  const report = validateWithReport(snapshots, "mysql");
-  report.nonLatest.map((it) => ({
-    folder: it,
-    raw: report.rawMap[it]
-  })).forEach((it) => {
-    const folder = it.folder;
-    const result = updateToLatestV4(it.raw);
-    console.log(
-      `[${source_default.green("\u2713")}] ${import_path6.default.join(out, folder, "snapshot.json")}`
-    );
-    import_fs8.default.writeFileSync(
-      import_path6.default.join(out, folder, "snapshot.json"),
-      JSON.stringify(result, null, 2)
-    );
-  });
-  console.log("Everything's fine \u{1F436}\u{1F525}");
-};
-var updateToLatestV4 = (json) => {
-  const version = Number(json["version"]);
-  if (version === 3) {
-    const v3 = mysqlSchemaV3.parse(json);
-    const v4 = updateV3toV42(v3);
-    return v4;
-  }
-  return mysqlSchemaV4.parse(json);
-};
-var updateV3toV42 = (old) => {
-  return {
-    ...old,
-    version: "4",
-    schemas: {}
-  };
-};
-
 // src/cli/index.ts
+init_mysqlUp();
 init_upFolders();
 init_mysqlSchema();
 
@@ -48316,10 +49331,10 @@ init_mysqlSchema();
 init_source();
 var import_fs9 = require("fs");
 var import_hanji3 = __toESM(require_hanji());
-var import_path7 = require("path");
+var import_path5 = require("path");
 init_views();
 var dropMigration = async (out) => {
-  const metaFilePath = (0, import_path7.join)(out, "meta", "_journal.json");
+  const metaFilePath = (0, import_path5.join)(out, "meta", "_journal.json");
   const journal = JSON.parse(
     (0, import_fs9.readFileSync)(metaFilePath, "utf-8")
   );
@@ -48331,8 +49346,8 @@ var dropMigration = async (out) => {
     ...journal,
     entries: journal.entries.filter(Boolean)
   };
-  const sqlFilePath = (0, import_path7.join)(out, `${result.data.tag}.sql`);
-  const snapshotFilePath = (0, import_path7.join)(out, "meta", `${result.data.idx.toFixed(0).padStart(4, "0")}_snapshot.json`);
+  const sqlFilePath = (0, import_path5.join)(out, `${result.data.tag}.sql`);
+  const snapshotFilePath = (0, import_path5.join)(out, "meta", `${result.data.idx.toFixed(0).padStart(4, "0")}_snapshot.json`);
   (0, import_fs9.rmSync)(sqlFilePath);
   (0, import_fs9.rmSync)(snapshotFilePath);
   (0, import_fs9.writeFileSync)(metaFilePath, JSON.stringify(resultJournal));
@@ -48347,13 +49362,13 @@ var printVersions = () => {
 var assertEitherConfigOrOut = (config, out) => {
   if (out)
     return out;
-  if (!(0, import_fs10.existsSync)(import_path8.default.join(import_path8.default.resolve(config)))) {
+  if (!(0, import_fs10.existsSync)(import_path6.default.join(import_path6.default.resolve(config)))) {
     console.log(`${config} file does not exist`);
     process.exit(1);
   }
   console.log(`Reading ${config}`);
   const drizzleConfig = JSON.parse(
-    import_fs10.default.readFileSync(import_path8.default.join(import_path8.default.resolve(config))).toString()
+    import_fs10.default.readFileSync(import_path6.default.join(import_path6.default.resolve(config))).toString()
   );
   return drizzleConfig.out;
 };
@@ -48375,12 +49390,13 @@ var optionsSchema = objectType({
   config: stringType().optional(),
   breakpoints: booleanType().optional().default(false)
 }).strict();
-var generatePgCommand = new Command("generate:pg").option("--schema <schema>", "Path to a schema file or folder").option("--out <out>", `Output folder, 'drizzle' by default`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option(
+var generatePgCommand = new Command("generate:pg").option("--schema <schema...>", "Path to a schema file or folder").option("--out <out>", `Output folder, 'drizzle' by default`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option(
   "--config <config>",
   "Path to a config.json file, drizzle.config.json by default"
 ).action(async (options) => {
   printVersions();
   assertOrmCoreVersion();
+  console.log(options);
   const oprtionsParsed = optionsSchema.parse(options);
   const result = prepareGenerateConfig(oprtionsParsed);
   if (result instanceof Error) {
@@ -48391,7 +49407,7 @@ var generatePgCommand = new Command("generate:pg").option("--schema <schema>", "
   const { prepareAndMigratePg: prepareAndMigratePg2 } = (init_migrate(), __toCommonJS(migrate_exports));
   await prepareAndMigratePg2(result);
 });
-var generateMysqlCommand = new Command("generate:mysql").option("--schema <schema>", "Path to a schema file or folder").option("--out <out>", `Output folder, 'drizzle' by default`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option(
+var generateMysqlCommand = new Command("generate:mysql").option("--schema <schema...>", "Path to a schema file or folder").option("--out <out>", `Output folder, 'drizzle' by default`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option(
   "--config <config>",
   "Path to a config.json file, drizzle.config.json by default"
 ).action(async (options) => {
@@ -48407,7 +49423,7 @@ var generateMysqlCommand = new Command("generate:mysql").option("--schema <schem
   const { prepareAndMigrateMySql: prepareAndMigrateMySql2 } = (init_migrate(), __toCommonJS(migrate_exports));
   await prepareAndMigrateMySql2(result);
 });
-var generateSqliteCommand = new Command("generate:sqlite").option("--schema <schema>", "Path to a schema file or folder").option("--out <out>", `Output folder, 'drizzle' by default`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option(
+var generateSqliteCommand = new Command("generate:sqlite").option("--schema <schema...>", "Path to a schema file or folder").option("--out <out>", `Output folder, 'drizzle' by default`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option(
   "--config <config>",
   "Path to a config.json file, drizzle.config.json by default"
 ).action(async (options) => {
@@ -48426,9 +49442,9 @@ var generateSqliteCommand = new Command("generate:sqlite").option("--schema <sch
 var prepareGenerateConfig = (options) => {
   const { schema: schema4, out, config, breakpoints } = options;
   if (!(schema4 || out)) {
-    const path4 = config != null ? config : "drizzle.config.json";
+    const path2 = config != null ? config : "drizzle.config.json";
     const drizzleConfig = JSON.parse(
-      import_fs10.default.readFileSync(import_path8.default.join(import_path8.default.resolve(path4))).toString()
+      import_fs10.default.readFileSync(import_path6.default.join(import_path6.default.resolve(path2))).toString()
     );
     return drizzleConfig;
   }
@@ -48514,6 +49530,8 @@ var upSqliteCommand = new Command("up:sqlite").option("--out <out>", `Output fol
     console.log(error(`'out' folder param must be set`));
     process.exit(0);
   }
+  upSqliteHandlerV4(out);
+  upgradeFolders("sqlite", out);
   upSqliteHandler(out);
 });
 var pt1 = objectType({
@@ -48534,16 +49552,18 @@ var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Mi
     console.log("Missing required params");
     return;
   }
-  const { snapshots, journal } = prepareOutFolder(res.data.out, "pg");
+  const { snapshots, journal } = prepareOutFolder2(res.data.out, "pg");
   const { schema: schema4, ts } = await pgIntrospect2(res.data);
-  const schemaFile = import_path8.default.join(res.data.out, "schema.ts");
+  const schemaFile = import_path6.default.join(res.data.out, "schema.ts");
   (0, import_fs10.writeFileSync)(schemaFile, ts);
   console.log();
   if (snapshots.length === 0) {
     const { sqlStatements, _meta } = await prepareSQL(
       squashPgScheme(dryPg),
       squashPgScheme(schema4),
-      "pg"
+      "pg",
+      dryMySql,
+      schema4
     );
     writeResult(
       schema4,
@@ -48583,16 +49603,18 @@ var introspectMySqlCommand = new Command("introspect:mysql").option("--out <out>
     console.log("Missing required params");
     return;
   }
-  const { snapshots, journal } = prepareOutFolder(res.data.out, "mysql");
+  const { snapshots, journal } = prepareOutFolder2(res.data.out, "mysql");
   const { schema: schema4, ts } = await mysqlIntrospect2(res.data);
-  const schemaFile = import_path8.default.join(res.data.out, "schema.ts");
+  const schemaFile = import_path6.default.join(res.data.out, "schema.ts");
   (0, import_fs10.writeFileSync)(schemaFile, ts);
   console.log();
   if (snapshots.length === 0) {
     const { sqlStatements, _meta } = await prepareSQL(
       squashMysqlScheme(dryMySql),
       squashMysqlScheme(schema4),
-      "mysql"
+      "mysql",
+      dryMySql,
+      schema4
     );
     writeResult(
       schema4,