drizzle-kit 0.22.4 → 0.22.6

package/bin.cjs

@@ -4420,9 +4420,11 @@ Is ${source_default.bold.blue(
       render(status) {
         if (status === "pending") {
           const spin = this.spinner.value();
-          return `[${spin}] ${this.progressText}`;
+          return `[${spin}] ${this.progressText}
+`;
         }
-        return `[${source_default.green("\u2713")}] ${this.successText}`;
+        return `[${source_default.green("\u2713")}] ${this.successText}
+`;
       }
     };
     DropMigrationView = class extends import_hanji.Prompt {
@@ -9058,11 +9060,11 @@ var init_pgSchema = __esm({
       },
       squashIdxPush: (idx) => {
         index2.parse(idx);
-        return `${idx.name};${idx.columns.map((c) => `${c.isExpression ? "" : c.expression},${c.asc},${c.nulls}`).join(",,")};${idx.isUnique};${idx.method};${JSON.stringify(idx.with)}`;
+        return `${idx.name};${idx.columns.map((c) => `${c.isExpression ? "" : c.expression}--${c.asc}--${c.nulls}`).join(",,")};${idx.isUnique};${idx.method};${JSON.stringify(idx.with)}`;
       },
       unsquashIdxPush: (input) => {
         const [name, columnsString, isUnique, method, idxWith] = input.split(";");
-        const columnString = columnsString.split(",,");
+        const columnString = columnsString.split("--");
         const columns = [];
         for (const column7 of columnString) {
           const [expression, asc, nulls, opclass] = column7.split(",");
@@ -23742,7 +23744,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         } = statement.data;
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
         const value = columns.map(
-          (it) => `${it.expression}${it.opclass ? ` ${it.opclass}` : it.asc ? "" : " DESC"}${it.asc && it.nulls && it.nulls === "last" || it.opclass ? "" : ` NULLS ${it.nulls.toUpperCase()}`}`
+          (it) => `${it.isExpression ? it.expression : `"${it.expression}"`}${it.opclass ? ` ${it.opclass}` : it.asc ? "" : " DESC"}${it.asc && it.nulls && it.nulls === "last" || it.opclass ? "" : ` NULLS ${it.nulls.toUpperCase()}`}`
         ).join(",");
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
         function reverseLogic(mappedWith) {
@@ -121915,10 +121917,19 @@ var init_mysqlIntrospect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i2 = 0; i2 < matchers.length; i2++) {
-          const matcher = matchers[i2];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -121958,10 +121969,19 @@ var init_pgIntrospect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i2 = 0; i2 < matchers.length; i2++) {
-          const matcher = matchers[i2];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -122306,10 +122326,19 @@ var init_sqliteIntrospect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i2 = 0; i2 < matchers.length; i2++) {
-          const matcher = matchers[i2];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -122331,10 +122360,19 @@ var init_sqliteIntrospect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i2 = 0; i2 < matchers.length; i2++) {
-          const matcher = matchers[i2];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -122342,10 +122380,7 @@ var init_sqliteIntrospect = __esm({
         "Pulling schema from database...",
         "Pulling schema from database..."
       );
-      const res = await (0, import_hanji10.renderWithTask)(
-        progress,
-        fromDatabase3(db2, filter2)
-      );
+      const res = await (0, import_hanji10.renderWithTask)(progress, fromDatabase3(db2, filter2));
       const schema5 = { id: originUUID, prevId: "", ...res };
       return { schema: schema5 };
     };
@@ -128324,7 +128359,7 @@ var updateUpToV7 = (json) => {
               opClass: void 0
             };
           });
-          return [idx[0], { columns: mappedColumns, ...rest }];
+          return [idx[0], { columns: mappedColumns, with: {}, ...rest }];
         })
       );
       return [it[0], { ...table4, indexes: mappedIndexes }];
@@ -129502,7 +129537,7 @@ var printVersions = async () => {
 var versions = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.22.4";
+  const envVersion = "0.22.6";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions2 = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.22.4",
+  "version": "0.22.6",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/payload.js

@@ -15191,11 +15191,11 @@ var init_pgSchema = __esm({
       },
       squashIdxPush: (idx) => {
         index2.parse(idx);
-        return `${idx.name};${idx.columns.map((c) => `${c.isExpression ? "" : c.expression},${c.asc},${c.nulls}`).join(",,")};${idx.isUnique};${idx.method};${JSON.stringify(idx.with)}`;
+        return `${idx.name};${idx.columns.map((c) => `${c.isExpression ? "" : c.expression}--${c.asc}--${c.nulls}`).join(",,")};${idx.isUnique};${idx.method};${JSON.stringify(idx.with)}`;
       },
       unsquashIdxPush: (input) => {
         const [name2, columnsString, isUnique, method, idxWith] = input.split(";");
-        const columnString = columnsString.split(",,");
+        const columnString = columnsString.split("--");
         const columns = [];
         for (const column4 of columnString) {
           const [expression, asc2, nulls, opclass] = column4.split(",");
@@ -15783,9 +15783,11 @@ Is ${source_default.bold.blue(
       render(status) {
         if (status === "pending") {
           const spin = this.spinner.value();
-          return `[${spin}] ${this.progressText}`;
+          return `[${spin}] ${this.progressText}
+`;
         }
-        return `[${source_default.green("\u2713")}] ${this.successText}`;
+        return `[${source_default.green("\u2713")}] ${this.successText}
+`;
       }
     };
   }
@@ -24359,7 +24361,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         } = statement.data;
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
         const value = columns.map(
-          (it) => `${it.expression}${it.opclass ? ` ${it.opclass}` : it.asc ? "" : " DESC"}${it.asc && it.nulls && it.nulls === "last" || it.opclass ? "" : ` NULLS ${it.nulls.toUpperCase()}`}`
+          (it) => `${it.isExpression ? it.expression : `"${it.expression}"`}${it.opclass ? ` ${it.opclass}` : it.asc ? "" : " DESC"}${it.asc && it.nulls && it.nulls === "last" || it.opclass ? "" : ` NULLS ${it.nulls.toUpperCase()}`}`
         ).join(",");
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
         function reverseLogic(mappedWith) {
@@ -33280,10 +33282,19 @@ var init_mysqlIntrospect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i = 0; i < matchers.length; i++) {
-          const matcher = matchers[i];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -33338,10 +33349,19 @@ var pgPushIntrospect = async (db, filters, schemaFilters) => {
   const filter2 = (tableName) => {
     if (matchers.length === 0)
       return true;
-    for (let i = 0; i < matchers.length; i++) {
-      const matcher = matchers[i];
-      if (matcher.match(tableName))
-        return true;
+    let flags = [];
+    for (let matcher of matchers) {
+      if (matcher.negate) {
+        if (!matcher.match(tableName)) {
+          flags.push(false);
+        }
+      }
+      if (matcher.match(tableName)) {
+        flags.push(true);
+      }
+    }
+    if (flags.length > 0) {
+      return flags.every(Boolean);
     }
     return false;
   };
@@ -33720,10 +33740,19 @@ var sqlitePushIntrospect = async (db, filters) => {
   const filter2 = (tableName) => {
     if (matchers.length === 0)
       return true;
-    for (let i = 0; i < matchers.length; i++) {
-      const matcher = matchers[i];
-      if (matcher.match(tableName))
-        return true;
+    let flags = [];
+    for (let matcher of matchers) {
+      if (matcher.negate) {
+        if (!matcher.match(tableName)) {
+          flags.push(false);
+        }
+      }
+      if (matcher.match(tableName)) {
+        flags.push(true);
+      }
+    }
+    if (flags.length > 0) {
+      return flags.every(Boolean);
     }
     return false;
   };
@@ -33731,10 +33760,7 @@ var sqlitePushIntrospect = async (db, filters) => {
     "Pulling schema from database...",
     "Pulling schema from database..."
   );
-  const res = await (0, import_hanji7.renderWithTask)(
-    progress,
-    fromDatabase2(db, filter2)
-  );
+  const res = await (0, import_hanji7.renderWithTask)(progress, fromDatabase2(db, filter2));
   const schema4 = { id: originUUID, prevId: "", ...res };
   return { schema: schema4 };
 };

package/payload.mjs

@@ -15197,11 +15197,11 @@ var init_pgSchema = __esm({
       },
       squashIdxPush: (idx) => {
         index2.parse(idx);
-        return `${idx.name};${idx.columns.map((c) => `${c.isExpression ? "" : c.expression},${c.asc},${c.nulls}`).join(",,")};${idx.isUnique};${idx.method};${JSON.stringify(idx.with)}`;
+        return `${idx.name};${idx.columns.map((c) => `${c.isExpression ? "" : c.expression}--${c.asc}--${c.nulls}`).join(",,")};${idx.isUnique};${idx.method};${JSON.stringify(idx.with)}`;
       },
       unsquashIdxPush: (input) => {
         const [name2, columnsString, isUnique, method, idxWith] = input.split(";");
-        const columnString = columnsString.split(",,");
+        const columnString = columnsString.split("--");
         const columns = [];
         for (const column4 of columnString) {
           const [expression, asc2, nulls, opclass] = column4.split(",");
@@ -15789,9 +15789,11 @@ Is ${source_default.bold.blue(
       render(status) {
         if (status === "pending") {
           const spin = this.spinner.value();
-          return `[${spin}] ${this.progressText}`;
+          return `[${spin}] ${this.progressText}
+`;
         }
-        return `[${source_default.green("\u2713")}] ${this.successText}`;
+        return `[${source_default.green("\u2713")}] ${this.successText}
+`;
       }
     };
   }
@@ -24365,7 +24367,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         } = statement.data;
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
         const value = columns.map(
-          (it) => `${it.expression}${it.opclass ? ` ${it.opclass}` : it.asc ? "" : " DESC"}${it.asc && it.nulls && it.nulls === "last" || it.opclass ? "" : ` NULLS ${it.nulls.toUpperCase()}`}`
+          (it) => `${it.isExpression ? it.expression : `"${it.expression}"`}${it.opclass ? ` ${it.opclass}` : it.asc ? "" : " DESC"}${it.asc && it.nulls && it.nulls === "last" || it.opclass ? "" : ` NULLS ${it.nulls.toUpperCase()}`}`
         ).join(",");
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
         function reverseLogic(mappedWith) {
@@ -33286,10 +33288,19 @@ var init_mysqlIntrospect = __esm({
       const filter2 = (tableName) => {
         if (matchers.length === 0)
           return true;
-        for (let i = 0; i < matchers.length; i++) {
-          const matcher = matchers[i];
-          if (matcher.match(tableName))
-            return true;
+        let flags = [];
+        for (let matcher of matchers) {
+          if (matcher.negate) {
+            if (!matcher.match(tableName)) {
+              flags.push(false);
+            }
+          }
+          if (matcher.match(tableName)) {
+            flags.push(true);
+          }
+        }
+        if (flags.length > 0) {
+          return flags.every(Boolean);
         }
         return false;
       };
@@ -33330,10 +33341,19 @@ var pgPushIntrospect = async (db, filters, schemaFilters) => {
   const filter2 = (tableName) => {
     if (matchers.length === 0)
       return true;
-    for (let i = 0; i < matchers.length; i++) {
-      const matcher = matchers[i];
-      if (matcher.match(tableName))
-        return true;
+    let flags = [];
+    for (let matcher of matchers) {
+      if (matcher.negate) {
+        if (!matcher.match(tableName)) {
+          flags.push(false);
+        }
+      }
+      if (matcher.match(tableName)) {
+        flags.push(true);
+      }
+    }
+    if (flags.length > 0) {
+      return flags.every(Boolean);
     }
     return false;
   };
@@ -33712,10 +33732,19 @@ var sqlitePushIntrospect = async (db, filters) => {
   const filter2 = (tableName) => {
     if (matchers.length === 0)
       return true;
-    for (let i = 0; i < matchers.length; i++) {
-      const matcher = matchers[i];
-      if (matcher.match(tableName))
-        return true;
+    let flags = [];
+    for (let matcher of matchers) {
+      if (matcher.negate) {
+        if (!matcher.match(tableName)) {
+          flags.push(false);
+        }
+      }
+      if (matcher.match(tableName)) {
+        flags.push(true);
+      }
+    }
+    if (flags.length > 0) {
+      return flags.every(Boolean);
     }
     return false;
   };
@@ -33723,10 +33752,7 @@ var sqlitePushIntrospect = async (db, filters) => {
     "Pulling schema from database...",
     "Pulling schema from database..."
   );
-  const res = await (0, import_hanji7.renderWithTask)(
-    progress,
-    fromDatabase2(db, filter2)
-  );
+  const res = await (0, import_hanji7.renderWithTask)(progress, fromDatabase2(db, filter2));
   const schema4 = { id: originUUID, prevId: "", ...res };
   return { schema: schema4 };
 };