#1619: Logic to mark spatial_ref_sys, topology, layers tables as user editable so...

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

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index c35f20868cdc7b2809f9c5ba5eede1eac7ce40bd..3e6a12971d8c3034c994853acdfd2fff61d6c5c3 100644 (file)
--- 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 (file)
index 0000000..9b2eef2
--- /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 2470eb78ea01b30b413e0eadbcbe95cac3eb3353..c0fa33421b81b82ce395048a37a8846d4166ebba 100644 (file)
--- 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 (file)
index 0000000..fca28e9
--- /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', '');