From: Regina Obe <lr@pcorp.us>
Date: Fri, 1 Jul 2011 21:32:10 +0000 (+0000)
Subject: #1082 get rid of delete from geometry_columns call.  Also cleanup argument list to... 
X-Git-Tag: 2.0.0alpha1~1297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f91031fbca1b5c93c5f76164f1b212b623ff6d77;p=postgis

#1082 get rid of delete from geometry_columns call.  Also cleanup argument list to make more modern

git-svn-id: http://svn.osgeo.org/postgis/trunk@7545 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 3fd274163..ad8967a79 100644
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -2497,7 +2497,7 @@ LANGUAGE 'plpgsql' VOLATILE STRICT;
 -- when catalogue and schema is undefined.
 --
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION DropGeometryColumn(varchar,varchar)
+CREATE OR REPLACE FUNCTION DropGeometryColumn(table_name varchar, column_name varchar)
 	RETURNS text
 	AS
 $$
@@ -2518,14 +2518,11 @@ LANGUAGE 'plpgsql' VOLATILE STRICT;
 -- Drop a table and all its references in geometry_columns
 --
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION DropGeometryTable(varchar, varchar,varchar)
+CREATE OR REPLACE FUNCTION DropGeometryTable(catalog_name varchar, schema_name varchar, table_name varchar)
 	RETURNS text
 	AS
 $$
 DECLARE
-	catalog_name alias for $1;
-	schema_name alias for $2;
-	table_name alias for $3;
 	real_schema name;
 
 BEGIN
@@ -2536,12 +2533,6 @@ BEGIN
 		real_schema = schema_name;
 	END IF;
 
-	-- Remove refs from geometry_columns table
-	EXECUTE 'DELETE FROM geometry_columns WHERE ' ||
-		'f_table_schema = ' || quote_literal(real_schema) ||
-		' AND ' ||
-		' f_table_name = ' || quote_literal(table_name);
-
 	-- Remove table
 	EXECUTE 'DROP TABLE IF EXISTS '
 		|| quote_ident(real_schema) || '.' ||
@@ -2563,9 +2554,9 @@ LANGUAGE 'plpgsql' VOLATILE STRICT;
 -- Drop a table and all its references in geometry_columns
 --
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION DropGeometryTable(varchar,varchar) RETURNS text AS
+CREATE OR REPLACE FUNCTION DropGeometryTable(schema_name varchar, table_name varchar) RETURNS text AS
 $$ SELECT DropGeometryTable('',$1,$2) $$
-LANGUAGE 'sql' WITH (isstrict);
+LANGUAGE 'sql' VOLATILE STRICT;
 
 -----------------------------------------------------------------------
 -- DROPGEOMETRYTABLE
@@ -2576,7 +2567,7 @@ LANGUAGE 'sql' WITH (isstrict);
 -- For PG>=73 use current_schema()
 --
 -----------------------------------------------------------------------
-CREATE OR REPLACE FUNCTION DropGeometryTable(varchar) RETURNS text AS
+CREATE OR REPLACE FUNCTION DropGeometryTable(table_name varchar) RETURNS text AS
 $$ SELECT DropGeometryTable('','',$1) $$
 LANGUAGE 'sql' VOLATILE STRICT;