self-hosted/postgis
self-hosted/postgis
1
0
Fork 0
mirror of https://git.osgeo.org/gitea/postgis/postgis synced 2024-10-25 09:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed fix_geometry_columns() to leave correctly linked records untouched.

Browse source 
git-svn-id: http://svn.osgeo.org/postgis/trunk@1045 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Sandro Santilli 2004-10-27 10:55:13 +00:00
parent 5319798247
commit fdf1925661
1 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
lwgeom/lwpostgis.sql.in
View file

@ -1689,6 +1689,18 @@ CREATE AGGREGATE makeline (
finalfunc = makeline_garray
);
CREATEFUNCTION makepoly_garray (geometry[])
RETURNS geometry
AS '@MODULE_FILENAME@', 'GEOS_makepoly_garray'
LANGUAGE 'C';
CREATE AGGREGATE makepoly (
sfunc = geom_accum,
basetype = geometry,
stype = geometry[],
finalfunc = makepoly_garray
);
------------------------------------------------------------------------
--
@ -1876,6 +1888,7 @@ CREATEFUNCTION fix_geometry_columns() RETURNS text
AS
'
DECLARE
mislinked record;
result text;
linked integer;
deleted integer;
@ -1933,27 +1946,33 @@ BEGIN
#endif
-- fix linking to system tables
UPDATE geometry_columns SET
attrelid = NULL,
varattnum = NULL,
stats = NULL;
UPDATE geometry_columns SET
attrelid = c.oid,
varattnum = a.attnum
SELECT 0 INTO linked;
FOR mislinked in
SELECT gc.oid as gcrec,
a.attrelid as attrelid, a.attnum as attnum
FROM geometry_columns gc, pg_class c,
#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
pg_namespace n, pg_attribute a
#else
pg_attribute a
#endif
AND a.attname = f_geometry_column::name
AND a.attrelid = c.oid;
GET DIAGNOSTICS linked = ROW_COUNT;
WHERE ( gc.attrelid IS NULL OR gc.attrelid != a.attrelid
OR gc.varattnum IS NULL OR gc.varattnum != a.attnum)
#if USE_VERSION >= 73
AND n.nspname = gc.f_table_schema::name
AND c.relnamespace = n.oid
#endif
AND c.relname = gc.f_table_name::name
AND a.attname = f_geometry_column::name
AND a.attrelid = c.oid
LOOP
UPDATE geometry_columns SET
attrelid = mislinked.attrelid,
varattnum = mislinked.attnum,
stats = NULL
WHERE geometry_columns.oid = mislinked.gcrec;
SELECT linked+1 INTO linked;
END LOOP;
-- remove stale records
DELETE FROM geometry_columns WHERE attrelid IS NULL;