diff --git a/configure b/configure index 9cf33a4bd..c75bbe0ae 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Citus 6.2devel. +# Generated by GNU Autoconf 2.69 for Citus 7.0devel. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Citus' PACKAGE_TARNAME='citus' -PACKAGE_VERSION='6.2devel' -PACKAGE_STRING='Citus 6.2devel' +PACKAGE_VERSION='7.0devel' +PACKAGE_STRING='Citus 7.0devel' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1195,7 +1195,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Citus 6.2devel to adapt to many kinds of systems. +\`configure' configures Citus 7.0devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1256,7 +1256,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Citus 6.2devel:";; + short | recursive ) echo "Configuration of Citus 7.0devel:";; esac cat <<\_ACEOF @@ -1344,7 +1344,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Citus configure 6.2devel +Citus configure 7.0devel generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1401,7 +1401,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Citus $as_me 6.2devel, which was +It was created by Citus $as_me 7.0devel, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3561,7 +3561,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Citus $as_me 6.2devel, which was +This file was extended by Citus $as_me 7.0devel, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3623,7 +3623,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Citus config.status 6.2devel +Citus config.status 7.0devel configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 1bc1a6ee3..8e9ab3f0a 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ # everyone needing autoconf installed, the resulting files are checked # into the SCM. -AC_INIT([Citus], [6.2devel]) +AC_INIT([Citus], [7.0devel]) AC_COPYRIGHT([Copyright (c) 2012-2017, Citus Data, Inc.]) # we'll need sed and awk for some of the version commands diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile index 83476146c..cfd4e1ea8 100644 --- a/src/backend/distributed/Makefile +++ b/src/backend/distributed/Makefile @@ -10,7 +10,8 @@ EXTVERSIONS = 5.0 5.0-1 5.0-2 \ 5.2-1 5.2-2 5.2-3 5.2-4 \ 6.0-1 6.0-2 6.0-3 6.0-4 6.0-5 6.0-6 6.0-7 6.0-8 6.0-9 6.0-10 6.0-11 6.0-12 6.0-13 6.0-14 6.0-15 6.0-16 6.0-17 6.0-18 \ 6.1-1 6.1-2 6.1-3 6.1-4 6.1-5 6.1-6 6.1-7 6.1-8 6.1-9 6.1-10 6.1-11 6.1-12 6.1-13 6.1-14 6.1-15 6.1-16 6.1-17 \ - 6.2-1 6.2-2 6.2-3 6.2-4 + 6.2-1 6.2-2 6.2-3 6.2-4 \ + 7.0-1 # All citus--*.sql files in the source directory DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql)) @@ -138,6 +139,8 @@ $(EXTENSION)--6.2-3.sql: $(EXTENSION)--6.2-2.sql $(EXTENSION)--6.2-2--6.2-3.sql cat $^ > $@ $(EXTENSION)--6.2-4.sql: $(EXTENSION)--6.2-3.sql $(EXTENSION)--6.2-3--6.2-4.sql cat $^ > $@ +$(EXTENSION)--7.0-1.sql: $(EXTENSION)--6.2-4.sql $(EXTENSION)--6.2-4--7.0-1.sql + cat $^ > $@ NO_PGXS = 1 diff --git a/src/backend/distributed/citus--6.2-4--7.0-1.sql b/src/backend/distributed/citus--6.2-4--7.0-1.sql new file mode 100644 index 000000000..53055b615 --- /dev/null +++ b/src/backend/distributed/citus--6.2-4--7.0-1.sql @@ -0,0 +1,3 @@ +/* citus--6.2-4--7.0-1.sql */ + +/* empty, but required to update the extension version */ diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index 9d9fdb624..ecc22e45e 100644 --- a/src/backend/distributed/citus.control +++ b/src/backend/distributed/citus.control @@ -1,6 +1,6 @@ # Citus extension comment = 'Citus distributed database' -default_version = '6.2-4' +default_version = '7.0-1' module_pathname = '$libdir/citus' relocatable = false schema = pg_catalog diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index d637f5b63..4236ed162 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -80,11 +80,12 @@ ALTER EXTENSION citus UPDATE TO '6.2-1'; ALTER EXTENSION citus UPDATE TO '6.2-2'; ALTER EXTENSION citus UPDATE TO '6.2-3'; ALTER EXTENSION citus UPDATE TO '6.2-4'; +ALTER EXTENSION citus UPDATE TO '7.0-1'; -- show running version SHOW citus.version; citus.version --------------- - 6.2devel + 7.0devel (1 row) -- ensure no objects were created outside pg_catalog @@ -106,7 +107,7 @@ RESET citus.enable_version_checks; DROP EXTENSION citus; CREATE EXTENSION citus VERSION '5.0'; ERROR: specified version incompatible with loaded Citus library -DETAIL: Loaded library requires 6.2, but 5.0 was specified. +DETAIL: Loaded library requires 7.0, but 5.0 was specified. HINT: If a newer library is present, restart the database and try the command again. -- re-create in newest version \c diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index e5d2064a1..db625ecd6 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -81,6 +81,7 @@ ALTER EXTENSION citus UPDATE TO '6.2-1'; ALTER EXTENSION citus UPDATE TO '6.2-2'; ALTER EXTENSION citus UPDATE TO '6.2-3'; ALTER EXTENSION citus UPDATE TO '6.2-4'; +ALTER EXTENSION citus UPDATE TO '7.0-1'; -- show running version SHOW citus.version;