Skip to content

fix: Use ~~ as match operator #96

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 1 commit into from
Mar 20, 2025
Merged

fix: Use ~~ as match operator #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
143 changes: 100 additions & 43 deletions sql/016-operators-match.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
--
-- Support for the following comparisons:
--
-- cs_encrypted_v1 @> cs_encrypted_v1
-- cs_encrypted_v1 @> jsonb
-- cs_encrypted_v1 @> cs_match_index_v1
-- cs_encrypted_v1 ~~ cs_encrypted_v1
-- cs_encrypted_v1 ~~ jsonb
-- cs_encrypted_v1 ~~ cs_match_index_v1
--

DROP OPERATOR IF EXISTS @> (cs_encrypted_v1, cs_encrypted_v1);
DROP FUNCTION IF EXISTS cs_encrypted_contains_v1(a cs_encrypted_v1, b cs_encrypted_v1);
DROP OPERATOR IF EXISTS ~~ (cs_encrypted_v1, cs_encrypted_v1);
DROP FUNCTION IF EXISTS cs_encrypted_match_v1(a cs_encrypted_v1, b cs_encrypted_v1);

CREATE FUNCTION cs_encrypted_contains_v1(a cs_encrypted_v1, b cs_encrypted_v1)
CREATE FUNCTION cs_encrypted_match_v1(a cs_encrypted_v1, b cs_encrypted_v1)
RETURNS boolean AS $$
SELECT cs_match_v1(a) @> cs_match_v1(b);
$$ LANGUAGE SQL;

CREATE OPERATOR @>(
PROCEDURE="cs_encrypted_contains_v1",
CREATE OPERATOR ~~(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_encrypted_v1,
RIGHTARG=cs_encrypted_v1,
RESTRICT = eqsel,
Expand All @@ -25,17 +25,37 @@ CREATE OPERATOR @>(
MERGES
);

CREATE OPERATOR ~~*(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_encrypted_v1,
RIGHTARG=cs_encrypted_v1,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);

DROP OPERATOR IF EXISTS @> (cs_encrypted_v1, cs_match_index_v1);
DROP FUNCTION IF EXISTS cs_encrypted_contains_v1(a cs_encrypted_v1, b cs_match_index_v1);

CREATE FUNCTION cs_encrypted_contains_v1(a cs_encrypted_v1, b cs_match_index_v1)
DROP OPERATOR IF EXISTS ~~ (cs_encrypted_v1, cs_match_index_v1);
DROP FUNCTION IF EXISTS cs_encrypted_match_v1(a cs_encrypted_v1, b cs_match_index_v1);

CREATE FUNCTION cs_encrypted_match_v1(a cs_encrypted_v1, b cs_match_index_v1)
RETURNS boolean AS $$
SELECT cs_match_v1(a) @> b;
$$ LANGUAGE SQL;

CREATE OPERATOR @>(
PROCEDURE="cs_encrypted_contains_v1",
CREATE OPERATOR ~~(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_encrypted_v1,
RIGHTARG=cs_match_index_v1,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);

CREATE OPERATOR ~~*(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_encrypted_v1,
RIGHTARG=cs_match_index_v1,
RESTRICT = eqsel,
Expand All @@ -46,16 +66,16 @@ CREATE OPERATOR @>(



DROP OPERATOR IF EXISTS @> (cs_match_index_v1, cs_encrypted_v1);
DROP FUNCTION IF EXISTS cs_encrypted_contains_v1(a cs_match_index_v1, b cs_encrypted_v1);
DROP OPERATOR IF EXISTS ~~ (cs_match_index_v1, cs_encrypted_v1);
DROP FUNCTION IF EXISTS cs_encrypted_match_v1(a cs_match_index_v1, b cs_encrypted_v1);

CREATE FUNCTION cs_encrypted_contains_v1(a cs_match_index_v1, b cs_encrypted_v1)
CREATE FUNCTION cs_encrypted_match_v1(a cs_match_index_v1, b cs_encrypted_v1)
RETURNS boolean AS $$
SELECT a @> cs_match_v1(b);
$$ LANGUAGE SQL;

CREATE OPERATOR @>(
PROCEDURE="cs_encrypted_contains_v1",
CREATE OPERATOR ~~(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_match_index_v1,
RIGHTARG=cs_encrypted_v1,
RESTRICT = eqsel,
Expand All @@ -64,67 +84,104 @@ CREATE OPERATOR @>(
MERGES
);


-----------------------------------------------------------------------------
CREATE OPERATOR ~~*(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_match_index_v1,
RIGHTARG=cs_encrypted_v1,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);


DROP OPERATOR IF EXISTS <@ (cs_encrypted_v1, cs_encrypted_v1);
DROP FUNCTION IF EXISTS cs_encrypted_contained_v1(a cs_encrypted_v1, b cs_encrypted_v1);
DROP OPERATOR IF EXISTS ~~ (cs_match_index_v1, cs_match_index_v1);
DROP FUNCTION IF EXISTS cs_encrypted_match_v1(a cs_match_index_v1, b cs_match_index_v1);

CREATE FUNCTION cs_encrypted_contained_v1(a cs_encrypted_v1, b cs_encrypted_v1)
CREATE FUNCTION cs_encrypted_match_v1(a cs_match_index_v1, b cs_match_index_v1)
RETURNS boolean AS $$
SELECT cs_match_v1(a) <@ cs_match_v1(b);
SELECT a @> b;
$$ LANGUAGE SQL;

CREATE OPERATOR <@(
PROCEDURE="cs_encrypted_contained_v1",
LEFTARG=cs_encrypted_v1,
RIGHTARG=cs_encrypted_v1,
CREATE OPERATOR ~~(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_match_index_v1,
RIGHTARG=cs_match_index_v1,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);

CREATE OPERATOR ~~*(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_match_index_v1,
RIGHTARG=cs_match_index_v1,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);


DROP OPERATOR IF EXISTS <@ (cs_encrypted_v1, cs_match_index_v1);
DROP FUNCTION IF EXISTS cs_encrypted_contained_v1(a cs_encrypted_v1, b cs_match_index_v1);
DROP OPERATOR IF EXISTS ~~ (cs_encrypted_v1, jsonb);
DROP FUNCTION IF EXISTS cs_encrypted_match_v1(a cs_encrypted_v1, b jsonb);

CREATE FUNCTION cs_encrypted_contained_v1(a cs_encrypted_v1, b cs_match_index_v1)
CREATE FUNCTION cs_encrypted_match_v1(a cs_encrypted_v1, b jsonb)
RETURNS boolean AS $$
SELECT cs_match_v1(a) <@ b;
SELECT cs_match_v1(a) @> cs_match_v1(b);
$$ LANGUAGE SQL;

CREATE OPERATOR <@ (
PROCEDURE="cs_encrypted_contained_v1",
CREATE OPERATOR ~~(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_encrypted_v1,
RIGHTARG=cs_match_index_v1,
RIGHTARG=jsonb,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);

CREATE OPERATOR ~~*(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=cs_encrypted_v1,
RIGHTARG=jsonb,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);


DROP OPERATOR IF EXISTS <@ (cs_match_index_v1, cs_encrypted_v1);
DROP FUNCTION IF EXISTS cs_encrypted_contained_v1(a cs_match_index_v1, b cs_encrypted_v1);

CREATE FUNCTION cs_encrypted_contained_v1(a cs_match_index_v1, b cs_encrypted_v1)
DROP OPERATOR IF EXISTS ~~ (jsonb, cs_encrypted_v1);
DROP FUNCTION IF EXISTS cs_encrypted_match_v1(a jsonb, b cs_encrypted_v1);

CREATE FUNCTION cs_encrypted_match_v1(a jsonb, b cs_encrypted_v1)
RETURNS boolean AS $$
SELECT a <@ cs_match_v1(b);
SELECT cs_match_v1(a) @> cs_match_v1(b);
$$ LANGUAGE SQL;

CREATE OPERATOR <@ (
PROCEDURE="cs_encrypted_contained_v1",
LEFTARG=cs_match_index_v1,
CREATE OPERATOR ~~(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=jsonb,
RIGHTARG=cs_encrypted_v1,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);

CREATE OPERATOR ~~*(
PROCEDURE="cs_encrypted_match_v1",
LEFTARG=jsonb,
RIGHTARG=cs_encrypted_v1,
RESTRICT = eqsel,
JOIN = eqjoinsel,
HASHES,
MERGES
);

-----------------------------------------------------------------------------------------

-- -----------------------------------------------------------------------------

11 changes: 9 additions & 2 deletions sql/017-operators-ore.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,16 +411,23 @@ CREATE FUNCTION cs_encrypted_ore_64_8_compare(a cs_encrypted_v1, b cs_encrypted_
END;
$$ LANGUAGE plpgsql;

DROP FUNCTION IF EXISTS cs_encrypted_ore_64_8_compare(a cs_encrypted_v1, b cs_encrypted_v1);
DROP FUNCTION IF EXISTS cs_encrypted_ore_64_8_compare(a cs_encrypted_v1, b jsonb);

CREATE FUNCTION cs_encrypted_ore_64_8_compare(a cs_encrypted_v1, b jsonb)
RETURNS integer AS $$
BEGIN
RETURN compare_ore_64_8_v1(cs_ore_64_8_v1(a), cs_ore_64_8_v1(jsonb));
RETURN compare_ore_64_8_v1(cs_ore_64_8_v1(a), cs_ore_64_8_v1(b));
END;
$$ LANGUAGE plpgsql;


CREATE FUNCTION cs_encrypted_ore_64_8_compare(a cs_encrypted_v1, b jsonb)
RETURNS integer AS $$
BEGIN
RETURN compare_ore_64_8_v1(cs_ore_64_8_v1(a), cs_ore_64_8_v1(b));
END;
$$ LANGUAGE plpgsql;

-----------------------------------------------------------------------------------------


Expand Down
Loading