drizzle-kit 0.19.2 → 0.19.3-23a3dbf

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.2",
+  "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,6 +52,7 @@
     ]
   },
   "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",
@@ -77,13 +79,14 @@
     "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-orm": "0.27.0-56b9edc",
+    "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

@@ -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,