Jsonb functions accept eql_v2_encrypted as selector param

src/encrypted/functions.sql

@@ -73,3 +73,15 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
+CREATE FUNCTION eql_v2.meta_data(val jsonb)
+  RETURNS jsonb
+  IMMUTABLE STRICT PARALLEL SAFE
+AS $$
+	BEGIN
+     RETURN jsonb_build_object(
+      'i', val->'i',
+      'v', val->'v'
+    );
+  END;
+$$ LANGUAGE plpgsql;
+

src/jsonb/functions.sql

@@ -30,13 +30,17 @@ AS $$
     sv eql_v2_encrypted[];
     found jsonb[];
     e jsonb;
+    meta jsonb;
     ary boolean;
   BEGIN
 
     IF val IS NULL THEN
       RETURN NEXT NULL;
     END IF;
 
+    -- Column identifier and version
+    meta := eql_v2.meta_data(val);
+
     sv := eql_v2.ste_vec(val);
 
     FOR idx IN 1..array_length(sv, 1) LOOP
@@ -55,13 +59,14 @@ AS $$
 
       IF ary THEN
         -- Wrap found array elements as eql_v2_encrypted
-        RETURN NEXT jsonb_build_object(
+
+        RETURN NEXT (meta || jsonb_build_object(
           'sv', found,
           'a', 1
-        )::eql_v2_encrypted;
+        ))::eql_v2_encrypted;
 
       ELSE
-        RETURN NEXT found[1]::eql_v2_encrypted;
+        RETURN NEXT (meta || found[1])::eql_v2_encrypted;
       END IF;
 
     END IF;
@@ -71,6 +76,16 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
+CREATE FUNCTION eql_v2.jsonb_path_query(val eql_v2_encrypted, selector eql_v2_encrypted)
+  RETURNS SETOF eql_v2_encrypted
+  IMMUTABLE STRICT PARALLEL SAFE
+AS $$
+  BEGIN
+    RETURN QUERY
+    SELECT * FROM eql_v2.jsonb_path_query(val.data, eql_v2.selector(selector));
+  END;
+$$ LANGUAGE plpgsql;
+
 
 CREATE FUNCTION eql_v2.jsonb_path_query(val eql_v2_encrypted, selector text)
   RETURNS SETOF eql_v2_encrypted
@@ -83,6 +98,8 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
+------------------------------------------------------------------------------------
+
 
 CREATE FUNCTION eql_v2.jsonb_path_exists(val jsonb, selector text)
   RETURNS boolean
@@ -96,6 +113,17 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
+CREATE FUNCTION eql_v2.jsonb_path_exists(val eql_v2_encrypted, selector eql_v2_encrypted)
+  RETURNS boolean
+  IMMUTABLE STRICT PARALLEL SAFE
+AS $$
+  BEGIN
+    RETURN EXISTS (
+      SELECT eql_v2.jsonb_path_query(val, eql_v2.selector(selector))
+    );
+  END;
+$$ LANGUAGE plpgsql;
+
 
 CREATE FUNCTION eql_v2.jsonb_path_exists(val eql_v2_encrypted, selector text)
   RETURNS boolean
@@ -109,8 +137,8 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
---
---
+------------------------------------------------------------------------------------
+
 
 CREATE FUNCTION eql_v2.jsonb_path_query_first(val jsonb, selector text)
   RETURNS eql_v2_encrypted
@@ -128,6 +156,19 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
+CREATE FUNCTION eql_v2.jsonb_path_query_first(val eql_v2_encrypted, selector eql_v2_encrypted)
+  RETURNS eql_v2_encrypted
+  IMMUTABLE STRICT PARALLEL SAFE
+AS $$
+  BEGIN
+    RETURN (
+        SELECT e
+        FROM eql_v2.jsonb_path_query(val.data, eql_v2.selector(selector)) as e
+        LIMIT 1
+    );
+  END;
+$$ LANGUAGE plpgsql;
+
 
 CREATE FUNCTION eql_v2.jsonb_path_query_first(val eql_v2_encrypted, selector text)
   RETURNS eql_v2_encrypted
@@ -144,7 +185,7 @@ $$ LANGUAGE plpgsql;
 
 
 
---
+------------------------------------------------------------------------------------
 
 
 -- =====================================================================

src/jsonb/functions_test.sql

@@ -5,87 +5,62 @@ SELECT create_table_with_encrypted();
 SELECT seed_encrypted_json();
 
 
--- CREATE TABLE unencrypted
--- (
---     id bigint GENERATED ALWAYS AS IDENTITY,
---     u jsonb,
---     PRIMARY KEY(id)
--- );
--- INSERT INTO unencrypted (u)
--- VALUES
---     ('{"a": [1, 2, 3] }'),
---     ('{"a": [1, 2, 3, 4] }'),
---     ('{"a": [1, 2, 3, 4, 5] }');
-
--- SELECT *
--- FROM unencrypted
--- WHERE EXISTS (
---   SELECT 1
---   FROM jsonb_array_elements(u->'a') AS elem
---   WHERE elem::int < 2
--- );
-
--- SELECT seed_encrypted(get_array_ste_vec()::eql_v2_encrypted);
--- SELECT *
--- FROM encrypted
--- WHERE EXISTS (
---   SELECT 1
---   FROM eql_v2.jsonb_array_elements(e->'f510853730e1c3dbd31b86963f029dd5') AS elem
---   WHERE elem > '{"ocf": "b0c0a7385cb2f7dfe32a2649a9d8294794b8fc05585a240c1315f1e45ee7d9012616db3f01b43fa94351618670a29c24fc75df1392d52764c757b34495888b1c"}'::jsonb
--- );
-
--- SELECT eql_v2.jsonb_path_query_first(e, '33743aed3ae636f6bf05cff11ac4b519') as e
--- FROM encrypted
--- WHERE eql_v2.jsonb_path_query(e, '33743aed3ae636f6bf05cff11ac4b519') IS NOT NULL;
-
-
-
--- "ocf": "b0c0a7385cb2f7dfe32a2649a9d8294794b8fc05585a240c1315f1e45ee7d9012616db3f01b43fa94351618670a29c24fc75df1392d52764c757b34495888b1c",
-
--- SELECT eql_v2.jsonb_array_elements(eql_v2.jsonb_path_query(e, 'f510853730e1c3dbd31b86963f029dd5')) as e FROM encrypted ;
-
-
-
+-- ========================================================================
+--
+-- Selector &.a[*]
+--  -> 33743aed3ae636f6bf05cff11ac4b519
+--
+DO $$
+  BEGIN
 
--- -- SELECT eql_v2.jsonb_path_exists(e, ''f510853730e1c3dbd31b86963f029dd5'') FROM encrypted;
--- -- SELECT eql_v2.jsonb_path_query(e, 'f510853730e1c3dbd31b86963f029dd5') FROM encrypted;
+    PERFORM seed_encrypted_json();
+    PERFORM seed_encrypted(get_array_ste_vec()::eql_v2_encrypted);
 
--- -- SELECT eql_v2.jsonb_path_query(e, 'f510853730e1c3dbd31b86963f029dd5') as e FROM encrypted;
--- -- SELECT eql_v2.jsonb_array_length(eql_v2.jsonb_path_query(e, 'f510853730e1c3dbd31b86963f029dd5')) as e FROM encrypted LIMIT 1;
--- -- SELECT eql_v2.jsonb_array_elements(eql_v2.jsonb_path_query(e, 'f510853730e1c3dbd31b86963f029dd5')) as e FROM encrypted ;
--- -- SELECT eql_v2.jsonb_array_elements_text(eql_v2.jsonb_path_query(e, 'f510853730e1c3dbd31b86963f029dd5')) as e FROM encrypted ;
--- -- SELECT eql_v2.jsonb_array_length(eql_v2.jsonb_path_query(e, 'f510853730e1c3dbd31b86963f029dd5')) as e FROM encrypted LIMIT 1;
--- -- SELECT eql_v2.jsonb_path_query(e, 'f510853730e1c3dbd31b86963f029dd5') as e FROM encrypted;
+    PERFORM assert_result(
+      'jsonb_array_elements returns array elements from jsonb_path_query result',
+      'SELECT eql_v2.jsonb_array_elements(eql_v2.jsonb_path_query(e, ''f510853730e1c3dbd31b86963f029dd5'')) as e FROM encrypted;');
 
+    PERFORM assert_count(
+      'jsonb_array_elements returns the correct number of array elements from jsonb_path_query result',
+      'SELECT eql_v2.jsonb_array_elements(eql_v2.jsonb_path_query(e, ''f510853730e1c3dbd31b86963f029dd5'')) as e FROM encrypted;',
+      5);
 
+    PERFORM assert_exception(
+      'jsonb_array_elements exception if input is not an array',
+      'SELECT eql_v2.jsonb_array_elements(eql_v2.jsonb_path_query(e, ''33743aed3ae636f6bf05cff11ac4b519'')) as e FROM encrypted LIMIT 1;');
 
+  END;
+$$ LANGUAGE plpgsql;
 
--- ========================================================================
 --
--- Selector &.a[*]
+-- Selector &.a[*] as eql_v2_encrypted
 --  -> 33743aed3ae636f6bf05cff11ac4b519
 --
 DO $$
 DECLARE
-    sv eql_v2_encrypted;
-    results eql_v2_encrypted[];
+    selector eql_v2_encrypted;
+
   BEGIN
 
     PERFORM seed_encrypted_json();
     PERFORM seed_encrypted(get_array_ste_vec()::eql_v2_encrypted);
 
+    selector := '{"s": "f510853730e1c3dbd31b86963f029dd5"}'::jsonb::eql_v2_encrypted;
+
     PERFORM assert_result(
-      'jsonb_array_elements returns array elements from jsonb_path_query result',
-      'SELECT eql_v2.jsonb_array_elements(eql_v2.jsonb_path_query(e, ''f510853730e1c3dbd31b86963f029dd5'')) as e FROM encrypted;');
+      'jsonb_array_elements returns array elements from jsonb_path_query result using eql_v2_encrypted selector',
+      format('SELECT eql_v2.jsonb_array_elements_text(eql_v2.jsonb_path_query(e, %L::eql_v2_encrypted)) as e FROM encrypted;', selector));
 
     PERFORM assert_count(
       'jsonb_array_elements returns the correct number of array elements from jsonb_path_query result',
-      'SELECT eql_v2.jsonb_array_elements(eql_v2.jsonb_path_query(e, ''f510853730e1c3dbd31b86963f029dd5'')) as e FROM encrypted;',
+      format('SELECT eql_v2.jsonb_array_elements_text(eql_v2.jsonb_path_query(e, %L::eql_v2_encrypted)) as e FROM encrypted;', selector),
       5);
 
+    selector := '{"s": "33743aed3ae636f6bf05cff11ac4b519"}'::jsonb::eql_v2_encrypted;
+
     PERFORM assert_exception(
       'jsonb_array_elements exception if input is not an array',
-      'SELECT eql_v2.jsonb_array_elements(eql_v2.jsonb_path_query(e, ''33743aed3ae636f6bf05cff11ac4b519'')) as e FROM encrypted LIMIT 1;');
+      format('SELECT eql_v2.jsonb_array_elements_text(eql_v2.jsonb_path_query(e, %L::eql_v2_encrypted)) as e FROM encrypted;', selector));
 
   END;
 $$ LANGUAGE plpgsql;
@@ -217,6 +192,22 @@ DO $$
 $$ LANGUAGE plpgsql;
 
 
+DO $$
+  DECLARE
+    result jsonb;
+  BEGIN
+    PERFORM seed_encrypted_json();
+
+    SELECT eql_v2.jsonb_path_query(e, '2517068c0d1f9d4d41d2c666211f785e')::jsonb FROM encrypted LIMIT 1 INTO result;
+
+    ASSERT result ? 'i';
+    ASSERT result ? 'v';
+
+  END;
+$$ LANGUAGE plpgsql;
+
+
+
 DO $$
   BEGIN
 

src/ste_vec/functions.sql

@@ -45,6 +45,10 @@ CREATE FUNCTION eql_v2.selector(val jsonb)
   IMMUTABLE STRICT PARALLEL SAFE
 AS $$
 	BEGIN
+    IF val IS NULL THEN
+      RETURN NULL;
+    END IF;
+
     IF val ? 's' THEN
       RETURN val->>'s';
     END IF;

tests/test_helpers.sql

@@ -320,6 +320,7 @@ AS $$
           "hm": "unique.%s",
           "b3": "blake3.%s",
           "bf": %s,
+
           "v": 2
         }',
         random_key,