Skip to content

Commit

Permalink
Revert back to 1.5 as release number
Browse files Browse the repository at this point in the history
This is going to be the first release on this branch, so there is no
need to number that .1 yet.  Oversight in 9b84b1f.
  • Loading branch information
michaelpq committed Jan 25, 2023
1 parent 9b84b1f commit 69747ab
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 29 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

MODULES = pg_hint_plan
HINTPLANVER = 1.5.1
HINTPLANVER = 1.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 hints_anywhere plpgsql oldextversions
Expand All @@ -24,8 +24,7 @@ DATA = \
pg_hint_plan--1.3.7--1.3.8.sql \
pg_hint_plan--1.3.8--1.4.sql \
pg_hint_plan--1.4--1.4.1.sql \
pg_hint_plan--1.4.1--1.5.sql \
pg_hint_plan--1.5--1.5.1.sql
pg_hint_plan--1.4.1--1.5.sql

EXTRA_CLEAN = RPMS

Expand Down
7 changes: 3 additions & 4 deletions SPECS/pg_hint_plan15.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Release: 1%{?dist}
License: BSD
Group: Applications/Databases
Expand All @@ -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
Summary: Just-in-time compilation support for pg_hint_plan15

%description llvmjit
Expand Down Expand Up @@ -85,7 +85,6 @@ rm -rf %{buildroot}
%{_datadir}/extension/pg_hint_plan--1.3.8--1.4.sql
%{_datadir}/extension/pg_hint_plan--1.4--1.4.1.sql
%{_datadir}/extension/pg_hint_plan--1.4.1--1.5.sql
%{_datadir}/extension/pg_hint_plan--1.5--1.5.1.sql
%{_datadir}/extension/pg_hint_plan.control

%files llvmjit
Expand All @@ -98,6 +97,6 @@ rm -rf %{buildroot}
# History of pg_hint_plan.
%changelog
* Fri Jan 20 2023 Michael Paquier
- Version 1.5.1.
- Version 1.5.0.
* Thu Sep 29 2022 Masahiro Ikeda
- Support PostgreSQL 15.
9 changes: 0 additions & 9 deletions expected/oldextversions.out
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,4 @@ Objects in extension "pg_hint_plan"
table hint_plan.hints
(2 rows)

ALTER EXTENSION pg_hint_plan UPDATE TO "1.5.1";
\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;
10 changes: 0 additions & 10 deletions pg_hint_plan--1.5--1.5.1.sql

This file was deleted.

2 changes: 1 addition & 1 deletion pg_hint_plan.control
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pg_hint_plan extension

comment = ''
default_version = '1.5.1'
default_version = '1.5'
relocatable = false
schema = hint_plan
2 changes: 0 additions & 2 deletions sql/oldextversions.sql
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,4 @@ ALTER EXTENSION pg_hint_plan UPDATE TO "1.4.1";
\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
DROP EXTENSION pg_hint_plan;

0 comments on commit 69747ab

Please sign in to comment.