drizzle-kit 0.19.2-f1211c0 → 0.19.3-23a3dbf

package/index.d.ts

@@ -34,10 +34,7 @@ export type Config = {
         password?: string;
         database: string;
         ssl?: boolean;
-    };
-} | {
-    driver: "pg";
-    dbCredentials: {
+    } | {
         connectionString: string;
     };
 } | {
@@ -48,11 +45,7 @@ export type Config = {
         user?: string;
         password?: string;
         database: string;
-        connectionString: string;
-    };
-} | {
-    driver: "mysql2";
-    dbCredentials: {
+    } | {
         connectionString: string;
     };
 } | {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.2-f1211c0",
+  "version": "0.19.3-23a3dbf",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -37,7 +37,8 @@
     "build:dev": "rm -rf ./dist && tsx build.dev.ts && tsc -p tsconfig.cli-types.json && chmod +x ./dist/index.cjs",
     "pack": "build && package",
     "tsc": "tsc -p tsconfig.build.json",
-    "pub": "cp package.json readme.md dist/ && cd dist && npm publish"
+    "pub": "cp package.json readme.md dist/ && cd dist && npm publish",
+    "studio": "./dist/index.cjs studio --verbose"
   },
   "ava": {
     "files": [
@@ -51,10 +52,13 @@
     ]
   },
   "dependencies": {
+    "@drizzle-team/studio": "file:drizzle-team-studio-0.0.1.tgz",
     "@esbuild-kit/esm-loader": "^2.5.5",
     "camelcase": "^7.0.1",
     "chalk": "^5.2.0",
     "commander": "^9.4.1",
+    "esbuild": "^0.18.6",
+    "esbuild-register": "^3.4.2",
     "glob": "^8.1.0",
     "hanji": "^0.0.5",
     "json-diff": "0.9.0",
@@ -75,15 +79,14 @@
     "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-orm": "0.27.0-56b9edc",
-    "esbuild": "^0.17.19",
-    "esbuild-register": "^3.4.2",
+    "drizzle-orm": "0.27.0",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "get-port": "^6.1.2",
     "mysql2": "2.3.3",
     "pg": "^8.8.0",
+    "postgres": "^3.3.5",
     "prettier": "^2.8.1",
     "tsx": "^3.12.1",
     "typescript": "^4.9.4",

package/utils.js

@@ -1539,7 +1539,7 @@ var init_lib = __esm({
         message: issueData.message || errorMessage
       };
     };
-    ParseStatus = class {
+    ParseStatus = class _ParseStatus {
       constructor() {
         this.value = "valid";
       }
@@ -1570,7 +1570,7 @@ var init_lib = __esm({
             value: await pair.value
           });
         }
-        return ParseStatus.mergeObjectSync(status, syncPairs);
+        return _ParseStatus.mergeObjectSync(status, syncPairs);
       }
       static mergeObjectSync(status, pairs) {
         const finalObject = {};
@@ -1886,7 +1886,7 @@ var init_lib = __esm({
         }
       }
     };
-    ZodString = class extends ZodType {
+    ZodString = class _ZodString extends ZodType {
       constructor() {
         super(...arguments);
         this._regex = (regex, validation, message) => this.refinement((data) => regex.test(data), {
@@ -1895,7 +1895,7 @@ var init_lib = __esm({
           ...errorUtil.errToObj(message)
         });
         this.nonempty = (message) => this.min(1, errorUtil.errToObj(message));
-        this.trim = () => new ZodString({
+        this.trim = () => new _ZodString({
           ...this._def,
           checks: [...this._def.checks, { kind: "trim" }]
         });
@@ -2067,7 +2067,7 @@ var init_lib = __esm({
         return { status: status.value, value: input.data };
       }
       _addCheck(check) {
-        return new ZodString({
+        return new _ZodString({
           ...this._def,
           checks: [...this._def.checks, check]
         });
@@ -2188,7 +2188,7 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodNumber = class extends ZodType {
+    ZodNumber = class _ZodNumber extends ZodType {
       constructor() {
         super(...arguments);
         this.min = this.gte;
@@ -2289,7 +2289,7 @@ var init_lib = __esm({
         return this.setLimit("max", value, false, errorUtil.toString(message));
       }
       setLimit(kind, value, inclusive, message) {
-        return new ZodNumber({
+        return new _ZodNumber({
           ...this._def,
           checks: [
             ...this._def.checks,
@@ -2303,7 +2303,7 @@ var init_lib = __esm({
         });
       }
       _addCheck(check) {
-        return new ZodNumber({
+        return new _ZodNumber({
           ...this._def,
           checks: [...this._def.checks, check]
         });
@@ -2442,7 +2442,7 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodDate = class extends ZodType {
+    ZodDate = class _ZodDate extends ZodType {
       _parse(input) {
         if (this._def.coerce) {
           input.data = new Date(input.data);
@@ -2503,7 +2503,7 @@ var init_lib = __esm({
         };
       }
       _addCheck(check) {
-        return new ZodDate({
+        return new _ZodDate({
           ...this._def,
           checks: [...this._def.checks, check]
         });
@@ -2682,7 +2682,7 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodArray = class extends ZodType {
+    ZodArray = class _ZodArray extends ZodType {
       _parse(input) {
         const { ctx, status } = this._processInputParams(input);
         const def = this._def;
@@ -2752,19 +2752,19 @@ var init_lib = __esm({
         return this._def.type;
       }
       min(minLength, message) {
-        return new ZodArray({
+        return new _ZodArray({
           ...this._def,
           minLength: { value: minLength, message: errorUtil.toString(message) }
         });
       }
       max(maxLength, message) {
-        return new ZodArray({
+        return new _ZodArray({
           ...this._def,
           maxLength: { value: maxLength, message: errorUtil.toString(message) }
         });
       }
       length(len, message) {
-        return new ZodArray({
+        return new _ZodArray({
           ...this._def,
           exactLength: { value: len, message: errorUtil.toString(message) }
         });
@@ -2801,7 +2801,7 @@ var init_lib = __esm({
         })
       });
     };
-    ZodObject = class extends ZodType {
+    ZodObject = class _ZodObject extends ZodType {
       constructor() {
         super(...arguments);
         this._cached = null;
@@ -2907,7 +2907,7 @@ var init_lib = __esm({
       }
       strict(message) {
         errorUtil.errToObj;
-        return new ZodObject({
+        return new _ZodObject({
           ...this._def,
           unknownKeys: "strict",
           ...message !== void 0 ? {
@@ -2926,13 +2926,13 @@ var init_lib = __esm({
         });
       }
       strip() {
-        return new ZodObject({
+        return new _ZodObject({
           ...this._def,
           unknownKeys: "strip"
         });
       }
       passthrough() {
-        return new ZodObject({
+        return new _ZodObject({
           ...this._def,
           unknownKeys: "passthrough"
         });
@@ -2946,7 +2946,7 @@ var init_lib = __esm({
        * upgrade if you are experiencing issues.
        */
       merge(merging) {
-        const merged = new ZodObject({
+        const merged = new _ZodObject({
           unknownKeys: merging._def.unknownKeys,
           catchall: merging._def.catchall,
           shape: () => objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
@@ -2955,7 +2955,7 @@ var init_lib = __esm({
         return merged;
       }
       catchall(index4) {
-        return new ZodObject({
+        return new _ZodObject({
           ...this._def,
           catchall: index4
         });
@@ -2966,7 +2966,7 @@ var init_lib = __esm({
           if (this.shape[key])
             shape[key] = this.shape[key];
         });
-        return new ZodObject({
+        return new _ZodObject({
           ...this._def,
           shape: () => shape
         });
@@ -2978,7 +2978,7 @@ var init_lib = __esm({
             shape[key] = this.shape[key];
           }
         });
-        return new ZodObject({
+        return new _ZodObject({
           ...this._def,
           shape: () => shape
         });
@@ -2996,7 +2996,7 @@ var init_lib = __esm({
               newShape[key] = this.shape[key].optional();
             }
           });
-          return new ZodObject({
+          return new _ZodObject({
             ...this._def,
             shape: () => newShape
           });
@@ -3006,7 +3006,7 @@ var init_lib = __esm({
             newShape[key] = fieldSchema.optional();
           }
         }
-        return new ZodObject({
+        return new _ZodObject({
           ...this._def,
           shape: () => newShape
         });
@@ -3036,7 +3036,7 @@ var init_lib = __esm({
             newShape[key] = newField;
           }
         }
-        return new ZodObject({
+        return new _ZodObject({
           ...this._def,
           shape: () => newShape
         });
@@ -3184,7 +3184,7 @@ var init_lib = __esm({
         return null;
       }
     };
-    ZodDiscriminatedUnion = class extends ZodType {
+    ZodDiscriminatedUnion = class _ZodDiscriminatedUnion extends ZodType {
       _parse(input) {
         const { ctx } = this._processInputParams(input);
         if (ctx.parsedType !== ZodParsedType.object) {
@@ -3251,7 +3251,7 @@ var init_lib = __esm({
             optionsMap.set(value, type);
           }
         }
-        return new ZodDiscriminatedUnion({
+        return new _ZodDiscriminatedUnion({
           typeName: ZodFirstPartyTypeKind.ZodDiscriminatedUnion,
           discriminator,
           options,
@@ -3313,7 +3313,7 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodTuple = class extends ZodType {
+    ZodTuple = class _ZodTuple extends ZodType {
       _parse(input) {
         const { status, ctx } = this._processInputParams(input);
         if (ctx.parsedType !== ZodParsedType.array) {
@@ -3363,7 +3363,7 @@ var init_lib = __esm({
         return this._def.items;
       }
       rest(rest) {
-        return new ZodTuple({
+        return new _ZodTuple({
           ...this._def,
           rest
         });
@@ -3380,7 +3380,7 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodRecord = class extends ZodType {
+    ZodRecord = class _ZodRecord extends ZodType {
       get keySchema() {
         return this._def.keyType;
       }
@@ -3417,14 +3417,14 @@ var init_lib = __esm({
       }
       static create(first, second, third) {
         if (second instanceof ZodType) {
-          return new ZodRecord({
+          return new _ZodRecord({
             keyType: first,
             valueType: second,
             typeName: ZodFirstPartyTypeKind.ZodRecord,
             ...processCreateParams(third)
           });
         }
-        return new ZodRecord({
+        return new _ZodRecord({
           keyType: ZodString.create(),
           valueType: first,
           typeName: ZodFirstPartyTypeKind.ZodRecord,
@@ -3492,7 +3492,7 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodSet = class extends ZodType {
+    ZodSet = class _ZodSet extends ZodType {
       _parse(input) {
         const { status, ctx } = this._processInputParams(input);
         if (ctx.parsedType !== ZodParsedType.set) {
@@ -3550,13 +3550,13 @@ var init_lib = __esm({
         }
       }
       min(minSize, message) {
-        return new ZodSet({
+        return new _ZodSet({
           ...this._def,
           minSize: { value: minSize, message: errorUtil.toString(message) }
         });
       }
       max(maxSize, message) {
-        return new ZodSet({
+        return new _ZodSet({
           ...this._def,
           maxSize: { value: maxSize, message: errorUtil.toString(message) }
         });
@@ -3577,7 +3577,7 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodFunction = class extends ZodType {
+    ZodFunction = class _ZodFunction extends ZodType {
       constructor() {
         super(...arguments);
         this.validate = this.implement;
@@ -3662,13 +3662,13 @@ var init_lib = __esm({
         return this._def.returns;
       }
       args(...items) {
-        return new ZodFunction({
+        return new _ZodFunction({
           ...this._def,
           args: ZodTuple.create(items).rest(ZodUnknown.create())
         });
       }
       returns(returnType) {
-        return new ZodFunction({
+        return new _ZodFunction({
           ...this._def,
           returns: returnType
         });
@@ -3682,7 +3682,7 @@ var init_lib = __esm({
         return validatedFunc;
       }
       static create(args, returns, params) {
-        return new ZodFunction({
+        return new _ZodFunction({
           args: args ? args : ZodTuple.create([]).rest(ZodUnknown.create()),
           returns: returns || ZodUnknown.create(),
           typeName: ZodFirstPartyTypeKind.ZodFunction,
@@ -4093,7 +4093,7 @@ var init_lib = __esm({
         return this._def.type;
       }
     };
-    ZodPipeline = class extends ZodType {
+    ZodPipeline = class _ZodPipeline extends ZodType {
       _parse(input) {
         const { status, ctx } = this._processInputParams(input);
         if (ctx.common.async) {
@@ -4141,7 +4141,7 @@ var init_lib = __esm({
         }
       }
       static create(a, b) {
-        return new ZodPipeline({
+        return new _ZodPipeline({
           in: a,
           out: b,
           typeName: ZodFirstPartyTypeKind.ZodPipeline
@@ -13594,7 +13594,7 @@ var isPgNativeType = (it) => {
   if (pgNativeTypes.has(it))
     return true;
   const toCheck = it.replace(/ /g, "");
-  return toCheck.startsWith("varchar(") || toCheck.startsWith("char(") || toCheck.startsWith("numeric(") || toCheck.startsWith("timestamp(");
+  return toCheck.startsWith("varchar(") || toCheck.startsWith("char(") || toCheck.startsWith("numeric(") || toCheck.startsWith("timestamp(") || toCheck.startsWith("intervalyear(") || toCheck.startsWith("intervalmonth(") || toCheck.startsWith("intervalday(") || toCheck.startsWith("intervalhour(") || toCheck.startsWith("intervalminute(") || toCheck.startsWith("intervalsecond(") || toCheck.startsWith("intervalyeartomonth(") || toCheck.startsWith("intervaldaytohour(") || toCheck.startsWith("intervaldaytominute(") || toCheck.startsWith("intervaldaytosecond(") || toCheck.startsWith("intervalhourtominute(") || toCheck.startsWith("intervalhourtosecond(") || toCheck.startsWith("intervalminutetosecond(") || /^(\w+)(\[\d*])+$/.test(it);
 };
 var Convertor = class {
 };
@@ -13676,9 +13676,9 @@ var SQLiteCreateTableConvertor = class extends Convertor {
       const primaryKeyStatement = column4.primaryKey ? " PRIMARY KEY" : "";
       const notNullStatement = column4.notNull ? " NOT NULL" : "";
       const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
-      const autoincrementStatement = column4.autoincrement ? " AUTO_INCREMENT" : "";
+      const autoincrementStatement = column4.autoincrement ? " AUTOINCREMENT" : "";
       statement += "\n	";
-      statement += `\`${column4.name}\` ${column4.type}${autoincrementStatement}${primaryKeyStatement}${defaultStatement}${notNullStatement}`;
+      statement += `\`${column4.name}\` ${column4.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}`;
       statement += ",";
     }
     compositePKs.forEach((it) => {
@@ -15540,35 +15540,64 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   const jsonSetNewTableSchemas = [];
   allAlteredResolved.forEach((it) => {
     const schemaUnwrapped = valueFromSelfOrPatchedNew(it.schema);
-    let addedCompositePKs;
-    let deletedCompositePKs;
-    let alteredCompositePKs;
+    let addedColumns = [];
+    for (const addedPkName of Object.keys(it.addedCompositePKs)) {
+      const addedPkColumns = it.addedCompositePKs[addedPkName];
+      if (dialect3 === "sqlite") {
+        addedColumns = SQLiteSquasher.unsquashPK(addedPkColumns);
+      } else if (dialect3 === "mysql") {
+        addedColumns = MySqlSquasher.unsquashPK(addedPkColumns).columns;
+      } else {
+        addedColumns = SQLiteSquasher.unsquashPK(addedPkColumns);
+      }
+    }
+    let deletedColumns = [];
+    for (const deletedPkName of Object.keys(it.deletedCompositePKs)) {
+      const deletedPkColumns = it.deletedCompositePKs[deletedPkName];
+      if (dialect3 === "sqlite") {
+        deletedColumns = SQLiteSquasher.unsquashPK(deletedPkColumns);
+      } else if (dialect3 === "mysql") {
+        deletedColumns = MySqlSquasher.unsquashPK(deletedPkColumns).columns;
+      } else {
+        deletedColumns = SQLiteSquasher.unsquashPK(deletedPkColumns);
+      }
+    }
+    addedColumns.sort();
+    deletedColumns.sort();
+    const doPerformDeleteAndCreate = JSON.stringify(addedColumns) !== JSON.stringify(deletedColumns);
+    let addedCompositePKs = [];
+    let deletedCompositePKs = [];
+    let alteredCompositePKs = [];
     if (dialect3 === "sqlite") {
-      addedCompositePKs = prepareAddCompositePrimaryKeySqlite(
-        it.name,
-        it.addedCompositePKs
-      );
-      deletedCompositePKs = prepareDeleteCompositePrimaryKeySqlite(
-        it.name,
-        it.deletedCompositePKs
-      );
+      if (doPerformDeleteAndCreate) {
+        addedCompositePKs = prepareAddCompositePrimaryKeySqlite(
+          it.name,
+          it.addedCompositePKs
+        );
+        deletedCompositePKs = prepareDeleteCompositePrimaryKeySqlite(
+          it.name,
+          it.deletedCompositePKs
+        );
+      }
       alteredCompositePKs = prepareAlterCompositePrimaryKeySqlite(
         it.name,
         it.alteredCompositePKs
       );
     } else if (dialect3 === "pg") {
-      addedCompositePKs = prepareAddCompositePrimaryKeyPg(
-        it.name,
-        schemaUnwrapped,
-        it.addedCompositePKs,
-        curFull
-      );
-      deletedCompositePKs = prepareDeleteCompositePrimaryKeyPg(
-        it.name,
-        schemaUnwrapped,
-        it.deletedCompositePKs,
-        prevFull
-      );
+      if (doPerformDeleteAndCreate) {
+        addedCompositePKs = prepareAddCompositePrimaryKeyPg(
+          it.name,
+          schemaUnwrapped,
+          it.addedCompositePKs,
+          curFull
+        );
+        deletedCompositePKs = prepareDeleteCompositePrimaryKeyPg(
+          it.name,
+          schemaUnwrapped,
+          it.deletedCompositePKs,
+          prevFull
+        );
+      }
       alteredCompositePKs = prepareAlterCompositePrimaryKeyPg(
         it.name,
         schemaUnwrapped,
@@ -15577,16 +15606,19 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
         curFull
       );
     } else {
-      addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
-        it.name,
-        it.addedCompositePKs,
-        curFull
-      );
-      deletedCompositePKs = prepareDeleteCompositePrimaryKeyMySql(
-        it.name,
-        it.deletedCompositePKs,
-        prevFull
-      );
+      if (doPerformDeleteAndCreate) {
+        addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
+          it.name,
+          it.addedCompositePKs,
+          curFull
+        );
+        deletedCompositePKs = prepareDeleteCompositePrimaryKeyMySql(
+          it.name,
+          it.deletedCompositePKs,
+          prevFull
+        );
+      }
+      ;
       alteredCompositePKs = prepareAlterCompositePrimaryKeyMySql(
         it.name,
         it.alteredCompositePKs,