drizzle-kit 0.31.1-9811cd4 → 0.31.1-a4825a4

package/bin.cjs

@@ -1369,7 +1369,7 @@ var require_hanji = __commonJS({
       }
     };
     exports2.Terminal = Terminal;
-    var TaskView4 = class {
+    var TaskView5 = class {
       constructor() {
         this.attachCallbacks = [];
         this.detachCallbacks = [];
@@ -1393,7 +1393,7 @@ var require_hanji = __commonJS({
         }
       }
     };
-    exports2.TaskView = TaskView4;
+    exports2.TaskView = TaskView5;
     var TaskTerminal = class {
       constructor(view5, stdout) {
         this.view = view5;
@@ -5887,6 +5887,7 @@ You can check the "pg_vector" docs for more info: https://github.com/pgvector/pg
         this.state.bind(this);
         this.base = base;
       }
+      state;
       render(status) {
         if (status === "submitted" || status === "aborted") {
           return "";
@@ -5927,93 +5928,95 @@ Is ${source_default.bold.blue(key)} ${this.entityType} created or renamed from a
     Spinner = class {
       constructor(frames) {
         this.frames = frames;
-        this.offset = 0;
-        this.tick = () => {
-          this.iterator();
-        };
-        this.value = () => {
-          return this.frames[this.offset];
-        };
         this.iterator = () => {
           this.offset += 1;
           this.offset %= frames.length - 1;
         };
       }
+      offset = 0;
+      iterator;
+      tick = () => {
+        this.iterator();
+      };
+      value = () => {
+        return this.frames[this.offset];
+      };
     };
     IntrospectProgress = class extends import_hanji.TaskView {
       constructor(hasEnums = false) {
         super();
         this.hasEnums = hasEnums;
-        this.spinner = new Spinner("\u28F7\u28EF\u28DF\u287F\u28BF\u28FB\u28FD\u28FE".split(""));
-        this.state = {
-          tables: {
-            count: 0,
-            name: "tables",
-            status: "fetching"
-          },
-          columns: {
-            count: 0,
-            name: "columns",
-            status: "fetching"
-          },
-          enums: {
-            count: 0,
-            name: "enums",
-            status: "fetching"
-          },
-          indexes: {
-            count: 0,
-            name: "indexes",
-            status: "fetching"
-          },
-          fks: {
-            count: 0,
-            name: "foreign keys",
-            status: "fetching"
-          },
-          policies: {
-            count: 0,
-            name: "policies",
-            status: "fetching"
-          },
-          checks: {
-            count: 0,
-            name: "check constraints",
-            status: "fetching"
-          },
-          views: {
-            count: 0,
-            name: "views",
-            status: "fetching"
-          }
-        };
-        this.formatCount = (count2) => {
-          const width = Math.max.apply(
-            null,
-            Object.values(this.state).map((it) => it.count.toFixed(0).length)
-          );
-          return count2.toFixed(0).padEnd(width, " ");
-        };
-        this.statusText = (spinner, stage) => {
-          const { name, count: count2 } = stage;
-          const isDone = stage.status === "done";
-          const prefix2 = isDone ? `[${source_default.green("\u2713")}]` : `[${spinner}]`;
-          const formattedCount = this.formatCount(count2);
-          const suffix = isDone ? `${formattedCount} ${name} fetched` : `${formattedCount} ${name} fetching`;
-          return `${prefix2} ${suffix}
-`;
-        };
         this.timeout = setInterval(() => {
           this.spinner.tick();
           this.requestLayout();
         }, 128);
         this.on("detach", () => clearInterval(this.timeout));
       }
+      spinner = new Spinner("\u28F7\u28EF\u28DF\u287F\u28BF\u28FB\u28FD\u28FE".split(""));
+      timeout;
+      state = {
+        tables: {
+          count: 0,
+          name: "tables",
+          status: "fetching"
+        },
+        columns: {
+          count: 0,
+          name: "columns",
+          status: "fetching"
+        },
+        enums: {
+          count: 0,
+          name: "enums",
+          status: "fetching"
+        },
+        indexes: {
+          count: 0,
+          name: "indexes",
+          status: "fetching"
+        },
+        fks: {
+          count: 0,
+          name: "foreign keys",
+          status: "fetching"
+        },
+        policies: {
+          count: 0,
+          name: "policies",
+          status: "fetching"
+        },
+        checks: {
+          count: 0,
+          name: "check constraints",
+          status: "fetching"
+        },
+        views: {
+          count: 0,
+          name: "views",
+          status: "fetching"
+        }
+      };
       update(stage, count2, status) {
         this.state[stage].count = count2;
         this.state[stage].status = status;
         this.requestLayout();
       }
+      formatCount = (count2) => {
+        const width = Math.max.apply(
+          null,
+          Object.values(this.state).map((it) => it.count.toFixed(0).length)
+        );
+        return count2.toFixed(0).padEnd(width, " ");
+      };
+      statusText = (spinner, stage) => {
+        const { name, count: count2 } = stage;
+        const isDone = stage.status === "done";
+        const prefix2 = isDone ? `[${source_default.green("\u2713")}]` : `[${spinner}]`;
+        const formattedCount = this.formatCount(count2);
+        const suffix = isDone ? `${formattedCount} ${name} fetched` : `${formattedCount} ${name} fetching`;
+        return `${prefix2} ${suffix}
+`;
+      };
       render() {
         let info2 = "";
         const spin = this.spinner.value();
@@ -6029,9 +6032,10 @@ Is ${source_default.bold.blue(key)} ${this.entityType} created or renamed from a
       }
     };
     MigrateProgress = class extends import_hanji.TaskView {
+      spinner = new Spinner("\u28F7\u28EF\u28DF\u287F\u28BF\u28FB\u28FD\u28FE".split(""));
+      timeout;
       constructor() {
         super();
-        this.spinner = new Spinner("\u28F7\u28EF\u28DF\u287F\u28BF\u28FB\u28FD\u28FE".split(""));
         this.timeout = setInterval(() => {
           this.spinner.tick();
           this.requestLayout();
@@ -6051,13 +6055,14 @@ Is ${source_default.bold.blue(key)} ${this.entityType} created or renamed from a
         super();
         this.progressText = progressText;
         this.successText = successText;
-        this.spinner = new Spinner("\u28F7\u28EF\u28DF\u287F\u28BF\u28FB\u28FD\u28FE".split(""));
         this.timeout = setInterval(() => {
           this.spinner.tick();
           this.requestLayout();
         }, 128);
         this.on("detach", () => clearInterval(this.timeout));
       }
+      spinner = new Spinner("\u28F7\u28EF\u28DF\u287F\u28BF\u28FB\u28FD\u28FE".split(""));
+      timeout;
       render(status) {
         if (status === "pending") {
           const spin = this.spinner.value();
@@ -6069,6 +6074,7 @@ Is ${source_default.bold.blue(key)} ${this.entityType} created or renamed from a
       }
     };
     DropMigrationView = class extends import_hanji.Prompt {
+      data;
       constructor(data) {
         super();
         this.on("attach", (terminal) => terminal.toggleCursor("hide"));
@@ -6234,7 +6240,7 @@ function matchesFilters(item, filter2) {
   for (const [k, v] of Object.entries(filter2)) {
     if (v === void 0) continue;
     const target = item[k];
-    if (typeof v === "object" && v.CONTAINS !== void 0) {
+    if (v && typeof v === "object" && v.CONTAINS !== void 0) {
       if (!Array.isArray(target)) return false;
       if (!target.find((e2) => isEqual(e2, v.CONTAINS))) return false;
     } else {
@@ -6254,6 +6260,11 @@ function findCompositeKey(dataSource, target) {
   const match2 = dataSource.find((e2) => getCompositeKey(e2) === targetKey);
   return match2;
 }
+function findCompositeKeys(dataSource, target) {
+  const targetKey = getCompositeKey(target);
+  const match2 = dataSource.filter((e2) => getCompositeKey(e2) === targetKey);
+  return match2;
+}
 function validate(data, schema4, deep = false) {
   if (typeof data !== "object" || data === null) return false;
   for (const k of Array.from(/* @__PURE__ */ new Set([...Object.keys(data), ...Object.keys(schema4)]))) {
@@ -6284,6 +6295,13 @@ function validate(data, schema4, deep = false) {
 }
 function initSchemaProcessors({ entities }, store, common, extraConfigs) {
   const entries = Object.entries(entities);
+  const extraKeys = 4;
+  const lengths = Object.fromEntries(
+    Object.entries(common ? extraConfigs : entities).map(([k, v]) => {
+      const commonCount = Object.keys(v).filter((e2) => e2 in commonConfig).length;
+      return [k, commonCount + extraKeys];
+    })
+  );
   return Object.fromEntries(entries.map(([k, v]) => {
     return [k, {
       push: generateInsert(common ? extraConfigs : entities, store, common ? void 0 : k),
@@ -6291,7 +6309,8 @@ function initSchemaProcessors({ entities }, store, common, extraConfigs) {
       one: generateOne(store, common ? void 0 : k),
       update: generateUpdate(store, common ? void 0 : k),
       delete: generateDelete(store, common ? void 0 : k),
-      validate: generateValidate(common ? extraConfigs : entities, common ? void 0 : k)
+      validate: generateValidate(common ? extraConfigs : entities, common ? void 0 : k),
+      hasDiff: generateHasDiff(lengths)
     }];
   }));
 }
@@ -6374,7 +6393,9 @@ function _diff(dbOld, dbNew, collection, mode) {
           $diffType: "alter",
           entityType: newRow.entityType,
           ...getRowCommons(newRow),
-          ...changes
+          ...changes,
+          $left: oldRow,
+          $right: newRow
         });
       }
     }
@@ -6407,7 +6428,7 @@ function create(definition) {
   }
   return db2;
 }
-var commonConfig, generateInsert, generateList, generateOne, generateUpdate, generateDelete, generateValidate, ignoreChanges, SimpleDb;
+var commonConfig, generateInsert, generateList, generateOne, generateUpdate, generateDelete, generateHasDiff, generateValidate, ignoreChanges, SimpleDb;
 var init_dialect = __esm({
   "src/dialects/dialect.ts"() {
     "use strict";
@@ -6471,14 +6492,37 @@ var init_dialect = __esm({
         } : where;
         const targets = filter2 ? filterCollection(store.collection, filter2) : store.collection;
         const entries = Object.entries(set);
+        const newItems = [];
+        let i2 = 0;
+        const dupes = [];
         for (const item of targets) {
+          const newItem = { ...item };
           for (const [k, v] of entries) {
             if (!(k in item)) continue;
             const target = item[k];
-            item[k] = typeof v === "function" ? Array.isArray(target) ? target.map(v) : v(target) : v;
+            newItem[k] = typeof v === "function" ? Array.isArray(target) ? target.map(v) : v(target) : v;
+          }
+          const dupe = findCompositeKeys(store.collection, newItem).filter(
+            (e2) => e2 !== item
+          );
+          dupes.push(...dupe.filter((e2) => !dupes.find((d) => d === e2)));
+          if (!dupe.length) {
+            newItems.push({
+              item: newItem,
+              index: i2++
+            });
           }
         }
-        return targets;
+        if (dupes.length) {
+          return {
+            status: "CONFLICT",
+            data: dupes
+          };
+        }
+        for (const { index: index5, item } of newItems) {
+          Object.assign(targets[index5], item);
+        }
+        return { status: "OK", data: targets };
       };
     };
     generateDelete = (store, type) => {
@@ -6501,6 +6545,13 @@ var init_dialect = __esm({
         return deleted;
       };
     };
+    generateHasDiff = (lengths) => {
+      return (input) => {
+        const type = input.entityType;
+        const length = lengths[type];
+        return Object.keys(input).length > length;
+      };
+    };
     generateValidate = (configs, type) => {
       return (data) => {
         if (typeof data !== "object" || data === null) return false;
@@ -6536,13 +6587,14 @@ var init_dialect = __esm({
       diff2.alters = alters;
     })(diff || (diff = {}));
     SimpleDb = class {
+      _ = {
+        diffs: {},
+        store: {
+          collection: []
+        }
+      };
+      entities;
       constructor(definition) {
-        this._ = {
-          diffs: {},
-          store: {
-            collection: []
-          }
-        };
         const entries = Object.entries(definition);
         const configs = Object.fromEntries(entries.map(([type, def]) => {
           if (type === "entities" || type === "_") throw new Error(`Illegal entity type name: "${type}"`);
@@ -6615,7 +6667,7 @@ var init_utils2 = __esm({
 });
 
 // src/dialects/mssql/grammar.ts
-var defaultNameForPK, defaultNameForUnique, defaultNameForFK, defaultToSQL;
+var defaultNameForPK, defaultNameForUnique, defaultNameForFK, defaultNameForDefault, defaultToSQL;
 var init_grammar = __esm({
   "src/dialects/mssql/grammar.ts"() {
     "use strict";
@@ -6630,6 +6682,9 @@ var init_grammar = __esm({
     defaultNameForFK = (table5, columns, tableTo, columnsTo) => {
       return `${table5}_${columns.join("_")}_${tableTo}_${columnsTo.join("_")}_fk`;
     };
+    defaultNameForDefault = (table5, column8) => {
+      return `${table5}_${column8}_default`;
+    };
     defaultToSQL = (it) => {
       if (!it) return "";
       const { value, type } = it;
@@ -6663,10 +6718,6 @@ var init_ddl = __esm({
           table: "required",
           type: "string",
           notNull: "boolean",
-          default: {
-            value: "string",
-            type: ["string", "number", "boolean", "bigint", "text", "unknown"]
-          },
           generated: {
             type: ["persisted", "virtual"],
             as: "string"
@@ -6718,6 +6769,16 @@ var init_ddl = __esm({
           // TODO why?
           value: "string"
         },
+        defaults: {
+          schema: "required",
+          table: "required",
+          column: "string",
+          nameExplicit: "boolean",
+          default: {
+            value: "string",
+            type: ["string", "number", "boolean", "bigint", "text", "unknown"]
+          }
+        },
         views: {
           schema: "required",
           definition: "string",
@@ -6736,6 +6797,7 @@ var init_ddl = __esm({
       const uniques = ddl5.uniques.list(filter2);
       const checks = ddl5.checks.list(filter2);
       const indexes = ddl5.indexes.list(filter2);
+      const defaults4 = ddl5.defaults.list(filter2);
       return {
         ...table5,
         columns,
@@ -6743,7 +6805,8 @@ var init_ddl = __esm({
         fks,
         uniques,
         checks,
-        indexes
+        indexes,
+        defaults: defaults4
       };
     };
     interimToDDL = (interim) => {
@@ -6826,6 +6889,17 @@ var init_ddl = __esm({
           columns: [column8.name]
         });
       }
+      for (const columnDefault of interim.defaults) {
+        const res = ddl5.defaults.push(columnDefault);
+        if (res.status === "CONFLICT") {
+          errors.push({
+            type: "constraint_name_conflict",
+            schema: columnDefault.schema,
+            table: columnDefault.table,
+            name: columnDefault.name
+          });
+        }
+      }
       for (const check2 of interim.checks) {
         const res = ddl5.checks.push(check2);
         if (res.status === "CONFLICT") {
@@ -7339,6 +7413,31 @@ var init_snapshot2 = __esm({
   }
 });
 
+// src/dialects/common.ts
+var dictionary, hash;
+var init_common2 = __esm({
+  "src/dialects/common.ts"() {
+    "use strict";
+    dictionary = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".split("");
+    hash = (input, len = 12) => {
+      const combinationsCount = Math.pow(dictionary.length, len);
+      const p = 53;
+      let hash2 = 0;
+      for (let i2 = 0; i2 < input.length; i2++) {
+        hash2 += (input.codePointAt(i2) || 0) * Math.pow(p, i2) % combinationsCount;
+      }
+      const result = [];
+      let index5 = hash2 % combinationsCount;
+      for (let i2 = len - 1; i2 >= 0; i2--) {
+        const element = dictionary[index5 % dictionary.length];
+        result.unshift(element);
+        index5 = Math.floor(index5 / dictionary.length);
+      }
+      return result.join("");
+    };
+  }
+});
+
 // src/dialects/postgres/grammar.ts
 function stringFromIdentityProperty(field) {
   return typeof field === "string" ? field : typeof field === "undefined" ? void 0 : String(field);
@@ -7375,12 +7474,13 @@ function buildArrayString(array3, sqlType) {
   }).join(",");
   return `{${values}}`;
 }
-var trimChar, NativeTypes, parseType, indexName, serialExpressionFor, parseOnType, systemNamespaceNames, isSystemNamespace, splitExpressions, wrapRecord, parseViewDefinition, defaultNameForIdentitySequence, defaultNameForPK2, defaultNameForFK2, defaultNameForUnique2, defaultNameForIndex, trimDefaultValueSuffix, defaultForColumn, defaultToSQL2, isDefaultAction, defaults;
+var trimChar, NativeTypes, parseType, indexName, isSerialExpression, parseOnType, systemNamespaceNames, isSystemNamespace, splitExpressions, wrapRecord, parseViewDefinition, defaultNameForIdentitySequence, defaultNameForPK2, defaultNameForFK2, defaultNameForUnique2, defaultNameForIndex, trimDefaultValueSuffix, defaultForColumn, defaultToSQL2, isDefaultAction, defaults;
 var init_grammar2 = __esm({
   "src/dialects/postgres/grammar.ts"() {
     "use strict";
     init_global();
     init_utils2();
+    init_common2();
     trimChar = (str, char) => {
       let start = 0;
       let end = str.length;
@@ -7442,9 +7542,9 @@ var init_grammar2 = __esm({
     indexName = (tableName, columns) => {
       return `${tableName}_${columns.join("_")}_index`;
     };
-    serialExpressionFor = (schema4, table5, column8) => {
+    isSerialExpression = (expr, schema4) => {
       const schemaPrefix = schema4 === "public" ? "" : `${schema4}.`;
-      return `nextval('${schemaPrefix}${table5}_${column8}_seq'::regclass)`;
+      return expr.startsWith(`nextval('${schemaPrefix}`) && expr.endsWith(`_seq'::regclass)`);
     };
     parseOnType = (type) => {
       switch (type) {
@@ -7562,7 +7662,9 @@ var init_grammar2 = __esm({
       return `${table5}_pkey`;
     };
     defaultNameForFK2 = (table5, columns, tableTo, columnsTo) => {
-      return `${table5}_${columns.join("_")}_${tableTo}_${columnsTo.join("_")}_fk`;
+      const desired = `${table5}_${columns.join("_")}_${tableTo}_${columnsTo.join("_")}_fkey`;
+      const res = desired.length > 63 ? table5.length < 63 - 18 ? `${table5}_${hash(desired)}_fkey` : `${hash(desired)}_fkey` : desired;
+      return res;
     };
     defaultNameForUnique2 = (table5, ...columns) => {
       return `${table5}_${columns.join("_")}_key`;
@@ -7684,6 +7786,9 @@ var init_grammar2 = __esm({
         },
         cache: 1,
         cycle: false
+      },
+      index: {
+        method: "btree"
       }
     };
   }
@@ -7750,9 +7855,7 @@ var init_ddl3 = __esm({
           where: "string?",
           with: "string",
           method: "string",
-          concurrently: "boolean",
-          isPrimary: "boolean"
-          // is index for primaryKey, introspect only
+          concurrently: "boolean"
         },
         fks: {
           schema: "required",
@@ -7906,7 +8009,8 @@ var init_ddl3 = __esm({
         }
       }
       for (const it of schema4.indexes) {
-        const res = ddl5.indexes.push(it);
+        const { forPK, forUnique, ...rest } = it;
+        const res = ddl5.indexes.push(rest);
         if (res.status === "CONFLICT") {
           errors.push({
             type: "index_duplicate",
@@ -8025,7 +8129,7 @@ var init_ddl3 = __esm({
       for (const it of ddl5.entities.list()) {
         let err2 = false;
         if (!ddl5.entities.validate(it)) {
-          console.log(it);
+          console.log("invalid entity:", it);
           err2 = true;
         }
         if (err2) throw new Error();
@@ -8672,12 +8776,12 @@ var require_common = __commonJS({
       createDebug.skips = [];
       createDebug.formatters = {};
       function selectColor(namespace) {
-        let hash = 0;
+        let hash2 = 0;
         for (let i2 = 0; i2 < namespace.length; i2++) {
-          hash = (hash << 5) - hash + namespace.charCodeAt(i2);
-          hash |= 0;
+          hash2 = (hash2 << 5) - hash2 + namespace.charCodeAt(i2);
+          hash2 |= 0;
         }
-        return createDebug.colors[Math.abs(hash) % createDebug.colors.length];
+        return createDebug.colors[Math.abs(hash2) % createDebug.colors.length];
       }
       createDebug.selectColor = selectColor;
       function createDebug(namespace) {
@@ -13602,7 +13706,7 @@ var require_node2 = __commonJS({
             });
           }
         });
-        var defaults3 = opts.default || {};
+        var defaults4 = opts.default || {};
         var argv = { _: [] };
         function argDefined(key2, arg2) {
           return flags.allBools && /^--[^=]+$/.test(arg2) || flags.strings[key2] || flags.bools[key2] || aliases[key2];
@@ -13656,7 +13760,7 @@ var require_node2 = __commonJS({
           });
         }
         Object.keys(flags.bools).forEach(function(key2) {
-          setArg(key2, defaults3[key2] === void 0 ? false : defaults3[key2]);
+          setArg(key2, defaults4[key2] === void 0 ? false : defaults4[key2]);
         });
         var notFlags = [];
         if (args.indexOf("--") !== -1) {
@@ -13739,11 +13843,11 @@ var require_node2 = __commonJS({
             }
           }
         }
-        Object.keys(defaults3).forEach(function(k) {
+        Object.keys(defaults4).forEach(function(k) {
           if (!hasKey(argv, k.split("."))) {
-            setKey(argv, k.split("."), defaults3[k]);
+            setKey(argv, k.split("."), defaults4[k]);
             (aliases[k] || []).forEach(function(x2) {
-              setKey(argv, x2.split("."), defaults3[k]);
+              setKey(argv, x2.split("."), defaults4[k]);
             });
           }
         });
@@ -20565,7 +20669,7 @@ var init_utils5 = __esm({
 });
 
 // src/dialects/postgres/drizzle.ts
-var import_drizzle_orm, import_pg_core, policyFrom, unwrapArray, transformOnUpdateDelete, defaultFromColumn, fromDrizzleSchema, fromExport, prepareFromSchemaFiles;
+var import_drizzle_orm, import_pg_core, policyFrom, unwrapArray, transformOnUpdateDelete, defaultFromColumn, fromDrizzleSchema, fromExports, prepareFromSchemaFiles;
 var init_drizzle = __esm({
   "src/dialects/postgres/drizzle.ts"() {
     "use strict";
@@ -20683,7 +20787,23 @@ var init_drizzle = __esm({
       const dialect5 = new import_pg_core.PgDialect({ casing: casing2 });
       const errors = [];
       const warnings = [];
-      const schemas = schema4.schemas.map((it) => ({
+      const res = {
+        indexes: [],
+        pks: [],
+        fks: [],
+        uniques: [],
+        checks: [],
+        columns: [],
+        policies: [],
+        enums: [],
+        roles: [],
+        schemas: [],
+        sequences: [],
+        tables: [],
+        viewColumns: [],
+        views: []
+      };
+      res.schemas = schema4.schemas.map((it) => ({
         entityType: "schemas",
         name: it.schemaName
       })).filter((it) => {
@@ -20696,22 +20816,36 @@ var init_drizzle = __esm({
       const tableConfigPairs = schema4.tables.map((it) => {
         return { config: (0, import_pg_core.getTableConfig)(it), table: it };
       });
-      const tables = tableConfigPairs.map((it) => {
+      for (const policy2 of schema4.policies) {
+        if (!("_linkedTable" in policy2) || typeof policy2._linkedTable === "undefined") {
+          warnings.push({ type: "policy_not_linked", policy: policy2.name });
+          continue;
+        }
+        const { schema: configSchema, name: tableName } = (0, import_pg_core.getTableConfig)(policy2._linkedTable);
+        const p = policyFrom(policy2, dialect5);
+        res.policies.push({
+          entityType: "policies",
+          schema: configSchema ?? "public",
+          table: tableName,
+          name: p.name,
+          as: p.as,
+          for: p.for,
+          roles: p.roles,
+          using: p.using,
+          withCheck: p.withCheck
+        });
+      }
+      res.tables = tableConfigPairs.map((it) => {
         const config = it.config;
+        const schema5 = config.schema ?? "public";
+        const isRlsEnabled = config.enableRLS || config.policies.length > 0 || res.policies.some((x2) => x2.schema === schema5 && x2.table === config.name);
         return {
           entityType: "tables",
-          schema: config.schema ?? "public",
+          schema: schema5,
           name: config.name,
-          isRlsEnabled: config.enableRLS || config.policies.length > 0
+          isRlsEnabled
         };
       });
-      const indexes = [];
-      const pks = [];
-      const fks = [];
-      const uniques = [];
-      const checks = [];
-      const columns = [];
-      const policies = [];
       for (const { table: table5, config } of tableConfigPairs) {
         const {
           name: tableName,
@@ -20729,7 +20863,7 @@ var init_drizzle = __esm({
         if (schemaFilter && !schemaFilter.includes(schema5)) {
           continue;
         }
-        columns.push(
+        res.columns.push(
           ...drizzleColumns.map((column8) => {
             var _a2, _b2, _c2, _d2, _e2, _f2;
             const name = getColumnCasing(column8, casing2);
@@ -20773,7 +20907,7 @@ var init_drizzle = __esm({
               dimensions,
               pk: column8.primary,
               pkName: null,
-              notNull: notNull && !isPrimary && !generatedValue && !identityValue,
+              notNull,
               default: columnDefault,
               generated: generatedValue,
               unique: column8.isUnique,
@@ -20783,7 +20917,7 @@ var init_drizzle = __esm({
             };
           })
         );
-        pks.push(
+        res.pks.push(
           ...drizzlePKs.map((pk) => {
             const columnNames = pk.columns.map((c) => getColumnCasing(c, casing2));
             const name = pk.name || defaultNameForPK2(tableName);
@@ -20798,7 +20932,7 @@ var init_drizzle = __esm({
             };
           })
         );
-        uniques.push(
+        res.uniques.push(
           ...drizzleUniques.map((unq) => {
             const columnNames = unq.columns.map((c) => getColumnCasing(c, casing2));
             const name = unq.name || (0, import_pg_core.uniqueKeyName)(table5, columnNames);
@@ -20807,39 +20941,28 @@ var init_drizzle = __esm({
               schema: schema5,
               table: tableName,
               name,
-              nameExplicit: !!unq.name,
+              nameExplicit: !!unq.isNameExplicit(),
               nullsNotDistinct: unq.nullsNotDistinct,
               columns: columnNames
             };
           })
         );
-        fks.push(
+        res.fks.push(
           ...drizzleFKs.map((fk5) => {
             const onDelete = fk5.onDelete;
             const onUpdate = fk5.onUpdate;
             const reference = fk5.reference();
             const tableTo = (0, import_drizzle_orm.getTableName)(reference.foreignTable);
             const schemaTo = (0, import_pg_core.getTableConfig)(reference.foreignTable).schema || "public";
-            const originalColumnsFrom = reference.columns.map((it) => it.name);
             const columnsFrom = reference.columns.map((it) => getColumnCasing(it, casing2));
-            const originalColumnsTo = reference.foreignColumns.map((it) => it.name);
             const columnsTo = reference.foreignColumns.map((it) => getColumnCasing(it, casing2));
-            let name = fk5.reference.name || fk5.getName();
-            const nameExplicit = !!fk5.reference.name;
-            if (casing2 !== void 0 && !nameExplicit) {
-              for (let i2 = 0; i2 < originalColumnsFrom.length; i2++) {
-                name = name.replace(originalColumnsFrom[i2], columnsFrom[i2]);
-              }
-              for (let i2 = 0; i2 < originalColumnsTo.length; i2++) {
-                name = name.replace(originalColumnsTo[i2], columnsTo[i2]);
-              }
-            }
+            const name = fk5.isNameExplicit() ? fk5.getName() : defaultNameForFK2(tableName, columnsFrom, tableTo, columnsTo);
             return {
               entityType: "fks",
               schema: schema5,
               table: tableName,
               name,
-              nameExplicit,
+              nameExplicit: fk5.isNameExplicit(),
               tableTo,
               schemaTo,
               columns: columnsFrom,
@@ -20850,8 +20973,8 @@ var init_drizzle = __esm({
           })
         );
         for (const index5 of drizzleIndexes) {
-          const columns2 = index5.config.columns;
-          for (const column8 of columns2) {
+          const columns = index5.config.columns;
+          for (const column8 of columns) {
             if ((0, import_drizzle_orm.is)(column8, import_pg_core.IndexedColumn) && column8.type !== "PgVector") continue;
             if ((0, import_drizzle_orm.is)(column8, import_drizzle_orm.SQL) && !index5.config.name) {
               errors.push({
@@ -20874,16 +20997,16 @@ var init_drizzle = __esm({
             }
           }
         }
-        indexes.push(
+        res.indexes.push(
           ...drizzleIndexes.map((value) => {
-            const columns2 = value.config.columns;
-            let indexColumnNames = columns2.map((it) => {
+            const columns = value.config.columns;
+            let indexColumnNames = columns.map((it) => {
               const name2 = getColumnCasing(it, casing2);
               return name2;
             });
             const name = value.config.name ? value.config.name : indexName(tableName, indexColumnNames);
             const nameExplicit = !!value.config.name;
-            let indexColumns = columns2.map((it) => {
+            let indexColumns = columns.map((it) => {
               var _a2, _b2, _c2, _d2;
               if ((0, import_drizzle_orm.is)(it, import_drizzle_orm.SQL)) {
                 return {
@@ -20922,11 +21045,12 @@ var init_drizzle = __esm({
               concurrently: value.config.concurrently ?? false,
               method: value.config.method ?? "btree",
               with: withOpt,
-              isPrimary: false
+              forPK: false,
+              forUnique: false
             };
           })
         );
-        policies.push(
+        res.policies.push(
           ...drizzlePolicies.map((policy2) => {
             const p = policyFrom(policy2, dialect5);
             return {
@@ -20942,7 +21066,7 @@ var init_drizzle = __esm({
             };
           })
         );
-        checks.push(
+        res.checks.push(
           ...drizzleChecks.map((check2) => {
             const checkName = check2.name;
             return {
@@ -20955,26 +21079,6 @@ var init_drizzle = __esm({
           })
         );
       }
-      for (const policy2 of schema4.policies) {
-        if (!("_linkedTable" in policy2) || typeof policy2._linkedTable === "undefined") {
-          warnings.push({ type: "policy_not_linked", policy: policy2.name });
-          continue;
-        }
-        const { schema: configSchema, name: tableName } = (0, import_pg_core.getTableConfig)(policy2._linkedTable);
-        const p = policyFrom(policy2, dialect5);
-        policies.push({
-          entityType: "policies",
-          schema: configSchema ?? "public",
-          table: tableName,
-          name: p.name,
-          as: p.as,
-          for: p.for,
-          roles: p.roles,
-          using: p.using,
-          withCheck: p.withCheck
-        });
-      }
-      const sequences = [];
       for (const sequence of schema4.sequences) {
         const name = sequence.seqName;
         const increment = stringFromIdentityProperty((_a = sequence.seqOptions) == null ? void 0 : _a.increment) ?? "1";
@@ -20982,7 +21086,7 @@ var init_drizzle = __esm({
         const maxValue = stringFromIdentityProperty((_c = sequence.seqOptions) == null ? void 0 : _c.maxValue) ?? (parseFloat(increment) < 0 ? "-1" : "9223372036854775807");
         const startWith = stringFromIdentityProperty((_d = sequence.seqOptions) == null ? void 0 : _d.startWith) ?? (parseFloat(increment) < 0 ? maxValue : minValue);
         const cache = Number(stringFromIdentityProperty((_e = sequence.seqOptions) == null ? void 0 : _e.cache) ?? 1);
-        sequences.push({
+        res.sequences.push({
           entityType: "sequences",
           name,
           schema: sequence.schema ?? "public",
@@ -20994,11 +21098,10 @@ var init_drizzle = __esm({
           cycle: ((_f = sequence.seqOptions) == null ? void 0 : _f.cycle) ?? false
         });
       }
-      const roles = [];
       for (const _role of schema4.roles) {
         const role = _role;
         if (role._existing) continue;
-        roles.push({
+        res.roles.push({
           entityType: "roles",
           name: role.name,
           createDb: role.createDb ?? false,
@@ -21006,7 +21109,6 @@ var init_drizzle = __esm({
           inherit: role.inherit ?? true
         });
       }
-      const views = [];
       const combinedViews = [...schema4.views, ...schema4.matViews].map((it) => {
         if ((0, import_drizzle_orm.is)(it, import_pg_core.PgView)) {
           return {
@@ -21084,7 +21186,7 @@ var init_drizzle = __esm({
           vacuumTruncate: getOrNull(opt, "vacuumTruncate")
         } : null;
         const hasNonNullOpts = Object.values(withOpt ?? {}).filter((x2) => x2 !== null).length > 0;
-        views.push({
+        res.views.push({
           entityType: "views",
           definition: isExisting ? null : dialect5.sqlToQuery(query).sql,
           name: viewName,
@@ -21100,7 +21202,7 @@ var init_drizzle = __esm({
           } : null
         });
       }
-      const enums = schema4.enums.map((e2) => {
+      res.enums = schema4.enums.map((e2) => {
         return {
           entityType: "enums",
           name: e2.enumName,
@@ -21109,27 +21211,12 @@ var init_drizzle = __esm({
         };
       });
       return {
-        schema: {
-          schemas,
-          tables,
-          enums,
-          columns,
-          indexes,
-          fks,
-          pks,
-          uniques,
-          checks,
-          sequences,
-          roles,
-          policies,
-          views,
-          viewColumns: []
-        },
+        schema: res,
         errors,
         warnings
       };
     };
-    fromExport = (exports2) => {
+    fromExports = (exports2) => {
       const tables = [];
       const enums = [];
       const schemas = [];
@@ -21190,7 +21277,7 @@ var init_drizzle = __esm({
       for (let i2 = 0; i2 < imports.length; i2++) {
         const it = imports[i2];
         const i0 = require(`${it}`);
-        const prepared = fromExport(i0);
+        const prepared = fromExports(i0);
         tables.push(...prepared.tables);
         enums.push(...prepared.enums);
         schemas.push(...prepared.schemas);
@@ -21425,7 +21512,7 @@ function fromJson(statements) {
   };
   return result;
 }
-var convertor, createSchemaConvertor, dropSchemaConvertor, renameSchemaConvertor, createViewConvertor, dropViewConvertor, renameViewConvertor, moveViewConvertor, alterViewConvertor, recreateViewConvertor, createTableConvertor, dropTableConvertor, renameTableConvertor, moveTableConvertor, addColumnConvertor, dropColumnConvertor, renameColumnConvertor, recreateColumnConvertor, alterColumnConvertor, createIndexConvertor, dropIndexConvertor, addPrimaryKeyConvertor, dropPrimaryKeyConvertor, recreatePrimaryKeyConvertor, renameConstraintConvertor, createForeignKeyConvertor, alterForeignKeyConvertor, dropForeignKeyConvertor, addCheckConvertor, dropCheckConvertor, addUniqueConvertor, dropUniqueConvertor, createEnumConvertor, dropEnumConvertor, renameEnumConvertor, moveEnumConvertor, alterEnumConvertor, recreateEnumConvertor, createSequenceConvertor, dropSequenceConvertor, renameSequenceConvertor, moveSequenceConvertor, alterSequenceConvertor, createRoleConvertor, dropRoleConvertor, renameRoleConvertor, alterRoleConvertor, createPolicyConvertor, dropPolicyConvertor, renamePolicyConvertor, alterPolicyConvertor, recreatePolicy, toggleRlsConvertor, convertors;
+var convertor, createSchemaConvertor, dropSchemaConvertor, renameSchemaConvertor, createViewConvertor, dropViewConvertor, renameViewConvertor, moveViewConvertor, alterViewConvertor, recreateViewConvertor, createTableConvertor, dropTableConvertor, renameTableConvertor, moveTableConvertor, addColumnConvertor, dropColumnConvertor, renameColumnConvertor, recreateColumnConvertor, alterColumnConvertor, createIndexConvertor, dropIndexConvertor, renameIndexConvertor, addPrimaryKeyConvertor, dropPrimaryKeyConvertor, recreatePrimaryKeyConvertor, renameConstraintConvertor, createForeignKeyConvertor, recreateFKConvertor, dropForeignKeyConvertor, addCheckConvertor, dropCheckConvertor, recreateCheckConvertor, addUniqueConvertor, dropUniqueConvertor, createEnumConvertor, dropEnumConvertor, renameEnumConvertor, moveEnumConvertor, alterEnumConvertor, recreateEnumConvertor, createSequenceConvertor, dropSequenceConvertor, renameSequenceConvertor, moveSequenceConvertor, alterSequenceConvertor, createRoleConvertor, dropRoleConvertor, renameRoleConvertor, alterRoleConvertor, createPolicyConvertor, dropPolicyConvertor, renamePolicyConvertor, alterPolicyConvertor, recreatePolicy, toggleRlsConvertor, convertors;
 var init_convertor = __esm({
   "src/dialects/postgres/convertor.ts"() {
     "use strict";
@@ -21536,7 +21623,7 @@ var init_convertor = __esm({
         const notNullStatement = isPK ? "" : column8.notNull && !column8.identity ? " NOT NULL" : "";
         const defaultStatement = column8.default ? ` DEFAULT ${defaultToSQL2(column8.default)}` : "";
         const unique = uniques.find((u) => u.columns.length === 1 && u.columns[0] === column8.name);
-        const unqiueConstraintPrefix = unique ? unique.nameExplicit ? `UNIQUE("${unique.name}")` : "UNIQUE" : "";
+        const unqiueConstraintPrefix = unique ? unique.nameExplicit ? `CONSTRAINT "${unique.name}" UNIQUE` : "UNIQUE" : "";
         const uniqueConstraintStatement = unique ? ` ${unqiueConstraintPrefix}${unique.nullsNotDistinct ? " NULLS NOT DISTINCT" : ""}` : "";
         const schemaPrefix = column8.typeSchema && column8.typeSchema !== "public" ? `"${column8.typeSchema}".` : "";
         const arr = column8.dimensions > 0 ? "[]" : "";
@@ -21580,7 +21667,7 @@ var init_convertor = __esm({
       const droppedPolicies = policies.map((policy2) => dropPolicyConvertor.convert({ policy: policy2 }));
       return [
         ...droppedPolicies,
-        `DROP TABLE ${tableNameWithSchema} CASCADE;`
+        `DROP TABLE ${tableNameWithSchema};`
       ];
     });
     renameTableConvertor = convertor("rename_table", (st) => {
@@ -21593,7 +21680,7 @@ var init_convertor = __esm({
 `;
     });
     addColumnConvertor = convertor("add_column", (st) => {
-      const { schema: schema4, table: table5, name } = st.column;
+      const { schema: schema4, table: table5, name, identity, generated } = st.column;
       const column8 = st.column;
       const primaryKeyStatement = st.isPK ? " PRIMARY KEY" : "";
       const tableNameWithSchema = schema4 !== "public" ? `"${schema4}"."${table5}"` : `"${table5}"`;
@@ -21601,10 +21688,9 @@ var init_convertor = __esm({
       const schemaPrefix = column8.typeSchema && column8.typeSchema !== "public" ? `"${column8.typeSchema}".` : "";
       let fixedType = parseType(schemaPrefix, column8.type);
       fixedType += column8.dimensions > 0 ? "[]" : "";
-      const notNullStatement = column8.notNull ? " NOT NULL" : "";
-      const unsquashedIdentity = column8.identity;
-      const identityWithSchema = schema4 !== "public" ? `"${schema4}"."${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"` : `"${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"`;
-      const identityStatement = unsquashedIdentity ? ` GENERATED ${unsquashedIdentity.type === "always" ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY (sequence name ${identityWithSchema}${unsquashedIdentity.increment ? ` INCREMENT BY ${unsquashedIdentity.increment}` : ""}${unsquashedIdentity.minValue ? ` MINVALUE ${unsquashedIdentity.minValue}` : ""}${unsquashedIdentity.maxValue ? ` MAXVALUE ${unsquashedIdentity.maxValue}` : ""}${unsquashedIdentity.startWith ? ` START WITH ${unsquashedIdentity.startWith}` : ""}${unsquashedIdentity.cache ? ` CACHE ${unsquashedIdentity.cache}` : ""}${unsquashedIdentity.cycle ? ` CYCLE` : ""})` : "";
+      const notNullStatement = column8.notNull && !identity && !generated ? " NOT NULL" : "";
+      const identityWithSchema = schema4 !== "public" ? `"${schema4}"."${identity == null ? void 0 : identity.name}"` : `"${identity == null ? void 0 : identity.name}"`;
+      const identityStatement = identity ? ` GENERATED ${identity.type === "always" ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY (sequence name ${identityWithSchema}${identity.increment ? ` INCREMENT BY ${identity.increment}` : ""}${identity.minValue ? ` MINVALUE ${identity.minValue}` : ""}${identity.maxValue ? ` MAXVALUE ${identity.maxValue}` : ""}${identity.startWith ? ` START WITH ${identity.startWith}` : ""}${identity.cache ? ` CACHE ${identity.cache}` : ""}${identity.cycle ? ` CYCLE` : ""})` : "";
       const generatedStatement = column8.generated ? ` GENERATED ALWAYS AS (${column8.generated.as}) STORED` : "";
       return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name}" ${fixedType}${primaryKeyStatement}${defaultStatement}${generatedStatement}${notNullStatement}${identityStatement};`;
     });
@@ -21733,11 +21819,16 @@ var init_convertor = __esm({
       const concur = concurrently ? " CONCURRENTLY" : "";
       const withClause = w ? ` WITH (${w})` : "";
       const whereClause = where ? ` WHERE ${where}` : "";
-      return `CREATE ${indexPart}${concur} "${name}" ON ${key} USING ${method} (${value})${withClause}${whereClause};`;
+      const using = method !== defaults.index.method ? ` USING ${method}` : "";
+      return `CREATE ${indexPart}${concur} "${name}" ON ${key}${using} (${value})${withClause}${whereClause};`;
     });
     dropIndexConvertor = convertor("drop_index", (st) => {
       return `DROP INDEX "${st.index.name}";`;
     });
+    renameIndexConvertor = convertor("rename_index", (st) => {
+      const key = st.schema !== "public" ? `"${st.schema}"."${st.from}"` : `"${st.from}"`;
+      return `ALTER INDEX ${key} RENAME TO "${st.to}";`;
+    });
     addPrimaryKeyConvertor = convertor("add_pk", (st) => {
       const { pk } = st;
       const key = pk.schema !== "public" ? `"${pk.schema}"."${pk.table}"` : `"${pk.table}"`;
@@ -21749,25 +21840,7 @@ var init_convertor = __esm({
     dropPrimaryKeyConvertor = convertor("drop_pk", (st) => {
       const pk = st.pk;
       const key = pk.schema !== "public" ? `"${pk.schema}"."${pk.table}"` : `"${pk.table}"`;
-      if (st.pk.nameExplicit) {
-        return `ALTER TABLE ${key} DROP CONSTRAINT "${pk.name}";`;
-      }
-      return `/* 
-    Unfortunately in current drizzle-kit version we can't automatically get name for primary key.
-    We are working on making it available!
-
-    Meanwhile you can:
-        1. Check pk name in your database, by running
-            SELECT constraint_name FROM information_schema.table_constraints
-            WHERE table_schema = '${pk.schema}'
-                AND table_name = '${pk.table}'
-                AND constraint_type = 'PRIMARY KEY';
-        2. Uncomment code below and paste pk name manually
-        
-    Hope to release this update as soon as possible
-*/
-
--- ALTER TABLE "${key}" DROP CONSTRAINT "<constraint_name>";`;
+      return `ALTER TABLE ${key} DROP CONSTRAINT "${pk.name}";`;
     });
     recreatePrimaryKeyConvertor = convertor("alter_pk", (it) => {
       const drop2 = dropPrimaryKeyConvertor.convert({ pk: it.pk });
@@ -21788,29 +21861,23 @@ var init_convertor = __esm({
       const tableToNameWithSchema = schemaTo !== "public" ? `"${schemaTo}"."${tableTo}"` : `"${tableTo}"`;
       return `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement};`;
     });
-    alterForeignKeyConvertor = convertor("alter_fk", (st) => {
-      const { from, to } = st;
-      const key = to.schema !== "public" ? `"${to.schema}"."${to.table}"` : `"${to.table}"`;
-      let sql = `ALTER TABLE ${key} DROP CONSTRAINT "${from.name}";
-`;
-      const onDeleteStatement = to.onDelete ? ` ON DELETE ${to.onDelete}` : "";
-      const onUpdateStatement = to.onUpdate ? ` ON UPDATE ${to.onUpdate}` : "";
-      const fromColumnsString = to.columns.map((it) => `"${it}"`).join(",");
-      const toColumnsString = to.columnsTo.map((it) => `"${it}"`).join(",");
-      const tableToNameWithSchema = to.schemaTo !== "public" ? `"${to.schemaTo}"."${to.tableTo}"` : `"${to.tableTo}"`;
-      const alterStatement = `ALTER TABLE ${key} ADD CONSTRAINT "${to.name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
-      sql += "DO $$ BEGIN\n";
-      sql += " " + alterStatement + ";\n";
-      sql += "EXCEPTION\n";
-      sql += " WHEN duplicate_object THEN null;\n";
-      sql += "END $$;\n";
+    recreateFKConvertor = convertor("recreate_fk", (st) => {
+      const { fk: fk5 } = st;
+      const key = fk5.schema !== "public" ? `"${fk5.schema}"."${fk5.table}"` : `"${fk5.table}"`;
+      const onDeleteStatement = fk5.onDelete !== "NO ACTION" ? ` ON DELETE ${fk5.onDelete}` : "";
+      const onUpdateStatement = fk5.onUpdate !== "NO ACTION" ? ` ON UPDATE ${fk5.onUpdate}` : "";
+      const fromColumnsString = fk5.columns.map((it) => `"${it}"`).join(",");
+      const toColumnsString = fk5.columnsTo.map((it) => `"${it}"`).join(",");
+      const tableToNameWithSchema = fk5.schemaTo !== "public" ? `"${fk5.schemaTo}"."${fk5.tableTo}"` : `"${fk5.tableTo}"`;
+      let sql = `ALTER TABLE ${key} DROP CONSTRAINT "${fk5.name}", `;
+      sql += `ADD CONSTRAINT "${fk5.name}" FOREIGN KEY (${fromColumnsString}) `;
+      sql += `REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement};`;
       return sql;
     });
     dropForeignKeyConvertor = convertor("drop_fk", (st) => {
       const { schema: schema4, table: table5, name } = st.fk;
-      const tableNameWithSchema = schema4 ? `"${schema4}"."${table5}"` : `"${table5}"`;
-      return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${name}";
-`;
+      const tableNameWithSchema = schema4 !== "public" ? `"${schema4}"."${table5}"` : `"${table5}"`;
+      return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${name}";`;
     });
     addCheckConvertor = convertor("add_check", (st) => {
       const { check: check2 } = st;
@@ -21822,6 +21889,13 @@ var init_convertor = __esm({
       const tableNameWithSchema = check2.schema !== "public" ? `"${check2.schema}"."${check2.table}"` : `"${check2.table}"`;
       return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${check2.name}";`;
     });
+    recreateCheckConvertor = convertor("alter_check", (st) => {
+      const { check: check2 } = st;
+      const key = check2.schema !== "public" ? `"${check2.schema}"."${check2.table}"` : `"${check2.table}"`;
+      let sql = `ALTER TABLE ${key} DROP CONSTRAINT "${check2.name}", `;
+      sql += `ADD CONSTRAINT "${check2.name}" CHECK (${check2.value});`;
+      return sql;
+    });
     addUniqueConvertor = convertor("add_unique", (st) => {
       const { unique } = st;
       const tableNameWithSchema = unique.schema !== "public" ? `"${unique.schema}"."${unique.table}"` : `"${unique.table}"`;
@@ -21945,7 +22019,7 @@ var init_convertor = __esm({
     dropPolicyConvertor = convertor("drop_policy", (st) => {
       const policy2 = st.policy;
       const tableNameWithSchema = policy2.schema !== "public" ? `"${policy2.schema}"."${policy2.table}"` : `"${policy2.table}"`;
-      return `DROP POLICY "${policy2.name}" ON ${tableNameWithSchema} CASCADE;`;
+      return `DROP POLICY "${policy2.name}" ON ${tableNameWithSchema};`;
     });
     renamePolicyConvertor = convertor("rename_policy", (st) => {
       const { from, to } = st;
@@ -21995,14 +22069,16 @@ var init_convertor = __esm({
       alterColumnConvertor,
       createIndexConvertor,
       dropIndexConvertor,
+      renameIndexConvertor,
       addPrimaryKeyConvertor,
       dropPrimaryKeyConvertor,
       recreatePrimaryKeyConvertor,
       createForeignKeyConvertor,
-      alterForeignKeyConvertor,
+      recreateFKConvertor,
       dropForeignKeyConvertor,
       addCheckConvertor,
       dropCheckConvertor,
+      recreateCheckConvertor,
       addUniqueConvertor,
       dropUniqueConvertor,
       renameConstraintConvertor,
@@ -22069,7 +22145,7 @@ var init_statements = __esm({
 });
 
 // src/dialects/postgres/diff.ts
-var ddlDiffDry, ddlDiff;
+var ddlDiffDry, ddlDiff, preserveEntityNames;
 var init_diff = __esm({
   "src/dialects/postgres/diff.ts"() {
     "use strict";
@@ -22080,7 +22156,6 @@ var init_diff = __esm({
     init_utils3();
     init_convertor();
     init_ddl3();
-    init_grammar2();
     init_statements();
     ddlDiffDry = async (ddlFrom, ddlTo, mode) => {
       const mocks = /* @__PURE__ */ new Set();
@@ -22264,7 +22339,7 @@ var init_diff = __esm({
             schema: rename.from.schema
           }
         });
-        const fks1 = ddl1.fks.update({
+        ddl1.fks.update({
           set: {
             schemaTo: rename.to.schema,
             tableTo: rename.to.name
@@ -22274,7 +22349,7 @@ var init_diff = __esm({
             tableTo: rename.from.name
           }
         });
-        const fks2 = ddl1.fks.update({
+        ddl1.fks.update({
           set: {
             schema: rename.to.schema,
             table: rename.to.name
@@ -22284,19 +22359,7 @@ var init_diff = __esm({
             table: rename.from.name
           }
         });
-        for (const fk5 of [...fks1, ...fks2].filter((it) => !it.nameExplicit)) {
-          const name = defaultNameForFK2(fk5.table, fk5.columns, fk5.tableTo, fk5.columnsTo);
-          ddl22.fks.update({
-            set: { name: fk5.name },
-            where: {
-              schema: fk5.schema,
-              table: fk5.table,
-              name,
-              nameExplicit: false
-            }
-          });
-        }
-        const res = ddl1.entities.update({
+        ddl1.entities.update({
           set: {
             table: rename.to.name,
             schema: rename.to.schema
@@ -22306,50 +22369,6 @@ var init_diff = __esm({
             schema: rename.from.schema
           }
         });
-        for (const it of res) {
-          if (it.entityType === "pks") {
-            const name = defaultNameForPK2(it.table);
-            ddl22.pks.update({
-              set: {
-                name: it.name
-              },
-              where: {
-                schema: it.schema,
-                table: it.table,
-                name,
-                nameExplicit: false
-              }
-            });
-          }
-          if (it.entityType === "uniques" && !it.nameExplicit && it.columns.length === 1) {
-            const name = defaultNameForUnique2(it.table, it.columns[0]);
-            ddl22.uniques.update({
-              set: {
-                name: it.name
-              },
-              where: {
-                schema: it.schema,
-                table: it.table,
-                name,
-                nameExplicit: false
-              }
-            });
-          }
-          if (it.entityType === "indexes" && !it.nameExplicit) {
-            const name = defaultNameForIndex(it.table, it.columns.map((c) => c.value));
-            ddl22.indexes.update({
-              set: {
-                name: it.name
-              },
-              where: {
-                schema: it.schema,
-                table: it.table,
-                name,
-                nameExplicit: false
-              }
-            });
-          }
-        }
       }
       const columnsDiff = diff(ddl1, ddl22, "columns");
       const columnRenames = [];
@@ -22376,7 +22395,7 @@ var init_diff = __esm({
             schema: rename.from.schema
           }
         });
-        const indexes = ddl1.indexes.update({
+        ddl1.indexes.update({
           set: {
             columns: (it) => {
               if (!it.isExpression && it.value === rename.from.name) {
@@ -22387,24 +22406,9 @@ var init_diff = __esm({
           },
           where: {
             schema: rename.from.schema,
-            table: rename.from.table,
-            name: rename.from.name
+            table: rename.from.table
           }
         });
-        for (const it of indexes.filter((it2) => !it2.nameExplicit)) {
-          const name = defaultNameForIndex(it.table, it.columns.map((c) => c.value));
-          ddl22.indexes.update({
-            set: {
-              name: it.name
-            },
-            where: {
-              schema: it.schema,
-              table: it.table,
-              name,
-              nameExplicit: false
-            }
-          });
-        }
         ddl1.pks.update({
           set: {
             columns: (it) => {
@@ -22416,7 +22420,7 @@ var init_diff = __esm({
             table: rename.from.table
           }
         });
-        const fks1 = ddl1.fks.update({
+        ddl1.fks.update({
           set: {
             columns: (it) => {
               return it === rename.from.name ? rename.to.name : it;
@@ -22427,7 +22431,7 @@ var init_diff = __esm({
             table: rename.from.table
           }
         });
-        const fks2 = ddl1.fks.update({
+        ddl1.fks.update({
           set: {
             columnsTo: (it) => {
               return it === rename.from.name ? rename.to.name : it;
@@ -22438,19 +22442,7 @@ var init_diff = __esm({
             tableTo: rename.from.table
           }
         });
-        for (const fk5 of [...fks1, ...fks2].filter((it) => !it.nameExplicit)) {
-          const name = defaultNameForFK2(fk5.table, fk5.columns, fk5.tableTo, fk5.columnsTo);
-          ddl22.fks.update({
-            set: { name: fk5.name },
-            where: {
-              schema: fk5.schema,
-              table: fk5.table,
-              name,
-              nameExplicit: false
-            }
-          });
-        }
-        const uniques = ddl1.uniques.update({
+        ddl1.uniques.update({
           set: {
             columns: (it) => {
               return it === rename.from.name ? rename.to.name : it;
@@ -22461,20 +22453,6 @@ var init_diff = __esm({
             table: rename.from.table
           }
         });
-        for (const it of uniques.filter((it2) => !it2.nameExplicit)) {
-          const name = defaultNameForUnique2(it.table, it.columns[0]);
-          ddl22.uniques.update({
-            set: {
-              name: it.name
-            },
-            where: {
-              schema: it.schema,
-              table: it.table,
-              name,
-              nameExplicit: false
-            }
-          });
-        }
         ddl1.checks.update({
           set: {
             value: rename.to.name
@@ -22486,8 +22464,10 @@ var init_diff = __esm({
           }
         });
       }
-      ddl1.uniques.list().filter((x2) => mode === "push" || !x2.nameExplicit);
-      ddl22.uniques.list({ nameExplicit: false });
+      preserveEntityNames(ddl1.uniques, ddl22.uniques, mode);
+      preserveEntityNames(ddl1.fks, ddl22.fks, mode);
+      preserveEntityNames(ddl1.pks, ddl22.pks, mode);
+      preserveEntityNames(ddl1.indexes, ddl22.indexes, mode);
       const uniquesDiff = diff(ddl1, ddl22, "uniques");
       const groupedUniquesDiff = groupDiffs(uniquesDiff);
       const uniqueRenames = [];
@@ -22693,7 +22673,15 @@ var init_diff = __esm({
       const jsonDropIndexes = indexesDeletes.filter(tablesFilter("deleted")).map(
         (index5) => prepareStatement("drop_index", { index: index5 })
       );
-      for (const idx of alters.filter((it) => it.entityType === "indexes")) {
+      const jsonRenameIndexes = indexesRenames.map((r2) => {
+        return prepareStatement("rename_index", { schema: r2.to.schema, from: r2.from.name, to: r2.to.name });
+      });
+      const indexesAlters = alters.filter((it) => {
+        if (it.entityType !== "indexes") return false;
+        delete it.concurrently;
+        return ddl22.indexes.hasDiff(it);
+      });
+      for (const idx of indexesAlters) {
         const forWhere = !!idx.where && (idx.where.from !== null && idx.where.to !== null ? mode !== "push" : true);
         const forColumns = !!idx.columns && (idx.columns.from.length === idx.columns.to.length ? mode !== "push" : true);
         if (idx.isUnique || idx.concurrently || idx.method || idx.with || forColumns || forWhere) {
@@ -22720,20 +22708,20 @@ var init_diff = __esm({
           isPK: ddl22.pks.one({ schema: it.schema, table: it.table, columns: [it.name] }) !== null
         })
       );
-      const columnAlters = alters.filter((it) => it.entityType === "columns").map((it) => {
+      const columnAlters = alters.filter((it) => it.entityType === "columns").filter((it) => {
         var _a, _b;
         if (it.default && ((_a = it.default.from) == null ? void 0 : _a.value) === ((_b = it.default.to) == null ? void 0 : _b.value)) {
           delete it.default;
         }
-        return it;
-      }).filter((it) => Object.keys(it).length > 5);
+        return ddl22.columns.hasDiff(it);
+      });
       const columnsToRecreate = columnAlters.filter((it) => it.generated && it.generated.to !== null).filter((it) => {
         var _a;
         return !(((_a = it.generated) == null ? void 0 : _a.to) && it.generated.from && mode === "push");
       });
       const jsonRecreateColumns = columnsToRecreate.map(
         (it) => prepareStatement("recreate_column", {
-          column: ddl22.columns.one({ schema: it.schema, table: it.table, name: it.name }),
+          column: it.$right,
           isPK: ddl22.pks.one({ schema: it.schema, table: it.table, columns: [it.name] }) !== null
         })
       );
@@ -22743,17 +22731,25 @@ var init_diff = __esm({
       const jsonDropPrimaryKeys = pksDeletes.filter(tablesFilter("deleted")).map(
         (it) => prepareStatement("drop_pk", { pk: it })
       );
-      const alteredUniques = alters.filter((it) => it.entityType === "uniques").map((it) => {
+      const jsonRenamePrimaryKey = pksRenames.map((it) => {
+        return prepareStatement("rename_constraint", {
+          schema: it.to.schema,
+          table: it.to.table,
+          from: it.from.name,
+          to: it.to.name
+        });
+      });
+      const alteredUniques = alters.filter((it) => it.entityType === "uniques").filter((it) => {
         if (it.nameExplicit) {
           delete it.nameExplicit;
         }
-        return it;
-      }).filter((it) => Object.keys(it).length > 5);
+        return ddl22.uniques.hasDiff(it);
+      });
       const jsonAlteredUniqueConstraints = alteredUniques.map((it) => prepareStatement("alter_unique", { diff: it }));
       const jsonAddedUniqueConstraints = uniqueCreates.filter(tablesFilter("created")).map(
         (it) => prepareStatement("add_unique", { unique: it })
       );
-      const jsonDeletedUniqueConstraints = uniqueDeletes.filter(tablesFilter("deleted")).map(
+      const jsonDropUniqueConstraints = uniqueDeletes.filter(tablesFilter("deleted")).map(
         (it) => prepareStatement("drop_unique", { unique: it })
       );
       const jsonRenamedUniqueConstraints = uniqueRenames.map(
@@ -22775,20 +22771,24 @@ var init_diff = __esm({
       const jsonCreatedCheckConstraints = checkCreates.filter(tablesFilter("created")).map(
         (it) => prepareStatement("add_check", { check: it })
       );
-      const jsonDeletedCheckConstraints = checkDeletes.filter(tablesFilter("deleted")).map(
+      const jsonDropCheckConstraints = checkDeletes.filter(tablesFilter("deleted")).map(
         (it) => prepareStatement("drop_check", { check: it })
       );
       const alteredPKs = alters.filter((it) => it.entityType === "pks").filter((it) => {
         return !!it.columns;
       });
-      const alteredFKs = alters.filter((it) => it.entityType === "fks");
       const alteredChecks = alters.filter((it) => it.entityType === "checks");
-      const jsonAlteredPKs = alteredPKs.map((it) => {
-        const pk = ddl22.pks.one({ schema: it.schema, table: it.table, name: it.name });
-        return prepareStatement("alter_pk", { diff: it, pk });
-      });
-      const jsonCreateReferences = fksCreates.map((it) => prepareStatement("create_fk", { fk: it }));
-      const jsonDropReferences = fksDeletes.map((it) => prepareStatement("drop_fk", { fk: it }));
+      const jsonAlteredPKs = alteredPKs.map((it) => prepareStatement("alter_pk", { diff: it, pk: it.$right }));
+      const jsonRecreateFKs = alters.filter((it) => it.entityType === "fks").filter((x2) => {
+        if (x2.nameExplicit && (mode === "push" && x2.nameExplicit.from && !x2.nameExplicit.to || x2.nameExplicit.to && !x2.nameExplicit.from)) {
+          delete x2.nameExplicit;
+        }
+        return ddl22.fks.hasDiff(x2);
+      }).map((it) => prepareStatement("recreate_fk", { fk: it.$right }));
+      const jsonCreateFKs = fksCreates.map((it) => prepareStatement("create_fk", { fk: it }));
+      const jsonDropReferences = fksDeletes.filter((fk5) => {
+        return !deletedTables.some((x2) => x2.schema === fk5.schema && x2.name === fk5.table);
+      }).map((it) => prepareStatement("drop_fk", { fk: it }));
       const jsonRenameReferences = fksRenames.map(
         (it) => prepareStatement("rename_constraint", {
           schema: it.to.schema,
@@ -22797,7 +22797,7 @@ var init_diff = __esm({
           to: it.to.name
         })
       );
-      const jsonAlterCheckConstraints = alteredChecks.map((it) => prepareStatement("alter_check", { diff: it }));
+      const jsonAlterCheckConstraints = alteredChecks.map((it) => prepareStatement("alter_check", { check: it.$right }));
       const jsonCreatePoliciesStatements = policyCreates.map((it) => prepareStatement("create_policy", { policy: it }));
       const jsonDropPoliciesStatements = policyDeletes.map((it) => prepareStatement("drop_policy", { policy: it }));
       const jsonRenamePoliciesStatements = policyRenames.map((it) => prepareStatement("rename_policy", it));
@@ -22865,10 +22865,7 @@ var init_diff = __esm({
       }
       const policiesAlters = alters.filter((it) => it.entityType === "policies");
       const jsonPloiciesAlterStatements = policiesAlters.map(
-        (it) => prepareStatement("alter_policy", {
-          diff: it,
-          policy: ddl22.policies.one({ schema: it.schema, table: it.name, name: it.name })
-        })
+        (it) => prepareStatement("alter_policy", { diff: it, policy: it.$right })
       );
       const jsonCreateEnums = createdEnums.map((it) => prepareStatement("create_enum", { enum: it }));
       const jsonDropEnums = deletedEnums.map((it) => prepareStatement("drop_enum", { enum: it }));
@@ -22898,15 +22895,26 @@ var init_diff = __esm({
           jsonAlterEnums.push(prepareStatement("alter_enum", { diff: res, enum: e2 }));
         }
       }
-      const jsonAlterColumns = columnAlters.filter((it) => !(it.generated && it.generated.to !== null)).map((it) => {
+      const jsonAlterColumns = columnAlters.filter((it) => !(it.generated && it.generated.to !== null)).filter((it) => {
         if (it.default && recreateEnums.some(
           (x2) => x2.columns.some((c) => it.schema === c.schema && it.table === c.table && it.name === c.name)
         )) {
           delete it.default;
         }
-        return it;
-      }).filter((it) => Object.keys(it).length > 5).map((it) => {
-        const column8 = ddl22.columns.one({ schema: it.schema, table: it.table, name: it.name });
+        if (it.notNull && it.notNull.to && (it.$right.generated || it.$right.identity)) {
+          delete it.notNull;
+        }
+        const pkIn2 = ddl22.pks.one({ schema: it.schema, table: it.table, columns: { CONTAINS: it.name } });
+        if (it.notNull && pkIn2) {
+          delete it.notNull;
+        }
+        const pkIn1 = ddl1.pks.one({ schema: it.schema, table: it.table, columns: { CONTAINS: it.name } });
+        if (it.notNull && it.notNull.from && pkIn1 && !pkIn2) {
+          delete it.notNull;
+        }
+        return ddl22.columns.hasDiff(it);
+      }).map((it) => {
+        const column8 = it.$right;
         return prepareStatement("alter_column", {
           diff: it,
           isEnum: ddl22.enums.one({ schema: column8.typeSchema ?? "public", name: column8.type }) !== null,
@@ -22920,17 +22928,13 @@ var init_diff = __esm({
       const renameSequences = renamedSequences.map((it) => prepareStatement("rename_sequence", it));
       const sequencesAlter = alters.filter((it) => it.entityType === "sequences");
       const jsonAlterSequences = sequencesAlter.map(
-        (it) => prepareStatement("alter_sequence", {
-          diff: it,
-          sequence: ddl22.sequences.one({ schema: it.schema, name: it.name })
-        })
+        (it) => prepareStatement("alter_sequence", { diff: it, sequence: it.$right })
       );
-      const createRoles = createdRoles.map((it) => prepareStatement("create_role", { role: it }));
-      const dropRoles = deletedRoles.map((it) => prepareStatement("drop_role", { role: it }));
-      const renameRoles = renamedRoles.map((it) => prepareStatement("rename_role", it));
-      const rolesAlter = alters.filter((it) => it.entityType === "roles");
-      const jsonAlterRoles = rolesAlter.map(
-        (it) => prepareStatement("alter_role", { diff: it, role: ddl22.roles.one({ name: it.name }) })
+      const jsonCreateRoles = createdRoles.map((it) => prepareStatement("create_role", { role: it }));
+      const jsonDropRoles = deletedRoles.map((it) => prepareStatement("drop_role", { role: it }));
+      const jsonRenameRoles = renamedRoles.map((it) => prepareStatement("rename_role", it));
+      const jsonAlterRoles = alters.filter((it) => it.entityType === "roles").map(
+        (it) => prepareStatement("alter_role", { diff: it, role: it.$right })
       );
       const createSchemas = createdSchemas.map((it) => prepareStatement("create_schema", it));
       const dropSchemas = deletedSchemas.map((it) => prepareStatement("drop_schema", it));
@@ -22954,10 +22958,9 @@ var init_diff = __esm({
         }
         return it;
       }).filter((it) => !(it.isExisting && it.isExisting.to));
-      const viewsAlters = filteredViewAlters.map((it) => {
-        const view5 = ddl22.views.one({ schema: it.schema, name: it.name });
-        return { diff: it, view: view5 };
-      }).filter((it) => !it.view.isExisting);
+      const viewsAlters = filteredViewAlters.map((it) => ({ diff: it, view: it.$right })).filter(
+        (it) => !it.view.isExisting
+      );
       const jsonAlterViews = viewsAlters.filter((it) => !it.diff.definition).map((it) => {
         return prepareStatement("alter_view", {
           diff: it.diff,
@@ -22990,9 +22993,9 @@ var init_diff = __esm({
       jsonStatements.push(...moveSequences);
       jsonStatements.push(...renameSequences);
       jsonStatements.push(...jsonAlterSequences);
-      jsonStatements.push(...renameRoles);
-      jsonStatements.push(...dropRoles);
-      jsonStatements.push(...createRoles);
+      jsonStatements.push(...jsonRenameRoles);
+      jsonStatements.push(...jsonDropRoles);
+      jsonStatements.push(...jsonCreateRoles);
       jsonStatements.push(...jsonAlterRoles);
       jsonStatements.push(...createTables);
       jsonStatements.push(...jsonAlterRlsStatements);
@@ -23006,17 +23009,21 @@ var init_diff = __esm({
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonSetTableSchemas);
       jsonStatements.push(...jsonRenameColumnsStatements);
-      jsonStatements.push(...jsonDeletedUniqueConstraints);
-      jsonStatements.push(...jsonDeletedCheckConstraints);
+      jsonStatements.push(...jsonDropUniqueConstraints);
+      jsonStatements.push(...jsonDropCheckConstraints);
       jsonStatements.push(...jsonDropReferences);
+      jsonStatements.push(...jsonRenameIndexes);
       jsonStatements.push(...jsonDropIndexes);
       jsonStatements.push(...jsonDropPrimaryKeys);
       jsonStatements.push(...jsonAddPrimaryKeys);
+      jsonStatements.push(...jsonRenamePrimaryKey);
+      jsonStatements.push(...jsonRenameReferences);
       jsonStatements.push(...jsonAddColumnsStatemets);
       jsonStatements.push(...recreateEnums);
       jsonStatements.push(...jsonRecreateColumns);
       jsonStatements.push(...jsonAlterColumns);
-      jsonStatements.push(...jsonCreateReferences);
+      jsonStatements.push(...jsonCreateFKs);
+      jsonStatements.push(...jsonRecreateFKs);
       jsonStatements.push(...jsonCreateIndexes);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredPKs);
@@ -23024,6 +23031,7 @@ var init_diff = __esm({
       jsonStatements.push(...jsonAddedUniqueConstraints);
       jsonStatements.push(...jsonCreatedCheckConstraints);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
+      jsonStatements.push(...jsonAlterCheckConstraints);
       jsonStatements.push(...createViews);
       jsonStatements.push(...jsonRenamePoliciesStatements);
       jsonStatements.push(...jsonCreatePoliciesStatements);
@@ -23054,6 +23062,21 @@ var init_diff = __esm({
         renames
       };
     };
+    preserveEntityNames = (collection1, collection2, mode) => {
+      const items = collection1.list().filter((x2) => mode === "push" || !x2.nameExplicit);
+      for (const left of items) {
+        const { entityType: _2, name, nameExplicit, ...filter2 } = left;
+        const match2 = collection2.list({ ...filter2, nameExplicit: false });
+        if (match2.length !== 1 || match2[0].name === left.name) continue;
+        collection2.update({
+          set: { name: left.name },
+          where: {
+            ...filter2,
+            nameExplicit: false
+          }
+        });
+      }
+    };
   }
 });
 
@@ -23193,7 +23216,6 @@ var init_generate_postgres = __esm({
     init_diff();
     init_serializer2();
     init_utils_node();
-    init_mocks();
     init_prompts();
     init_generate_common();
     handle = async (config) => {
@@ -23215,7 +23237,6 @@ var init_generate_postgres = __esm({
         });
         return;
       }
-      const blanks = /* @__PURE__ */ new Set();
       const { sqlStatements, renames } = await ddlDiff(
         ddlPrev,
         ddlCur,
@@ -23227,17 +23248,11 @@ var init_generate_postgres = __esm({
         resolver("table"),
         resolver("column"),
         resolver("view"),
-        // TODO: handle all renames
-        mockResolver(blanks),
-        // uniques
-        mockResolver(blanks),
-        // indexes
-        mockResolver(blanks),
-        // checks
-        mockResolver(blanks),
-        // pks
-        mockResolver(blanks),
-        // fks
+        resolver("unique"),
+        resolver("index"),
+        resolver("check"),
+        resolver("primary key"),
+        resolver("foreign key"),
         "default"
       );
       writeResult({
@@ -23358,7 +23373,7 @@ var init_drizzle2 = __esm({
           const autoIncrement = typeof column8.autoIncrement === "undefined" ? false : column8.autoIncrement;
           const generated = column8.generated ? {
             as: (0, import_drizzle_orm2.is)(column8.generated.as, import_drizzle_orm2.SQL) ? dialect5.sqlToQuery(column8.generated.as).sql : typeof column8.generated.as === "function" ? dialect5.sqlToQuery(column8.generated.as()).sql : column8.generated.as,
-            type: column8.generated.mode ?? "stored"
+            type: column8.generated.mode === "virtual" ? "virtual" : "stored"
           } : null;
           result.columns.push({
             entityType: "columns",
@@ -23369,13 +23384,6 @@ var init_drizzle2 = __esm({
             autoIncrement,
             onUpdateNow: column8.hasOnUpdateNow ?? false,
             // TODO: ??
-            // @ts-expect-error
-            // TODO update description
-            // 'virtual' | 'stored' for for all dialects
-            // 'virtual' | 'persisted' for mssql
-            // We should remove this option from common Column and store it per dialect common
-            // Was discussed with Andrew
-            // Type erorr because of common in drizzle orm for all dialects (includes virtual' | 'stored' | 'persisted')
             generated,
             isPK: column8.primary,
             isUnique: column8.isUnique,
@@ -23976,7 +23984,7 @@ var init_diff2 = __esm({
             tableTo: renamed.from.name
           }
         });
-        const renamedFKs = [...selfRefs, ...froms, ...tos];
+        const renamedFKs = [...selfRefs.data, ...froms.data, ...tos.data];
         for (const fk5 of renamedFKs) {
           const name = nameForForeignKey2(fk5);
           ddl22.fks.update({
@@ -24566,7 +24574,7 @@ var init_diff3 = __esm({
             tableTo: renamed.from.name
           }
         });
-        const renamedFKs = [...selfRefs, ...froms, ...tos];
+        const renamedFKs = [...selfRefs.data, ...froms.data, ...tos.data];
         for (const fk5 of renamedFKs) {
           const name = nameForForeignKey(fk5);
           ddl22.fks.update({
@@ -24802,7 +24810,7 @@ var init_diff3 = __esm({
 });
 
 // src/dialects/sqlite/drizzle.ts
-var import_drizzle_orm3, import_sqlite_core, fromDrizzleSchema3, fromExports, prepareFromSchemaFiles3;
+var import_drizzle_orm3, import_sqlite_core, fromDrizzleSchema3, fromExports2, prepareFromSchemaFiles3;
 var init_drizzle3 = __esm({
   "src/dialects/sqlite/drizzle.ts"() {
     "use strict";
@@ -24953,7 +24961,7 @@ var init_drizzle3 = __esm({
       });
       return { tables, columns, indexes, uniques, fks, pks, checks, views };
     };
-    fromExports = (exports2) => {
+    fromExports2 = (exports2) => {
       const tables = [];
       const views = [];
       const i0values = Object.values(exports2);
@@ -24974,7 +24982,7 @@ var init_drizzle3 = __esm({
       for (let i2 = 0; i2 < imports.length; i2++) {
         const it = imports[i2];
         const i0 = require(`${it}`);
-        const prepared = fromExports(i0);
+        const prepared = fromExports2(i0);
         tables.push(...prepared.tables);
         views.push(...prepared.views);
       }
@@ -25499,7 +25507,7 @@ function fromJson4(statements) {
   };
   return result;
 }
-var convertor4, createTable3, dropTable3, renameTable3, addColumn2, dropColumn2, renameColumn2, alterColumn2, recreateColumn2, createIndex3, dropIndex3, createFK2, createPK2, renamePk, renameCheck, renameFk, renameIndex, renameUnique, createCheck2, dropConstraint2, createView3, dropView3, renameView2, alterView2, createSchema, dropSchema, renameSchema, moveTable, moveView, addUniqueConvertor2, dropPK2, recreatePK2, recreateView, addCheck, dropCheck, alterCheck, dropUnique, dropForeignKey, convertors4;
+var convertor4, createTable3, dropTable3, renameTable3, addColumn2, dropColumn2, renameColumn2, alterColumn2, recreateColumn2, createIndex3, dropIndex3, createFK2, createPK2, renamePk, renameCheck, renameFk, renameIndex, renameUnique, createCheck2, dropConstraint2, createView3, dropView3, renameView2, alterView2, createSchema, dropSchema, renameSchema, moveTable, moveView, addUniqueConvertor2, dropPK2, recreatePK2, recreateView, addCheck, dropCheck, alterCheck, dropUnique, dropForeignKey, addDefault, dropDefault, renameDefault, convertors4;
 var init_convertor4 = __esm({
   "src/dialects/mssql/convertor.ts"() {
     "use strict";
@@ -25526,11 +25534,9 @@ var init_convertor4 = __esm({
         const identity = column8.identity;
         const identityStatement = identity ? ` IDENTITY(${identity.seed}, ${identity.increment})` : "";
         const notNullStatement = isPK ? "" : column8.notNull && !column8.identity ? " NOT NULL" : "";
-        const def = defaultToSQL(column8.default);
-        const defaultStatement = def ? ` DEFAULT ${def}` : "";
         const generatedType = ((_a = column8.generated) == null ? void 0 : _a.type.toUpperCase()) === "VIRTUAL" ? "" : (_b = column8.generated) == null ? void 0 : _b.type.toUpperCase();
         const generatedStatement = column8.generated ? ` AS (${(_c = column8.generated) == null ? void 0 : _c.as})${" " + generatedType}` : "";
-        statement += `	[${column8.name}] ${column8.type}${identityStatement}${generatedStatement}${notNullStatement}${defaultStatement}`;
+        statement += `	[${column8.name}] ${column8.type}${identityStatement}${generatedStatement}${notNullStatement}`;
         statement += i2 === columns.length - 1 ? "" : ",\n";
       }
       if (pk) {
@@ -25574,8 +25580,6 @@ var init_convertor4 = __esm({
         identity,
         schema: schema4
       } = column8;
-      const def = defaultToSQL(column8.default);
-      const defaultStatement = def ? ` DEFAULT ${def}` : "";
       const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
       const identityStatement = identity ? ` IDENTITY(${identity.seed}, ${identity.increment})` : "";
       const generatedType = ((_a = column8.generated) == null ? void 0 : _a.type.toUpperCase()) === "VIRTUAL" ? "" : (_b = column8.generated) == null ? void 0 : _b.type.toUpperCase();
@@ -25583,7 +25587,7 @@ var init_convertor4 = __esm({
       const key = schema4 !== "dbo" ? `[${schema4}].[${table5}]` : `[${table5}]`;
       let statement = `ALTER TABLE ${key} ADD [${name}]`;
       if (!generated) statement += ` ${type}`;
-      statement += `${identityStatement}${defaultStatement}${generatedStatement}${notNullStatement};`;
+      statement += `${identityStatement}${generatedStatement}${notNullStatement};`;
       return statement;
     });
     dropColumn2 = convertor4("drop_column", (st) => {
@@ -25599,14 +25603,12 @@ var init_convertor4 = __esm({
     });
     alterColumn2 = convertor4("alter_column", (st) => {
       const { diff: diff2, column: column8, isPK } = st;
-      const def = defaultToSQL(column8.default);
-      const defaultStatement = def ? ` DEFAULT ${def}` : "";
       const identity = column8.identity;
       const notNullStatement = `${column8.notNull ? " NOT NULL" : ""}`;
       const identityStatement = identity ? ` IDENTITY(${identity.seed}, ${identity.increment})` : "";
       const generatedStatement = column8.generated ? ` AS (${column8.generated.as}) ${column8.generated.type.toUpperCase()}` : "";
       const key = column8.schema !== "dbo" ? `[${column8.schema}].[${column8.table}]` : `[${column8.table}]`;
-      return `ALTER TABLE ${key} ALTER COLUMN [${column8.name}] ${column8.type}${identityStatement}${defaultStatement}${generatedStatement}${notNullStatement};`;
+      return `ALTER TABLE ${key} ALTER COLUMN [${column8.name}] ${column8.type}${identityStatement}${generatedStatement}${notNullStatement};`;
     });
     recreateColumn2 = convertor4("recreate_column", (st) => {
       return [dropColumn2.convert(st), addColumn2.convert(st)];
@@ -25827,6 +25829,22 @@ WITH CHECK OPTION` : "";
       return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT [${name}];
 `;
     });
+    addDefault = convertor4("create_default", (st) => {
+      const { schema: schema4, table: table5, name, default: tableDefault } = st.default;
+      const tableNameWithSchema = schema4 !== "dbo" ? `[${schema4}].[${table5}]` : `[${table5}]`;
+      return `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT [${name}] DEFAULT ${defaultToSQL(tableDefault)};`;
+    });
+    dropDefault = convertor4("drop_default", (st) => {
+      const { schema: schema4, table: table5, name } = st.default;
+      const tableNameWithSchema = schema4 !== "dbo" ? `[${schema4}].[${table5}]` : `[${table5}]`;
+      return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT [${name}];`;
+    });
+    renameDefault = convertor4("rename_default", (st) => {
+      const { name: nameFrom, schema: schemaFrom } = st.from;
+      const { name: nameTo } = st.to;
+      const key = schemaFrom !== "dbo" ? `${schemaFrom}.${nameFrom}` : `${nameFrom}`;
+      return `EXEC sp_rename '${key}', [${nameTo}], 'OBJECT';`;
+    });
     convertors4 = [
       createTable3,
       dropTable3,
@@ -25864,7 +25882,10 @@ WITH CHECK OPTION` : "";
       renameIndex,
       dropUnique,
       dropForeignKey,
-      renameUnique
+      renameUnique,
+      addDefault,
+      dropDefault,
+      renameDefault
     ];
   }
 });
@@ -25910,10 +25931,11 @@ var init_diff5 = __esm({
         mockResolver(mocks),
         mockResolver(mocks),
         mockResolver(mocks),
+        mockResolver(mocks),
         mode
       );
     };
-    ddlDiff3 = async (ddl1, ddl22, schemasResolver, tablesResolver, columnsResolver, viewsResolver, uniquesResolver, indexesResolver, checksResolver, pksResolver, fksResolver, type) => {
+    ddlDiff3 = async (ddl1, ddl22, schemasResolver, tablesResolver, columnsResolver, viewsResolver, uniquesResolver, indexesResolver, checksResolver, pksResolver, fksResolver, defaultsResolver, type) => {
       const ddl1Copy = createDDL();
       for (const entity of ddl1.entities.list()) {
         ddl1Copy.entities.push(entity);
@@ -25948,7 +25970,6 @@ var init_diff5 = __esm({
       const createSchemas = createdSchemas.map((it) => prepareStatement4("create_schema", it));
       const dropSchemas = deletedSchemas.map((it) => prepareStatement4("drop_schema", it));
       const renameSchemas = renamedSchemas.map((it) => prepareStatement4("rename_schema", it));
-      const checkRenames = [];
       const tablesDiff = diff(ddl1, ddl22, "tables");
       const {
         created: createdTables,
@@ -25964,6 +25985,8 @@ var init_diff5 = __esm({
       const pksRenames = [];
       const uniqueRenames = [];
       const fksRenames = [];
+      const checkRenames = [];
+      const defaultsRenames = [];
       for (const rename of renamedOrMovedTables) {
         ddl1.tables.update({
           set: {
@@ -25995,7 +26018,7 @@ var init_diff5 = __esm({
             table: rename.from.name
           }
         });
-        const copies = [...copy(fks1), ...copy(fks2)];
+        const copies = [...copy(fks1.data), ...copy(fks2.data)];
         for (const fk5 of copies.filter((it) => !it.nameExplicit)) {
           const name = defaultNameForFK(fk5.table, fk5.columns, fk5.tableTo, fk5.columnsTo);
           const updated = ddl1.fks.update({
@@ -26007,7 +26030,7 @@ var init_diff5 = __esm({
               nameExplicit: false
             }
           });
-          fksRenames.push({ to: updated[0], from: fk5 });
+          fksRenames.push({ to: updated.data[0], from: fk5 });
         }
         const res = ddl1.entities.update({
           set: {
@@ -26019,7 +26042,7 @@ var init_diff5 = __esm({
             schema: rename.from.schema
           }
         });
-        for (const it of res) {
+        for (const it of res.data) {
           if (it.entityType === "pks" && !it.nameExplicit) {
             const name = defaultNameForPK(it.table);
             const originalPk = copy(
@@ -26037,7 +26060,7 @@ var init_diff5 = __esm({
                 nameExplicit: false
               }
             });
-            pksRenames.push({ from: originalPk, to: updated[0] });
+            pksRenames.push({ from: originalPk, to: updated.data[0] });
           }
           if (it.entityType === "uniques" && !it.nameExplicit) {
             const name = defaultNameForUnique(it.table, it.columns);
@@ -26059,7 +26082,29 @@ var init_diff5 = __esm({
                 nameExplicit: false
               }
             });
-            uniqueRenames.push({ from: originalUnique, to: updated[0] });
+            uniqueRenames.push({ from: originalUnique, to: updated.data[0] });
+          }
+          if (it.entityType === "defaults" && !it.nameExplicit) {
+            const name = defaultNameForDefault(it.table, it.column);
+            const originalDefaults = copy(ddl1.defaults.one({
+              schema: it.schema,
+              table: it.table,
+              name: it.name,
+              nameExplicit: false
+            }));
+            if (!originalDefaults) throw Error("Unhandled error occurred: Can not find original Default");
+            const updated = ddl1.defaults.update({
+              set: {
+                name
+              },
+              where: {
+                schema: it.schema,
+                table: it.table,
+                name: it.name,
+                nameExplicit: false
+              }
+            });
+            defaultsRenames.push({ from: originalDefaults, to: updated.data[0] });
           }
         }
       }
@@ -26121,17 +26166,19 @@ var init_diff5 = __esm({
             tableTo: rename.from.table
           }
         });
-        for (const fk5 of [...fks1, ...fks2].filter((it) => !it.nameExplicit)) {
+        const copies = [...copy(fks1.data), ...copy(fks2.data)];
+        for (const fk5 of copies.filter((it) => !it.nameExplicit)) {
           const name = defaultNameForFK(fk5.table, fk5.columns, fk5.tableTo, fk5.columnsTo);
-          ddl22.fks.update({
-            set: { name: fk5.name },
+          const updated = ddl1.fks.update({
+            set: { name },
             where: {
               schema: fk5.schema,
               table: fk5.table,
-              name,
+              name: fk5.name,
               nameExplicit: false
             }
           });
+          fksRenames.push({ to: updated.data[0], from: fk5 });
         }
         const uniques = ddl1.uniques.update({
           set: {
@@ -26144,19 +26191,56 @@ var init_diff5 = __esm({
             table: rename.from.table
           }
         });
-        for (const it of uniques.filter((it2) => !it2.nameExplicit)) {
+        for (const it of uniques.data.filter((it2) => !it2.nameExplicit)) {
+          const originalUnique = copy(ddl1.uniques.one({
+            schema: it.schema,
+            table: it.table,
+            name: it.name,
+            nameExplicit: false
+          }));
+          if (!originalUnique) throw Error("Unhandled error occurred: Can not find original Unique");
           const name = defaultNameForUnique(it.table, [it.columns[0]]);
-          ddl22.uniques.update({
+          const updated = ddl1.uniques.update({
             set: {
-              name: it.name
+              name
             },
             where: {
               schema: it.schema,
               table: it.table,
-              name,
+              name: it.name,
+              nameExplicit: false
+            }
+          });
+          uniqueRenames.push({ from: originalUnique, to: updated.data[0] });
+        }
+        const columnsDefaults = ddl1.defaults.update({
+          set: { column: rename.to.name },
+          where: {
+            schema: rename.from.schema,
+            table: rename.from.table
+          }
+        });
+        for (const it of columnsDefaults.data.filter((it2) => !it2.nameExplicit)) {
+          const originalDefault = copy(ddl1.defaults.one({
+            schema: it.schema,
+            table: it.table,
+            name: it.name,
+            nameExplicit: false
+          }));
+          if (!originalDefault) throw Error("Unhandled error occurred: Can not find original Default");
+          const name = defaultNameForDefault(it.table, it.column);
+          const updated = ddl1.defaults.update({
+            set: {
+              name
+            },
+            where: {
+              schema: it.schema,
+              table: it.table,
+              name: it.name,
               nameExplicit: false
             }
           });
+          defaultsRenames.push({ from: originalDefault, to: updated.data[0] });
         }
         ddl1.checks.update({
           set: {
@@ -26330,6 +26414,31 @@ var init_diff5 = __esm({
           }
         });
       }
+      const diffDefaults = diff(ddl1, ddl22, "defaults");
+      const groupedDefaultsDiff = groupDiffs(diffDefaults);
+      const defaultsCreates = [];
+      const defaultsDeletes = [];
+      for (const entry of groupedDefaultsDiff) {
+        const { renamedOrMoved, created, deleted } = await defaultsResolver({
+          created: entry.inserted,
+          deleted: entry.deleted
+        });
+        defaultsCreates.push(...created);
+        defaultsDeletes.push(...deleted);
+        defaultsRenames.push(...renamedOrMoved);
+      }
+      for (const rename of defaultsRenames) {
+        ddl1.defaults.update({
+          set: {
+            name: rename.to.name,
+            schema: rename.to.schema
+          },
+          where: {
+            name: rename.from.name,
+            schema: rename.from.schema
+          }
+        });
+      }
       const alters = diff.alters(ddl1, ddl22);
       const jsonStatements = [];
       const tablesFilter = (type2) => {
@@ -26346,6 +26455,15 @@ var init_diff5 = __esm({
         (index5) => prepareStatement4("drop_index", { index: index5 })
       );
       const jsonRenameIndex = indexesRenames.map((it) => prepareStatement4("rename_index", { from: it.from, to: it.to }));
+      const jsonCreateDefaults = defaultsCreates.map(
+        (defaultValue) => prepareStatement4("create_default", { default: defaultValue })
+      );
+      const jsonDropDefaults = defaultsDeletes.filter(tablesFilter("deleted")).map(
+        (defaultValue) => prepareStatement4("drop_default", { default: defaultValue })
+      );
+      const jsonRenameDefaults = defaultsRenames.map(
+        (it) => prepareStatement4("rename_default", { from: it.from, to: it.to })
+      );
       for (const idx of alters.filter((it) => it.entityType === "indexes")) {
         const forWhere = !!idx.where && (idx.where.from !== null && idx.where.to !== null ? type !== "push" : true);
         const forColumns = !!idx.columns && (idx.columns.from.length === idx.columns.to.length ? type !== "push" : true);
@@ -26378,13 +26496,7 @@ var init_diff5 = __esm({
           isPK: ddl22.pks.one({ schema: it.schema, table: it.table, columns: [it.name] }) !== null
         })
       );
-      const columnAlters = alters.filter((it) => it.entityType === "columns").map((it) => {
-        var _a, _b;
-        if (it.default && ((_a = it.default.from) == null ? void 0 : _a.value) === ((_b = it.default.to) == null ? void 0 : _b.value)) {
-          delete it.default;
-        }
-        return it;
-      }).filter((it) => Object.keys(it).length > 5);
+      const columnAlters = alters.filter((it) => it.entityType === "columns").filter((it) => Object.keys(it).length > 5);
       const columnsToRecreate = columnAlters.filter((it) => it.generated).filter((it) => {
         var _a;
         return !(((_a = it.generated) == null ? void 0 : _a.to) && it.generated.from && type === "push");
@@ -26502,6 +26614,7 @@ var init_diff5 = __esm({
       jsonStatements.push(...jsonDeletedUniqueConstraints);
       jsonStatements.push(...jsonDeletedCheckConstraints);
       jsonStatements.push(...jsonDropReferences);
+      jsonStatements.push(...jsonDropDefaults);
       jsonStatements.push(...jsonDropIndexes);
       jsonStatements.push(...jsonDropPrimaryKeys);
       jsonStatements.push(...jsonAddColumnsStatemets);
@@ -26510,6 +26623,7 @@ var init_diff5 = __esm({
       jsonStatements.push(...jsonAddPrimaryKeys);
       jsonStatements.push(...jsonRenamePrimaryKeys);
       jsonStatements.push(...jsonCreateReferences);
+      jsonStatements.push(...jsonCreateDefaults);
       jsonStatements.push(...jsonRenameFks);
       jsonStatements.push(...jsonCreateIndexes);
       jsonStatements.push(...jsonRenameIndex);
@@ -26520,6 +26634,7 @@ var init_diff5 = __esm({
       jsonStatements.push(...jsonCreatedCheckConstraints);
       jsonStatements.push(...jsonRenamedCheckConstraints);
       jsonStatements.push(...jsonRenameUniqueConstraints);
+      jsonStatements.push(...jsonRenameDefaults);
       jsonStatements.push(...createViews);
       jsonStatements.push(...dropSchemas);
       const { groupedStatements, sqlStatements } = fromJson4(jsonStatements);
@@ -26545,7 +26660,7 @@ var init_diff5 = __esm({
 });
 
 // src/dialects/mssql/drizzle.ts
-var import_drizzle_orm5, import_mssql_core, upper3, defaultFromColumn4, fromDrizzleSchema5, prepareFromSchemaFiles5, fromExport2;
+var import_drizzle_orm5, import_mssql_core, upper3, defaultFromColumn4, fromDrizzleSchema5, prepareFromSchemaFiles5, fromExport;
 var init_drizzle5 = __esm({
   "src/dialects/mssql/drizzle.ts"() {
     "use strict";
@@ -26607,7 +26722,8 @@ var init_drizzle5 = __esm({
         checks: [],
         views: [],
         viewColumns: [],
-        uniques: []
+        uniques: [],
+        defaults: []
       };
       for (const { table: table5, config } of tableConfigPairs) {
         const {
@@ -26625,7 +26741,7 @@ var init_drizzle5 = __esm({
           continue;
         }
         for (const column8 of columns) {
-          const name = getColumnCasing(column8, casing2);
+          const columnName = getColumnCasing(column8, casing2);
           const notNull = column8.notNull;
           const sqlType = column8.getSQLType();
           const identity = column8.identity;
@@ -26637,7 +26753,7 @@ var init_drizzle5 = __esm({
             schema: schema5,
             entityType: "columns",
             table: tableName,
-            name,
+            name: columnName,
             type: sqlType,
             notNull: notNull && !column8.primary && !column8.generated && !identity,
             // @ts-expect-error
@@ -26651,9 +26767,19 @@ var init_drizzle5 = __esm({
             identity: identity ?? null,
             isPK: column8.primary,
             isUnique: column8.isUnique,
-            uniqueName: column8.uniqueName ?? null,
-            default: defaultFromColumn4(column8, casing2)
+            uniqueName: column8.uniqueName ?? null
           });
+          if (typeof column8.default !== "undefined") {
+            result.defaults.push({
+              entityType: "defaults",
+              name: defaultNameForDefault(tableName, columnName),
+              nameExplicit: false,
+              schema: schema5,
+              column: columnName,
+              table: tableName,
+              default: defaultFromColumn4(column8, casing2)
+            });
+          }
         }
         for (const pk of primaryKeys) {
           const columnNames = pk.columns.map((c) => getColumnCasing(c, casing2));
@@ -26798,7 +26924,7 @@ var init_drizzle5 = __esm({
       for (let i2 = 0; i2 < imports.length; i2++) {
         const it = imports[i2];
         const i0 = require(`${it}`);
-        const prepared = fromExport2(i0);
+        const prepared = fromExport(i0);
         tables.push(...prepared.tables);
         schemas.push(...prepared.schemas);
         views.push(...prepared.views);
@@ -26810,7 +26936,7 @@ var init_drizzle5 = __esm({
         views
       };
     };
-    fromExport2 = (exports2) => {
+    fromExport = (exports2) => {
       const tables = [];
       const schemas = [];
       const views = [];
@@ -26932,6 +27058,8 @@ var init_generate_mssql = __esm({
         // pks
         resolver("foreign key", "dbo"),
         // fks
+        resolver("default", "dbo"),
+        // fks
         "default"
       );
       writeResult({
@@ -32254,8 +32382,8 @@ var init_get_search = __esm({
         return parsedURL.search;
       }
       const lastOffset = parsedURL.href.length - 1;
-      const hash = parsedURL.hash || (parsedURL.href[lastOffset] === "#" ? "#" : "");
-      return parsedURL.href[lastOffset - hash.length] === "?" ? "?" : "";
+      const hash2 = parsedURL.hash || (parsedURL.href[lastOffset] === "#" ? "#" : "");
+      return parsedURL.href[lastOffset - hash2.length] === "?" ? "?" : "";
     };
   }
 });
@@ -44543,9 +44671,9 @@ var require_dist_cjs36 = __commonJS({
       });
     }, "clearCredentialCache");
     var hmac = /* @__PURE__ */ __name((ctor, secret, data) => {
-      const hash = new ctor(secret);
-      hash.update((0, import_util_utf8.toUint8Array)(data));
-      return hash.digest();
+      const hash2 = new ctor(secret);
+      hash2.update((0, import_util_utf8.toUint8Array)(data));
+      return hash2.digest();
     }, "hmac");
     var getCanonicalHeaders = /* @__PURE__ */ __name(({ headers }, unsignableHeaders, signableHeaders) => {
       const canonical = {};
@@ -44869,9 +44997,9 @@ var require_dist_cjs36 = __commonJS({
         const { shortDate, longDate } = formatDate(signingDate);
         const scope = createScope(shortDate, region, signingService ?? this.service);
         const hashedPayload = await getPayloadHash({ headers: {}, body: payload }, this.sha256);
-        const hash = new this.sha256();
-        hash.update(headers);
-        const hashedHeaders = (0, import_util_hex_encoding.toHex)(await hash.digest());
+        const hash2 = new this.sha256();
+        hash2.update(headers);
+        const hashedHeaders = (0, import_util_hex_encoding.toHex)(await hash2.digest());
         const stringToSign = [
           EVENT_ALGORITHM_IDENTIFIER,
           longDate,
@@ -44904,9 +45032,9 @@ var require_dist_cjs36 = __commonJS({
         this.validateResolvedCredentials(credentials2);
         const region = signingRegion ?? await this.regionProvider();
         const { shortDate } = formatDate(signingDate);
-        const hash = new this.sha256(await this.getSigningKey(credentials2, region, shortDate, signingService));
-        hash.update((0, import_util_utf84.toUint8Array)(stringToSign));
-        return (0, import_util_hex_encoding.toHex)(await hash.digest());
+        const hash2 = new this.sha256(await this.getSigningKey(credentials2, region, shortDate, signingService));
+        hash2.update((0, import_util_utf84.toUint8Array)(stringToSign));
+        return (0, import_util_hex_encoding.toHex)(await hash2.digest());
       }
       async signRequest(requestToSign, {
         signingDate = /* @__PURE__ */ new Date(),
@@ -44950,9 +45078,9 @@ ${sortedHeaders.join(";")}
 ${payloadHash}`;
       }
       async createStringToSign(longDate, credentialScope, canonicalRequest) {
-        const hash = new this.sha256();
-        hash.update((0, import_util_utf84.toUint8Array)(canonicalRequest));
-        const hashedRequest = await hash.digest();
+        const hash2 = new this.sha256();
+        hash2.update((0, import_util_utf84.toUint8Array)(canonicalRequest));
+        const hashedRequest = await hash2.digest();
         return `${ALGORITHM_IDENTIFIER}
 ${longDate}
 ${credentialScope}
@@ -44980,9 +45108,9 @@ ${(0, import_util_hex_encoding.toHex)(hashedRequest)}`;
       }
       async getSignature(longDate, credentialScope, keyPromise, canonicalRequest) {
         const stringToSign = await this.createStringToSign(longDate, credentialScope, canonicalRequest);
-        const hash = new this.sha256(await keyPromise);
-        hash.update((0, import_util_utf84.toUint8Array)(stringToSign));
-        return (0, import_util_hex_encoding.toHex)(await hash.digest());
+        const hash2 = new this.sha256(await keyPromise);
+        hash2.update((0, import_util_utf84.toUint8Array)(stringToSign));
+        return (0, import_util_hex_encoding.toHex)(await hash2.digest());
       }
       getSigningKey(credentials2, region, shortDate, service) {
         return getSigningKey(this.sha256, credentials2, shortDate, region, service || this.service);
@@ -49619,9 +49747,9 @@ var require_dist_cjs46 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/auth/httpAuthSchemeProvider.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/auth/httpAuthSchemeProvider.js
 var require_httpAuthSchemeProvider3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveHttpAuthSchemeConfig = exports2.defaultSSOOIDCHttpAuthSchemeProvider = exports2.defaultSSOOIDCHttpAuthSchemeParametersProvider = void 0;
@@ -49688,9 +49816,9 @@ var require_httpAuthSchemeProvider3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/package.json
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/package.json
 var require_package4 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/package.json"(exports2, module2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/package.json"(exports2, module2) {
     module2.exports = {
       name: "@aws-sdk/client-sso-oidc",
       description: "AWS SDK for JavaScript Sso Oidc Client for Node.js, Browser and React Native",
@@ -49794,9 +49922,9 @@ var require_package4 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/ruleset.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/ruleset.js
 var require_ruleset2 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/ruleset.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/ruleset.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ruleSet = void 0;
@@ -49829,9 +49957,9 @@ var require_ruleset2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/endpointResolver.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/endpointResolver.js
 var require_endpointResolver2 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/endpointResolver.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/endpoint/endpointResolver.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.defaultEndpointResolver = void 0;
@@ -49849,9 +49977,9 @@ var require_endpointResolver2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.shared.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.shared.js
 var require_runtimeConfig_shared2 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.shared.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.shared.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -49895,9 +50023,9 @@ var require_runtimeConfig_shared2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.js
 var require_runtimeConfig2 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/runtimeConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -49948,9 +50076,9 @@ var require_runtimeConfig2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/index.js
+// ../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/index.js
 var require_dist_cjs47 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sso-oidc@3.583.0_@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sso-oidc/dist-cjs/index.js"(exports2, module2) {
     "use strict";
     var __defProp3 = Object.defineProperty;
     var __getOwnPropDesc3 = Object.getOwnPropertyDescriptor;
@@ -51296,9 +51424,9 @@ Reference: https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sso.ht
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthSchemeProvider.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthSchemeProvider.js
 var require_httpAuthSchemeProvider4 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveHttpAuthSchemeConfig = exports2.resolveStsAuthConfig = exports2.defaultSTSHttpAuthSchemeProvider = exports2.defaultSTSHttpAuthSchemeParametersProvider = void 0;
@@ -51368,9 +51496,9 @@ var require_httpAuthSchemeProvider4 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/EndpointParameters.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/EndpointParameters.js
 var require_EndpointParameters = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/EndpointParameters.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/EndpointParameters.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.commonParams = exports2.resolveClientEndpointParameters = void 0;
@@ -51394,9 +51522,9 @@ var require_EndpointParameters = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/package.json
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/package.json
 var require_package5 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/package.json"(exports2, module2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/package.json"(exports2, module2) {
     module2.exports = {
       name: "@aws-sdk/client-sts",
       description: "AWS SDK for JavaScript Sts Client for Node.js, Browser and React Native",
@@ -51502,9 +51630,9 @@ var require_package5 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/ruleset.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/ruleset.js
 var require_ruleset3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/ruleset.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/ruleset.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ruleSet = void 0;
@@ -51549,9 +51677,9 @@ var require_ruleset3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/endpointResolver.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/endpointResolver.js
 var require_endpointResolver3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/endpointResolver.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/endpoint/endpointResolver.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.defaultEndpointResolver = void 0;
@@ -51569,9 +51697,9 @@ var require_endpointResolver3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.shared.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.shared.js
 var require_runtimeConfig_shared3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.shared.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.shared.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -51615,9 +51743,9 @@ var require_runtimeConfig_shared3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.js
 var require_runtimeConfig3 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -51681,9 +51809,9 @@ var require_runtimeConfig3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthExtensionConfiguration.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthExtensionConfiguration.js
 var require_httpAuthExtensionConfiguration = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthExtensionConfiguration.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/auth/httpAuthExtensionConfiguration.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveHttpAuthRuntimeConfig = exports2.getHttpAuthExtensionConfiguration = void 0;
@@ -51729,9 +51857,9 @@ var require_httpAuthExtensionConfiguration = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeExtensions.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeExtensions.js
 var require_runtimeExtensions = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeExtensions.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/runtimeExtensions.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveRuntimeExtensions = void 0;
@@ -51760,9 +51888,9 @@ var require_runtimeExtensions = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/STSClient.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/STSClient.js
 var require_STSClient = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/STSClient.js"(exports2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/STSClient.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.STSClient = exports2.__Client = void 0;
@@ -51824,9 +51952,9 @@ var require_STSClient = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/index.js
+// ../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/index.js
 var require_dist_cjs50 = __commonJS({
-  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0_@aws-sdk+client-sso-oidc@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/@aws-sdk+client-sts@3.583.0/node_modules/@aws-sdk/client-sts/dist-cjs/index.js"(exports2, module2) {
     "use strict";
     var __defProp3 = Object.defineProperty;
     var __getOwnPropDesc3 = Object.getOwnPropertyDescriptor;
@@ -65089,9 +65217,9 @@ var require_conUtils_server = __commonJS({
       if (platform.isWindows && !projectPath.startsWith("\\\\")) {
         projectPath = "\\\\?\\" + projectPath;
       }
-      const hash = (0, systemUtils_1.hashSHA1toHex)(projectPath);
+      const hash2 = (0, systemUtils_1.hashSHA1toHex)(projectPath);
       const baseName = node_path_1.default.basename(projectPath);
-      const dirName = baseName + "-" + hash;
+      const dirName = baseName + "-" + hash2;
       return platform.searchConfigDir("projects", dirName);
     }
     exports2.serverUtils = {
@@ -67842,14 +67970,14 @@ var require_functions = __commonJS({
           description: (_a = func.annotations[0]) == null ? void 0 : _a["@value"]
         };
         replaceNumberTypes(funcDef);
-        const hash = hashFuncDef(funcDef);
-        if (!seenFuncDefHashes.has(hash)) {
+        const hash2 = hashFuncDef(funcDef);
+        if (!seenFuncDefHashes.has(hash2)) {
           if (!functionMap.has(name)) {
             functionMap.set(name, [funcDef]);
           } else {
             functionMap.get(name).push(funcDef);
           }
-          seenFuncDefHashes.add(hash);
+          seenFuncDefHashes.add(hash2);
         }
       }
       return functionMap;
@@ -67974,14 +68102,14 @@ var require_operators = __commonJS({
           annotations: void 0
         };
         (0, functions_1.replaceNumberTypes)(opDef);
-        const hash = hashOpDef(opDef);
-        if (!seenOpDefHashes.has(hash)) {
+        const hash2 = hashOpDef(opDef);
+        if (!seenOpDefHashes.has(hash2)) {
           if (!operators.has(name)) {
             operators.set(name, [opDef]);
           } else {
             operators.get(name).push(opDef);
           }
-          seenOpDefHashes.add(hash);
+          seenOpDefHashes.add(hash2);
         }
       }
       return operators;
@@ -69083,6 +69211,7 @@ var init_selector_ui = __esm({
     init_source();
     import_hanji6 = __toESM(require_hanji());
     Select = class extends import_hanji6.Prompt {
+      data;
       constructor(items) {
         super();
         this.on("attach", (terminal) => terminal.toggleCursor("hide"));
@@ -69246,7 +69375,7 @@ var init_unescape = __esm({
 });
 
 // ../node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/index.js
-var import_brace_expansion, minimatch, starDotExtRE, starDotExtTest, starDotExtTestDot, starDotExtTestNocase, starDotExtTestNocaseDot, starDotStarRE, starDotStarTest, starDotStarTestDot, dotStarRE, dotStarTest, starRE, starTest, starTestDot, qmarksRE, qmarksTestNocase, qmarksTestNocaseDot, qmarksTestDot, qmarksTest, qmarksTestNoExt, qmarksTestNoExtDot, defaultPlatform, path2, sep, GLOBSTAR, plTypes, qmark, star, twoStarDot, twoStarNoDot, charSet, reSpecials, addPatternStartSet, filter, ext, defaults2, braceExpand, MAX_PATTERN_LENGTH, assertValidPattern, makeRe, match, globUnescape, globMagic, regExpEscape, Minimatch;
+var import_brace_expansion, minimatch, starDotExtRE, starDotExtTest, starDotExtTestDot, starDotExtTestNocase, starDotExtTestNocaseDot, starDotStarRE, starDotStarTest, starDotStarTestDot, dotStarRE, dotStarTest, starRE, starTest, starTestDot, qmarksRE, qmarksTestNocase, qmarksTestNocaseDot, qmarksTestDot, qmarksTest, qmarksTestNoExt, qmarksTestNoExtDot, defaultPlatform, path2, sep, GLOBSTAR, plTypes, qmark, star, twoStarDot, twoStarNoDot, charSet, reSpecials, addPatternStartSet, filter, ext, defaults3, braceExpand, MAX_PATTERN_LENGTH, assertValidPattern, makeRe, match, globUnescape, globMagic, regExpEscape, Minimatch;
 var init_mjs = __esm({
   "../node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/index.js"() {
     import_brace_expansion = __toESM(require_brace_expansion(), 1);
@@ -69341,7 +69470,7 @@ var init_mjs = __esm({
     filter = (pattern, options = {}) => (p) => minimatch(p, pattern, options);
     minimatch.filter = filter;
     ext = (a, b = {}) => Object.assign({}, a, b);
-    defaults2 = (def) => {
+    defaults3 = (def) => {
       if (!def || typeof def !== "object" || !Object.keys(def).length) {
         return minimatch;
       }
@@ -69367,7 +69496,7 @@ var init_mjs = __esm({
         GLOBSTAR
       });
     };
-    minimatch.defaults = defaults2;
+    minimatch.defaults = defaults3;
     braceExpand = (pattern, options = {}) => {
       assertValidPattern(pattern);
       if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
@@ -72120,6 +72249,14 @@ var init_introspect2 = __esm({
             name: it.name,
             values: [it.value]
           };
+        } else {
+          acc[it.oid].values.push(it.value);
+        }
+        return acc;
+      }, {});
+      const groupedArrEnums = enumsList.reduce((acc, it) => {
+        if (!(it.arrayTypeId in acc)) {
+          const schemaName = filteredNamespaces.find((sch) => sch.oid === it.schemaId).name;
           acc[it.arrayTypeId] = {
             oid: it.oid,
             schema: schemaName,
@@ -72127,7 +72264,6 @@ var init_introspect2 = __esm({
             values: [it.value]
           };
         } else {
-          acc[it.oid].values.push(it.value);
           acc[it.arrayTypeId].values.push(it.value);
         }
         return acc;
@@ -72200,15 +72336,14 @@ var init_introspect2 = __esm({
         if (expr) {
           const table5 = tablesList.find((it) => it.oid === column8.tableId);
           const schema4 = namespaces.find((it) => it.oid === table5.schemaId);
-          const expectedExpression = serialExpressionFor(schema4.name, table5.name, column8.name);
-          const isSerial = expr.expression === expectedExpression;
+          const isSerial = isSerialExpression(expr.expression, schema4.name);
           column8.type = isSerial ? type === "bigint" ? "bigserial" : type === "integer" ? "serial" : "smallserial" : type;
         }
       }
       for (const column8 of columnsList.filter((x2) => x2.kind === "r")) {
         const table5 = tablesList.find((it) => it.oid === column8.tableId);
         const schema4 = namespaces.find((it) => it.oid === table5.schemaId);
-        const enumType2 = column8.typeId in groupedEnums ? groupedEnums[column8.typeId] : null;
+        const enumType2 = column8.typeId in groupedEnums ? groupedEnums[column8.typeId] : column8.typeId in groupedArrEnums ? groupedArrEnums[column8.typeId] : null;
         let columnTypeMapped = enumType2 ? enumType2.name : column8.type.replace("[]", "");
         columnTypeMapped = trimChar(columnTypeMapped, '"');
         if (columnTypeMapped.startsWith("numeric(")) {
@@ -72255,7 +72390,7 @@ ${JSON.stringify(column8.metadata)}`
           unique: !!unique,
           uniqueName: unique ? unique.name : null,
           uniqueNullsNotDistinct: (unique == null ? void 0 : unique.definition.includes("NULLS NOT DISTINCT")) ?? false,
-          notNull: column8.notNull && !pk && column8.generatedType !== "s" && column8.identityType === "",
+          notNull: column8.notNull,
           pk: pk !== null,
           pkName: pk !== null ? pk.name : null,
           generated: column8.generatedType === "s" ? { type: "stored", as: metadata.expression } : null,
@@ -72372,6 +72507,8 @@ ${JSON.stringify(column8.metadata)}`
     `);
       for (const idx of idxs) {
         const { metadata } = idx;
+        const forUnique = metadata.isUnique && constraintsList.some((x2) => x2.type === "u" && x2.indexId === idx.oid);
+        const forPK = metadata.isPrimary && constraintsList.some((x2) => x2.type === "p" && x2.indexId === idx.oid);
         const opclasses = metadata.opclassIds.map((it) => opsById[it]);
         const expr = splitExpressions(metadata.expression);
         const schema4 = namespaces.find((it) => it.oid === idx.schemaId);
@@ -72443,7 +72580,8 @@ ${JSON.stringify(column8.metadata)}`
           where: idx.metadata.where,
           columns: columns2,
           concurrently: false,
-          isPrimary: idx.metadata.isPrimary
+          forUnique,
+          forPK
         });
       }
       progressCallback("columns", columnsCount, "fetching");
@@ -72453,7 +72591,7 @@ ${JSON.stringify(column8.metadata)}`
       for (const it of columnsList.filter((x2) => x2.kind === "m" || x2.kind === "v")) {
         const view5 = viewsList.find((x2) => x2.oid === it.tableId);
         const schema4 = namespaces.find((x2) => x2.oid === view5.schemaId);
-        const enumType2 = it.typeId in groupedEnums ? groupedEnums[it.typeId] : null;
+        const enumType2 = it.typeId in groupedEnums ? groupedEnums[it.typeId] : it.typeId in groupedArrEnums ? groupedArrEnums[it.typeId] : null;
         let columnTypeMapped = enumType2 ? enumType2.name : it.type.replace("[]", "");
         columnTypeMapped = trimChar(columnTypeMapped, '"');
         if (columnTypeMapped.startsWith("numeric(")) {
@@ -72558,7 +72696,7 @@ ${JSON.stringify(column8.metadata)}`
     }) => {
       const res = await fromDatabase2(db2, tableFilter, schemaFilters, entities, progressCallback);
       res.schemas = res.schemas.filter((it) => it.name !== "public");
-      res.indexes = res.indexes.filter((it) => !it.isPrimary);
+      res.indexes = res.indexes.filter((it) => !it.forPK && !it.forUnique);
       return res;
     };
   }
@@ -72568,9 +72706,9 @@ ${JSON.stringify(column8.metadata)}`
 var pull_postgres_exports = {};
 __export(pull_postgres_exports, {
   handle: () => handle7,
-  pgPushIntrospect: () => pgPushIntrospect
+  introspect: () => introspect
 });
-var import_fs9, import_hanji8, import_path6, handle7, pgPushIntrospect;
+var import_fs9, import_hanji8, import_path6, handle7, introspect;
 var init_pull_postgres = __esm({
   "src/cli/commands/pull-postgres.ts"() {
     "use strict";
@@ -72581,7 +72719,6 @@ var init_pull_postgres = __esm({
     import_path6 = require("path");
     init_snapshot3();
     init_global();
-    init_mocks();
     init_ddl3();
     init_diff();
     init_introspect2();
@@ -72589,7 +72726,6 @@ var init_pull_postgres = __esm({
     init_utils_node();
     init_prompts();
     init_views();
-    init_views();
     init_generate_common();
     init_pull_common();
     handle7 = async (casing2, out, breakpoints, credentials2, tablesFilter, schemasFilters, prefix2, entities) => {
@@ -72637,17 +72773,11 @@ var init_pull_postgres = __esm({
           resolver("table"),
           resolver("column"),
           resolver("view"),
-          // TODO: handle all renames
-          mockResolver(blanks),
-          // uniques
-          mockResolver(blanks),
-          // indexes
-          mockResolver(blanks),
-          // checks
-          mockResolver(blanks),
-          // pks
-          mockResolver(blanks),
-          // fks
+          resolver("unique"),
+          resolver("index"),
+          resolver("check"),
+          resolver("primary key"),
+          resolver("foreign key"),
           "push"
         );
         writeResult({
@@ -72681,7 +72811,7 @@ var init_pull_postgres = __esm({
       );
       process.exit(0);
     };
-    pgPushIntrospect = async (db2, filters, schemaFilters, entities) => {
+    introspect = async (db2, filters, schemaFilters, entities, progress) => {
       const matchers = filters.map((it) => {
         return new Minimatch(it);
       });
@@ -72703,17 +72833,8 @@ var init_pull_postgres = __esm({
         }
         return false;
       };
-      const progress = new ProgressView(
-        "Pulling schema from database...",
-        "Pulling schema from database..."
-      );
-      const schemaFilter = (it) => {
-        return schemaFilters.some((x2) => x2 === it);
-      };
-      const schema4 = await (0, import_hanji8.renderWithTask)(
-        progress,
-        fromDatabaseForDrizzle2(db2, filter2, schemaFilter, entities)
-      );
+      const schemaFilter = typeof schemaFilters === "function" ? schemaFilters : (it) => schemaFilters.some((x2) => x2 === it);
+      const schema4 = await (0, import_hanji8.renderWithTask)(progress, fromDatabaseForDrizzle2(db2, filter2, schemaFilter, entities));
       return { schema: schema4 };
     };
   }
@@ -72735,14 +72856,13 @@ var init_push_postgres = __esm({
     init_diff();
     init_drizzle();
     init_serializer();
-    init_mocks();
     init_prompts();
     init_selector_ui();
     init_outputs();
     init_views();
     handle8 = async (schemaPath, verbose, strict, credentials2, tablesFilter, schemasFilter, entities, force, casing2) => {
       const { preparePostgresDB: preparePostgresDB2 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
-      const { pgPushIntrospect: pgPushIntrospect2 } = await Promise.resolve().then(() => (init_pull_postgres(), pull_postgres_exports));
+      const { introspect: pgPushIntrospect } = await Promise.resolve().then(() => (init_pull_postgres(), pull_postgres_exports));
       const db2 = await preparePostgresDB2(credentials2);
       const filenames = prepareFilenames(schemaPath);
       const res = await prepareFromSchemaFiles(filenames);
@@ -72754,7 +72874,8 @@ var init_push_postgres = __esm({
         console.log(errors.map((it) => schemaError(it)).join("\n"));
         process.exit(1);
       }
-      const { schema: schemaFrom } = await pgPushIntrospect2(db2, tablesFilter, schemasFilter, entities);
+      const progress = new ProgressView("Pulling schema from database...", "Pulling schema from database...");
+      const { schema: schemaFrom } = await pgPushIntrospect(db2, tablesFilter, schemasFilter, entities, progress);
       const { ddl: ddl1, errors: errors1 } = interimToDDL3(schemaFrom);
       const { ddl: ddl22, errors: errors2 } = interimToDDL3(schemaTo);
       if (errors1.length > 0) {
@@ -72773,16 +72894,11 @@ var init_push_postgres = __esm({
         resolver("table"),
         resolver("column"),
         resolver("view"),
-        mockResolver(blanks),
-        // uniques
-        mockResolver(blanks),
-        // indexes
-        mockResolver(blanks),
-        // checks
-        mockResolver(blanks),
-        // pks
-        mockResolver(blanks),
-        // fks
+        resolver("unique"),
+        resolver("index"),
+        resolver("check"),
+        resolver("primary key"),
+        resolver("foreign key"),
         "push"
       );
       if (sqlStatements.length === 0) {
@@ -77024,14 +77140,14 @@ var cors;
 var init_cors = __esm({
   "../node_modules/.pnpm/hono@4.5.0/node_modules/hono/dist/middleware/cors/index.js"() {
     cors = (options) => {
-      const defaults3 = {
+      const defaults4 = {
         origin: "*",
         allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"],
         allowHeaders: [],
         exposeHeaders: []
       };
       const opts = {
-        ...defaults3,
+        ...defaults4,
         ...options
       };
       const findAllowOrigin = ((optsOrigin) => {
@@ -78859,7 +78975,7 @@ var require_parse = __commonJS2({
     var META = "|&;()<> \\t";
     var SINGLE_QUOTE = '"((\\\\"|[^"])*?)"';
     var DOUBLE_QUOTE = "'((\\\\'|[^'])*?)'";
-    var hash = /^#$/;
+    var hash2 = /^#$/;
     var SQ = "'";
     var DQ = '"';
     var DS = "$";
@@ -78989,7 +79105,7 @@ var require_parse = __commonJS2({
             quote = c;
           } else if (controlRE.test(c)) {
             return { op: s2 };
-          } else if (hash.test(c)) {
+          } else if (hash2.test(c)) {
             commented = true;
             var commentObj = { comment: string2.slice(match2.index + i22 + 1) };
             if (out.length) {
@@ -80267,7 +80383,6 @@ var updateToV8 = (it) => {
         table: table5.name,
         name: idx.name,
         columns,
-        isPrimary: false,
         isUnique: idx.isUnique,
         method: idx.method,
         concurrently: idx.concurrently,
@@ -81191,11 +81306,11 @@ var flattenDatabaseCredentials = (config) => {
 };
 var flattenPull = (config) => {
   if ("dbCredentials" in config) {
-    const { dbCredentials, introspect, ...rest } = config;
+    const { dbCredentials, introspect: introspect2, ...rest } = config;
     return {
       ...rest,
       ...dbCredentials,
-      casing: introspect == null ? void 0 : introspect.casing
+      casing: introspect2 == null ? void 0 : introspect2.casing
     };
   }
   return config;
@@ -82445,7 +82560,7 @@ init_utils4();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.31.1-9811cd4";
+  const envVersion = "0.31.1-a4825a4";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;