pqb 0.56.2 → 0.56.4

package/dist/index.js

@@ -5714,7 +5714,7 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
         }))
       );
     }
-    if (query.hookSelect || query.parsers || query.transform) {
+    if (query.hookSelect || query.parsers || query.transform || query.returnType === "oneOrThrow" || query.returnType === "valueOrThrow" || query.returnType === "one" || query.returnType === "value") {
       orchidCore.pushQueryValueImmutable(q, "batchParsers", {
         path: [key],
         fn: (path, queryResult) => {
@@ -5755,7 +5755,7 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
                 if (returnType === "one") {
                   for (const batch of batches) {
                     if (batch.data) parseRecord(parsers, batch.data);
-                    else batch.data = void 0;
+                    else batch.parent[batch.key] = batch.data = void 0;
                   }
                 } else {
                   for (const { data } of batches) {
@@ -5765,7 +5765,8 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
                 }
               } else if (returnType === "one") {
                 for (const batch of batches) {
-                  if (!batch.data) batch.data = void 0;
+                  if (!batch.data)
+                    batch.parent[batch.key] = batch.data = void 0;
                 }
               } else {
                 for (const { data } of batches) {
@@ -5792,22 +5793,30 @@ const addParserForSelectItem = (q, as, key, arg, columnAlias, joinQuery) => {
             }
             case "value":
             case "valueOrThrow": {
+              const notNullable = !query.getColumn?.data.isNullable;
               const parse = query.parsers?.[orchidCore.getValueKey];
               if (parse) {
                 if (returnType === "value") {
                   for (const item of batches) {
-                    item.parent[item.key] = item.data = item.data === void 0 ? query.notFoundDefault : parse(item.data);
+                    item.parent[item.key] = item.data = item.data === null ? query.notFoundDefault : parse(item.data);
                   }
                 } else {
                   for (const item of batches) {
-                    if (item.data === void 0)
+                    if (notNullable && item.data === null) {
                       throw new orchidCore.NotFoundError(arg);
+                    }
                     item.parent[item.key] = item.data = parse(item.data);
                   }
                 }
-              } else if (returnType !== "value") {
+              } else if (returnType === "value") {
+                for (const item of batches) {
+                  if (item.data === null) {
+                    item.parent[item.key] = item.data = query.notFoundDefault;
+                  }
+                }
+              } else if (notNullable) {
                 for (const { data } of batches) {
-                  if (data === void 0) throw new orchidCore.NotFoundError(arg);
+                  if (data === null) throw new orchidCore.NotFoundError(arg);
                 }
               }
               if (hookSelect) {
@@ -7841,14 +7850,18 @@ const isSelectingCount = (q) => {
   const { expr } = q.q;
   return expr instanceof FnExpression && expr.fn === "count" && expr.args[0] === "*";
 };
-const int = new IntegerColumn(defaultSchemaConfig).parse(parseInt);
-const float = new RealColumn(defaultSchemaConfig).parse(parseFloat);
-const stringAsNumber = new NumberAsStringBaseColumn(
+const intNullable = new IntegerColumn(defaultSchemaConfig).nullable().parse(parseInt);
+const floatNullable = new RealColumn(defaultSchemaConfig).nullable().parse(parseFloat);
+const booleanNullable = BooleanColumn.instance.nullable();
+const textNullable = TextColumn.instance.nullable();
+const jsonTextNullable = JSONTextColumn.instance.nullable();
+const xmlNullable = XMLColumn.instance.nullable();
+const stringAsNumberNullable = new NumberAsStringBaseColumn(
   defaultSchemaConfig
-);
+).nullable();
 const numericResultColumn = (q, arg) => {
   const type = typeof arg === "string" ? _getSelectableColumn(q, arg) : arg.result.value;
-  return type instanceof NumberBaseColumn ? float : stringAsNumber;
+  return type instanceof NumberBaseColumn ? floatNullable : stringAsNumberNullable;
 };
 class AggregateMethods {
   /**
@@ -7891,7 +7904,13 @@ class AggregateMethods {
    * @param options - aggregation options
    */
   count(arg = "*", options) {
-    return makeFnExpression(this, int, "count", [arg], options);
+    return makeFnExpression(
+      this,
+      intNullable,
+      "count",
+      [arg],
+      options
+    );
   }
   /**
    * Get the minimum value for the specified numeric column, returns number or `null` if there are no records.
@@ -8086,7 +8105,7 @@ class AggregateMethods {
   boolAnd(arg, options) {
     return makeFnExpression(
       this,
-      BooleanColumn.instance,
+      booleanNullable,
       "bool_and",
       [arg],
       options
@@ -8115,7 +8134,7 @@ class AggregateMethods {
   boolOr(arg, options) {
     return makeFnExpression(
       this,
-      BooleanColumn.instance,
+      booleanNullable,
       "bool_or",
       [arg],
       options
@@ -8127,7 +8146,7 @@ class AggregateMethods {
   every(arg, options) {
     return makeFnExpression(
       this,
-      BooleanColumn.instance,
+      booleanNullable,
       "every",
       [arg],
       options
@@ -8160,7 +8179,7 @@ class AggregateMethods {
   jsonAgg(arg, options) {
     return makeFnExpression(
       this,
-      JSONTextColumn.instance,
+      jsonTextNullable,
       "json_agg",
       [arg],
       options
@@ -8172,7 +8191,7 @@ class AggregateMethods {
   jsonbAgg(arg, options) {
     return makeFnExpression(
       this,
-      JSONTextColumn.instance,
+      jsonTextNullable,
       "jsonb_agg",
       [arg],
       options
@@ -8213,7 +8232,7 @@ class AggregateMethods {
   jsonObjectAgg(arg, options) {
     return makeFnExpression(
       this,
-      JSONTextColumn.instance,
+      jsonTextNullable,
       "json_object_agg",
       [{ pairs: arg }],
       options
@@ -8225,7 +8244,7 @@ class AggregateMethods {
   jsonbObjectAgg(arg, options) {
     return makeFnExpression(
       this,
-      JSONTextColumn.instance,
+      jsonTextNullable,
       "jsonb_object_agg",
       [{ pairs: arg }],
       options
@@ -8256,7 +8275,7 @@ class AggregateMethods {
   stringAgg(arg, delimiter, options) {
     return makeFnExpression(
       this,
-      TextColumn.instance,
+      textNullable,
       "string_agg",
       [arg, { value: delimiter }],
       options
@@ -8282,7 +8301,7 @@ class AggregateMethods {
   xmlAgg(arg, options) {
     return makeFnExpression(
       this,
-      XMLColumn.instance,
+      xmlNullable,
       "xmlagg",
       [arg],
       options
@@ -8307,7 +8326,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   rowNumber(over) {
-    return makeFnExpression(this, int, "row_number", orchidCore.emptyArray, {
+    return makeFnExpression(this, intNullable, "row_number", orchidCore.emptyArray, {
       over
     });
   }
@@ -8330,7 +8349,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   rank(over) {
-    return makeFnExpression(this, int, "rank", orchidCore.emptyArray, {
+    return makeFnExpression(this, intNullable, "rank", orchidCore.emptyArray, {
       over
     });
   }
@@ -8353,7 +8372,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   denseRank(over) {
-    return makeFnExpression(this, int, "dense_rank", orchidCore.emptyArray, {
+    return makeFnExpression(this, intNullable, "dense_rank", orchidCore.emptyArray, {
       over
     });
   }
@@ -8376,7 +8395,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   percentRank(over) {
-    return makeFnExpression(this, int, "percent_rank", orchidCore.emptyArray, {
+    return makeFnExpression(this, intNullable, "percent_rank", orchidCore.emptyArray, {
       over
     });
   }
@@ -8399,7 +8418,7 @@ class AggregateMethods {
    * @param over - OVER clause config
    */
   cumeDist(over) {
-    return makeFnExpression(this, float, "cume_dist", orchidCore.emptyArray, {
+    return makeFnExpression(this, floatNullable, "cume_dist", orchidCore.emptyArray, {
       over
     });
   }