Skip to content

Commit 6d1297f

Browse files
tobyhedetobyhede
committed
fix: explicit cast to text for all tests using -> or ->>
1 parent 2c727eb commit 6d1297f

17 files changed

+109
-105
lines changed

‎src/encrypted/aggregates.sql‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ CREATE FUNCTION eql_v2.min(a eql_v2_encrypted, b eql_v2_encrypted)
99
STRICT
1010
AS $$
1111
BEGIN
12-
PERFORM eql_v2.log('eql_v2.min');
1312
IF eql_v2.ore_block_u64_8_256(a) < eql_v2.ore_block_u64_8_256(b) THEN
1413
RETURN a;
1514
ELSE
@@ -31,7 +30,6 @@ RETURNS eql_v2_encrypted
3130
STRICT
3231
AS $$
3332
BEGIN
34-
PERFORM eql_v2.log('eql_v2.max');
3533
IF eql_v2.ore_block_u64_8_256(a) > eql_v2.ore_block_u64_8_256(b) THEN
3634
RETURN a;
3735
ELSE

‎src/operators/->.sql‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
-- "sv": [ {"c": "", "s": "", "b3": "" } ]
1515
-- }
1616
--
17+
-- Note on oeprator resolution:
18+
-- Assignment casts are considered for operator resolution (see PostgreSQL docs),
19+
-- the system may pick the "more specific" one, which is the one with both arguments of the same type.
20+
--
21+
-- This means that to use the text operator, the parameter will need to be cast to text
22+
--
1723
CREATE FUNCTION eql_v2."->"(e eql_v2_encrypted, selector text)
1824
RETURNS eql_v2_encrypted
1925
IMMUTABLE STRICT PARALLEL SAFE
@@ -45,7 +51,6 @@ CREATE OPERATOR ->(
4551
RIGHTARG=text
4652
);
4753

48-
4954
---------------------------------------------------
5055

5156

‎src/operators/->>_test.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ DO $$
1010
BEGIN
1111
PERFORM assert_result(
1212
'Selector ->> returns at least one eql_v2_encrypted',
13-
'SELECT e->>''bca213de9ccce676fa849ff9c4807963'' FROM encrypted;');
13+
'SELECT e->>''bca213de9ccce676fa849ff9c4807963''::text FROM encrypted;');
1414

1515
PERFORM assert_count(
1616
'Selector ->> returns all eql_v2_encrypted',
17-
'SELECT e->>''bca213de9ccce676fa849ff9c4807963'' FROM encrypted;',
17+
'SELECT e->>''bca213de9ccce676fa849ff9c4807963''::text FROM encrypted;',
1818
3);
1919
END;
2020
$$ LANGUAGE plpgsql;
@@ -26,7 +26,7 @@ DO $$
2626
BEGIN
2727
PERFORM assert_no_result(
2828
'Unknown selector -> returns null',
29-
'SELECT e->>''blahvtha'' FROM encrypted;');
29+
'SELECT e->>''blahvtha''::text FROM encrypted;');
3030

3131
END;
3232
$$ LANGUAGE plpgsql;
@@ -39,7 +39,7 @@ DO $$
3939

4040
PERFORM assert_result(
4141
'Selector ->> returns all eql_v2_encrypted',
42-
'SELECT e->>''bca213de9ccce676fa849ff9c4807963'' FROM encrypted LIMIT 1;',
42+
'SELECT e->>''bca213de9ccce676fa849ff9c4807963''::text FROM encrypted LIMIT 1;',
4343
'mBbLGB9xHAGzLvUj-`@Wmf=IhD87n7r3ir3n!Sk6AKir_YawR=0c>pk(OydB;ntIEXK~c>V&4>)rNkf<JN7fmlO)c^iBv;-X0+3XyK5d`&&I-oeIEOcwPf<3zy');
4444
END;
4545
$$ LANGUAGE plpgsql;

‎src/operators/->_test.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ DO $$
1212
BEGIN
1313
PERFORM assert_result(
1414
'Selector -> returns at least one eql_v2_encrypted',
15-
'SELECT e->''bca213de9ccce676fa849ff9c4807963'' FROM encrypted;');
15+
'SELECT e->''bca213de9ccce676fa849ff9c4807963''::text FROM encrypted;');
1616

1717
PERFORM assert_count(
1818
'Selector -> returns all eql_v2_encrypted',
19-
'SELECT e->''bca213de9ccce676fa849ff9c4807963'' FROM encrypted;',
19+
'SELECT e->''bca213de9ccce676fa849ff9c4807963''::text FROM encrypted;',
2020
3);
2121
END;
2222
$$ LANGUAGE plpgsql;
@@ -28,7 +28,7 @@ DO $$
2828
BEGIN
2929
PERFORM assert_no_result(
3030
'Unknown selector -> returns null',
31-
'SELECT e->''blahvtha'' FROM encrypted;');
31+
'SELECT e->''blahvtha''::text FROM encrypted;');
3232

3333
END;
3434
$$ LANGUAGE plpgsql;
@@ -65,11 +65,11 @@ DO $$
6565
BEGIN
6666
PERFORM assert_result(
6767
'Fetch ciphertext via selector',
68-
'SELECT eql_v2.ciphertext(e->''2517068c0d1f9d4d41d2c666211f785e'') FROM encrypted;');
68+
'SELECT eql_v2.ciphertext(e->''2517068c0d1f9d4d41d2c666211f785e''::text) FROM encrypted;');
6969

7070
PERFORM assert_count(
7171
'Fetch ciphertext via selector returns all eql_v2_encrypted',
72-
'SELECT eql_v2.ciphertext(e->''2517068c0d1f9d4d41d2c666211f785e'') FROM encrypted;',
72+
'SELECT eql_v2.ciphertext(e->''2517068c0d1f9d4d41d2c666211f785e''::text) FROM encrypted;',
7373
3);
7474
END;
7575
$$ LANGUAGE plpgsql;

‎src/operators/<=_test.sql‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
SELECT create_table_with_encrypted();
44
SELECT seed_encrypted_json();
55

6-
SELECT e FROM encrypted WHERE e->'a7cea93975ed8c01f861ccb6bd082784' <= '("{""c"": ""mBbM0#UZON2jQ3@LiWcvns2Yf6y3L;hykEh`}*fX#aF;n*=>+*o5Uarod39C7TF-SiCD-NgkG)l%Vw=l!tX>H*P<PfE$+0Szy"", ""s"": ""2517068c0d1f9d4d41d2c666211f785e"", ""ocf"": ""b0c13d4a4a9ffcb2ef853959fb2d26236337244ed86d66470d08963ed703356a1cee600a9a75a70aaefc1b4ca03b7918a7df25b7cd4ca774fd5b8616e6b9adb8""}")'::eql_v2_encrypted;
6+
SELECT e FROM encrypted WHERE e->'a7cea93975ed8c01f861ccb6bd082784'::text <= '("{""c"": ""mBbM0#UZON2jQ3@LiWcvns2Yf6y3L;hykEh`}*fX#aF;n*=>+*o5Uarod39C7TF-SiCD-NgkG)l%Vw=l!tX>H*P<PfE$+0Szy"", ""s"": ""2517068c0d1f9d4d41d2c666211f785e"", ""ocf"": ""b0c13d4a4a9ffcb2ef853959fb2d26236337244ed86d66470d08963ed703356a1cee600a9a75a70aaefc1b4ca03b7918a7df25b7cd4ca774fd5b8616e6b9adb8""}")'::eql_v2_encrypted;
77

88

99
-- ------------------------------------------------------------------------
@@ -29,23 +29,23 @@ DECLARE
2929
-- json n: 30
3030
sv := get_numeric_ste_vec_30()::eql_v2_encrypted;
3131
-- extract the term at $.n returned as eql_v2_encrypted
32-
term := sv->'2517068c0d1f9d4d41d2c666211f785e';
32+
term := sv->'2517068c0d1f9d4d41d2c666211f785e'::text;
3333

3434
-- -- -- -- $.n
3535
PERFORM assert_result(
3636
format('eql_v2_encrypted <= eql_v2_encrypted with ore_cllw_u64_8 index term'),
37-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' <= %L::eql_v2_encrypted', term));
37+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text <= %L::eql_v2_encrypted', term));
3838

3939
PERFORM assert_count(
4040
format('eql_v2_encrypted <= eql_v2_encrypted with ore index term'),
41-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' <= %L::eql_v2_encrypted', term),
41+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text <= %L::eql_v2_encrypted', term),
4242
3);
4343

4444
-- -- Check the $.hello path
4545
-- -- Returned encrypted does not have ore_cllw_u64_8
4646
PERFORM assert_no_result(
4747
format('eql_v2_encrypted <= eql_v2_encrypted with ore_cllw_u64_8 index term'),
48-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' <= %L::eql_v2_encrypted', term));
48+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text <= %L::eql_v2_encrypted', term));
4949

5050
END;
5151
$$ LANGUAGE plpgsql;
@@ -73,23 +73,23 @@ DECLARE
7373
-- json n: 30
7474
sv := get_numeric_ste_vec_30()::eql_v2_encrypted;
7575
-- extract the term at $.n returned as eql_v2_encrypted
76-
term := sv->'a7cea93975ed8c01f861ccb6bd082784';
76+
term := sv->'a7cea93975ed8c01f861ccb6bd082784'::text;
7777

7878
-- -- -- -- $.n
7979
PERFORM assert_result(
8080
format('eql_v2_encrypted <= eql_v2_encrypted with ore_cllw_var_8 index term'),
81-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' <= %L::eql_v2_encrypted', term));
81+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text <= %L::eql_v2_encrypted', term));
8282

8383
PERFORM assert_count(
8484
format('eql_v2_encrypted <= eql_v2_encrypted with ore_cllw_var_8 index term'),
85-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' <= %L::eql_v2_encrypted', term),
85+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text <= %L::eql_v2_encrypted', term),
8686
2);
8787

8888
-- -- Check the $.n path
8989
-- -- Returned encrypted does not have ore_cllw_u64_8
9090
PERFORM assert_no_result(
9191
format('eql_v2_encrypted <= eql_v2_encrypted with ore_cllw_var_8 index term'),
92-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' <= %L::eql_v2_encrypted', term));
92+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text <= %L::eql_v2_encrypted', term));
9393

9494
END;
9595
$$ LANGUAGE plpgsql;

‎src/operators/<>_ore_cllw_u64_8_test.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ DECLARE
3131
-- json n: 10
3232
sv := get_numeric_ste_vec_10()::eql_v2_encrypted;
3333
-- extract the term at $.n returned as eql_v2_encrypted
34-
term := sv->'2517068c0d1f9d4d41d2c666211f785e';
34+
term := sv->'2517068c0d1f9d4d41d2c666211f785e'::text;
3535

3636
-- -- -- -- $.n
3737
PERFORM assert_result(
3838
format('eql_v2_encrypted <> eql_v2_encrypted with ore_cllw_u64_8 index term'),
39-
format('SELECT e FROM encrypted WHERE (e->''2517068c0d1f9d4d41d2c666211f785e'') <> %L::eql_v2_encrypted', term));
39+
format('SELECT e FROM encrypted WHERE (e->''2517068c0d1f9d4d41d2c666211f785e''::text) <> %L::eql_v2_encrypted', term));
4040

4141
PERFORM assert_count(
4242
format('eql_v2_encrypted <> eql_v2_encrypted with ore index term'),
43-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' <> %L::eql_v2_encrypted', term),
43+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text <> %L::eql_v2_encrypted', term),
4444
2);
4545

4646
-- -- Check the $.hello path
4747
-- -- Returned encrypted does not have ore_cllw_u64_8
4848
PERFORM assert_result(
4949
format('eql_v2_encrypted <> eql_v2_encrypted with ore index term'),
50-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' <> %L::eql_v2_encrypted', term));
50+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text <> %L::eql_v2_encrypted', term));
5151

5252
END;
5353
$$ LANGUAGE plpgsql;

‎src/operators/<>_ore_cllw_var_8_test.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ DECLARE
3030
-- json n: 10
3131
sv := get_numeric_ste_vec_10()::eql_v2_encrypted;
3232
-- extract the term at $.n returned as eql_v2_encrypted
33-
term := sv->'a7cea93975ed8c01f861ccb6bd082784';
33+
term := sv->'a7cea93975ed8c01f861ccb6bd082784'::text;
3434

3535
-- -- -- -- $.n
3636
PERFORM assert_result(
3737
format('eql_v2_encrypted <> eql_v2_encrypted with ore_cllw_var_8 index term'),
38-
format('SELECT e FROM encrypted WHERE (e->''a7cea93975ed8c01f861ccb6bd082784'') <> %L::eql_v2_encrypted', term));
38+
format('SELECT e FROM encrypted WHERE (e->''a7cea93975ed8c01f861ccb6bd082784''::text) <> %L::eql_v2_encrypted', term));
3939

4040
PERFORM assert_count(
4141
format('eql_v2_encrypted <> eql_v2_encrypted with ore_cllw_var_8 index term'),
42-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' <> %L::eql_v2_encrypted', term),
42+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text <> %L::eql_v2_encrypted', term),
4343
2);
4444

4545
-- -- Check the $.n path
4646
-- -- Returned encrypted does not have ore_cllw_var_8
4747
PERFORM assert_result(
4848
format('eql_v2_encrypted <> eql_v2_encrypted with ore_cllw_var_8 index term'),
49-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' <> %L::eql_v2_encrypted', term));
49+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text <> %L::eql_v2_encrypted', term));
5050

5151
END;
5252
$$ LANGUAGE plpgsql;

‎src/operators/<@_test.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ DECLARE
2525
-- This extracts the data associated with the field from the test eql_v2_encrypted
2626
sv := get_numeric_ste_vec_10()::eql_v2_encrypted;
2727
-- extract the term at $.n returned as eql_v2_encrypted
28-
term := sv->'a7cea93975ed8c01f861ccb6bd082784';
28+
term := sv->'a7cea93975ed8c01f861ccb6bd082784'::text;
2929

3030
-- -- -- -- $.n
3131
PERFORM assert_result(

‎src/operators/<_test.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@ DECLARE
2727
-- json n: 30
2828
sv := get_numeric_ste_vec_30()::eql_v2_encrypted;
2929
-- extract the term at $.n returned as eql_v2_encrypted
30-
term := sv->'2517068c0d1f9d4d41d2c666211f785e';
30+
term := sv->'2517068c0d1f9d4d41d2c666211f785e'::text;
3131

3232
-- -- -- -- $.n
3333
PERFORM assert_result(
3434
format('eql_v2_encrypted < eql_v2_encrypted with ore_cllw_u64_8 index term'),
35-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' < %L::eql_v2_encrypted', term));
35+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text < %L::eql_v2_encrypted', term));
3636

3737
PERFORM assert_count(
3838
format('eql_v2_encrypted < eql_v2_encrypted with ore index term'),
39-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' < %L::eql_v2_encrypted', term),
39+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text < %L::eql_v2_encrypted', term),
4040
2);
4141

4242
-- -- Check the $.hello path
4343
-- -- Returned encrypted does not have ore_cllw_u64_8
4444
PERFORM assert_no_result(
4545
format('eql_v2_encrypted < eql_v2_encrypted with ore index term'),
46-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' < %L::eql_v2_encrypted', term));
46+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text < %L::eql_v2_encrypted', term));
4747

4848
END;
4949
$$ LANGUAGE plpgsql;
@@ -71,23 +71,23 @@ DECLARE
7171
-- This extracts the data associated with the field from the test eql_v2_encrypted
7272
sv := get_numeric_ste_vec_30()::eql_v2_encrypted;
7373
-- extract the term at $.n returned as eql_v2_encrypted
74-
term := sv->'a7cea93975ed8c01f861ccb6bd082784';
74+
term := sv->'a7cea93975ed8c01f861ccb6bd082784'::text;
7575

7676
-- -- -- -- $.n
7777
PERFORM assert_result(
7878
format('eql_v2_encrypted < eql_v2_encrypted with ore_cllw_var_8 index term'),
79-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' < %L::eql_v2_encrypted', term));
79+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text < %L::eql_v2_encrypted', term));
8080

8181
PERFORM assert_count(
8282
format('eql_v2_encrypted < eql_v2_encrypted with ore_cllw_var_8 index term'),
83-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' < %L::eql_v2_encrypted', term),
83+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text < %L::eql_v2_encrypted', term),
8484
1);
8585

8686
-- -- Check the $.n path
8787
-- -- Returned encrypted does not have ore_cllw_var_8
8888
PERFORM assert_no_result(
8989
format('eql_v2_encrypted < eql_v2_encrypted with ore_cllw_var_8 index term'),
90-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' < %L::eql_v2_encrypted', term));
90+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text < %L::eql_v2_encrypted', term));
9191

9292
END;
9393
$$ LANGUAGE plpgsql;

‎src/operators/=_ore_cllw_u64_8_test.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ DECLARE
3030
-- json n: 10
3131
sv := get_numeric_ste_vec_10()::eql_v2_encrypted;
3232
-- extract the term at $.n returned as eql_v2_encrypted
33-
term := sv->'2517068c0d1f9d4d41d2c666211f785e';
33+
term := sv->'2517068c0d1f9d4d41d2c666211f785e'::text;
3434

3535
-- -- -- -- $.n
3636
PERFORM assert_result(
3737
format('eql_v2_encrypted = eql_v2_encrypted with ore_cllw_u64_8 index term'),
38-
format('SELECT e FROM encrypted WHERE (e->''2517068c0d1f9d4d41d2c666211f785e'') = %L::eql_v2_encrypted', term));
38+
format('SELECT e FROM encrypted WHERE (e->''2517068c0d1f9d4d41d2c666211f785e''::text) = %L::eql_v2_encrypted', term));
3939

4040
PERFORM assert_count(
4141
format('eql_v2_encrypted = eql_v2_encrypted with ore index term'),
42-
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e'' = %L::eql_v2_encrypted', term),
42+
format('SELECT e FROM encrypted WHERE e->''2517068c0d1f9d4d41d2c666211f785e''::text = %L::eql_v2_encrypted', term),
4343
1);
4444

4545
-- -- Check the $.hello path
4646
-- -- Returned encrypted does not have ore_cllw_u64_8
4747
PERFORM assert_no_result(
4848
format('eql_v2_encrypted = eql_v2_encrypted with ore index term'),
49-
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784'' = %L::eql_v2_encrypted', term));
49+
format('SELECT e FROM encrypted WHERE e->''a7cea93975ed8c01f861ccb6bd082784''::text = %L::eql_v2_encrypted', term));
5050

5151
END;
5252
$$ LANGUAGE plpgsql;

0 commit comments

Comments
 (0)