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, 2 insertions, 6 deletions

diff --git a/contrib/pg_trgm/uninstall_pg_trgm.sql b/contrib/pg_trgm/uninstall_pg_trgm.sql
index 1804078f158..8fc85bd7bac 100644
--- a/contrib/pg_trgm/uninstall_pg_trgm.sql
+++ b/contrib/pg_trgm/uninstall_pg_trgm.sql
@@ -2,7 +2,7 @@ SET search_path = public;
 
 BEGIN;
 
-DROP OPERATOR CLASS gist_trgm_ops;
+DROP OPERATOR CLASS gist_trgm_ops USING gist;
 
 DROP FUNCTION gtrgm_same(gtrgm, gtrgm, internal);
 
@@ -18,11 +18,7 @@ DROP FUNCTION gtrgm_compress(internal);
  
 DROP FUNCTION gtrgm_consistent(gtrgm,internal,int4);
 
-DROP TYPE gtrgm;
-
-DROP FUNCTION gtrgm_out(gtrgm);
-
-DROP FUNCTION gtrgm_in(cstring);
+DROP TYPE gtrgm CASCADE;
 
 DROP OPERATOR % (text, text);