rake-db 2.21.7 → 2.22.0

package/dist/index.d.ts

@@ -1688,7 +1688,7 @@ declare const getConstraintName: (table: string, constraint: {
     };
     check?: unknown;
     identity?: unknown;
-}) => string;
+}, snakeCase: boolean | undefined) => string;
 declare const constraintToSql: ({ name }: {
     schema?: string;
     name: string;
@@ -1702,7 +1702,7 @@ declare const getIndexName: (table: string, columns: ({
 declare const indexesToQuery: (up: boolean, { schema, name: tableName }: {
     schema?: string;
     name: string;
-}, indexes: TableData.Index[], language?: string) => SingleSql[];
+}, indexes: TableData.Index[], snakeCase: boolean | undefined, language?: string) => SingleSql[];
 declare const commentsToQuery: (schemaTable: {
     schema?: string;
     name: string;

package/dist/index.js

@@ -132,7 +132,10 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
     line.push(identityToSql(item.data.identity));
   } else if (item.data.generated) {
     line.push(
-      `GENERATED ALWAYS AS (${item.data.generated.toSQL({ values })}) STORED`
+      `GENERATED ALWAYS AS (${item.data.generated({
+        values,
+        snakeCase
+      })}) STORED`
     );
   }
   if (item.data.primaryKey && !hasMultiplePrimaryKeys) {
@@ -224,9 +227,13 @@ const getForeignKeyTable = (fnOrTable) => {
   const item = new (fnOrTable())();
   return [item.schema, item.table];
 };
-const getConstraintName = (table, constraint) => {
-  if (constraint.references)
-    return `${table}_${constraint.references.columns.join("_")}_fkey`;
+const getConstraintName = (table, constraint, snakeCase) => {
+  if (constraint.references) {
+    const { columns } = constraint.references;
+    return `${table}_${(snakeCase ? columns.map(orchidCore.toSnakeCase) : columns).join(
+      "_"
+    )}_fkey`;
+  }
   if (constraint.check)
     return `${table}_check`;
   if (constraint.identity)
@@ -234,7 +241,7 @@ const getConstraintName = (table, constraint) => {
   return `${table}_constraint`;
 };
 const constraintToSql = ({ name }, up, constraint, values, snakeCase) => {
-  const constraintName = constraint.name || getConstraintName(name, constraint);
+  const constraintName = constraint.name || getConstraintName(name, constraint, snakeCase);
   if (!up) {
     const { dropMode } = constraint;
     return `CONSTRAINT "${constraintName}"${dropMode ? ` ${dropMode}` : ""}`;
@@ -252,10 +259,9 @@ const checkToSql = (check, values) => {
   return `CHECK (${check.toSQL({ values })})`;
 };
 const foreignKeyToSql = (item, snakeCase) => {
-  return `FOREIGN KEY (${joinColumns(item.columns)}) ${referencesToSql(
-    item,
-    snakeCase
-  )}`;
+  return `FOREIGN KEY (${joinColumns(
+    snakeCase ? item.columns.map(orchidCore.toSnakeCase) : item.columns
+  )}) ${referencesToSql(item, snakeCase)}`;
 };
 const referencesToSql = (references, snakeCase) => {
   const [schema, table] = getForeignKeyTable(references.fnOrTable);
@@ -279,8 +285,16 @@ const referencesToSql = (references, snakeCase) => {
 const getIndexName = (table, columns) => {
   return `${table}_${columns.map((it) => "column" in it ? it.column : "expression").join("_")}_idx`;
 };
-const indexesToQuery = (up, { schema, name: tableName }, indexes, language) => {
+const indexesToQuery = (up, { schema, name: tableName }, indexes, snakeCase, language) => {
   return indexes.map(({ columns, options, name }) => {
+    let include = options.include ? orchidCore.toArray(options.include) : void 0;
+    if (snakeCase) {
+      columns = columns.map(
+        (c) => "column" in c ? __spreadProps$7(__spreadValues$9({}, c), { column: orchidCore.toSnakeCase(c.column) }) : c
+      );
+      if (include)
+        include = include.map(orchidCore.toSnakeCase);
+    }
     const indexName = name || getIndexName(tableName, columns);
     if (!up) {
       return {
@@ -335,7 +349,7 @@ const indexesToQuery = (up, { schema, name: tableName }, indexes, language) => {
     sql.push(`(${columnList})`);
     if (options.include) {
       sql.push(
-        `INCLUDE (${orchidCore.toArray(options.include).map((column) => `"${column}"`).join(", ")})`
+        `INCLUDE (${orchidCore.toArray(include).map((column) => `"${column}"`).join(", ")})`
       );
     }
     if (options.nullsNotDistinct) {
@@ -599,7 +613,7 @@ const astToQueries$1 = (ast, snakeCase, language) => {
 )`,
       values
     },
-    ...indexesToQuery(true, ast, indexes, language),
+    ...indexesToQuery(true, ast, indexes, snakeCase, language),
     ...commentsToQuery(ast, comments)
   );
   if (ast.comment) {
@@ -639,6 +653,8 @@ const resetChangeTableData = () => {
 };
 const addOrDropChanges = [];
 function add(item, options) {
+  orchidCore.consumeColumnName();
+  setName(this, item);
   if (item instanceof pqb.ColumnType) {
     const result = addOrDrop("add", item, options);
     if (result.type === "change")
@@ -664,6 +680,8 @@ function add(item, options) {
   return void 0;
 }
 const drop = function(item, options) {
+  orchidCore.consumeColumnName();
+  setName(this, item);
   if (item instanceof pqb.ColumnType) {
     const result = addOrDrop("drop", item, options);
     if (result.type === "change")
@@ -689,10 +707,6 @@ const drop = function(item, options) {
   return void 0;
 };
 const addOrDrop = (type, item, options) => {
-  const name = orchidCore.consumeColumnName();
-  if (name) {
-    item.data.name = name;
-  }
   if (item instanceof pqb.UnknownColumn) {
     const empty = columnTypeToColumnChange({
       type: "change",
@@ -718,24 +732,42 @@ const addOrDrop = (type, item, options) => {
     dropMode: options == null ? void 0 : options.dropMode
   };
 };
-const columnTypeToColumnChange = (item) => {
+const columnTypeToColumnChange = (item, name) => {
   if (item instanceof pqb.ColumnType) {
-    const foreignKeys = item.data.foreignKeys;
+    let column = item;
+    const foreignKeys = column.data.foreignKeys;
     if (foreignKeys == null ? void 0 : foreignKeys.some((it) => "fn" in it)) {
       throw new Error("Callback in foreignKey is not allowed in migration");
     }
+    if (name && !column.data.name) {
+      column = Object.create(column);
+      column.data = __spreadProps$5(__spreadValues$7({}, column.data), { name });
+    }
     return __spreadProps$5(__spreadValues$7({
-      column: item,
-      type: item.toSQL(),
-      nullable: item.data.isNullable
-    }, item.data), {
-      primaryKey: item.data.primaryKey === void 0 ? void 0 : true,
+      column,
+      type: column.toSQL(),
+      nullable: column.data.isNullable
+    }, column.data), {
+      primaryKey: column.data.primaryKey === void 0 ? void 0 : true,
       foreignKeys
     });
   }
   return item.to;
 };
 const nameKey = Symbol("name");
+const setName = (self, item) => {
+  var _a, _b, _c, _d, _e;
+  const name = self[nameKey];
+  if (!name)
+    return;
+  if ("column" in item && item.column instanceof pqb.ColumnType) {
+    (_b = (_a = item.column.data).name) != null ? _b : _a.name = name;
+  } else if (item instanceof pqb.ColumnType) {
+    (_d = (_c = item.data).name) != null ? _d : _c.name = name;
+  } else {
+    (_e = item.name) != null ? _e : item.name = name;
+  }
+};
 const tableChangeMethods = __spreadProps$5(__spreadValues$7(__spreadValues$7({}, tableMethods), pqb.tableDataMethods), {
   name(name) {
     orchidCore.setCurrentColumnName(name);
@@ -746,11 +778,17 @@ const tableChangeMethods = __spreadProps$5(__spreadValues$7(__spreadValues$7({},
   add,
   drop,
   change(from, to, using) {
+    orchidCore.consumeColumnName();
+    const f = columnTypeToColumnChange(from);
+    const t = columnTypeToColumnChange(to);
+    setName(this, f);
+    setName(this, t);
     return {
       type: "change",
-      name: orchidCore.consumeColumnName(),
-      from: columnTypeToColumnChange(from),
-      to: columnTypeToColumnChange(to),
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      name: this[nameKey],
+      from: f,
+      to: t,
       using
     };
   },
@@ -853,6 +891,7 @@ const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
   }, up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add });
 };
 const astToQueries = (ast, snakeCase, language) => {
+  var _a, _b, _c, _d;
   const queries = [];
   if (ast.comment !== void 0) {
     queries.push({
@@ -891,25 +930,25 @@ const astToQueries = (ast, snakeCase, language) => {
   }
   if (ast.add.primaryKey) {
     addPrimaryKeys.name = ast.add.primaryKey.name;
-    addPrimaryKeys.columns.push(...ast.add.primaryKey.columns);
+    const { columns } = ast.add.primaryKey;
+    addPrimaryKeys.columns.push(
+      ...snakeCase ? columns.map(orchidCore.toSnakeCase) : columns
+    );
   }
   if (ast.drop.primaryKey) {
     dropPrimaryKeys.name = ast.drop.primaryKey.name;
-    dropPrimaryKeys.columns.push(...ast.drop.primaryKey.columns);
+    const { columns } = ast.drop.primaryKey;
+    dropPrimaryKeys.columns.push(
+      ...snakeCase ? columns.map(orchidCore.toSnakeCase) : columns
+    );
   }
   const alterTable = [];
   const renameItems = [];
   const values = [];
-  const addIndexes = mapIndexesForSnakeCase(ast.add.indexes, snakeCase);
-  const dropIndexes = mapIndexesForSnakeCase(ast.drop.indexes, snakeCase);
-  const addConstraints = mapConstraintsToSnakeCase(
-    ast.add.constraints,
-    snakeCase
-  );
-  const dropConstraints = mapConstraintsToSnakeCase(
-    ast.drop.constraints,
-    snakeCase
-  );
+  const addIndexes = (_a = ast.add.indexes) != null ? _a : [];
+  const dropIndexes = (_b = ast.drop.indexes) != null ? _b : [];
+  const addConstraints = (_c = ast.add.constraints) != null ? _c : [];
+  const dropConstraints = (_d = ast.drop.constraints) != null ? _d : [];
   const comments = [];
   for (const key in ast.shape) {
     const item = ast.shape[key];
@@ -985,8 +1024,8 @@ const astToQueries = (ast, snakeCase, language) => {
   if (alterTable.length) {
     queries.push(alterTableSql(tableName, alterTable, values));
   }
-  queries.push(...indexesToQuery(false, ast, dropIndexes, language));
-  queries.push(...indexesToQuery(true, ast, addIndexes, language));
+  queries.push(...indexesToQuery(false, ast, dropIndexes, snakeCase, language));
+  queries.push(...indexesToQuery(true, ast, addIndexes, snakeCase, language));
   queries.push(...commentsToQuery(ast, comments));
   return queries;
 };
@@ -1057,7 +1096,7 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
     const name = getChangeColumnName("to", item, key, snakeCase);
     const fromName = getChangeColumnName("from", item, key, snakeCase);
     if (fromName !== name) {
-      renameItems.push(renameColumnSql(fromName, name, snakeCase));
+      renameItems.push(renameColumnSql(fromName, name));
     }
     let changeType = false;
     if (to.type && (from.type !== to.type || from.collate !== to.collate)) {
@@ -1173,7 +1212,9 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
       comments.push({ column: name, comment: to.comment || null });
     }
   } else if (item.type === "rename") {
-    renameItems.push(renameColumnSql(key, item.name, snakeCase));
+    renameItems.push(
+      snakeCase ? renameColumnSql(orchidCore.toSnakeCase(key), orchidCore.toSnakeCase(item.name)) : renameColumnSql(key, item.name)
+    );
   }
 };
 const getChangeColumnName = (what, change, key, snakeCase) => {
@@ -1182,22 +1223,8 @@ const getChangeColumnName = (what, change, key, snakeCase) => {
     getColumnName(change[what].column, key, snakeCase)
   ) : snakeCase ? orchidCore.toSnakeCase(key) : key);
 };
-const renameColumnSql = (from, to, snakeCase) => {
-  return `RENAME COLUMN "${snakeCase ? orchidCore.toSnakeCase(from) : from}" TO "${snakeCase ? orchidCore.toSnakeCase(to) : to}"`;
-};
-const mapIndexesForSnakeCase = (indexes, snakeCase) => {
-  return (indexes == null ? void 0 : indexes.map((index) => __spreadProps$5(__spreadValues$7({}, index), {
-    columns: snakeCase ? index.columns.map(
-      (item) => "column" in item ? __spreadProps$5(__spreadValues$7({}, item), { column: orchidCore.toSnakeCase(item.column) }) : item
-    ) : index.columns
-  }))) || [];
-};
-const mapConstraintsToSnakeCase = (foreignKeys, snakeCase) => {
-  return (foreignKeys == null ? void 0 : foreignKeys.map((item) => __spreadProps$5(__spreadValues$7({}, item), {
-    references: item.references ? snakeCase ? __spreadProps$5(__spreadValues$7({}, item.references), {
-      columns: item.references.columns.map(orchidCore.toSnakeCase)
-    }) : item.references : void 0
-  }))) || [];
+const renameColumnSql = (from, to) => {
+  return `RENAME COLUMN "${from}" TO "${to}"`;
 };
 
 const createView = async (migration, up, name, options, sql) => {
@@ -2110,7 +2137,10 @@ class Migration {
   async columnExists(tableName, columnName) {
     return queryExists(this, {
       text: `SELECT 1 FROM "information_schema"."columns" WHERE "table_name" = $1 AND "column_name" = $2`,
-      values: [tableName, columnName]
+      values: [
+        tableName,
+        this.options.snakeCase ? orchidCore.toSnakeCase(columnName) : columnName
+      ]
     });
   }
   /**
@@ -4277,17 +4307,20 @@ const tableToAst = (ctx, data, table, action, domains) => {
     name: tableName,
     shape: makeDbStructureColumnsShape(ctx, data, domains, table, tableData),
     noPrimaryKey: tableData.primaryKey ? "error" : "ignore",
-    primaryKey: primaryKey && primaryKey.columns.length > 1 ? primaryKey : void 0,
+    primaryKey: primaryKey && primaryKey.columns.length > 1 ? __spreadProps$1(__spreadValues$2({}, primaryKey), { columns: primaryKey.columns.map(orchidCore.toCamelCase) }) : void 0,
     indexes: indexes.reduce((acc, index) => {
+      var _b;
       if (index.columns.length > 1 || index.columns.some((it) => "expression" in it)) {
         const _a = makeIndexOptions(tableName, index), { name } = _a, options = __objRest(_a, ["name"]);
         acc.push({
-          columns: index.columns.map((it) => __spreadProps$1(__spreadValues$2({}, "column" in it ? { column: it.column } : { expression: it.expression }), {
+          columns: index.columns.map((it) => __spreadProps$1(__spreadValues$2({}, "column" in it ? { column: orchidCore.toCamelCase(it.column) } : { expression: it.expression }), {
             collate: it.collate,
             opclass: it.opclass,
             order: it.order
           })),
-          options,
+          options: __spreadProps$1(__spreadValues$2({}, options), {
+            include: (_b = index.include) == null ? void 0 : _b.map(orchidCore.toCamelCase)
+          }),
           name
         });
       }
@@ -4343,7 +4376,7 @@ const constraintToAst = (ctx, item) => {
   if (check) {
     result.check = pqb.raw({ raw: check.expression });
   }
-  if (item.name && item.name !== getConstraintName(item.tableName, result)) {
+  if (item.name && item.name !== getConstraintName(item.tableName, result, ctx.snakeCase)) {
     result.name = item.name;
     if ((_a = result.references) == null ? void 0 : _a.options) {
       result.references.options.name = item.name;
@@ -4409,6 +4442,7 @@ const getDbTableColumnsChecks = (tableData) => tableData.constraints.reduce((acc
 const dbColumnToAst = (ctx, data, domains, tableName, item, table, tableData, checks) => {
   var _a, _b, _c, _d, _f, _g, _h, _i, _j;
   let column = instantiateDbColumn(ctx, data, domains, item);
+  column.data.name = item.name;
   if (item.identity) {
     column.data.identity = item.identity;
     if (!item.identity.always)
@@ -4479,7 +4513,7 @@ const dbConstraintToTableConstraint = (ctx, table, item) => {
     } : void 0,
     check: check ? pqb.raw({ raw: check.expression }) : void 0
   };
-  const name = item.name && item.name !== getConstraintName(table.name, constraint) ? item.name : void 0;
+  const name = item.name && item.name !== getConstraintName(table.name, constraint, ctx.snakeCase) ? item.name : void 0;
   if (name) {
     constraint.name = name;
     if ((_a = constraint.references) == null ? void 0 : _a.options) {
@@ -4518,10 +4552,10 @@ const checkIfIsOuterRecursiveFkey = (data, table, references) => {
   return false;
 };
 
-const astToGenerateItems = (asts, currentSchema) => {
-  return asts.map((ast) => astToGenerateItem(ast, currentSchema));
+const astToGenerateItems = (config, asts, currentSchema) => {
+  return asts.map((ast) => astToGenerateItem(config, ast, currentSchema));
 };
-const astToGenerateItem = (ast, currentSchema) => {
+const astToGenerateItem = (config, ast, currentSchema) => {
   var _a, _b, _c, _d, _e;
   const add = [];
   const drop = [];
@@ -4550,6 +4584,7 @@ const astToGenerateItem = (ast, currentSchema) => {
           ([name, column]) => [keys, name, { column }]
         );
         analyzeTableColumns(
+          config,
           currentSchema,
           schema,
           table,
@@ -4558,7 +4593,15 @@ const astToGenerateItem = (ast, currentSchema) => {
           columns
         );
         if (ast.type === "table") {
-          analyzeTableData(currentSchema, schema, table, keys, deps, ast);
+          analyzeTableData(
+            config,
+            currentSchema,
+            schema,
+            table,
+            keys,
+            deps,
+            ast
+          );
         } else {
           deps.push(
             ...ast.deps.map(({ schemaName, name }) => `${schemaName}.${name}`)
@@ -4581,6 +4624,7 @@ const astToGenerateItem = (ast, currentSchema) => {
           }
         }
         analyzeTableColumns(
+          config,
           currentSchema,
           schema,
           table,
@@ -4588,8 +4632,24 @@ const astToGenerateItem = (ast, currentSchema) => {
           resolveType,
           columns
         );
-        analyzeTableData(currentSchema, schema, table, add, deps, ast.add);
-        analyzeTableData(currentSchema, schema, table, drop, deps, ast.drop);
+        analyzeTableData(
+          config,
+          currentSchema,
+          schema,
+          table,
+          add,
+          deps,
+          ast.add
+        );
+        analyzeTableData(
+          config,
+          currentSchema,
+          schema,
+          table,
+          drop,
+          deps,
+          ast.drop
+        );
       }
       break;
     }
@@ -4635,7 +4695,7 @@ const astToGenerateItem = (ast, currentSchema) => {
     }
     case "constraint": {
       const { tableSchema = currentSchema, tableName } = ast;
-      const name = `${tableSchema}.${(_e = ast.name) != null ? _e : getConstraintName(tableName, ast)}`;
+      const name = `${tableSchema}.${(_e = ast.name) != null ? _e : getConstraintName(tableName, ast, config.snakeCase)}`;
       (ast.action === "create" ? add : drop).push(name);
       deps.push(tableSchema, `${tableSchema}.${tableName}`);
       break;
@@ -4657,7 +4717,7 @@ const astToGenerateItem = (ast, currentSchema) => {
     deps: new Set(deps)
   };
 };
-const analyzeTableColumns = (currentSchema, schema, table, deps, resolveType, columns) => {
+const analyzeTableColumns = (config, currentSchema, schema, table, deps, resolveType, columns) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   for (const [keys, name, change] of columns) {
     const { column } = change;
@@ -4697,9 +4757,13 @@ const analyzeTableColumns = (currentSchema, schema, table, deps, resolveType, co
     if (foreignKeys) {
       for (const fkey of foreignKeys) {
         keys.push(
-          ((_h = fkey.options) == null ? void 0 : _h.name) ? `${schema}.${fkey.options.name}` : getConstraintName(table, {
-            references: { columns: [(_j = (_i = change.column) == null ? void 0 : _i.data.name) != null ? _j : name] }
-          })
+          ((_h = fkey.options) == null ? void 0 : _h.name) ? `${schema}.${fkey.options.name}` : getConstraintName(
+            table,
+            {
+              references: { columns: [(_j = (_i = change.column) == null ? void 0 : _i.data.name) != null ? _j : name] }
+            },
+            config.snakeCase
+          )
         );
         const [s = currentSchema, t] = getForeignKeyTable(fkey.fnOrTable);
         deps.push(`${s}.${t}`);
@@ -4707,7 +4771,7 @@ const analyzeTableColumns = (currentSchema, schema, table, deps, resolveType, co
     }
   }
 };
-const analyzeTableData = (currentSchema, schema, table, keys, deps, data) => {
+const analyzeTableData = (config, currentSchema, schema, table, keys, deps, data) => {
   if (data.primaryKey) {
     const name = data.primaryKey.name;
     keys.push(name ? `${schema}.${name}` : `${table}_pkey`);
@@ -4722,7 +4786,7 @@ const analyzeTableData = (currentSchema, schema, table, keys, deps, data) => {
   if (data.constraints) {
     for (const constraint of data.constraints) {
       keys.push(
-        constraint.name ? `${schema}.${constraint.name}` : getConstraintName(table, constraint)
+        constraint.name ? `${schema}.${constraint.name}` : getConstraintName(table, constraint, config.snakeCase)
       );
       if (constraint.references) {
         const [s = currentSchema, t] = getForeignKeyTable(
@@ -4736,7 +4800,7 @@ const analyzeTableData = (currentSchema, schema, table, keys, deps, data) => {
 
 const astToMigration = (currentSchema, config, asts) => {
   var _a, _b, _c;
-  const items = astToGenerateItems(asts, currentSchema);
+  const items = astToGenerateItems(config, asts, currentSchema);
   const toBeAdded = /* @__PURE__ */ new Set();
   const toBeDropped = /* @__PURE__ */ new Set();
   const remainingDeps = /* @__PURE__ */ new Map();
@@ -4886,7 +4950,6 @@ const astEncoders = {
       );
     }
     const timestamps = getHasTimestamps(
-      config,
       ast.shape.createdAt,
       ast.shape.updatedAt
     );
@@ -4894,14 +4957,15 @@ const astEncoders = {
       if (timestamps.hasAnyTimestamps && (key === "createdAt" || key === "updatedAt"))
         continue;
       const line = [`${orchidCore.quoteObjectKey(key)}: `];
-      for (const part of ast.shape[key].toCode("t", true)) {
+      const columnCode = orchidCore.columnToCode(key, ast.shape[key], config.snakeCase);
+      for (const part of columnCode) {
         orchidCore.addCode(line, part);
       }
       orchidCore.addCode(line, ",");
       code.push(line);
     }
     if (timestamps.hasAnyTimestamps) {
-      code.push([`...${timestampsToCode(config, timestamps)},`]);
+      code.push([`...${timestampsToCode(timestamps)},`]);
     }
     if (isShifted) {
       orchidCore.addCode(code, "}),");
@@ -4914,6 +4978,7 @@ const astEncoders = {
     return result;
   },
   changeTable(ast, config, currentSchema) {
+    var _a;
     let code = [];
     const result = code;
     const schemaTable = quoteSchemaTable({
@@ -4935,10 +5000,9 @@ const astEncoders = {
     }
     const [addTimestamps, dropTimestamps] = ["add", "drop"].map(
       (type) => {
-        var _a, _b;
+        var _a2, _b;
         return getHasTimestamps(
-          config,
-          ast.shape.createdAt && "type" in ast.shape.createdAt && ((_a = ast.shape.createdAt) == null ? void 0 : _a.type) === type ? ast.shape.createdAt.item : void 0,
+          ast.shape.createdAt && "type" in ast.shape.createdAt && ((_a2 = ast.shape.createdAt) == null ? void 0 : _a2.type) === type ? ast.shape.createdAt.item : void 0,
           ast.shape.updatedAt && "type" in ast.shape.updatedAt && ((_b = ast.shape.updatedAt) == null ? void 0 : _b.type) === type ? ast.shape.updatedAt.item : void 0
         );
       }
@@ -4951,9 +5015,11 @@ const astEncoders = {
             continue;
           const recreate = changes.length > 1;
           const line = [
-            recreate ? `...t.${change.type}(t.name(${orchidCore.singleQuote(key)})` : `${orchidCore.quoteObjectKey(key)}: t.${change.type}(`
+            recreate ? `...t.${change.type}(t.name(${orchidCore.singleQuote(
+              (_a = change.item.data.name) != null ? _a : key
+            )})` : `${orchidCore.quoteObjectKey(key)}: t.${change.type}(`
           ];
-          const columnCode = change.item.toCode("t", true);
+          const columnCode = orchidCore.columnToCode(key, change.item, config.snakeCase);
           for (let i = 0; i < columnCode.length; i++) {
             let part = columnCode[i];
             if (recreate && !i)
@@ -4968,11 +5034,17 @@ const astEncoders = {
           const line = [
             `${orchidCore.quoteObjectKey(key)}: t${change.name ? `.name(${orchidCore.singleQuote(change.name)})` : ""}.change(`
           ];
-          for (const part of change.from.column.toCode("t", true)) {
+          const fromCode = orchidCore.columnToCode(
+            key,
+            change.from.column,
+            config.snakeCase
+          );
+          for (const part of fromCode) {
             orchidCore.addCode(line, part);
           }
           orchidCore.addCode(line, ", ");
-          for (const part of change.to.column.toCode("t", true)) {
+          const toCode = orchidCore.columnToCode(key, change.to.column, config.snakeCase);
+          for (const part of toCode) {
             orchidCore.addCode(line, part);
           }
           if (change.using) {
@@ -5001,9 +5073,7 @@ const astEncoders = {
     for (const key of ["drop", "add"]) {
       const timestamps = key === "add" ? addTimestamps : dropTimestamps;
       if (timestamps.hasAnyTimestamps) {
-        orchidCore.addCode(code, [
-          `...t.${key}(${timestampsToCode(config, timestamps)}),`
-        ]);
+        orchidCore.addCode(code, [`...t.${key}(${timestampsToCode(timestamps)}),`]);
       }
       const { primaryKey, indexes, constraints } = ast[key];
       if (primaryKey) {
@@ -5193,41 +5263,24 @@ const isTimestamp = (column, type) => {
     column instanceof type && !column.data.isNullable && def && typeof def === "object" && orchidCore.isRawSQL(def) && (typeof def._sql === "object" ? def._sql[0][0] : def._sql) === "now()"
   );
 };
-const getHasTimestamps = (config, createdAt, updatedAt) => {
-  const timestamps = getTimestampsInfo(
-    config,
-    createdAt,
-    updatedAt,
-    pqb.TimestampTZColumn
-  );
+const getHasTimestamps = (createdAt, updatedAt) => {
+  const timestamps = getTimestampsInfo(createdAt, updatedAt, pqb.TimestampTZColumn);
   const timestampsNoTZ = getTimestampsInfo(
-    config,
     createdAt,
     updatedAt,
     pqb.TimestampColumn
   );
   return {
-    hasTZTimestamps: timestamps.hasTimestamps,
-    hasAnyTimestamps: timestamps.hasTimestamps || timestampsNoTZ.hasTimestamps,
-    hasAnyCamelCaseTimestamps: timestamps.camelCaseTimestamps || timestampsNoTZ.camelCaseTimestamps
+    hasTZTimestamps: timestamps,
+    hasAnyTimestamps: timestamps || timestampsNoTZ
   };
 };
-const getTimestampsInfo = (config, createdAt, updatedAt, type) => {
-  let hasTimestamps = isTimestamp(createdAt, type) && isTimestamp(updatedAt, type);
-  const camelCaseTimestamps = !config.snakeCase && hasTimestamps && !(createdAt == null ? void 0 : createdAt.data.name) && !(updatedAt == null ? void 0 : updatedAt.data.name);
-  const snakeCaseTimestamps = hasTimestamps && !camelCaseTimestamps && (!config.snakeCase && (createdAt == null ? void 0 : createdAt.data.name) === "created_at" && (updatedAt == null ? void 0 : updatedAt.data.name) === "updated_at" || config.snakeCase && !(createdAt == null ? void 0 : createdAt.data.name) && !(updatedAt == null ? void 0 : updatedAt.data.name));
-  if (!camelCaseTimestamps && !snakeCaseTimestamps) {
-    hasTimestamps = false;
-  }
-  return {
-    hasTimestamps,
-    camelCaseTimestamps,
-    snakeCaseTimestamps
-  };
+const getTimestampsInfo = (createdAt, updatedAt, type) => {
+  return isTimestamp(createdAt, type) && isTimestamp(updatedAt, type) && (!(createdAt == null ? void 0 : createdAt.data.name) || (createdAt == null ? void 0 : createdAt.data.name) === "created_at") && (!(updatedAt == null ? void 0 : updatedAt.data.name) || (updatedAt == null ? void 0 : updatedAt.data.name) === "updated_at");
 };
-const timestampsToCode = (config, { hasTZTimestamps, hasAnyCamelCaseTimestamps }) => {
+const timestampsToCode = ({ hasTZTimestamps }) => {
   const key = hasTZTimestamps ? "timestamps" : "timestampsNoTZ";
-  return `t.${hasAnyCamelCaseTimestamps || config.snakeCase ? key : `${key}SnakeCase`}()`;
+  return `t.${key}()`;
 };
 
 const pullDbStructure = async (options, config) => {