From a2bf76906a07e0d79480084c41ba5556a89e2895 Mon Sep 17 00:00:00 2001 From: William Wen Date: Wed, 21 Feb 2024 15:33:57 +0800 Subject: [PATCH 1/3] chore: upgrade declared pg version to 13.14.0 --- e2e_test/batch/functions/setting.slt.part | 2 +- src/common/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e_test/batch/functions/setting.slt.part b/e2e_test/batch/functions/setting.slt.part index 77d1d80e46590..bf3897263a1c8 100644 --- a/e2e_test/batch/functions/setting.slt.part +++ b/e2e_test/batch/functions/setting.slt.part @@ -1,7 +1,7 @@ query T SELECT current_setting('server_version'); ---- -9.5.0 +13.14.0 query I SELECT CAST(current_setting('server_version_num') AS INT) / 100 AS version; diff --git a/src/common/src/lib.rs b/src/common/src/lib.rs index 980897d5636e7..98113254d1381 100644 --- a/src/common/src/lib.rs +++ b/src/common/src/lib.rs @@ -92,7 +92,7 @@ pub const UNKNOWN_GIT_SHA: &str = "unknown"; // The single source of truth of the pg parameters, Used in ConfigMap and current_cluster_version. // The version of PostgreSQL that Risingwave claims to be. -pub const PG_VERSION: &str = "9.5.0"; +pub const PG_VERSION: &str = "13.14.0"; /// The version of PostgreSQL that Risingwave claims to be. pub const SERVER_VERSION_NUM: i32 = 90500; /// Shows the server-side character set encoding. At present, this parameter can be shown but not set, because the encoding is determined at database creation time. It is also the default value of `client_encoding`. From e75151180f268493a784f5e5cfa4651103c7fe09 Mon Sep 17 00:00:00 2001 From: William Wen Date: Wed, 21 Feb 2024 16:19:12 +0800 Subject: [PATCH 2/3] update version number --- e2e_test/batch/functions/setting.slt.part | 4 ++-- src/common/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e_test/batch/functions/setting.slt.part b/e2e_test/batch/functions/setting.slt.part index bf3897263a1c8..233399d80a025 100644 --- a/e2e_test/batch/functions/setting.slt.part +++ b/e2e_test/batch/functions/setting.slt.part @@ -4,9 +4,9 @@ SELECT current_setting('server_version'); 13.14.0 query I -SELECT CAST(current_setting('server_version_num') AS INT) / 100 AS version; +SELECT current_setting('server_version_num') AS version; ---- -905 +130014 query T SELECT set_config('client_min_messages', 'warning', false); diff --git a/src/common/src/lib.rs b/src/common/src/lib.rs index 98113254d1381..313c0bada6616 100644 --- a/src/common/src/lib.rs +++ b/src/common/src/lib.rs @@ -94,7 +94,7 @@ pub const UNKNOWN_GIT_SHA: &str = "unknown"; // The version of PostgreSQL that Risingwave claims to be. pub const PG_VERSION: &str = "13.14.0"; /// The version of PostgreSQL that Risingwave claims to be. -pub const SERVER_VERSION_NUM: i32 = 90500; +pub const SERVER_VERSION_NUM: i32 = 130014; /// Shows the server-side character set encoding. At present, this parameter can be shown but not set, because the encoding is determined at database creation time. It is also the default value of `client_encoding`. pub const SERVER_ENCODING: &str = "UTF8"; /// see From fc9fe71e35a06ec47f6de6b5d9398cc3ed17f912 Mon Sep 17 00:00:00 2001 From: William Wen Date: Wed, 21 Feb 2024 16:58:28 +0800 Subject: [PATCH 3/3] fix e2e --- e2e_test/batch/catalog/version.slt.part | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e_test/batch/catalog/version.slt.part b/e2e_test/batch/catalog/version.slt.part index b2ba9e2a877c5..dc3e0399b1e6a 100644 --- a/e2e_test/batch/catalog/version.slt.part +++ b/e2e_test/batch/catalog/version.slt.part @@ -1,4 +1,4 @@ query T -select substring(version() from 1 for 14); +select substring(version() from 1 for 16); ---- -PostgreSQL 9.5 +PostgreSQL 13.14