pqb 0.46.4 → 0.47.1

package/dist/index.js

@@ -2156,7 +2156,7 @@ const makeRowToJson = (table, shape, aliasName) => {
       `'${key}', "${table}"."${aliasName && column.data.name || key}"${column.data.jsonCast ? `::${column.data.jsonCast}` : ""}`
     );
   }
-  return isSimple ? `row_to_json("${table}".*)` : "json_build_object(" + list.join(", ") + ")";
+  return isSimple ? `row_to_json("${table}".*)` : `CASE WHEN "${table}".* IS NULL THEN NULL ELSE json_build_object(` + list.join(", ") + ") END";
 };
 
 const queryTypeWithLimitOne = {
@@ -5987,14 +5987,21 @@ const subJoinToSql = (ctx, jq, innerAs, outerAs, cloned) => {
   )}) ${outerAs || innerAs}`;
 };
 const processArgs = (args, ctx, query, joinAs, joinShape, quotedAs) => {
-  return args.length === 1 ? getObjectOrRawConditions(ctx, query, args[0], quotedAs, joinAs, joinShape) : getConditionsFor3Or4LengthItem(
+  return args.length ? args.length === 1 ? getObjectOrRawConditions(
+    ctx,
+    query,
+    args[0],
+    quotedAs,
+    joinAs,
+    joinShape
+  ) : getConditionsFor3Or4LengthItem(
     ctx,
     query,
     joinAs,
     quotedAs,
     args,
     joinShape
-  );
+  ) : void 0;
 };
 const getConditionsFor3Or4LengthItem = (ctx, query, target, quotedAs, args, joinShape) => {
   const [leftColumn, opOrRightColumn, maybeRightColumn] = args;
@@ -8297,7 +8304,7 @@ const handleOneData = (q, data, ctx) => {
     columns.map(
       (key) => (
         // undefined values were stripped and no need to check for them
-        encoders[key] && !orchidCore.isExpression(data[key]) ? encoders[key](data[key]) : data[key]
+        encoders[key] && !orchidCore.isExpression(data[key]) && data[key] !== null ? encoders[key](data[key]) : data[key]
       )
     )
   ];