diff --git a/test/JDBC/expected/BABEL-1435.out b/test/JDBC/expected/BABEL-1435.out index a5c15144d8..7226f9d66e 100644 --- a/test/JDBC/expected/BABEL-1435.out +++ b/test/JDBC/expected/BABEL-1435.out @@ -159,124 +159,3 @@ 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 - -~~END~~ - - --- test multi-db mode -SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false); -GO -~~START~~ -text -multi-db -~~END~~ - - -SELECT name FROM sys.sysdatabases ORDER BY name; -GO -~~START~~ -text -master -msdb -tempdb -~~END~~ - - -CREATE DATABASE db1; -GO - --- test error -CREATE DATABASE db1; -GO -~~ERROR (Code: 33557097)~~ - -~~ERROR (Message: Database 'db1' already exists. Choose a different database name.)~~ - - -CREATE DATABASE db2; -GO - -SELECT COUNT(*) FROM pg_roles where rolname = 'db1_dbo'; -SELECT COUNT(*) FROM pg_roles where rolname = 'db1_db_owner'; -SELECT COUNT(*) FROM pg_namespace where nspname = 'db1_dbo'; -GO -~~START~~ -int -1 -~~END~~ - -~~START~~ -int -1 -~~END~~ - -~~START~~ -int -1 -~~END~~ - - -SELECT COUNT(*) FROM pg_roles where rolname = 'db2_dbo'; -SELECT COUNT(*) FROM pg_roles where rolname = 'db2_db_owner'; -SELECT COUNT(*) FROM pg_namespace where nspname = 'db2_dbo'; -GO -~~START~~ -int -1 -~~END~~ - -~~START~~ -int -1 -~~END~~ - -~~START~~ -int -1 -~~END~~ - - -DROP DATABASE db1; -GO - -DROP DATABASE db2; -GO - -SELECT name FROM sys.sysdatabases ORDER BY name; -GO -~~START~~ -text -master -msdb -tempdb -~~END~~ - - -SELECT set_config('babelfishpg_tsql.migration_mode', 'single-db', false); -GO -~~START~~ -text -single-db -~~END~~ - diff --git a/test/JDBC/expected/BABEL-1446.out b/test/JDBC/expected/BABEL-1446.out index 44185b2466..d29149ec2a 100644 --- a/test/JDBC/expected/BABEL-1446.out +++ b/test/JDBC/expected/BABEL-1446.out @@ -85,79 +85,3 @@ int 0 ~~END~~ - --- test multi-db mode -SELECT set_config('role', 'jdbc_user', false); -GO -~~START~~ -text -jdbc_user -~~END~~ - -SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false); -GO -~~START~~ -text -multi-db -~~END~~ - - -CREATE DATABASE db1; -GO - -SELECT COUNT(*) FROM pg_auth_members -WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'db1_guest') -AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db1_db_owner'); -GO -~~START~~ -int -1 -~~END~~ - - -CREATE DATABASE db2; -GO - -SELECT COUNT(*) FROM pg_auth_members -WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'db2_guest') -AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db2_db_owner'); -GO -~~START~~ -int -1 -~~END~~ - - -DROP DATABASE db1; -GO - -SELECT COUNT(*) FROM pg_auth_members -WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'db1_guest') -AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db1_db_owner'); -GO -~~START~~ -int -0 -~~END~~ - - -DROP DATABASE db2; -GO - -SELECT COUNT(*) FROM pg_auth_members -WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'db2_guest') -AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db2_db_owner'); -GO -~~START~~ -int -0 -~~END~~ - - -SELECT set_config('babelfishpg_tsql.migration_mode', 'single-db', false); -GO -~~START~~ -text -single-db -~~END~~ - diff --git a/test/JDBC/input/BABEL-1435.sql b/test/JDBC/input/BABEL-1435.sql index eb7a33f82e..e158610e47 100644 --- a/test/JDBC/input/BABEL-1435.sql +++ b/test/JDBC/input/BABEL-1435.sql @@ -57,61 +57,3 @@ 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 - --- test multi-db mode -SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false); -GO - -SELECT name FROM sys.sysdatabases ORDER BY name; -GO - -CREATE DATABASE db1; -GO - --- test error -CREATE DATABASE db1; -GO - -CREATE DATABASE db2; -GO - -SELECT COUNT(*) FROM pg_roles where rolname = 'db1_dbo'; -SELECT COUNT(*) FROM pg_roles where rolname = 'db1_db_owner'; -SELECT COUNT(*) FROM pg_namespace where nspname = 'db1_dbo'; -GO - -SELECT COUNT(*) FROM pg_roles where rolname = 'db2_dbo'; -SELECT COUNT(*) FROM pg_roles where rolname = 'db2_db_owner'; -SELECT COUNT(*) FROM pg_namespace where nspname = 'db2_dbo'; -GO - -DROP DATABASE db1; -GO - -DROP DATABASE db2; -GO - -SELECT name FROM sys.sysdatabases ORDER BY name; -GO - -SELECT set_config('babelfishpg_tsql.migration_mode', 'single-db', false); -GO diff --git a/test/JDBC/input/BABEL-1446.sql b/test/JDBC/input/BABEL-1446.sql index 9603dd2ccc..73dbb960c2 100644 --- a/test/JDBC/input/BABEL-1446.sql +++ b/test/JDBC/input/BABEL-1446.sql @@ -50,44 +50,3 @@ SELECT COUNT(*) FROM pg_auth_members WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'guest') AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db_owner'); GO - --- test multi-db mode -SELECT set_config('role', 'jdbc_user', false); -GO -SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false); -GO - -CREATE DATABASE db1; -GO - -SELECT COUNT(*) FROM pg_auth_members -WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'db1_guest') -AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db1_db_owner'); -GO - -CREATE DATABASE db2; -GO - -SELECT COUNT(*) FROM pg_auth_members -WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'db2_guest') -AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db2_db_owner'); -GO - -DROP DATABASE db1; -GO - -SELECT COUNT(*) FROM pg_auth_members -WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'db1_guest') -AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db1_db_owner'); -GO - -DROP DATABASE db2; -GO - -SELECT COUNT(*) FROM pg_auth_members -WHERE roleid = (SELECT oid FROM pg_roles WHERE rolname = 'db2_guest') -AND "member" = (SELECT oid FROM pg_roles WHERE rolname = 'db2_db_owner'); -GO - -SELECT set_config('babelfishpg_tsql.migration_mode', 'single-db', false); -GO diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule index 9e2a30dc5e..3d34190053 100644 --- a/test/JDBC/jdbc_schedule +++ b/test/JDBC/jdbc_schedule @@ -10,8 +10,6 @@ all -ignore#!#BABEL-1435 -ignore#!#BABEL-1446 ignore#!#BABEL-4279 ignore#!#babelfish_migration_mode-vu-prepare ignore#!#babelfish_migration_mode-vu-verify