drizzle-kit 0.19.13 → 0.20.0-baf960c

package/index.d.ts

@@ -49,4 +49,10 @@ export type Config = {
     } | {
         connectionString: string;
     };
+} | {
+    driver: "d1";
+    dbCredentials: {
+        wranglerConfigPath: string;
+    };
 } | {});
+export type defineConfig = (config: Config) => Config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.13",
+  "version": "0.20.0-baf960c",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -64,9 +64,11 @@
     "hanji": "^0.0.5",
     "json-diff": "0.9.0",
     "minimatch": "^7.4.3",
+    "wrangler": "^3.7.0",
     "zod": "^3.20.2"
   },
   "devDependencies": {
+    "@cloudflare/workers-types": "^4.20230518.0",
     "@libsql/client": "^0.1.6",
     "@types/better-sqlite3": "^7.6.4",
     "@types/dockerode": "^3.3.14",
@@ -80,7 +82,7 @@
     "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-orm": "0.27.1-8a21e7b",
+    "drizzle-orm": "0.28.7-4e094f0",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",

package/utils.js

@@ -12696,6 +12696,13 @@ var init_serializer = __esm({
   }
 });
 
+// src/cli/validations/outputs.ts
+var init_outputs = __esm({
+  "src/cli/validations/outputs.ts"() {
+    init_source();
+  }
+});
+
 // src/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
@@ -13265,7 +13272,8 @@ var fk3 = objectType({
   onDelete: stringType().optional()
 }).strict();
 var compositePK3 = objectType({
-  columns: stringType().array()
+  columns: stringType().array(),
+  name: stringType()
 }).strict();
 var column3 = objectType({
   name: stringType(),
@@ -13656,6 +13664,7 @@ init_serializer();
 var import_hanji2 = __toESM(require_hanji());
 init_views();
 init_source();
+init_outputs();
 var BREAKPOINT = "--> statement-breakpoint\n";
 
 // src/sqlgenerator.ts
@@ -13886,7 +13895,7 @@ var MySQLAlterTableDropUniqueConstraintConvertor = class extends Convertor {
   convert(statement) {
     const unsquashed = MySqlSquasher.unsquashUnique(statement.data);
     const tableNameWithSchema = statement.schema ? `\`${statement.schema}\`.\`${statement.tableName}\`` : `\`${statement.tableName}\``;
-    return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT \`${unsquashed.name}\`;`;
+    return `ALTER TABLE ${tableNameWithSchema} DROP INDEX \`${unsquashed.name}\`;`;
   }
 };
 var SQLiteAlterTableAddUniqueConstraintConvertor = class extends Convertor {
@@ -14990,9 +14999,7 @@ var prepareMySqlCreateTableJson = (table4, json2) => {
     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 : "",
+    compositePkName: Object.values(compositePrimaryKeys).length > 0 ? json2.tables[name].compositePrimaryKeys[MySqlSquasher.unsquashPK(Object.values(compositePrimaryKeys)[0]).name].name : "",
     uniqueConstraints: Object.values(uniqueConstraints)
   };
 };
@@ -15513,7 +15520,7 @@ var prepareAddCompositePrimaryKeyMySql = (tableName, pks, json1, json2) => {
       type: "create_composite_pk",
       tableName,
       data: it,
-      constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${unsquashed.columns.join("_")}`].name
+      constraintName: json2.tables[tableName].compositePrimaryKeys[unsquashed.name].name
     });
   }
   return res;
@@ -15524,7 +15531,7 @@ var prepareDeleteCompositePrimaryKeyMySql = (tableName, pks, json1) => {
       type: "delete_composite_pk",
       tableName,
       data: it,
-      constraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${MySqlSquasher.unsquashPK(it).columns.join("_")}`].name
+      constraintName: json1.tables[tableName].compositePrimaryKeys[MySqlSquasher.unsquashPK(it).name].name
     };
   });
 };
@@ -15535,8 +15542,8 @@ var prepareAlterCompositePrimaryKeyMySql = (tableName, pks, json1, json2) => {
       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
+      oldConstraintName: json1.tables[tableName].compositePrimaryKeys[MySqlSquasher.unsquashPK(it.__old).name].name,
+      newConstraintName: json2.tables[tableName].compositePrimaryKeys[MySqlSquasher.unsquashPK(it.__new).name].name
     };
   });
 };
@@ -15893,19 +15900,17 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
         curFull
       );
     } else {
-      if (doPerformDeleteAndCreate) {
-        addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
-          it.name,
-          it.addedCompositePKs,
-          prevFull,
-          curFull
-        );
-        deletedCompositePKs = prepareDeleteCompositePrimaryKeyMySql(
-          it.name,
-          it.deletedCompositePKs,
-          prevFull
-        );
-      }
+      addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
+        it.name,
+        it.addedCompositePKs,
+        prevFull,
+        curFull
+      );
+      deletedCompositePKs = prepareDeleteCompositePrimaryKeyMySql(
+        it.name,
+        it.deletedCompositePKs,
+        prevFull
+      );
       alteredCompositePKs = prepareAlterCompositePrimaryKeyMySql(
         it.name,
         it.alteredCompositePKs,
@@ -16112,10 +16117,16 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   jsonStatements.push(...jsonRenameTables);
   jsonStatements.push(...jsonRenameColumnsStatements);
   jsonStatements.push(...jsonDeletedCompositePKs);
-  jsonStatements.push(...jsonDeletedUniqueConstraints);
+  if (dialect3 !== "mysql") {
+    jsonStatements.push(...jsonDeletedUniqueConstraints);
+  }
   jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
   jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
   jsonStatements.push(...jsonTableAlternations.alterColumns);
+  if (dialect3 === "mysql") {
+    jsonStatements.push(...jsonAddedUniqueConstraints);
+    jsonStatements.push(...jsonDeletedUniqueConstraints);
+  }
   jsonStatements.push(...jsonTableAlternations.createColumns);
   jsonStatements.push(...jsonCreateIndexesForCreatedTables);
   jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
@@ -16125,7 +16136,9 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
     jsonStatements.push(...jsonCreateReferences);
   jsonStatements.push(...jsonAddedCompositePKs);
   jsonStatements.push(...jsonAlteredCompositePKs);
-  jsonStatements.push(...jsonAddedUniqueConstraints);
+  if (dialect3 !== "mysql") {
+    jsonStatements.push(...jsonAddedUniqueConstraints);
+  }
   jsonStatements.push(...jsonAlteredUniqueConstraints);
   jsonStatements.push(...jsonSetTableSchemas);
   jsonStatements.push(...filteredJsonSetNewTableSchemas);