Skip to content

Commit 1bb6ecd

Browse files
authored
Merge pull request #121 from cipherstash/drop-schema-on-install
fix: drop eql schema on install
2 parents 54840cb + d5d8c27 commit 1bb6ecd

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

src/schema.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
CREATE SCHEMA IF NOT EXISTS eql_v2;
1+
DROP SCHEMA IF EXISTS eql_v2 CASCADE;
2+
CREATE SCHEMA eql_v2;

tasks/test.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,13 @@ echo
4646

4747
# Install
4848
cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f-
49-
# if cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f- | grep -q "ERROR"; then
50-
# echo
51-
# echo '******************************************************'
52-
# echo '* ❌ ERROR installing release/cipherstash-encrypt.sql'
53-
# echo '******************************************************'
54-
# echo
55-
56-
# exit 1
57-
# fi
5849

5950

6051
cat tests/test_helpers.sql | docker exec -i ${container_name} psql ${connection_url} -f-
6152
cat tests/ore.sql | docker exec -i ${container_name} psql ${connection_url} -f-
6253
cat tests/ste_vec.sql | docker exec -i ${container_name} psql ${connection_url} -f-
6354

55+
6456
if [ $usage_test = "false" ]; then
6557
find src -type f -path "*_test.sql" | while read -r sql_file; do
6658
echo $sql_file

tasks/uninstall.sql

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11

22
DO $$
33
BEGIN
4-
EXECUTE format('ALTER TABLE IF EXISTS %I RENAME TO %I_%s', 'eql_v2_configuration','eql_v2_configuration_', to_char(current_date,'YYYYMMDD')::TEXT);
4+
ALTER TABLE IF EXISTS public.eql_v2_configuration DROP CONSTRAINT IF EXISTS eql_v2_configuration_data_check;
5+
6+
EXECUTE format('ALTER TABLE IF EXISTS %I RENAME TO %I_%s', 'eql_v2_configuration','eql_v2_configuration_', to_char(current_date,'YYYYMMDD')::TEXT);
7+
8+
RAISE NOTICE 'EQL configuration archived as %_%','eql_v2_configuration_', to_char(current_date,'YYYYMMDD')::TEXT;
59
END
610
$$;
711

8-
ALTER TABLE public.eql_v2_configuration DROP CONSTRAINT IF EXISTS eql_v2_configuration_data_check;
9-
1012
DROP SCHEMA IF EXISTS eql_v2 CASCADE;

0 commit comments

Comments
 (0)