@hozon/adapter 0.2.0 → 0.2.1

package/lib/postgres.js

@@ -92,8 +92,8 @@ export class AbstractPostgresAdapter {
         return sql`${expression} ILIKE ${pattern} ESCAPE '\\'`;
     }
     arrayIncludesAllPredicate(expression, values) {
-        // Native jsonb containment: works for string and numeric elements alike. NULL node
-        // coalesces to an empty array, which is a subset only of another empty set.
+        // Native jsonb containment: works for string and numeric elements alike. A node that is
+        // not an array (NULL, a scalar or an object) counts as an empty array.
         // Cast via ::text::jsonb, not a direct ::jsonb: postgres.js infers the parameter's
         // wire type from a trailing ::jsonb cast and re-encodes the JS string as a jsonb
         // *string scalar* instead of sending it as text for the server to parse, so a
@@ -102,13 +102,13 @@ export class AbstractPostgresAdapter {
         // included, contains the empty set) — identical on every backend.
         const distinct = Array.from(new Set(values));
         if (distinct.length === 0) return sql`1 = 1`;
-        return sql`COALESCE(${expression}, '[]'::jsonb) @> ${JSON.stringify(distinct)}::text::jsonb`;
+        return sql`(CASE WHEN jsonb_typeof(${expression}) = 'array' THEN ${expression} ELSE '[]'::jsonb END) @> ${JSON.stringify(distinct)}::text::jsonb`;
     }
     arrayIncludesAnyPredicate(expression, values) {
         // An empty list matches nothing; never emit `IN ()`, which Postgres rejects.
         if (values.length === 0) return sql`1 = 0`;
         // Elements, not `?|`, so numeric arrays are covered too (`?|` only matches string keys).
-        return sql`EXISTS (SELECT 1 FROM jsonb_array_elements_text(COALESCE(${expression}, '[]'::jsonb)) AS _t WHERE _t IN (${sql.join(values.map((v)=>sql`${v}`))}))`;
+        return sql`EXISTS (SELECT 1 FROM jsonb_array_elements_text(CASE WHEN jsonb_typeof(${expression}) = 'array' THEN ${expression} ELSE '[]'::jsonb END) AS _t WHERE _t IN (${sql.join(values.map((v)=>sql`${v}`))}))`;
     }
     arrayPresencePredicate(expression, mode) {
         // null/nonNull/empty/nonEmpty must see the true NULL, so the node is never coalesced

package/lib/sqlite.js

@@ -101,12 +101,12 @@ export class AbstractSQLiteAdapter {
         if (distinct.length === 0) return sql`1 = 1`;
         // NULL/absent node -> json_each yields zero rows -> COUNT(DISTINCT value) = 0, never
         // equal to a positive set size.
-        return sql`(SELECT COUNT(DISTINCT value) FROM json_each(COALESCE(${expression}, '[]')) WHERE value IN (${sql.join(distinct.map((v)=>sql`${v}`))})) = ${distinct.length}`;
+        return sql`(SELECT COUNT(DISTINCT value) FROM json_each(CASE WHEN json_type(${expression}) = 'array' THEN ${expression} ELSE '[]' END) WHERE value IN (${sql.join(distinct.map((v)=>sql`${v}`))})) = ${distinct.length}`;
     }
     arrayIncludesAnyPredicate(expression, values) {
         // An empty list matches nothing; never emit `IN ()` (portable with Postgres).
         if (values.length === 0) return sql`1 = 0`;
-        return sql`EXISTS (SELECT 1 FROM json_each(COALESCE(${expression}, '[]')) WHERE value IN (${sql.join(values.map((v)=>sql`${v}`))}))`;
+        return sql`EXISTS (SELECT 1 FROM json_each(CASE WHEN json_type(${expression}) = 'array' THEN ${expression} ELSE '[]' END) WHERE value IN (${sql.join(values.map((v)=>sql`${v}`))}))`;
     }
     arrayPresencePredicate(expression, mode) {
         // null/nonNull/empty/nonEmpty must see the true NULL, so the node is never coalesced

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hozon/adapter",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Database adapter interfaces and dialect behavior for Hozon",
   "repository": {
     "type": "git",