From c1e55c488afdc80bd689aa24696334828b8c2915 Mon Sep 17 00:00:00 2001 From: Shameem Ahmed Date: Thu, 25 Jul 2024 12:27:02 +0000 Subject: [PATCH] Remove commented migration_mode changes in test files Signed-off-by: Shameem Ahmed (cherry picked from commit 140143b0cab7c863c4f4e817aab0e7a4574a2193) --- test/JDBC/input/BABEL-1454.mix | 4 ++-- test/JDBC/input/BABEL-2403.mix | 6 +++--- test/JDBC/input/BABEL-2902.mix | 4 ++-- test/JDBC/input/BABEL-3655.mix | 4 ++-- test/JDBC/input/BABEL-CROSS-DB.mix | 4 ++-- test/JDBC/input/BABEL-LOGIN-USER-EXT.mix | 4 ++-- test/JDBC/input/BABEL-SYS-DATABASES.mix | 4 ++-- test/JDBC/input/ISC-Table_Constraints.mix | 4 ++-- .../babelfish_migration_mode-vu-verify.mix | 16 ++++++++-------- test/JDBC/input/usedb_inside_execute.mix | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/JDBC/input/BABEL-1454.mix b/test/JDBC/input/BABEL-1454.mix index cf20c8de346..d127173c5e4 100644 --- a/test/JDBC/input/BABEL-1454.mix +++ b/test/JDBC/input/BABEL-1454.mix @@ -1,5 +1,5 @@ -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; ALTER SYSTEM SET babelfishpg_tsql.allow_antlr_to_unsupported_grammar_for_testing = true; SELECT pg_reload_conf(); GO @@ -267,7 +267,7 @@ DROP DATABASE db1; GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; ALTER SYSTEM SET babelfishpg_tsql.allow_antlr_to_unsupported_grammar_for_testing = false; SELECT pg_reload_conf(); GO diff --git a/test/JDBC/input/BABEL-2403.mix b/test/JDBC/input/BABEL-2403.mix index e4e80399a39..a7babff18b0 100644 --- a/test/JDBC/input/BABEL-2403.mix +++ b/test/JDBC/input/BABEL-2403.mix @@ -1,5 +1,5 @@ -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; SELECT pg_reload_conf(); GO @@ -36,7 +36,7 @@ SELECT * FROM sys.babelfish_inconsistent_metadata(true); GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; SELECT pg_reload_conf(); GO @@ -54,7 +54,7 @@ SELECT * FROM sys.babelfish_inconsistent_metadata(true); GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; SELECT pg_reload_conf(); GO diff --git a/test/JDBC/input/BABEL-2902.mix b/test/JDBC/input/BABEL-2902.mix index cccdd01648b..f2671713338 100644 --- a/test/JDBC/input/BABEL-2902.mix +++ b/test/JDBC/input/BABEL-2902.mix @@ -1,7 +1,7 @@ -- parallel_query_expected -- Test setup -- -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; SELECT pg_reload_conf(); GO @@ -307,6 +307,6 @@ DROP DATABASE IF EXISTS babel_2902_testdb_2 DROP DATABASE IF EXISTS babel_2902_testdb_3 GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; SELECT pg_reload_conf(); GO \ No newline at end of file diff --git a/test/JDBC/input/BABEL-3655.mix b/test/JDBC/input/BABEL-3655.mix index 8259151c776..5afad926299 100644 --- a/test/JDBC/input/BABEL-3655.mix +++ b/test/JDBC/input/BABEL-3655.mix @@ -1,5 +1,5 @@ -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; SELECT pg_reload_conf(); GO -- Wait to sync with another session @@ -35,7 +35,7 @@ DROP DATABASE babel_3655_test_db GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; SELECT pg_reload_conf(); GO -- Wait to sync with another session diff --git a/test/JDBC/input/BABEL-CROSS-DB.mix b/test/JDBC/input/BABEL-CROSS-DB.mix index 5c4b74582f5..1957d7ff2a2 100644 --- a/test/JDBC/input/BABEL-CROSS-DB.mix +++ b/test/JDBC/input/BABEL-CROSS-DB.mix @@ -281,7 +281,7 @@ DROP LOGIN johndoe; GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; SELECT pg_reload_conf(); GO SELECT pg_sleep(1); @@ -499,7 +499,7 @@ DROP DATABASE db_4934_2; GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; SELECT pg_reload_conf(); GO SELECT pg_sleep(1); diff --git a/test/JDBC/input/BABEL-LOGIN-USER-EXT.mix b/test/JDBC/input/BABEL-LOGIN-USER-EXT.mix index ac5108d9dfe..491391cc22d 100644 --- a/test/JDBC/input/BABEL-LOGIN-USER-EXT.mix +++ b/test/JDBC/input/BABEL-LOGIN-USER-EXT.mix @@ -456,7 +456,7 @@ DROP LOGIN login1; GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; GO SELECT pg_reload_conf(); GO @@ -704,7 +704,7 @@ DROP USER lgn_3232; GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; GO -- Wait to sync with another session SELECT pg_sleep(1); diff --git a/test/JDBC/input/BABEL-SYS-DATABASES.mix b/test/JDBC/input/BABEL-SYS-DATABASES.mix index fe03dc4878c..f9f5b18d5ba 100644 --- a/test/JDBC/input/BABEL-SYS-DATABASES.mix +++ b/test/JDBC/input/BABEL-SYS-DATABASES.mix @@ -1,5 +1,5 @@ -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; SELECT pg_reload_conf(); GO @@ -21,6 +21,6 @@ DROP DATABASE db2; GO -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; SELECT pg_reload_conf(); GO diff --git a/test/JDBC/input/ISC-Table_Constraints.mix b/test/JDBC/input/ISC-Table_Constraints.mix index 032b23be0d2..89faa967863 100644 --- a/test/JDBC/input/ISC-Table_Constraints.mix +++ b/test/JDBC/input/ISC-Table_Constraints.mix @@ -1,5 +1,5 @@ -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; SELECT pg_reload_conf(); GO @@ -182,6 +182,6 @@ drop login user_tbl_const; go -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; SELECT pg_reload_conf(); 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 index d2f1cbb4dca..8863365b939 100644 --- a/test/JDBC/input/ownership/babelfish_migration_mode-vu-verify.mix +++ b/test/JDBC/input/ownership/babelfish_migration_mode-vu-verify.mix @@ -39,8 +39,8 @@ GO SELECT set_config('role', 'jdbc_user', false) GO --- SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false) --- GO +SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false) +GO SELECT current_setting('babelfishpg_tsql.migration_mode') GO @@ -113,8 +113,8 @@ GO SELECT set_config('role', 'jdbc_user', false) GO --- SELECT set_config('babelfishpg_tsql.migration_mode', 'single-db', false) --- GO +SELECT set_config('babelfishpg_tsql.migration_mode', 'single-db', false) +GO SELECT current_setting('babelfishpg_tsql.migration_mode') GO @@ -126,8 +126,8 @@ GO SELECT set_config('role', 'jdbc_user', false) GO --- SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false) --- GO +SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false) +GO SELECT current_setting('babelfishpg_tsql.migration_mode') GO @@ -151,8 +151,8 @@ GO SELECT set_config('role', 'jdbc_user', false) GO --- SELECT set_config('babelfishpg_tsql.migration_mode', 'single-db', false) --- GO +SELECT set_config('babelfishpg_tsql.migration_mode', 'single-db', false) +GO SELECT current_setting('babelfishpg_tsql.migration_mode') GO diff --git a/test/JDBC/input/usedb_inside_execute.mix b/test/JDBC/input/usedb_inside_execute.mix index f5bc94947b8..8e2e774defa 100644 --- a/test/JDBC/input/usedb_inside_execute.mix +++ b/test/JDBC/input/usedb_inside_execute.mix @@ -1,5 +1,5 @@ -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'multi-db'; SELECT pg_reload_conf(); GO @@ -77,6 +77,6 @@ drop database db3; go -- psql --- ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; +ALTER SYSTEM SET babelfishpg_tsql.migration_mode = 'single-db'; SELECT pg_reload_conf(); GO