rake-db 2.4.16 → 2.4.17

package/dist/index.d.ts

@@ -35,6 +35,7 @@ declare type TableOptions = {
     dropMode?: DropMode;
     comment?: string;
     noPrimaryKey?: boolean;
+    snakeCase?: boolean;
 };
 declare type TextColumnCreator = () => TextColumn;
 declare type MigrationColumnTypes = Omit<ColumnTypes, 'text' | 'string' | 'enum'> & {
@@ -47,6 +48,7 @@ declare type ColumnsShapeCallback = (t: MigrationColumnTypes & {
     raw: typeof raw;
 }) => ColumnsShape;
 declare type ChangeTableOptions = {
+    snakeCase?: boolean;
     comment?: string | [string, string] | null;
 };
 declare type ChangeTableCallback = (t: TableChanger) => TableChangeData;

package/dist/index.js

@@ -305,8 +305,11 @@ var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const columnTypeToSql = (item) => {
   return item.data.isOfCustomType ? `"${item.toSQL()}"` : item.toSQL();
 };
-const columnToSql = (key, item, values, hasMultiplePrimaryKeys) => {
-  const line = [`"${item.data.name || key}" ${columnTypeToSql(item)}`];
+const getColumnName = (item, key, snakeCase) => {
+  return item.data.name || (snakeCase ? orchidCore.toSnakeCase(key) : key);
+};
+const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
+  const line = [`"${name}" ${columnTypeToSql(item)}`];
   if (item.data.compression) {
     line.push(`COMPRESSION ${item.data.compression}`);
   }
@@ -337,24 +340,32 @@ const columnToSql = (key, item, values, hasMultiplePrimaryKeys) => {
       if (foreignKey.name) {
         line.push(`CONSTRAINT "${foreignKey.name}"`);
       }
-      line.push(referencesToSql(schema, table, foreignKey.columns, foreignKey));
+      line.push(
+        referencesToSql(
+          schema,
+          table,
+          foreignKey.columns,
+          foreignKey,
+          snakeCase
+        )
+      );
     }
   }
   return line.join(" ");
 };
-const addColumnIndex = (indexes, key, item) => {
+const addColumnIndex = (indexes, name, item) => {
   if (item.data.indexes) {
     indexes.push(
       ...item.data.indexes.map((index) => ({
-        columns: [__spreadProps$4(__spreadValues$5({}, index), { column: key })],
+        columns: [__spreadProps$4(__spreadValues$5({}, index), { column: name })],
         options: index
       }))
     );
   }
 };
-const addColumnComment = (comments, key, item) => {
+const addColumnComment = (comments, name, item) => {
   if (item.data.comment) {
-    comments.push({ column: key, comment: item.data.comment });
+    comments.push({ column: name, comment: item.data.comment });
   }
 };
 const getForeignKeyTable = (fnOrTable) => {
@@ -367,7 +378,7 @@ const getForeignKeyTable = (fnOrTable) => {
 const getForeignKeyName = (table, columns) => {
   return `${table}_${columns.join("_")}_fkey`;
 };
-const constraintToSql = ({ name }, up, foreignKey) => {
+const constraintToSql = ({ name }, up, foreignKey, snakeCase) => {
   const constraintName = foreignKey.options.name || getForeignKeyName(name, foreignKey.columns);
   if (!up) {
     const { dropMode } = foreignKey.options;
@@ -380,13 +391,14 @@ const constraintToSql = ({ name }, up, foreignKey) => {
     schema,
     table,
     foreignKey.foreignColumns,
-    foreignKey.options
+    foreignKey.options,
+    snakeCase
   )}`;
 };
-const referencesToSql = (schema, table, columns, foreignKey) => {
+const referencesToSql = (schema, table, columns, foreignKey, snakeCase) => {
   const sql = [
     `REFERENCES ${quoteWithSchema({ schema, name: table })}(${joinColumns(
-      columns
+      snakeCase ? columns.map(orchidCore.toSnakeCase) : columns
     )})`
   ];
   if (foreignKey.match) {
@@ -525,7 +537,8 @@ var __objRest$1 = (source, exclude) => {
 };
 const types = Object.assign(Object.create(pqb.columnTypes), tableMethods);
 const createTable$1 = async (migration, up, tableName, options, fn) => {
-  types[orchidCore.snakeCaseKey] = migration.options.snakeCase;
+  const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
+  types[orchidCore.snakeCaseKey] = snakeCase;
   const shape = pqb.getColumnTypes(types, fn);
   const tableData = pqb.getTableData();
   const ast = makeAst$1(
@@ -537,7 +550,7 @@ const createTable$1 = async (migration, up, tableName, options, fn) => {
     migration.options.noPrimaryKey
   );
   validatePrimaryKey(ast);
-  const queries = astToQueries$1(ast);
+  const queries = astToQueries$1(ast, snakeCase);
   for (const _a of queries) {
     const _b = _a, { then } = _b, query = __objRest$1(_b, ["then"]);
     const result = await migration.adapter.arrays(query);
@@ -548,11 +561,12 @@ const createTable$1 = async (migration, up, tableName, options, fn) => {
 const makeAst$1 = (up, tableName, shape, tableData, options, noPrimaryKey) => {
   const shapePKeys = [];
   for (const key in shape) {
-    if (shape[key].data.isPrimaryKey) {
+    const column = shape[key];
+    if (column.data.isPrimaryKey) {
       shapePKeys.push(key);
     }
   }
-  const primaryKey = tableData.primaryKey;
+  const { primaryKey } = tableData;
   const [schema, table] = getSchemaAndTableFromName(tableName);
   return __spreadProps$3(__spreadValues$4(__spreadProps$3(__spreadValues$4({
     type: "table",
@@ -591,10 +605,11 @@ You can suppress this error by setting { noPrimaryKey: true } after a table name
     }
   }
 };
-const astToQueries$1 = (ast) => {
+const astToQueries$1 = (ast, snakeCase) => {
   const queries = [];
-  for (const key in ast.shape) {
-    const item = ast.shape[key];
+  const { shape } = ast;
+  for (const key in shape) {
+    const item = shape[key];
     if (!(item instanceof pqb.EnumColumn))
       continue;
     queries.push(makePopulateEnumQuery(item));
@@ -609,22 +624,49 @@ const astToQueries$1 = (ast) => {
   const values = [];
   const indexes = [];
   const comments = [];
-  for (const key in ast.shape) {
-    const item = ast.shape[key];
-    addColumnIndex(indexes, key, item);
-    addColumnComment(comments, key, item);
-    lines.push(`
-  ${columnToSql(key, item, values, !!ast.primaryKey)}`);
+  for (const key in shape) {
+    const item = shape[key];
+    const name = getColumnName(item, key, snakeCase);
+    addColumnIndex(indexes, name, item);
+    addColumnComment(comments, name, item);
+    lines.push(
+      `
+  ${columnToSql(name, item, values, !!ast.primaryKey, snakeCase)}`
+    );
   }
   if (ast.primaryKey) {
-    lines.push(`
-  ${primaryKeyToSql(ast.primaryKey)}`);
+    lines.push(
+      `
+  ${primaryKeyToSql({
+        options: ast.primaryKey.options,
+        columns: ast.primaryKey.columns.map(
+          (key) => getColumnName(shape[key], key, snakeCase)
+        )
+      })}`
+    );
   }
   ast.foreignKeys.forEach((foreignKey) => {
-    lines.push(`
-  ${constraintToSql(ast, true, foreignKey)}`);
+    lines.push(
+      `
+  ${constraintToSql(
+        ast,
+        true,
+        __spreadProps$3(__spreadValues$4({}, foreignKey), {
+          columns: foreignKey.columns.map(
+            (column) => getColumnName(shape[column], column, snakeCase)
+          )
+        }),
+        snakeCase
+      )}`
+    );
   });
-  indexes.push(...ast.indexes);
+  indexes.push(
+    ...ast.indexes.map((index) => __spreadProps$3(__spreadValues$4({}, index), {
+      columns: index.columns.map((item) => __spreadValues$4(__spreadValues$4({}, item), "column" in item ? {
+        column: getColumnName(shape[item.column], item.column, snakeCase)
+      } : {}))
+    }))
+  );
   queries.push(
     {
       text: `CREATE TABLE ${quoteWithSchema(ast)} (${lines.join(",")}
@@ -808,10 +850,11 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   resetChangeTableData();
   const tableChanger = Object.create(pqb.columnTypes);
   Object.assign(tableChanger, tableChangeMethods);
-  tableChanger[orchidCore.snakeCaseKey] = migration.options.snakeCase;
+  const snakeCase = "snakeCase" in options ? options.snakeCase : migration.options.snakeCase;
+  tableChanger[orchidCore.snakeCaseKey] = snakeCase;
   const changeData = (fn == null ? void 0 : fn(tableChanger)) || {};
   const ast = makeAst(up, tableName, changeData, changeTableData, options);
-  const queries = astToQueries(ast);
+  const queries = astToQueries(ast, snakeCase);
   for (const query of queries) {
     const result = await migration.adapter.arrays(query);
     (_a = query.then) == null ? void 0 : _a.call(query, result);
@@ -844,7 +887,7 @@ const makeAst = (up, name, changeData, changeTableData2, options) => {
     shape
   }, up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add });
 };
-const astToQueries = (ast) => {
+const astToQueries = (ast, snakeCase) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const queries = [];
   if (ast.comment !== void 0) {
@@ -852,10 +895,10 @@ const astToQueries = (ast) => {
       text: `COMMENT ON TABLE ${quoteWithSchema(ast)} IS ${pqb.quote(ast.comment)}`
     });
   }
-  const addPrimaryKeys = ast.add.primaryKey ? __spreadValues$3({}, ast.add.primaryKey) : {
+  const addPrimaryKeys = {
     columns: []
   };
-  const dropPrimaryKeys = ast.drop.primaryKey ? __spreadValues$3({}, ast.drop.primaryKey) : {
+  const dropPrimaryKeys = {
     columns: []
   };
   for (const key in ast.shape) {
@@ -868,11 +911,11 @@ const astToQueries = (ast) => {
     }
     if (item.type === "add") {
       if (item.item.data.isPrimaryKey) {
-        addPrimaryKeys.columns.push(key);
+        addPrimaryKeys.columns.push(getColumnName(item.item, key, snakeCase));
       }
     } else if (item.type === "drop") {
       if (item.item.data.isPrimaryKey) {
-        dropPrimaryKeys.columns.push(key);
+        dropPrimaryKeys.columns.push(getColumnName(item.item, key, snakeCase));
       }
     } else if (item.type === "change") {
       if (item.from.column instanceof pqb.EnumColumn) {
@@ -882,73 +925,104 @@ const astToQueries = (ast) => {
         queries.push(makePopulateEnumQuery(item.to.column));
       }
       if (item.from.primaryKey) {
-        dropPrimaryKeys.columns.push(key);
+        dropPrimaryKeys.columns.push(
+          item.from.column ? getColumnName(item.from.column, key, snakeCase) : snakeCase ? orchidCore.toSnakeCase(key) : key
+        );
         dropPrimaryKeys.change = true;
       }
       if (item.to.primaryKey) {
-        addPrimaryKeys.columns.push(key);
+        addPrimaryKeys.columns.push(
+          item.to.column ? getColumnName(item.to.column, key, snakeCase) : snakeCase ? orchidCore.toSnakeCase(key) : key
+        );
         addPrimaryKeys.change = true;
       }
     }
   }
+  if (ast.add.primaryKey) {
+    addPrimaryKeys.options = ast.add.primaryKey.options;
+    addPrimaryKeys.columns.push(...ast.add.primaryKey.columns);
+  }
+  if (ast.drop.primaryKey) {
+    dropPrimaryKeys.options = ast.drop.primaryKey.options;
+    dropPrimaryKeys.columns.push(...ast.drop.primaryKey.columns);
+  }
   const alterTable = [];
   const values = [];
-  const addIndexes = [...ast.add.indexes];
-  const dropIndexes = [...ast.drop.indexes];
-  const addForeignKeys = [...ast.add.foreignKeys];
-  const dropForeignKeys = [...ast.drop.foreignKeys];
+  const addIndexes = mapIndexesForSnakeCase(
+    ast.add.indexes,
+    snakeCase
+  );
+  const dropIndexes = mapIndexesForSnakeCase(
+    ast.drop.indexes,
+    snakeCase
+  );
+  const addForeignKeys = mapForeignKeysForSnakeCase(
+    ast.add.foreignKeys,
+    snakeCase
+  );
+  const dropForeignKeys = mapForeignKeysForSnakeCase(
+    ast.drop.foreignKeys,
+    snakeCase
+  );
   const comments = [];
   for (const key in ast.shape) {
     const item = ast.shape[key];
     if (item.type === "add") {
       const column = item.item;
-      addColumnIndex(addIndexes, key, column);
-      addColumnComment(comments, key, column);
+      const name = getColumnName(column, key, snakeCase);
+      addColumnIndex(addIndexes, name, column);
+      addColumnComment(comments, name, column);
       alterTable.push(
         `ADD COLUMN ${columnToSql(
-          key,
+          name,
           column,
           values,
-          addPrimaryKeys.columns.length > 1
+          addPrimaryKeys.columns.length > 1,
+          snakeCase
         )}`
       );
     } else if (item.type === "drop") {
-      addColumnIndex(dropIndexes, key, item.item);
+      const name = getColumnName(item.item, key, snakeCase);
+      addColumnIndex(dropIndexes, name, item.item);
       alterTable.push(
-        `DROP COLUMN "${item.item.data.name || key}"${item.dropMode ? ` ${item.dropMode}` : ""}`
+        `DROP COLUMN "${name}"${item.dropMode ? ` ${item.dropMode}` : ""}`
       );
     } else if (item.type === "change") {
       const { from, to } = item;
+      const name = getChangeColumnName(item, key, snakeCase);
       if (to.type && (from.type !== to.type || from.collate !== to.collate)) {
         const type = !to.column || to.column.data.isOfCustomType ? `"${to.type}"` : to.type;
         alterTable.push(
-          `ALTER COLUMN "${item.name || key}" TYPE ${type}${to.collate ? ` COLLATE ${pqb.quote(to.collate)}` : ""}${item.using ? ` USING ${pqb.getRaw(item.using, values)}` : ""}`
+          `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${pqb.quote(to.collate)}` : ""}${item.using ? ` USING ${pqb.getRaw(item.using, values)}` : ""}`
         );
       }
       if (from.default !== to.default) {
         const value = typeof to.default === "object" && to.default && orchidCore.isRaw(to.default) ? pqb.getRaw(to.default, values) : pqb.quote(to.default);
         const expr = value === void 0 ? "DROP DEFAULT" : `SET DEFAULT ${value}`;
-        alterTable.push(`ALTER COLUMN "${item.name || key}" ${expr}`);
+        alterTable.push(`ALTER COLUMN "${name}" ${expr}`);
       }
       if (from.nullable !== to.nullable) {
         alterTable.push(
-          `ALTER COLUMN "${item.name || key}" ${to.nullable ? "DROP" : "SET"} NOT NULL`
+          `ALTER COLUMN "${name}" ${to.nullable ? "DROP" : "SET"} NOT NULL`
         );
       }
       if (from.compression !== to.compression) {
         alterTable.push(
-          `ALTER COLUMN "${item.name || key}" SET COMPRESSION ${to.compression || "DEFAULT"}`
+          `ALTER COLUMN "${name}" SET COMPRESSION ${to.compression || "DEFAULT"}`
         );
       }
       if (from.check !== to.check) {
-        const name = `${ast.name}_${item.name || key}_check`;
+        const checkName = `${ast.name}_${name}_check`;
         if (from.check) {
-          alterTable.push(`DROP CONSTRAINT "${name}"`);
+          alterTable.push(`DROP CONSTRAINT "${checkName}"`);
         }
         if (to.check) {
           alterTable.push(
-            `ADD CONSTRAINT "${name}"
-    CHECK (${pqb.getRaw(to.check, values)})`
+            `ADD CONSTRAINT "${checkName}"
+    CHECK (${pqb.getRaw(
+              to.check,
+              values
+            )})`
           );
         }
       }
@@ -962,17 +1036,17 @@ const astToQueries = (ast) => {
         if ((fromFkey || toFkey) && (!fromFkey || !toFkey || fromFkey.name !== toFkey.name || fromFkey.match !== toFkey.match || fromFkey.onUpdate !== toFkey.onUpdate || fromFkey.onDelete !== toFkey.onDelete || fromFkey.dropMode !== toFkey.dropMode || fromFkey.table !== toFkey.table || fromFkey.columns.join(",") !== toFkey.columns.join(","))) {
           if (fromFkey) {
             dropForeignKeys.push({
-              columns: [key],
+              columns: [name],
               fnOrTable: fromFkey.table,
-              foreignColumns: fromFkey.columns,
+              foreignColumns: snakeCase ? fromFkey.columns.map(orchidCore.toSnakeCase) : fromFkey.columns,
               options: fromFkey
             });
           }
           if (toFkey) {
             addForeignKeys.push({
-              columns: [key],
+              columns: [name],
               fnOrTable: toFkey.table,
-              foreignColumns: toFkey.columns,
+              foreignColumns: snakeCase ? toFkey.columns.map(orchidCore.toSnakeCase) : toFkey.columns,
               options: toFkey
             });
           }
@@ -990,7 +1064,7 @@ const astToQueries = (ast) => {
             dropIndexes.push({
               columns: [
                 __spreadValues$3({
-                  column: key
+                  column: name
                 }, fromIndex)
               ],
               options: fromIndex
@@ -1000,7 +1074,7 @@ const astToQueries = (ast) => {
             addIndexes.push({
               columns: [
                 __spreadValues$3({
-                  column: key
+                  column: name
                 }, toIndex)
               ],
               options: toIndex
@@ -1009,10 +1083,12 @@ const astToQueries = (ast) => {
         }
       }
       if (from.comment !== to.comment) {
-        comments.push({ column: key, comment: to.comment || null });
+        comments.push({ column: name, comment: to.comment || null });
       }
     } else if (item.type === "rename") {
-      alterTable.push(`RENAME COLUMN "${key}" TO "${item.name}"`);
+      alterTable.push(
+        `RENAME COLUMN "${snakeCase ? orchidCore.toSnakeCase(key) : key}" TO "${snakeCase ? orchidCore.toSnakeCase(item.name) : item.name}"`
+      );
     }
   }
   const prependAlterTable = [];
@@ -1023,17 +1099,24 @@ const astToQueries = (ast) => {
   prependAlterTable.push(
     ...dropForeignKeys.map(
       (foreignKey) => `
- DROP ${constraintToSql(ast, false, foreignKey)}`
+ DROP ${constraintToSql(ast, false, foreignKey, snakeCase)}`
     )
   );
   alterTable.unshift(...prependAlterTable);
   if (ast.add.primaryKey || addPrimaryKeys.change || addPrimaryKeys.columns.length > 1) {
-    alterTable.push(`ADD ${primaryKeyToSql(addPrimaryKeys)}`);
+    alterTable.push(
+      `ADD ${primaryKeyToSql(
+        snakeCase ? {
+          options: addPrimaryKeys.options,
+          columns: addPrimaryKeys.columns.map(orchidCore.toSnakeCase)
+        } : addPrimaryKeys
+      )}`
+    );
   }
   alterTable.push(
     ...addForeignKeys.map(
       (foreignKey) => `
- ADD ${constraintToSql(ast, true, foreignKey)}`
+ ADD ${constraintToSql(ast, true, foreignKey, snakeCase)}`
     )
   );
   if (alterTable.length) {
@@ -1048,6 +1131,22 @@ const astToQueries = (ast) => {
   queries.push(...commentsToQuery(ast, comments));
   return queries;
 };
+const getChangeColumnName = (change, key, snakeCase) => {
+  return change.name || (change.to.column ? getColumnName(change.to.column, key, snakeCase) : snakeCase ? orchidCore.toSnakeCase(key) : key);
+};
+const mapIndexesForSnakeCase = (indexes, snakeCase) => {
+  return indexes.map((index) => ({
+    options: index.options,
+    columns: snakeCase ? index.columns.map(
+      (item) => "column" in item ? __spreadProps$2(__spreadValues$3({}, item), { column: orchidCore.toSnakeCase(item.column) }) : item
+    ) : index.columns
+  }));
+};
+const mapForeignKeysForSnakeCase = (foreignKeys, snakeCase) => {
+  return foreignKeys.map((foreignKey) => __spreadProps$2(__spreadValues$3({}, foreignKey), {
+    columns: snakeCase ? foreignKey.columns.map(orchidCore.toSnakeCase) : foreignKey.columns
+  }));
+};
 
 var __defProp$2 = Object.defineProperty;
 var __defProps$1 = Object.defineProperties;
@@ -2051,7 +2150,7 @@ const fkeyActionMap = {
   n: "SET NULL",
   d: "SET DEFAULT"
 };
-const structureToAst = async (unsupportedTypes, db) => {
+const structureToAst = async (ctx, db) => {
   const ast = [];
   const data = await getData(db);
   for (const name of data.schemas) {
@@ -2079,24 +2178,19 @@ const structureToAst = async (unsupportedTypes, db) => {
   }
   const domains = {};
   for (const it of data.domains) {
-    domains[`${it.schemaName}.${it.name}`] = getColumn(
-      unsupportedTypes,
-      data,
-      domains,
-      {
-        schemaName: it.schemaName,
-        name: it.name,
-        type: it.type,
-        typeSchema: it.typeSchema,
-        isArray: it.isArray,
-        isSerial: false
-      }
-    );
+    domains[`${it.schemaName}.${it.name}`] = getColumn(ctx, data, domains, {
+      schemaName: it.schemaName,
+      name: it.name,
+      type: it.type,
+      typeSchema: it.typeSchema,
+      isArray: it.isArray,
+      isSerial: false
+    });
   }
   for (const key in pendingTables) {
     const { table, dependsOn } = pendingTables[key];
     if (!dependsOn.size) {
-      pushTableAst(unsupportedTypes, ast, data, domains, table, pendingTables);
+      pushTableAst(ctx, ast, data, domains, table, pendingTables);
     }
   }
   const outerFKeys = [];
@@ -2144,15 +2238,7 @@ const structureToAst = async (unsupportedTypes, db) => {
         outerFKeys.push([fkey, table]);
       }
     }
-    pushTableAst(
-      unsupportedTypes,
-      ast,
-      data,
-      domains,
-      table,
-      pendingTables,
-      innerFKeys
-    );
+    pushTableAst(ctx, ast, data, domains, table, pendingTables, innerFKeys);
   }
   for (const [fkey, table] of outerFKeys) {
     ast.push(__spreadProps(__spreadValues({}, foreignKeyToAst(fkey)), {
@@ -2212,7 +2298,7 @@ const getIsSerial = (item) => {
   }
   return false;
 };
-const getColumn = (unsupportedTypes, data, domains, _a) => {
+const getColumn = (ctx, data, domains, _a) => {
   var _b = _a, {
     schemaName,
     tableName,
@@ -2230,7 +2316,7 @@ const getColumn = (unsupportedTypes, data, domains, _a) => {
     "isArray",
     "isSerial"
   ]);
-  var _a2;
+  var _a2, _b2;
   let column;
   const klass = pqb.columnsByType[getColumnType(type, isSerial)];
   if (klass) {
@@ -2247,7 +2333,7 @@ const getColumn = (unsupportedTypes, data, domains, _a) => {
         column = new RakeDbEnumColumn({}, type, enumType.values);
       } else {
         column = new pqb.CustomTypeColumn({}, type);
-        ((_a2 = unsupportedTypes[type]) != null ? _a2 : unsupportedTypes[type] = []).push(
+        ((_b2 = (_a2 = ctx.unsupportedTypes)[type]) != null ? _b2 : _a2[type] = []).push(
           `${schemaName}${tableName ? `.${tableName}` : ""}.${name}`
         );
       }
@@ -2260,7 +2346,7 @@ const getColumnType = (type, isSerial) => {
     return type;
   return type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial";
 };
-const pushTableAst = (unsupportedTypes, ast, data, domains, table, pendingTables, innerFKeys = data.foreignKeys) => {
+const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerFKeys = data.foreignKeys) => {
   const { schemaName, name } = table;
   const key = `${schemaName}.${table.name}`;
   delete pendingTables[key];
@@ -2283,7 +2369,7 @@ const pushTableAst = (unsupportedTypes, ast, data, domains, table, pendingTables
     if (isSerial) {
       item = __spreadProps(__spreadValues({}, item), { default: void 0 });
     }
-    let column = getColumn(unsupportedTypes, data, domains, __spreadProps(__spreadValues({}, item), {
+    let column = getColumn(ctx, data, domains, __spreadProps(__spreadValues({}, item), {
       type: item.type,
       isArray: item.isArray,
       isSerial
@@ -2328,8 +2414,14 @@ const pushTableAst = (unsupportedTypes, ast, data, domains, table, pendingTables
     if (check) {
       column.data.check = orchidCore.raw(check.expression);
     }
-    delete column.data.name;
-    shape[item.name] = column;
+    const camelCaseName = orchidCore.toCamelCase(item.name);
+    if (ctx.snakeCase) {
+      const snakeCaseName = orchidCore.toSnakeCase(camelCaseName);
+      column.data.name = snakeCaseName === item.name ? void 0 : item.name;
+    } else {
+      column.data.name = camelCaseName === item.name ? void 0 : item.name;
+    }
+    shape[camelCaseName] = column;
   }
   ast.push({
     type: "table",
@@ -2366,14 +2458,7 @@ const pushTableAst = (unsupportedTypes, ast, data, domains, table, pendingTables
   for (const otherKey in pendingTables) {
     const item = pendingTables[otherKey];
     if (item.dependsOn.delete(key) && item.dependsOn.size === 0) {
-      pushTableAst(
-        unsupportedTypes,
-        ast,
-        data,
-        domains,
-        item.table,
-        pendingTables
-      );
+      pushTableAst(ctx, ast, data, domains, item.table, pendingTables);
     }
   }
 };
@@ -2490,15 +2575,18 @@ const createDomain = (ast) => {
   return code;
 };
 const createTable = (config, ast) => {
+  var _a, _b, _c, _d, _e, _f;
   const code = [];
   orchidCore.addCode(code, `await db.createTable(${quoteSchemaTable(ast)}, (t) => ({`);
-  const hasTimestamps = !config.snakeCase && isTimestamp(ast.shape.createdAt) && isTimestamp(ast.shape.updatedAt);
-  const hasTimestampsSnake = isTimestamp(ast.shape.created_at) && isTimestamp(ast.shape.updated_at);
+  let hasTimestamps = isTimestamp(ast.shape.createdAt) && isTimestamp(ast.shape.updatedAt);
+  const camelCaseTimestamps = !config.snakeCase && hasTimestamps && !((_a = ast.shape.createdAt) == null ? void 0 : _a.data.name) && !((_b = ast.shape.updatedAt) == null ? void 0 : _b.data.name);
+  const snakeCaseTimestamps = hasTimestamps && !camelCaseTimestamps && (!config.snakeCase && ((_c = ast.shape.createdAt) == null ? void 0 : _c.data.name) === "created_at" && ((_d = ast.shape.updatedAt) == null ? void 0 : _d.data.name) === "updated_at" || config.snakeCase && !((_e = ast.shape.createdAt) == null ? void 0 : _e.data.name) && !((_f = ast.shape.updatedAt) == null ? void 0 : _f.data.name));
+  if (!camelCaseTimestamps && !snakeCaseTimestamps) {
+    hasTimestamps = false;
+  }
   for (const key in ast.shape) {
     if (hasTimestamps && (key === "createdAt" || key === "updatedAt"))
       continue;
-    if (hasTimestampsSnake && (key === "created_at" || key === "updated_at"))
-      continue;
     const line = [`${orchidCore.quoteObjectKey(key)}: `];
     for (const part of ast.shape[key].toCode("t")) {
       orchidCore.addCode(line, part);
@@ -2506,11 +2594,10 @@ const createTable = (config, ast) => {
     orchidCore.addCode(line, ",");
     code.push(line);
   }
-  if (hasTimestamps || config.snakeCase && hasTimestampsSnake) {
-    code.push(["...t.timestamps(),"]);
-  }
-  if (hasTimestampsSnake && !config.snakeCase) {
-    code.push(["...t.timestampsSnakeCase(),"]);
+  if (hasTimestamps) {
+    code.push([
+      `...t.${camelCaseTimestamps || config.snakeCase ? "timestamps" : "timestampsSnakeCase"}(),`
+    ]);
   }
   if (ast.primaryKey) {
     code.push([pqb.primaryKeyToCode(ast.primaryKey, "t")]);
@@ -2548,8 +2635,11 @@ const pullDbStructure = async (options, config) => {
   var _a, _b, _c;
   const adapter = new pqb.Adapter(options);
   const db = new DbStructure(adapter);
-  const unsupportedTypes = {};
-  const ast = await structureToAst(unsupportedTypes, db);
+  const ctx = {
+    unsupportedTypes: {},
+    snakeCase: config.snakeCase
+  };
+  const ast = await structureToAst(ctx, db);
   await adapter.close();
   const result = astToMigration(config, ast);
   if (!result)
@@ -2567,7 +2657,7 @@ const pullDbStructure = async (options, config) => {
       logger: config.logger
     }));
   }
-  const unsupportedEntries = Object.entries(unsupportedTypes);
+  const unsupportedEntries = Object.entries(ctx.unsupportedTypes);
   const len = unsupportedEntries.length;
   if (len) {
     let count = 0;