From 81d3e41e96faca901fb4764a4b0a6ea5b850c9ea Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 4 Jun 2004 08:49:26 +0000
Subject: [PATCH] Moved all geoemtry_columns cleanup in fix_geometry_columns,
 update_geometry_stats(*) and addgeometrycolumn(*) will now call the former
 and print out its result text.

git-svn-id: http://svn.osgeo.org/postgis/trunk@583 b70326c6-7e19-0410-871a-916f4a2858ee
---
 postgis.sql.in | 83 +++++---------------------------------------------
 1 file changed, 8 insertions(+), 75 deletions(-)

diff --git a/postgis.sql.in b/postgis.sql.in
index afbb35b7c..9ed8d1781 100644
--- a/postgis.sql.in
+++ b/postgis.sql.in
@@ -396,7 +396,7 @@ BEGIN
 
 #if USE_VERSION >= 75
 	-- no linkage to system table needed
-	return ''schemafixes:''||foundschema::text;
+	return ''fixed:''||foundschema::text;
 #endif
 
 	-- fix linking to system tables
@@ -429,7 +429,7 @@ BEGIN
 
 	result = 
 #if USE_VERSION >= 73
-		'' schemafixes:'' || foundschema::text ||
+		''fixed:'' || foundschema::text ||
 #endif
 		'' linked:'' || linked::text || 
 		'' deleted:'' || deleted::text;
@@ -2611,32 +2611,11 @@ AS
 '
 DECLARE
 	result text;
-	linked integer;
 	stated integer;
-	deleted integer;
+	fixres text;
 BEGIN
 
-	UPDATE geometry_columns SET
-		attrelid = NULL,
-		varattnum = NULL,
-		stats = NULL;
-
-	UPDATE geometry_columns SET
-		attrelid = c.oid,
-		varattnum = a.attnum
-#if USE_VERSION >= 73
-		FROM pg_class c, pg_attribute a, pg_namespace n
-		WHERE n.nspname = f_table_schema::name
-		AND c.relname = f_table_name::name
-		AND c.relnamespace = n.oid
-#else // USE_VERSION < 73 
-		FROM pg_class c, pg_attribute a
-		WHERE c.relname = f_table_name::name
-#endif
-		AND a.attname = f_geometry_column::name
-		AND a.attrelid = c.oid;
-	
-	GET DIAGNOSTICS linked = ROW_COUNT;
+	SELECT fix_geometry_columns() INTO fixres;
 
 	UPDATE geometry_columns SET
 #if USE_VERSION >= 73
@@ -2659,15 +2638,7 @@ BEGIN
 
 	GET DIAGNOSTICS stated = ROW_COUNT;
 
-	-- remove stale records
-	DELETE FROM geometry_columns WHERE attrelid IS NULL;
-
-	GET DIAGNOSTICS deleted = ROW_COUNT;
-
-	result = ''link:'' || linked::text || '' '' ||
-		''stat:'' || stated::text || '' '' ||
-		''del:'' || deleted::text;
-
+	result = fixres || '' stats:'' || stated::text;
 
 	return result;
 END;
@@ -2696,41 +2667,12 @@ AS
 DECLARE
 	tablename aliAS for $1;
 	columnname aliAS for $2;
-	linked integer;
 	stated integer;
-	deleted integer;
 	result text;
+	fixres text;
 BEGIN
 
-	EXECUTE ''UPDATE geometry_columns SET
-			attrelid = NULL,
-			varattnum = NULL
-		WHERE f_table_name = '' || quote_literal(tablename) || ''
-		AND f_geometry_column = '' || quote_literal(columnname);
-
-	EXECUTE ''UPDATE geometry_columns SET
-			attrelid = c.oid,
-			varattnum = a.attnum
-#if USE_VERSION >= 73
-			FROM pg_class c, pg_attribute a, pg_namespace n
-			WHERE n.nspname = f_table_schema::name
-			AND c.relname = f_table_name::name
-			AND a.attname = f_geometry_column::name
-			AND c.relnamespace = n.oid
-			AND a.attrelid = c.oid
-#else // USE_VERSION < 73 
-			stats = (build_histogram2d(create_histogram2d(
-				find_extent(f_table_name, f_geometry_column),
-				40), f_table_name, f_geometry_column))
-			FROM pg_class c, pg_attribute a
-			WHERE c.relname = f_table_name::name
-			AND a.attname = f_geometry_column::name
-			AND a.attrelid = c.oid
-#endif
-			AND f_table_name = '' || quote_literal(tablename) || ''
-			AND f_geometry_column = '' || quote_literal(columnname);
-
-	GET DIAGNOSTICS linked = ROW_COUNT;
+	SELECT fix_geometry_columns() INTO fixres;
 
 	EXECUTE ''UPDATE geometry_columns SET
 #if USE_VERSION >= 73
@@ -2761,16 +2703,7 @@ BEGIN
 
 	GET DIAGNOSTICS stated = ROW_COUNT;
 
-	-- remove stale record
-	EXECUTE ''DELETE FROM geometry_columns WHERE attrelid IS NULL AND
-		f_table_name = '' || quote_literal(tablename) || ''
-		AND f_geometry_column = '' || quote_literal(columnname);
-
-	GET DIAGNOSTICS deleted = ROW_COUNT;
-
-	result = ''link:'' || linked::text || '' '' ||
-		''stat:'' || stated::text || '' '' ||
-		''del:'' || deleted::text;
+	result = fixres || '' stats:'' || stated::text;
 
 	return result;
 END;
-- 
2.40.0