Addressed Code review suggestion for muti-db test cases

Ignored file containing multi-db test from jdbc schedule. Removed set config change for multi-db Added basic test cases seperately to verify IO Triggers. Task:BABEL-2170 Signed-off-by: Deepakshi Mittal <[email protected]>
babelfish-for-postgresql · Jan 2, 2024 · f105495 · f105495
1 parent 4d891ab
commit f105495
Show file tree

Hide file tree

Showing 9 changed files with 256 additions and 70 deletions.
diff --git a/test/JDBC/expected/BABEL-2170-vu-cleanup.out b/test/JDBC/expected/BABEL-2170-vu-cleanup.out
@@ -1,5 +1,5 @@
 -- clean all objects in first database
-USE db1_BABEL2170;
+USE babel_2170_db1;
 GO
 
 DROP TRIGGER IF EXISTS babel_2170_vu_employees_view_iot_insert;
@@ -35,5 +35,5 @@ GO
 USE MASTER; 
 GO
 
-DROP DATABASE IF EXISTS db1_BABEL2170;
+DROP DATABASE IF EXISTS babel_2170_db1;
 GO
diff --git a/test/JDBC/expected/BABEL-2170-vu-prepare.out b/test/JDBC/expected/BABEL-2170-vu-prepare.out
@@ -1,8 +1,7 @@
--- We will create two databases db1_BABEL2170, db2_BABEL2170
-CREATE DATABASE db1_BABEL2170;
+CREATE DATABASE babel_2170_db1;
 GO
 
-USE db1_BABEL2170;
+USE babel_2170_db1;
 GO
 
 CREATE TABLE babel_2170_vu_employees

diff --git a/test/JDBC/expected/BABEL-2170-vu-verify.out b/test/JDBC/expected/BABEL-2170-vu-verify.out
@@ -1,20 +1,20 @@
-USE db1_BABEL2170;
+USE babel_2170_db1;
 GO
 
 -- Instead of Insert Trigger on View 
 CREATE TRIGGER babel_2170_vu_employees_view_iot_insert ON babel_2170_vu_employees_view
 INSTEAD OF INSERT
 AS
 BEGIN
-    SELECT 'Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_insert Invoked'
+    SELECT 'Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_insert Invoked'
 END
 GO
 
 INSERT INTO babel_2170_vu_employees_view VALUES(3, 'adam', '1st Street', '3000');
 GO
 ~~START~~
 varchar
-Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_insert Invoked
+Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_insert Invoked
 ~~END~~
 
 ~~ROW COUNT: 1~~
@@ -41,15 +41,15 @@ CREATE TRIGGER babel_2170_vu_employees_view_iot_update ON babel_2170_vu_employee
 INSTEAD OF UPDATE
 AS
 BEGIN
-    SELECT 'Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_update Invoked'
+    SELECT 'Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_update Invoked'
 END
 GO
 
 UPDATE babel_2170_vu_employees_view SET MonthSalary = MonthSalary +1 WHERE EmployeeID = 2;
 GO
 ~~START~~
 varchar
-Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_update Invoked
+Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_update Invoked
 ~~END~~
 
 ~~ROW COUNT: 1~~
@@ -70,7 +70,7 @@ COMMIT TRANSACTION;
 GO
 ~~START~~
 varchar
-Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_update Invoked
+Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_update Invoked
 ~~END~~
 
 ~~ROW COUNT: 2~~
@@ -90,7 +90,7 @@ CREATE TRIGGER babel_2170_vu_employees_view_iot_delete ON babel_2170_vu_employee
 INSTEAD OF DELETE
 AS
 BEGIN
-    SELECT 'Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_delete Invoked'
+    SELECT 'Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_delete Invoked'
 END
 GO
 
@@ -100,7 +100,7 @@ COMMIT TRANSACTION;
 GO
 ~~START~~
 varchar
-Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_delete Invoked
+Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_delete Invoked
 ~~END~~
 
 ~~ROW COUNT: 2~~
@@ -174,7 +174,7 @@ CREATE TRIGGER babel_2170_vu_employees_view_iot_update ON babel_2170_vu_employee
 INSTEAD OF INSERT
 AS
 BEGIN
-    SELECT 'Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view2_iot_update Invoked'
+    SELECT 'Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_update Invoked'
 END
 GO
 ~~ERROR (Code: 33557097)~~
@@ -187,7 +187,7 @@ CREATE TRIGGER babel_2170_vu_employees_view_iot_update ON babel_2170_vu_employee
 INSTEAD OF INSERT
 AS
 BEGIN
-    SELECT 'Trigger db1_BABEL2170.dbo.babel_2170_vu_employees__table_iot_update Invoked'
+    SELECT 'Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_update Invoked'
 END
 GO
 ~~ERROR (Code: 33557097)~~
@@ -204,20 +204,20 @@ GO
 CREATE TRIGGER [schema_2170].[babel_2170_vu_employees_view_iot_update] ON [schema_2170].[babel_2170_vu_employees_view]
 INSTEAD OF UPDATE
 AS
-    SELECT 'Trigger db1_BABEL2170.schema_2170.babel_2170_vu_employees_view_iot_update Invoked'
+    SELECT 'Trigger babel_2170_db1.schema_2170.babel_2170_vu_employees_view_iot_update Invoked'
 GO
 
 CREATE TRIGGER [babel_2170_vu_employees_view_iot_update] ON [babel_2170_vu_employees_view]
 INSTEAD OF UPDATE
 AS
-    SELECT 'Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_update Invoked'
+    SELECT 'Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_update Invoked'
 GO
 
 UPDATE [schema_2170].[babel_2170_vu_employees_view] SET MonthSalary = MonthSalary +1 WHERE EmployeeID = 2;
 GO
 ~~START~~
 varchar
-Trigger db1_BABEL2170.schema_2170.babel_2170_vu_employees_view_iot_update Invoked
+Trigger babel_2170_db1.schema_2170.babel_2170_vu_employees_view_iot_update Invoked
 ~~END~~
 
 ~~ROW COUNT: 1~~
@@ -236,7 +236,7 @@ UPDATE [dbo].[babel_2170_vu_employees_view] SET MonthSalary = MonthSalary +1 WHE
 GO
 ~~START~~
 varchar
-Trigger db1_BABEL2170.dbo.babel_2170_vu_employees_view_iot_update Invoked
+Trigger babel_2170_db1.dbo.babel_2170_vu_employees_view_iot_update Invoked
 ~~END~~
 
 ~~ROW COUNT: 1~~
@@ -259,7 +259,7 @@ UPDATE [schema_2170].[babel_2170_vu_employees_view] SET MonthSalary = MonthSalar
 GO
 ~~START~~
 varchar
-Trigger db1_BABEL2170.schema_2170.babel_2170_vu_employees_view_iot_update Invoked
+Trigger babel_2170_db1.schema_2170.babel_2170_vu_employees_view_iot_update Invoked
 ~~END~~
 
 ~~ROW COUNT: 1~~
@@ -664,27 +664,10 @@ GO
 DROP TABLE IF EXISTS babel_2170_vu_employees_t2;
 GO
 
--- test multi-db mode
-SELECT set_config('role', 'jdbc_user', false);
+CREATE DATABASE babel_2170_db2;
 GO
-~~START~~
-text
-jdbc_user
-~~END~~
-
 
-SELECT set_config('babelfishpg_tsql.migration_mode', 'multi-db', false);
-GO
-~~START~~
-text
-multi-db
-~~END~~
-
-
-CREATE DATABASE db2_BABEL2170;
-GO
-
-USE db2_BABEL2170;
+USE babel_2170_db2;
 GO
 
 CREATE TABLE babel_2170_vu_employees
@@ -718,22 +701,22 @@ CREATE TRIGGER babel_2170_vu_employees_view_iot_insert ON babel_2170_vu_employee
 INSTEAD OF INSERT
 AS
 BEGIN
-    SELECT 'Trigger db2_BABEL2170.dbo.babel_2170_vu_employees_view_iot_insert Invoked'
+    SELECT 'Trigger babel_2170_db2.dbo.babel_2170_vu_employees_view_iot_insert Invoked'
 END
 GO
 
 -- should fire IOT trigger of second db
-INSERT INTO babel_2170_vu_employees_view VALUES(3, 'adam', '1st Street db2_BABEL2170', '3000');
+INSERT INTO babel_2170_vu_employees_view VALUES(3, 'adam', '1st Street babel_2170_db2', '3000');
 GO
 ~~START~~
 varchar
-Trigger db2_BABEL2170.dbo.babel_2170_vu_employees_view_iot_insert Invoked
+Trigger babel_2170_db2.dbo.babel_2170_vu_employees_view_iot_insert Invoked
 ~~END~~
 
 ~~ROW COUNT: 1~~
 
 
-SELECT EmployeeID, EmployeeName, EmployeeAddress, MonthSalary FROM babel_2170_vu_employees_view  ORDER BY EmployeeID;
+SELECT EmployeeID, EmployeeName, EmployeeAddress, MonthSalary FROM babel_2170_vu_employees_view ORDER BY EmployeeID;
 GO
 ~~START~~
 int#!#varchar#!#varchar#!#numeric
@@ -755,5 +738,5 @@ GO
 USE MASTER;
 GO
 
-DROP DATABASE IF EXISTS db2_BABEL2170;
+DROP DATABASE IF EXISTS babel_2170_db2;
 GO
diff --git a/test/JDBC/expected/BABEL-2170.out b/test/JDBC/expected/BABEL-2170.out
@@ -0,0 +1,126 @@
+CREATE TABLE babel_2170_employees
+(
+    EmployeeID      int NOT NULL,
+    EmployeeName    VARCHAR(50),
+    EmployeeAddress VARCHAR(50),
+    MonthSalary     NUMERIC(10, 2)
+)
+GO
+
+INSERT INTO babel_2170_employees VALUES(1, 'ash', '1st Street', '1000');
+INSERT INTO babel_2170_employees VALUES(2, 'bob', '1st Street', '2000');
+GO
+~~ROW COUNT: 1~~
+
+~~ROW COUNT: 1~~
+
+
+CREATE VIEW babel_2170_employees_view AS
+SELECT EmployeeID,
+       EmployeeName,
+       EmployeeAddress,
+       MonthSalary
+FROM babel_2170_employees;
+GO
+
+-- Instead of Insert Trigger on View 
+CREATE TRIGGER babel_2170_employees_view_iot_insert ON babel_2170_employees_view
+INSTEAD OF INSERT
+AS
+BEGIN
+    SELECT 'Trigger babel_2170_employees_view_iot_insert Invoked'
+END
+GO
+
+INSERT INTO babel_2170_employees_view VALUES(3, 'john', '1st Street', '3000');
+GO
+~~START~~
+varchar
+Trigger babel_2170_employees_view_iot_insert Invoked
+~~END~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT EmployeeID, EmployeeName, EmployeeAddress, MonthSalary FROM babel_2170_employees_view ORDER BY EmployeeID;
+GO
+~~START~~
+int#!#varchar#!#varchar#!#numeric
+1#!#ash#!#1st Street#!#1000.00
+2#!#bob#!#1st Street#!#2000.00
+~~END~~
+
+
+-- Instead of Update Trigger on View 
+CREATE TRIGGER babel_2170_employees_view_iot_update ON babel_2170_employees_view
+INSTEAD OF UPDATE
+AS
+BEGIN
+    SELECT 'Trigger babel_2170_employees_view_iot_update Invoked'
+END
+GO
+
+UPDATE babel_2170_employees_view SET MonthSalary = MonthSalary +1 WHERE EmployeeID = 2;
+GO
+~~START~~
+varchar
+Trigger babel_2170_employees_view_iot_update Invoked
+~~END~~
+
+~~ROW COUNT: 1~~
+
+
+SELECT EmployeeID, EmployeeName, EmployeeAddress, MonthSalary FROM babel_2170_employees_view ORDER BY EmployeeID;
+GO
+~~START~~
+int#!#varchar#!#varchar#!#numeric
+1#!#ash#!#1st Street#!#1000.00
+2#!#bob#!#1st Street#!#2000.00
+~~END~~
+
+
+
+-- Instead of Delete Trigger on View 
+CREATE TRIGGER babel_2170_employees_view_iot_delete ON babel_2170_employees_view
+INSTEAD OF DELETE
+AS
+BEGIN
+    SELECT 'Trigger babel_2170_employees_view_iot_delete Invoked'
+END
+GO
+
+BEGIN TRANSACTION
+    DELETE FROM babel_2170_employees_view WHERE EmployeeID IN (1, 2);
+COMMIT TRANSACTION;
+GO
+~~START~~
+varchar
+Trigger babel_2170_employees_view_iot_delete Invoked
+~~END~~
+
+~~ROW COUNT: 2~~
+
+
+SELECT EmployeeID, EmployeeName, EmployeeAddress, MonthSalary FROM babel_2170_employees_view ORDER BY EmployeeID;
+GO
+~~START~~
+int#!#varchar#!#varchar#!#numeric
+1#!#ash#!#1st Street#!#1000.00
+2#!#bob#!#1st Street#!#2000.00
+~~END~~
+
+
+DROP TRIGGER IF EXISTS babel_2170_employees_view_iot_insert;
+GO
+
+DROP TRIGGER IF EXISTS babel_2170_employees_view_iot_update;
+GO
+
+DROP TRIGGER IF EXISTS babel_2170_employees_view_iot_delete;
+GO
+
+DROP VIEW IF EXISTS babel_2170_employees_view;
+GO
+
+DROP TABLE IF EXISTS babel_2170_employees;
+GO
diff --git a/test/JDBC/input/triggers/BABEL-2170-vu-cleanup.sql b/test/JDBC/input/triggers/BABEL-2170-vu-cleanup.sql
@@ -1,5 +1,5 @@
 -- clean all objects in first database
-USE db1_BABEL2170;
+USE babel_2170_db1;
 GO
 
 DROP TRIGGER IF EXISTS babel_2170_vu_employees_view_iot_insert;
@@ -35,5 +35,5 @@ GO
 USE MASTER; 
 GO
 
-DROP DATABASE IF EXISTS db1_BABEL2170;
+DROP DATABASE IF EXISTS babel_2170_db1;
 GO
diff --git a/test/JDBC/input/triggers/BABEL-2170-vu-prepare.sql b/test/JDBC/input/triggers/BABEL-2170-vu-prepare.sql
@@ -1,8 +1,7 @@
--- We will create two databases db1_BABEL2170, db2_BABEL2170
-CREATE DATABASE db1_BABEL2170;
+CREATE DATABASE babel_2170_db1;
 GO
 
-USE db1_BABEL2170;
+USE babel_2170_db1;
 GO
 
 CREATE TABLE babel_2170_vu_employees