drizzle-kit 1.0.0-beta.5-0a7601e → 1.0.0-beta.5-5d28122

package/api-postgres.js

@@ -6916,6 +6916,9 @@ var init_grammar = __esm({
         if (!value) return { options, default: "" };
         value = trimChar(value, "'");
         if (value === "gen_random_uuid()") return { options, default: ".defaultRandom()" };
+        if (!value.startsWith("'") && !value.endsWith("'") && value.endsWith("()")) {
+          return { options, default: `sql\`${value}\`` };
+        }
         return { options, default: `"${trimChar(value, "'")}"` };
       },
       toArrayTs: (type, value) => {
@@ -16085,25 +16088,35 @@ var init_views = __esm({
           const columnsAltered = fksAlters.filter((it) => it.columns);
           const columnsToAltered = fksAlters.filter((it) => it.columnsTo);
           const tablesToAltered = fksAlters.filter((it) => it.tableTo);
-          res += `\u2502 Foreign key constraint was altered:
-`;
-          if (columnsAltered) {
+          const onUpdateAltered = fksAlters.filter((it) => it.onUpdate);
+          const onDeleteAltered = fksAlters.filter((it) => it.onDelete);
+          res += columnsAltered.length > 0 && columnsToAltered.length > 0 && tablesToAltered.length > 0 && onUpdateAltered.length > 0 && onDeleteAltered.length > 0 ? `\u2502 Foreign key constraint was altered:
+` : "";
+          if (columnsAltered.length) {
             res += `${columnsAltered.map(
               (it) => `\u2502 name: ${it.name} => columns: [${it.columns?.from.join(",")}] -> [${it.columns?.to.join(",")}]`
             )}
 `;
           }
-          if (columnsToAltered) {
+          if (columnsToAltered.length) {
             res += ` ${columnsToAltered.map(
               (it) => `\u2502 name: ${it.name} => columnsTo: [${it.columnsTo?.from.join(",")}] -> [${it.columnsTo?.to.join(",")}]`
             )}
 `;
           }
-          if (tablesToAltered) {
+          if (tablesToAltered.length) {
             res += `${tablesToAltered.map((it) => `\u2502 name: ${it.name} => tableTo: [${it.tableTo?.from}] -> [${it.tableTo?.to}]`)}
 `;
           }
-          blocks.push([res]);
+          if (onUpdateAltered.length) {
+            res += `${onUpdateAltered.map((it) => `\u2502 name: ${it.name} => onUpdate: [${it.onUpdate?.from}] -> [${it.onUpdate?.to}]`)}
+`;
+          }
+          if (onDeleteAltered.length) {
+            res += `${onDeleteAltered.map((it) => `\u2502 name: ${it.name} => onDelete: [${it.onDelete?.from}] -> [${it.onDelete?.to}]`)}
+`;
+          }
+          if (res) blocks.push([res]);
         }
         if (fksDiff.length) {
           const fksCreated = fksDiff.filter((it) => it.$diffType === "create");
@@ -22782,6 +22795,82 @@ var init_mocks = __esm({
   }
 });
 
+// src/utils/node-assert/deep-strict-equal.ts
+function deepStrictEqualInternal(actual, expected) {
+  if (actual === expected) {
+    return true;
+  }
+  if (actual === null || expected === null) {
+    return false;
+  }
+  if (typeof actual !== "object" || typeof expected !== "object") {
+    return false;
+  }
+  if (Array.isArray(actual) && Array.isArray(expected)) {
+    if (actual.length !== expected.length) {
+      return false;
+    }
+    for (let i7 = 0; i7 < actual.length; i7++) {
+      if (!deepStrictEqualInternal(actual[i7], expected[i7])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  if (Array.isArray(actual) !== Array.isArray(expected)) {
+    return false;
+  }
+  const actualObj = actual;
+  const expectedObj = expected;
+  const actualKeys = Object.keys(actualObj);
+  const expectedKeys = Object.keys(expectedObj);
+  if (actualKeys.length !== expectedKeys.length) {
+    return false;
+  }
+  for (const key of actualKeys) {
+    if (!Object.prototype.hasOwnProperty.call(expectedObj, key)) {
+      return false;
+    }
+    if (!deepStrictEqualInternal(actualObj[key], expectedObj[key])) {
+      return false;
+    }
+  }
+  return true;
+}
+function deepStrictEqual(actual, expected, message) {
+  if (!deepStrictEqualInternal(actual, expected)) {
+    if (message instanceof Error) {
+      throw message;
+    }
+    throw new AssertionError({
+      message: message || `Expected values to be strictly deep-equal`,
+      actual,
+      expected,
+      operator: "deepStrictEqual"
+    });
+  }
+}
+var AssertionError;
+var init_deep_strict_equal = __esm({
+  "src/utils/node-assert/deep-strict-equal.ts"() {
+    "use strict";
+    AssertionError = class extends Error {
+      actual;
+      expected;
+      operator;
+      constructor(options) {
+        super(
+          options.message || `${JSON.stringify(options.actual)} ${options.operator} ${JSON.stringify(options.expected)}`
+        );
+        this.name = "AssertionError";
+        this.actual = options.actual;
+        this.expected = options.expected;
+        this.operator = options.operator;
+      }
+    };
+  }
+});
+
 // src/utils/sequence-matcher.ts
 function diffStringArrays(oldArr, newArr) {
   const opcodes = getOpcodes(oldArr, newArr);
@@ -23632,6 +23721,7 @@ var init_diff = __esm({
     init_when_json_met_bigint();
     init_utils();
     init_mocks();
+    init_deep_strict_equal();
     init_sequence_matcher();
     init_dialect();
     init_utils2();
@@ -24243,10 +24333,12 @@ var init_diff = __esm({
       const columnAlters = alters.filter((it) => it.entityType === "columns").filter((it) => {
         if (it.default && (it.$left.type === "json" && it.$right.type === "json" || it.$left.type === "jsonb" && it.$right.type === "jsonb")) {
           if (it.default.from !== null && it.default.to !== null) {
-            const left = stringify(parse(trimChar(it.default.from, "'")));
-            const right = stringify(parse(trimChar(it.default.to, "'")));
-            if (left === right) {
+            const parsedLeft = parse(trimChar(it.default.from, "'"));
+            const parsedRight = parse(trimChar(it.default.to, "'"));
+            try {
+              deepStrictEqual(parsedLeft, parsedRight);
               delete it.default;
+            } catch {
             }
           }
         }

package/api-postgres.mjs

@@ -6922,6 +6922,9 @@ var init_grammar = __esm({
         if (!value) return { options, default: "" };
         value = trimChar(value, "'");
         if (value === "gen_random_uuid()") return { options, default: ".defaultRandom()" };
+        if (!value.startsWith("'") && !value.endsWith("'") && value.endsWith("()")) {
+          return { options, default: `sql\`${value}\`` };
+        }
         return { options, default: `"${trimChar(value, "'")}"` };
       },
       toArrayTs: (type, value) => {
@@ -16091,25 +16094,35 @@ var init_views = __esm({
           const columnsAltered = fksAlters.filter((it) => it.columns);
           const columnsToAltered = fksAlters.filter((it) => it.columnsTo);
           const tablesToAltered = fksAlters.filter((it) => it.tableTo);
-          res += `\u2502 Foreign key constraint was altered:
-`;
-          if (columnsAltered) {
+          const onUpdateAltered = fksAlters.filter((it) => it.onUpdate);
+          const onDeleteAltered = fksAlters.filter((it) => it.onDelete);
+          res += columnsAltered.length > 0 && columnsToAltered.length > 0 && tablesToAltered.length > 0 && onUpdateAltered.length > 0 && onDeleteAltered.length > 0 ? `\u2502 Foreign key constraint was altered:
+` : "";
+          if (columnsAltered.length) {
             res += `${columnsAltered.map(
               (it) => `\u2502 name: ${it.name} => columns: [${it.columns?.from.join(",")}] -> [${it.columns?.to.join(",")}]`
             )}
 `;
           }
-          if (columnsToAltered) {
+          if (columnsToAltered.length) {
             res += ` ${columnsToAltered.map(
               (it) => `\u2502 name: ${it.name} => columnsTo: [${it.columnsTo?.from.join(",")}] -> [${it.columnsTo?.to.join(",")}]`
             )}
 `;
           }
-          if (tablesToAltered) {
+          if (tablesToAltered.length) {
             res += `${tablesToAltered.map((it) => `\u2502 name: ${it.name} => tableTo: [${it.tableTo?.from}] -> [${it.tableTo?.to}]`)}
 `;
           }
-          blocks.push([res]);
+          if (onUpdateAltered.length) {
+            res += `${onUpdateAltered.map((it) => `\u2502 name: ${it.name} => onUpdate: [${it.onUpdate?.from}] -> [${it.onUpdate?.to}]`)}
+`;
+          }
+          if (onDeleteAltered.length) {
+            res += `${onDeleteAltered.map((it) => `\u2502 name: ${it.name} => onDelete: [${it.onDelete?.from}] -> [${it.onDelete?.to}]`)}
+`;
+          }
+          if (res) blocks.push([res]);
         }
         if (fksDiff.length) {
           const fksCreated = fksDiff.filter((it) => it.$diffType === "create");
@@ -22819,6 +22832,82 @@ var init_mocks = __esm({
   }
 });
 
+// src/utils/node-assert/deep-strict-equal.ts
+function deepStrictEqualInternal(actual, expected) {
+  if (actual === expected) {
+    return true;
+  }
+  if (actual === null || expected === null) {
+    return false;
+  }
+  if (typeof actual !== "object" || typeof expected !== "object") {
+    return false;
+  }
+  if (Array.isArray(actual) && Array.isArray(expected)) {
+    if (actual.length !== expected.length) {
+      return false;
+    }
+    for (let i7 = 0; i7 < actual.length; i7++) {
+      if (!deepStrictEqualInternal(actual[i7], expected[i7])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  if (Array.isArray(actual) !== Array.isArray(expected)) {
+    return false;
+  }
+  const actualObj = actual;
+  const expectedObj = expected;
+  const actualKeys = Object.keys(actualObj);
+  const expectedKeys = Object.keys(expectedObj);
+  if (actualKeys.length !== expectedKeys.length) {
+    return false;
+  }
+  for (const key of actualKeys) {
+    if (!Object.prototype.hasOwnProperty.call(expectedObj, key)) {
+      return false;
+    }
+    if (!deepStrictEqualInternal(actualObj[key], expectedObj[key])) {
+      return false;
+    }
+  }
+  return true;
+}
+function deepStrictEqual(actual, expected, message) {
+  if (!deepStrictEqualInternal(actual, expected)) {
+    if (message instanceof Error) {
+      throw message;
+    }
+    throw new AssertionError({
+      message: message || `Expected values to be strictly deep-equal`,
+      actual,
+      expected,
+      operator: "deepStrictEqual"
+    });
+  }
+}
+var AssertionError;
+var init_deep_strict_equal = __esm({
+  "src/utils/node-assert/deep-strict-equal.ts"() {
+    "use strict";
+    AssertionError = class extends Error {
+      actual;
+      expected;
+      operator;
+      constructor(options) {
+        super(
+          options.message || `${JSON.stringify(options.actual)} ${options.operator} ${JSON.stringify(options.expected)}`
+        );
+        this.name = "AssertionError";
+        this.actual = options.actual;
+        this.expected = options.expected;
+        this.operator = options.operator;
+      }
+    };
+  }
+});
+
 // src/utils/sequence-matcher.ts
 function diffStringArrays(oldArr, newArr) {
   const opcodes = getOpcodes(oldArr, newArr);
@@ -23669,6 +23758,7 @@ var init_diff = __esm({
     init_when_json_met_bigint();
     init_utils();
     init_mocks();
+    init_deep_strict_equal();
     init_sequence_matcher();
     init_dialect();
     init_utils2();
@@ -24280,10 +24370,12 @@ var init_diff = __esm({
       const columnAlters = alters.filter((it) => it.entityType === "columns").filter((it) => {
         if (it.default && (it.$left.type === "json" && it.$right.type === "json" || it.$left.type === "jsonb" && it.$right.type === "jsonb")) {
           if (it.default.from !== null && it.default.to !== null) {
-            const left = stringify(parse(trimChar(it.default.from, "'")));
-            const right = stringify(parse(trimChar(it.default.to, "'")));
-            if (left === right) {
+            const parsedLeft = parse(trimChar(it.default.from, "'"));
+            const parsedRight = parse(trimChar(it.default.to, "'"));
+            try {
+              deepStrictEqual(parsedLeft, parsedRight);
               delete it.default;
+            } catch {
             }
           }
         }

package/bin.cjs

@@ -21828,6 +21828,9 @@ var init_grammar2 = __esm({
         if (!value) return { options, default: "" };
         value = trimChar(value, "'");
         if (value === "gen_random_uuid()") return { options, default: ".defaultRandom()" };
+        if (!value.startsWith("'") && !value.endsWith("'") && value.endsWith("()")) {
+          return { options, default: `sql\`${value}\`` };
+        }
         return { options, default: `"${trimChar(value, "'")}"` };
       },
       toArrayTs: (type, value) => {
@@ -23807,9 +23810,11 @@ var init_views = __esm({
           const columnsAltered = fksAlters.filter((it2) => it2.columns);
           const columnsToAltered = fksAlters.filter((it2) => it2.columnsTo);
           const tablesToAltered = fksAlters.filter((it2) => it2.tableTo);
-          res += `\u2502 Foreign key constraint was altered:
-`;
-          if (columnsAltered) {
+          const onUpdateAltered = fksAlters.filter((it2) => it2.onUpdate);
+          const onDeleteAltered = fksAlters.filter((it2) => it2.onDelete);
+          res += columnsAltered.length > 0 && columnsToAltered.length > 0 && tablesToAltered.length > 0 && onUpdateAltered.length > 0 && onDeleteAltered.length > 0 ? `\u2502 Foreign key constraint was altered:
+` : "";
+          if (columnsAltered.length) {
             res += `${columnsAltered.map(
               (it2) => {
                 var _a5, _b;
@@ -23818,7 +23823,7 @@ var init_views = __esm({
             )}
 `;
           }
-          if (columnsToAltered) {
+          if (columnsToAltered.length) {
             res += ` ${columnsToAltered.map(
               (it2) => {
                 var _a5, _b;
@@ -23827,14 +23832,28 @@ var init_views = __esm({
             )}
 `;
           }
-          if (tablesToAltered) {
+          if (tablesToAltered.length) {
             res += `${tablesToAltered.map((it2) => {
               var _a5, _b;
               return `\u2502 name: ${it2.name} => tableTo: [${(_a5 = it2.tableTo) == null ? void 0 : _a5.from}] -> [${(_b = it2.tableTo) == null ? void 0 : _b.to}]`;
             })}
 `;
           }
-          blocks.push([res]);
+          if (onUpdateAltered.length) {
+            res += `${onUpdateAltered.map((it2) => {
+              var _a5, _b;
+              return `\u2502 name: ${it2.name} => onUpdate: [${(_a5 = it2.onUpdate) == null ? void 0 : _a5.from}] -> [${(_b = it2.onUpdate) == null ? void 0 : _b.to}]`;
+            })}
+`;
+          }
+          if (onDeleteAltered.length) {
+            res += `${onDeleteAltered.map((it2) => {
+              var _a5, _b;
+              return `\u2502 name: ${it2.name} => onDelete: [${(_a5 = it2.onDelete) == null ? void 0 : _a5.from}] -> [${(_b = it2.onDelete) == null ? void 0 : _b.to}]`;
+            })}
+`;
+          }
+          if (res) blocks.push([res]);
         }
         if (fksDiff.length) {
           const fksCreated = fksDiff.filter((it2) => it2.$diffType === "create");
@@ -28110,7 +28129,10 @@ function sqlTypeFrom(sqlType) {
   if (["real", "double", "double precision", "float"].some((it2) => lowered.startsWith(it2))) {
     return "real";
   }
-  return "numeric";
+  if (["numeric", "decimal", "boolean", "date", "datetime"].some((it2) => lowered.startsWith(it2))) {
+    return "numeric";
+  }
+  return sqlType;
 }
 function extractGeneratedColumns(input) {
   const columns = {};
@@ -39027,6 +39049,82 @@ var init_mocks = __esm({
   }
 });
 
+// src/utils/node-assert/deep-strict-equal.ts
+function deepStrictEqualInternal(actual, expected) {
+  if (actual === expected) {
+    return true;
+  }
+  if (actual === null || expected === null) {
+    return false;
+  }
+  if (typeof actual !== "object" || typeof expected !== "object") {
+    return false;
+  }
+  if (Array.isArray(actual) && Array.isArray(expected)) {
+    if (actual.length !== expected.length) {
+      return false;
+    }
+    for (let i6 = 0; i6 < actual.length; i6++) {
+      if (!deepStrictEqualInternal(actual[i6], expected[i6])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  if (Array.isArray(actual) !== Array.isArray(expected)) {
+    return false;
+  }
+  const actualObj = actual;
+  const expectedObj = expected;
+  const actualKeys = Object.keys(actualObj);
+  const expectedKeys = Object.keys(expectedObj);
+  if (actualKeys.length !== expectedKeys.length) {
+    return false;
+  }
+  for (const key of actualKeys) {
+    if (!Object.prototype.hasOwnProperty.call(expectedObj, key)) {
+      return false;
+    }
+    if (!deepStrictEqualInternal(actualObj[key], expectedObj[key])) {
+      return false;
+    }
+  }
+  return true;
+}
+function deepStrictEqual(actual, expected, message) {
+  if (!deepStrictEqualInternal(actual, expected)) {
+    if (message instanceof Error) {
+      throw message;
+    }
+    throw new AssertionError({
+      message: message || `Expected values to be strictly deep-equal`,
+      actual,
+      expected,
+      operator: "deepStrictEqual"
+    });
+  }
+}
+var AssertionError;
+var init_deep_strict_equal = __esm({
+  "src/utils/node-assert/deep-strict-equal.ts"() {
+    "use strict";
+    AssertionError = class extends Error {
+      actual;
+      expected;
+      operator;
+      constructor(options) {
+        super(
+          options.message || `${JSON.stringify(options.actual)} ${options.operator} ${JSON.stringify(options.expected)}`
+        );
+        this.name = "AssertionError";
+        this.actual = options.actual;
+        this.expected = options.expected;
+        this.operator = options.operator;
+      }
+    };
+  }
+});
+
 // src/utils/sequence-matcher.ts
 function diffStringArrays(oldArr, newArr) {
   const opcodes = getOpcodes(oldArr, newArr);
@@ -39877,6 +39975,7 @@ var init_diff = __esm({
     init_when_json_met_bigint();
     init_utils2();
     init_mocks();
+    init_deep_strict_equal();
     init_sequence_matcher();
     init_dialect();
     init_utils3();
@@ -40489,10 +40588,12 @@ var init_diff = __esm({
         var _a5, _b;
         if (it2.default && (it2.$left.type === "json" && it2.$right.type === "json" || it2.$left.type === "jsonb" && it2.$right.type === "jsonb")) {
           if (it2.default.from !== null && it2.default.to !== null) {
-            const left = stringify(parse(trimChar(it2.default.from, "'")));
-            const right = stringify(parse(trimChar(it2.default.to, "'")));
-            if (left === right) {
+            const parsedLeft = parse(trimChar(it2.default.from, "'"));
+            const parsedRight = parse(trimChar(it2.default.to, "'"));
+            try {
+              deepStrictEqual(parsedLeft, parsedRight);
               delete it2.default;
+            } catch {
             }
           }
         }
@@ -42576,6 +42677,10 @@ var init_diff3 = __esm({
         if (it2.nameExplicit) {
           delete it2.nameExplicit;
         }
+        if (it2.columns && it2.columns.to && it2.columns.from && it2.columns.from.length === it2.columns.to.length) {
+          const unique = new Set(it2.columns.to);
+          if (it2.columns.from.every((col) => unique.has(col))) delete it2.columns;
+        }
         return ddl22.pks.hasDiff(it2);
       });
       const fksAlters = updates.filter((it2) => it2.entityType === "fks").filter((it2) => {
@@ -171620,7 +171725,7 @@ import { sql } from "drizzle-orm"
     createTableColumns3 = (columns, fks, pk, casing2) => {
       let statement = "";
       for (const it2 of columns) {
-        const isPrimary = pk && pk.columns.length === 1 && pk.columns[0] === it2.name;
+        const isPrimary = pk && pk.columns.length === 1 && pk.columns[0] === it2.name && pk.table === it2.table;
         statement += "	";
         statement += column8(it2.type, it2.name, it2.default, casing2);
         statement += isPrimary ? `.primaryKey(${it2.autoincrement ? "{ autoIncrement: true }" : ""})` : "";
@@ -171702,7 +171807,7 @@ import { sql } from "drizzle-orm"
       }).join(", ")}]`;
       statement += `${pk.name ? `, name: "${pk.name}"` : ""}}`;
       statement += ")";
-      statement += `
+      statement += `,
 `;
       return statement;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "1.0.0-beta.5-0a7601e",
+  "version": "1.0.0-beta.5-5d28122",
   "homepage": "https://orm.drizzle.team",
   "keywords": [
     "drizzle",