pqb 0.12.4 → 0.12.5

package/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterBase, QueryInput, Sql, ColumnTypesBase, ColumnShapeOutput, DefaultSelectColumns, DbBase, QueryThen, QueryCatch, QueryBaseCommon, ColumnsShapeBase, QueryInternal, QueryMetaBase, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, ColumnsParsers, getValueKey, StringKey, ColumnOutput, NullableColumn, EmptyTuple, SetOptional, MergeObjects, CoalesceString, QueryCommon, Spread, BaseNumberData, Code, ColumnWithDefault, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateTypeMethods, DateColumnData, EncodeColumn, ParseColumn, JSONTypeAny, record, ArrayMethodsData, arrayMethods, ForeignKeyTable, name, ColumnNameOfTable, ColumnDataBase, BaseOperators, ValidationContext, MessageParam } from 'orchid-core';
+import { QueryResultRow, AdapterBase, QueryInput, Sql, ColumnTypesBase, ColumnShapeOutput, DefaultSelectColumns, DbBase, QueryThen, QueryCatch, QueryBaseCommon, ColumnsShapeBase, QueryInternal, QueryMetaBase, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, ColumnsParsers, getValueKey, StringKey, ColumnOutput, NullableColumn, TemplateLiteralArgs, EmptyTuple, SetOptional, MergeObjects, CoalesceString, QueryCommon, Spread, BaseNumberData, Code, ColumnWithDefault, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateTypeMethods, DateColumnData, EncodeColumn, ParseColumn, JSONTypeAny, record, ArrayMethodsData, arrayMethods, ForeignKeyTable, name, ColumnNameOfTable, ColumnDataBase, BaseOperators, ValidationContext, MessageParam } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import { inspect } from 'util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -434,7 +434,7 @@ type JoinOverrides = Record<string, string>;
 type CommonQueryData = {
     adapter: Adapter;
     shape: ColumnsShapeBase;
-    patchResult?(queryResult: QueryResult): Promise<void>;
+    patchResult?(q: Query, queryResult: QueryResult): Promise<void>;
     handleResult(q: Query, result: QueryResult, isSubQuery?: true): unknown;
     returnType: QueryReturnType;
     [relationQueryKey]?: RelationQueryData;
@@ -742,7 +742,7 @@ type FromArgs<T extends Query> = [
     second?: {
         only?: boolean;
     }
-] | [TemplateStringsArray, ...unknown[]];
+] | TemplateLiteralArgs;
 type FromResult<T extends Query, Args extends FromArgs<T>> = Args extends TemplateStringsArray ? T : Args[0] extends string ? T['withData'] extends Record<string, WithDataItem> ? Args[0] extends keyof T['withData'] ? Omit<T, 'meta' | 'selectable'> & {
     meta: Omit<T['meta'], 'as'> & {
         as?: string;
@@ -802,7 +802,7 @@ type WhereArg<T extends QueryBase> = (Omit<{
         values: unknown[][] | Query | RawExpression;
     }>;
 }) | QueryBase | RawExpression | ((q: WhereQueryBuilder<T>) => WhereQueryBuilder);
-type WhereArgs<T extends QueryBase> = WhereArg<T>[] | [TemplateStringsArray, ...unknown[]];
+type WhereArgs<T extends QueryBase> = WhereArg<T>[] | TemplateLiteralArgs;
 type WhereInColumn<T extends QueryBase> = keyof T['selectable'] | [keyof T['selectable'], ...(keyof T['selectable'])[]];
 type WhereInValues<T extends QueryBase, Column extends WhereInColumn<T>> = Column extends keyof T['selectable'] ? T['selectable'][Column]['column']['type'][] | Query | RawExpression : ({
     [I in keyof Column]: Column[I] extends keyof T['selectable'] ? T['selectable'][Column[I]]['column']['type'] : never;
@@ -1873,7 +1873,7 @@ type UpdateHasAndBelongsToManyData<Rel extends HasAndBelongsToManyRelation> = {
     create?: CreateData<Rel['nestedCreateQuery']>[];
 };
 type UpdateArg<T extends Query> = T['meta']['hasWhere'] extends true ? UpdateData<T> : never;
-type UpdateRawArgs<T extends Query> = T['meta']['hasWhere'] extends true ? [sql: RawExpression] | [TemplateStringsArray, ...unknown[]] : never;
+type UpdateRawArgs<T extends Query> = T['meta']['hasWhere'] extends true ? [sql: RawExpression] | TemplateLiteralArgs : never;
 type UpdateResult<T extends Query> = T['meta']['hasSelect'] extends true ? T : SetQueryReturnsRowCount<T>;
 type ChangeCountArg<T extends Query> = keyof T['shape'] | Partial<Record<keyof T['shape'], number>>;
 type UpdateCtx = {
@@ -2192,7 +2192,7 @@ type HavingArg<T extends Query = Query> = ({
 } & {
     count?: number | HavingArgObject<T, 'count'>;
 }) | Query | RawExpression;
-type HavingArgs<T extends Query> = [...args: HavingArg<T>[]] | [TemplateStringsArray, ...unknown[]];
+type HavingArgs<T extends Query> = [...args: HavingArg<T>[]] | TemplateLiteralArgs;
 declare class Having {
     having<T extends Query>(this: T, ...args: HavingArgs<T>): T;
     _having<T extends Query>(this: T, ...args: HavingArgs<T>): T;
@@ -2503,10 +2503,6 @@ type SqlNoColumnArgs = [params: {
 }] | TemplateLiteralArgs;
 type Values = Record<string, unknown>;
 type ColumnFn<T extends Query> = (types: T['columnTypes']) => ColumnType;
-type TemplateLiteralArgs = [
-    strings: TemplateStringsArray,
-    ...values: unknown[]
-];
 type SqlFn<C extends ColumnType> = (...args: TemplateLiteralArgs) => RawExpression<C>;
 type SqlResult<T extends Query, Args extends SqlArgs<T>> = Args extends SqlColumnArgs<T> ? Args extends SqlColumnArgsWithSQL<T> ? RawExpression<ReturnType<Args[0]>> : SqlFn<ReturnType<Args[0]>> : Args extends [{
     raw: string;
@@ -2766,8 +2762,8 @@ type OrderArg<T extends Query, Key extends PropertyKey = keyof T['selectable'] |
 }[keyof T['result']]> = Key | {
     [K in Key]?: SortDir;
 } | RawExpression;
-type OrderArgs<T extends Query> = OrderArg<T>[] | [TemplateStringsArray, ...unknown[]];
-type FindArgs<T extends Query> = [T['shape'][T['singlePrimaryKey']]['type'] | RawExpression] | [TemplateStringsArray, ...unknown[]];
+type OrderArgs<T extends Query> = OrderArg<T>[] | TemplateLiteralArgs;
+type FindArgs<T extends Query> = [T['shape'][T['singlePrimaryKey']]['type'] | RawExpression] | TemplateLiteralArgs;
 type QueryHelper<T extends Query, Args extends unknown[], Result> = <Q extends {
     [K in keyof T]: K extends 'then' ? QueryThen<unknown> : K extends 'result' ? ColumnsShapeBase : T[K];
 }>(q: Q, ...args: Args) => Result extends Query ? MergeQuery<Q, Result> : Result;
@@ -5054,7 +5050,7 @@ declare function text(min: number, max: number): TextColumn;
 declare function sql(sql: TemplateStringsArray, ...values: unknown[]): RawExpression;
 declare function sql(sql: string): RawExpression;
 declare function sql(values: Record<string, unknown>, sql: string): RawExpression;
-declare function sql(values: Record<string, unknown>): (...sql: [TemplateStringsArray, ...unknown[]]) => RawExpression;
+declare function sql(values: Record<string, unknown>): (...sql: TemplateLiteralArgs) => RawExpression;
 type DefaultColumnTypes = typeof columnTypes;
 declare const columnTypes: {
     timestamps<T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {

package/dist/index.js

@@ -4408,7 +4408,7 @@ const then = async (q, adapter, resolve, reject) => {
     }
     const queryResult = await adapter[queryMethodByReturnType[query.returnType || "all"]](sql);
     if (query.patchResult) {
-      await query.patchResult(queryResult);
+      await query.patchResult(q, queryResult);
     }
     if (query.log) {
       query.log.afterQuery(sql, logData);
@@ -5741,9 +5741,7 @@ class From {
   _from(...args) {
     var _a, _b, _c;
     if (Array.isArray(args[0])) {
-      return this._from(
-        orchidCore.raw(args)
-      );
+      return this._from(orchidCore.raw(args));
     }
     if (typeof args[0] === "string") {
       (_a = this.query).as || (_a.as = args[0]);
@@ -7030,7 +7028,7 @@ class Update {
             }
           });
         }
-        query.patchResult = async (queryResult) => {
+        query.patchResult = async (_, queryResult) => {
           await Promise.all(queries.map((fn) => fn(queryResult)));
           if (ctx.updateData) {
             const t = this.baseQuery.clone();
@@ -7489,16 +7487,16 @@ class QueryUpsertOrCreate {
     this.query.handleResult = (q, r, s) => {
       return created ? result : handleResult(q, r, s);
     };
-    this.query.patchResult = async (queryResult) => {
+    this.query.patchResult = async (q, queryResult) => {
       if (queryResult.rowCount === 0) {
         if (typeof data === "function") {
           data = data();
         }
-        const inner = this.create(data);
+        const inner = q.create(data);
         const { handleResult: handleResult2 } = inner.query;
-        inner.query.handleResult = (q, r, s) => {
+        inner.query.handleResult = (q2, r, s) => {
           queryResult = r;
-          const res = handleResult2(q, r, s);
+          const res = handleResult2(q2, r, s);
           result = res;
           return res;
         };
@@ -7620,39 +7618,23 @@ class RawSqlMethods {
     const arg = args[0];
     if (typeof arg === "object") {
       if (Array.isArray(arg)) {
-        return {
-          __raw: args
-        };
+        return orchidCore.raw(args);
       }
       const obj = arg;
       if (obj.raw) {
-        return {
-          __raw: obj.raw,
-          __values: obj.values
-        };
+        return orchidCore.raw(obj.raw, obj.values);
       }
       return (...args2) => {
-        return {
-          __raw: args2,
-          __values: obj.values
-        };
+        return orchidCore.raw(args2, obj.values);
       };
     }
     const column = arg(this.columnTypes);
     const second = args[1];
     if (second == null ? void 0 : second.raw) {
-      return {
-        __column: column,
-        __raw: second.raw,
-        __values: second.values
-      };
+      return orchidCore.raw(second.raw, second.values, column);
     }
     return (...args2) => {
-      return {
-        __column: column,
-        __raw: args2,
-        __values: second == null ? void 0 : second.values
-      };
+      return orchidCore.raw(args2, second == null ? void 0 : second.values, column);
     };
   }
   /**
@@ -7660,16 +7642,9 @@ class RawSqlMethods {
    */
   raw(...args) {
     if (typeof args[0] === "string") {
-      return {
-        __raw: args[0],
-        __values: args[1]
-      };
+      return orchidCore.raw(args[0], args[1]);
     } else {
-      return {
-        __column: args[0](this.columnTypes),
-        __raw: args[1],
-        __values: args[2]
-      };
+      return orchidCore.raw(args[1], args[2], args[0](this.columnTypes));
     }
   }
 }