Fix a number of syntax errors in contrib modules' uninstall scripts.

Most of the changes add the mandatory USING clause to DROP OPERATOR
CLASS statements.  DROP TYPE is now DROP TYPE CASCADE; without
CASCADE a DROP TYPE fails due to the circular dependency on the
type's I/O functions.  The DROP FUNCTION statements for the I/O
functions have been removed, as DROP TYPE CASCADE removes them
automatically. Patch from Michael Fuhr.

1 files changed, 4 insertions, 12 deletions

diff --git a/contrib/intarray/uninstall__int.sql b/contrib/intarray/uninstall__int.sql
index 92dc92aeae5..43fd854c7ae 100644
--- a/contrib/intarray/uninstall__int.sql
+++ b/contrib/intarray/uninstall__int.sql
@@ -1,6 +1,6 @@
 SET search_path = public;
 
-DROP OPERATOR CLASS gist__intbig_ops;
+DROP OPERATOR CLASS gist__intbig_ops USING gist;
 
 DROP FUNCTION g_intbig_same(internal, internal, internal);
 
@@ -16,13 +16,9 @@ DROP FUNCTION g_intbig_compress(internal);
 
 DROP FUNCTION g_intbig_consistent(internal,internal,int4);
 
-DROP TYPE intbig_gkey;
+DROP TYPE intbig_gkey CASCADE;
 
-DROP FUNCTION _intbig_out(intbig_gkey);
-
-DROP FUNCTION _intbig_in(cstring);
-
-DROP OPERATOR CLASS gist__int_ops;
+DROP OPERATOR CLASS gist__int_ops USING gist;
 
 DROP FUNCTION g_int_same(_int4, _int4, internal);
 
@@ -116,8 +112,4 @@ DROP FUNCTION boolop(_int4, query_int);
 
 DROP FUNCTION querytree(query_int);
 
-DROP TYPE query_int;
-
-DROP FUNCTION bqarr_out(query_int);
-
-DROP FUNCTION bqarr_in(cstring);
+DROP TYPE query_int CASCADE;