feat: add metadata to ste_vec records

Author: tobyhede

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;

src/jsonb/functions_test.sql

@@ -192,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
 

tests/test_helpers.sql

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