pqb 0.36.16 → 0.37.0

package/dist/index.mjs

@@ -2204,37 +2204,16 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         );
       } else {
         const item = value;
-        const leftColumn = columnToSql(
-          ctx,
-          query,
-          query.shape,
-          item.on[0],
-          `"${getJoinItemSource(item.joinFrom)}"`
+        const joinAs = `"${getJoinItemSource(item.joinFrom)}"`;
+        const { on } = item;
+        const q = item.useOuterJoinOverrides ? {
+          joinedShapes: query.joinedShapes,
+          joinOverrides: query.outerJoinOverrides,
+          shape: query.shape
+        } : query;
+        ands.push(
+          `${onColumnToSql(ctx, q, joinAs, on[0])} ${on.length === 2 ? "=" : on[1]} ${onColumnToSql(ctx, q, joinAs, on.length === 3 ? on[2] : on[1])}`
         );
-        const joinTo = getJoinItemSource(item.joinTo);
-        const joinedShape = query.joinedShapes[joinTo];
-        let op;
-        let rightColumn;
-        if (item.on.length === 2) {
-          op = "=";
-          rightColumn = columnToSql(
-            ctx,
-            query,
-            joinedShape,
-            item.on[1],
-            `"${joinTo}"`
-          );
-        } else {
-          op = item.on[1];
-          rightColumn = columnToSql(
-            ctx,
-            query,
-            joinedShape,
-            item.on[2],
-            `"${joinTo}"`
-          );
-        }
-        ands.push(`${leftColumn} ${op} ${rightColumn}`);
       }
     } else if (key === "IN") {
       toArray(value).forEach((item) => {
@@ -2330,6 +2309,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     }
   }
 };
+const onColumnToSql = (ctx, query, joinAs, column) => columnToSql(ctx, query, query.shape, column, joinAs);
 const getJoinItemSource = (joinItem) => {
   return typeof joinItem === "string" ? joinItem : getQueryAs(joinItem);
 };
@@ -5968,12 +5948,14 @@ const makeRegexToFindInSql = (value) => {
   return new RegExp(`${value}(?=(?:[^']*'[^']*')*[^']*$)`, "g");
 };
 const resolveSubQueryCallback = (q, cb) => {
-  const { subQuery, relChain } = q.q;
+  const { subQuery, relChain, outerJoinOverrides } = q.q;
   q.q.subQuery = 1;
   q.q.relChain = void 0;
+  q.q.outerJoinOverrides = q.q.joinOverrides;
   const result = cb(q);
   q.q.subQuery = subQuery;
   q.q.relChain = relChain;
+  q.q.outerJoinOverrides = outerJoinOverrides;
   return result;
 };
 const joinSubQuery = (q, sub) => {
@@ -8403,7 +8385,7 @@ class Join {
    *
    * All the `join` methods accept the same arguments, but returning type is different because with `join` it's guaranteed to load joined table, and with `leftJoin` the joined table columns may be `NULL` when no matching record was found.
    *
-   * For the following examples, imagine we have a `User` table with `id` and `name`, and `Message` table with `id`, `text`, messages belongs to user via `userId` column:
+   * For the following examples, imagine you have a `User` table with `id` and `name`, and `Message` table with `id`, `text`, messages belongs to user via `userId` column:
    *
    * ```ts
    * export class UserTable extends BaseTable {
@@ -8481,7 +8463,7 @@ class Join {
    * ```ts
    * const result = await db.user
    *   .join('messages')
-   *   // after joining a table, we can use it in `where` conditions:
+   *   // after joining a table, you can use it in `where` conditions:
    *   .where({ 'messages.text': { startsWith: 'Hi' } })
    *   .select(
    *     'name', // name is User column, table name may be omitted
@@ -8492,8 +8474,8 @@ class Join {
    * const ok: { name: string; text: string }[] = result;
    * ```
    *
-   * The first argument can also be a callback, where instead of relation name as a string we're picking it as a property of `q`.
-   * In such a way, we can alias the relation with `as`, add `where` conditions, use other query methods.
+   * The first argument can also be a callback, where instead of relation name as a string you're picking it as a property of `q`.
+   * In such a way, you can alias the relation with `as`, add `where` conditions, use other query methods.
    *
    * ```ts
    * const result = await db.user.join((q) =>
@@ -8510,7 +8492,7 @@ class Join {
    *   (q) => q.messages.as('m'),
    *   (q) =>
    *     q
-   *       .on('text', 'name') // additionally, match message with user name
+   *       .on('messages.text', 'user.name') // additionally, match message with user name
    *       .where({ text: 'some text' }), // you can add `where` in a second callback as well.
    * );
    * ```
@@ -8564,17 +8546,16 @@ class Join {
    * Joined table can be references from `where` and `select` by a table name.
    *
    * ```ts
-   * // Join message where userId = id:
    * db.user
-   *   .join(db.message, 'userId', 'id')
+   *   .join(db.message, 'userId', 'user.id')
    *   .where({ 'message.text': { startsWith: 'Hi' } })
    *   .select('name', 'message.text');
    * ```
    *
-   * Columns in the join list may be prefixed with table names for clarity:
+   * The name of the joining table can be omitted, but not the name of the main table:
    *
    * ```ts
-   * db.user.join(db.message, 'message.userId', 'user.id');
+   * db.user.join(db.message, 'userId', 'user.id');
    * ```
    *
    * Joined table can have an alias for referencing it further:
@@ -8605,7 +8586,7 @@ class Join {
    * You can provide a custom comparison operator
    *
    * ```ts
-   * db.user.join(db.message, 'userId', '!=', 'id');
+   * db.user.join(db.message, 'userId', '!=', 'user.id');
    * ```
    *
    * Join can accept raw SQL for the `ON` part of join:
@@ -8640,11 +8621,11 @@ class Join {
    *
    * ```ts
    * db.user.join(db.message, {
-   *   userId: 'id',
-   *
-   *   // with table names:
    *   'message.userId': 'user.id',
    *
+   *   // joined table name may be omitted
+   *   userId: 'user.id',
+   *
    *   // value can be a raw SQL expression:
    *   text: sql`lower("user"."name")`,
    * });
@@ -8663,17 +8644,16 @@ class Join {
    *   db.message,
    *   (q) =>
    *     q
-   *       // left column is the db.message column, right column is the db.user column
-   *       .on('userId', 'id')
-   *       // table names can be provided:
    *       .on('message.userId', 'user.id')
+   *       // joined table name may be omitted
+   *       .on('userId', 'user.id')
    *       // operator can be specified:
-   *       .on('userId', '!=', 'id')
+   *       .on('userId', '!=', 'user.id')
    *       // operator can be specified with table names as well:
    *       .on('message.userId', '!=', 'user.id')
    *       // `.orOn` takes the same arguments as `.on` and acts like `.or`:
-   *       .on('userId', 'id') // where message.userId = user.id
-   *       .orOn('text', 'name'), // or message.text = user.name
+   *       .on('userId', 'user.id') // where message.userId = user.id
+   *       .orOn('text', 'user.name'), // or message.text = user.name
    * );
    * ```
    *
@@ -8682,7 +8662,7 @@ class Join {
    * ```ts
    * db.user.join(db.message, (q) =>
    *   q
-   *     .on('userId', 'id')
+   *     .on('userId', 'user.id')
    *     .where({
    *       // not prefixed column name is for joined table:
    *       text: { startsWith: 'hello' },
@@ -8717,7 +8697,7 @@ class Join {
    *     .where({ text: { startsWith: 'Hi' } })
    *     .as('t'),
    *   'userId',
-   *   'id',
+   *   'user.id',
    * );
    * ```
    *
@@ -8784,7 +8764,7 @@ class Join {
    *
    * // the same query, but joining table explicitly
    * const result2: typeof result = await db.user
-   *   .leftJoin(db.message, 'userId', 'id')
+   *   .leftJoin(db.message, 'userId', 'user.id')
    *   .select('name', 'message.text');
    *
    * // result has the following type:
@@ -8886,7 +8866,7 @@ class Join {
    *     // select message columns
    *     .select('text')
    *     // join the message to the user, column names can be prefixed with table names
-   *     .on('authorId', 'id')
+   *     .on('authorId', 'user.id')
    *     // message columns are available without prefixing,
    *     // outer table columns are available with a table name
    *     .where({ text: 'some text', 'user.name': 'name' })
@@ -8968,14 +8948,22 @@ class Join {
     );
   }
 }
-const makeOnItem = (joinTo, joinFrom, args) => {
-  return {
+const makeOnItem = (joinTo, joinFrom, args) => ({
+  ON: {
+    joinTo,
+    joinFrom,
+    on: args
+  }
+});
+const pushQueryOnForOuter = (q, joinFrom, joinTo, ...on) => {
+  return pushQueryValue(q, "and", {
     ON: {
-      joinTo,
-      joinFrom,
-      on: args
+      joinTo: joinFrom,
+      joinFrom: joinTo,
+      useOuterJoinOverrides: true,
+      on
     }
-  };
+  });
 };
 const pushQueryOn = (q, joinFrom, joinTo, ...on) => {
   return pushQueryValue(
@@ -9026,16 +9014,13 @@ class OnMethods {
    *
    * ```ts
    * q
-   *   // left column is the db.message column, right column is the db.user column
-   *   .on('userId', 'id')
-   *   // table names can be provided:
    *   .on('message.userId', 'user.id')
+   *   // joined table name may be omitted
+   *   .on('userId', 'user.id')
    *   // operator can be specified:
-   *   .on('userId', '!=', 'id')
+   *   .on('userId', '!=', 'user.id')
    *   // operator can be specified with table names as well:
    *   .on('message.userId', '!=', 'user.id')
-   *   // `.orOn` takes the same arguments as `.on` and acts like `.or`:
-   *   .on('userId', 'id') // where message.userId = user.id
    * ```
    *
    * @param args - columns to join with
@@ -9380,6 +9365,7 @@ const resolveCallbacksInArgs = (q, args) => {
       qb.q = getClonedQueryData(q.q);
       qb.q.and = qb.q.or = qb.q.scopes = void 0;
       qb.q.subQuery = 1;
+      qb.q.outerJoinOverrides = qb.q.joinOverrides;
       args[i] = resolveSubQueryCallback(qb, arg);
     }
   }
@@ -12769,5 +12755,5 @@ function copyTableData(query, arg) {
   return q;
 }
 
-export { Adapter, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, QueryBase, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql$1 as rollbackSql, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
 //# sourceMappingURL=index.mjs.map