Skip to content

Raise exceptions if index fields are missing #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Raise exceptions if index fields are missing #59

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0654418
Raise exceptions if index fields are missing
tobyhede Nov 4, 2024
13bf286
Add ore and sv tests
tobyhede Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 87 additions & 73 deletions sql/010-core.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,125 +159,147 @@ ALTER DOMAIN cs_encrypted_v1
);


DROP FUNCTION IF EXISTS cs_ciphertext_v1_v0_0(col jsonb);
DROP FUNCTION IF EXISTS cs_ciphertext_v1_v0_0(val jsonb);

CREATE FUNCTION cs_ciphertext_v1_v0_0(val jsonb)
RETURNS text
IMMUTABLE STRICT PARALLEL SAFE
AS $$
BEGIN
IF val ? 'c' THEN
RETURN val->>'c';
END IF;
RAISE 'Expected a ciphertext (c) value in json: %', val;
END;
$$ LANGUAGE plpgsql;

CREATE FUNCTION cs_ciphertext_v1_v0_0(col jsonb)
RETURNS text
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
BEGIN ATOMIC
RETURN col->>'c';
END;


DROP FUNCTION IF EXISTS cs_ciphertext_v1_v0(col jsonb);
DROP FUNCTION IF EXISTS cs_ciphertext_v1_v0(val jsonb);

CREATE FUNCTION cs_ciphertext_v1_v0(col 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(col);
RETURN cs_ciphertext_v1_v0_0(val);
END;


DROP FUNCTION IF EXISTS cs_ciphertext_v1(col jsonb);
DROP FUNCTION IF EXISTS cs_ciphertext_v1(val jsonb);

CREATE FUNCTION cs_ciphertext_v1(col jsonb)
CREATE FUNCTION cs_ciphertext_v1(val jsonb)
RETURNS text
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
BEGIN ATOMIC
RETURN cs_ciphertext_v1_v0_0(col);
RETURN cs_ciphertext_v1_v0_0(val);
END;


-- extracts match index from an emcrypted column
DROP FUNCTION IF EXISTS cs_match_v1_v0_0(col jsonb);
DROP FUNCTION IF EXISTS cs_match_v1_v0_0(val jsonb);

CREATE FUNCTION cs_match_v1_v0_0(col jsonb)
CREATE FUNCTION cs_match_v1_v0_0(val jsonb)
RETURNS cs_match_index_v1
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
BEGIN ATOMIC
SELECT ARRAY(SELECT jsonb_array_elements(col->'m'))::cs_match_index_v1;
END;
IMMUTABLE STRICT PARALLEL SAFE
AS $$
BEGIN

IF val ? 'm' THEN
RETURN ARRAY(SELECT jsonb_array_elements(val->'m'))::cs_match_index_v1;
END IF;
RAISE 'Expected a match index (m) value in json: %', val;
END;
$$ LANGUAGE plpgsql;


DROP FUNCTION IF EXISTS cs_match_v1_v0(col jsonb);
DROP FUNCTION IF EXISTS cs_match_v1_v0(val jsonb);

CREATE FUNCTION cs_match_v1_v0(col 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(col);
RETURN cs_match_v1_v0_0(val);
END;


DROP FUNCTION IF EXISTS cs_match_v1(col jsonb);
DROP FUNCTION IF EXISTS cs_match_v1(val jsonb);

CREATE FUNCTION cs_match_v1(col 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(col);
RETURN cs_match_v1_v0_0(val);
END;


-- extracts unique index from an encrypted column
DROP FUNCTION IF EXISTS cs_unique_v1_v0_0(col jsonb);
DROP FUNCTION IF EXISTS cs_unique_v1_v0_0(val jsonb);

CREATE FUNCTION cs_unique_v1_v0_0(col jsonb)
CREATE FUNCTION cs_unique_v1_v0_0(val jsonb)
RETURNS cs_unique_index_v1
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
BEGIN ATOMIC
RETURN col->>'u';
END;
IMMUTABLE STRICT PARALLEL SAFE
AS $$
BEGIN
IF val ? 'u' THEN
RETURN val->>'u';
END IF;
RAISE 'Expected a unique index (u) value in json: %', val;
END;
$$ LANGUAGE plpgsql;


DROP FUNCTION IF EXISTS cs_unique_v1_v0(col jsonb);
DROP FUNCTION IF EXISTS cs_unique_v1_v0(val jsonb);

CREATE FUNCTION cs_unique_v1_v0(col 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(col);
RETURN cs_unique_v1_v0_0(val);
END;


DROP FUNCTION IF EXISTS cs_unique_v1(col jsonb);
DROP FUNCTION IF EXISTS cs_unique_v1(val jsonb);

CREATE FUNCTION cs_unique_v1(col 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(col);
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_v0_0(col jsonb);
DROP FUNCTION IF EXISTS cs_ste_vec_v1_v0_0(val jsonb);

CREATE FUNCTION cs_ste_vec_v1_v0_0(col jsonb)
CREATE FUNCTION cs_ste_vec_v1_v0_0(val jsonb)
RETURNS cs_ste_vec_index_v1
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
BEGIN ATOMIC
SELECT (col->'sv')::cs_ste_vec_index_v1;
END;
IMMUTABLE STRICT PARALLEL SAFE
AS $$
BEGIN
IF val ? 'sv' THEN
RETURN (val->'sv')::cs_ste_vec_index_v1;
END IF;
RAISE 'Expected a structured vector index (sv) value in json: %', val;
END;
$$ LANGUAGE plpgsql;


DROP FUNCTION IF EXISTS cs_ste_vec_v1_v0(col jsonb);
DROP FUNCTION IF EXISTS cs_ste_vec_v1_v0(val jsonb);

CREATE FUNCTION cs_ste_vec_v1_v0(col 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(col);
RETURN cs_ste_vec_v1_v0_0(val);
END;


DROP FUNCTION IF EXISTS cs_ste_vec_v1(col jsonb);
DROP FUNCTION IF EXISTS cs_ste_vec_v1(val jsonb);

CREATE FUNCTION cs_ste_vec_v1(col 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(col);
RETURN cs_ste_vec_v1_v0_0(val);
END;


Expand All @@ -303,39 +325,31 @@ 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
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
BEGIN ATOMIC
SELECT (val->>'o')::ore_64_8_v1;
END;
IMMUTABLE STRICT PARALLEL SAFE
AS $$
BEGIN
IF val ? 'o' THEN
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(col jsonb);

CREATE FUNCTION cs_ore_64_8_v1_v0(col jsonb)
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(col);
RETURN cs_ore_64_8_v1_v0_0(val);
END;

DROP FUNCTION IF EXISTS cs_ore_64_8_v1(col jsonb);
DROP FUNCTION IF EXISTS cs_ore_64_8_v1(val jsonb);

CREATE FUNCTION cs_ore_64_8_v1(col 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(col);
RETURN cs_ore_64_8_v1_v0_0(val);
END;

DROP FUNCTION IF EXISTS _cs_first_grouped_value(jsonb, jsonb);

CREATE FUNCTION _cs_first_grouped_value(jsonb, jsonb)
RETURNS jsonb AS $$
SELECT COALESCE($1, $2);
$$ LANGUAGE sql IMMUTABLE;

DROP AGGREGATE IF EXISTS cs_grouped_value_v1(jsonb);

CREATE AGGREGATE cs_grouped_value_v1(jsonb) (
SFUNC = _cs_first_grouped_value,
STYPE = jsonb
);
43 changes: 43 additions & 0 deletions tests/core-functions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
\set ON_ERROR_STOP on


DO $$
BEGIN
ASSERT (SELECT EXISTS (SELECT cs_unique_v1('{"u": "u"}'::jsonb)));
ASSERT (SELECT EXISTS (SELECT cs_match_v1('{"m": []}'::jsonb)));
END;
$$ LANGUAGE plpgsql;

DO $$
BEGIN
-- sanity check
PERFORM cs_unique_v1('{"u": "u"}'::jsonb);

BEGIN
PERFORM cs_unique_v1_v0('{}'::jsonb);
RAISE NOTICE 'Missing index. Function call should have failed.';
ASSERT false;
EXCEPTION
WHEN OTHERS THEN
ASSERT true;
END;
END;
$$ LANGUAGE plpgsql;


DO $$
BEGIN
-- sanity check
PERFORM cs_match_v1('{"m": []}'::jsonb);

BEGIN
PERFORM cs_match_v1('{}'::jsonb);
RAISE NOTICE 'Missing index. Function call should have failed.';
ASSERT false;
EXCEPTION
WHEN OTHERS THEN
ASSERT true;
END;
END;
$$ LANGUAGE plpgsql;

Loading