Skip to content

Commit 56ec35d

Browse files
tobyhedetobyhede
committed
chore: remove all drops and rely on drop schema
1 parent fe61365 commit 56ec35d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+221
-215
lines changed

‎src/blake3/functions.sql

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
-- REQUIRE: src/schema.sql
22

33
-- extracts ste_vec index from a jsonb value
4-
DROP FUNCTION IF EXISTS eql_v1.blake3(val jsonb);
4+
-- DROP FUNCTION IF EXISTS eql_v1.blake3(val jsonb);
55

66
-- extracts blake3 index from a jsonb value
7-
DROP FUNCTION IF EXISTS eql_v1.blake3(val jsonb);
7+
-- DROP FUNCTION IF EXISTS eql_v1.blake3(val jsonb);
88

99
CREATE FUNCTION eql_v1.blake3(val jsonb)
1010
RETURNS eql_v1.blake3
@@ -26,7 +26,7 @@ $$ LANGUAGE plpgsql;
2626

2727

2828
-- extracts blake3 index from an eql_v1_encrypted value
29-
DROP FUNCTION IF EXISTS eql_v1.blake3(val eql_v1_encrypted);
29+
-- DROP FUNCTION IF EXISTS eql_v1.blake3(val eql_v1_encrypted);
3030

3131
CREATE FUNCTION eql_v1.blake3(val eql_v1_encrypted)
3232
RETURNS eql_v1.blake3

‎src/blake3/types.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
-- REQUIRE: src/schema.sql
22

3-
DROP DOMAIN IF EXISTS eql_v1.blake3;
3+
-- DROP DOMAIN IF EXISTS eql_v1.blake3;
44
CREATE DOMAIN eql_v1.blake3 AS text;

‎src/common.sql

+10-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33

44

55
-- Constant time comparison of 2 bytea values
6-
DROP FUNCTION IF EXISTS eql_v1.bytea_eq(a bytea, b bytea);
6+
7+
8+
9+
10+
11+
12+
-- DROP FUNCTION IF EXISTS eql_v1.bytea_eq(a bytea, b bytea);
713

814
CREATE FUNCTION eql_v1.bytea_eq(a bytea, b bytea) RETURNS boolean AS $$
915
DECLARE
@@ -29,7 +35,7 @@ END;
2935
$$ LANGUAGE plpgsql;
3036

3137

32-
DROP FUNCTION IF EXISTS eql_v1.jsonb_array_to_bytea_array(val jsonb);
38+
-- DROP FUNCTION IF EXISTS eql_v1.jsonb_array_to_bytea_array(val jsonb);
3339

3440
-- Casts a jsonb array of hex-encoded strings to an array of bytea.
3541
CREATE FUNCTION eql_v1.jsonb_array_to_bytea_array(val jsonb)
@@ -54,7 +60,7 @@ $$ LANGUAGE plpgsql;
5460
--
5561
-- Convenience function to log a message
5662
--
57-
DROP FUNCTION IF EXISTS eql_v1.log(text);
63+
-- DROP FUNCTION IF EXISTS eql_v1.log(text);
5864
CREATE FUNCTION eql_v1.log(s text)
5965
RETURNS void
6066
AS $$
@@ -67,7 +73,7 @@ $$ LANGUAGE plpgsql;
6773
--
6874
-- Convenience function to describe a test
6975
--
70-
DROP FUNCTION IF EXISTS eql_v1.log(text, text);
76+
-- DROP FUNCTION IF EXISTS eql_v1.log(text, text);
7177
CREATE FUNCTION eql_v1.log(ctx text, s text)
7278
RETURNS void
7379
AS $$

‎src/config/config_test.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--
55
-- Helper function for assertions
66
--
7-
DROP FUNCTION IF EXISTS _index_exists(text, text, text, text);
7+
-- DROP FUNCTION IF EXISTS _index_exists(text, text, text, text);
88
CREATE FUNCTION _index_exists(table_name text, column_name text, index_name text, state text DEFAULT 'pending')
99
RETURNS boolean
1010
LANGUAGE sql STRICT PARALLEL SAFE

‎src/config/constraints.sql

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
--
66
-- Used by the eql_v1.config_check_indexes as part of the configuration_data_v1 constraint
77
--
8-
DROP FUNCTION IF EXISTS eql_v1.config_get_indexes(jsonb);
8+
-- DROP FUNCTION IF EXISTS eql_v1.config_get_indexes(jsonb);
99
CREATE FUNCTION eql_v1.config_get_indexes(val jsonb)
1010
RETURNS SETOF text
1111
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
@@ -18,7 +18,7 @@ END;
1818
--
1919
-- Used by the cs_configuration_data_v1_check constraint
2020
--
21-
DROP FUNCTION IF EXISTS eql_v1.config_check_indexes(jsonb);
21+
-- DROP FUNCTION IF EXISTS eql_v1.config_check_indexes(jsonb);
2222
CREATE FUNCTION eql_v1.config_check_indexes(val jsonb)
2323
RETURNS BOOLEAN
2424
IMMUTABLE STRICT PARALLEL SAFE
@@ -36,7 +36,7 @@ AS $$
3636
$$ LANGUAGE plpgsql;
3737

3838

39-
DROP FUNCTION IF EXISTS eql_v1.config_check_cast(jsonb);
39+
-- DROP FUNCTION IF EXISTS eql_v1.config_check_cast(jsonb);
4040

4141
CREATE FUNCTION eql_v1.config_check_cast(val jsonb)
4242
RETURNS BOOLEAN
@@ -52,7 +52,7 @@ $$ LANGUAGE plpgsql;
5252
--
5353
-- Should include a tables field
5454
-- Tables should not be empty
55-
DROP FUNCTION IF EXISTS eql_v1.config_check_tables(jsonb);
55+
-- DROP FUNCTION IF EXISTS eql_v1.config_check_tables(jsonb);
5656
CREATE FUNCTION eql_v1.config_check_tables(val jsonb)
5757
RETURNS boolean
5858
AS $$
@@ -65,7 +65,7 @@ AS $$
6565
$$ LANGUAGE plpgsql;
6666

6767
-- Should include a version field
68-
DROP FUNCTION IF EXISTS eql_v1.config_check_version(jsonb);
68+
-- DROP FUNCTION IF EXISTS eql_v1.config_check_version(jsonb);
6969
CREATE FUNCTION eql_v1.config_check_version(val jsonb)
7070
RETURNS boolean
7171
AS $$

‎src/config/functions.sql

+16-16
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--
55
--
66

7-
DROP FUNCTION IF EXISTS eql_v1.config_default(config jsonb);
7+
-- DROP FUNCTION IF EXISTS eql_v1.config_default(config jsonb);
88

99
CREATE FUNCTION eql_v1.config_default(config jsonb)
1010
RETURNS jsonb
@@ -19,7 +19,7 @@ AS $$
1919
$$ LANGUAGE plpgsql;
2020

2121

22-
DROP FUNCTION IF EXISTS eql_v1.config_add_table(table_name text, config jsonb);
22+
-- DROP FUNCTION IF EXISTS eql_v1.config_add_table(table_name text, config jsonb);
2323

2424
CREATE FUNCTION eql_v1.config_add_table(table_name text, config jsonb)
2525
RETURNS jsonb
@@ -37,7 +37,7 @@ $$ LANGUAGE plpgsql;
3737

3838

3939
-- Add the column if it doesn't exist
40-
DROP FUNCTION IF EXISTS eql_v1.config_add_column(table_name text, column_name text, config jsonb);
40+
-- DROP FUNCTION IF EXISTS eql_v1.config_add_column(table_name text, column_name text, config jsonb);
4141

4242
CREATE FUNCTION eql_v1.config_add_column(table_name text, column_name text, config jsonb)
4343
RETURNS jsonb
@@ -56,7 +56,7 @@ $$ LANGUAGE plpgsql;
5656

5757

5858
-- Set the cast
59-
DROP FUNCTION IF EXISTS eql_v1.config_add_cast(table_name text, column_name text, cast_as text, config jsonb);
59+
-- DROP FUNCTION IF EXISTS eql_v1.config_add_cast(table_name text, column_name text, cast_as text, config jsonb);
6060

6161
CREATE FUNCTION eql_v1.config_add_cast(table_name text, column_name text, cast_as text, config jsonb)
6262
RETURNS jsonb
@@ -70,7 +70,7 @@ $$ LANGUAGE plpgsql;
7070

7171

7272
-- Add the column if it doesn't exist
73-
DROP FUNCTION IF EXISTS eql_v1.config_add_index(table_name text, column_name text, index_name text, opts jsonb, config jsonb);
73+
-- DROP FUNCTION IF EXISTS eql_v1.config_add_index(table_name text, column_name text, index_name text, opts jsonb, config jsonb);
7474

7575
CREATE FUNCTION eql_v1.config_add_index(table_name text, column_name text, index_name text, opts jsonb, config jsonb)
7676
RETURNS jsonb
@@ -86,7 +86,7 @@ $$ LANGUAGE plpgsql;
8686
--
8787
-- Default options for match index
8888
--
89-
DROP FUNCTION IF EXISTS eql_v1.config_match_default();
89+
-- DROP FUNCTION IF EXISTS eql_v1.config_match_default();
9090

9191
CREATE FUNCTION eql_v1.config_match_default()
9292
RETURNS jsonb
@@ -103,7 +103,7 @@ END;
103103
--
104104
-- Adds an index term to the configuration
105105
--
106-
DROP FUNCTION IF EXISTS eql_v1.add_index(table_name text, column_name text, index_name text, cast_as text, opts jsonb);
106+
-- DROP FUNCTION IF EXISTS eql_v1.add_index(table_name text, column_name text, index_name text, cast_as text, opts jsonb);
107107

108108
CREATE FUNCTION eql_v1.add_index(table_name text, column_name text, index_name text, cast_as text DEFAULT 'text', opts jsonb DEFAULT '{}')
109109
RETURNS jsonb
@@ -155,7 +155,7 @@ AS $$
155155
$$ LANGUAGE plpgsql;
156156

157157

158-
DROP FUNCTION IF EXISTS eql_v1.remove_index(table_name text, column_name text, index_name text);
158+
-- DROP FUNCTION IF EXISTS eql_v1.remove_index(table_name text, column_name text, index_name text);
159159

160160
CREATE FUNCTION eql_v1.remove_index(table_name text, column_name text, index_name text)
161161
RETURNS jsonb
@@ -216,7 +216,7 @@ AS $$
216216
$$ LANGUAGE plpgsql;
217217

218218

219-
DROP FUNCTION IF EXISTS eql_v1.modify_index(table_name text, column_name text, index_name text, cast_as text, opts jsonb);
219+
-- DROP FUNCTION IF EXISTS eql_v1.modify_index(table_name text, column_name text, index_name text, cast_as text, opts jsonb);
220220

221221
CREATE FUNCTION eql_v1.modify_index(table_name text, column_name text, index_name text, cast_as text DEFAULT 'text', opts jsonb DEFAULT '{}')
222222
RETURNS jsonb
@@ -240,7 +240,7 @@ $$ LANGUAGE plpgsql;
240240
--
241241
-- Raises an exception if the configuration is already `encrypting` or if there is no `pending` configuration to encrypt.
242242
--
243-
DROP FUNCTION IF EXISTS eql_v1.encrypt();
243+
-- DROP FUNCTION IF EXISTS eql_v1.encrypt();
244244

245245
CREATE FUNCTION eql_v1.encrypt(force boolean DEFAULT false)
246246
RETURNS boolean
@@ -267,7 +267,7 @@ AS $$
267267
$$ LANGUAGE plpgsql;
268268

269269

270-
DROP FUNCTION IF EXISTS eql_v1.activate();
270+
-- DROP FUNCTION IF EXISTS eql_v1.activate();
271271

272272
CREATE FUNCTION eql_v1.activate()
273273
RETURNS boolean
@@ -285,7 +285,7 @@ AS $$
285285
$$ LANGUAGE plpgsql;
286286

287287

288-
DROP FUNCTION IF EXISTS eql_v1.discard();
288+
-- DROP FUNCTION IF EXISTS eql_v1.discard();
289289

290290
CREATE FUNCTION eql_v1.discard()
291291
RETURNS boolean
@@ -301,7 +301,7 @@ AS $$
301301
$$ LANGUAGE plpgsql;
302302

303303

304-
DROP FUNCTION IF EXISTS eql_v1.add_column(table_name text, column_name text, cast_as text);
304+
-- DROP FUNCTION IF EXISTS eql_v1.add_column(table_name text, column_name text, cast_as text);
305305

306306
CREATE FUNCTION eql_v1.add_column(table_name text, column_name text, cast_as text DEFAULT 'text')
307307
RETURNS jsonb
@@ -340,7 +340,7 @@ AS $$
340340
$$ LANGUAGE plpgsql;
341341

342342

343-
DROP FUNCTION IF EXISTS eql_v1.remove_column(table_name text, column_name text);
343+
-- DROP FUNCTION IF EXISTS eql_v1.remove_column(table_name text, column_name text);
344344

345345
CREATE FUNCTION eql_v1.remove_column(table_name text, column_name text)
346346
RETURNS jsonb
@@ -396,7 +396,7 @@ AS $$
396396
$$ LANGUAGE plpgsql;
397397

398398

399-
DROP FUNCTION IF EXISTS eql_v1.reload_config();
399+
-- DROP FUNCTION IF EXISTS eql_v1.reload_config();
400400

401401
CREATE FUNCTION eql_v1.reload_config()
402402
RETURNS void
@@ -405,7 +405,7 @@ BEGIN ATOMIC
405405
RETURN NULL;
406406
END;
407407

408-
DROP FUNCTION IF EXISTS eql_v1.config();
408+
-- DROP FUNCTION IF EXISTS eql_v1.config();
409409

410410
-- A convenience function to return the configuration in a tabular format, allowing for easier filtering, and querying.
411411
-- Query using `SELECT * FROM cs_config();`

‎src/config/tables.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
--
44
--
5-
-- CREATE the cs_configuration_v1 TABLE
5+
-- CREATE the eql_v1_configuration TABLE
66
--
77
CREATE TABLE IF NOT EXISTS public.eql_v1_configuration
88
(

‎src/encrypted/aggregates.sql

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
-- REQUIRE: src/ore/functions.sql
44

55
-- Aggregate functions for ORE
6-
DROP AGGREGATE IF EXISTS eql_v1.min(eql_v1_encrypted);
7-
DROP FUNCTION IF EXISTS eql_v1.min(a eql_v1_encrypted, b eql_v1_encrypted);
6+
-- DROP AGGREGATE IF EXISTS eql_v1.min(eql_v1_encrypted);
7+
-- DROP FUNCTION IF EXISTS eql_v1.min(a eql_v1_encrypted, b eql_v1_encrypted);
88

99
CREATE FUNCTION eql_v1.min(a eql_v1_encrypted, b eql_v1_encrypted)
1010
RETURNS eql_v1_encrypted
@@ -27,8 +27,8 @@ CREATE AGGREGATE eql_v1.min(eql_v1_encrypted)
2727
stype = eql_v1_encrypted
2828
);
2929

30-
DROP AGGREGATE IF EXISTS eql_v1.max(eql_v1_encrypted);
31-
DROP FUNCTION IF EXISTS eql_v1.max(a eql_v1_encrypted, b eql_v1_encrypted);
30+
-- DROP AGGREGATE IF EXISTS eql_v1.max(eql_v1_encrypted);
31+
-- DROP FUNCTION IF EXISTS eql_v1.max(a eql_v1_encrypted, b eql_v1_encrypted);
3232

3333
CREATE FUNCTION eql_v1.max(a eql_v1_encrypted, b eql_v1_encrypted)
3434
RETURNS eql_v1_encrypted

‎src/encrypted/aggregates_test.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
\set ON_ERROR_STOP on
22

33
-- create table
4-
DROP TABLE IF EXISTS agg_test;
4+
-- DROP TABLE IF EXISTS agg_test;
55
CREATE TABLE agg_test
66
(
77
plain_int integer,

‎src/encrypted/casts.sql

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
--
66
-- Convert jsonb to eql_v1.encrypted
77
--
8-
DROP FUNCTION IF EXISTS eql_v1.to_encrypted(data jsonb);
8+
-- DROP FUNCTION IF EXISTS eql_v1.to_encrypted(data jsonb);
99

1010
CREATE FUNCTION eql_v1.to_encrypted(data jsonb)
1111
RETURNS public.eql_v1_encrypted AS $$
@@ -17,7 +17,7 @@ $$ LANGUAGE plpgsql;
1717
--
1818
-- Cast jsonb to eql_v1.encrypted
1919
--
20-
DROP CAST IF EXISTS (jsonb AS public.eql_v1_encrypted);
20+
-- DROP CAST IF EXISTS (jsonb AS public.eql_v1_encrypted);
2121

2222
CREATE CAST (jsonb AS public.eql_v1_encrypted)
2323
WITH FUNCTION eql_v1.to_encrypted(jsonb) AS IMPLICIT;
@@ -26,7 +26,7 @@ CREATE CAST (jsonb AS public.eql_v1_encrypted)
2626
--
2727
-- Convert text to eql_v1.encrypted
2828
--
29-
DROP FUNCTION IF EXISTS eql_v1.to_encrypted(data text);
29+
-- DROP FUNCTION IF EXISTS eql_v1.to_encrypted(data text);
3030

3131
CREATE FUNCTION eql_v1.to_encrypted(data text)
3232
RETURNS public.eql_v1_encrypted AS $$
@@ -38,7 +38,7 @@ $$ LANGUAGE plpgsql;
3838
--
3939
-- Cast text to eql_v1.encrypted
4040
--
41-
DROP CAST IF EXISTS (text AS public.eql_v1_encrypted);
41+
-- DROP CAST IF EXISTS (text AS public.eql_v1_encrypted);
4242

4343
CREATE CAST (text AS public.eql_v1_encrypted)
4444
WITH FUNCTION eql_v1.to_encrypted(text) AS IMPLICIT;
@@ -48,7 +48,7 @@ CREATE CAST (text AS public.eql_v1_encrypted)
4848
--
4949
-- Convert eql_v1.encrypted to jsonb
5050
--
51-
DROP FUNCTION IF EXISTS eql_v1.to_jsonb(e public.eql_v1_encrypted);
51+
-- DROP FUNCTION IF EXISTS eql_v1.to_jsonb(e public.eql_v1_encrypted);
5252

5353
CREATE FUNCTION eql_v1.to_jsonb(e public.eql_v1_encrypted)
5454
RETURNS jsonb AS $$
@@ -60,7 +60,7 @@ $$ LANGUAGE plpgsql;
6060
--
6161
-- Cast eql_v1.encrypted to jsonb
6262
--
63-
DROP CAST IF EXISTS (public.eql_v1_encrypted AS jsonb);
63+
-- DROP CAST IF EXISTS (public.eql_v1_encrypted AS jsonb);
6464

6565
CREATE CAST (public.eql_v1_encrypted AS jsonb)
6666
WITH FUNCTION eql_v1.to_jsonb(public.eql_v1_encrypted) AS ASSIGNMENT;

‎src/encrypted/constraints.sql

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
-- $$ LANGUAGE plpgsql;
7777

7878
-- Should include an ident field
79-
DROP FUNCTION IF EXISTS eql_v1._encrypted_check_i(jsonb);
79+
-- DROP FUNCTION IF EXISTS eql_v1._encrypted_check_i(jsonb);
8080
CREATE FUNCTION eql_v1._encrypted_check_i(val jsonb)
8181
RETURNS boolean
8282
AS $$
@@ -106,7 +106,7 @@ $$ LANGUAGE plpgsql;
106106
-- $$ LANGUAGE plpgsql;
107107

108108
-- Ident field should include table and column
109-
DROP FUNCTION IF EXISTS eql_v1._encrypted_check_i_ct(jsonb);
109+
-- DROP FUNCTION IF EXISTS eql_v1._encrypted_check_i_ct(jsonb);
110110
CREATE FUNCTION eql_v1._encrypted_check_i_ct(val jsonb)
111111
RETURNS boolean
112112
AS $$
@@ -132,7 +132,7 @@ $$ LANGUAGE plpgsql;
132132
-- $$ LANGUAGE plpgsql;
133133

134134

135-
DROP FUNCTION IF EXISTS eql_v1.check_encrypted(val jsonb);
135+
-- DROP FUNCTION IF EXISTS eql_v1.check_encrypted(val jsonb);
136136

137137
CREATE FUNCTION eql_v1.check_encrypted(val jsonb)
138138
RETURNS BOOLEAN

0 commit comments

Comments
 (0)