Update test files by removing set_config calls (#3307)

As part of #3096, we restricted setting of few configurations like role, migration mode etc. We ignored few files temporarily to get us unblocked. This commit fixes 3 such test files: 1. BABEL-1435 2. BABEL-1446 3. babelfish_migration-mode-vu-* Signed-off-by: Shameem Ahmed <[email protected]>
babelfish-for-postgresql · Dec 30, 2024 · 75c7a80 · 75c7a80
1 parent 6a98c1c
commit 75c7a80
Show file tree

Hide file tree

Showing 38 changed files with 27 additions and 213 deletions.
diff --git a/test/JDBC/expected/BABEL-1435.out b/test/JDBC/expected/BABEL-1435.out
@@ -175,29 +175,6 @@ GO
 DROP DATABASE db1;
 GO
 
--- Set current_user for testing db mode
-IF (SELECT 1 FROM pg_roles WHERE rolname='jdbc_user') = 1
-BEGIN
-	WITH SET_CTE
-	AS
-	(SELECT set_config('role', 'jdbc_user', false))
-	SELECT NULL
-	FROM SET_CTE
-END
-ELSE
-BEGIN
-	WITH SET_CTE
-	AS
-	(SELECT set_config('role', 'babeltestuser', false))
-	SELECT NULL
-	FROM SET_CTE
-END
-GO
-~~START~~
-int
-<NULL>
-~~END~~
-
 
 SELECT name FROM sys.sysdatabases ORDER BY name;
 GO

diff --git a/test/JDBC/expected/BABEL-1446.out b/test/JDBC/expected/BABEL-1446.out
@@ -87,14 +87,6 @@ int
 
 
 -- test multi-db mode
-SELECT set_config('role', 'jdbc_user', false);
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 CREATE DATABASE db1;
 GO
 

diff --git a/test/JDBC/expected/babelfish_migration_mode-vu-verify.out b/test/JDBC/expected/babelfish_migration_mode-vu-verify.out
@@ -96,14 +96,6 @@ GO
 ~~ROW COUNT: 1~~
 
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 SELECT current_setting('babelfishpg_tsql.migration_mode')
 GO
 ~~START~~
@@ -240,28 +232,12 @@ int
 USE master
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 
 
 -- should fail in single-db
 USE babelfish_migration_mode_db2
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 SELECT current_setting('babelfishpg_tsql.migration_mode')
 GO
 ~~START~~
@@ -291,14 +267,6 @@ GO
 DROP DATABASE babelfish_migration_mode_db2
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 
 
 INSERT INTO babelfish_migration_mode_catalog_status2 
@@ -333,25 +301,6 @@ varchar#!#int
 TRUNCATE TABLE babelfish_migration_mode_catalog_status2
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
--- Reset migration mode to default
-DECLARE @mig_mode VARCHAR(10)
-SET @mig_mode = (SELECT mig_mode FROM babelfish_migration_mode_tbl WHERE id_num = 1)
-SELECT CASE WHEN (SELECT set_config('babelfishpg_tsql.migration_mode', @mig_mode, false)) IS NOT NULL THEN 1 ELSE 0 END
-GO
-~~START~~
-int
-1
-~~END~~
-
-
 INSERT INTO babelfish_migration_mode_catalog_status2 
 SELECT 'sys.babelfish_sysdatabases', COUNT(*) FROM sys.babelfish_sysdatabases
 GO

diff --git a/test/JDBC/expected/single_db/BABEL-1435.out b/test/JDBC/expected/single_db/BABEL-1435.out
@@ -183,29 +183,6 @@ GO
 DROP DATABASE db1;
 GO
 
--- Set current_user for testing db mode
-IF (SELECT 1 FROM pg_roles WHERE rolname='jdbc_user') = 1
-BEGIN
-	WITH SET_CTE
-	AS
-	(SELECT set_config('role', 'jdbc_user', false))
-	SELECT NULL
-	FROM SET_CTE
-END
-ELSE
-BEGIN
-	WITH SET_CTE
-	AS
-	(SELECT set_config('role', 'babeltestuser', false))
-	SELECT NULL
-	FROM SET_CTE
-END
-GO
-~~START~~
-int
-<NULL>
-~~END~~
-
 
 SELECT name FROM sys.sysdatabases ORDER BY name;
 GO

diff --git a/test/JDBC/expected/single_db/BABEL-1446.out b/test/JDBC/expected/single_db/BABEL-1446.out
@@ -87,14 +87,6 @@ int
 
 
 -- test multi-db mode
-SELECT set_config('role', 'jdbc_user', false);
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 CREATE DATABASE db1;
 GO
 

diff --git a/test/JDBC/expected/single_db/babelfish_migration_mode-vu-verify.out b/test/JDBC/expected/single_db/babelfish_migration_mode-vu-verify.out
@@ -96,14 +96,6 @@ GO
 ~~ROW COUNT: 1~~
 
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 SELECT current_setting('babelfishpg_tsql.migration_mode')
 GO
 ~~START~~
@@ -247,14 +239,6 @@ int
 USE master
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 
 
 -- should fail in single-db
@@ -265,14 +249,6 @@ GO
 ~~ERROR (Message: database "babelfish_migration_mode_db2" does not exist)~~
 
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 SELECT current_setting('babelfishpg_tsql.migration_mode')
 GO
 ~~START~~
@@ -310,14 +286,6 @@ GO
 ~~ERROR (Message: database "babelfish_migration_mode_db2" does not exist)~~
 
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
 
 
 INSERT INTO babelfish_migration_mode_catalog_status2 
@@ -352,25 +320,6 @@ varchar#!#int
 TRUNCATE TABLE babelfish_migration_mode_catalog_status2
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
-
--- Reset migration mode to default
-DECLARE @mig_mode VARCHAR(10)
-SET @mig_mode = (SELECT mig_mode FROM babelfish_migration_mode_tbl WHERE id_num = 1)
-SELECT CASE WHEN (SELECT set_config('babelfishpg_tsql.migration_mode', @mig_mode, false)) IS NOT NULL THEN 1 ELSE 0 END
-GO
-~~START~~
-int
-1
-~~END~~
-
-
 INSERT INTO babelfish_migration_mode_catalog_status2 
 SELECT 'sys.babelfish_sysdatabases', COUNT(*) FROM sys.babelfish_sysdatabases
 GO

diff --git a/test/JDBC/input/BABEL-1435.sql b/test/JDBC/input/BABEL-1435.sql
@@ -67,24 +67,6 @@ GO
 DROP DATABASE db1;
 GO
 
--- Set current_user for testing db mode
-IF (SELECT 1 FROM pg_roles WHERE rolname='jdbc_user') = 1
-BEGIN
-	WITH SET_CTE
-	AS
-	(SELECT set_config('role', 'jdbc_user', false))
-	SELECT NULL
-	FROM SET_CTE
-END
-ELSE
-BEGIN
-	WITH SET_CTE
-	AS
-	(SELECT set_config('role', 'babeltestuser', false))
-	SELECT NULL
-	FROM SET_CTE
-END
-GO
 
 SELECT name FROM sys.sysdatabases ORDER BY name;
 GO

diff --git a/test/JDBC/input/BABEL-1446.sql b/test/JDBC/input/BABEL-1446.sql
@@ -53,9 +53,6 @@ AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db_owner');
 GO
 
 -- test multi-db mode
-SELECT set_config('role', 'jdbc_user', false);
-GO
-
 CREATE DATABASE db1;
 GO
 

diff --git a/test/JDBC/input/ownership/babelfish_migration_mode-vu-verify.mix b/test/JDBC/input/ownership/babelfish_migration_mode-vu-verify.mix
@@ -37,9 +37,6 @@ INSERT INTO babelfish_migration_mode_catalog_status
 SELECT 'sys.babelfish_authid_user_ext', COUNT(*) FROM sys.babelfish_authid_user_ext
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-
 SELECT current_setting('babelfishpg_tsql.migration_mode')
 GO
 
@@ -109,18 +106,12 @@ GO
 USE master
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-
 
 
 -- should fail in single-db
 USE babelfish_migration_mode_db2
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-
 SELECT current_setting('babelfishpg_tsql.migration_mode')
 GO
 
@@ -140,9 +131,6 @@ GO
 DROP DATABASE babelfish_migration_mode_db2
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-
 
 
 INSERT INTO babelfish_migration_mode_catalog_status2 
@@ -165,15 +153,6 @@ GO
 TRUNCATE TABLE babelfish_migration_mode_catalog_status2
 GO
 
-SELECT set_config('role', 'jdbc_user', false)
-GO
-
--- Reset migration mode to default
-DECLARE @mig_mode VARCHAR(10)
-SET @mig_mode = (SELECT mig_mode FROM babelfish_migration_mode_tbl WHERE id_num = 1)
-SELECT CASE WHEN (SELECT set_config('babelfishpg_tsql.migration_mode', @mig_mode, false)) IS NOT NULL THEN 1 ELSE 0 END
-GO
-
 INSERT INTO babelfish_migration_mode_catalog_status2 
 SELECT 'sys.babelfish_sysdatabases', COUNT(*) FROM sys.babelfish_sysdatabases
 GO

diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule
@@ -10,12 +10,6 @@
 
 all
 
-ignore#!#BABEL-1435
-ignore#!#BABEL-1446
-ignore#!#babelfish_migration_mode-vu-prepare
-ignore#!#babelfish_migration_mode-vu-verify
-ignore#!#babelfish_migration_mode-vu-cleanup
-
 # BABEL-SP_FKEYS test is very slow and causing github action timeout.
 
 # JDBC bulk insert API seems to call SET FMTONLY ON without calling SET FMTONLY OFF, causing some spurious test failures.

diff --git a/test/JDBC/singledb_jdbc_schedule b/test/JDBC/singledb_jdbc_schedule
@@ -5,4 +5,3 @@
 ignore#!#Test-sp_reset_connection
 ignore#!#test_search_path
 
-
diff --git a/test/JDBC/upgrade/13_4/schedule b/test/JDBC/upgrade/13_4/schedule
@@ -76,6 +76,7 @@ babel_datatype_sqlvariant
 BABEL-EXTENDEDPROPERTY-before-15_4
 babelfish_authid_login_ext
 babelfish_cast_floor
+babelfish_migration_mode
 babelfish_namespace_ext
 babelfish_sysdatabases
 babel_function_string-before-15-5-or-14-10

diff --git a/test/JDBC/upgrade/13_5/schedule b/test/JDBC/upgrade/13_5/schedule
@@ -82,6 +82,7 @@ babel_datatype_sqlvariant
 BABEL-EXTENDEDPROPERTY-before-15_4
 babelfish_authid_login_ext
 babelfish_cast_floor
+babelfish_migration_mode
 babelfish_namespace_ext
 babelfish_sysdatabases
 babel_function_string-before-15-5-or-14-10

diff --git a/test/JDBC/upgrade/13_6/schedule b/test/JDBC/upgrade/13_6/schedule
@@ -105,6 +105,7 @@ babelfish_authid_login_ext
 babelfish_authid_user_ext
 babelfish_cast_floor
 babelfish_inconsistent_metadata
+babelfish_migration_mode
 babelfish_namespace_ext
 babelfish_sysdatabases
 babel_function_string-before-15-5-or-14-10
-Original file line number
+Diff line change
@@ Expand Up @@
     GO
     -- test multi-db mode
-    SELECT set_config('role', 'jdbc_user', false);
-    GO
     CREATE DATABASE db1;
     GO
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@
		ignore#!#Test-sp_reset_connection
		ignore#!#test_search_path