From 8ed6ffe685cc179b8e4a122329a5bb98a6abc4ac Mon Sep 17 00:00:00 2001
From: Rishabh Tanwar <33982749+rishabhtanwar29@users.noreply.github.com>
Date: Mon, 25 Nov 2024 20:47:48 +0530
Subject: [PATCH] Fix upgrade script changes (#3159)

Move temporary procedure babelfish_revoke_guest_from_mapped_logins from
babelfishpg_tsql--4.4.0--4.5.0 to babelfishpg_tsql--4.3.0--4.4.0 upgrade script.

Task: BABEL-5389
Signed-off-by: Rishabh Tanwar ritanwar@amazon.com
---
 .../sql/upgrades/babelfishpg_tsql--4.3.0--4.4.0.sql   | 11 +++++++++++
 .../sql/upgrades/babelfishpg_tsql--4.4.0--4.5.0.sql   | 10 ----------
 .../sql_validation_framework/expected_drop.out        |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--4.3.0--4.4.0.sql b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--4.3.0--4.4.0.sql
index 503dabe1855..8c7f5279398 100644
--- a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--4.3.0--4.4.0.sql
+++ b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--4.3.0--4.4.0.sql
@@ -37,6 +37,17 @@ LANGUAGE plpgsql;
  * So make sure that any SQL statement (DDL/DML) being added here can be executed multiple times without affecting
  * final behaviour.
  */
+
+-- This is a temporary procedure which is only meant to be called during upgrade
+CREATE OR REPLACE PROCEDURE sys.babelfish_revoke_guest_from_mapped_logins()
+LANGUAGE C
+AS 'babelfishpg_tsql', 'revoke_guest_from_mapped_logins';
+
+CALL sys.babelfish_revoke_guest_from_mapped_logins();
+
+-- Drop this procedure after it gets executed once.
+DROP PROCEDURE sys.babelfish_revoke_guest_from_mapped_logins();
+
 DO $$
 DECLARE
     exception_message text;
diff --git a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--4.4.0--4.5.0.sql b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--4.4.0--4.5.0.sql
index 91bfb6f9d7e..1c31a7ced5a 100644
--- a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--4.4.0--4.5.0.sql
+++ b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--4.4.0--4.5.0.sql
@@ -60,16 +60,6 @@ CREATE OR REPLACE FUNCTION sys.pltsql_assign_var(dno INT, val ANYELEMENT)
 RETURNS ANYELEMENT
 AS 'babelfishpg_tsql', 'pltsql_assign_var' LANGUAGE C PARALLEL UNSAFE;
 
--- This is a temporary procedure which is only meant to be called during upgrade
-CREATE OR REPLACE PROCEDURE sys.babelfish_revoke_guest_from_mapped_logins()
-LANGUAGE C
-AS 'babelfishpg_tsql', 'revoke_guest_from_mapped_logins';
-
-CALL sys.babelfish_revoke_guest_from_mapped_logins();
-
--- Drop this procedure after it gets executed once.
-DROP PROCEDURE sys.babelfish_revoke_guest_from_mapped_logins();
-
 -- After upgrade, always run analyze for all babelfish catalogs.
 CALL sys.analyze_babelfish_catalogs();
 
diff --git a/test/python/expected/sql_validation_framework/expected_drop.out b/test/python/expected/sql_validation_framework/expected_drop.out
index 92163fd856a..42181bc3038 100644
--- a/test/python/expected/sql_validation_framework/expected_drop.out
+++ b/test/python/expected/sql_validation_framework/expected_drop.out
@@ -74,7 +74,7 @@ Unexpected drop found for procedure sys.babelfish_drop_deprecated_view in file b
 Unexpected drop found for procedure sys.babelfish_drop_deprecated_view in file babelfishpg_tsql--2.1.0--2.2.0.sql
 Unexpected drop found for procedure sys.babelfish_remove_object_from_extension in file babelfishpg_tsql--2.1.0--2.2.0.sql
 Unexpected drop found for procedure sys.babelfish_remove_object_from_extension in file babelfishpg_tsql--3.0.0--3.1.0.sql
-Unexpected drop found for procedure sys.babelfish_revoke_guest_from_mapped_logins in file babelfishpg_tsql--4.4.0--4.5.0.sql
+Unexpected drop found for procedure sys.babelfish_revoke_guest_from_mapped_logins in file babelfishpg_tsql--4.3.0--4.4.0.sql
 Unexpected drop found for procedure sys.babelfish_update_collation_to_default in file babelfishpg_common--2.2.0--2.3.0.sql
 Unexpected drop found for procedure sys.babelfish_update_collation_to_default in file babelfishpg_tsql--2.2.0--2.3.0.sql
 Unexpected drop found for procedure sys.babelfish_update_collation_to_default in file babelfishpg_tsql--2.3.0--3.0.0.sql