Skip to content

Commit a996a21

Browse files
tobyhedetobyhede
committed
fixes
1 parent 87b0c77 commit a996a21

16 files changed

+205
-171
lines changed

‎sql/001-ore.sql‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ $$ LANGUAGE SQL;
138138
DROP OPERATOR IF EXISTS = (eql_v1.ore_64_8_v1_term, eql_v1.ore_64_8_v1_term);
139139

140140
CREATE OPERATOR = (
141-
PROCEDURE="eql_v1.ore_64_8_v1_term_eq",
141+
FUNCTION=eql_v1.ore_64_8_v1_term_eq,
142142
LEFTARG=eql_v1.ore_64_8_v1_term,
143143
RIGHTARG=eql_v1.ore_64_8_v1_term,
144144
NEGATOR = <>,
@@ -152,7 +152,7 @@ CREATE OPERATOR = (
152152
DROP OPERATOR IF EXISTS <> (eql_v1.ore_64_8_v1_term, eql_v1.ore_64_8_v1_term);
153153

154154
CREATE OPERATOR <> (
155-
PROCEDURE="eql_v1.ore_64_8_v1_term_neq",
155+
FUNCTION=eql_v1.ore_64_8_v1_term_neq,
156156
LEFTARG=eql_v1.ore_64_8_v1_term,
157157
RIGHTARG=eql_v1.ore_64_8_v1_term,
158158
NEGATOR = =,
@@ -165,7 +165,7 @@ CREATE OPERATOR <> (
165165
DROP OPERATOR IF EXISTS > (eql_v1.ore_64_8_v1_term, eql_v1.ore_64_8_v1_term);
166166

167167
CREATE OPERATOR > (
168-
PROCEDURE="eql_v1.ore_64_8_v1_term_gt",
168+
FUNCTION=eql_v1.ore_64_8_v1_term_gt,
169169
LEFTARG=eql_v1.ore_64_8_v1_term,
170170
RIGHTARG=eql_v1.ore_64_8_v1_term,
171171
COMMUTATOR = <,
@@ -177,7 +177,7 @@ CREATE OPERATOR > (
177177
DROP OPERATOR IF EXISTS < (eql_v1.ore_64_8_v1_term, eql_v1.ore_64_8_v1_term);
178178

179179
CREATE OPERATOR < (
180-
PROCEDURE="eql_v1.ore_64_8_v1_term_lt",
180+
FUNCTION=eql_v1.ore_64_8_v1_term_lt,
181181
LEFTARG=eql_v1.ore_64_8_v1_term,
182182
RIGHTARG=eql_v1.ore_64_8_v1_term,
183183
COMMUTATOR = >,
@@ -189,7 +189,7 @@ CREATE OPERATOR < (
189189
DROP OPERATOR IF EXISTS <= (eql_v1.ore_64_8_v1_term, eql_v1.ore_64_8_v1_term);
190190

191191
CREATE OPERATOR <= (
192-
PROCEDURE="eql_v1.ore_64_8_v1_term_lte",
192+
FUNCTION=eql_v1.ore_64_8_v1_term_lte,
193193
LEFTARG=eql_v1.ore_64_8_v1_term,
194194
RIGHTARG=eql_v1.ore_64_8_v1_term,
195195
COMMUTATOR = >=,
@@ -201,7 +201,7 @@ CREATE OPERATOR <= (
201201
DROP OPERATOR IF EXISTS >= (eql_v1.ore_64_8_v1_term, eql_v1.ore_64_8_v1_term);
202202

203203
CREATE OPERATOR >= (
204-
PROCEDURE="eql_v1.ore_64_8_v1_term_gte",
204+
FUNCTION=eql_v1.ore_64_8_v1_term_gte,
205205
LEFTARG=eql_v1.ore_64_8_v1_term,
206206
RIGHTARG=eql_v1.ore_64_8_v1_term,
207207
COMMUTATOR = <=,
@@ -260,10 +260,10 @@ RETURNS integer AS $$
260260
RETURN 1;
261261
END IF;
262262

263-
cmp_result := compare_ore_64_8_v1_term(a[1], b[1]);
263+
cmp_result := eql_v1.compare_ore_64_8_v1_term(a[1], b[1]);
264264
IF cmp_result = 0 THEN
265265
-- Removes the first element in the array, and calls this fn again to compare the next element/s in the array.
266-
RETURN compare_ore_array(a[2:array_length(a,1)], b[2:array_length(b,1)]);
266+
RETURN eql_v1.compare_ore_array(a[2:array_length(a,1)], b[2:array_length(b,1)]);
267267
END IF;
268268

269269
RETURN cmp_result;
@@ -335,7 +335,7 @@ $$ LANGUAGE SQL;
335335
DROP OPERATOR IF EXISTS = (eql_v1.ore_64_8_v1, eql_v1.ore_64_8_v1);
336336

337337
CREATE OPERATOR = (
338-
PROCEDURE="eql_v1.ore_64_8_v1_eq",
338+
FUNCTION=eql_v1.ore_64_8_v1_eq,
339339
LEFTARG=eql_v1.ore_64_8_v1,
340340
RIGHTARG=eql_v1.ore_64_8_v1,
341341
NEGATOR = <>,
@@ -349,7 +349,7 @@ CREATE OPERATOR = (
349349
DROP OPERATOR IF EXISTS <> (eql_v1.ore_64_8_v1, eql_v1.ore_64_8_v1);
350350

351351
CREATE OPERATOR <> (
352-
PROCEDURE="ore_64_8_v1_neq",
352+
FUNCTION=eql_v1.ore_64_8_v1_neq,
353353
LEFTARG=eql_v1.ore_64_8_v1,
354354
RIGHTARG=eql_v1.ore_64_8_v1,
355355
NEGATOR = =,
@@ -362,7 +362,7 @@ CREATE OPERATOR <> (
362362
DROP OPERATOR IF EXISTS > (eql_v1.ore_64_8_v1, eql_v1.ore_64_8_v1);
363363

364364
CREATE OPERATOR > (
365-
PROCEDURE="ore_64_8_v1_gt",
365+
FUNCTION=eql_v1.ore_64_8_v1_gt,
366366
LEFTARG=eql_v1.ore_64_8_v1,
367367
RIGHTARG=eql_v1.ore_64_8_v1,
368368
COMMUTATOR = <,
@@ -375,7 +375,7 @@ CREATE OPERATOR > (
375375
DROP OPERATOR IF EXISTS < (eql_v1.ore_64_8_v1, eql_v1.ore_64_8_v1);
376376

377377
CREATE OPERATOR < (
378-
PROCEDURE="ore_64_8_v1_lt",
378+
FUNCTION=eql_v1.ore_64_8_v1_lt,
379379
LEFTARG=eql_v1.ore_64_8_v1,
380380
RIGHTARG=eql_v1.ore_64_8_v1,
381381
COMMUTATOR = >,
@@ -388,7 +388,7 @@ CREATE OPERATOR < (
388388
DROP OPERATOR IF EXISTS <= (eql_v1.ore_64_8_v1, eql_v1.ore_64_8_v1);
389389

390390
CREATE OPERATOR <= (
391-
PROCEDURE="ore_64_8_v1_lte",
391+
FUNCTION=eql_v1.ore_64_8_v1_lte,
392392
LEFTARG=eql_v1.ore_64_8_v1,
393393
RIGHTARG=eql_v1.ore_64_8_v1,
394394
COMMUTATOR = >=,
@@ -401,7 +401,7 @@ CREATE OPERATOR <= (
401401
DROP OPERATOR IF EXISTS >= (eql_v1.ore_64_8_v1, eql_v1.ore_64_8_v1);
402402

403403
CREATE OPERATOR >= (
404-
PROCEDURE="ore_64_8_v1_gte",
404+
FUNCTION=eql_v1.ore_64_8_v1_gte,
405405
LEFTARG=eql_v1.ore_64_8_v1,
406406
RIGHTARG=eql_v1.ore_64_8_v1,
407407
COMMUTATOR = <=,

‎sql/002-ore-cllw.sql‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ $$ LANGUAGE SQL;
211211
DROP OPERATOR IF EXISTS = (eql_v1.ore_cllw_8_v1, eql_v1.ore_cllw_8_v1);
212212

213213
CREATE OPERATOR = (
214-
PROCEDURE="eql_v1.eql_v1.ore_cllw_8_v1_eq",
214+
FUNCTION=eql_v1.ore_cllw_8_v1_eq,
215215
LEFTARG=eql_v1.ore_cllw_8_v1,
216216
RIGHTARG=eql_v1.ore_cllw_8_v1,
217217
NEGATOR = <>,
@@ -225,7 +225,7 @@ CREATE OPERATOR = (
225225
DROP OPERATOR IF EXISTS <> (eql_v1.ore_cllw_8_v1, eql_v1.ore_cllw_8_v1);
226226

227227
CREATE OPERATOR <> (
228-
PROCEDURE="eql_v1.ore_cllw_8_v1_neq",
228+
FUNCTION=eql_v1.ore_cllw_8_v1_neq,
229229
LEFTARG=eql_v1.ore_cllw_8_v1,
230230
RIGHTARG=eql_v1.ore_cllw_8_v1,
231231
NEGATOR = =,
@@ -239,7 +239,7 @@ CREATE OPERATOR <> (
239239
DROP OPERATOR IF EXISTS > (eql_v1.ore_cllw_8_v1, eql_v1.ore_cllw_8_v1);
240240

241241
CREATE OPERATOR > (
242-
PROCEDURE="eql_v1.ore_cllw_8_v1_gt",
242+
FUNCTION=eql_v1.ore_cllw_8_v1_gt,
243243
LEFTARG=eql_v1.ore_cllw_8_v1,
244244
RIGHTARG=eql_v1.ore_cllw_8_v1,
245245
NEGATOR = <=,
@@ -253,7 +253,7 @@ CREATE OPERATOR > (
253253
DROP OPERATOR IF EXISTS < (eql_v1.ore_cllw_8_v1, eql_v1.ore_cllw_8_v1);
254254

255255
CREATE OPERATOR < (
256-
PROCEDURE="eql_v1.ore_cllw_8_v1_lt",
256+
FUNCTION=eql_v1.ore_cllw_8_v1_lt,
257257
LEFTARG=eql_v1.ore_cllw_8_v1,
258258
RIGHTARG=eql_v1.ore_cllw_8_v1,
259259
NEGATOR = >=,
@@ -267,7 +267,7 @@ CREATE OPERATOR < (
267267
DROP OPERATOR IF EXISTS >= (eql_v1.ore_cllw_8_v1, eql_v1.ore_cllw_8_v1);
268268

269269
CREATE OPERATOR >= (
270-
PROCEDURE="eql_v1.ore_cllw_8_v1_gte",
270+
FUNCTION=eql_v1.ore_cllw_8_v1_gte,
271271
LEFTARG=eql_v1.ore_cllw_8_v1,
272272
RIGHTARG=eql_v1.ore_cllw_8_v1,
273273
NEGATOR = <,
@@ -281,7 +281,7 @@ CREATE OPERATOR >= (
281281
DROP OPERATOR IF EXISTS <= (eql_v1.ore_cllw_8_v1, eql_v1.ore_cllw_8_v1);
282282

283283
CREATE OPERATOR <= (
284-
PROCEDURE="eql_v1.ore_cllw_8_v1_lte",
284+
FUNCTION=eql_v1.ore_cllw_8_v1_lte,
285285
LEFTARG=eql_v1.ore_cllw_8_v1,
286286
RIGHTARG=eql_v1.ore_cllw_8_v1,
287287
NEGATOR = >,
@@ -332,7 +332,7 @@ $$ LANGUAGE SQL;
332332
DROP OPERATOR IF EXISTS = (eql_v1.ore_cllw_8_variable_v1, eql_v1.ore_cllw_8_variable_v1);
333333

334334
CREATE OPERATOR = (
335-
PROCEDURE="eql_v1.ore_cllw_8_variable_v1_eq",
335+
FUNCTION=eql_v1.ore_cllw_8_variable_v1_eq,
336336
LEFTARG=eql_v1.ore_cllw_8_variable_v1,
337337
RIGHTARG=eql_v1.ore_cllw_8_variable_v1,
338338
NEGATOR = <>,
@@ -345,7 +345,7 @@ CREATE OPERATOR = (
345345
DROP OPERATOR IF EXISTS <> (eql_v1.ore_cllw_8_variable_v1, eql_v1.ore_cllw_8_variable_v1);
346346

347347
CREATE OPERATOR <> (
348-
PROCEDURE="eql_v1.ore_cllw_8_variable_v1_neq",
348+
FUNCTION=eql_v1.ore_cllw_8_variable_v1_neq,
349349
LEFTARG=eql_v1.ore_cllw_8_variable_v1,
350350
RIGHTARG=eql_v1.ore_cllw_8_variable_v1,
351351
NEGATOR = =,
@@ -358,7 +358,7 @@ CREATE OPERATOR <> (
358358
DROP OPERATOR IF EXISTS > (eql_v1.ore_cllw_8_variable_v1, eql_v1.ore_cllw_8_variable_v1);
359359

360360
CREATE OPERATOR > (
361-
PROCEDURE="eql_v1.ore_cllw_8_v1_gt_lex",
361+
FUNCTION=eql_v1.ore_cllw_8_v1_gt_lex,
362362
LEFTARG=eql_v1.ore_cllw_8_variable_v1,
363363
RIGHTARG=eql_v1.ore_cllw_8_variable_v1,
364364
NEGATOR = <=,
@@ -371,7 +371,7 @@ CREATE OPERATOR > (
371371
DROP OPERATOR IF EXISTS < (eql_v1.ore_cllw_8_variable_v1, eql_v1.ore_cllw_8_variable_v1);
372372

373373
CREATE OPERATOR < (
374-
PROCEDURE="eql_v1.ore_cllw_8_v1_lt_lex",
374+
FUNCTION=eql_v1.ore_cllw_8_v1_lt_lex,
375375
LEFTARG=eql_v1.ore_cllw_8_variable_v1,
376376
RIGHTARG=eql_v1.ore_cllw_8_variable_v1,
377377
NEGATOR = >=,
@@ -384,7 +384,7 @@ CREATE OPERATOR < (
384384
DROP OPERATOR IF EXISTS >= (eql_v1.ore_cllw_8_variable_v1, eql_v1.ore_cllw_8_variable_v1);
385385

386386
CREATE OPERATOR >= (
387-
PROCEDURE="eql_v1.ore_cllw_8_v1_gte_lex",
387+
FUNCTION=eql_v1.ore_cllw_8_v1_gte_lex,
388388
LEFTARG=eql_v1.ore_cllw_8_variable_v1,
389389
RIGHTARG=eql_v1.ore_cllw_8_variable_v1,
390390
NEGATOR = <,
@@ -397,7 +397,7 @@ CREATE OPERATOR >= (
397397
DROP OPERATOR IF EXISTS <= (eql_v1.ore_cllw_8_variable_v1, eql_v1.ore_cllw_8_variable_v1);
398398

399399
CREATE OPERATOR <= (
400-
PROCEDURE="eql_v1.ore_cllw_8_v1_lte_lex",
400+
FUNCTION=eql_v1.ore_cllw_8_v1_lte_lex,
401401
LEFTARG=eql_v1.ore_cllw_8_variable_v1,
402402
RIGHTARG=eql_v1.ore_cllw_8_variable_v1,
403403
NEGATOR = >,

‎sql/003-ste-vec.sql‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $$ LANGUAGE SQL;
8181
DROP OPERATOR IF EXISTS = (eql_v1.ste_vec_encrypted_term, eql_v1.ste_vec_encrypted_term);
8282

8383
CREATE OPERATOR = (
84-
PROCEDURE="eql_v1.ste_vec_encrypted_term_eq",
84+
FUNCTION=eql_v1.ste_vec_encrypted_term_eq,
8585
LEFTARG=eql_v1.ste_vec_encrypted_term,
8686
RIGHTARG=eql_v1.ste_vec_encrypted_term,
8787
NEGATOR = <>,
@@ -94,7 +94,7 @@ CREATE OPERATOR = (
9494
DROP OPERATOR IF EXISTS <> (eql_v1.ste_vec_encrypted_term, eql_v1.ste_vec_encrypted_term);
9595

9696
CREATE OPERATOR <> (
97-
PROCEDURE="eql_v1.ste_vec_encrypted_term_neq",
97+
FUNCTION=eql_v1.ste_vec_encrypted_term_neq,
9898
LEFTARG=eql_v1.ste_vec_encrypted_term,
9999
RIGHTARG=eql_v1.ste_vec_encrypted_term,
100100
NEGATOR = =,
@@ -107,7 +107,7 @@ CREATE OPERATOR <> (
107107
DROP OPERATOR IF EXISTS > (eql_v1.ste_vec_encrypted_term, eql_v1.ste_vec_encrypted_term);
108108

109109
CREATE OPERATOR > (
110-
PROCEDURE="eql_v1.ste_vec_encrypted_term_gt",
110+
FUNCTION=eql_v1.ste_vec_encrypted_term_gt,
111111
LEFTARG=eql_v1.ste_vec_encrypted_term,
112112
RIGHTARG=eql_v1.ste_vec_encrypted_term,
113113
NEGATOR = <=,
@@ -120,7 +120,7 @@ CREATE OPERATOR > (
120120
DROP OPERATOR IF EXISTS < (eql_v1.ste_vec_encrypted_term_v1, eql_v1.ste_vec_encrypted_term_v1);
121121

122122
CREATE OPERATOR < (
123-
PROCEDURE="eql_v1.ste_vec_encrypted_term_lt",
123+
FUNCTION=eql_v1.ste_vec_encrypted_term_lt,
124124
LEFTARG=eql_v1.ste_vec_encrypted_term,
125125
RIGHTARG=eql_v1.ste_vec_encrypted_term,
126126
NEGATOR = >=,
@@ -133,7 +133,7 @@ CREATE OPERATOR < (
133133
DROP OPERATOR IF EXISTS >= (eql_v1.ste_vec_encrypted_term_v1, eql_v1.ste_vec_encrypted_term_v1);
134134

135135
CREATE OPERATOR >= (
136-
PROCEDURE="eql_v1.ste_vec_encrypted_term_gte",
136+
FUNCTION=eql_v1.ste_vec_encrypted_term_gte,
137137
LEFTARG=eql_v1.ste_vec_encrypted_term,
138138
RIGHTARG=eql_v1.ste_vec_encrypted_term,
139139
NEGATOR = <,
@@ -146,7 +146,7 @@ CREATE OPERATOR >= (
146146
DROP OPERATOR IF EXISTS <= (eql_v1.ste_vec_encrypted_term_v1, eql_v1.ste_vec_encrypted_term_v1);
147147

148148
CREATE OPERATOR <= (
149-
PROCEDURE="eql_v1.ste_vec_encrypted_term_lte",
149+
FUNCTION=eql_v1.ste_vec_encrypted_term_lte,
150150
LEFTARG=eql_v1.ste_vec_encrypted_term,
151151
RIGHTARG=eql_v1.ste_vec_encrypted_term,
152152
NEGATOR = >,
@@ -188,7 +188,7 @@ DROP FUNCTION IF EXISTS eql_v1.ste_vec_value(col jsonb, selector jsonb);
188188
CREATE FUNCTION eql_v1.cs_ste_vec_value(col jsonb, selector jsonb)
189189
RETURNS jsonb AS $$
190190
DECLARE
191-
ste_vec_index eql_v1.cs_ste_vec_index;
191+
ste_vec_index eql_v1.ste_vec_index;
192192
target_selector text;
193193
found text;
194194
ignored text;
@@ -238,7 +238,7 @@ DECLARE
238238
found eql_v1.ste_vec_encrypted_term;
239239
ignored eql_v1.ste_vec_encrypted_term;
240240
i integer;
241-
term_array eql_v1.ste_vec_encrypted_term_v1[];
241+
term_array eql_v1.ste_vec_encrypted_term[];
242242
BEGIN
243243
ste_vec_index := eql_v1.ste_vec(col);
244244

@@ -394,17 +394,14 @@ END;
394394
$$ LANGUAGE plpgsql;
395395

396396

397-
DROP FUNCTION IF EXISTS eql_v1.jsonb_to_cs_ste_vec_index(input jsonb);
397+
DROP FUNCTION IF EXISTS eql_v1.jsonb_to_ste_vec_index(input jsonb);
398398

399-
CREATE FUNCTION eql_v1.jsonb_to_cs_ste_vec_index(input jsonb)
399+
CREATE FUNCTION eql_v1.jsonb_to_ste_vec_index(input jsonb)
400400
RETURNS eql_v1.ste_vec_index AS $$
401401
DECLARE
402-
vec_entry eql_v1._ste_vec_entry;
403-
entry_array eql_v1.ste_vec_v1_entry[];
402+
vec_entry eql_v1.ste_vec_entry;
403+
entry_array eql_v1.ste_vec_entry[];
404404
entry_json jsonb;
405-
entry_json_array jsonb[];
406-
entry_array_length int;
407-
i int;
408405
BEGIN
409406
FOR entry_json IN SELECT * FROM jsonb_array_elements(input)
410407
LOOP
@@ -415,7 +412,6 @@ BEGIN
415412
)::eql_v1.ste_vec_entry;
416413
entry_array := array_append(entry_array, vec_entry);
417414
END LOOP;
418-
419415
RETURN ROW(entry_array)::eql_v1.ste_vec_index;
420416
END;
421417
$$ LANGUAGE plpgsql;
@@ -428,7 +424,7 @@ CREATE CAST (jsonb AS eql_v1.ste_vec_index)
428424
DROP OPERATOR IF EXISTS @> (eql_v1.ste_vec_index, eql_v1.ste_vec_index);
429425

430426
CREATE OPERATOR @> (
431-
PROCEDURE="eql_v1.ste_vec_logical_contains",
427+
FUNCTION=eql_v1.ste_vec_logical_contains,
432428
LEFTARG=eql_v1.ste_vec_index,
433429
RIGHTARG=eql_v1.ste_vec_index,
434430
COMMUTATOR = <@
@@ -437,7 +433,7 @@ CREATE OPERATOR @> (
437433
DROP OPERATOR IF EXISTS <@ (eql_v1.ste_vec_index, eql_v1.ste_vec_index);
438434

439435
CREATE OPERATOR <@ (
440-
PROCEDURE="eql_v1.ste_vec_logical_is_contained",
436+
FUNCTION=eql_v1.ste_vec_logical_is_contained,
441437
LEFTARG=eql_v1.ste_vec_index,
442438
RIGHTARG=eql_v1.ste_vec_index,
443439
COMMUTATOR = @>

‎sql/010-core-domain-types.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DROP DOMAIN IF EXISTS eql_v1.unique_index;
55
CREATE DOMAIN eql_v1.unique_index AS text;
66

77

8-
-- cs_encrypted_v1 is a column type and cannot be dropped if in use
8+
-- eql_v1_encrypted is a column type and cannot be dropped if in use
99
DO $$
1010
BEGIN
1111
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'eql_v1_encrypted') THEN

0 commit comments

Comments
 (0)