Complain if extension scripts are sourced in psql

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

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 0e3cc312b6f872ba02f99b8bfe1605796d780068..6ca3b253e44ebce79f7bd34253d6cf60fbbab61b 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -38,7 +38,8 @@ all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERS
 
 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
        mkdir -p sql
-       cat $^ > $@
+       echo '\echo Use "CREATE EXTENSION postgis" to load this file. \quit' > $@
+       cat $^ >> $@
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        mkdir -p sql
@@ -103,7 +104,8 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
 #TODO: come up with a better name
 #TODO: what about postgis_drop_after.sql ? where does it fit ??
 sql_bits/postgis_raster_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
-       cat $^ > $@
+       echo '\echo Use "CREATE EXTENSION postgis" to load this file. \quit' > $@
+       cat $^ >> $@
 
 sql_minor_upgrade: sql_bits/postgis_raster_upgrade_minor.sql
        for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 053ba98b745525534fb72a6591a2e8c3605c4a83..33dff61ed68e70b75bba8ab1ce16016654b8a624 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -35,14 +35,14 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        mkdir -p sql
        cp $< $@
        
-sql/$(EXTENSION).sql: sql_bits/topology.sql  sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql
+sql/$(EXTENSION).sql: extlock.sql sql_bits/topology.sql  sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql
        mkdir -p sql
        cat $^ > $@
        
 #this is a cludge to allow upgrading from same SVN to same SVN
-sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
+sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: extlock.sql ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
        cat $^ > $@
-sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
+sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
        cat $^ > $@
        
 #strip BEGIN/COMMIT since these are not allowed in extensions
@@ -72,7 +72,7 @@ sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../
 sql/topology_upgrade.sql:  ../../topology/topology_upgrade.sql
         sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@
        
-sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
+sql_minor_upgrade: extlock.sql ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade.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/extlock.sql b/extensions/postgis_topology/extlock.sql
new file mode 100644 (file)
index 0000000..537c36e
--- /dev/null
+++ b/extensions/postgis_topology/extlock.sql
@@ -0,0 +1,2 @@
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION postgis_topology" to load this file. \quit

diff --git a/utils/create_unpackaged.pl b/utils/create_unpackaged.pl
index ac9ed6629e48bf5047af799308ee160cf8f3d430..e321277105de7753f584a6101284672cbeb6b78f 100755 (executable)
--- a/utils/create_unpackaged.pl
+++ b/utils/create_unpackaged.pl
@@ -148,7 +148,10 @@ print "-- \n";
 print "-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --\n";
 print "\n";
 
-
+print "-- complain if script is sourced in psql\n";
+print '\echo Use "CREATE EXTENSION ' . ${extname} .
+      '" to load this file. \quit';
+print "\n\n";
 
 print "-- Register all views.\n";
 foreach my $view (@views)