From ddbd10d2e7b431c10283c8d4941d073186912796 Mon Sep 17 00:00:00 2001
From: Naisila Puka <37271756+naisila@users.noreply.github.com>
Date: Wed, 24 Aug 2022 16:31:52 +0300
Subject: [PATCH] Rename server version checks in tests (#6239)

---
 src/test/regress/expected/pg14.out            |  4 ++--
 src/test/regress/expected/pg14_0.out          |  4 ++--
 src/test/regress/expected/stat_statements.out | 10 +++++-----
 src/test/regress/sql/pg14.sql                 |  4 ++--
 src/test/regress/sql/stat_statements.sql      | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/test/regress/expected/pg14.out b/src/test/regress/expected/pg14.out
index fb6312965..54ecd0e06 100644
--- a/src/test/regress/expected/pg14.out
+++ b/src/test/regress/expected/pg14.out
@@ -1,7 +1,7 @@
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int > 13 AS server_version_above_thirteen
+SELECT substring(:'server_version', '\d+')::int >= 14 AS server_version_ge_14
 \gset
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 \else
 \q
 \endif
diff --git a/src/test/regress/expected/pg14_0.out b/src/test/regress/expected/pg14_0.out
index 65b2376bc..cff095489 100644
--- a/src/test/regress/expected/pg14_0.out
+++ b/src/test/regress/expected/pg14_0.out
@@ -1,6 +1,6 @@
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int > 13 AS server_version_above_thirteen
+SELECT substring(:'server_version', '\d+')::int >= 14 AS server_version_ge_14
 \gset
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 \else
 \q
diff --git a/src/test/regress/expected/stat_statements.out b/src/test/regress/expected/stat_statements.out
index 1bfeba544..537bb4e9b 100644
--- a/src/test/regress/expected/stat_statements.out
+++ b/src/test/regress/expected/stat_statements.out
@@ -3,9 +3,9 @@
 --
 -- tests citus_stat_statements functionality
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int > 13 AS server_version_above_thirteen
+SELECT substring(:'server_version', '\d+')::int >= 14 AS server_version_ge_14
 \gset
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 SET compute_query_id = 'on';
 \endif
 -- check if pg_stat_statements is available
@@ -72,7 +72,7 @@ select query, calls from citus_stat_statements();
  insert into test values($1) |     1
 (1 row)
 
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 SET compute_query_id = 'off';
 \else
 set citus.stat_statements_track = 'none';
@@ -88,7 +88,7 @@ select query, calls from citus_stat_statements();
  insert into test values($1) |     1
 (1 row)
 
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 SET compute_query_id = 'on';
 \else
 RESET citus.stat_statements_track;
@@ -646,6 +646,6 @@ CONTEXT:  PL/pgSQL function citus_stat_statements() line XX at RAISE
 -- drop created tables
 DROP TABLE stat_test_text, stat_test_bigint, stat_test_bigint_other, stat_test_reference;
 DROP FUNCTION normalize_query_string(text);
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 SET compute_query_id = 'off';
 \endif
diff --git a/src/test/regress/sql/pg14.sql b/src/test/regress/sql/pg14.sql
index 34baf863d..4f14fac3d 100644
--- a/src/test/regress/sql/pg14.sql
+++ b/src/test/regress/sql/pg14.sql
@@ -1,7 +1,7 @@
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int > 13 AS server_version_above_thirteen
+SELECT substring(:'server_version', '\d+')::int >= 14 AS server_version_ge_14
 \gset
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 \else
 \q
 \endif
diff --git a/src/test/regress/sql/stat_statements.sql b/src/test/regress/sql/stat_statements.sql
index 1f15a82c4..546a5aefa 100644
--- a/src/test/regress/sql/stat_statements.sql
+++ b/src/test/regress/sql/stat_statements.sql
@@ -4,9 +4,9 @@
 -- tests citus_stat_statements functionality
 
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int > 13 AS server_version_above_thirteen
+SELECT substring(:'server_version', '\d+')::int >= 14 AS server_version_ge_14
 \gset
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 SET compute_query_id = 'on';
 \endif
 
@@ -50,7 +50,7 @@ SELECT create_distributed_table('test','a');
 insert into test values(1);
 
 select query, calls from citus_stat_statements();
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 SET compute_query_id = 'off';
 \else
 set citus.stat_statements_track = 'none';
@@ -64,7 +64,7 @@ insert into test values(1);
 select query, calls from citus_stat_statements();
 
 
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 SET compute_query_id = 'on';
 \else
 RESET citus.stat_statements_track;
@@ -290,6 +290,6 @@ DROP TABLE stat_test_text, stat_test_bigint, stat_test_bigint_other, stat_test_r
 DROP FUNCTION normalize_query_string(text);
 
 
-\if :server_version_above_thirteen
+\if :server_version_ge_14
 SET compute_query_id = 'off';
 \endif