pqb 0.43.2 → 0.43.4

package/dist/index.mjs

@@ -1001,9 +1001,9 @@ const makeVarArg = (_op) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   );
 };
-const quoteValue = (arg, ctx, quotedAs, jsonArray) => {
+const quoteValue = (arg, ctx, quotedAs, IN) => {
   if (arg && typeof arg === "object") {
-    if (!jsonArray && Array.isArray(arg)) {
+    if (IN && Array.isArray(arg)) {
       return `(${arg.map((value) => addValue(ctx.values, value)).join(", ")})`;
     }
     if (isExpression(arg)) {
@@ -1039,10 +1039,10 @@ const base = {
     (key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, ctx, quotedAs)}`
   ),
   in: make(
-    (key, value, ctx, quotedAs) => `${key} IN ${quoteValue(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} IN ${quoteValue(value, ctx, quotedAs, true)}`
   ),
   notIn: make(
-    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs, true)}`
   )
 };
 const boolean = {
@@ -1124,10 +1124,10 @@ const json = {
     { _op: jsonPathQueryOp }
   ),
   jsonSupersetOf: make(
-    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs, true)}`
+    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs)}`
   ),
   jsonSubsetOf: make(
-    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs, true)}`
+    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs)}`
   ),
   jsonSet: makeVarArg(
     (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${addValue(
@@ -1151,6 +1151,30 @@ const json = {
     (key, [path], ctx) => `(${key} #- ${encodeJsonPath(ctx, path)})`
   )
 };
+const array = {
+  ...base,
+  has: make(
+    (key, value, ctx, quotedAs) => `${quoteValue(value, ctx, quotedAs)} = ANY(${key})`
+  ),
+  hasEvery: make(
+    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs)}`
+  ),
+  hasSome: make(
+    (key, value, ctx, quotedAs) => `${key} && ${quoteValue(value, ctx, quotedAs)}`
+  ),
+  containedIn: make(
+    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs)}`
+  ),
+  length: make((key, value, ctx, quotedAs) => {
+    const expr = `COALESCE(array_length(${key}, 1), 0)`;
+    return typeof value === "number" ? `${expr} = ${quoteValue(value, ctx, quotedAs)}` : Object.keys(value).map(
+      (key2) => (
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        numeric[key2]._op(expr, value[key2], ctx, quotedAs)
+      )
+    ).join(" AND ");
+  })
+};
 const Operators = {
   any: base,
   boolean,
@@ -1159,7 +1183,7 @@ const Operators = {
   time: numeric,
   text,
   json,
-  array: base
+  array
 };
 
 class TextBaseColumn extends ColumnType {
@@ -2136,7 +2160,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     } else if (key === "SEARCH") {
       const search = value;
       ands.push(`${search.vectorSQL} @@ "${search.as}"`);
-    } else if (typeof value === "object" && value && !(value instanceof Date)) {
+    } else if (typeof value === "object" && value && !(value instanceof Date) && !Array.isArray(value)) {
       if (isExpression(value)) {
         ands.push(
           `${columnToSql(
@@ -5763,9 +5787,10 @@ const makeInsertSql = (ctx, q, query, quotedAs) => {
   }
   pushWhereStatementSql(ctx, q, query, quotedAs);
   let returning;
-  if (inCTE?.selectNum) {
+  if (inCTE) {
+    const select = inCTE.returning?.select;
     returning = {
-      select: inCTE.returning?.select ? "1, " + inCTE.returning.select : "1",
+      select: inCTE.selectNum || !select ? select ? "1, " + select : "1" : select,
       hookSelect: inCTE.returning?.hookSelect
     };
   } else {
@@ -5961,8 +5986,6 @@ const makeReturningSql = (ctx, q, data, quotedAs, hookSelectI, addHookSelectI) =
   let sql;
   if (tempSelect?.size || select?.length) {
     sql = selectToSql(ctx, q, data, quotedAs, tempSelect, void 0, true);
-  } else if (addHookSelectI) {
-    sql = "1";
   }
   return { select: sql, hookSelect: tempSelect };
 };
@@ -5986,7 +6009,7 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
       query,
       quotedAs
     );
-    return query.inCTE.selectNum ? select ? "0, " + select : "0" : select || "";
+    return query.inCTE.selectNum || !select ? select ? "0, " + select : "0" : select;
   }
   let selected;
   const list = [];
@@ -6482,7 +6505,7 @@ const pushUpdateReturning = (ctx, table, query, quotedAs, keyword) => {
     1,
     inCTE && 2
   );
-  const s = inCTE?.selectNum ? select ? "0, " + select : "0" : select;
+  const s = inCTE && (inCTE.selectNum || !select) ? select ? "0, " + select : "0" : select;
   if (s) ctx.sql.push(keyword, s);
   return hookSelect;
 };
@@ -7490,6 +7513,7 @@ function makeFnExpression(self, type, fn, args, options) {
     options,
     type
   );
+  q.q.transform = void 0;
   return q;
 }