orchid-orm 1.5.10 → 1.5.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.5.10",
+  "version": "1.5.11",
   "description": "Postgres ORM",
   "homepage": "https://orchid-orm.netlify.app/guide/orm-setup-and-overview.html",
   "repository": {
@@ -39,14 +39,14 @@
   "author": "Roman Kushyn",
   "license": "ISC",
   "dependencies": {
-    "pqb": "0.9.8"
+    "pqb": "0.9.9"
   },
   "devDependencies": {
     "@swc/core": "^1.3.19",
     "rollup": "^2.79.0",
     "rollup-plugin-dts": "^4.2.2",
     "rollup-plugin-esbuild": "^4.10.1",
-    "orchid-orm-schema-to-zod": "0.2.14",
+    "orchid-orm-schema-to-zod": "0.2.15",
     "@swc/jest": "^0.2.21",
     "@types/jest": "^28.1.2",
     "@types/node": "^18.0.1",
@@ -58,7 +58,7 @@
     "rimraf": "^3.0.2",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4",
-    "rake-db": "2.3.13"
+    "rake-db": "2.3.14"
   },
   "peerDependencies": {
     "typescript": "*"

package/src/table.test.ts

@@ -2,7 +2,7 @@ import { createBaseTable } from './table';
 import { orchidORM } from './orm';
 import { adapter, db } from './test-utils/test-db';
 import { assertType, userData, useTestDatabase } from './test-utils/test-utils';
-import { ColumnType, columnTypes, Operators } from 'pqb';
+import { ColumnType, Operators } from 'pqb';
 import { BaseTable } from './test-utils/test-tables';
 
 describe('table', () => {
@@ -68,12 +68,12 @@ describe('table', () => {
       await db.user.create(userData);
 
       const BaseTable = createBaseTable({
-        columnTypes: {
-          serial: columnTypes.serial,
+        columnTypes: (t) => ({
+          serial: t.serial,
           timestamp() {
-            return columnTypes.timestamp().parse((input) => new Date(input));
+            return t.timestamp().parse((input) => new Date(input));
           },
-        },
+        }),
       });
 
       class UserTable extends BaseTable {

package/src/table.ts

@@ -50,12 +50,15 @@ export type Table = {
 
 export const createBaseTable = <CT extends ColumnTypesBase>(
   options: {
-    columnTypes?: CT;
+    columnTypes?: CT | ((t: DefaultColumnTypes) => CT);
   } = { columnTypes: columnTypes as unknown as CT },
 ) => {
-  return create(
-    options.columnTypes as ColumnTypesBase extends CT ? DefaultColumnTypes : CT,
-  );
+  const ct =
+    typeof options.columnTypes === 'function'
+      ? options.columnTypes(columnTypes)
+      : options.columnTypes;
+
+  return create(ct as ColumnTypesBase extends CT ? DefaultColumnTypes : CT);
 };
 
 const create = <CT extends ColumnTypesBase>(columnTypes: CT) => {

package/src/test-utils/test-tables.ts

@@ -1,15 +1,14 @@
 import { createBaseTable } from '../table';
-import { columnTypes } from 'pqb';
 import { tableToZod } from 'orchid-orm-schema-to-zod';
 
 export const BaseTable = createBaseTable({
-  columnTypes: {
-    ...columnTypes,
-    text: (min = 0, max = Infinity) => columnTypes.text(min, max),
+  columnTypes: (t) => ({
+    ...t,
+    text: (min = 0, max = Infinity) => t.text(min, max),
     timestamp() {
-      return columnTypes.timestamp().parse((input) => new Date(input));
+      return t.timestamp().parse((input) => new Date(input));
     },
-  },
+  }),
 });
 
 export type User = UserTable['columns']['type'];