Preparation for branch PG12

Change version to 12-1.3.5. Adjust SPEC file.

diff --git a/Makefile b/Makefile
index 5d9f65a..92e7806 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #
 
 MODULES = pg_hint_plan
-HINTPLANVER = 1.3.4
+HINTPLANVER = 1.3.5
 
 REGRESS = init base_plan pg_hint_plan ut-init ut-A ut-S ut-J ut-L ut-G ut-R ut-fdw ut-W ut-T ut-fini
 

diff --git a/SPECS/pg_hint_plan12.spec b/SPECS/pg_hint_plan12.spec
index e81fbbd..085cf98 100644 (file)
--- a/SPECS/pg_hint_plan12.spec
+++ b/SPECS/pg_hint_plan12.spec
@@ -16,7 +16,7 @@
 ## Set general information for pg_store_plans.
 Summary:    Optimizer hint on PostgreSQL 12
 Name:       pg_hint_plan12
-Version:    1.3.4
+Version:    1.3.5
 Release:    1%{?dist}
 License:    BSD
 Group:      Applications/Databases
@@ -39,7 +39,7 @@ Note that this package is available for only PostgreSQL 12.
 
 %package llvmjit
 Requires: postgresql12-server, postgresql12-llvmjit
-Requires: pg_hint_plan12 = 1.3.4
+Requires: pg_hint_plan12 = 1.3.5
 Summary:  Just-in-time compilation support for pg_hint_plan12
 
 %description llvmjit
@@ -73,11 +73,7 @@ rm -rf %{buildroot}
 %defattr(0755,root,root)
 %{_libdir}/pg_hint_plan.so
 %defattr(0644,root,root)
-%{_datadir}/extension/pg_hint_plan--1.3.0--1.3.1.sql
-%{_datadir}/extension/pg_hint_plan--1.3.1--1.3.2.sql
-%{_datadir}/extension/pg_hint_plan--1.3.2--1.3.3.sql
-%{_datadir}/extension/pg_hint_plan--1.3.3--1.3.4.sql
-%{_datadir}/extension/pg_hint_plan--1.3.4.sql
+%{_datadir}/extension/pg_hint_plan--1.3.5.sql
 %{_datadir}/extension/pg_hint_plan.control
 
 %files llvmjit
@@ -89,6 +85,8 @@ rm -rf %{buildroot}
 
 # History of pg_hint_plan.
 %changelog
+* Thu Feb 20 2020 Kyotaro Horiguchi
+- Support PostgreSQL 12. Fix some bugs. Version 1.3.5.
 * Thu Jan 17 2019 Kyotaro Horiguchi
 - Fix some bugs. Version 1.3.4.
 * Tue Nov 13 2018 Kyotaro Horiguchi

diff --git a/pg_hint_plan--1.3.0--1.3.1.sql b/pg_hint_plan--1.3.0--1.3.1.sql
deleted file mode 100644 (file)
index f09e407..0000000
--- a/pg_hint_plan--1.3.0--1.3.1.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/* pg_hint_plan/pg_hint_plan--1.3.0--1.3.1.sql */
-
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION pg_hint_plan" to load this file. \quit
-
--- nothing to do upgrading from 1.3.0.

diff --git a/pg_hint_plan--1.3.1--1.3.2.sql b/pg_hint_plan--1.3.1--1.3.2.sql
deleted file mode 100644 (file)
index 3a4103f..0000000
--- a/pg_hint_plan--1.3.1--1.3.2.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/* pg_hint_plan/pg_hint_plan--1.3.1--1.3.2.sql */
-
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION pg_hint_plan" to load this file. \quit
-
--- nothing to do upgrading from 1.3.1.

diff --git a/pg_hint_plan--1.3.2--1.3.3.sql b/pg_hint_plan--1.3.2--1.3.3.sql
deleted file mode 100644 (file)
index 2a9602c..0000000
--- a/pg_hint_plan--1.3.2--1.3.3.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/* pg_hint_plan/pg_hint_plan--1.3.2--1.3.3.sql */
-
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION pg_hint_plan" to load this file. \quit
-
--- nothing to do upgrading from 1.3.2.

diff --git a/pg_hint_plan--1.3.3--1.3.4.sql b/pg_hint_plan--1.3.3--1.3.4.sql
deleted file mode 100644 (file)
index 973a7ef..0000000
--- a/pg_hint_plan--1.3.3--1.3.4.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/* pg_hint_plan/pg_hint_plan--1.3.3--1.3.4.sql */
-
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION pg_hint_plan" to load this file. \quit
-
--- nothing to do upgrading from 1.3.3.

diff --git a/pg_hint_plan--1.3.4.sql b/pg_hint_plan--1.3.5.sql
similarity index 92%
rename from pg_hint_plan--1.3.4.sql
rename to pg_hint_plan--1.3.5.sql
index 388a877..6e7ea47 100644 (file)
--- a/pg_hint_plan--1.3.4.sql
+++ b/pg_hint_plan--1.3.5.sql
@@ -1,4 +1,4 @@
-/* pg_hint_plan/pg_hint_plan--1.3.4.sql */
+/* pg_hint_plan/pg_hint_plan--1.3.5.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_hint_plan" to load this file. \quit

diff --git a/pg_hint_plan.control b/pg_hint_plan.control
index 9ab15e7..76cb9e5 100644 (file)
--- a/pg_hint_plan.control
+++ b/pg_hint_plan.control
@@ -1,6 +1,6 @@
 # pg_hint_plan extension
 
 comment = ''
-default_version = '1.3.4'
+default_version = '1.3.5'
 relocatable = false
 schema = hint_plan