orchid-orm 1.6.15 → 1.6.17

package/dist/index.d.ts

@@ -144,7 +144,7 @@ declare type Table = {
     columnTypes: ColumnTypesBase;
     noPrimaryKey?: boolean;
 };
-declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
+declare const createBaseTable: <CT extends ColumnTypesBase>({ columnTypes, snakeCase, }?: {
     columnTypes?: CT | ((t: DefaultColumnTypes) => CT) | undefined;
     snakeCase?: boolean | undefined;
 }) => {
@@ -265,6 +265,7 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
             };
         } : CT;
         noPrimaryKey?: boolean | undefined;
+        snakeCase: boolean | undefined;
         setColumns: <T_16 extends ColumnsShape>(fn: (t: ColumnTypesBase extends CT ? {
             timestamps: <T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
                 name(name: string): {

package/dist/index.js

@@ -33,24 +33,40 @@ var path__namespace = /*#__PURE__*/_interopNamespace(path);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
 
-const createBaseTable = (options = { columnTypes: pqb.columnTypes }) => {
-  const ct = typeof options.columnTypes === "function" ? options.columnTypes(pqb.columnTypes) : options.columnTypes || pqb.columnTypes;
-  if (options.snakeCase) {
-    ct[orchidCore.snakeCaseKey] = true;
-  }
-  return create(ct);
+const createBaseTable = ({
+  columnTypes,
+  snakeCase
+} = { columnTypes: pqb.columnTypes }) => {
+  const ct = typeof columnTypes === "function" ? columnTypes(pqb.columnTypes) : columnTypes || pqb.columnTypes;
+  return create(
+    ct,
+    snakeCase
+  );
 };
-const create = (columnTypes2) => {
+const create = (columnTypes, snakeCase) => {
   return class BaseTable {
     constructor() {
+      this.snakeCase = snakeCase;
       this.setColumns = (fn) => {
-        const shape = pqb.getColumnTypes(columnTypes2, fn);
+        columnTypes[orchidCore.snakeCaseKey] = this.snakeCase;
+        const shape = pqb.getColumnTypes(columnTypes, fn);
+        if (this.snakeCase) {
+          for (const key in shape) {
+            const column = shape[key];
+            if (column.data.name)
+              continue;
+            const snakeName = orchidCore.toSnakeCase(key);
+            if (snakeName !== key) {
+              column.data.name = snakeName;
+            }
+          }
+        }
         return {
           shape,
           type: void 0
         };
       };
-      this.columnTypes = columnTypes2;
+      this.columnTypes = columnTypes;
     }
     belongsTo(fn, options) {
       return {