Fix Makefile

Author: CherkashinSergey

.gitignore

@@ -39,5 +39,4 @@ lib*.pc
 /Release/
 /tmp_install/
 Dockerfile
-pg_variables--1.0.sql
 pg_variables--1.1.sql

Makefile

@@ -5,10 +5,8 @@ OBJS = pg_variables.o pg_variables_record.o $(WIN32RES)
 
 EXTENSION = pg_variables
 EXTVERSION = 1.1
-DATA = pg_variables--1.0--1.1.sql
+DATA = pg_variables--1.0.sql pg_variables--1.0--1.1.sql
 DATA_built = $(EXTENSION)--$(EXTVERSION).sql
-$(EXTENSION)--$(EXTVERSION).sql: init.sql
-	cat $^ > $@
 
 PGFILEDESC = "pg_variables - sessional variables"
 
@@ -24,3 +22,6 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
+$(EXTENSION)--$(EXTVERSION).sql: $(DATA)
+	cat $^ > $@

init.sql pg_variables--1.0.sqlinit.sql renamed to pg_variables--1.0.sql

@@ -1,19 +1,11 @@
-/* ------------------------------------------------------------------------
- *
- * init.sql
- *		Provides common utility functions
- *
- * Copyright (c) 2015-2018, Postgres Professional
- *
- * ------------------------------------------------------------------------
- */
+/* contrib/pg_variables/pg_variables--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_variables" to load this file. \quit
 
 -- Scalar variables functions
 
-CREATE FUNCTION pgv_set(package text, name text, value anynonarray, is_transactional bool default false)
+CREATE FUNCTION pgv_set(package text, name text, value anynonarray)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_set_any'
 LANGUAGE C VOLATILE;
@@ -25,7 +17,7 @@ LANGUAGE C VOLATILE;
 
 -- Deprecated scalar variables functions
 
-CREATE FUNCTION pgv_set_int(package text, name text, value int, is_transactional bool default false)
+CREATE FUNCTION pgv_set_int(package text, name text, value int)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_set_int'
 LANGUAGE C VOLATILE;
@@ -35,7 +27,7 @@ RETURNS int
 AS 'MODULE_PATHNAME', 'variable_get_int'
 LANGUAGE C VOLATILE;
 
-CREATE FUNCTION pgv_set_text(package text, name text, value text, is_transactional bool default false)
+CREATE FUNCTION pgv_set_text(package text, name text, value text)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_set_text'
 LANGUAGE C VOLATILE;
@@ -45,7 +37,7 @@ RETURNS text
 AS 'MODULE_PATHNAME', 'variable_get_text'
 LANGUAGE C VOLATILE;
 
-CREATE FUNCTION pgv_set_numeric(package text, name text, value numeric, is_transactional bool default false)
+CREATE FUNCTION pgv_set_numeric(package text, name text, value numeric)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_set_numeric'
 LANGUAGE C VOLATILE;
@@ -55,7 +47,7 @@ RETURNS numeric
 AS 'MODULE_PATHNAME', 'variable_get_numeric'
 LANGUAGE C VOLATILE;
 
-CREATE FUNCTION pgv_set_timestamp(package text, name text, value timestamp, is_transactional bool default false)
+CREATE FUNCTION pgv_set_timestamp(package text, name text, value timestamp)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_set_timestamp'
 LANGUAGE C VOLATILE;
@@ -65,7 +57,7 @@ RETURNS timestamp
 AS 'MODULE_PATHNAME', 'variable_get_timestamp'
 LANGUAGE C VOLATILE;
 
-CREATE FUNCTION pgv_set_timestamptz(package text, name text, value timestamptz, is_transactional bool default false)
+CREATE FUNCTION pgv_set_timestamptz(package text, name text, value timestamptz)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_set_timestamptz'
 LANGUAGE C VOLATILE;
@@ -75,7 +67,7 @@ RETURNS timestamptz
 AS 'MODULE_PATHNAME', 'variable_get_timestamptz'
 LANGUAGE C VOLATILE;
 
-CREATE FUNCTION pgv_set_date(package text, name text, value date, is_transactional bool default false)
+CREATE FUNCTION pgv_set_date(package text, name text, value date)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_set_date'
 LANGUAGE C VOLATILE;
@@ -85,7 +77,7 @@ RETURNS date
 AS 'MODULE_PATHNAME', 'variable_get_date'
 LANGUAGE C VOLATILE;
 
-CREATE FUNCTION pgv_set_jsonb(package text, name text, value jsonb, is_transactional bool default false)
+CREATE FUNCTION pgv_set_jsonb(package text, name text, value jsonb)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_set_jsonb'
 LANGUAGE C VOLATILE;
@@ -96,7 +88,7 @@ AS 'MODULE_PATHNAME', 'variable_get_jsonb'
 LANGUAGE C VOLATILE;
 
 -- Functions to work with records
-CREATE FUNCTION pgv_insert(package text, name text, r record, is_transactional bool default false)
+CREATE FUNCTION pgv_insert(package text, name text, r record)
 RETURNS void
 AS 'MODULE_PATHNAME', 'variable_insert'
 LANGUAGE C VOLATILE;
@@ -154,7 +146,7 @@ AS 'MODULE_PATHNAME', 'remove_packages'
 LANGUAGE C VOLATILE;
 
 CREATE FUNCTION pgv_list()
-RETURNS TABLE(package text, name text, is_transactional bool)
+RETURNS TABLE(package text, name text)
 AS 'MODULE_PATHNAME', 'get_packages_and_variables'
 LANGUAGE C VOLATILE;