From 527ca3ca1334461cb4b4ac505120a8c79a18d816 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 22 Jul 2024 17:37:31 +0900 Subject: [PATCH] Version 1.5.2 The release is not ready yet, but this does all the ground work to be able to do a release at any moment. --- META.json | 4 +-- Makefile | 11 +++++--- SPECS/pg_hint_plan15.spec | 13 ++++++--- expected/oldextversions.out | 27 +++++++++++++++++++ ...--1.4.sql => pg_hint_plan--1.3.10--1.4.sql | 2 +- pg_hint_plan--1.3.9--1.3.10.sql | 10 +++++++ pg_hint_plan--1.4.2--1.4.3.sql | 10 +++++++ ...2--1.5.sql => pg_hint_plan--1.4.3--1.5.sql | 2 +- pg_hint_plan--1.5.1--1.5.2.sql | 10 +++++++ pg_hint_plan.control | 2 +- sql/oldextversions.sql | 6 +++++ 11 files changed, 84 insertions(+), 13 deletions(-) rename pg_hint_plan--1.3.9--1.4.sql => pg_hint_plan--1.3.10--1.4.sql (88%) create mode 100644 pg_hint_plan--1.3.9--1.3.10.sql create mode 100644 pg_hint_plan--1.4.2--1.4.3.sql rename pg_hint_plan--1.4.2--1.5.sql => pg_hint_plan--1.4.3--1.5.sql (88%) create mode 100644 pg_hint_plan--1.5.1--1.5.2.sql diff --git a/META.json b/META.json index 3da65ce0..98166bad 100644 --- a/META.json +++ b/META.json @@ -2,7 +2,7 @@ "name": "pg_hint_plan15", "abstract": "Query hints in SQL comments", "description": "This library adds support for query hints in SQL comments in PostgreSQL 15.", - "version": "1.5.1", + "version": "1.5.2", "maintainer": [ "Michael Paquier " ], @@ -19,7 +19,7 @@ "abstract": "Query hints in SQL comments", "file": "pg_hint_plan--1.3.0.sql", "docfile": "README.md", - "version": "1.5.1" + "version": "1.5.2" } }, "resources": { diff --git a/Makefile b/Makefile index 22ee13b4..bbfe4912 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # MODULES = pg_hint_plan -HINTPLANVER = 1.5.1 +HINTPLANVER = 1.5.2 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 hints_anywhere plpgsql oldextversions @@ -23,11 +23,14 @@ DATA = \ pg_hint_plan--1.3.6--1.3.7.sql \ pg_hint_plan--1.3.7--1.3.8.sql \ pg_hint_plan--1.3.8--1.3.9.sql \ - pg_hint_plan--1.3.9--1.4.sql \ + pg_hint_plan--1.3.9--1.3.10.sql \ + pg_hint_plan--1.3.10--1.4.sql \ pg_hint_plan--1.4--1.4.1.sql \ pg_hint_plan--1.4.1--1.4.2.sql \ - pg_hint_plan--1.4.2--1.5.sql \ - pg_hint_plan--1.5--1.5.1.sql + pg_hint_plan--1.4.2--1.4.3.sql \ + pg_hint_plan--1.4.3--1.5.sql \ + pg_hint_plan--1.5--1.5.1.sql \ + pg_hint_plan--1.5.1--1.5.2.sql EXTRA_CLEAN = RPMS diff --git a/SPECS/pg_hint_plan15.spec b/SPECS/pg_hint_plan15.spec index b522a454..e1b3951e 100644 --- a/SPECS/pg_hint_plan15.spec +++ b/SPECS/pg_hint_plan15.spec @@ -16,7 +16,7 @@ ## Set general information for pg_store_plans. Summary: Optimizer hint on PostgreSQL 15 Name: pg_hint_plan15 -Version: 1.5.1 +Version: 1.5.2 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -39,7 +39,7 @@ Note that this package is available for only PostgreSQL 15. %package llvmjit Requires: postgresql15-server, postgresql15-llvmjit -Requires: pg_hint_plan15 = 1.5.1 +Requires: pg_hint_plan15 = 1.5.2 Summary: Just-in-time compilation support for pg_hint_plan15 %description llvmjit @@ -83,11 +83,14 @@ rm -rf %{buildroot} %{_datadir}/extension/pg_hint_plan--1.3.6--1.3.7.sql %{_datadir}/extension/pg_hint_plan--1.3.7--1.3.8.sql %{_datadir}/extension/pg_hint_plan--1.3.8--1.3.9.sql -%{_datadir}/extension/pg_hint_plan--1.3.9--1.4.sql +%{_datadir}/extension/pg_hint_plan--1.3.9--1.3.10.sql +%{_datadir}/extension/pg_hint_plan--1.3.10--1.4.sql %{_datadir}/extension/pg_hint_plan--1.4--1.4.1.sql %{_datadir}/extension/pg_hint_plan--1.4.1--1.4.2.sql -%{_datadir}/extension/pg_hint_plan--1.4.2--1.5.sql +%{_datadir}/extension/pg_hint_plan--1.4.2--1.4.3.sql +%{_datadir}/extension/pg_hint_plan--1.4.3--1.5.sql %{_datadir}/extension/pg_hint_plan--1.5--1.5.1.sql +%{_datadir}/extension/pg_hint_plan--1.5.1--1.5.2.sql %{_datadir}/extension/pg_hint_plan.control %files llvmjit @@ -99,6 +102,8 @@ rm -rf %{buildroot} # History of pg_hint_plan. %changelog +* Tue Aug 27 2024 Michael Paquier +- Version 1.5.2. * Tue Aug 29 2023 Michael Paquier - Version 1.5.1. * Fri Jan 20 2023 Michael Paquier diff --git a/expected/oldextversions.out b/expected/oldextversions.out index 5a686951..475474a5 100644 --- a/expected/oldextversions.out +++ b/expected/oldextversions.out @@ -91,6 +91,15 @@ Objects in extension "pg_hint_plan" table hint_plan.hints (2 rows) +ALTER EXTENSION pg_hint_plan UPDATE TO "1.3.10"; +\dx+ pg_hint_plan +Objects in extension "pg_hint_plan" + Object description +--------------------------------- + sequence hint_plan.hints_id_seq + table hint_plan.hints +(2 rows) + ALTER EXTENSION pg_hint_plan UPDATE TO "1.4"; \dx+ pg_hint_plan Objects in extension "pg_hint_plan" @@ -118,6 +127,15 @@ Objects in extension "pg_hint_plan" table hint_plan.hints (2 rows) +ALTER EXTENSION pg_hint_plan UPDATE TO "1.4.3"; +\dx+ pg_hint_plan +Objects in extension "pg_hint_plan" + Object description +--------------------------------- + sequence hint_plan.hints_id_seq + table hint_plan.hints +(2 rows) + ALTER EXTENSION pg_hint_plan UPDATE TO "1.5"; \dx+ pg_hint_plan Objects in extension "pg_hint_plan" @@ -136,4 +154,13 @@ Objects in extension "pg_hint_plan" table hint_plan.hints (2 rows) +ALTER EXTENSION pg_hint_plan UPDATE TO "1.5.2"; +\dx+ pg_hint_plan +Objects in extension "pg_hint_plan" + Object description +--------------------------------- + sequence hint_plan.hints_id_seq + table hint_plan.hints +(2 rows) + DROP EXTENSION pg_hint_plan; diff --git a/pg_hint_plan--1.3.9--1.4.sql b/pg_hint_plan--1.3.10--1.4.sql similarity index 88% rename from pg_hint_plan--1.3.9--1.4.sql rename to pg_hint_plan--1.3.10--1.4.sql index ec085848..a5c9c8cc 100644 --- a/pg_hint_plan--1.3.9--1.4.sql +++ b/pg_hint_plan--1.3.10--1.4.sql @@ -1,4 +1,4 @@ -/* pg_hint_plan/pg_hint_plan--1.3.9--1.4.sql */ +/* pg_hint_plan/pg_hint_plan--1.3.10--1.4.sql */ -- complain if script is sourced in psql, rather than via ALTER EXTENSION \echo Use "ALTER EXTENSION pg_hint_plan UPDATE TO '1.4'" to load this file. \quit diff --git a/pg_hint_plan--1.3.9--1.3.10.sql b/pg_hint_plan--1.3.9--1.3.10.sql new file mode 100644 index 00000000..eb1c3d94 --- /dev/null +++ b/pg_hint_plan--1.3.9--1.3.10.sql @@ -0,0 +1,10 @@ +/* pg_hint_plan/pg_hint_plan--1.3.9--1.3.10.sql */ + +-- complain if script is sourced in psql, rather than via ALTER EXTENSION +\echo Use "ALTER EXTENSION pg_hint_plan UPDATE TO '1.3.10'" to load this file. \quit + +SELECT pg_catalog.pg_extension_config_dump('hint_plan.hints',''); +SELECT pg_catalog.pg_extension_config_dump('hint_plan.hints_id_seq',''); + +GRANT SELECT ON hint_plan.hints TO PUBLIC; +GRANT USAGE ON SCHEMA hint_plan TO PUBLIC; diff --git a/pg_hint_plan--1.4.2--1.4.3.sql b/pg_hint_plan--1.4.2--1.4.3.sql new file mode 100644 index 00000000..c4caa177 --- /dev/null +++ b/pg_hint_plan--1.4.2--1.4.3.sql @@ -0,0 +1,10 @@ +/* pg_hint_plan/pg_hint_plan--1.4.2--1.4.3.sql */ + +-- complain if script is sourced in psql, rather than via ALTER EXTENSION +\echo Use "ALTER EXTENSION pg_hint_plan UPDATE TO '1.4.3'" to load this file. \quit + +SELECT pg_catalog.pg_extension_config_dump('hint_plan.hints',''); +SELECT pg_catalog.pg_extension_config_dump('hint_plan.hints_id_seq',''); + +GRANT SELECT ON hint_plan.hints TO PUBLIC; +GRANT USAGE ON SCHEMA hint_plan TO PUBLIC; diff --git a/pg_hint_plan--1.4.2--1.5.sql b/pg_hint_plan--1.4.3--1.5.sql similarity index 88% rename from pg_hint_plan--1.4.2--1.5.sql rename to pg_hint_plan--1.4.3--1.5.sql index 964cc158..8f234340 100644 --- a/pg_hint_plan--1.4.2--1.5.sql +++ b/pg_hint_plan--1.4.3--1.5.sql @@ -1,4 +1,4 @@ -/* pg_hint_plan/pg_hint_plan--1.4.2--1.5.sql */ +/* pg_hint_plan/pg_hint_plan--1.4.3--1.5.sql */ -- complain if script is sourced in psql, rather than via CREATE EXTENSION \echo Use "ALTER EXTENSION pg_hint_plan UPDATE TO '1.5'" to load this file. \quit diff --git a/pg_hint_plan--1.5.1--1.5.2.sql b/pg_hint_plan--1.5.1--1.5.2.sql new file mode 100644 index 00000000..763886d1 --- /dev/null +++ b/pg_hint_plan--1.5.1--1.5.2.sql @@ -0,0 +1,10 @@ +/* pg_hint_plan/pg_hint_plan--1.5.1--1.5.2.sql */ + +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "ALTER EXTENSION pg_hint_plan UPDATE TO '1.5.2'" to load this file. \quit + +SELECT pg_catalog.pg_extension_config_dump('hint_plan.hints',''); +SELECT pg_catalog.pg_extension_config_dump('hint_plan.hints_id_seq',''); + +GRANT SELECT ON hint_plan.hints TO PUBLIC; +GRANT USAGE ON SCHEMA hint_plan TO PUBLIC; diff --git a/pg_hint_plan.control b/pg_hint_plan.control index 94682c34..4c0d2ed2 100644 --- a/pg_hint_plan.control +++ b/pg_hint_plan.control @@ -1,6 +1,6 @@ # pg_hint_plan extension comment = '' -default_version = '1.5.1' +default_version = '1.5.2' relocatable = false schema = hint_plan diff --git a/sql/oldextversions.sql b/sql/oldextversions.sql index b5f729ff..e0770723 100644 --- a/sql/oldextversions.sql +++ b/sql/oldextversions.sql @@ -22,14 +22,20 @@ ALTER EXTENSION pg_hint_plan UPDATE TO "1.3.8"; \dx+ pg_hint_plan ALTER EXTENSION pg_hint_plan UPDATE TO "1.3.9"; \dx+ pg_hint_plan +ALTER EXTENSION pg_hint_plan UPDATE TO "1.3.10"; +\dx+ pg_hint_plan ALTER EXTENSION pg_hint_plan UPDATE TO "1.4"; \dx+ pg_hint_plan ALTER EXTENSION pg_hint_plan UPDATE TO "1.4.1"; \dx+ pg_hint_plan ALTER EXTENSION pg_hint_plan UPDATE TO "1.4.2"; \dx+ pg_hint_plan +ALTER EXTENSION pg_hint_plan UPDATE TO "1.4.3"; +\dx+ pg_hint_plan ALTER EXTENSION pg_hint_plan UPDATE TO "1.5"; \dx+ pg_hint_plan ALTER EXTENSION pg_hint_plan UPDATE TO "1.5.1"; \dx+ pg_hint_plan +ALTER EXTENSION pg_hint_plan UPDATE TO "1.5.2"; +\dx+ pg_hint_plan DROP EXTENSION pg_hint_plan;