pqb 0.0.7 → 0.0.9

package/dist/index.js

@@ -1933,6 +1933,8 @@ class ArrayOfColumnsObjects extends ColumnType {
     this.operators = Operators.any;
   }
 }
+class PluckResultColumnType extends ColumnType {
+}
 class TableSchema {
   constructor(shape) {
     this.shape = shape;
@@ -2005,21 +2007,28 @@ const processJoinItem = (model, query, values, args, quotedAs) => {
   const [first] = args;
   if (typeof first === "string") {
     if (first in model.relations) {
-      const { key, joinQuery: joinQuery2 } = model.relations[first];
-      const table = typeof joinQuery2.query.from === "string" ? joinQuery2.query.from : joinQuery2.table;
-      let target3 = quoteSchemaAndTable(joinQuery2.query.schema, table);
-      const as = joinQuery2.query.as || key;
+      const {
+        key,
+        query: toQuery,
+        joinQuery: joinQuery2
+      } = model.relations[first];
+      const joinedQuery = joinQuery2(model, toQuery);
+      const joinedQueryData = joinedQuery.query;
+      const table = typeof joinedQueryData.from === "string" ? joinedQueryData.from : joinedQuery.table;
+      let target3 = quoteSchemaAndTable(joinedQueryData.schema, table);
+      const as = joinedQueryData.as || key;
       if (as !== table) {
         target3 += ` AS ${q(as)}`;
       }
       const queryData = {
+        as: joinedQuery.query.as,
         and: [],
         or: []
       };
-      if (joinQuery2.query.and)
-        queryData.and.push(...joinQuery2.query.and);
-      if (joinQuery2.query.or)
-        queryData.or.push(...joinQuery2.query.or);
+      if (joinedQueryData.and)
+        queryData.and.push(...joinedQueryData.and);
+      if (joinedQueryData.or)
+        queryData.or.push(...joinedQueryData.or);
       const arg = (_a = args[1]) == null ? void 0 : _a.call(
         args,
         new model.onQueryBuilder({ table: model.table, query }, args[0])
@@ -2032,7 +2041,7 @@ const processJoinItem = (model, query, values, args, quotedAs) => {
       }
       const joinAs2 = q(as);
       const onConditions = whereToSql(
-        joinQuery2,
+        joinedQuery,
         queryData,
         values,
         quotedAs,
@@ -2328,9 +2337,9 @@ const whereHandlers = {
       const item = value;
       const leftColumn = quoteFullColumn(
         item.on[0],
-        typeof item.joinTo === "string" ? q(item.joinTo) : q(getQueryAs(item.joinTo))
+        getJoinItemSource(item.joinTo)
       );
-      const joinTo = typeof item.joinFrom === "string" ? item.joinFrom : q(getQueryAs(item.joinFrom));
+      const joinTo = getJoinItemSource(item.joinFrom);
       const [op, rightColumn] = item.on.length === 2 ? ["=", quoteFullColumn(item.on[1], joinTo)] : [item.on[1], quoteFullColumn(item.on[2], joinTo)];
       ands.push(`${prefix}${leftColumn} ${op} ${rightColumn}`);
     }
@@ -2356,6 +2365,9 @@ const whereHandlers = {
     });
   }
 };
+const getJoinItemSource = (joinItem) => {
+  return typeof joinItem === "string" ? q(joinItem) : q(getQueryAs(joinItem));
+};
 const pushIn = (ands, prefix, quotedAs, values, arg) => {
   let value;
   if (Array.isArray(arg.values)) {
@@ -2438,6 +2450,23 @@ const aggregateToSql = (model, values, item, quotedAs) => {
 const relationQueryKey = Symbol("relationQuery");
 const isRequiredRelationKey = Symbol("isRequiredRelation");
 
+class PormError extends Error {
+}
+class NotFoundError extends PormError {
+  constructor(message = "Record is not found") {
+    super(message);
+  }
+}
+class MoreThanOneRowError extends PormError {
+}
+class PormInternalError extends Error {
+}
+class UnhandledTypeError extends PormInternalError {
+  constructor(value) {
+    super(`Unhandled type: ${JSON.stringify(value)} received`);
+  }
+}
+
 const jsonColumnOrMethodToSql = (column, values, quotedAs) => {
   return typeof column === "string" ? quoteFullColumn(column, quotedAs) : jsonToSql(column, values, quotedAs);
 };
@@ -2482,7 +2511,7 @@ const selectToSql = (model, query, values, quotedAs) => {
   if (query.select) {
     const list = [];
     query.select.forEach((item) => {
-      var _a2, _b;
+      var _a2, _b, _c;
       if (typeof item === "string") {
         list.push(
           item === "*" ? ((_a2 = query.join) == null ? void 0 : _a2.length) ? `${quotedAs}.*` : "*" : quoteFullColumn(item, quotedAs)
@@ -2492,8 +2521,35 @@ const selectToSql = (model, query, values, quotedAs) => {
         const as = q(getQueryAs(relationQuery));
         relationQuery._as(relationQuery.query[relationQueryKey]);
         const { returnType } = relationQuery.query;
-        if (returnType === "all" || returnType === "one" || returnType === "oneOrThrow") {
-          relationQuery = relationQuery._json();
+        switch (returnType) {
+          case "all":
+          case "one":
+          case "oneOrThrow":
+            relationQuery = relationQuery._json();
+            break;
+          case "pluck": {
+            const first = (_c = relationQuery.query.select) == null ? void 0 : _c[0];
+            if (!first)
+              throw new PormInternalError(`Nothing was selected for pluck`);
+            const selection = selectToSql(
+              relationQuery.__model,
+              relationQuery.query,
+              values,
+              q(getQueryAs(relationQuery))
+            );
+            relationQuery.query.select = [
+              raw(`COALESCE(json_agg(${selection}), '[]')`)
+            ];
+            break;
+          }
+          case "rows":
+          case "value":
+          case "valueOrThrow":
+          case "rowCount":
+          case "void":
+            break;
+          default:
+            throw new UnhandledTypeError(returnType);
         }
         list.push(`(${relationQuery.toSql(values).text}) AS ${as}`);
       } else {
@@ -3100,14 +3156,6 @@ const setQueryObjectValue = (q, object, key, value) => {
   return q;
 };
 
-class NotFoundError extends Error {
-  constructor(message = "Record is not found") {
-    super(message);
-  }
-}
-class MoreThanOneRowError extends Error {
-}
-
 const addParserForRawExpression = (q, key, raw) => {
   var _a;
   const parser = (_a = raw.__column) == null ? void 0 : _a.parseFn;
@@ -3936,6 +3984,9 @@ class WhereQueryBuilder extends Where {
     this.relations = {};
     this.withData = {};
     this.__model = this;
+    if (tableAlias) {
+      this.query.as = tableAlias;
+    }
   }
   clone() {
     const cloned = Object.create(this.__model);
@@ -5505,8 +5556,11 @@ exports.OnConflictQueryBuilder = OnConflictQueryBuilder;
 exports.OnQueryBuilder = OnQueryBuilder;
 exports.Operators = Operators;
 exports.PathColumn = PathColumn;
+exports.PluckResultColumnType = PluckResultColumnType;
 exports.PointColumn = PointColumn;
 exports.PolygonColumn = PolygonColumn;
+exports.PormError = PormError;
+exports.PormInternalError = PormInternalError;
 exports.QueryCallbacks = QueryCallbacks;
 exports.QueryGet = QueryGet;
 exports.QueryLog = QueryLog;
@@ -5530,6 +5584,7 @@ exports.TransactionAdapter = TransactionAdapter;
 exports.TsQueryColumn = TsQueryColumn;
 exports.TsVectorColumn = TsVectorColumn;
 exports.UUIDColumn = UUIDColumn;
+exports.UnhandledTypeError = UnhandledTypeError;
 exports.Union = Union;
 exports.Update = Update;
 exports.VarCharColumn = VarCharColumn;