pqb 0.30.6 → 0.30.7

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, addValue, isExpression, joinTruthy, numberDataToCode, stringDataToCode, getDefaultLanguage, dateDataToCode, pushOrNewArrayToObject, noop, arrayDataToCode, emptyArray, callWithThis, setParserToQuery, applyTransforms, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, toSnakeCase, snakeCaseKey } from 'orchid-core';
+import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, addValue, isExpression, joinTruthy, numberDataToCode, stringDataToCode, getDefaultLanguage, dateDataToCode, pushOrNewArrayToObject, returnArg as returnArg$1, noop, arrayDataToCode, emptyArray, callWithThis, setParserToQuery, applyTransforms, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, toSnakeCase, snakeCaseKey } from 'orchid-core';
 import pg from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -2377,25 +2377,14 @@ const subJoinToSql = (ctx, jq, innerAs, outerAs, cloned) => {
   }).text}) ${outerAs || innerAs}`;
 };
 const processArgs = (args, ctx, query, joinAs, joinShape, quotedAs) => {
-  if (args.length === 1) {
-    return getObjectOrRawConditions(
-      ctx,
-      query,
-      args[0],
-      quotedAs,
-      joinAs,
-      joinShape
-    );
-  } else {
-    return getConditionsFor3Or4LengthItem(
-      ctx,
-      query,
-      joinAs,
-      quotedAs,
-      args,
-      joinShape
-    );
-  }
+  return args.length === 1 ? getObjectOrRawConditions(ctx, query, args[0], quotedAs, joinAs, joinShape) : getConditionsFor3Or4LengthItem(
+    ctx,
+    query,
+    joinAs,
+    quotedAs,
+    args,
+    joinShape
+  );
 };
 const getConditionsFor3Or4LengthItem = (ctx, query, target, quotedAs, args, joinShape) => {
   const [leftColumn, opOrRightColumn, maybeRightColumn] = args;
@@ -2548,7 +2537,9 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
       );
       return { w: first, r, s: joinSubQuery || getIsJoinSubQuery(r) };
     }
-  } else if (typeof args[0] === "function") {
+  }
+  const args0 = args.length ? args[0] : returnArg$1;
+  if (typeof args0 === "function") {
     const q = first;
     if (q.joinQueryAfterCallback) {
       let base = q.baseQuery;
@@ -2566,7 +2557,7 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
     const joinedShapes = __spreadProps$4(__spreadValues$c({}, joinTo.q.joinedShapes), {
       [joinTo.q.as || joinTo.table]: joinTo.shape
     });
-    const r = args[0](
+    const r = args0(
       makeJoinQueryBuilder(
         q,
         q.q.joinedShapes ? __spreadValues$c(__spreadValues$c({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
@@ -6364,7 +6355,7 @@ class Create {
    *
    * await db.table.create({
    *   // raw SQL
-   *   column1: sql`'John' || ' ' || 'Doe'`,
+   *   column1: (q) => q.sql`'John' || ' ' || 'Doe'`,
    *
    *   // query that returns a single value
    *   // returning multiple values will result in Postgres error
@@ -9440,7 +9431,7 @@ class Update {
    *   column1: 123,
    *
    *   // use raw SQL to update the column
-   *   column2: sql`2 + 2`,
+   *   column2: (q) => q.sql`2 + 2`,
    *
    *   // use query that returns a single value
    *   // returning multiple values will result in Postgres error
@@ -9554,7 +9545,7 @@ class Update {
     );
   }
   /**
-   * `updateRaw` is for updating records with raw expression.
+   * `updateSql` is for updating records with raw expression.
    *
    * The behavior is the same as a regular `update` method has:
    * `find` or `where` must precede calling this method,
@@ -9565,14 +9556,14 @@ class Update {
    * const value = 'new name';
    *
    * // update with SQL template string
-   * const updatedCount = await db.table.find(1).updateRaw`name = ${value}`;
+   * const updatedCount = await db.table.find(1).updateSql`name = ${value}`;
    *
    * // or update with `sql` function:
-   * await db.table.find(1).updateRaw(sql`name = ${value}`);
+   * await db.table.find(1).updateSql(sql`name = ${value}`);
    * ```
    * @param args - raw SQL via a template string or by using a `sql` method
    */
-  updateRaw(...args) {
+  updateSql(...args) {
     return _queryUpdateRaw(
       this.clone(),
       sqlQueryArgsToExpression(args)
@@ -11147,10 +11138,7 @@ class QueryMethods {
    *   pets: (q) => q.pets.join().none(),
    * });
    *
-   * await db.user.join(
-   *   (q) => q.pets.none(),
-   *   (q) => q,
-   * );
+   * await db.user.join((q) => q.pets.none());
    *
    * await db.user.join('pets', (q) => q.none());
    * ```