From 3cc7a4aa42afe304301f65e22fd85ef4dd4eed56 Mon Sep 17 00:00:00 2001
From: Naisila Puka <37271756+naisila@users.noreply.github.com>
Date: Wed, 14 Jun 2023 15:32:38 +0300
Subject: [PATCH] Fix pg14-pg15 upgrade_distributed_triggers test (#6981)

This test is only relevant for pg14-15 upgrade.
However, the check on `upgrade_distributed_triggers_after` didn't take
into consideration the case when we are doing pg15-16 upgrade. Hence, I
added one more condition to the test: existence of
`upgrade_distributed_triggers` schema which can only be created in pg14.
---
 .../regress/expected/upgrade_distributed_triggers_after.out   | 4 ++--
 .../regress/expected/upgrade_distributed_triggers_after_0.out | 4 ++--
 src/test/regress/sql/upgrade_distributed_triggers_after.sql   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/regress/expected/upgrade_distributed_triggers_after.out b/src/test/regress/expected/upgrade_distributed_triggers_after.out
index 7037b4c50..f36bf1749 100644
--- a/src/test/regress/expected/upgrade_distributed_triggers_after.out
+++ b/src/test/regress/expected/upgrade_distributed_triggers_after.out
@@ -9,9 +9,9 @@
 -- this test is relevant only for pg14-15 upgrade
 --
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int = 15 AS server_version_eq_15
+SELECT substring(:'server_version', '\d+')::int = 15 AND EXISTS (SELECT * FROM pg_namespace WHERE nspname = 'upgrade_distributed_triggers') AS is_14_15_pg_upgrade
 \gset
-\if :server_version_eq_15
+\if :is_14_15_pg_upgrade
 \else
 \q
 \endif
diff --git a/src/test/regress/expected/upgrade_distributed_triggers_after_0.out b/src/test/regress/expected/upgrade_distributed_triggers_after_0.out
index 2b1f5cac1..c6a0d053a 100644
--- a/src/test/regress/expected/upgrade_distributed_triggers_after_0.out
+++ b/src/test/regress/expected/upgrade_distributed_triggers_after_0.out
@@ -9,8 +9,8 @@
 -- this test is relevant only for pg14-15 upgrade
 --
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int = 15 AS server_version_eq_15
+SELECT substring(:'server_version', '\d+')::int = 15 AND EXISTS (SELECT * FROM pg_namespace WHERE nspname = 'upgrade_distributed_triggers') AS is_14_15_pg_upgrade
 \gset
-\if :server_version_eq_15
+\if :is_14_15_pg_upgrade
 \else
 \q
diff --git a/src/test/regress/sql/upgrade_distributed_triggers_after.sql b/src/test/regress/sql/upgrade_distributed_triggers_after.sql
index 681f1896b..181833594 100644
--- a/src/test/regress/sql/upgrade_distributed_triggers_after.sql
+++ b/src/test/regress/sql/upgrade_distributed_triggers_after.sql
@@ -10,9 +10,9 @@
 --
 
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+')::int = 15 AS server_version_eq_15
+SELECT substring(:'server_version', '\d+')::int = 15 AND EXISTS (SELECT * FROM pg_namespace WHERE nspname = 'upgrade_distributed_triggers') AS is_14_15_pg_upgrade
 \gset
-\if :server_version_eq_15
+\if :is_14_15_pg_upgrade
 \else
 \q
 \endif