feat: -> and ->> variants with eql_v2_enctrypted selector

Author: tobyhede

src/operators/->.sql

@@ -5,19 +5,15 @@
 
 
 --
--- The -> operator returns an encrypted matching the selector
+-- The -> operator returns an encrypted matching the provided selector
+--
 -- Encyprted JSON is represented as an array of `eql_v2_encrypted`.
--- Each `eql_v2_encrypted` value has a selector, ciphertext, and an index term of
---   - blake3
---   - ore_cllw_u64_8
---   - ore_cllw_var_8
+-- Each `eql_v2_encrypted` value has a selector, ciphertext, and an index term
 --
 --     {
 --       "sv": [ {"c": "", "s": "", "b3": "" } ]
 --     }
 --
-
-
 CREATE FUNCTION eql_v2."->"(e eql_v2_encrypted, selector text)
   RETURNS eql_v2_encrypted
   IMMUTABLE STRICT PARALLEL SAFE
@@ -43,10 +39,35 @@ AS $$
   END;
 $$ LANGUAGE plpgsql;
 
+CREATE OPERATOR ->(
+  FUNCTION=eql_v2."->",
+  LEFTARG=eql_v2_encrypted,
+  RIGHTARG=text
+);
+
 
---
+---------------------------------------------------
 
 
+CREATE FUNCTION eql_v2."->"(e eql_v2_encrypted, selector eql_v2_encrypted)
+  RETURNS eql_v2_encrypted
+  IMMUTABLE STRICT PARALLEL SAFE
+AS $$
+	BEGIN
+    RETURN eql_v2."->"(e, eql_v2.selector(selector));
+  END;
+$$ LANGUAGE plpgsql;
+
+
+
+CREATE OPERATOR ->(
+  FUNCTION=eql_v2."->",
+  LEFTARG=eql_v2_encrypted,
+  RIGHTARG=eql_v2_encrypted
+);
+
+
+---------------------------------------------------
 
 
 CREATE FUNCTION eql_v2."->"(e eql_v2_encrypted, selector integer)
@@ -76,11 +97,7 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
-CREATE OPERATOR ->(
-  FUNCTION=eql_v2."->",
-  LEFTARG=eql_v2_encrypted,
-  RIGHTARG=text
-);
+
 
 
 CREATE OPERATOR ->(

src/operators/->>.sql

@@ -11,9 +11,7 @@ AS $$
   DECLARE
     found eql_v2_encrypted;
 	BEGIN
-
     found = eql_v2."->"(e, selector);
-
     RETURN eql_v2.ciphertext(found);
   END;
 $$ LANGUAGE plpgsql;
@@ -26,3 +24,22 @@ CREATE OPERATOR ->> (
 );
 
 
+
+---------------------------------------------------
+
+
+CREATE FUNCTION eql_v2."->>"(e eql_v2_encrypted, selector eql_v2_encrypted)
+  RETURNS text
+  IMMUTABLE STRICT PARALLEL SAFE
+AS $$
+	BEGIN
+    RETURN eql_v2."->>"(e, eql_v2.selector(selector));
+  END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OPERATOR ->> (
+  FUNCTION=eql_v2."->>",
+  LEFTARG=eql_v2_encrypted,
+  RIGHTARG=eql_v2_encrypted
+);

src/operators/->>_test.sql

@@ -3,6 +3,7 @@
 SELECT create_table_with_encrypted();
 SELECT seed_encrypted_json();
 
+
 --
 -- The ->> operator returns ciphertext matching the selector
 DO $$
@@ -43,3 +44,24 @@ DO $$
   END;
 $$ LANGUAGE plpgsql;
 
+
+--
+-- The ->> operator accepts an eql_v2_encrypted as the selector
+--
+DO $$
+ DECLARE
+    term text;
+  BEGIN
+    term := '{"s": "bca213de9ccce676fa849ff9c4807963"}';
+
+    PERFORM assert_result(
+        'Selector ->> returns at least one eql_v2_encrypted',
+        format('SELECT e->>%L::jsonb::eql_v2_encrypted FROM encrypted;', term));
+
+    PERFORM assert_count(
+        'Selector ->> returns all eql_v2_encrypted',
+        format('SELECT e->>%L::jsonb::eql_v2_encrypted FROM encrypted;', term),
+        3);
+  END;
+$$ LANGUAGE plpgsql;
+

src/operators/->_test.sql

@@ -5,6 +5,7 @@ SELECT create_table_with_encrypted();
 SELECT seed_encrypted_json();
 
 
+
 --
 -- The -> operator returns an encrypted matching the selector
 DO $$
@@ -34,6 +35,27 @@ $$ LANGUAGE plpgsql;
 
 
 
+--
+-- The -> operator accepts an eql_v2_encrypted as the selector
+--
+DO $$
+ DECLARE
+    term text;
+  BEGIN
+    term := '{"s": "bca213de9ccce676fa849ff9c4807963"}';
+
+    PERFORM assert_result(
+        'Selector -> returns at least one eql_v2_encrypted',
+        format('SELECT e->%L::jsonb::eql_v2_encrypted FROM encrypted;', term));
+
+    PERFORM assert_count(
+        'Selector -> returns all eql_v2_encrypted',
+        format('SELECT e->%L::jsonb::eql_v2_encrypted FROM encrypted;', term),
+        3);
+  END;
+$$ LANGUAGE plpgsql;
+
+
 --
 -- encrypted returned from -> operator expression called via eql_v2.ciphertext
 --