Extension script generates from init.sql. Refactoring

Author: CherkashinSergey

.gitignore

@@ -38,3 +38,5 @@ lib*.pc
 /Debug/
 /Release/
 /tmp_install/
+pg_variables--1.0.sql
+pg_variables--1.1.sql

Makefile

@@ -4,7 +4,12 @@ MODULE_big = pg_variables
 OBJS = pg_variables.o pg_variables_record.o $(WIN32RES)
 
 EXTENSION = pg_variables
-DATA = pg_variables--1.0.sql pg_variables--1.1.sql pg_variables--1.0--1.1.sql
+EXTVERSION = 1.1
+DATA = pg_variables--1.0--1.1.sql
+DATA_built = $(EXTENSION)--$(EXTVERSION).sql
+$(EXTENSION)--$(EXTVERSION).sql: init.sql
+	cat $^ > $@
+
 PGFILEDESC = "pg_variables - sessional variables"
 
 REGRESS = pg_variables pg_variables_any pg_variables_trans

README.md

@@ -291,7 +291,6 @@ BEGIN;
 SELECT pgv_set('pack', 'var_text', 'before savepoint'::text, true);
 SAVEPOINT sp1;
 SELECT pgv_set('pack', 'var_text', 'savepoint sp1'::text, true);
-SELECT pgv_get('pack', 'var_text', NULL::text);
 SAVEPOINT sp2;
 SELECT pgv_set('pack', 'var_text', 'savepoint sp2'::text, true);
 RELEASE sp2;

expected/pg_variables_trans.out

@@ -2328,8 +2328,9 @@ SELECT pgv_select('vars3', 'r1');
  (,strNULL)
  (2,)
  (1,str33)
+ (5,str55)
  (0,str00)
-(4 rows)
+(5 rows)
 
 SELECT pgv_select('vars3', 'r2');
  pgv_select 

pg_variables--1.1.sql renamed to init.sql

@@ -1,4 +1,12 @@
-/* contrib/pg_variables/pg_variables--1.0.sql */
+/* ------------------------------------------------------------------------
+ *
+ * init.sql
+ *		Provides common utility functions
+ *
+ * Copyright (c) 2015-2018, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_variables" to load this file. \quit