db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From be...@apache.org
Subject svn commit: r469102 [2/4] - in /db/derby/code/trunk/java: demo/toursdb/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/j...
Date Mon, 30 Oct 2006 09:34:11 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out Mon Oct 30 01:34:06 2006
@@ -233,9 +233,9 @@
 ij(SWIPERCONNECTION)> -- Some TRIGGER privilege checks. See GrantRevoke.java for more tests
 set connection swiperConnection;
 ij(SWIPERCONNECTION)> -- Should fail
-create trigger trig_sat1 after update on satheesh.tsat for each statement mode db2sql values 1;
+create trigger trig_sat1 after update on satheesh.tsat for each statement values 1;
 ERROR 28506: User 'SWIPER' does not have trigger permission on table 'SATHEESH'.'TSAT'.
-ij(SWIPERCONNECTION)> create trigger trig_sat2 no cascade before delete on satheesh.tsat for each statement mode db2sql values 1;
+ij(SWIPERCONNECTION)> create trigger trig_sat2 no cascade before delete on satheesh.tsat for each statement values 1;
 ERROR 28506: User 'SWIPER' does not have trigger permission on table 'SATHEESH'.'TSAT'.
 ij(SWIPERCONNECTION)> -- Grant trigger privilege
 set connection satConnection;
@@ -243,9 +243,9 @@
 0 rows inserted/updated/deleted
 ij(SATCONNECTION)> -- Try now
 set connection swiperConnection;
-ij(SWIPERCONNECTION)> create trigger trig_sat1 after update on satheesh.tsat for each statement mode db2sql values 1;
+ij(SWIPERCONNECTION)> create trigger trig_sat1 after update on satheesh.tsat for each statement values 1;
 0 rows inserted/updated/deleted
-ij(SWIPERCONNECTION)> create trigger trig_sat2 no cascade before delete on satheesh.tsat for each statement mode db2sql values 1;
+ij(SWIPERCONNECTION)> create trigger trig_sat2 no cascade before delete on satheesh.tsat for each statement values 1;
 0 rows inserted/updated/deleted
 ij(SWIPERCONNECTION)> drop trigger trig_sat1;
 0 rows inserted/updated/deleted
@@ -256,18 +256,18 @@
 ij(SATCONNECTION)> revoke trigger on tsat from swiper;
 0 rows inserted/updated/deleted
 ij(SATCONNECTION)> set connection swiperConnection;
-ij(SWIPERCONNECTION)> create trigger trig_sat1 after update on satheesh.tsat for each statement mode db2sql values 1;
+ij(SWIPERCONNECTION)> create trigger trig_sat1 after update on satheesh.tsat for each statement values 1;
 ERROR 28506: User 'SWIPER' does not have trigger permission on table 'SATHEESH'.'TSAT'.
-ij(SWIPERCONNECTION)> create trigger trig_sat2 no cascade before delete on satheesh.tsat for each statement mode db2sql values 1;
+ij(SWIPERCONNECTION)> create trigger trig_sat2 no cascade before delete on satheesh.tsat for each statement values 1;
 ERROR 28506: User 'SWIPER' does not have trigger permission on table 'SATHEESH'.'TSAT'.
 ij(SWIPERCONNECTION)> -- Now grant access to public and try again
 set connection satConnection;
 ij(SATCONNECTION)> grant trigger on tsat to public;
 0 rows inserted/updated/deleted
 ij(SATCONNECTION)> set connection swiperConnection;
-ij(SWIPERCONNECTION)> create trigger trig_sat1 after update on satheesh.tsat for each statement mode db2sql values 1;
+ij(SWIPERCONNECTION)> create trigger trig_sat1 after update on satheesh.tsat for each statement values 1;
 0 rows inserted/updated/deleted
-ij(SWIPERCONNECTION)> create trigger trig_sat2 no cascade before delete on satheesh.tsat for each statement mode db2sql values 1;
+ij(SWIPERCONNECTION)> create trigger trig_sat2 no cascade before delete on satheesh.tsat for each statement values 1;
 0 rows inserted/updated/deleted
 ij(SWIPERCONNECTION)> drop trigger trig_sat1;
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/grantRevokeDDL2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/grantRevokeDDL2.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/grantRevokeDDL2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/grantRevokeDDL2.out Mon Oct 30 01:34:06 2006
@@ -112,7 +112,7 @@
 0 rows inserted/updated/deleted
 ij(USER1)> -- tests
 create trigger grant_select_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call grant_select_proc1();
+	for each STATEMENT call grant_select_proc1();
 0 rows inserted/updated/deleted
 ij(USER1)> -- should fail
 delete from t1 where i = 1;
@@ -131,7 +131,7 @@
 ERROR: Failed with SQLSTATE 28508
 ij(USER2)> set connection user1;
 ij(USER1)> create trigger grant_select_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call grant_select_proc2();
+	for each STATEMENT call grant_select_proc2();
 0 rows inserted/updated/deleted
 ij(USER1)> -- should fail
 delete from t1 where i = 2;
@@ -150,7 +150,7 @@
 ERROR: Failed with SQLSTATE 28508
 ij(USER2)> set connection user1;
 ij(USER1)> create trigger grant_select_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call grant_select_proc3();
+	for each STATEMENT call grant_select_proc3();
 0 rows inserted/updated/deleted
 ij(USER1)> -- should fail
 delete from t1 where i = 3;
@@ -169,7 +169,7 @@
 ERROR: Failed with SQLSTATE 28508
 ij(USER2)> set connection user1;
 ij(USER1)> create trigger grant_select_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call grant_select_proc4();
+	for each STATEMENT call grant_select_proc4();
 0 rows inserted/updated/deleted
 ij(USER1)> -- ok
 delete from t1 where i = 4;
@@ -190,7 +190,7 @@
 1 row selected
 ij(USER2)> set connection user1;
 ij(USER1)> create trigger revoke_select_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call revoke_select_proc1();
+	for each STATEMENT call revoke_select_proc1();
 0 rows inserted/updated/deleted
 ij(USER1)> -- should fail
 delete from t1 where i = 5;
@@ -212,7 +212,7 @@
 1 row selected
 ij(USER2)> set connection user1;
 ij(USER1)> create trigger revoke_select_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call revoke_select_proc2();
+	for each STATEMENT call revoke_select_proc2();
 0 rows inserted/updated/deleted
 ij(USER1)> -- should fail
 delete from t1 where i = 6;
@@ -234,7 +234,7 @@
 1 row selected
 ij(USER2)> set connection user1;
 ij(USER1)> create trigger revoke_select_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call revoke_select_proc3();
+	for each STATEMENT call revoke_select_proc3();
 0 rows inserted/updated/deleted
 ij(USER1)> -- should fail
 delete from t1 where i = 7;
@@ -256,7 +256,7 @@
 1 row selected
 ij(USER2)> set connection user1;
 ij(USER1)> create trigger revoke_select_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call revoke_select_proc4();
+	for each STATEMENT call revoke_select_proc4();
 0 rows inserted/updated/deleted
 ij(USER1)> -- ok
 delete from t1 where i = 8;
@@ -353,7 +353,7 @@
 create table t2 (c1 int primary key not null, c2 int references user1.t1);
 ERROR: Failed with SQLSTATE 28508
 ij(USER2)> -- test TRIGGER privilege, expect error
-create trigger trigger1 after update on user1.t1 for each statement mode db2sql values integer('123');
+create trigger trigger1 after update on user1.t1 for each statement values integer('123');
 ERROR: Failed with SQLSTATE 28506
 ij(USER2)> -- try to DROP user1.idx1 index, expect error
 drop index user1.idx1;
@@ -1709,10 +1709,10 @@
 -- -------------------------------------------------------------------
 set connection user1;
 ij(USER1)> -- expect error
-create trigger tt0a after insert on t1 for each statement mode db2sql grant select on t1 to user2;
+create trigger tt0a after insert on t1 for each statement grant select on t1 to user2;
 ERROR: Failed with SQLSTATE 42X01
 ij(USER1)> -- expect error
-create trigger tt0b after insert on t1 for each statement mode db2sql revoke select on t1 from user2;
+create trigger tt0b after insert on t1 for each statement revoke select on t1 from user2;
 ERROR: Failed with SQLSTATE 42X01
 ij(USER1)> -- same schema in trigger action
 drop table t6;
@@ -1728,9 +1728,9 @@
 0 rows inserted/updated/deleted
 ij(USER2)> insert into t7 values (1,1,1);
 1 row inserted/updated/deleted
-ij(USER2)> create trigger tt1 after insert on user1.t6 for each statement mode db2sql update user2.t7 set c2 = 888;
+ij(USER2)> create trigger tt1 after insert on user1.t6 for each statement update user2.t7 set c2 = 888;
 0 rows inserted/updated/deleted
-ij(USER2)> create trigger tt2 after insert on user1.t6 for each statement mode db2sql insert into user2.t7 values (2,2,2);
+ij(USER2)> create trigger tt2 after insert on user1.t6 for each statement insert into user2.t7 values (2,2,2);
 0 rows inserted/updated/deleted
 ij(USER2)> set connection user1;
 ij(USER1)> insert into t6 values (1, 10);
@@ -1761,9 +1761,9 @@
 ij(USER1)> grant update(c2, c1), insert on t9 to user2;
 0 rows inserted/updated/deleted
 ij(USER1)> set connection user2;
-ij(USER2)> create trigger tt3 after insert on user1.t8 for each statement mode db2sql update user1.t9 set c2 = 888;
+ij(USER2)> create trigger tt3 after insert on user1.t8 for each statement update user1.t9 set c2 = 888;
 0 rows inserted/updated/deleted
-ij(USER2)> create trigger tt4 after insert on user1.t8 for each statement mode db2sql insert into user1.t9 values (2,2,2);
+ij(USER2)> create trigger tt4 after insert on user1.t8 for each statement insert into user1.t9 values (2,2,2);
 0 rows inserted/updated/deleted
 ij(USER2)> set connection user1;
 ij(USER1)> -- expect error
@@ -1795,11 +1795,11 @@
 0 rows inserted/updated/deleted
 ij(USER1)> set connection user2;
 ij(USER2)> -- ok
-create trigger tt5 after update on user1.t10 for each statement mode db2sql insert into user1.t11 values 1;
+create trigger tt5 after update on user1.t10 for each statement insert into user1.t11 values 1;
 0 rows inserted/updated/deleted
-ij(USER2)> create trigger tt6 after update of i on user1.t10 for each statement mode db2sql insert into user1.t11 values 2;
+ij(USER2)> create trigger tt6 after update of i on user1.t10 for each statement insert into user1.t11 values 2;
 0 rows inserted/updated/deleted
-ij(USER2)> create trigger tt7 after update of j on user1.t10 for each statement mode db2sql insert into user1.t11 values 3;
+ij(USER2)> create trigger tt7 after update of j on user1.t10 for each statement insert into user1.t11 values 3;
 0 rows inserted/updated/deleted
 ij(USER2)> update user1.t10 set i=10;
 2 rows inserted/updated/deleted
@@ -1838,7 +1838,7 @@
 ij(USER1)> grant trigger on t10 to user2;
 0 rows inserted/updated/deleted
 ij(USER1)> set connection user2;
-ij(USER2)> create trigger tt8 after update of j on user1.t10 for each statement mode db2sql delete from user1.t11;
+ij(USER2)> create trigger tt8 after update of j on user1.t10 for each statement delete from user1.t11;
 0 rows inserted/updated/deleted
 ij(USER2)> update user1.t10 set j=100;
 2 rows inserted/updated/deleted
@@ -1879,9 +1879,9 @@
 ij(USER1)> grant select on v to user5;
 0 rows inserted/updated/deleted
 ij(USER1)> set connection user5;
-ij(USER5)> create trigger tt9 after insert on user1.t10 for each statement mode db2sql insert into user1.t11 values (user1.F_ABS1(-5));
+ij(USER5)> create trigger tt9 after insert on user1.t10 for each statement insert into user1.t11 values (user1.F_ABS1(-5));
 0 rows inserted/updated/deleted
-ij(USER5)> create trigger tt10 after insert on user1.t10 for each statement mode db2sql insert into user1.t11 select * from user1.v;
+ij(USER5)> create trigger tt10 after insert on user1.t10 for each statement insert into user1.t11 select * from user1.v;
 0 rows inserted/updated/deleted
 ij(USER5)> insert into user1.t10 values (1,1);
 1 row inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/procedureInTrigger.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/procedureInTrigger.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/procedureInTrigger.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/procedureInTrigger.out Mon Oct 30 01:34:06 2006
@@ -134,7 +134,7 @@
 0 rows inserted/updated/deleted
 ij> --- tests
 create trigger after_stmt_trig_no_sql AFTER insert on t2 
-	for each STATEMENT mode db2sql call proc_no_sql();
+	for each STATEMENT call proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -172,7 +172,7 @@
 2          |4          
 3          |6          
 ij> create trigger after_row_trig_no_sql AFTER delete on t2 
-	for each ROW mode db2sql call proc_no_sql();
+	for each ROW call proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- delete all rows. check that trigger is fired - procedure should be called 2 times
 delete from t2;
@@ -189,7 +189,7 @@
 ij> drop trigger after_row_trig_no_sql;
 0 rows inserted/updated/deleted
 ij> create trigger before_stmt_trig_no_sql no cascade BEFORE insert on t2 
-	for each STATEMENT mode db2sql call proc_no_sql();
+	for each STATEMENT call proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -227,7 +227,7 @@
 2          |4          
 3          |6          
 ij> create trigger before_row_trig_no_sql no cascade BEFORE delete on t2 
-	for each ROW mode db2sql call proc_no_sql();
+	for each ROW call proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- delete and check trigger fired. procedure called twice
 delete from t2;
@@ -246,7 +246,7 @@
 ij> insert into t2 values (1,2), (2,4);
 2 rows inserted/updated/deleted
 ij> create trigger after_row_trig_contains_sql AFTER update on t2 
-	for each ROW mode db2sql call proc_contains_sql();
+	for each ROW call proc_contains_sql();
 0 rows inserted/updated/deleted
 ij> --- update 2 rows. check that trigger is fired - procedure should be called twice
 update t2 set x=x*2;
@@ -260,7 +260,7 @@
 2          |2          
 4          |4          
 ij> create trigger before_stmt_trig_contains_sql no cascade BEFORE delete on t2 
-	for each STATEMENT mode db2sql call proc_contains_sql();
+	for each STATEMENT call proc_contains_sql();
 0 rows inserted/updated/deleted
 ij> --- delete 2 rows. check that trigger is fired - procedure should be called once
 delete from t2;
@@ -278,7 +278,7 @@
 insert into t1 values (1, 'one');
 1 row inserted/updated/deleted
 ij> create trigger after_stmt_trig_reads_sql AFTER insert on t2 
-	for each STATEMENT mode db2sql call proc_reads_sql(1);
+	for each STATEMENT call proc_reads_sql(1);
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -293,7 +293,7 @@
 ij> drop trigger after_stmt_trig_reads_sql;
 0 rows inserted/updated/deleted
 ij> create trigger before_row_trig_reads_sql no cascade BEFORE delete on t2 
-	for each ROW mode db2sql call proc_reads_sql(1);
+	for each ROW call proc_reads_sql(1);
 0 rows inserted/updated/deleted
 ij> --- delete 2 rows. check that trigger is fired - procedure should be called twice
 delete from t2;
@@ -310,7 +310,7 @@
 delete from t1;
 1 row inserted/updated/deleted
 ij> create trigger after_stmt_trig_modifies_sql_insert_op AFTER insert on t2 
-	for each STATEMENT mode db2sql call proc_modifies_sql_insert_op(1, 'one');
+	for each STATEMENT call proc_modifies_sql_insert_op(1, 'one');
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows
 insert into t2 values (1,2), (2,4);
@@ -327,7 +327,7 @@
 1          |2          
 2          |4          
 ij> create trigger after_row_trig_modifies_sql_update_op AFTER update of x on t2 
-	for each ROW mode db2sql call proc_modifies_sql_update_op(2);
+	for each ROW call proc_modifies_sql_update_op(2);
 0 rows inserted/updated/deleted
 ij> --- update all rows
 update t2 set x=x*2;
@@ -344,7 +344,7 @@
 2          |2          
 4          |4          
 ij> create trigger after_stmt_trig_modifies_sql_delete_op AFTER delete on t2 
-	for each STATEMENT mode db2sql call proc_modifies_sql_delete_op(5);
+	for each STATEMENT call proc_modifies_sql_delete_op(5);
 0 rows inserted/updated/deleted
 ij> --- delete from t2
 delete from t2;
@@ -365,7 +365,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger refer_new_row_trig AFTER insert on t2 
 	REFERENCING NEW as new
-	for each ROW mode db2sql call proc_modifies_sql_insert_op(new.x, 'new');
+	for each ROW call proc_modifies_sql_insert_op(new.x, 'new');
 0 rows inserted/updated/deleted
 ij> --- insert a row
 insert into t2 values (25, 50);
@@ -382,7 +382,7 @@
 25         |50         
 ij> create trigger refer_old_row_trig AFTER delete on t2 
 	REFERENCING OLD as old
-	for each ROW mode db2sql call proc_modifies_sql_delete_op(old.x);
+	for each ROW call proc_modifies_sql_delete_op(old.x);
 0 rows inserted/updated/deleted
 ij> --- delete a row
 delete from t2 where x=25;
@@ -402,12 +402,12 @@
 ij> --- create a before trigger that calls a procedure that modifies sql data. 
 --- trigger creation should fail
 create trigger before_trig_modifies_sql no cascade BEFORE insert on t2 
-	for each STATEMENT mode db2sql call proc_modifies_sql_insert_op(1, 'one');
+	for each STATEMENT call proc_modifies_sql_insert_op(1, 'one');
 ERROR 42Z9D: Procedures that modify SQL data are not allowed in BEFORE triggers.
 ij> --- in a BEFORE trigger, call a procedure which actually modifies SQL data	
 --- trigger creation will pass but firing should fail
 create trigger bad_before_trig no cascade BEFORE insert on t2 
-	for each STATEMENT mode db2sql call proc_wrongly_defined_as_no_sql(50, 'fifty');
+	for each STATEMENT call proc_wrongly_defined_as_no_sql(50, 'fifty');
 0 rows inserted/updated/deleted
 ij> --- try to insert 2 rows
 --- Bug DERBY-1629 -- in JDK 1.6 you only get 38001, not 38000
@@ -425,7 +425,7 @@
 0 rows inserted/updated/deleted
 ij> --- procedures which insert/update/delete into trigger table
 create trigger insert_trig AFTER update on t1 
-	for each STATEMENT mode db2sql call proc_modifies_sql_insert_op(1, 'one');
+	for each STATEMENT call proc_modifies_sql_insert_op(1, 'one');
 0 rows inserted/updated/deleted
 ij> insert into t1 values(2, 'two');
 1 row inserted/updated/deleted
@@ -451,7 +451,7 @@
 ij> drop trigger insert_trig;
 0 rows inserted/updated/deleted
 ij> create trigger update_trig AFTER insert on t1 
-	for each STATEMENT mode db2sql call proc_modifies_sql_update_op(2);
+	for each STATEMENT call proc_modifies_sql_update_op(2);
 0 rows inserted/updated/deleted
 ij> insert into t1 values (4,'four');
 1 row inserted/updated/deleted
@@ -465,7 +465,7 @@
 ij> drop trigger update_trig;
 0 rows inserted/updated/deleted
 ij> create trigger delete_trig AFTER insert on t1 
-	for each STATEMENT mode db2sql call proc_modifies_sql_delete_op(3);
+	for each STATEMENT call proc_modifies_sql_delete_op(3);
 0 rows inserted/updated/deleted
 ij> insert into t1 values (8,'eight');
 1 row inserted/updated/deleted
@@ -480,7 +480,7 @@
 0 rows inserted/updated/deleted
 ij> --- Procedures with schema name
 create trigger call_proc_in_default_schema AFTER insert on t2 
-	for each STATEMENT mode db2sql call APP.proc_no_sql();
+	for each STATEMENT call APP.proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -495,7 +495,7 @@
 ij> drop trigger call_proc_in_default_schema;
 0 rows inserted/updated/deleted
 ij> create trigger call_proc_in_default_schema no cascade BEFORE delete on t2 
-	for each ROW mode db2sql call APP.proc_no_sql();
+	for each ROW call APP.proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- delete 2 rows. check that trigger is fired - procedure should be called twice
 delete from t2;
@@ -509,7 +509,7 @@
 ij> drop trigger call_proc_in_default_schema;
 0 rows inserted/updated/deleted
 ij> create trigger call_proc_in_new_schema no cascade BEFORE insert on t2 
-	for each STATEMENT mode db2sql call new_schema.proc_in_new_schema();
+	for each STATEMENT call new_schema.proc_in_new_schema();
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -524,7 +524,7 @@
 ij> drop trigger call_proc_in_new_schema;
 0 rows inserted/updated/deleted
 ij> create trigger call_proc_in_new_schema AFTER delete on t2 
-	for each ROW mode db2sql call new_schema.proc_in_new_schema();
+	for each ROW call new_schema.proc_in_new_schema();
 0 rows inserted/updated/deleted
 ij> --- delete 2 rows. check that trigger is fired - procedure should be called twice
 delete from t2;
@@ -539,56 +539,56 @@
 0 rows inserted/updated/deleted
 ij> --- non-existent procedure
 create trigger call_non_existent_proc1 AFTER insert on t2 
-	for each ROW mode db2sql call non_existent_proc();
+	for each ROW call non_existent_proc();
 ERROR 42Y03: 'NON_EXISTENT_PROC' is not recognized as a function or procedure.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_NON_EXISTENT_PROC1';
 1          
 -----------
 0          
 ij> create trigger call_proc_with_non_existent_proc2 AFTER insert on t2 
-	for each ROW mode db2sql call new_schema.non_existent_proc();
+	for each ROW call new_schema.non_existent_proc();
 ERROR 42Y03: 'NEW_SCHEMA.NON_EXISTENT_PROC' is not recognized as a function or procedure.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_NON_EXISTENT_PROC2';
 1          
 -----------
 0          
 ij> create trigger call_proc_in_non_existent_schema AFTER insert on t2 
-	for each ROW mode db2sql call non_existent_schema.non_existent_proc();
+	for each ROW call non_existent_schema.non_existent_proc();
 ERROR 42Y07: Schema 'NON_EXISTENT_SCHEMA' does not exist
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_PROC_IN_NON_EXISTENT_SCHEMA';
 1          
 -----------
 0          
 ij> create trigger call_proc_using_non_existent_method AFTER insert on t2 
-	for each ROW mode db2sql call proc_using_non_existent_method();
+	for each ROW call proc_using_non_existent_method();
 ERROR 42X50: No method was found that matched the method call org.apache.derbyTesting.functionTests.util.ProcedureTest.nonexistentMethod(), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_PROC_WITH_NON_EXISTENT_METHOD';
 1          
 -----------
 0          
 ij> create trigger call_non_existent_proc1 no cascade BEFORE insert on t2 
-	for each ROW mode db2sql call non_existent_proc();
+	for each ROW call non_existent_proc();
 ERROR 42Y03: 'NON_EXISTENT_PROC' is not recognized as a function or procedure.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_NON_EXISTENT_PROC1';
 1          
 -----------
 0          
 ij> create trigger call_proc_with_non_existent_proc2 no cascade BEFORE insert on t2 
-	for each ROW mode db2sql call new_schema.non_existent_proc();
+	for each ROW call new_schema.non_existent_proc();
 ERROR 42Y03: 'NEW_SCHEMA.NON_EXISTENT_PROC' is not recognized as a function or procedure.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_NON_EXISTENT_PROC2';
 1          
 -----------
 0          
 ij> create trigger call_proc_in_non_existent_schema no cascade BEFORE insert on t2 
-	for each ROW mode db2sql call non_existent_schema.non_existent_proc();
+	for each ROW call non_existent_schema.non_existent_proc();
 ERROR 42Y07: Schema 'NON_EXISTENT_SCHEMA' does not exist
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_PROC_IN_NON_EXISTENT_SCHEMA';
 1          
 -----------
 0          
 ij> create trigger call_proc_using_non_existent_method no cascade BEFORE insert on t2 
-	for each ROW mode db2sql call proc_using_non_existent_method();
+	for each ROW call proc_using_non_existent_method();
 ERROR 42X50: No method was found that matched the method call org.apache.derbyTesting.functionTests.util.ProcedureTest.nonexistentMethod(), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_PROC_WITH_NON_EXISTENT_METHOD';
 1          
@@ -596,14 +596,14 @@
 0          
 ij> --- triggers must not allow dynamic parameters (?)
 create trigger update_trig AFTER insert on t1 
-	for each STATEMENT mode db2sql call proc_modifies_sql_update_op(?);
+	for each STATEMENT call proc_modifies_sql_update_op(?);
 ERROR 42Y27: Parameters are not allowed in the trigger action.
 ij> --- insert some rows into t2
 insert into t2 values (1,2), (2,4);
 2 rows inserted/updated/deleted
 ij> --- use procedure with commit
 create trigger commit_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call commit_proc();
+	for each STATEMENT call commit_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -618,7 +618,7 @@
 ij> drop trigger commit_trig;
 0 rows inserted/updated/deleted
 ij> create trigger commit_trig no cascade BEFORE delete on t2 
-	for each STATEMENT mode db2sql call commit_proc();
+	for each STATEMENT call commit_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -634,7 +634,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedure with rollback
 create trigger rollback_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call rollback_proc();
+	for each STATEMENT call rollback_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -649,7 +649,7 @@
 ij> drop trigger rollback_trig;
 0 rows inserted/updated/deleted
 ij> create trigger rollback_trig no cascade BEFORE delete on t2 
-	for each STATEMENT mode db2sql call rollback_proc();
+	for each STATEMENT call rollback_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -665,7 +665,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedure which changes isolation level
 create trigger set_isolation_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call set_isolation_proc();
+	for each STATEMENT call set_isolation_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -680,7 +680,7 @@
 ij> drop trigger set_isolation_trig;
 0 rows inserted/updated/deleted
 ij> create trigger set_isolation_trig no cascade BEFORE delete on t2 
-	for each STATEMENT mode db2sql call set_isolation_proc();
+	for each STATEMENT call set_isolation_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -696,7 +696,7 @@
 0 rows inserted/updated/deleted
 ij> --- call procedure that selects from same trigger table
 create trigger select_from_trig_table AFTER insert on t1
-	for each STATEMENT mode db2sql call proc_reads_sql(1);
+	for each STATEMENT call proc_reads_sql(1);
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t1 values (10, 'ten');
@@ -713,7 +713,7 @@
 ij> drop trigger select_from_trig_table;
 0 rows inserted/updated/deleted
 ij> create trigger select_from_trig_table no cascade before delete on t1
-	for each STATEMENT mode db2sql call proc_reads_sql(1);
+	for each STATEMENT call proc_reads_sql(1);
 0 rows inserted/updated/deleted
 ij> --- delete a row. check that trigger is fired - procedure should be called once
 delete from t1 where i=10;
@@ -730,7 +730,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedures which alter/drop trigger table and some other table
 create trigger alter_table_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call alter_table_proc();
+	for each STATEMENT call alter_table_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;
@@ -746,7 +746,7 @@
 ij> drop trigger alter_table_trig;
 0 rows inserted/updated/deleted
 ij> create trigger drop_table_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call drop_table_proc();
+	for each STATEMENT call drop_table_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
@@ -762,7 +762,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedures which create/drop trigger on trigger table and some other table
 create trigger create_trigger_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call create_trigger_proc();
+	for each STATEMENT call create_trigger_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;
@@ -783,10 +783,10 @@
 ij> drop trigger create_trigger_trig;
 0 rows inserted/updated/deleted
 ij> --- create a trigger to test we cannot drop it from a procedure called by a trigger
-create trigger test_trig AFTER delete on t1 for each STATEMENT mode db2sql insert into  t1 values(20, 'twenty');
+create trigger test_trig AFTER delete on t1 for each STATEMENT insert into  t1 values(20, 'twenty');
 0 rows inserted/updated/deleted
 ij> create trigger drop_trigger_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call drop_trigger_proc();
+	for each STATEMENT call drop_trigger_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
@@ -807,7 +807,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedures which create/drop index on trigger table and some other table
 create trigger create_index_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call create_index_proc();
+	for each STATEMENT call create_index_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
@@ -830,7 +830,7 @@
 create index ix on t1(i,b);
 0 rows inserted/updated/deleted
 ij> create trigger drop_index_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call drop_index_proc();
+	for each STATEMENT call drop_index_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out Mon Oct 30 01:34:06 2006
@@ -215,9 +215,9 @@
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij> commit;
 ij> -- create some triggers.
-create trigger update_of_t after update on t for each row mode db2sql values 2;
+create trigger update_of_t after update on t for each row values 2;
 0 rows inserted/updated/deleted
-ij> create trigger insert_of_t after insert on t for each row mode db2sql values 3;
+ij> create trigger insert_of_t after insert on t for each row values 3;
 0 rows inserted/updated/deleted
 ij> commit;
 ij> -- t has (1,1) (2,1) (3,2)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/predicatesIntoViews.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/predicatesIntoViews.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/predicatesIntoViews.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/predicatesIntoViews.out Mon Oct 30 01:34:06 2006
@@ -2931,12 +2931,12 @@
 0 rows inserted/updated/deleted
 ij> create trigger xr.be_uname_i after insert on xr.businessentity
 referencing new as n
-for each row mode db2sql
+for each row
 update xr.businessentity set uname = upper( n.name ) where name = n.name;
 0 rows inserted/updated/deleted
 ij> create trigger xr.be_unane_u after update of name, uname on xr.businessentity
 referencing new as n
-for each row mode db2sql
+for each row
 update xr.businessentity set uname = upper( n.name )
   where name = n.name and uname <> upper( n.name );
 0 rows inserted/updated/deleted
@@ -3059,12 +3059,12 @@
 0 rows inserted/updated/deleted
 ij> create trigger xr.rov_uname_i after insert on xr.repositoryobjectversion
 referencing new as n
-for each row mode db2sql
+for each row
 update xr.repositoryobjectversion set uname = upper( n.name ) where name = n.name;
 0 rows inserted/updated/deleted
 ij> create trigger xr.rov_unane_u after update of name, uname on xr.repositoryobjectversion
 referencing new as n
-for each row mode db2sql
+for each row
 update xr.repositoryobjectversion set uname = upper( n.name )
   where name = n.name and uname <> upper( n.name );
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out Mon Oct 30 01:34:06 2006
@@ -134,7 +134,7 @@
 0 rows inserted/updated/deleted
 ij> --- tests
 create trigger after_stmt_trig_no_sql AFTER insert on t2 
-	for each STATEMENT mode db2sql call proc_no_sql();
+	for each STATEMENT call proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -172,7 +172,7 @@
 2          |4          
 3          |6          
 ij> create trigger after_row_trig_no_sql AFTER delete on t2 
-	for each ROW mode db2sql call proc_no_sql();
+	for each ROW call proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- delete all rows. check that trigger is fired - procedure should be called 2 times
 delete from t2;
@@ -189,7 +189,7 @@
 ij> drop trigger after_row_trig_no_sql;
 0 rows inserted/updated/deleted
 ij> create trigger before_stmt_trig_no_sql no cascade BEFORE insert on t2 
-	for each STATEMENT mode db2sql call proc_no_sql();
+	for each STATEMENT call proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -227,7 +227,7 @@
 2          |4          
 3          |6          
 ij> create trigger before_row_trig_no_sql no cascade BEFORE delete on t2 
-	for each ROW mode db2sql call proc_no_sql();
+	for each ROW call proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- delete and check trigger fired. procedure called twice
 delete from t2;
@@ -246,7 +246,7 @@
 ij> insert into t2 values (1,2), (2,4);
 2 rows inserted/updated/deleted
 ij> create trigger after_row_trig_contains_sql AFTER update on t2 
-	for each ROW mode db2sql call proc_contains_sql();
+	for each ROW call proc_contains_sql();
 0 rows inserted/updated/deleted
 ij> --- update 2 rows. check that trigger is fired - procedure should be called twice
 update t2 set x=x*2;
@@ -260,7 +260,7 @@
 2          |2          
 4          |4          
 ij> create trigger before_stmt_trig_contains_sql no cascade BEFORE delete on t2 
-	for each STATEMENT mode db2sql call proc_contains_sql();
+	for each STATEMENT call proc_contains_sql();
 0 rows inserted/updated/deleted
 ij> --- delete 2 rows. check that trigger is fired - procedure should be called once
 delete from t2;
@@ -278,7 +278,7 @@
 insert into t1 values (1, 'one');
 1 row inserted/updated/deleted
 ij> create trigger after_stmt_trig_reads_sql AFTER insert on t2 
-	for each STATEMENT mode db2sql call proc_reads_sql(1);
+	for each STATEMENT call proc_reads_sql(1);
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -293,7 +293,7 @@
 ij> drop trigger after_stmt_trig_reads_sql;
 0 rows inserted/updated/deleted
 ij> create trigger before_row_trig_reads_sql no cascade BEFORE delete on t2 
-	for each ROW mode db2sql call proc_reads_sql(1);
+	for each ROW call proc_reads_sql(1);
 0 rows inserted/updated/deleted
 ij> --- delete 2 rows. check that trigger is fired - procedure should be called twice
 delete from t2;
@@ -310,7 +310,7 @@
 delete from t1;
 1 row inserted/updated/deleted
 ij> create trigger after_stmt_trig_modifies_sql_insert_op AFTER insert on t2 
-	for each STATEMENT mode db2sql call proc_modifies_sql_insert_op(1, 'one');
+	for each STATEMENT call proc_modifies_sql_insert_op(1, 'one');
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows
 insert into t2 values (1,2), (2,4);
@@ -327,7 +327,7 @@
 1          |2          
 2          |4          
 ij> create trigger after_row_trig_modifies_sql_update_op AFTER update of x on t2 
-	for each ROW mode db2sql call proc_modifies_sql_update_op(2);
+	for each ROW call proc_modifies_sql_update_op(2);
 0 rows inserted/updated/deleted
 ij> --- update all rows
 update t2 set x=x*2;
@@ -344,7 +344,7 @@
 2          |2          
 4          |4          
 ij> create trigger after_stmt_trig_modifies_sql_delete_op AFTER delete on t2 
-	for each STATEMENT mode db2sql call proc_modifies_sql_delete_op(5);
+	for each STATEMENT call proc_modifies_sql_delete_op(5);
 0 rows inserted/updated/deleted
 ij> --- delete from t2
 delete from t2;
@@ -365,7 +365,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger refer_new_row_trig AFTER insert on t2 
 	REFERENCING NEW as new
-	for each ROW mode db2sql call proc_modifies_sql_insert_op(new.x, 'new');
+	for each ROW call proc_modifies_sql_insert_op(new.x, 'new');
 0 rows inserted/updated/deleted
 ij> --- insert a row
 insert into t2 values (25, 50);
@@ -382,7 +382,7 @@
 25         |50         
 ij> create trigger refer_old_row_trig AFTER delete on t2 
 	REFERENCING OLD as old
-	for each ROW mode db2sql call proc_modifies_sql_delete_op(old.x);
+	for each ROW call proc_modifies_sql_delete_op(old.x);
 0 rows inserted/updated/deleted
 ij> --- delete a row
 delete from t2 where x=25;
@@ -402,12 +402,12 @@
 ij> --- create a before trigger that calls a procedure that modifies sql data. 
 --- trigger creation should fail
 create trigger before_trig_modifies_sql no cascade BEFORE insert on t2 
-	for each STATEMENT mode db2sql call proc_modifies_sql_insert_op(1, 'one');
+	for each STATEMENT call proc_modifies_sql_insert_op(1, 'one');
 ERROR 42Z9D: Procedures that modify SQL data are not allowed in BEFORE triggers.
 ij> --- in a BEFORE trigger, call a procedure which actually modifies SQL data	
 --- trigger creation will pass but firing should fail
 create trigger bad_before_trig no cascade BEFORE insert on t2 
-	for each STATEMENT mode db2sql call proc_wrongly_defined_as_no_sql(50, 'fifty');
+	for each STATEMENT call proc_wrongly_defined_as_no_sql(50, 'fifty');
 0 rows inserted/updated/deleted
 ij> --- try to insert 2 rows
 --- Bug DERBY-1629 -- in JDK 1.6 you only get 38001, not 38000
@@ -426,7 +426,7 @@
 0 rows inserted/updated/deleted
 ij> --- procedures which insert/update/delete into trigger table
 create trigger insert_trig AFTER update on t1 
-	for each STATEMENT mode db2sql call proc_modifies_sql_insert_op(1, 'one');
+	for each STATEMENT call proc_modifies_sql_insert_op(1, 'one');
 0 rows inserted/updated/deleted
 ij> insert into t1 values(2, 'two');
 1 row inserted/updated/deleted
@@ -452,7 +452,7 @@
 ij> drop trigger insert_trig;
 0 rows inserted/updated/deleted
 ij> create trigger update_trig AFTER insert on t1 
-	for each STATEMENT mode db2sql call proc_modifies_sql_update_op(2);
+	for each STATEMENT call proc_modifies_sql_update_op(2);
 0 rows inserted/updated/deleted
 ij> insert into t1 values (4,'four');
 1 row inserted/updated/deleted
@@ -466,7 +466,7 @@
 ij> drop trigger update_trig;
 0 rows inserted/updated/deleted
 ij> create trigger delete_trig AFTER insert on t1 
-	for each STATEMENT mode db2sql call proc_modifies_sql_delete_op(3);
+	for each STATEMENT call proc_modifies_sql_delete_op(3);
 0 rows inserted/updated/deleted
 ij> insert into t1 values (8,'eight');
 1 row inserted/updated/deleted
@@ -481,7 +481,7 @@
 0 rows inserted/updated/deleted
 ij> --- Procedures with schema name
 create trigger call_proc_in_default_schema AFTER insert on t2 
-	for each STATEMENT mode db2sql call APP.proc_no_sql();
+	for each STATEMENT call APP.proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -496,7 +496,7 @@
 ij> drop trigger call_proc_in_default_schema;
 0 rows inserted/updated/deleted
 ij> create trigger call_proc_in_default_schema no cascade BEFORE delete on t2 
-	for each ROW mode db2sql call APP.proc_no_sql();
+	for each ROW call APP.proc_no_sql();
 0 rows inserted/updated/deleted
 ij> --- delete 2 rows. check that trigger is fired - procedure should be called twice
 delete from t2;
@@ -510,7 +510,7 @@
 ij> drop trigger call_proc_in_default_schema;
 0 rows inserted/updated/deleted
 ij> create trigger call_proc_in_new_schema no cascade BEFORE insert on t2 
-	for each STATEMENT mode db2sql call new_schema.proc_in_new_schema();
+	for each STATEMENT call new_schema.proc_in_new_schema();
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t2 values (1,2), (2,4);
@@ -525,7 +525,7 @@
 ij> drop trigger call_proc_in_new_schema;
 0 rows inserted/updated/deleted
 ij> create trigger call_proc_in_new_schema AFTER delete on t2 
-	for each ROW mode db2sql call new_schema.proc_in_new_schema();
+	for each ROW call new_schema.proc_in_new_schema();
 0 rows inserted/updated/deleted
 ij> --- delete 2 rows. check that trigger is fired - procedure should be called twice
 delete from t2;
@@ -540,56 +540,56 @@
 0 rows inserted/updated/deleted
 ij> --- non-existent procedure
 create trigger call_non_existent_proc1 AFTER insert on t2 
-	for each ROW mode db2sql call non_existent_proc();
+	for each ROW call non_existent_proc();
 ERROR 42Y03: 'NON_EXISTENT_PROC' is not recognized as a function or procedure.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_NON_EXISTENT_PROC1';
 1          
 -----------
 0          
 ij> create trigger call_proc_with_non_existent_proc2 AFTER insert on t2 
-	for each ROW mode db2sql call new_schema.non_existent_proc();
+	for each ROW call new_schema.non_existent_proc();
 ERROR 42Y03: 'NEW_SCHEMA.NON_EXISTENT_PROC' is not recognized as a function or procedure.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_NON_EXISTENT_PROC2';
 1          
 -----------
 0          
 ij> create trigger call_proc_in_non_existent_schema AFTER insert on t2 
-	for each ROW mode db2sql call non_existent_schema.non_existent_proc();
+	for each ROW call non_existent_schema.non_existent_proc();
 ERROR 42Y07: Schema 'NON_EXISTENT_SCHEMA' does not exist
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_PROC_IN_NON_EXISTENT_SCHEMA';
 1          
 -----------
 0          
 ij> create trigger call_proc_using_non_existent_method AFTER insert on t2 
-	for each ROW mode db2sql call proc_using_non_existent_method();
+	for each ROW call proc_using_non_existent_method();
 ERROR 42X50: No method was found that matched the method call org.apache.derbyTesting.functionTests.util.ProcedureTest.nonexistentMethod(), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_PROC_WITH_NON_EXISTENT_METHOD';
 1          
 -----------
 0          
 ij> create trigger call_non_existent_proc1 no cascade BEFORE insert on t2 
-	for each ROW mode db2sql call non_existent_proc();
+	for each ROW call non_existent_proc();
 ERROR 42Y03: 'NON_EXISTENT_PROC' is not recognized as a function or procedure.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_NON_EXISTENT_PROC1';
 1          
 -----------
 0          
 ij> create trigger call_proc_with_non_existent_proc2 no cascade BEFORE insert on t2 
-	for each ROW mode db2sql call new_schema.non_existent_proc();
+	for each ROW call new_schema.non_existent_proc();
 ERROR 42Y03: 'NEW_SCHEMA.NON_EXISTENT_PROC' is not recognized as a function or procedure.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_NON_EXISTENT_PROC2';
 1          
 -----------
 0          
 ij> create trigger call_proc_in_non_existent_schema no cascade BEFORE insert on t2 
-	for each ROW mode db2sql call non_existent_schema.non_existent_proc();
+	for each ROW call non_existent_schema.non_existent_proc();
 ERROR 42Y07: Schema 'NON_EXISTENT_SCHEMA' does not exist
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_PROC_IN_NON_EXISTENT_SCHEMA';
 1          
 -----------
 0          
 ij> create trigger call_proc_using_non_existent_method no cascade BEFORE insert on t2 
-	for each ROW mode db2sql call proc_using_non_existent_method();
+	for each ROW call proc_using_non_existent_method();
 ERROR 42X50: No method was found that matched the method call org.apache.derbyTesting.functionTests.util.ProcedureTest.nonexistentMethod(), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 ij> select count(*) from SYS.SYSTRIGGERS where triggername='CALL_PROC_WITH_NON_EXISTENT_METHOD';
 1          
@@ -597,14 +597,14 @@
 0          
 ij> --- triggers must not allow dynamic parameters (?)
 create trigger update_trig AFTER insert on t1 
-	for each STATEMENT mode db2sql call proc_modifies_sql_update_op(?);
+	for each STATEMENT call proc_modifies_sql_update_op(?);
 ERROR 42Y27: Parameters are not allowed in the trigger action.
 ij> --- insert some rows into t2
 insert into t2 values (1,2), (2,4);
 2 rows inserted/updated/deleted
 ij> --- use procedure with commit
 create trigger commit_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call commit_proc();
+	for each STATEMENT call commit_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -619,7 +619,7 @@
 ij> drop trigger commit_trig;
 0 rows inserted/updated/deleted
 ij> create trigger commit_trig no cascade BEFORE delete on t2 
-	for each STATEMENT mode db2sql call commit_proc();
+	for each STATEMENT call commit_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -635,7 +635,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedure with rollback
 create trigger rollback_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call rollback_proc();
+	for each STATEMENT call rollback_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -650,7 +650,7 @@
 ij> drop trigger rollback_trig;
 0 rows inserted/updated/deleted
 ij> create trigger rollback_trig no cascade BEFORE delete on t2 
-	for each STATEMENT mode db2sql call rollback_proc();
+	for each STATEMENT call rollback_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -666,7 +666,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedure which changes isolation level
 create trigger set_isolation_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call set_isolation_proc();
+	for each STATEMENT call set_isolation_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -681,7 +681,7 @@
 ij> drop trigger set_isolation_trig;
 0 rows inserted/updated/deleted
 ij> create trigger set_isolation_trig no cascade BEFORE delete on t2 
-	for each STATEMENT mode db2sql call set_isolation_proc();
+	for each STATEMENT call set_isolation_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
@@ -697,7 +697,7 @@
 0 rows inserted/updated/deleted
 ij> --- call procedure that selects from same trigger table
 create trigger select_from_trig_table AFTER insert on t1
-	for each STATEMENT mode db2sql call proc_reads_sql(1);
+	for each STATEMENT call proc_reads_sql(1);
 0 rows inserted/updated/deleted
 ij> --- insert 2 rows. check that trigger is fired - procedure should be called once
 insert into t1 values (10, 'ten');
@@ -714,7 +714,7 @@
 ij> drop trigger select_from_trig_table;
 0 rows inserted/updated/deleted
 ij> create trigger select_from_trig_table no cascade before delete on t1
-	for each STATEMENT mode db2sql call proc_reads_sql(1);
+	for each STATEMENT call proc_reads_sql(1);
 0 rows inserted/updated/deleted
 ij> --- delete a row. check that trigger is fired - procedure should be called once
 delete from t1 where i=10;
@@ -731,7 +731,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedures which alter/drop trigger table and some other table
 create trigger alter_table_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call alter_table_proc();
+	for each STATEMENT call alter_table_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;
@@ -747,7 +747,7 @@
 ij> drop trigger alter_table_trig;
 0 rows inserted/updated/deleted
 ij> create trigger drop_table_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call drop_table_proc();
+	for each STATEMENT call drop_table_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
@@ -763,7 +763,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedures which create/drop trigger on trigger table and some other table
 create trigger create_trigger_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call create_trigger_proc();
+	for each STATEMENT call create_trigger_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;
@@ -784,10 +784,10 @@
 ij> drop trigger create_trigger_trig;
 0 rows inserted/updated/deleted
 ij> --- create a trigger to test we cannot drop it from a procedure called by a trigger
-create trigger test_trig AFTER delete on t1 for each STATEMENT mode db2sql insert into  t1 values(20, 'twenty');
+create trigger test_trig AFTER delete on t1 for each STATEMENT insert into  t1 values(20, 'twenty');
 0 rows inserted/updated/deleted
 ij> create trigger drop_trigger_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call drop_trigger_proc();
+	for each STATEMENT call drop_trigger_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
@@ -808,7 +808,7 @@
 0 rows inserted/updated/deleted
 ij> --- use procedures which create/drop index on trigger table and some other table
 create trigger create_index_trig AFTER delete on t2 
-	for each STATEMENT mode db2sql call create_index_proc();
+	for each STATEMENT call create_index_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
@@ -831,7 +831,7 @@
 create index ix on t1(i,b);
 0 rows inserted/updated/deleted
 ij> create trigger drop_index_trig AFTER delete on t1 
-	for each STATEMENT mode db2sql call drop_index_proc();
+	for each STATEMENT call drop_index_proc();
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions.out Mon Oct 30 01:34:06 2006
@@ -352,7 +352,7 @@
 --in t2 are inserted into t4
 create trigger trig_delete after DELETE on t2
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 insert into t4 values(deletedrow.x , 'bd');
 0 rows inserted/updated/deleted
 ij> insert into t1 values (1, 2, 3), (4,5,6) , (7,8,9) ;
@@ -795,7 +795,7 @@
 --in t2 are inserted into t4
 create trigger trig_update after UPDATE on t2
 referencing old as updatedrow
-for each row mode db2sql
+for each row
 insert into t4 values(updatedrow.x , 'bu');
 0 rows inserted/updated/deleted
 ij> insert into t1 values (1, 2, 3), (4,5,6) , (7,8,9) ;
@@ -927,7 +927,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_delete after DELETE on t1
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 delete from t2 where x = deletedrow.a;
 0 rows inserted/updated/deleted
 ij> insert into t1 values(1 , 2);
@@ -967,7 +967,7 @@
 ij> create table t2(x int references t1(a) ON UPDATE NO ACTION , y int);
 0 rows inserted/updated/deleted
 ij> create trigger trig_update after UPDATE on t1
-referencing old as old for each  row mode db2sql
+referencing old as old for each  row
 update t2 set x = 2 where x = old.a;
 0 rows inserted/updated/deleted
 ij> insert into t1 values(1 , 2);
@@ -1040,7 +1040,7 @@
 --in t2 are inserted into t4
 create trigger trig_delete after DELETE on t2
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 insert into t4 values(deletedrow.x , 'ad');
 0 rows inserted/updated/deleted
 ij> insert into t1 values (1, 2, 3), (4,5,6) , (7,8,9) ;
@@ -1087,7 +1087,7 @@
 --in t2 are inserted into t4
 create trigger trig_delete after DELETE on t2
 REFERENCING OLD_Table AS deletedrows
-for each statement mode db2sql 
+for each statement 
 insert into t4 select x, 'ad' from deletedrows;
 0 rows inserted/updated/deleted
 ij> insert into t1 values (1, 2, 3), (4,5,6) , (7,8,9) ;
@@ -1147,7 +1147,7 @@
 1 row inserted/updated/deleted
 ij> create trigger trig_emp_delete after DELETE on emp
 REFERENCING OLD_Table AS deletedrows
-for each statement mode db2sql 
+for each statement 
 insert into tempemp select empno, mgr,  'ad' from deletedrows;
 0 rows inserted/updated/deleted
 ij> delete from emp where empno = 'e1';
@@ -1197,7 +1197,7 @@
 1 row inserted/updated/deleted
 ij> create trigger trig_emp_delete AFTER DELETE on emp
 REFERENCING OLD_Table AS deletedrows
-for each statement mode db2sql 
+for each statement 
 insert into tempemp select empno, mgr,  'bd' from deletedrows;
 0 rows inserted/updated/deleted
 ij> delete from emp where empno = 'e1';
@@ -1260,7 +1260,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_cyclic_del after DELETE on t1
 REFERENCING OLD_Table AS deletedrows
-for each statement mode db2sql 
+for each statement 
 insert into t1temp  select a, b,  'ad' from deletedrows;
 0 rows inserted/updated/deleted
 ij> select * from t1;
@@ -1367,7 +1367,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_cyclic_del AFTER DELETE on t1
 REFERENCING OLD_Table AS deletedrows
-for each statement mode db2sql 
+for each statement 
 insert into t1temp  select a, b,  'bd' from deletedrows;
 0 rows inserted/updated/deleted
 ij> select * from t1;
@@ -1474,12 +1474,12 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_cyclic_del1 after DELETE on t1
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 insert into t1temp values(deletedrow.a , deletedrow.b, 'ad');
 0 rows inserted/updated/deleted
 ij> create trigger trig_cyclic_del2 AFTER DELETE on t1
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 insert into t1temp values(deletedrow.a , deletedrow.b, 'bd');
 0 rows inserted/updated/deleted
 ij> select * from t1;
@@ -1581,12 +1581,12 @@
 1 row inserted/updated/deleted
 ij> create trigger trig_emp_delete AFTER UPDATE on emp
 REFERENCING OLD_Table AS updatedrows
-for each statement mode db2sql 
+for each statement 
 insert into tempemp select empno, mgr,  'bu' from updatedrows;
 0 rows inserted/updated/deleted
 ij> create trigger trig_emp_delete1 AFTER UPDATE on emp
 REFERENCING NEW_Table AS updatedrows
-for each statement mode db2sql 
+for each statement 
 insert into tempemp select empno, mgr,  'au' from updatedrows;
 0 rows inserted/updated/deleted
 ij> delete from emp where empno = 'e1';
@@ -1639,12 +1639,12 @@
 1 row inserted/updated/deleted
 ij> create trigger trig_emp_delete after UPDATE on emp
 REFERENCING OLD AS updatedrow
-for each row mode db2sql
+for each row
 insert into tempemp values(updatedrow.empno, updatedrow.mgr, 'bu');
 0 rows inserted/updated/deleted
 ij> create trigger trig_emp_delete1 AFTER UPDATE on emp
 REFERENCING NEW AS updatedrow
-for each  row mode db2sql
+for each  row
 insert into tempemp values(updatedrow.empno, updatedrow.mgr, 'au');
 0 rows inserted/updated/deleted
 ij> delete from emp where empno = 'e1';
@@ -2483,12 +2483,12 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_delete after DELETE on t1
 referencing old as deletedrow
-for each  row mode db2sql
+for each  row
 delete from t2;
 0 rows inserted/updated/deleted
 ij> create trigger trig_delete1 after DELETE on t2
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 delete from t3;
 0 rows inserted/updated/deleted
 ij> insert into t1 values (1, 2, 3), (4,5,6) , (7,8,9) , (10,11,12), 
@@ -2544,12 +2544,12 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_delete after DELETE on t1
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 delete from t2;
 0 rows inserted/updated/deleted
 ij> create trigger trig_delete1 after DELETE on t2
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 delete from t3;
 0 rows inserted/updated/deleted
 ij> insert into t1 values (1, 2, 3), (4,5,6) , (7,8,9) , (10,11,12), 
@@ -2746,7 +2746,7 @@
 create table t4(c1 char (20));
 0 rows inserted/updated/deleted
 ij> create trigger trig_delete after DELETE on t3
-for each statement mode db2sql
+for each statement
 insert into t4 values('ad');
 0 rows inserted/updated/deleted
 ij> delete from t1 ;
@@ -2759,7 +2759,7 @@
 ij> delete from t4 ;
 0 rows inserted/updated/deleted
 ij> create trigger trig_delete after DELETE on t3
-for each statement mode db2sql
+for each statement
 insert into t4 values('bd');
 0 rows inserted/updated/deleted
 ij> delete from t1 ;
@@ -2780,7 +2780,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_delete after DELETE on t3
 referencing old as deletedrow
-for each row mode db2sql
+for each row
 insert into t4 values(deletedrow.c1 , 'bd');
 0 rows inserted/updated/deleted
 ij> delete from t1 ;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/releaseCompileLocks.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/releaseCompileLocks.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/releaseCompileLocks.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/releaseCompileLocks.out Mon Oct 30 01:34:06 2006
@@ -211,9 +211,9 @@
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij> commit;
 ij> -- create some triggers.
-create trigger update_of_t after update on t for each row mode db2sql values 2;
+create trigger update_of_t after update on t for each row values 2;
 0 rows inserted/updated/deleted
-ij> create trigger insert_of_t after insert on t for each row mode db2sql values 3;
+ij> create trigger insert_of_t after insert on t for each row values 3;
 0 rows inserted/updated/deleted
 ij> commit;
 ij> -- t has (1,1) (2,1) (3,2)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/renameTable.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/renameTable.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/renameTable.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/renameTable.out Mon Oct 30 01:34:06 2006
@@ -116,7 +116,7 @@
 ij> create table t7(c71 int);
 0 rows inserted/updated/deleted
 ij> -- bug 5684
-create trigger t7insert after insert on t7 referencing new as NEWROW for each row mode db2sql insert into t6 values(NEWROW.c71);
+create trigger t7insert after insert on t7 referencing new as NEWROW for each row insert into t6 values(NEWROW.c71);
 0 rows inserted/updated/deleted
 ij> insert into t7 values(1);
 1 row inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out Mon Oct 30 01:34:06 2006
@@ -381,7 +381,7 @@
 0 rows inserted/updated/deleted
 ij> create table t1 (c1 int);
 0 rows inserted/updated/deleted
-ij> create trigger sysblah.trig1 after update of c1 on t1 for each row mode db2sql insert into t1 values 1;
+ij> create trigger sysblah.trig1 after update of c1 on t1 for each row insert into t1 values 1;
 ERROR 42X62: 'CREATE TRIGGER' is not allowed in the 'SYSBLAH' schema.
 ij> create procedure sysblah.dummy() language java external name 'NotReallyThere.NoMethod' parameter style java;
 ERROR 42X62: 'CREATE PROCEDURE' is not allowed in the 'SYSBLAH' schema.
@@ -853,7 +853,7 @@
 6415       
 ij> drop view A5146.V;
 0 rows inserted/updated/deleted
-ij> prepare PS5146_TRIGGER as 'create trigger A5146.DT_TRIG AFTER INSERT ON B5146.DT FOR EACH STATEMENT MODE DB2SQL UPDATE  B5146.DT SET I = I + 1';
+ij> prepare PS5146_TRIGGER as 'create trigger A5146.DT_TRIG AFTER INSERT ON B5146.DT FOR EACH STATEMENT UPDATE  B5146.DT SET I = I + 1';
 ij> drop schema A5146 restrict;
 0 rows inserted/updated/deleted
 ij> execute PS5146_TRIGGER;
@@ -896,7 +896,7 @@
 0 rows inserted/updated/deleted
 ij> drop schema ISC restrict;
 0 rows inserted/updated/deleted
-ij> prepare ISC_TRIGGER as 'create trigger ISC.DT_TRIG AFTER INSERT ON B5146.DT FOR EACH STATEMENT MODE DB2SQL UPDATE  B5146.DT SET I = I + 1';
+ij> prepare ISC_TRIGGER as 'create trigger ISC.DT_TRIG AFTER INSERT ON B5146.DT FOR EACH STATEMENT UPDATE  B5146.DT SET I = I + 1';
 ij> execute ISC_TRIGGER;
 0 rows inserted/updated/deleted
 ij> insert into B5146.DT values 999;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/synonym.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/synonym.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/synonym.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/synonym.out Mon Oct 30 01:34:06 2006
@@ -198,14 +198,14 @@
 create table table2 (i int, j int);
 0 rows inserted/updated/deleted
 ij> -- Should fail
-create trigger tins after insert on myTable referencing new_table as new for each statement mode db2sql insert into table2 select i,j from table1;
+create trigger tins after insert on myTable referencing new_table as new for each statement insert into table2 select i,j from table1;
 ERROR 42Y55: 'CREATE TRIGGER' cannot be performed on 'MYTABLE' because it does not exist.
 ij> -- Should pass
-create trigger tins after insert on table1 referencing new_table as new for each statement mode db2sql insert into table2 select i,j from table1;
+create trigger tins after insert on table1 referencing new_table as new for each statement insert into table2 select i,j from table1;
 0 rows inserted/updated/deleted
 ij> drop trigger tins;
 0 rows inserted/updated/deleted
-ij> create trigger triggerins after insert on table2 referencing new_table as new for each statement mode db2sql insert into myTable select i,j from new;
+ij> create trigger triggerins after insert on table2 referencing new_table as new for each statement insert into myTable select i,j from new;
 0 rows inserted/updated/deleted
 ij> select * from myTable;
 I          |J          

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out Mon Oct 30 01:34:06 2006
@@ -681,7 +681,7 @@
 CONGLOMERATENAME                                                                                                                |DESCRIPTOR     
 ------------------------------------------------------------------------------------------------------------------------------------------------
 DECIMAL_TAB_IDX                                                                                                                 |BTREE (1)      
-ij> create trigger t1 after update on decimal_tab for each row mode db2sql values 1;
+ij> create trigger t1 after update on decimal_tab for each row values 1;
 0 rows inserted/updated/deleted
 ij> -- referenced columns.
 select triggername, referencedcolumns

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerBeforeTrig.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerBeforeTrig.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerBeforeTrig.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerBeforeTrig.out Mon Oct 30 01:34:06 2006
@@ -26,28 +26,28 @@
 ij> ------------------------------------
 -- DDL
 ------------------------------------
-create trigger tbad NO CASCADE before insert on x for each statement mode db2sql drop table x;
-ERROR 42X01: Syntax error: Encountered "drop" at line 4, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql drop index x;
-ERROR 42X01: Syntax error: Encountered "drop" at line 1, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql alter table x add column y int;
-ERROR 42X01: Syntax error: Encountered "alter" at line 1, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql alter table x add constraint ck2 check(x > 0);
-ERROR 42X01: Syntax error: Encountered "alter" at line 1, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql alter table x drop constraint ck;
-ERROR 42X01: Syntax error: Encountered "alter" at line 1, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql create index x2 on x (x);
-ERROR 42X01: Syntax error: Encountered "create" at line 1, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql create index xunrelated on unrelated(x);
-ERROR 42X01: Syntax error: Encountered "create" at line 1, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql drop index xunrelated;
-ERROR 42X01: Syntax error: Encountered "drop" at line 1, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql drop trigger tbad;
-ERROR 42X01: Syntax error: Encountered "drop" at line 1, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql 
-	create trigger tbad2 NO CASCADE before insert on x for each statement mode db2sql values 1;
+create trigger tbad NO CASCADE before insert on x for each statement drop table x;
+ERROR 42X01: Syntax error: Encountered "drop" at line 4, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement drop index x;
+ERROR 42X01: Syntax error: Encountered "drop" at line 1, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement alter table x add column y int;
+ERROR 42X01: Syntax error: Encountered "alter" at line 1, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement alter table x add constraint ck2 check(x > 0);
+ERROR 42X01: Syntax error: Encountered "alter" at line 1, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement alter table x drop constraint ck;
+ERROR 42X01: Syntax error: Encountered "alter" at line 1, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement create index x2 on x (x);
+ERROR 42X01: Syntax error: Encountered "create" at line 1, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement create index xunrelated on unrelated(x);
+ERROR 42X01: Syntax error: Encountered "create" at line 1, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement drop index xunrelated;
+ERROR 42X01: Syntax error: Encountered "drop" at line 1, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement drop trigger tbad;
+ERROR 42X01: Syntax error: Encountered "drop" at line 1, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement 
+	create trigger tbad2 NO CASCADE before insert on x for each statement values 1;
 ERROR 42X01: Syntax error: Encountered "create" at line 2, column 9.
-ij> create trigger tokv1 NO CASCADE before insert on x for each statement mode db2sql values 1;
+ij> create trigger tokv1 NO CASCADE before insert on x for each statement values 1;
 0 rows inserted/updated/deleted
 ij> insert into x values 1;
 1 row inserted/updated/deleted
@@ -60,54 +60,54 @@
 ij> ------------------------------------
 -- MISC
 ------------------------------------
-create trigger tbad NO CASCADE before insert on x for each statement mode db2sql set isolation to rr;
-ERROR 42X01: Syntax error: Encountered "set" at line 4, column 82.
-ij> create trigger tbad NO CASCADE before insert on x for each statement mode db2sql lock table x in share mode;
-ERROR 42X01: Syntax error: Encountered "lock" at line 1, column 82.
+create trigger tbad NO CASCADE before insert on x for each statement set isolation to rr;
+ERROR 42X01: Syntax error: Encountered "set" at line 4, column 70.
+ij> create trigger tbad NO CASCADE before insert on x for each statement lock table x in share mode;
+ERROR 42X01: Syntax error: Encountered "lock" at line 1, column 70.
 ij> ------------------------------------
 -- DML, cannot perform dml on same
 -- table for before trigger, of for
 -- after
 ------------------------------------
 -- before
-create trigger tbadX NO CASCADE before insert on x for each statement mode db2sql insert into x values 1;
+create trigger tbadX NO CASCADE before insert on x for each statement insert into x values 1;
 ERROR 42Z9D: 'INSERT' statements are not allowed in 'BEFORE' triggers.
-ij> create trigger tbadX NO CASCADE before insert on x for each statement mode db2sql delete from x;
+ij> create trigger tbadX NO CASCADE before insert on x for each statement delete from x;
 ERROR 42Z9D: 'DELETE' statements are not allowed in 'BEFORE' triggers.
-ij> create trigger tbadX NO CASCADE before insert on x for each statement mode db2sql update x set x = x;
+ij> create trigger tbadX NO CASCADE before insert on x for each statement update x set x = x;
 ERROR 42Z9D: 'UPDATE' statements are not allowed in 'BEFORE' triggers.
 ij> -- Following tests moved here from triggerRefClause, since these use BEFORE triggers
 -- syntax
-create trigger t1 NO CASCADE before update on x referencing badtoken as oldtable for each row mode db2sql values 1;
+create trigger t1 NO CASCADE before update on x referencing badtoken as oldtable for each row values 1;
 ERROR 42X01: Syntax error: Encountered "badtoken" at line 3, column 61.
-ij> create trigger t1 NO CASCADE before update on x referencing old as oldrow new for each row mode db2sql values 1;
+ij> create trigger t1 NO CASCADE before update on x referencing old as oldrow new for each row values 1;
 ERROR 42X01: Syntax error: Encountered "for" at line 1, column 79.
 ij> -- dup names
 create trigger t1 NO CASCADE before update on x referencing old as oldrow new as newrow old as oldrow2 
-	for each row mode db2sql values 1;
+	for each row values 1;
 ERROR 42Y93: Illegal REFERENCING clause: only one name is permitted for each type of transition variable/table.
 ij> create trigger t1 NO CASCADE before update on x referencing new as newrow new as newrow2 old as oldrow2 
-	for each row mode db2sql values 1;
+	for each row values 1;
 ERROR 42Y93: Illegal REFERENCING clause: only one name is permitted for each type of transition variable/table.
-ij> -- mismatch: row->for each statement mode db2sql, table->for each row
-create trigger t1 NO CASCADE before update on x referencing new_table as newtab for each row mode db2sql values 1;
+ij> -- mismatch: row->for each statement, table->for each row
+create trigger t1 NO CASCADE before update on x referencing new_table as newtab for each row values 1;
 ERROR 42Y92: ROW triggers may only reference row transition variables/tables.
-ij> create trigger t1 NO CASCADE before update on x referencing new as newrow for each statement mode db2sql values 1;
+ij> create trigger t1 NO CASCADE before update on x referencing new as newrow for each statement values 1;
 ERROR 42Y92: STATEMENT triggers may only reference table transition variables/tables.
 ij> -- same as above, but using old
-create trigger t1 NO CASCADE before update on x referencing old_table as old for each row mode db2sql select * from old;
+create trigger t1 NO CASCADE before update on x referencing old_table as old for each row select * from old;
 ERROR 42Y92: ROW triggers may only reference row transition variables/tables.
-ij> create trigger t1 NO CASCADE before update on x referencing old_table as old for each statement mode db2sql values old.x;
+ij> create trigger t1 NO CASCADE before update on x referencing old_table as old for each statement values old.x;
 ERROR 42Y92: BEFORE triggers may only reference row transition variables/tables.
 ij> -- old and new cannot be used once they have been redefined
-create trigger t1 NO CASCADE before update on x referencing old_table as oldtable for each statement mode db2sql select * from old;
+create trigger t1 NO CASCADE before update on x referencing old_table as oldtable for each statement select * from old;
 ERROR 42Y92: BEFORE triggers may only reference row transition variables/tables.
-ij> create trigger t1 NO CASCADE before update on x referencing old as oldtable for each row mode db2sql values old.x;
+ij> create trigger t1 NO CASCADE before update on x referencing old as oldtable for each row values old.x;
 ERROR 42X04: Column 'OLD.X' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'OLD.X' is not a column in the target table.
 ij> -- try some other likely uses
 create table y (x int);
 0 rows inserted/updated/deleted
-ij> create trigger t1 NO CASCADE before insert on x referencing new_table as newrowtab for each statement mode db2sql insert into y select x from newrowtab;
+ij> create trigger t1 NO CASCADE before insert on x referencing new_table as newrowtab for each statement insert into y select x from newrowtab;
 ERROR 42Z9D: 'INSERT' statements are not allowed in 'BEFORE' triggers.
 ij> drop table x;
 0 rows inserted/updated/deleted



Mime
View raw message