Skip to content

Commit a1aaee8

Browse files
tobyhedetobyhede
committed
chore: Remove unneeded drop statements
1 parent b9e3c0c commit a1aaee8

39 files changed

+0
-198
lines changed

‎src/blake3/functions.sql

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
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);
54

65
-- extracts blake3 index from a jsonb value
7-
-- DROP FUNCTION IF EXISTS eql_v1.blake3(val jsonb);
86

97
CREATE FUNCTION eql_v1.blake3(val jsonb)
108
RETURNS eql_v1.blake3
@@ -26,7 +24,6 @@ $$ LANGUAGE plpgsql;
2624

2725

2826
-- extracts blake3 index from an eql_v1_encrypted value
29-
-- DROP FUNCTION IF EXISTS eql_v1.blake3(val eql_v1_encrypted);
3027

3128
CREATE FUNCTION eql_v1.blake3(val eql_v1_encrypted)
3229
RETURNS eql_v1.blake3

‎src/blake3/types.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
-- REQUIRE: src/schema.sql
22

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

‎src/config/constraints.sql

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
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);
98
CREATE FUNCTION eql_v1.config_get_indexes(val jsonb)
109
RETURNS SETOF text
1110
LANGUAGE sql IMMUTABLE STRICT PARALLEL SAFE
@@ -18,7 +17,6 @@ END;
1817
--
1918
-- Used by the cs_configuration_data_v1_check constraint
2019
--
21-
-- DROP FUNCTION IF EXISTS eql_v1.config_check_indexes(jsonb);
2220
CREATE FUNCTION eql_v1.config_check_indexes(val jsonb)
2321
RETURNS BOOLEAN
2422
IMMUTABLE STRICT PARALLEL SAFE
@@ -36,7 +34,6 @@ AS $$
3634
$$ LANGUAGE plpgsql;
3735

3836

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

4138
CREATE FUNCTION eql_v1.config_check_cast(val jsonb)
4239
RETURNS BOOLEAN
@@ -52,7 +49,6 @@ $$ LANGUAGE plpgsql;
5249
--
5350
-- Should include a tables field
5451
-- Tables should not be empty
55-
-- DROP FUNCTION IF EXISTS eql_v1.config_check_tables(jsonb);
5652
CREATE FUNCTION eql_v1.config_check_tables(val jsonb)
5753
RETURNS boolean
5854
AS $$
@@ -65,7 +61,6 @@ AS $$
6561
$$ LANGUAGE plpgsql;
6662

6763
-- Should include a version field
68-
-- DROP FUNCTION IF EXISTS eql_v1.config_check_version(jsonb);
6964
CREATE FUNCTION eql_v1.config_check_version(val jsonb)
7065
RETURNS boolean
7166
AS $$

‎src/config/functions.sql

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
--
55
--
66

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

98
CREATE FUNCTION eql_v1.config_default(config jsonb)
109
RETURNS jsonb
@@ -19,7 +18,6 @@ AS $$
1918
$$ LANGUAGE plpgsql;
2019

2120

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

2422
CREATE FUNCTION eql_v1.config_add_table(table_name text, config jsonb)
2523
RETURNS jsonb
@@ -37,7 +35,6 @@ $$ LANGUAGE plpgsql;
3735

3836

3937
-- 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);
4138

4239
CREATE FUNCTION eql_v1.config_add_column(table_name text, column_name text, config jsonb)
4340
RETURNS jsonb
@@ -56,7 +53,6 @@ $$ LANGUAGE plpgsql;
5653

5754

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

6157
CREATE FUNCTION eql_v1.config_add_cast(table_name text, column_name text, cast_as text, config jsonb)
6258
RETURNS jsonb
@@ -70,7 +66,6 @@ $$ LANGUAGE plpgsql;
7066

7167

7268
-- 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);
7469

7570
CREATE FUNCTION eql_v1.config_add_index(table_name text, column_name text, index_name text, opts jsonb, config jsonb)
7671
RETURNS jsonb
@@ -86,7 +81,6 @@ $$ LANGUAGE plpgsql;
8681
--
8782
-- Default options for match index
8883
--
89-
-- DROP FUNCTION IF EXISTS eql_v1.config_match_default();
9084

9185
CREATE FUNCTION eql_v1.config_match_default()
9286
RETURNS jsonb
@@ -103,7 +97,6 @@ END;
10397
--
10498
-- Adds an index term to the configuration
10599
--
106-
-- DROP FUNCTION IF EXISTS eql_v1.add_index(table_name text, column_name text, index_name text, cast_as text, opts jsonb);
107100

108101
CREATE FUNCTION eql_v1.add_index(table_name text, column_name text, index_name text, cast_as text DEFAULT 'text', opts jsonb DEFAULT '{}')
109102
RETURNS jsonb
@@ -155,7 +148,6 @@ AS $$
155148
$$ LANGUAGE plpgsql;
156149

157150

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

160152
CREATE FUNCTION eql_v1.remove_index(table_name text, column_name text, index_name text)
161153
RETURNS jsonb
@@ -216,7 +208,6 @@ AS $$
216208
$$ LANGUAGE plpgsql;
217209

218210

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

221212
CREATE FUNCTION eql_v1.modify_index(table_name text, column_name text, index_name text, cast_as text DEFAULT 'text', opts jsonb DEFAULT '{}')
222213
RETURNS jsonb
@@ -240,7 +231,6 @@ $$ LANGUAGE plpgsql;
240231
--
241232
-- Raises an exception if the configuration is already `encrypting` or if there is no `pending` configuration to encrypt.
242233
--
243-
-- DROP FUNCTION IF EXISTS eql_v1.encrypt();
244234

245235
CREATE FUNCTION eql_v1.encrypt()
246236
RETURNS boolean
@@ -265,7 +255,6 @@ AS $$
265255
$$ LANGUAGE plpgsql;
266256

267257

268-
-- DROP FUNCTION IF EXISTS eql_v1.activate();
269258

270259
CREATE FUNCTION eql_v1.activate()
271260
RETURNS boolean
@@ -283,7 +272,6 @@ AS $$
283272
$$ LANGUAGE plpgsql;
284273

285274

286-
-- DROP FUNCTION IF EXISTS eql_v1.discard();
287275

288276
CREATE FUNCTION eql_v1.discard()
289277
RETURNS boolean
@@ -299,7 +287,6 @@ AS $$
299287
$$ LANGUAGE plpgsql;
300288

301289

302-
-- DROP FUNCTION IF EXISTS eql_v1.add_column(table_name text, column_name text, cast_as text);
303290

304291
CREATE FUNCTION eql_v1.add_column(table_name text, column_name text, cast_as text DEFAULT 'text')
305292
RETURNS jsonb
@@ -340,7 +327,6 @@ AS $$
340327
$$ LANGUAGE plpgsql;
341328

342329

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

345331
CREATE FUNCTION eql_v1.remove_column(table_name text, column_name text)
346332
RETURNS jsonb
@@ -398,7 +384,6 @@ AS $$
398384
$$ LANGUAGE plpgsql;
399385

400386

401-
-- DROP FUNCTION IF EXISTS eql_v1.reload_config();
402387

403388
CREATE FUNCTION eql_v1.reload_config()
404389
RETURNS void
@@ -407,7 +392,6 @@ BEGIN ATOMIC
407392
RETURN NULL;
408393
END;
409394

410-
-- DROP FUNCTION IF EXISTS eql_v1.config();
411395

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

‎src/encrypted/aggregates.sql

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
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);
86

97
CREATE FUNCTION eql_v1.min(a eql_v1_encrypted, b eql_v1_encrypted)
108
RETURNS eql_v1_encrypted
@@ -27,8 +25,6 @@ CREATE AGGREGATE eql_v1.min(eql_v1_encrypted)
2725
stype = eql_v1_encrypted
2826
);
2927

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);
3228

3329
CREATE FUNCTION eql_v1.max(a eql_v1_encrypted, b eql_v1_encrypted)
3430
RETURNS eql_v1_encrypted

‎src/encrypted/aggregates_test.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
\set ON_ERROR_STOP on
22

33
-- create table
4-
-- DROP TABLE IF EXISTS agg_test;
54
CREATE TABLE agg_test
65
(
76
plain_int integer,

‎src/encrypted/casts.sql

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
--
66
-- Convert jsonb to eql_v1.encrypted
77
--
8-
-- DROP FUNCTION IF EXISTS eql_v1.to_encrypted(data jsonb);
98

109
CREATE FUNCTION eql_v1.to_encrypted(data jsonb)
1110
RETURNS public.eql_v1_encrypted AS $$
@@ -17,7 +16,6 @@ $$ LANGUAGE plpgsql;
1716
--
1817
-- Cast jsonb to eql_v1.encrypted
1918
--
20-
-- DROP CAST IF EXISTS (jsonb AS public.eql_v1_encrypted);
2119

2220
CREATE CAST (jsonb AS public.eql_v1_encrypted)
2321
WITH FUNCTION eql_v1.to_encrypted(jsonb) AS ASSIGNMENT;
@@ -26,7 +24,6 @@ CREATE CAST (jsonb AS public.eql_v1_encrypted)
2624
--
2725
-- Convert text to eql_v1.encrypted
2826
--
29-
-- DROP FUNCTION IF EXISTS eql_v1.to_encrypted(data text);
3027

3128
CREATE FUNCTION eql_v1.to_encrypted(data text)
3229
RETURNS public.eql_v1_encrypted AS $$
@@ -38,7 +35,6 @@ $$ LANGUAGE plpgsql;
3835
--
3936
-- Cast text to eql_v1.encrypted
4037
--
41-
-- DROP CAST IF EXISTS (text AS public.eql_v1_encrypted);
4238

4339
CREATE CAST (text AS public.eql_v1_encrypted)
4440
WITH FUNCTION eql_v1.to_encrypted(text) AS ASSIGNMENT;
@@ -48,7 +44,6 @@ CREATE CAST (text AS public.eql_v1_encrypted)
4844
--
4945
-- Convert eql_v1.encrypted to jsonb
5046
--
51-
-- DROP FUNCTION IF EXISTS eql_v1.to_jsonb(e public.eql_v1_encrypted);
5247

5348
CREATE FUNCTION eql_v1.to_jsonb(e public.eql_v1_encrypted)
5449
RETURNS jsonb AS $$
@@ -60,7 +55,6 @@ $$ LANGUAGE plpgsql;
6055
--
6156
-- Cast eql_v1.encrypted to jsonb
6257
--
63-
-- DROP CAST IF EXISTS (public.eql_v1_encrypted AS jsonb);
6458

6559
CREATE CAST (public.eql_v1_encrypted AS jsonb)
6660
WITH FUNCTION eql_v1.to_jsonb(public.eql_v1_encrypted) AS ASSIGNMENT;

‎src/encrypted/functions.sql

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
-- REQUIRE: src/unique/types.sql
55

66

7-
-- DROP FUNCTION IF EXISTS eql_v1.ciphertext(val jsonb);
87

98
CREATE FUNCTION eql_v1.ciphertext(val jsonb)
109
RETURNS text
@@ -19,7 +18,6 @@ AS $$
1918
$$ LANGUAGE plpgsql;
2019

2120

22-
-- DROP FUNCTION IF EXISTS eql_v1.ciphertext(val eql_v1_encrypted);
2321

2422
CREATE FUNCTION eql_v1.ciphertext(val eql_v1_encrypted)
2523
RETURNS text
@@ -31,14 +29,12 @@ AS $$
3129
$$ LANGUAGE plpgsql;
3230

3331

34-
-- DROP FUNCTION IF EXISTS eql_v1._first_grouped_value(jsonb, jsonb);
3532

3633
CREATE FUNCTION eql_v1._first_grouped_value(jsonb, jsonb)
3734
RETURNS jsonb AS $$
3835
SELECT COALESCE($1, $2);
3936
$$ LANGUAGE sql IMMUTABLE;
4037

41-
-- DROP AGGREGATE IF EXISTS eql_v1.grouped_value(jsonb);
4238

4339
CREATE AGGREGATE eql_v1.grouped_value(jsonb) (
4440
SFUNC = eql_v1._first_grouped_value,

‎src/encrypted/types.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
-- eql_v1.encrypted is an internal composite type
1616
-- eql_v1_encrypted data is cast to eql_v1.encrypted for use in EQL functions
17-
-- DROP TYPE IF EXISTS public.eql_v1_encrypted;
1817

1918
--
2019
-- Create an eql_v1_encrypted type in the public schema

‎src/encryptindex/functions.sql

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
-- Return the diff of two configurations
22
-- Returns the set of keys in a that have different values to b
33
-- The json comparison is on object values held by the key
4-
-- DROP FUNCTION IF EXISTS eql_v1.diff_config(a JSONB, b JSONB);
54

65
CREATE FUNCTION eql_v1.diff_config(a JSONB, b JSONB)
76
RETURNS TABLE(table_name TEXT, column_name TEXT)
@@ -34,7 +33,6 @@ $$ LANGUAGE plpgsql;
3433

3534
-- Returns the set of columns with pending configuration changes
3635
-- Compares the columns in pending configuration that do not match the active config
37-
-- DROP FUNCTION IF EXISTS eql_v1.select_pending_columns();
3836

3937
CREATE FUNCTION eql_v1.select_pending_columns()
4038
RETURNS TABLE(table_name TEXT, column_name TEXT)
@@ -72,7 +70,6 @@ $$ LANGUAGE plpgsql;
7270
-- On initial encryption from plaintext the target column will be `{column_name}_encrypted `
7371
-- OR NULL if the column does not exist
7472
--
75-
-- DROP FUNCTION IF EXISTS eql_v1.select_target_columns();
7673

7774
CREATE FUNCTION eql_v1.select_target_columns()
7875
RETURNS TABLE(table_name TEXT, column_name TEXT, target_column TEXT)
@@ -93,7 +90,6 @@ $$ LANGUAGE sql;
9390

9491
--
9592
-- Returns true if all pending columns have a target (encrypted) column
96-
-- DROP FUNCTION IF EXISTS eql_v1.ready_for_encryption();
9793

9894
CREATE FUNCTION eql_v1.ready_for_encryption()
9995
RETURNS BOOLEAN
@@ -113,7 +109,6 @@ $$ LANGUAGE sql;
113109
-- Executes the ALTER TABLE statement
114110
-- `ALTER TABLE {target_table} ADD COLUMN {column_name}_encrypted eql_v1_encrypted;`
115111
--
116-
-- DROP FUNCTION IF EXISTS eql_v1.create_encrypted_columns();
117112

118113
CREATE FUNCTION eql_v1.create_encrypted_columns()
119114
RETURNS TABLE(table_name TEXT, column_name TEXT)
@@ -138,7 +133,6 @@ $$ LANGUAGE plpgsql;
138133
-- `ALTER TABLE {target_table} RENAME COLUMN {column_name} TO {column_name}_plaintext;
139134
-- `ALTER TABLE {target_table} RENAME COLUMN {column_name}_encrypted TO {column_name};`
140135
--
141-
-- DROP FUNCTION IF EXISTS eql_v1.rename_encrypted_columns();
142136

143137
CREATE FUNCTION eql_v1.rename_encrypted_columns()
144138
RETURNS TABLE(table_name TEXT, column_name TEXT, target_column TEXT)
@@ -155,7 +149,6 @@ AS $$
155149
$$ LANGUAGE plpgsql;
156150

157151

158-
-- DROP FUNCTION IF EXISTS eql_v1.count_encrypted_with_active_config(table_name TEXT, column_name TEXT);
159152

160153
CREATE FUNCTION eql_v1.count_encrypted_with_active_config(table_name TEXT, column_name TEXT)
161154
RETURNS BIGINT

0 commit comments

Comments
 (0)