From fee6b636ad90284a513264e38d908dee46965d59 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Wed, 29 Feb 2012 08:04:55 +0000 Subject: [PATCH] #1619: Logic to mark spatial_ref_sys, topology, layers tables as user editable so that the data in them gets backed up during pg_dump git-svn-id: http://svn.osgeo.org/postgis/trunk@9340 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis/Makefile.in | 4 ++-- extensions/postgis/sql_bits/mark_editable_objects.sql.in | 1 + extensions/postgis_topology/Makefile.in | 4 ++-- .../postgis_topology/sql_bits/mark_editable_objects.sql.in | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 extensions/postgis/sql_bits/mark_editable_objects.sql.in create mode 100644 extensions/postgis_topology/sql_bits/mark_editable_objects.sql.in diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index c35f20868..3e6a12971 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -28,7 +28,7 @@ EXTRA_CLEAN += ${SQL_BITS} sql/*.sql ifeq ($(PG91),yes) -sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql +sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/mark_editable_objects.sql.in sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql cat $^ > $@ all: sql/$(EXTENSION)--$(EXTVERSION).sql sql_minor_upgrade @@ -93,7 +93,7 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql #postgis_raster_upgrade_minor.sql is the one that contains both postgis AND raster #TODO: come up with a better name -sql_bits/postgis_raster_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in ../../postgis/postgis_drop_before.sql.in.c sql_bits/postgis_upgrade_minor.sql sql_bits/rtpostgis_upgrade_20_minor.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql +sql_bits/postgis_raster_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in ../../postgis/postgis_drop_before.sql.in.c sql_bits/postgis_upgrade_minor.sql sql_bits/rtpostgis_upgrade_20_minor.sql sql_bits/mark_editable_objects.sql.in ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql cat $^ > $@ # sql_bits/rtpostgis--unpackaged.sql: ../../raster/rt_pg/rtpostgis.sql diff --git a/extensions/postgis/sql_bits/mark_editable_objects.sql.in b/extensions/postgis/sql_bits/mark_editable_objects.sql.in new file mode 100644 index 000000000..9b2eef22d --- /dev/null +++ b/extensions/postgis/sql_bits/mark_editable_objects.sql.in @@ -0,0 +1 @@ +SELECT pg_catalog.pg_extension_config_dump('spatial_ref_sys', ''); diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in index 2470eb78e..c0fa33421 100644 --- a/extensions/postgis_topology/Makefile.in +++ b/extensions/postgis_topology/Makefile.in @@ -32,7 +32,7 @@ all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERS sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql cp $< $@ -sql/$(EXTENSION).sql: sql_bits/topology.sql sql_bits/topology_comments.sql +sql/$(EXTENSION).sql: sql_bits/topology.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql cat $^ > $@ #strip BEGIN/COMMIT since these are not allowed in extensions @@ -74,7 +74,7 @@ sql/topology_upgrade_minor.sql: sql_bits/topology.sql -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \ $< > $@ -sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql +sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \ cat $^ > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \ done diff --git a/extensions/postgis_topology/sql_bits/mark_editable_objects.sql.in b/extensions/postgis_topology/sql_bits/mark_editable_objects.sql.in new file mode 100644 index 000000000..fca28e97f --- /dev/null +++ b/extensions/postgis_topology/sql_bits/mark_editable_objects.sql.in @@ -0,0 +1,2 @@ +SELECT pg_catalog.pg_extension_config_dump('topology', ''); +SELECT pg_catalog.pg_extension_config_dump('layer', ''); -- 2.40.0