Reverted back the fix_geometry_columns() call removal, to keep

SCRIPT_VERSION from upgrading - the change is still present in the
head branch.

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

diff --git a/CHANGES b/CHANGES
index d74b68c484c022b2d6d9fad7672127e164a544ea..7e69a72b33867e279f09564ec072e34c2c962b39 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,5 @@
 PostGIS 1.0.5CVS
        - New "Reporting Bugs" chapter in manual
-       - Removed automatic call to fix_geometry_columns in
-         AddGeometryColumns() and update_geometry_stats()
 
 PostGIS 1.0.4
 2005/09/09

diff --git a/lwgeom/lwpostgis.sql.in b/lwgeom/lwpostgis.sql.in
index 590b61ac99ad8ad61ce2d9350a10433eca7f5849..25958d85803d9873f5aa55e92a643efe3d706266 100644 (file)
--- a/lwgeom/lwpostgis.sql.in
+++ b/lwgeom/lwpostgis.sql.in
@@ -2304,6 +2304,7 @@ DECLARE
        schema_ok bool;
        real_schema name;
 #endif
+       fixgeomres text;
 
 BEGIN
 
@@ -2443,6 +2444,8 @@ BEGIN
                quote_ident(column_name) || '') is null)'';
        END IF;
 
+       SELECT fix_geometry_columns() INTO fixgeomres;
+
        return 
 #if USE_VERSION >= 73
                real_schema || ''.'' || 
@@ -2450,7 +2453,8 @@ BEGIN
                table_name || ''.'' || column_name ||
                '' SRID:'' || new_srid ||
                '' TYPE:'' || new_type || 
-               '' DIMS:'' || new_dim || ''\n ''; 
+               '' DIMS:'' || new_dim || ''\n '' ||
+               ''geometry_column '' || fixgeomres;
 END;
 '
 LANGUAGE 'plpgsql' _VOLATILE_STRICT; -- WITH (isstrict);
@@ -2854,8 +2858,11 @@ AS
 DECLARE
        result text;
        stated integer;
+       fixres text;
 BEGIN
 
+       SELECT fix_geometry_columns() INTO fixres;
+
        UPDATE geometry_columns SET
 #if USE_VERSION >= 73
                stats = (build_histogram2d(create_histogram2d(
@@ -2877,7 +2884,7 @@ BEGIN
 
        GET DIAGNOSTICS stated = ROW_COUNT;
 
-       result = ''stats:'' || stated::text;
+       result = fixres || '' stats:'' || stated::text;
 
        return result;
 END;
@@ -2908,8 +2915,11 @@ DECLARE
        columnname aliAS for $2;
        stated integer;
        result text;
+       fixres text;
 BEGIN
 
+       SELECT fix_geometry_columns() INTO fixres;
+
        EXECUTE ''UPDATE geometry_columns SET
 #if USE_VERSION >= 73
                        stats = (build_histogram2d(create_histogram2d(
@@ -2939,7 +2949,7 @@ BEGIN
 
        GET DIAGNOSTICS stated = ROW_COUNT;
 
-       result = ''stats:'' || stated::text;
+       result = fixres || '' stats:'' || stated::text;
 
        return result;
 END;