Create both the standalone and extension sql scripts from the same .in

dvarrazzo · dvarrazzo · commit 8b8b859ad3a3 · 2012-11-10T19:52:28.000Z
diff --git a/lib/.gitignore b/lib/.gitignore
@@ -1,2 +1,3 @@
 /.deps/
 /pg_reorg.sql
+/pg_reorg--1.0.sql
diff --git a/lib/Makefile b/lib/Makefile
@@ -10,9 +10,8 @@ OBJS = reorg.o pgut/pgut-be.o pgut/pgut-spi.o
 EXTENSION = pg_reorg
 
 #supports both EXTENSION (for >=9.1) and without_EXTENSION (for <PG 9.1)
-DATA_built = pg_reorg.sql
-DATA = pg_reorg--1.0.sql pg_reorg--unpackaged--1.0.sql uninstall_pg_reorg.sql
-
+DATA_built = pg_reorg.sql pg_reorg--1.0.sql
+DATA = pg_reorg--unpackaged--1.0.sql uninstall_pg_reorg.sql
 ifndef USE_PGXS
 top_builddir = ../../..
 makefile_global = $(top_builddir)/src/Makefile.global
@@ -34,3 +33,13 @@ endif
 # remove dependency to libxml2 and libxslt
 LIBS := $(filter-out -lxml2, $(LIBS))
 LIBS := $(filter-out -lxslt, $(LIBS))
+
+pg_reorg.sql: pg_reorg.sql.in
+	echo "BEGIN;\n" > $@; \
+	echo "CREATE SCHEMA reorg;\n" >> $@; \
+	sed 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >> $@; \
+	echo "\nCOMMIT;" >> $@;
+
+pg_reorg--1.0.sql: pg_reorg.sql.in
+	echo '\echo Use "CREATE EXTENSION pg_reorg" to load this file. \quit' > $@; \
+	cat $< >> $@;
diff --git a/lib/pg_reorg--1.0.sql b/lib/pg_reorg--1.0.sql
diff --git a/lib/pg_reorg.sql.in b/lib/pg_reorg.sql.in
@@ -5,13 +5,6 @@
  * Portions Copyright (c) 2011, Itagaki Takahiro
  */
 
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
-
-BEGIN;
-
-CREATE SCHEMA reorg;
-
 CREATE FUNCTION reorg.version() RETURNS text AS
 'MODULE_PATHNAME', 'reorg_version'
 LANGUAGE C IMMUTABLE STRICT;
@@ -241,5 +234,3 @@ LANGUAGE C VOLATILE STRICT;
 CREATE FUNCTION reorg.reorg_drop(oid) RETURNS void AS
 'MODULE_PATHNAME', 'reorg_drop'
 LANGUAGE C VOLATILE STRICT;
-
-COMMIT;

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`/.deps/`
`2`	`2`	`/pg_reorg.sql`
	`3`	`+/pg_reorg--1.0.sql`