From 459186a1789547651e5eba784ff14eb12fdc38a0 Mon Sep 17 00:00:00 2001 From: Zsolt Parragi Date: Wed, 18 Jun 2025 08:39:16 +0100 Subject: [PATCH] Update postgres and pg_tde version numbers --- ci_scripts/env.sh | 2 +- configure | 2 +- configure.ac | 2 +- contrib/pg_tde/Makefile | 2 +- contrib/pg_tde/expected/version.out | 6 +++--- contrib/pg_tde/meson.build | 2 +- contrib/pg_tde/{pg_tde--1.0-rc.sql => pg_tde--1.0.sql} | 0 contrib/pg_tde/pg_tde.control | 2 +- contrib/pg_tde/src/include/pg_tde.h | 2 +- contrib/pg_tde/t/expected/basic.out | 2 +- meson.build | 2 +- src/test/modules/test_misc/t/008_percona_server_version.pl | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename contrib/pg_tde/{pg_tde--1.0-rc.sql => pg_tde--1.0.sql} (100%) diff --git a/ci_scripts/env.sh b/ci_scripts/env.sh index a5bb68ac66560..ec1cff4f8f2a1 100644 --- a/ci_scripts/env.sh +++ b/ci_scripts/env.sh @@ -1,3 +1,3 @@ #!/bin/bash -export PERCONA_SERVER_VERSION=17.5.1 +export PERCONA_SERVER_VERSION=17.5.2 diff --git a/configure b/configure index d255f91601c3b..7960612b26b5c 100755 --- a/configure +++ b/configure @@ -2856,7 +2856,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -PG_PERCONAVERSION=1 +PG_PERCONAVERSION=2 cat >>confdefs.h <<_ACEOF #define PG_PERCONAVERSION "$PG_PERCONAVERSION" diff --git a/configure.ac b/configure.ac index 669e3bcffc10b..70fa3619d4bad 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio AC_DEFINE_UNQUOTED(PG_MAJORVERSION_NUM, $PG_MAJORVERSION, [PostgreSQL major version number]) AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor version number]) -[PG_PERCONAVERSION=1] +[PG_PERCONAVERSION=2] AC_DEFINE_UNQUOTED(PG_PERCONAVERSION, "$PG_PERCONAVERSION", [PostgreSQL Percona version as a string]) PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version], diff --git a/contrib/pg_tde/Makefile b/contrib/pg_tde/Makefile index a8b7458b411f8..dd9f5541c6d19 100644 --- a/contrib/pg_tde/Makefile +++ b/contrib/pg_tde/Makefile @@ -1,7 +1,7 @@ PGFILEDESC = "pg_tde access method" MODULE_big = pg_tde EXTENSION = pg_tde -DATA = pg_tde--1.0-rc.sql +DATA = pg_tde--1.0.sql # Since meson supports skipping test suites this is a make only feature ifndef TDE_MODE diff --git a/contrib/pg_tde/expected/version.out b/contrib/pg_tde/expected/version.out index fddbafca98f12..44ebea8d04d32 100644 --- a/contrib/pg_tde/expected/version.out +++ b/contrib/pg_tde/expected/version.out @@ -1,8 +1,8 @@ CREATE EXTENSION pg_tde; SELECT pg_tde_version(); - pg_tde_version ------------------ - pg_tde 1.0.0-rc + pg_tde_version +---------------- + pg_tde 1.0.0 (1 row) DROP EXTENSION pg_tde; diff --git a/contrib/pg_tde/meson.build b/contrib/pg_tde/meson.build index 21f5b13c445a8..7429c08420f93 100644 --- a/contrib/pg_tde/meson.build +++ b/contrib/pg_tde/meson.build @@ -75,7 +75,7 @@ endif install_data( 'pg_tde.control', - 'pg_tde--1.0-rc.sql', + 'pg_tde--1.0.sql', kwargs: contrib_data_args, ) diff --git a/contrib/pg_tde/pg_tde--1.0-rc.sql b/contrib/pg_tde/pg_tde--1.0.sql similarity index 100% rename from contrib/pg_tde/pg_tde--1.0-rc.sql rename to contrib/pg_tde/pg_tde--1.0.sql diff --git a/contrib/pg_tde/pg_tde.control b/contrib/pg_tde/pg_tde.control index 73d135807fbe4..9ea82992d7490 100644 --- a/contrib/pg_tde/pg_tde.control +++ b/contrib/pg_tde/pg_tde.control @@ -1,4 +1,4 @@ comment = 'pg_tde access method' -default_version = '1.0-rc' +default_version = '1.0' module_pathname = '$libdir/pg_tde' relocatable = false diff --git a/contrib/pg_tde/src/include/pg_tde.h b/contrib/pg_tde/src/include/pg_tde.h index 652dc8eea18c6..4b6bb94d6d8f4 100644 --- a/contrib/pg_tde/src/include/pg_tde.h +++ b/contrib/pg_tde/src/include/pg_tde.h @@ -2,7 +2,7 @@ #define PG_TDE_H #define PG_TDE_NAME "pg_tde" -#define PG_TDE_VERSION "1.0.0-rc" +#define PG_TDE_VERSION "1.0.0" #define PG_TDE_VERSION_STRING PG_TDE_NAME " " PG_TDE_VERSION #define PG_TDE_DATA_DIR "pg_tde" diff --git a/contrib/pg_tde/t/expected/basic.out b/contrib/pg_tde/t/expected/basic.out index 587d8a7a31bf9..fdf976fb314c6 100644 --- a/contrib/pg_tde/t/expected/basic.out +++ b/contrib/pg_tde/t/expected/basic.out @@ -20,7 +20,7 @@ CREATE EXTENSION pg_tde; SELECT extname, extversion FROM pg_extension WHERE extname = 'pg_tde'; extname | extversion ---------+------------ - pg_tde | 1.0-rc + pg_tde | 1.0 (1 row) CREATE TABLE test_enc (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap; diff --git a/meson.build b/meson.build index 6fbc5163c0171..c054200660486 100644 --- a/meson.build +++ b/meson.build @@ -134,7 +134,7 @@ endif pg_version_major = pg_version_arr[0].to_int() pg_version_minor = pg_version_arr[1].to_int() pg_version_num = (pg_version_major * 10000) + pg_version_minor -pg_percona_ver = '1' +pg_percona_ver = '2' pg_url = 'https://www.postgresql.org/' diff --git a/src/test/modules/test_misc/t/008_percona_server_version.pl b/src/test/modules/test_misc/t/008_percona_server_version.pl index c7723525ebf22..347e173b523ed 100644 --- a/src/test/modules/test_misc/t/008_percona_server_version.pl +++ b/src/test/modules/test_misc/t/008_percona_server_version.pl @@ -17,7 +17,7 @@ # To make this testcase work, PERCONA_SERVER_VERSION variable should be available in environment. # If you are using ci_scripts it is already declated in ci_scripts/env.sh # If you are using command line make for regression then export like: -# export PERCONA_SERVER_VERSION=17.4.1 +# export PERCONA_SERVER_VERSION=17.5.2 if (!defined($ENV{PERCONA_SERVER_VERSION})) {