From df188d8f70b394dae3abe5270e24ce0f0530266c Mon Sep 17 00:00:00 2001
From: Burak Yucesoy <burak@citusdata.com>
Date: Sat, 3 Nov 2018 01:29:35 +0300
Subject: [PATCH] Release 2.12

---
 .travis.yml         | 2 +-
 CHANGELOG.md        | 4 ++++
 Makefile            | 4 +++-
 README.md           | 8 ++++----
 expected/setup.out  | 1 +
 hll--2.11--2.12.sql | 1 +
 hll.control         | 2 +-
 sql/setup.sql       | 1 +
 8 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 hll--2.11--2.12.sql

diff --git a/.travis.yml b/.travis.yml
index 69f1aba..a45b053 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ matrix:
     - env: PGVERSION=10
     - env: PGVERSION=11
 before_install:
-  - git clone -b v0.7.5 --depth 1 https://github.com/citusdata/tools.git
+  - git clone -b v0.7.9 --depth 1 https://github.com/citusdata/tools.git
   - sudo make -C tools install
   - setup_apt
   - nuke_pg
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b47ca2..c5b2f00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+2018-11-03
+==========
+v2.12 - More updates for PostgreSQL 11 and fixes
+
 2018-08-25
 ==========
 v2.11 - Updated for PostgreSQL 11
diff --git a/Makefile b/Makefile
index 59aaf4f..bab298c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 EXTENSION = hll
-EXTVERSIONS = 2.10 2.11
+EXTVERSIONS = 2.10 2.11 2.12
 
 DATA_built = $(foreach v,$(EXTVERSIONS),$(EXTENSION)--$(v).sql)
 DATA = $(wildcard $(EXTENSION)--*--*.sql)
@@ -34,3 +34,5 @@ $(EXTENSION)--2.10.sql: $(EXTENSION).sql
 	cat $^ > $@
 $(EXTENSION)--2.11.sql: $(EXTENSION)--2.10.sql $(EXTENSION)--2.10--2.11.sql
 	cat $^ > $@
+$(EXTENSION)--2.12.sql: $(EXTENSION)--2.11.sql $(EXTENSION)--2.11--2.12.sql
+	cat $^ > $@
diff --git a/README.md b/README.md
index b5dfa29..f530094 100644
--- a/README.md
+++ b/README.md
@@ -376,7 +376,7 @@ Build
 
 Specify versions:
 
-    export VER=2.11
+    export VER=2.12
     export PGSHRT=11
 
 Make sure `Makefile` points to the correct `pg_config` for the specified version, since `rpmbuild` doesn't respect env variables:
@@ -394,11 +394,11 @@ Execute rpmbuild:
 
 Install RPM:
 
-    rpm -Uv rpmbuild/RPMS/x86_64/postgresql11-hll-2.11.x86_64.rpm
+    rpm -Uv rpmbuild/RPMS/x86_64/postgresql11-hll-2.12.x86_64.rpm
 
 And if you want the debugging build:
 
-    rpm -Uv rpmbuild/RPMS/x86_64/postgresql11-hll-debuginfo-2.11.x86_64.rpm
+    rpm -Uv rpmbuild/RPMS/x86_64/postgresql11-hll-debuginfo-2.12.x86_64.rpm
 
 
 ## From source ##
@@ -439,7 +439,7 @@ And then just verify it's there:
                             List of installed extensions
           Name   | Version |   Schema   |            Description
         ---------+---------+------------+-----------------------------------
-         hll     | 2.11    | public     | type for storing hyperloglog data
+         hll     | 2.12    | public     | type for storing hyperloglog data
          plpgsql | 1.0     | pg_catalog | PL/pgSQL procedural language
         (2 rows)
 
diff --git a/expected/setup.out b/expected/setup.out
index 59124f4..ba7be04 100644
--- a/expected/setup.out
+++ b/expected/setup.out
@@ -1,2 +1,3 @@
 CREATE EXTENSION hll VERSION '2.10';
 ALTER EXTENSION hll UPDATE TO '2.11';
+ALTER EXTENSION hll UPDATE TO '2.12';
diff --git a/hll--2.11--2.12.sql b/hll--2.11--2.12.sql
new file mode 100644
index 0000000..ccbbd2e
--- /dev/null
+++ b/hll--2.11--2.12.sql
@@ -0,0 +1 @@
+-- Empty upgrade file to upgrade extension from 2.11 to 2.12
diff --git a/hll.control b/hll.control
index 3d71e2b..fa66731 100644
--- a/hll.control
+++ b/hll.control
@@ -14,5 +14,5 @@
 
 # hll extension
 comment = 'type for storing hyperloglog data'
-default_version = '2.11'
+default_version = '2.12'
 module_pathname = '$libdir/hll'
diff --git a/sql/setup.sql b/sql/setup.sql
index 59124f4..ba7be04 100644
--- a/sql/setup.sql
+++ b/sql/setup.sql
@@ -1,2 +1,3 @@
 CREATE EXTENSION hll VERSION '2.10';
 ALTER EXTENSION hll UPDATE TO '2.11';
+ALTER EXTENSION hll UPDATE TO '2.12';