orchid-orm 1.9.20 → 1.9.22

package/dist/index.d.ts

@@ -141,27 +141,28 @@ type TableToDb<T extends Table> = Db<T['table'], T['columns']['shape'], 'relatio
     name: string;
 };
 type DbTable<T extends TableClass> = TableToDb<InstanceType<T>> & Omit<MapRelations<InstanceType<T>>, keyof Query>;
-type TableConfig = {
+type ColumnsConfig = {
     shape: ColumnsShape;
     type: unknown;
 };
 type ScopeFn<Related extends TableClass, Scope extends Query> = (q: DbTable<Related>) => Scope;
 type Table = {
     table: string;
-    columns: TableConfig;
+    columns: ColumnsConfig;
     schema?: string;
     columnTypes: ColumnTypesBase;
     noPrimaryKey?: boolean;
     filePath: string;
 };
-declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>({ columnTypes, snakeCase, filePath, }?: {
+declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>({ columnTypes, snakeCase, filePath, nowSQL, }?: {
     columnTypes?: CT | ((t: DefaultColumnTypes) => CT) | undefined;
     snakeCase?: boolean | undefined;
     filePath?: string | undefined;
+    nowSQL?: string | undefined;
 }) => {
     new (): {
         table: string;
-        columns: TableConfig;
+        columns: ColumnsConfig;
         schema?: string | undefined;
         noPrimaryKey?: boolean | undefined;
         snakeCase: boolean | undefined;
@@ -512,6 +513,7 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
         };
     };
     filePath: string;
+    nowSQL: string | undefined;
 };
 
 type QueryMethods<T extends Query> = Record<string, (q: T, ...args: any[]) => any>;

package/dist/index.js

@@ -30,7 +30,8 @@ var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 const createBaseTable = ({
   columnTypes,
   snakeCase,
-  filePath
+  filePath,
+  nowSQL
 } = { columnTypes: pqb.columnTypes }) => {
   const ct = typeof columnTypes === "function" ? columnTypes(pqb.columnTypes) : columnTypes || pqb.columnTypes;
   filePath != null ? filePath : filePath = orchidCore.getCallerFilePath();
@@ -42,10 +43,11 @@ const createBaseTable = ({
   return create(
     ct,
     filePath,
-    snakeCase
+    snakeCase,
+    nowSQL
   );
 };
-const create = (columnTypes, filePath, snakeCase) => {
+const create = (columnTypes, filePath, snakeCase, nowSQL) => {
   var _a;
   const base = (_a = class {
     constructor() {
@@ -63,7 +65,7 @@ const create = (columnTypes, filePath, snakeCase) => {
         this.filePath = filePath2;
       }
       columnTypes[orchidCore.snakeCaseKey] = this.snakeCase;
-      const shape = pqb.getColumnTypes(columnTypes, fn);
+      const shape = pqb.getColumnTypes(columnTypes, fn, nowSQL);
       if (this.snakeCase) {
         for (const key in shape) {
           const column = shape[key];
@@ -112,7 +114,7 @@ const create = (columnTypes, filePath, snakeCase) => {
         options
       };
     }
-  }, _a.filePath = filePath, _a);
+  }, _a.filePath = filePath, _a.nowSQL = nowSQL, _a);
   base.prototype.columnTypes = columnTypes;
   return base;
 };
@@ -275,7 +277,8 @@ const nestedUpdate$3 = ({ query, primaryKey, foreignKey }) => {
         if (id !== null) {
           await query.findBy({ [primaryKey]: id })._update(upsert.update);
         } else {
-          const result = await query.select(primaryKey)._create(upsert.create);
+          const data = typeof upsert.create === "function" ? upsert.create() : upsert.create;
+          const result = await query.select(primaryKey)._create(data);
           ((_a2 = state.updateData) != null ? _a2 : state.updateData = {})[foreignKey] = result[primaryKey];
         }
       });
@@ -540,8 +543,9 @@ const nestedUpdate$2 = ({ query, primaryKey, foreignKey }) => {
       const { update, create } = params.upsert;
       const updatedIds = await currentRelationsQuery._pluck(foreignKey)._update(update);
       if (updatedIds.length < ids.length) {
+        const data2 = typeof create === "function" ? create() : create;
         await t.createMany(
-          ids.filter((id) => !updatedIds.includes(id)).map((id) => __spreadProps$5(__spreadValues$7({}, create), {
+          ids.filter((id) => !updatedIds.includes(id)).map((id) => __spreadProps$5(__spreadValues$7({}, data2), {
             [foreignKey]: id
           }))
         );
@@ -1262,6 +1266,16 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
   }
   makeRelationQuery(dbTable, relationName, data, query);
   baseQuery.joinQuery = data.joinQuery;
+  const { join: originalJoin } = baseQuery;
+  baseQuery.join = function(...args) {
+    if (args.length) {
+      return originalJoin.apply(this, args);
+    } else {
+      const q = this.clone();
+      q.query.innerJoinLateral = true;
+      return q;
+    }
+  };
   dbTable.relations[relationName] = {
     type,
     key: relationName,