orchid-orm 1.32.9 → 1.32.10

package/dist/migrations.js

@@ -99,14 +99,14 @@ const promptCreateOrRename = (kind, name, drop, verifying) => {
     ]
   });
 };
-const checkForColumnChange = (shape, key) => {
+const checkForColumnAddOrDrop = (shape, key) => {
   const item = shape[key];
   if (item) {
-    return item && (Array.isArray(item) || item.type !== "rename");
+    return item && (Array.isArray(item) || item.type === "add" || item.type === "drop");
   }
   for (const k in shape) {
     const item2 = shape[k];
-    if (Array.isArray(item2) || item2.type !== "rename") {
+    if (Array.isArray(item2) || item2.type === "add" || item2.type === "drop") {
       return true;
     }
   }
@@ -182,19 +182,19 @@ const renameSchemaInStructures = (items, from, to) => {
   }
 };
 
-var __defProp$7 = Object.defineProperty;
-var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$7 = (a, b) => {
+var __defProp$9 = Object.defineProperty;
+var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
+var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
+var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$9 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$7.call(b, prop))
-      __defNormalProp$7(a, prop, b[prop]);
-  if (__getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(b)) {
-      if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
+    if (__hasOwnProp$9.call(b, prop))
+      __defNormalProp$9(a, prop, b[prop]);
+  if (__getOwnPropSymbols$9)
+    for (var prop of __getOwnPropSymbols$9(b)) {
+      if (__propIsEnum$9.call(b, prop))
+        __defNormalProp$9(a, prop, b[prop]);
     }
   return a;
 };
@@ -228,7 +228,7 @@ const processExtensions = (ast, dbStructure, currentSchema, extensions) => {
   }
   if (codeExtensions == null ? void 0 : codeExtensions.length) {
     ast.push(
-      ...codeExtensions.map((ext) => __spreadValues$7({
+      ...codeExtensions.map((ext) => __spreadValues$9({
         type: "extension",
         action: "create"
       }, ext))
@@ -236,22 +236,25 @@ const processExtensions = (ast, dbStructure, currentSchema, extensions) => {
   }
 };
 
-var __defProp$6 = Object.defineProperty;
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$6 = (a, b) => {
+var __defProp$8 = Object.defineProperty;
+var __defProps$7 = Object.defineProperties;
+var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
+var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
+var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$8 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$6.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(b)) {
-      if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
+    if (__hasOwnProp$8.call(b, prop))
+      __defNormalProp$8(a, prop, b[prop]);
+  if (__getOwnPropSymbols$8)
+    for (var prop of __getOwnPropSymbols$8(b)) {
+      if (__propIsEnum$8.call(b, prop))
+        __defNormalProp$8(a, prop, b[prop]);
     }
   return a;
 };
+var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 const processColumns = async (adapter, config, structureToAstCtx, dbStructure, domainsMap, changeTableData, ast, currentSchema, compareSql, typeCastsCache, verifying) => {
   const { dbTable } = changeTableData;
   const dbColumns = Object.fromEntries(
@@ -336,7 +339,7 @@ const addOrRenameColumns = async (config, dbStructure, {
   schema,
   changeTableAst: { name: tableName, shape }
 }, columnsToAdd, columnsToDrop, columnsToChange, verifying) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c;
   for (const { key, column } of columnsToAdd) {
     if (columnsToDrop.length) {
       const codeName = (_a = column.data.name) != null ? _a : key;
@@ -350,9 +353,9 @@ const addOrRenameColumns = async (config, dbStructure, {
         const drop = columnsToDrop[index - 1];
         columnsToDrop.splice(index - 1, 1);
         const from = (_b = drop.column.data.name) != null ? _b : drop.key;
-        columnsToChange.set((_c = drop.column.data.name) != null ? _c : from, {
+        columnsToChange.set(from, {
           key,
-          dbName: (_d = drop.column.data.name) != null ? _d : from,
+          dbName: from,
           column: column.name(codeName)
         });
         const to = config.snakeCase ? orchidCore.toSnakeCase(key) : key;
@@ -367,7 +370,7 @@ const addOrRenameColumns = async (config, dbStructure, {
           }
         }
         for (const c of dbTableData.constraints) {
-          if ((_e = c.check) == null ? void 0 : _e.columns) {
+          if ((_c = c.check) == null ? void 0 : _c.columns) {
             renameColumn(c.check.columns, from, to);
           }
           if (c.references) {
@@ -403,7 +406,6 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
     { key: codeKey, dbName, column: codeColumn }
   ] of columnsToChange) {
     const dbColumnStructure = dbColumns[dbName];
-    const { shape } = changeTableData.changeTableAst;
     const dbColumn = rakeDb.instantiateDbColumn(
       structureToAstCtx,
       dbStructure,
@@ -420,11 +422,12 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
       typeCastsCache,
       verifying,
       key,
+      dbName,
       dbColumn,
       codeColumn
     );
     if (action === "change") {
-      changeColumn(shape, key, dbColumn, codeColumn);
+      changeColumn(changeTableData, key, dbName, dbColumn, codeColumn);
     } else if (action === "recreate") {
       changeTableData.changeTableAst.shape[key] = [
         {
@@ -439,7 +442,7 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
     } else if (action !== "recreate") {
       const to = (_a = codeColumn.data.name) != null ? _a : codeKey;
       if (dbName !== to) {
-        shape[config.snakeCase ? dbName === orchidCore.toSnakeCase(codeKey) ? codeKey : dbName : dbName] = {
+        changeTableData.changeTableAst.shape[config.snakeCase ? dbName === orchidCore.toSnakeCase(codeKey) ? codeKey : dbName : dbName] = {
           type: "rename",
           name: config.snakeCase ? to === orchidCore.toSnakeCase(codeKey) ? codeKey : to : to
         };
@@ -447,7 +450,7 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
     }
   }
 };
-const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSql, changeTableData, typeCastsCache, verifying, key, dbColumn, codeColumn) => {
+const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSql, changeTableData, typeCastsCache, verifying, key, dbName, dbColumn, codeColumn) => {
   var _a, _b, _c, _d;
   const dbType = getColumnDbType(dbColumn, currentSchema);
   const codeType = getColumnDbType(codeColumn, currentSchema);
@@ -534,7 +537,7 @@ JOIN pg_type AS t ON t.oid = casttarget`);
   }
   if (!orchidCore.deepCompare(
     dbData.identity,
-    codeData.identity ? __spreadValues$6({
+    codeData.identity ? __spreadValues$8({
       always: false,
       start: 1,
       increment: 1,
@@ -566,12 +569,7 @@ JOIN pg_type AS t ON t.oid = casttarget`);
         inDb: dbDefault,
         inCode: codeDefault,
         change: () => {
-          changeColumn(
-            changeTableData.changeTableAst.shape,
-            key,
-            dbColumn,
-            codeColumn
-          );
+          changeColumn(changeTableData, key, dbName, dbColumn, codeColumn);
           if (!changeTableData.pushedAst) {
             changeTableData.pushedAst = true;
             ast.push(changeTableData.changeTableAst);
@@ -582,12 +580,23 @@ JOIN pg_type AS t ON t.oid = casttarget`);
   }
   return;
 };
-const changeColumn = (shape, name, dbColumn, codeColumn) => {
+const changeColumn = (changeTableData, key, dbName, dbColumn, codeColumn) => {
   dbColumn.data.as = codeColumn.data.as = void 0;
-  shape[name] = {
+  const simpleCodeColumn = Object.create(codeColumn);
+  simpleCodeColumn.data = __spreadProps$7(__spreadValues$8({}, codeColumn.data), {
+    primaryKey: void 0,
+    indexes: void 0,
+    foreignKeys: void 0,
+    check: void 0
+  });
+  changeTableData.changingColumns[dbName] = {
+    from: dbColumn,
+    to: simpleCodeColumn
+  };
+  changeTableData.changeTableAst.shape[key] = {
     type: "change",
     from: { column: dbColumn },
-    to: { column: codeColumn }
+    to: { column: simpleCodeColumn }
   };
 };
 const getColumnDbType = (column, currentSchema) => {
@@ -773,19 +782,19 @@ const createAst = (codeDomain) => ({
   baseType: codeDomain.column
 });
 
-var __defProp$5 = Object.defineProperty;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
+var __defProp$7 = Object.defineProperty;
+var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
+var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
+var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$7 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
+    if (__hasOwnProp$7.call(b, prop))
+      __defNormalProp$7(a, prop, b[prop]);
+  if (__getOwnPropSymbols$7)
+    for (var prop of __getOwnPropSymbols$7(b)) {
+      if (__propIsEnum$7.call(b, prop))
+        __defNormalProp$7(a, prop, b[prop]);
     }
   return a;
 };
@@ -865,7 +874,7 @@ const processEnums = async (ast, enums, dbStructure, currentSchema, verifying) =
         continue;
       }
     }
-    ast.push(__spreadValues$5({
+    ast.push(__spreadValues$7({
       type: "enum",
       action: "create"
     }, codeEnum));
@@ -926,7 +935,26 @@ const renameColumnsTypeSchema = (dbStructure, from, to) => {
   }
 };
 
-const processPrimaryKey = (config, ast, changeTableData) => {
+var __defProp$6 = Object.defineProperty;
+var __defProps$6 = Object.defineProperties;
+var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$6 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$6.call(b, prop))
+      __defNormalProp$6(a, prop, b[prop]);
+  if (__getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(b)) {
+      if (__propIsEnum$6.call(b, prop))
+        __defNormalProp$6(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+const processPrimaryKey = (config, changeTableData) => {
   var _a;
   const { codeTable } = changeTableData;
   const columnsPrimaryKey = [];
@@ -937,14 +965,15 @@ const processPrimaryKey = (config, ast, changeTableData) => {
     }
   }
   changePrimaryKey(config, columnsPrimaryKey, changeTableData);
-  renamePrimaryKey(ast, changeTableData);
+  renamePrimaryKey(changeTableData);
 };
 const changePrimaryKey = (config, columnsPrimaryKey, {
   codeTable,
   dbTableData: { primaryKey: dbPrimaryKey },
-  changeTableAst: { shape, add, drop }
+  changeTableAst: { shape, add, drop },
+  changingColumns
 }) => {
-  var _a;
+  var _a, _b, _c;
   const tablePrimaryKey = codeTable.internal.tableData.primaryKey;
   const primaryKey = [
     .../* @__PURE__ */ new Set([
@@ -955,19 +984,48 @@ const changePrimaryKey = (config, columnsPrimaryKey, {
       })) : tablePrimaryKey == null ? void 0 : tablePrimaryKey.columns.map((key) => ({ key, name: key }))) != null ? _a : []
     ])
   ];
-  if (!dbPrimaryKey || primaryKey.length !== dbPrimaryKey.columns.length || primaryKey.some(
+  if (dbPrimaryKey && primaryKey.length === dbPrimaryKey.columns.length && !primaryKey.some(
     ({ name }) => !dbPrimaryKey.columns.some((dbName) => name === dbName)
   )) {
-    const toDrop = dbPrimaryKey == null ? void 0 : dbPrimaryKey.columns.filter(
-      (key) => !checkForColumnChange(shape, key)
-    );
-    if (toDrop == null ? void 0 : toDrop.length) {
+    if (primaryKey.length === 1) {
+      const { key } = primaryKey[0];
+      const changes = shape[key] && orchidCore.toArray(shape[key]);
+      if (changes) {
+        for (const change of changes) {
+          if (change.type !== "change")
+            continue;
+          if (change.from.column) {
+            change.from.column.data.primaryKey = void 0;
+          }
+          if (change.to.column) {
+            const column = Object.create(change.to.column);
+            column.data = __spreadProps$6(__spreadValues$6({}, column.data), { primaryKey: void 0 });
+            change.to.column = column;
+          }
+        }
+      }
+    }
+    return;
+  }
+  const toDrop = dbPrimaryKey == null ? void 0 : dbPrimaryKey.columns.filter(
+    (key) => !checkForColumnAddOrDrop(shape, key)
+  );
+  if (toDrop == null ? void 0 : toDrop.length) {
+    if (toDrop.length === 1 && changingColumns[toDrop[0]]) {
+      const column = changingColumns[toDrop[0]];
+      column.from.data.primaryKey = (_b = dbPrimaryKey == null ? void 0 : dbPrimaryKey.name) != null ? _b : true;
+    } else {
       drop.primaryKey = { columns: toDrop, name: dbPrimaryKey == null ? void 0 : dbPrimaryKey.name };
     }
-    const toAdd = primaryKey.filter(
-      ({ key }) => !checkForColumnChange(shape, key)
-    );
-    if (toAdd.length) {
+  }
+  const toAdd = primaryKey.filter(
+    ({ key }) => !checkForColumnAddOrDrop(shape, key)
+  );
+  if (toAdd.length) {
+    if (toAdd.length === 1 && changingColumns[toAdd[0].name]) {
+      const column = changingColumns[toAdd[0].name];
+      column.to.data.primaryKey = (_c = tablePrimaryKey == null ? void 0 : tablePrimaryKey.name) != null ? _c : true;
+    } else {
       add.primaryKey = {
         columns: toAdd.map((c) => c.key),
         name: tablePrimaryKey == null ? void 0 : tablePrimaryKey.name
@@ -975,15 +1033,16 @@ const changePrimaryKey = (config, columnsPrimaryKey, {
     }
   }
 };
-const renamePrimaryKey = (ast, {
+const renamePrimaryKey = ({
   codeTable,
   dbTableData: { primaryKey: dbPrimaryKey },
-  schema
+  schema,
+  delayedAst
 }) => {
   var _a, _b;
   const tablePrimaryKey = codeTable.internal.tableData.primaryKey;
   if (dbPrimaryKey && tablePrimaryKey && (dbPrimaryKey == null ? void 0 : dbPrimaryKey.name) !== (tablePrimaryKey == null ? void 0 : tablePrimaryKey.name)) {
-    ast.push({
+    delayedAst.push({
       type: "renameTableItem",
       kind: "CONSTRAINT",
       tableSchema: schema,
@@ -994,38 +1053,38 @@ const renamePrimaryKey = (ast, {
   }
 };
 
-var __defProp$4 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
+var __defProp$5 = Object.defineProperty;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$4.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$5.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$4.call(source, prop))
+  if (source != null && __getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$5.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
-const processIndexes = (config, changeTableData, delayedAst, ast, compareExpressions) => {
+const processIndexes = (config, changeTableData, ast, compareExpressions) => {
   const codeIndexes = collectCodeIndexes(config, changeTableData);
   const codeComparableIndexes = collectCodeComparableIndexes(
     config,
@@ -1038,97 +1097,95 @@ const processIndexes = (config, changeTableData, delayedAst, ast, compareExpress
     changeTableAst: { shape }
   } = changeTableData;
   for (const dbIndex of changeTableData.dbTableData.indexes) {
-    const hasChangedColumn = dbIndex.columns.some(
-      (column) => "column" in column && checkForColumnChange(shape, column.column)
+    const hasAddedOrDroppedColumn = dbIndex.columns.some(
+      (column) => "column" in column && checkForColumnAddOrDrop(shape, column.column)
     );
-    if (hasChangedColumn)
+    if (hasAddedOrDroppedColumn)
       continue;
     normalizeIndex(dbIndex);
-    const dbComparableIndex = indexToComparable(dbIndex);
-    const { columns: dbColumns } = dbIndex;
-    const { found, rename } = findMatchingIndexWithoutSql(
-      dbComparableIndex,
+    const { found, rename, foundAndHasSql } = findMatchingIndex(
+      dbIndex,
       codeComparableIndexes,
       codeIndexes,
       skipCodeIndexes,
       changeTableData.codeTable.table,
       config
     );
-    if (found.length && checkIfIndexHasSql(dbComparableIndex)) {
-      for (const codeIndex of found) {
-        holdCodeIndexes.set(codeIndex, true);
-      }
-      const compare = [];
-      for (let i = 0; i < dbIndex.columns.length; i++) {
-        const column = dbIndex.columns[i];
-        if (!("expression" in column))
-          continue;
-        compare.push({
-          inDb: column.expression,
-          inCode: found.map(
-            (index) => index.columns[i].expression
-          )
-        });
-      }
-      if (dbIndex.with) {
-        compare.push({
-          inDb: dbIndex.with,
-          inCode: found.map((index) => index.options.with)
-        });
-      }
-      if (dbIndex.where) {
-        compare.push({
-          inDb: dbIndex.where,
-          inCode: found.map((index) => index.options.where)
-        });
-      }
-      wait++;
-      compareExpressions.push({
-        compare,
-        handle(index) {
-          var _a, _b;
-          const codeIndex = index === void 0 ? void 0 : found[index];
-          handleIndexChange(
-            ast,
-            changeTableData,
-            dbIndex,
-            dbColumns,
-            codeIndex,
-            index === void 0 ? void 0 : rename[index]
-          );
-          if (codeIndex) {
-            holdCodeIndexes.delete(codeIndex);
-          }
-          if (!--wait && holdCodeIndexes.size) {
-            ((_b = (_a = changeTableData.changeTableAst.add).indexes) != null ? _b : _a.indexes = []).push(
-              ...holdCodeIndexes.keys()
-            );
-            if (!changeTableData.pushedAst) {
-              changeTableData.pushedAst = true;
-              ast.push(changeTableData.changeTableAst);
-            }
-          }
-        }
-      });
-    } else {
+    const { columns: dbColumns } = dbIndex;
+    if (!foundAndHasSql) {
       handleIndexChange(
-        delayedAst,
         changeTableData,
         dbIndex,
         dbColumns,
         found[0],
         rename[0]
       );
+      continue;
+    }
+    for (const codeIndex of found) {
+      holdCodeIndexes.set(codeIndex, true);
+    }
+    const compare = [];
+    for (let i = 0; i < dbIndex.columns.length; i++) {
+      const column = dbIndex.columns[i];
+      if (!("expression" in column))
+        continue;
+      compare.push({
+        inDb: column.expression,
+        inCode: found.map(
+          (index) => index.columns[i].expression
+        )
+      });
+    }
+    if (dbIndex.with) {
+      compare.push({
+        inDb: dbIndex.with,
+        inCode: found.map((index) => index.options.with)
+      });
+    }
+    if (dbIndex.where) {
+      compare.push({
+        inDb: dbIndex.where,
+        inCode: found.map((index) => index.options.where)
+      });
     }
+    wait++;
+    compareExpressions.push({
+      compare,
+      handle(index) {
+        const codeIndex = index === void 0 ? void 0 : found[index];
+        handleIndexChange(
+          changeTableData,
+          dbIndex,
+          dbColumns,
+          codeIndex,
+          index === void 0 ? void 0 : rename[index]
+        );
+        if (codeIndex) {
+          holdCodeIndexes.delete(codeIndex);
+        }
+        if (!--wait && holdCodeIndexes.size) {
+          addIndexes(changeTableData, [...holdCodeIndexes.keys()]);
+          if (!changeTableData.pushedAst) {
+            changeTableData.pushedAst = true;
+            ast.push(changeTableData.changeTableAst);
+          }
+        }
+      }
+    });
   }
-  const addIndexes = codeIndexes.filter(
+  const indexesToAdd = codeIndexes.filter(
     (index, i) => !skipCodeIndexes.has(i) && !holdCodeIndexes.has(index)
   );
-  if (addIndexes.length) {
-    changeTableData.changeTableAst.add.indexes = addIndexes.map((x) => __spreadProps$4(__spreadValues$4({}, x), {
-      columns: x.columnKeys,
-      options: x.options.include ? __spreadProps$4(__spreadValues$4({}, x.options), { include: x.includeKeys }) : x.options
-    }));
+  if (indexesToAdd.length) {
+    addIndexes(
+      changeTableData,
+      indexesToAdd.map((x) => __spreadProps$5(__spreadValues$5({}, x), {
+        columns: x.columnKeys,
+        columnNames: x.columns,
+        options: x.options.include ? __spreadProps$5(__spreadValues$5({}, x.options), { include: x.includeKeys }) : x.options
+      }))
+    );
   }
 };
 const collectCodeIndexes = (config, { codeTable, changeTableAst: { shape } }) => {
@@ -1139,7 +1196,7 @@ const collectCodeIndexes = (config, { codeTable, changeTableAst: { shape } }) =>
     if (!column.data.indexes)
       continue;
     const name = (_a = column.data.name) != null ? _a : key;
-    if (checkForColumnChange(shape, name))
+    if (checkForColumnAddOrDrop(shape, name))
       continue;
     codeIndexes.push(
       ...column.data.indexes.map(
@@ -1149,7 +1206,7 @@ const collectCodeIndexes = (config, { codeTable, changeTableAst: { shape } }) =>
           } = _c, _e = _d, { collate, opclass, order, weight } = _e, options = __objRest(_e, ["collate", "opclass", "order", "weight"]), index = __objRest(_c, [
             "options"
           ]);
-          return __spreadProps$4(__spreadValues$4({
+          return __spreadProps$5(__spreadValues$5({
             columns: [
               {
                 collate,
@@ -1160,7 +1217,7 @@ const collectCodeIndexes = (config, { codeTable, changeTableAst: { shape } }) =>
               }
             ]
           }, index), {
-            options: options.include ? config.snakeCase ? __spreadProps$4(__spreadValues$4({}, options), {
+            options: options.include ? config.snakeCase ? __spreadProps$5(__spreadValues$5({}, options), {
               include: orchidCore.toArray(options.include).map(orchidCore.toSnakeCase)
             }) : options : options,
             columnKeys: [{ collate, opclass, order, weight, column: key }],
@@ -1172,12 +1229,12 @@ const collectCodeIndexes = (config, { codeTable, changeTableAst: { shape } }) =>
   }
   if (codeTable.internal.tableData.indexes) {
     codeIndexes.push(
-      ...codeTable.internal.tableData.indexes.map((x) => __spreadProps$4(__spreadValues$4({}, x), {
+      ...codeTable.internal.tableData.indexes.map((x) => __spreadProps$5(__spreadValues$5({}, x), {
         columns: config.snakeCase ? x.columns.map(
-          (c) => "column" in c ? __spreadProps$4(__spreadValues$4({}, c), { column: orchidCore.toSnakeCase(c.column) }) : c
+          (c) => "column" in c ? __spreadProps$5(__spreadValues$5({}, c), { column: orchidCore.toSnakeCase(c.column) }) : c
         ) : x.columns,
         columnKeys: x.columns,
-        options: x.options.include && config.snakeCase ? __spreadProps$4(__spreadValues$4({}, x.options), {
+        options: x.options.include && config.snakeCase ? __spreadProps$5(__spreadValues$5({}, x.options), {
           include: orchidCore.toArray(x.options.include).map(orchidCore.toSnakeCase)
         }) : x.options,
         includeKeys: x.options.include
@@ -1189,7 +1246,7 @@ const collectCodeIndexes = (config, { codeTable, changeTableAst: { shape } }) =>
 const collectCodeComparableIndexes = (config, codeIndexes) => {
   return codeIndexes.map((codeIndex) => {
     normalizeIndex(codeIndex.options);
-    return indexToComparable(__spreadProps$4(__spreadValues$4({}, codeIndex.options), {
+    return indexToComparable(__spreadProps$5(__spreadValues$5({}, codeIndex.options), {
       include: codeIndex.options.include === void 0 ? void 0 : config.snakeCase ? orchidCore.toArray(codeIndex.options.include).map(orchidCore.toSnakeCase) : orchidCore.toArray(codeIndex.options.include),
       columns: codeIndex.columns,
       name: codeIndex.name,
@@ -1209,7 +1266,7 @@ const normalizeIndex = (index) => {
 const indexToComparable = (index) => {
   let hasExpression = false;
   const columns = index.columns.map((column) => {
-    const result = __spreadProps$4(__spreadValues$4({}, column), {
+    const result = __spreadProps$5(__spreadValues$5({}, column), {
       expression: void 0,
       hasExpression: "expression" in column
     });
@@ -1217,7 +1274,7 @@ const indexToComparable = (index) => {
       hasExpression = true;
     return result;
   });
-  return __spreadProps$4(__spreadValues$4({}, index), {
+  return __spreadProps$5(__spreadValues$5({}, index), {
     schemaName: void 0,
     tableName: void 0,
     with: void 0,
@@ -1228,6 +1285,19 @@ const indexToComparable = (index) => {
     hasExpression
   });
 };
+const findMatchingIndex = (dbIndex, codeComparableIndexes, codeIndexes, skipCodeIndexes, tableName, config) => {
+  const dbComparableIndex = indexToComparable(dbIndex);
+  const { found, rename } = findMatchingIndexWithoutSql(
+    dbComparableIndex,
+    codeComparableIndexes,
+    codeIndexes,
+    skipCodeIndexes,
+    tableName,
+    config
+  );
+  const foundAndHasSql = found.length && checkIfIndexHasSql(dbComparableIndex);
+  return { found, rename, foundAndHasSql };
+};
 const findMatchingIndexWithoutSql = (dbIndex, codeComparableIndexes, codeIndexes, skipCodeIndexes, tableName, config) => {
   var _c, _d;
   const found = [];
@@ -1242,8 +1312,8 @@ const findMatchingIndexWithoutSql = (dbIndex, codeComparableIndexes, codeIndexes
       let b = codeIndex;
       const codeName = (_c = b.name) != null ? _c : rakeDb.getIndexName(tableName, dbColumns);
       if (a.name !== b.name) {
-        a = __spreadProps$4(__spreadValues$4({}, a), { name: void 0 });
-        b = __spreadProps$4(__spreadValues$4({}, b), {
+        a = __spreadProps$5(__spreadValues$5({}, a), { name: void 0 });
+        b = __spreadProps$5(__spreadValues$5({}, b), {
           name: void 0,
           columnKeys: void 0,
           includeKeys: void 0
@@ -1276,16 +1346,33 @@ const findMatchingIndexWithoutSql = (dbIndex, codeComparableIndexes, codeIndexes
   return { found, rename };
 };
 const checkIfIndexHasSql = (index) => index.hasWith || index.hasWhere || index.hasExpression;
-const handleIndexChange = (ast, { changeTableAst, schema, codeTable }, dbIndex, dbColumns, found, rename) => {
-  var _a, _b;
+const handleIndexChange = ({
+  changeTableAst,
+  schema,
+  codeTable,
+  changingColumns,
+  delayedAst
+}, dbIndex, dbColumns, found, rename) => {
+  var _a, _b, _c, _d;
   if (!found) {
-    ((_b = (_a = changeTableAst.drop).indexes) != null ? _b : _a.indexes = []).push({
+    const indexName = dbIndex.name === rakeDb.getIndexName(changeTableAst.name, dbColumns) ? void 0 : dbIndex.name;
+    if (dbColumns.length === 1 && "column" in dbColumns[0]) {
+      const column = changingColumns[dbColumns[0].column];
+      if (column) {
+        ((_b = (_a = column.from.data).indexes) != null ? _b : _a.indexes = []).push({
+          options: dbIndex,
+          name: indexName
+        });
+        return;
+      }
+    }
+    ((_d = (_c = changeTableAst.drop).indexes) != null ? _d : _c.indexes = []).push({
       columns: dbColumns,
       options: dbIndex,
-      name: dbIndex.name === rakeDb.getIndexName(changeTableAst.name, dbColumns) ? void 0 : dbIndex.name
+      name: indexName
     });
   } else if (rename) {
-    ast.push({
+    delayedAst.push({
       type: "renameTableItem",
       kind: "INDEX",
       tableSchema: schema,
@@ -1295,26 +1382,40 @@ const handleIndexChange = (ast, { changeTableAst, schema, codeTable }, dbIndex,
     });
   }
 };
+const addIndexes = ({ changeTableAst, changingColumns }, add) => {
+  var _a, _b, _c, _d;
+  const indexes = (_b = (_a = changeTableAst.add).indexes) != null ? _b : _a.indexes = [];
+  for (const index of add) {
+    if (index.columns.length === 1 && "column" in index.columns[0]) {
+      const column = changingColumns[(index.columnNames || index.columns)[0].column];
+      if (column) {
+        ((_d = (_c = column.to.data).indexes) != null ? _d : _c.indexes = []).push(index);
+        continue;
+      }
+    }
+    indexes.push(index);
+  }
+};
 
-var __defProp$3 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
+var __defProp$4 = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const mapMatchToDb = {
   FULL: "f",
   PARTIAL: "p",
@@ -1336,14 +1437,14 @@ for (const key in mapActionToDb) {
   mapActionToCode[mapActionToDb[key]] = key;
 }
 const processForeignKeys = (config, ast, changeTables, currentSchema, tableShapes) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g;
   for (const changeTableData of changeTables) {
     const codeForeignKeys = collectCodeFkeys(
       config,
       changeTableData,
       currentSchema
     );
-    const { codeTable, dbTableData, changeTableAst, schema } = changeTableData;
+    const { codeTable, dbTableData, changeTableAst, schema, changingColumns } = changeTableData;
     const { shape, add, drop } = changeTableAst;
     let changed = false;
     for (const dbConstraint of dbTableData.constraints) {
@@ -1351,13 +1452,13 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
       if (!dbReferences)
         continue;
       const hasChangedColumn = dbReferences.columns.some(
-        (column) => checkForColumnChange(shape, column)
+        (column) => checkForColumnAddOrDrop(shape, column)
       );
       if (hasChangedColumn)
         continue;
       const foreignShape = tableShapes[`${dbReferences.foreignSchema}.${dbReferences.foreignTable}`];
       const hasForeignChangedColumn = foreignShape && dbReferences.foreignColumns.some(
-        (column) => checkForColumnChange(foreignShape, column)
+        (column) => checkForColumnAddOrDrop(foreignShape, column)
       );
       if (hasForeignChangedColumn)
         continue;
@@ -1380,9 +1481,21 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
         }
       }
       if (!found) {
-        ((_b = drop.constraints) != null ? _b : drop.constraints = []).push(
-          dbForeignKeyToCodeForeignKey(config, dbConstraint, dbReferences)
+        const foreignKey = dbForeignKeyToCodeForeignKey(
+          config,
+          dbConstraint,
+          dbReferences
         );
+        if (dbReferences.columns.length === 1 && changingColumns[dbReferences.columns[0]]) {
+          const column = changingColumns[dbReferences.columns[0]];
+          ((_c = (_b = column.from.data).foreignKeys) != null ? _c : _b.foreignKeys = []).push({
+            fnOrTable: foreignKey.references.fnOrTable,
+            foreignColumns: foreignKey.references.foreignColumns,
+            options: foreignKey.references.options
+          });
+        } else {
+          ((_d = drop.constraints) != null ? _d : drop.constraints = []).push(foreignKey);
+        }
         changed = true;
       } else if (rename) {
         ast.push({
@@ -1396,9 +1509,19 @@ const processForeignKeys = (config, ast, changeTables, currentSchema, tableShape
       }
     }
     if (codeForeignKeys.length) {
-      ((_c = add.constraints) != null ? _c : add.constraints = []).push(
-        ...codeForeignKeys.map((x) => x.codeConstraint)
-      );
+      const constraints = (_e = add.constraints) != null ? _e : add.constraints = [];
+      for (const { codeConstraint, references } of codeForeignKeys) {
+        if (references.columns.length === 1 && changingColumns[references.columns[0]]) {
+          const column = changingColumns[references.columns[0]];
+          ((_g = (_f = column.to.data).foreignKeys) != null ? _g : _f.foreignKeys = []).push({
+            fnOrTable: references.foreignTable,
+            foreignColumns: codeConstraint.references.foreignColumns,
+            options: codeConstraint.references.options
+          });
+        } else {
+          constraints.push(codeConstraint);
+        }
+      }
       changed = true;
     }
     if (changed && !changeTableData.pushedAst) {
@@ -1415,7 +1538,7 @@ const collectCodeFkeys = (config, { codeTable, changeTableAst: { shape } }, curr
     if (!column.data.foreignKeys)
       continue;
     const name = (_a = column.data.name) != null ? _a : key;
-    if (checkForColumnChange(shape, name))
+    if (checkForColumnAddOrDrop(shape, name))
       continue;
     codeForeignKeys.push(
       ...column.data.foreignKeys.map((x) => {
@@ -1453,12 +1576,12 @@ const collectCodeFkeys = (config, { codeTable, changeTableAst: { shape } }, curr
       codeForeignKeys.push(
         parseForeignKey(
           config,
-          __spreadProps$3(__spreadValues$3({}, tableConstraint), {
-            references: __spreadProps$3(__spreadValues$3({}, refs), {
+          __spreadProps$4(__spreadValues$4({}, tableConstraint), {
+            references: __spreadProps$4(__spreadValues$4({}, refs), {
               fnOrTable
             })
           }),
-          __spreadProps$3(__spreadValues$3({}, refs), {
+          __spreadProps$4(__spreadValues$4({}, refs), {
             fnOrTable,
             columns: config.snakeCase ? refs.columns.map(orchidCore.toSnakeCase) : refs.columns,
             foreignColumns: config.snakeCase ? refs.foreignColumns.map(orchidCore.toSnakeCase) : refs.foreignColumns
@@ -1511,19 +1634,44 @@ const dbForeignKeyToCodeForeignKey = (config, dbConstraint, dbReferences) => ({
   }
 });
 
+var __defProp$3 = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
+var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
+var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$3(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 const processChecks = (ast, changeTableData, compareExpressions) => {
   var _a, _b;
   const codeChecks = collectCodeChecks(changeTableData);
   const {
     dbTableData,
-    changeTableAst: { add, drop, shape }
+    changeTableAst: { add, shape }
   } = changeTableData;
   const hasDbChecks = dbTableData.constraints.some((c) => c.check);
   if (!hasDbChecks) {
     if (codeChecks.length) {
-      ((_a = add.constraints) != null ? _a : add.constraints = []).push(
-        ...codeChecks.map((check) => ({ check: check.sql, name: check.name }))
-      );
+      const constraints = (_a = add.constraints) != null ? _a : add.constraints = [];
+      for (const check of codeChecks) {
+        if (check.column && changeTableData.changingColumns[check.column]) {
+          const column = changeTableData.changingColumns[check.column];
+          column.to.data.check = check;
+        } else {
+          constraints.push({ check: check.sql, name: check.name });
+        }
+      }
     }
     return;
   }
@@ -1534,7 +1682,7 @@ const processChecks = (ast, changeTableData, compareExpressions) => {
     if (!dbCheck)
       continue;
     const hasChangedColumn = (_b = dbCheck.columns) == null ? void 0 : _b.some(
-      (column) => checkForColumnChange(shape, column)
+      (column) => checkForColumnAddOrDrop(shape, column)
     );
     if (hasChangedColumn)
       continue;
@@ -1551,7 +1699,7 @@ const processChecks = (ast, changeTableData, compareExpressions) => {
           var _a2;
           if (index !== void 0)
             return;
-          dropCheck(drop, dbCheck, name);
+          dropCheck(changeTableData, dbCheck, name);
           if (--wait === 0 && !changeTableData.pushedAst) {
             changeTableData.pushedAst = true;
             ((_a2 = add.constraints) != null ? _a2 : add.constraints = []).push(
@@ -1565,7 +1713,7 @@ const processChecks = (ast, changeTableData, compareExpressions) => {
         }
       });
     } else {
-      dropCheck(drop, dbCheck, name);
+      dropCheck(changeTableData, dbCheck, name);
     }
   }
 };
@@ -1580,9 +1728,11 @@ const collectCodeChecks = ({
     if (!column.data.check)
       continue;
     const name = (_a = column.data.name) != null ? _a : key;
-    if (checkForColumnChange(shape, name))
+    if (checkForColumnAddOrDrop(shape, name))
       continue;
-    codeChecks.push(column.data.check);
+    codeChecks.push(__spreadProps$3(__spreadValues$3({}, column.data.check), {
+      column: name
+    }));
   }
   if (codeTable.internal.tableData.constraints) {
     for (const constraint of codeTable.internal.tableData.constraints) {
@@ -1594,12 +1744,25 @@ const collectCodeChecks = ({
   }
   return codeChecks;
 };
-const dropCheck = (drop, dbCheck, name) => {
-  var _a;
-  ((_a = drop.constraints) != null ? _a : drop.constraints = []).push({
-    name,
-    check: new pqb.RawSQL([[dbCheck.expression]])
-  });
+const dropCheck = ({ changeTableAst: { drop }, changingColumns }, dbCheck, name) => {
+  var _a, _b;
+  const constraints = (_a = drop.constraints) != null ? _a : drop.constraints = [];
+  const sql = new pqb.RawSQL([
+    [dbCheck.expression]
+  ]);
+  if (((_b = dbCheck.columns) == null ? void 0 : _b.length) === 1 && changingColumns[dbCheck.columns[0]]) {
+    const column = changingColumns[dbCheck.columns[0]];
+    column.from.data.name = "i_d";
+    column.from.data.check = {
+      name,
+      sql
+    };
+  } else {
+    constraints.push({
+      name,
+      check: sql
+    });
+  }
 };
 
 var __defProp$2 = Object.defineProperty;
@@ -1842,7 +2005,9 @@ const addChangeTable = (dbStructure, changeTables, tableShapes, currentSchema, d
       add: {},
       drop: {}
     },
-    pushedAst: false
+    pushedAst: false,
+    changingColumns: {},
+    delayedAst: []
   });
   tableShapes[`${schema}.${codeTable.table}`] = shape;
 };
@@ -1881,17 +2046,17 @@ const processTableChange = async (adapter, structureToAstCtx, dbStructure, domai
     typeCastsCache,
     verifying
   );
-  const delayedAst = [];
-  processPrimaryKey(config, delayedAst, changeTableData);
-  processIndexes(config, changeTableData, delayedAst, ast, compareExpressions);
+  processPrimaryKey(config, changeTableData);
+  processIndexes(config, changeTableData, ast, compareExpressions);
   processChecks(ast, changeTableData, compareExpressions);
   const { changeTableAst } = changeTableData;
   if (Object.keys(changeTableAst.shape).length || Object.keys(changeTableAst.add).length || Object.keys(changeTableAst.drop).length) {
     changeTableData.pushedAst = true;
     ast.push(changeTableAst);
   }
-  if (delayedAst.length)
-    ast.push(...delayedAst);
+  if (changeTableData.delayedAst.length) {
+    ast.push(...changeTableData.delayedAst);
+  }
 };
 
 const composeMigration = async (adapter, config, ast, dbStructure, {
@@ -2033,6 +2198,12 @@ const report = (ast, config, currentSchema) => {
       }
       case "changeTable": {
         const inner = [];
+        const toCodeCtx = {
+          t: "t",
+          table: a.name,
+          migration: true,
+          snakeCase: config.snakeCase
+        };
         for (const key in a.shape) {
           const changes = orchidCore.toArray(a.shape[key]);
           for (const change of changes) {
@@ -2051,20 +2222,12 @@ const report = (ast, config, currentSchema) => {
               const changes2 = [];
               inner.push(`${yellow("~ change column")} ${name}:`, changes2);
               changes2.push(`${yellow("from")}: `);
-              const fromCode = orchidCore.columnToCode(
-                key,
-                change.from.column,
-                config.snakeCase
-              );
+              const fromCode = change.from.column.toCode(toCodeCtx, key);
               for (const code2 of fromCode) {
                 orchidCore.addCode(changes2, code2);
               }
               changes2.push(`  ${yellow("to")}: `);
-              const toCode = orchidCore.columnToCode(
-                key,
-                change.to.column,
-                config.snakeCase
-              );
+              const toCode = change.to.column.toCode(toCodeCtx, key);
               for (const code2 of toCode) {
                 orchidCore.addCode(changes2, code2);
               }
@@ -2673,7 +2836,7 @@ const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExporte
   const hasTableData = Boolean(
     ast.primaryKey || ((_a = ast.indexes) == null ? void 0 : _a.length) || ((_b = ast.constraints) == null ? void 0 : _b.length)
   );
-  const shapeCode = pqb.columnsShapeToCode(ast.shape, "t");
+  const shapeCode = pqb.columnsShapeToCode({ t: "t", table: ast.name }, ast.shape);
   props.push(
     `columns = this.setColumns(${hasTableData ? "\n    " : ""}(t) => ({`,
     hasTableData ? [shapeCode] : shapeCode,
@@ -2764,9 +2927,15 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains) => {
       code += `
   domains: {
     ${domains.sort((a, b) => a.name > b.name ? 1 : -1).map(
-        (ast) => `${orchidCore.quoteObjectKey(
-          ast.schema ? `${ast.schema}.${ast.name}` : ast.name
-        )}: (t) => ${ast.baseType.toCode("t")},`
+        (ast) => {
+          var _a;
+          return `${orchidCore.quoteObjectKey(
+            ast.schema ? `${ast.schema}.${ast.name}` : ast.name
+          )}: (t) => ${ast.baseType.toCode(
+            { t: "t", table: ast.name },
+            (_a = ast.baseType.data.name) != null ? _a : ""
+          )},`;
+        }
       ).join("\n    ")}
   },`;
     }