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

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 3fd2741631ea350ab65efa26432f4966314db0a3..ad8967a79574ea7b5f306fedc2350a52af4a7e60 100644 (file)
--- 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.\r
 --\r
 -----------------------------------------------------------------------\r
-CREATE OR REPLACE FUNCTION DropGeometryColumn(varchar,varchar)\r
+CREATE OR REPLACE FUNCTION DropGeometryColumn(table_name varchar, column_name varchar)\r
        RETURNS text\r
        AS\r
 $$\r
@@ -2518,14 +2518,11 @@ LANGUAGE 'plpgsql' VOLATILE STRICT;
 -- Drop a table and all its references in geometry_columns\r
 --\r
 -----------------------------------------------------------------------\r
-CREATE OR REPLACE FUNCTION DropGeometryTable(varchar, varchar,varchar)\r
+CREATE OR REPLACE FUNCTION DropGeometryTable(catalog_name varchar, schema_name varchar, table_name varchar)\r
        RETURNS text\r
        AS\r
 $$\r
 DECLARE\r
-       catalog_name alias for $1;\r
-       schema_name alias for $2;\r
-       table_name alias for $3;\r
        real_schema name;\r
 \r
 BEGIN\r
@@ -2536,12 +2533,6 @@ BEGIN
                real_schema = schema_name;\r
        END IF;\r
 \r
-       -- Remove refs from geometry_columns table\r
-       EXECUTE 'DELETE FROM geometry_columns WHERE ' ||\r
-               'f_table_schema = ' || quote_literal(real_schema) ||\r
-               ' AND ' ||\r
-               ' f_table_name = ' || quote_literal(table_name);\r
-\r
        -- Remove table\r
        EXECUTE 'DROP TABLE IF EXISTS '\r
                || quote_ident(real_schema) || '.' ||\r
@@ -2563,9 +2554,9 @@ LANGUAGE 'plpgsql' VOLATILE STRICT;
 -- Drop a table and all its references in geometry_columns\r
 --\r
 -----------------------------------------------------------------------\r
-CREATE OR REPLACE FUNCTION DropGeometryTable(varchar,varchar) RETURNS text AS\r
+CREATE OR REPLACE FUNCTION DropGeometryTable(schema_name varchar, table_name varchar) RETURNS text AS\r
 $$ SELECT DropGeometryTable('',$1,$2) $$\r
-LANGUAGE 'sql' WITH (isstrict);\r
+LANGUAGE 'sql' VOLATILE STRICT;\r
 \r
 -----------------------------------------------------------------------\r
 -- DROPGEOMETRYTABLE\r
@@ -2576,7 +2567,7 @@ LANGUAGE 'sql' WITH (isstrict);
 -- For PG>=73 use current_schema()\r
 --\r
 -----------------------------------------------------------------------\r
-CREATE OR REPLACE FUNCTION DropGeometryTable(varchar) RETURNS text AS\r
+CREATE OR REPLACE FUNCTION DropGeometryTable(table_name varchar) RETURNS text AS\r
 $$ SELECT DropGeometryTable('','',$1) $$\r
 LANGUAGE 'sql' VOLATILE STRICT;\r
 \r