Merge pull request #87 from cipherstash/improve-uninstall

Use same drop setup on install and uninstall

Author: tobyhede

sql/000-ore.sql

@@ -88,7 +88,7 @@ $$ LANGUAGE plpgsql;
 -- doesn't always make sense but it's here for completeness.
 -- If both are non-empty, we compare the first element. If they are equal
 -- we need to consider the next block so we recurse, otherwise we return the comparison result.
-
+DROP FUNCTION IF EXISTS compare_ore_array(a ore_64_8_index_v1, b ore_64_8_index_v1);
 
 CREATE FUNCTION compare_ore_array(a ore_64_8_index_v1, b ore_64_8_index_v1)
 RETURNS integer AS $$
@@ -184,8 +184,8 @@ DROP OPERATOR IF EXISTS = (ore_64_8_index_v1, ore_64_8_index_v1);
 
 CREATE OPERATOR = (
   PROCEDURE="ore_64_8_v1_eq",
-  LEFTARG=ore_64_8_v1,
-  RIGHTARG=ore_64_8_v1,
+  LEFTARG=ore_64_8_index_v1,
+  RIGHTARG=ore_64_8_index_v1,
   NEGATOR = <>,
   RESTRICT = eqsel,
   JOIN = eqjoinsel,
@@ -198,8 +198,8 @@ DROP OPERATOR IF EXISTS <> (ore_64_8_index_v1, ore_64_8_index_v1);
 
 CREATE OPERATOR <> (
   PROCEDURE="ore_64_8_v1_neq",
-  LEFTARG=ore_64_8_v1,
-  RIGHTARG=ore_64_8_v1,
+  LEFTARG=ore_64_8_index_v1,
+  RIGHTARG=ore_64_8_index_v1,
   NEGATOR = =,
   RESTRICT = eqsel,
   JOIN = eqjoinsel,
@@ -211,8 +211,8 @@ DROP OPERATOR IF EXISTS > (ore_64_8_index_v1, ore_64_8_index_v1);
 
 CREATE OPERATOR > (
   PROCEDURE="ore_64_8_v1_gt",
-  LEFTARG=ore_64_8_v1,
-  RIGHTARG=ore_64_8_v1,
+  LEFTARG=ore_64_8_index_v1,
+  RIGHTARG=ore_64_8_index_v1,
   COMMUTATOR = <,
   NEGATOR = <=,
   RESTRICT = scalargtsel,
@@ -224,8 +224,8 @@ DROP OPERATOR IF EXISTS < (ore_64_8_index_v1, ore_64_8_index_v1);
 
 CREATE OPERATOR < (
   PROCEDURE="ore_64_8_v1_lt",
-  LEFTARG=ore_64_8_v1,
-  RIGHTARG=ore_64_8_v1,
+  LEFTARG=ore_64_8_index_v1,
+  RIGHTARG=ore_64_8_index_v1,
   COMMUTATOR = >,
   NEGATOR = >=,
   RESTRICT = scalarltsel,
@@ -237,8 +237,8 @@ DROP OPERATOR IF EXISTS <= (ore_64_8_index_v1, ore_64_8_index_v1);
 
 CREATE OPERATOR <= (
   PROCEDURE="ore_64_8_v1_lte",
-  LEFTARG=ore_64_8_v1,
-  RIGHTARG=ore_64_8_v1,
+  LEFTARG=ore_64_8_index_v1,
+  RIGHTARG=ore_64_8_index_v1,
   COMMUTATOR = >=,
   NEGATOR = >,
   RESTRICT = scalarlesel,
@@ -250,8 +250,8 @@ DROP OPERATOR IF EXISTS >= (ore_64_8_index_v1, ore_64_8_index_v1);
 
 CREATE OPERATOR >= (
   PROCEDURE="ore_64_8_v1_gte",
-  LEFTARG=ore_64_8_v1,
-  RIGHTARG=ore_64_8_v1,
+  LEFTARG=ore_64_8_index_v1,
+  RIGHTARG=ore_64_8_index_v1,
   COMMUTATOR = <=,
   NEGATOR = <,
   RESTRICT = scalarlesel,
@@ -266,7 +266,7 @@ CREATE OPERATOR FAMILY ore_64_8_v1_btree_ops USING btree;
 
 DROP OPERATOR CLASS IF EXISTS ore_64_8_v1_btree_ops USING btree;
 
-CREATE OPERATOR CLASS ore_64_8_v1_btree_ops DEFAULT FOR TYPE ore_64_8_v1 USING btree FAMILY ore_64_8_v1_btree_ops  AS
+CREATE OPERATOR CLASS ore_64_8_v1_btree_ops DEFAULT FOR TYPE ore_64_8_index_v1 USING btree FAMILY ore_64_8_v1_btree_ops  AS
         OPERATOR 1 <,
         OPERATOR 2 <=,
         OPERATOR 3 =,

sql/666-drop-operators.sql

@@ -1,5 +1,5 @@
-DROP OPERATOR FAMILY IF EXISTS cs_encrypted_ore_64_8_v1_btree_ops_v1 USING btree;
-DROP OPERATOR CLASS IF EXISTS cs_encrypted_ore_64_8_v1_btree_ops_v1 USING btree;
+DROP OPERATOR FAMILY IF EXISTS cs_encrypted_ore_64_8_v1_btree_ops_v1 USING btree CASCADE;
+DROP OPERATOR CLASS IF EXISTS cs_encrypted_ore_64_8_v1_btree_ops_v1 USING btree CASCADE;
 
 DROP OPERATOR IF EXISTS @> (cs_encrypted_v1, cs_encrypted_v1);
 DROP OPERATOR IF EXISTS @> (cs_encrypted_v1, cs_match_index_v1);

sql/666-drop_types.sql renamed to sql/666-drop-types.sql

@@ -1,5 +1,5 @@
 -- ANYTHING THAT NEEDS TO BE DROPPED LAST
-DROP TYPE IF EXISTS ore_64_8_v1;
+DROP TYPE IF EXISTS ore_64_8_index_v1;
 DROP TYPE IF EXISTS cs_ste_vec_index_v1;
 DROP TYPE IF EXISTS cs_ste_vec_v1_entry;
 DROP TYPE IF EXISTS ore_cllw_8_v1;