Revert back to commit 01dcc24

sql/011-core-functions.sql

@@ -1,6 +1,6 @@
 DROP FUNCTION IF EXISTS cs_ciphertext_v1_v0_0(val jsonb);
 
-CREATE FUNCTION cs_ciphertext_v1(val jsonb)
+CREATE FUNCTION cs_ciphertext_v1_v0_0(val jsonb)
   RETURNS text
   IMMUTABLE STRICT PARALLEL SAFE
 AS $$
@@ -13,13 +13,30 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
------------------------------------------------------------------------------
+DROP FUNCTION IF EXISTS cs_ciphertext_v1_v0(val jsonb);
+
+CREATE FUNCTION cs_ciphertext_v1_v0(val jsonb)
+    RETURNS text
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_ciphertext_v1_v0_0(val);
+END;
+
+
+DROP FUNCTION IF EXISTS cs_ciphertext_v1(val jsonb);
+
+CREATE FUNCTION cs_ciphertext_v1(val jsonb)
+    RETURNS text
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_ciphertext_v1_v0_0(val);
+END;
 
 
 -- extracts match index from an emcrypted column
-DROP FUNCTION IF EXISTS cs_match_v1(val jsonb);
+DROP FUNCTION IF EXISTS cs_match_v1_v0_0(val jsonb);
 
-CREATE FUNCTION cs_match_v1(val jsonb)
+CREATE FUNCTION cs_match_v1_v0_0(val jsonb)
   RETURNS cs_match_index_v1
   IMMUTABLE STRICT PARALLEL SAFE
 AS $$
@@ -31,13 +48,31 @@ AS $$
   END;
 $$ LANGUAGE plpgsql;
 
------------------------------------------------------------------------------
+
+DROP FUNCTION IF EXISTS cs_match_v1_v0(val jsonb);
+
+CREATE FUNCTION cs_match_v1_v0(val jsonb)
+  RETURNS cs_match_index_v1
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_match_v1_v0_0(val);
+END;
+
+
+DROP FUNCTION IF EXISTS cs_match_v1(val jsonb);
+
+CREATE FUNCTION cs_match_v1(val jsonb)
+  RETURNS cs_match_index_v1
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_match_v1_v0_0(val);
+END;
 
 
 -- extracts unique index from an encrypted column
-DROP FUNCTION IF EXISTS  cs_unique_v1(val jsonb);
+DROP FUNCTION IF EXISTS  cs_unique_v1_v0_0(val jsonb);
 
-CREATE FUNCTION cs_unique_v1(val jsonb)
+CREATE FUNCTION cs_unique_v1_v0_0(val jsonb)
   RETURNS cs_unique_index_v1
   IMMUTABLE STRICT PARALLEL SAFE
 AS $$
@@ -50,12 +85,29 @@ AS $$
 $$ LANGUAGE plpgsql;
 
 
------------------------------------------------------------------------------
+DROP FUNCTION IF EXISTS  cs_unique_v1_v0(val jsonb);
+
+CREATE FUNCTION cs_unique_v1_v0(val jsonb)
+  RETURNS cs_unique_index_v1
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_unique_v1_v0_0(val);
+END;
+
+
+DROP FUNCTION IF EXISTS cs_unique_v1(val jsonb);
+
+CREATE FUNCTION cs_unique_v1(val jsonb)
+  RETURNS cs_unique_index_v1
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_unique_v1_v0_0(val);
+END;
 
 -- extracts json ste_vec index from an encrypted column
-DROP FUNCTION IF EXISTS cs_ste_vec_v1(val jsonb);
+DROP FUNCTION IF EXISTS cs_ste_vec_v1_v0_0(val jsonb);
 
-CREATE FUNCTION cs_ste_vec_v1(val jsonb)
+CREATE FUNCTION cs_ste_vec_v1_v0_0(val jsonb)
   RETURNS cs_ste_vec_index_v1
   IMMUTABLE STRICT PARALLEL SAFE
 AS $$
@@ -67,34 +119,77 @@ AS $$
   END;
 $$ LANGUAGE plpgsql;
 
------------------------------------------------------------------------------
 
+DROP FUNCTION IF EXISTS cs_ste_vec_v1_v0(val jsonb);
 
-DROP FUNCTION IF EXISTS jsonb_array_to_bytea_array(val jsonb);
+CREATE FUNCTION cs_ste_vec_v1_v0(val jsonb)
+  RETURNS cs_ste_vec_index_v1
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_ste_vec_v1_v0_0(val);
+END;
 
-CREATE FUNCTION jsonb_array_to_bytea_array(val jsonb)
-RETURNS bytea[] AS $$
-    SELECT array_agg(decode(value::text, 'hex'))
-    FROM jsonb_array_elements_text(val) AS value;
-$$ LANGUAGE sql;
 
+DROP FUNCTION IF EXISTS cs_ste_vec_v1(val jsonb);
 
-DROP FUNCTION IF EXISTS cs_ore_64_8_v1(val jsonb);
+CREATE FUNCTION cs_ste_vec_v1(val jsonb)
+  RETURNS cs_ste_vec_index_v1
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_ste_vec_v1_v0_0(val);
+END;
 
-CREATE FUNCTION cs_ore_64_8_v1(val jsonb)
-  RETURNS ore_64_8_index_v1
+
+-- casts text to ore_64_8_v1_term (bytea)
+DROP FUNCTION IF EXISTS _cs_text_to_ore_64_8_v1_term_v1_0(t text);
+
+CREATE FUNCTION _cs_text_to_ore_64_8_v1_term_v1_0(t text)
+  RETURNS ore_64_8_v1_term
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN t::bytea;
+END;
+
+-- cast to cleanup ore_64_8_v1 extraction
+DROP CAST IF EXISTS (text AS ore_64_8_v1_term);
+
+CREATE CAST (text AS ore_64_8_v1_term)
+	WITH FUNCTION _cs_text_to_ore_64_8_v1_term_v1_0(text) AS IMPLICIT;
+
+
+-- extracts ore index from an encrypted column
+DROP FUNCTION IF EXISTS cs_ore_64_8_v1_v0_0(val jsonb);
+
+CREATE FUNCTION cs_ore_64_8_v1_v0_0(val jsonb)
+  RETURNS ore_64_8_v1
   IMMUTABLE STRICT PARALLEL SAFE
 AS $$
 	BEGIN
     IF val ? 'o' THEN
-      RETURN jsonb_array_to_bytea_array(val->'o');
+      RETURN (val->>'o')::ore_64_8_v1;
     END IF;
     RAISE 'Expected an ore index (o) value in json: %', val;
   END;
 $$ LANGUAGE plpgsql;
 
------------------------------------------------------------------------------
 
+DROP FUNCTION IF EXISTS cs_ore_64_8_v1_v0(val jsonb);
+
+CREATE FUNCTION cs_ore_64_8_v1_v0(val jsonb)
+  RETURNS ore_64_8_v1
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_ore_64_8_v1_v0_0(val);
+END;
+
+DROP FUNCTION IF EXISTS cs_ore_64_8_v1(val jsonb);
+
+CREATE FUNCTION cs_ore_64_8_v1(val jsonb)
+  RETURNS ore_64_8_v1
+  LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
+BEGIN ATOMIC
+	RETURN cs_ore_64_8_v1_v0_0(val);
+END;
 
 DROP FUNCTION IF EXISTS _cs_first_grouped_value(jsonb, jsonb);