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 [1/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
Author: bernt
Date: Mon Oct 30 01:34:06 2006
New Revision: 469102

URL: http://svn.apache.org/viewvc?view=rev&rev=469102
Log:
DERBY-1953 Test changes. MODE DB2SQL removed from most tests

Modified:
    db/derby/code/trunk/java/demo/toursdb/ToursDB_schema.sql
    db/derby/code/trunk/java/demo/toursdb/toursdb_readme.html
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertableDropColumn.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/procedureInTrigger.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/grantRevokeDDL2.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/procedureInTrigger.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/predicatesIntoViews.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/refActions.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/releaseCompileLocks.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/renameTable.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schemas.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/synonym.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/syscat.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerBeforeTrig.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRecursion.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xml_general.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/prepStmtMetaData.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/altertable.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/altertableDropColumn.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dropTable.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevoke.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevokeDDL.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevokeDDL2.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/identifier.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/predicatesIntoViews.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedureInTrigger.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/refActions.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/renameTable.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/schemas.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/streams.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/synonym.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/syscat.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerBeforeTrig.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerGeneral.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerRecursion.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerRefClause.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerStream.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updatableResultSet.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/xml_general.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_makeDB.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_makeDB_2.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTester.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java

Modified: db/derby/code/trunk/java/demo/toursdb/ToursDB_schema.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/toursdb/ToursDB_schema.sql?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/ToursDB_schema.sql (original)
+++ db/derby/code/trunk/java/demo/toursdb/ToursDB_schema.sql Mon Oct 30 01:34:06 2006
@@ -174,8 +174,8 @@
 
 -- \************************************************************\
 
-CREATE TRIGGER TRIG1 AFTER UPDATE ON FLIGHTS REFERENCING OLD AS UPDATEDROW FOR EACH ROW MODE DB2SQL INSERT INTO FLIGHTS_HISTORY VALUES (UPDATEDROW.FLIGHT_ID, UPDATEDROW.SEGMENT_NUMBER, UPDATEDROW.ORIG_AIRPORT,UPDATEDROW.DEPART_TIME, UPDATEDROW.DEST_AIRPORT,UPDATEDROW.ARRIVE_TIME,UPDATEDROW.MEAL, UPDATEDROW.FLYING_TIME, UPDATEDROW.MILES, UPDATEDROW.AIRCRAFT,'INSERTED FROM TRIG1');
+CREATE TRIGGER TRIG1 AFTER UPDATE ON FLIGHTS REFERENCING OLD AS UPDATEDROW FOR EACH ROW INSERT INTO FLIGHTS_HISTORY VALUES (UPDATEDROW.FLIGHT_ID, UPDATEDROW.SEGMENT_NUMBER, UPDATEDROW.ORIG_AIRPORT,UPDATEDROW.DEPART_TIME, UPDATEDROW.DEST_AIRPORT,UPDATEDROW.ARRIVE_TIME,UPDATEDROW.MEAL, UPDATEDROW.FLYING_TIME, UPDATEDROW.MILES, UPDATEDROW.AIRCRAFT,'INSERTED FROM TRIG1');
 
-CREATE TRIGGER TRIG2 AFTER DELETE ON FLIGHTS FOR EACH STATEMENT MODE DB2SQL
+CREATE TRIGGER TRIG2 AFTER DELETE ON FLIGHTS FOR EACH STATEMENT
 INSERT INTO FLIGHTS_HISTORY (STATUS) VALUES ('INSERTED FROM TRIG2');
 

Modified: db/derby/code/trunk/java/demo/toursdb/toursdb_readme.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/toursdb/toursdb_readme.html?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/toursdb_readme.html (original)
+++ db/derby/code/trunk/java/demo/toursdb/toursdb_readme.html Mon Oct 30 01:34:06 2006
@@ -554,7 +554,7 @@
 
 <UL><UL>after update on FLIGHTS <BR CLEAR="LEFT">
 referencing old as UPDATEDROW <BR CLEAR="LEFT">
-for each row mode DB2SQL <BR CLEAR="LEFT">
+for each row <BR CLEAR="LEFT">
 insert into FLIGHTS_HISTORY values ( <BR CLEAR="LEFT">
 UPDATEDROW.FLIGHT_ID, <BR CLEAR="LEFT">
 UPDATEDROW.SEGMENT_NUMBER, <BR CLEAR="LEFT">
@@ -574,7 +574,7 @@
 
 
 <UL><UL>after delete on FLIGHTS <BR CLEAR="LEFT">
-for each statement mode DB2SQL <BR CLEAR="LEFT">
+for each statement <BR CLEAR="LEFT">
 insert into FLIGHTS_HISTORY (STATUS) values ('INSERTED FROM TRIG2'); 
 
 </BODY>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out Mon Oct 30 01:34:06 2006
@@ -559,7 +559,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_import after INSERT on alltypes
 referencing new as newrow
-for each  row mode db2sql
+for each  row
 insert into test1 values(newrow.chartype);
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out Mon Oct 30 01:34:06 2006
@@ -559,7 +559,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_import after INSERT on alltypes
 referencing new as newrow
-for each  row mode db2sql
+for each  row
 insert into test1 values(newrow.chartype);
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/synonym.out Mon Oct 30 01:34:06 2006
@@ -195,14 +195,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/DerbyNet/syscat.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/syscat.out Mon Oct 30 01:34:06 2006
@@ -662,7 +662,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/DerbyNet/xml_general.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/xml_general.out Mon Oct 30 01:34:06 2006
@@ -175,9 +175,9 @@
   not logged on commit preserve rows;
 ERROR 42962: Long column type column or parameter 'MYX' not permitted in declared global temporary tables or procedure definitions. 
 ij> -- XML cols can be used in a SET clause, if target value is XML.
-create trigger tr2 after insert on t1 for each row mode db2sql update t1 set x = 'hmm';
+create trigger tr2 after insert on t1 for each row update t1 set x = 'hmm';
 ERROR 42821: Columns of type 'XML' cannot hold values of type 'CHAR'. 
-ij> create trigger tr1 after insert on t1 for each row mode db2sql update t1 set x = null;
+ij> create trigger tr1 after insert on t1 for each row update t1 set x = null;
 0 rows inserted/updated/deleted
 ij> drop trigger tr1;
 0 rows inserted/updated/deleted
@@ -1223,7 +1223,7 @@
 0 rows inserted/updated/deleted
 ij> insert into t9 values (1, xmlparse(document '<name> john </name>' preserve whitespace));
 1 row inserted/updated/deleted
-ij> create trigger tx after insert on t9 for each statement mode db2sql
+ij> create trigger tx after insert on t9 for each statement
    insert into t10 values (1, xmlparse(document '<name> jane </name>' preserve whitespace));
 0 rows inserted/updated/deleted
 ij> insert into t9 values (2, xmlparse(document '<name> ally </name>' preserve whitespace));
@@ -1259,7 +1259,7 @@
 2 rows inserted/updated/deleted
 ij> insert into t9 values (1, xmlparse(document '<name> john </name>' preserve whitespace));
 1 row inserted/updated/deleted
-ij> create trigger tx after insert on t9 for each statement mode db2sql
+ij> create trigger tx after insert on t9 for each statement
    insert into t10 values (1, (select xmlquery('.' passing by ref x returning sequence empty on empty) from t9 where i = 1));
 0 rows inserted/updated/deleted
 ij> insert into t9 values (2, xmlparse(document '<name> ally </name>' preserve whitespace));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out Mon Oct 30 01:34:06 2006
@@ -559,7 +559,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_import after INSERT on alltypes
 referencing new as newrow
-for each  row mode db2sql
+for each  row
 insert into test1 values(newrow.chartype);
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/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/DerbyNetClient/jdk16/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out Mon Oct 30 01:34:06 2006
@@ -559,7 +559,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_import after INSERT on alltypes
 referencing new as newrow
-for each  row mode db2sql
+for each  row
 insert into test1 values(newrow.chartype);
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/synonym.out Mon Oct 30 01:34:06 2006
@@ -195,14 +195,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/DerbyNetClient/syscat.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/syscat.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/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/DerbyNetClient/xml_general.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/xml_general.out Mon Oct 30 01:34:06 2006
@@ -175,9 +175,9 @@
   not logged on commit preserve rows;
 ERROR 42962: Long column type column or parameter 'MYX' not permitted in declared global temporary tables or procedure definitions. 
 ij> -- XML cols can be used in a SET clause, if target value is XML.
-create trigger tr2 after insert on t1 for each row mode db2sql update t1 set x = 'hmm';
+create trigger tr2 after insert on t1 for each row update t1 set x = 'hmm';
 ERROR 42821: Columns of type 'XML' cannot hold values of type 'CHAR'. 
-ij> create trigger tr1 after insert on t1 for each row mode db2sql update t1 set x = null;
+ij> create trigger tr1 after insert on t1 for each row update t1 set x = null;
 0 rows inserted/updated/deleted
 ij> drop trigger tr1;
 0 rows inserted/updated/deleted
@@ -1224,7 +1224,7 @@
 0 rows inserted/updated/deleted
 ij> insert into t9 values (1, xmlparse(document '<name> john </name>' preserve whitespace));
 1 row inserted/updated/deleted
-ij> create trigger tx after insert on t9 for each statement mode db2sql
+ij> create trigger tx after insert on t9 for each statement
    insert into t10 values (1, xmlparse(document '<name> jane </name>' preserve whitespace));
 0 rows inserted/updated/deleted
 ij> insert into t9 values (2, xmlparse(document '<name> ally </name>' preserve whitespace));
@@ -1260,7 +1260,7 @@
 2 rows inserted/updated/deleted
 ij> insert into t9 values (1, xmlparse(document '<name> john </name>' preserve whitespace));
 1 row inserted/updated/deleted
-ij> create trigger tx after insert on t9 for each statement mode db2sql
+ij> create trigger tx after insert on t9 for each statement
    insert into t10 values (1, (select xmlquery('.' passing by ref x returning sequence empty on empty) from t9 where i = 1));
 0 rows inserted/updated/deleted
 ij> insert into t9 values (2, xmlparse(document '<name> ally </name>' preserve whitespace));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out Mon Oct 30 01:34:06 2006
@@ -247,9 +247,9 @@
 0 rows inserted/updated/deleted
 ij> insert into tab4 values (1,2,3,4);
 1 row inserted/updated/deleted
-ij> create trigger tr1 after update of c2, c3, c4 on tab4 for each row mode db2sql insert into tab5 values (1);
+ij> create trigger tr1 after update of c2, c3, c4 on tab4 for each row insert into tab5 values (1);
 0 rows inserted/updated/deleted
-ij> create trigger tr2 after update of c3, c4 on tab4 for each row mode db2sql insert into tab5 values (2);
+ij> create trigger tr2 after update of c3, c4 on tab4 for each row insert into tab5 values (2);
 0 rows inserted/updated/deleted
 ij> -- tr1 is dropped, tr2 still OK
 drop trigger tr1;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertableDropColumn.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertableDropColumn.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertableDropColumn.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertableDropColumn.out Mon Oct 30 01:34:06 2006
@@ -351,7 +351,7 @@
 create table atdc_6 (a integer, b integer);
 0 rows inserted/updated/deleted
 ij> create trigger atdc_6_trigger_1 after update of b on atdc_6
-	for each row mode db2sql values current_date;
+	for each row values current_date;
 0 rows inserted/updated/deleted
 ij> alter table atdc_6 drop column b restrict;
 ERROR X0Y25: Operation 'DROP COLUMN' cannot be performed on object 'B' because TRIGGER 'ATDC_6_TRIGGER_1' is dependent on that object.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out Mon Oct 30 01:34:06 2006
@@ -372,7 +372,7 @@
 0 rows inserted/updated/deleted
 ij> create table t2 (c2 int generated always as identity, name char(32));
 0 rows inserted/updated/deleted
-ij> create trigger insert_trigger after insert on t1 for each row mode db2sql
+ij> create trigger insert_trigger after insert on t1 for each row
 	   insert into t2 (name) values ('Bob Finocchio');
 0 rows inserted/updated/deleted
 ij> insert into t1 (name) values ('Phil White');
@@ -505,7 +505,7 @@
 0 rows inserted/updated/deleted
 ij> create table tab3 (c1 int);
 0 rows inserted/updated/deleted
-ij> create trigger tab1_after1 after insert on tab3 referencing new as newrow for each row mode db2sql insert into tab1 (lvl) values 1,2,3;
+ij> create trigger tab1_after1 after insert on tab3 referencing new as newrow for each row insert into tab1 (lvl) values 1,2,3;
 0 rows inserted/updated/deleted
 ij> insert into tab3 values null;
 1 row inserted/updated/deleted
@@ -521,7 +521,7 @@
 TAB1                                                                                                                            |4                   |1                   |1                   
 ij> create table tab2 (lvl int, s1  bigint generated always as identity);
 0 rows inserted/updated/deleted
-ij> create trigger tab1_after2 after insert on tab3 referencing new as newrow for each row mode db2sql insert into tab2 (lvl) values 1,2,3;
+ij> create trigger tab1_after2 after insert on tab3 referencing new as newrow for each row insert into tab2 (lvl) values 1,2,3;
 0 rows inserted/updated/deleted
 ij> insert into tab3 values null;
 1 row inserted/updated/deleted
@@ -1699,7 +1699,7 @@
 0 rows inserted/updated/deleted
 ij(CONN2)> create table t2 (c21 int generated always as identity (start with 201, increment by 5), c22 int);
 0 rows inserted/updated/deleted
-ij(CONN2)> create trigger t1tr1 after insert on t1 for each row mode db2sql insert into t2 (c22) values (1);
+ij(CONN2)> create trigger t1tr1 after insert on t1 for each row insert into t2 (c22) values (1);
 0 rows inserted/updated/deleted
 ij(CONN2)> values IDENTITY_VAL_LOCAL();
 1                              

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out Mon Oct 30 01:34:06 2006
@@ -156,9 +156,9 @@
    );
 0 rows inserted/updated/deleted
 ij> -- \************************************************************\
-CREATE TRIGGER TRIG1 AFTER UPDATE ON FLIGHTS REFERENCING OLD AS UPDATEDROW FOR EACH ROW MODE DB2SQL INSERT INTO FLIGHTS_HISTORY VALUES (UPDATEDROW.FLIGHT_ID, UPDATEDROW.SEGMENT_NUMBER, UPDATEDROW.ORIG_AIRPORT,UPDATEDROW.DEPART_TIME, UPDATEDROW.DEST_AIRPORT,UPDATEDROW.ARRIVE_TIME,UPDATEDROW.MEAL, UPDATEDROW.FLYING_TIME, UPDATEDROW.MILES, UPDATEDROW.AIRCRAFT,'INSERTED FROM TRIG1');
+CREATE TRIGGER TRIG1 AFTER UPDATE ON FLIGHTS REFERENCING OLD AS UPDATEDROW FOR EACH ROW INSERT INTO FLIGHTS_HISTORY VALUES (UPDATEDROW.FLIGHT_ID, UPDATEDROW.SEGMENT_NUMBER, UPDATEDROW.ORIG_AIRPORT,UPDATEDROW.DEPART_TIME, UPDATEDROW.DEST_AIRPORT,UPDATEDROW.ARRIVE_TIME,UPDATEDROW.MEAL, UPDATEDROW.FLYING_TIME, UPDATEDROW.MILES, UPDATEDROW.AIRCRAFT,'INSERTED FROM TRIG1');
 0 rows inserted/updated/deleted
-ij> CREATE TRIGGER TRIG2 AFTER DELETE ON FLIGHTS FOR EACH STATEMENT MODE DB2SQL
+ij> CREATE TRIGGER TRIG2 AFTER DELETE ON FLIGHTS FOR EACH STATEMENT
 INSERT INTO FLIGHTS_HISTORY (STATUS) VALUES ('INSERTED FROM TRIG2');
 0 rows inserted/updated/deleted
 ij> ij version 10.3

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out Mon Oct 30 01:34:06 2006
@@ -5266,7 +5266,7 @@
 -- ----------------------------------------------
 -- DDL Statements for triggers
 -- ----------------------------------------------
-CREATE TRIGGER "APP"."TRIGONE" AFTER INSERT ON "BAR"."T1" FOR EACH ROW MODE DB2SQL update bar.t1 set i = 4 where i = 2
+CREATE TRIGGER "APP"."TRIGONE" AFTER INSERT ON "BAR"."T1" FOR EACH ROW update bar.t1 set i = 4 where i = 2
 ############## End File Contents ################
 File dblook.log was empty.
 ************
@@ -5397,7 +5397,7 @@
 -- ----------------------------------------------
 -- DDL Statements for triggers
 -- ----------------------------------------------
-CREATE TRIGGER "APP"."TRIGONE" AFTER INSERT ON "BAR"."T1" FOR EACH ROW MODE DB2SQL update bar.t1 set i = 4 where i = 2 #
+CREATE TRIGGER "APP"."TRIGONE" AFTER INSERT ON "BAR"."T1" FOR EACH ROW update bar.t1 set i = 4 where i = 2 #
 ************
 Msg Test 5
 ************

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dropTable.out Mon Oct 30 01:34:06 2006
@@ -265,7 +265,7 @@
 0 rows inserted/updated/deleted
 ij> create table t2(a int);
 0 rows inserted/updated/deleted
-ij> create trigger t1trig after insert on t1 for each row mode db2sql insert into t2 values(1);
+ij> create trigger t1trig after insert on t1 for each row insert into t2 values(1);
 0 rows inserted/updated/deleted
 ij> -- this should work - trigger should be deleted
 drop table t1;
@@ -275,7 +275,7 @@
 ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1(a int);
 0 rows inserted/updated/deleted
-ij> create trigger t1trig after insert on t1 for each row mode db2sql insert into t2 values(1);
+ij> create trigger t1trig after insert on t1 for each row insert into t2 values(1);
 0 rows inserted/updated/deleted
 ij> -- this should work - trigger should be deleted
 drop table t1;
@@ -285,7 +285,7 @@
 ERROR 42X05: Table/View 'T1' does not exist.
 ij> create table t1(a int);
 0 rows inserted/updated/deleted
-ij> create trigger t1trig after insert on t1 for each row mode db2sql insert into t2 values(1);
+ij> create trigger t1trig after insert on t1 for each row insert into t2 values(1);
 0 rows inserted/updated/deleted
 ij> -- this should work - trigger should be deleted
 drop table t1;
@@ -302,7 +302,7 @@
 0 rows inserted/updated/deleted
 ij> create table t2(a int);
 0 rows inserted/updated/deleted
-ij> create trigger t2trig after insert on t2 for each row mode db2sql insert into t1 values(1);
+ij> create trigger t2trig after insert on t2 for each row insert into t1 values(1);
 0 rows inserted/updated/deleted
 ij> -- this should work
 drop table t1;
@@ -316,7 +316,7 @@
 0 rows inserted/updated/deleted
 ij> create table t2(a int);
 0 rows inserted/updated/deleted
-ij> create trigger t2trig after insert on t2 for each row mode db2sql insert into t1 values(1);
+ij> create trigger t2trig after insert on t2 for each row insert into t1 values(1);
 0 rows inserted/updated/deleted
 ij> -- this should work
 drop table t1;
@@ -330,7 +330,7 @@
 0 rows inserted/updated/deleted
 ij> create table t2(a int);
 0 rows inserted/updated/deleted
-ij> create trigger t2trig after insert on t2 for each row mode db2sql insert into t1 values(1);
+ij> create trigger t2trig after insert on t2 for each row insert into t1 values(1);
 0 rows inserted/updated/deleted
 ij> -- this should work
 drop table t1;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out Mon Oct 30 01:34:06 2006
@@ -11,7 +11,7 @@
 UpdatePrivCheck: update S2.T1 set C1=0
 UpdatePrivCheck: update S2.T1 set C2=0
 UpdatePrivCheck: update S2.T1 set C3=0
-TriggerPrivCheck: create trigger "T1Trig" after insert on "S2"."T1" for each row mode db2sql values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "S2"."T1" for each row values 1
 SelectPrivCheck: select * from S2.T1
 SelectPrivCheck: select count(*) from "S2"."T1" where (C1 is null) or (C2 is null) or (C3 is null)
 DeletePrivCheck: delete from "S2"."T1"
@@ -19,7 +19,7 @@
 UpdatePrivCheck: update S2.T1 set C1=0
 UpdatePrivCheck: update S2.T1 set C2=0
 UpdatePrivCheck: update S2.T1 set C3=0
-TriggerPrivCheck: create trigger "T1Trig" after insert on "S2"."T1" for each row mode db2sql values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "S2"."T1" for each row values 1
 SelectPrivCheck: select * from S2.T1
 SelectPrivCheck: select count(*) from "S2"."T1" where (C1 is null) or (C2 is null) or (C3 is null)
 DeletePrivCheck: delete from "S2"."T1"
@@ -27,7 +27,7 @@
 UpdatePrivCheck: update S2.T1 set C1=0
 UpdatePrivCheck: update S2.T1 set C2=0
 UpdatePrivCheck: update S2.T1 set C3=0
-TriggerPrivCheck: create trigger "T1Trig" after insert on "S2"."T1" for each row mode db2sql values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "S2"."T1" for each row values 1
 SelectPrivCheck: select * from S1.T1
 SelectPrivCheck: select count(*) from "S1"."T1" where (C1 is null) or (C2 is null) or (C3 is null)
 SelectPrivCheck: select * from S2.T2
@@ -113,7 +113,7 @@
 UpdatePrivCheck: update R2.T1 set C3=0
 InsertPrivCheck: insert into "R2"."T1" values(0,0,0)
 DeletePrivCheck: delete from "R2"."T1"
-TriggerPrivCheck: create trigger "T1Trig" after insert on "R2"."T1" for each row mode db2sql values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "R2"."T1" for each row values 1
 Revoke test: single table privilege, one user
 SelectPrivCheck: select * from R2.T1
 SelectPrivCheck: select count(*) from "R2"."T1" where (C1 is null) or (C2 is null) or (C3 is null)
@@ -123,7 +123,7 @@
 UpdatePrivCheck: update R2.T1 set C3=0
 InsertPrivCheck: insert into "R2"."T1" values(0,0,0)
 DeletePrivCheck: delete from "R2"."T1"
-TriggerPrivCheck: create trigger "T1Trig" after insert on "R2"."T1" for each row mode db2sql values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "R2"."T1" for each row values 1
 SelectPrivCheck: select * from R1.T1
 SelectPrivCheck: select count(*) from "R1"."T1" where (C1 is null) or (C2 is null) or (C3 is null)
 SelectPrivCheck: select * from R1.T1
@@ -134,8 +134,8 @@
 UpdatePrivCheck: update R1.T1 set C2=0
 UpdatePrivCheck: update R1.T1 set C3=0
 UpdatePrivCheck: update R1.T1 set C3=0
-TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row mode db2sql values 1
-TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row mode db2sql values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row values 1
 Revoke test: multiple table permissions, multiple users
 SelectPrivCheck: select * from R1.T1
 SelectPrivCheck: select count(*) from "R1"."T1" where (C1 is null) or (C2 is null) or (C3 is null)
@@ -149,8 +149,8 @@
 UpdatePrivCheck: update R1.T1 set C1=0
 UpdatePrivCheck: update R1.T1 set C2=0
 UpdatePrivCheck: update R1.T1 set C3=0
-TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row mode db2sql values 1
-TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row mode db2sql values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row values 1
 Revoke test: table privilege implies column privileges
 UpdatePrivCheck: update R1.T1 set C1=0
 UpdatePrivCheck: update R1.T1 set C1=0
@@ -160,7 +160,7 @@
 UpdatePrivCheck: update R1.T1 set C1=0
 UpdatePrivCheck: update R1.T1 set C2=0
 UpdatePrivCheck: update R1.T1 set C3=0
-TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row mode db2sql values 1
+TriggerPrivCheck: create trigger "T1Trig" after insert on "R1"."T1" for each row values 1
 ExecutePrivCheck: values "R1"."F1"()
 ExecutePrivCheck: values "R1"."F1"()
 ExecutePrivCheck: call "R1"."F1"()

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out Mon Oct 30 01:34:06 2006
@@ -253,9 +253,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: Failed with SQLSTATE 28506
-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: Failed with SQLSTATE 28506
 ij(SWIPERCONNECTION)> -- Grant trigger privilege
 set connection satConnection;
@@ -263,9 +263,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
@@ -276,18 +276,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: Failed with SQLSTATE 28506
-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: Failed with SQLSTATE 28506
 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
@@ -1233,7 +1233,7 @@
 ij(MAMTA3)> create table t32TriggerTest (c321 int);
 0 rows inserted/updated/deleted
 ij(MAMTA3)> -- following should fail because not all the privileges are in place
-create trigger tr31t31TriggerTest after insert on t31TriggerTest for each statement mode db2sql
+create trigger tr31t31TriggerTest after insert on t31TriggerTest for each statement
 	insert into t32TriggerTest values (select c111 from mamta2.v21ViewTest where c112=1);
 ERROR: Failed with SQLSTATE 28508
 ij(MAMTA3)> insert into t31TriggerTest values(1);
@@ -1932,7 +1932,7 @@
 ij(MAMTA2)> create table t22TriggerTest (c221 int);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- following should pass because all the privileges are in places
-create trigger tr21t21TriggerTest after insert on t21TriggerTest for each statement mode db2sql
+create trigger tr21t21TriggerTest after insert on t21TriggerTest for each statement
 	insert into t22TriggerTest values (select c111 from mamta1.t11TriggerTest where c112=1);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> insert into t21TriggerTest values(1);
@@ -1987,7 +1987,7 @@
 ij(MAMTA2)> create table t21TriggerTest (c211 int);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- following should pass because all the privileges are in places
-create trigger tr21t21TriggerTest after insert on t21TriggerTest for each statement mode db2sql
+create trigger tr21t21TriggerTest after insert on t21TriggerTest for each statement
 	insert into mamta1.t12RoutineTest values (select c111 from mamta1.t11TriggerTest where c111=1);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- this insert's trigger will cause a new row in mamta1.t12RoutineTest
@@ -2014,7 +2014,7 @@
 3 rows selected
 ij(MAMTA1)> set connection mamta2;
 ij(MAMTA2)> -- following should fail because mamta2 doesn't have trigger permission on mamta1.t11TriggerTest
-create trigger tr11t11TriggerTest after insert on mamta1.t11TriggerTest for each statement mode db2sql
+create trigger tr11t11TriggerTest after insert on mamta1.t11TriggerTest for each statement
         insert into mamta1.t12RoutineTest values (1);
 ERROR: Failed with SQLSTATE 28506
 ij(MAMTA2)> set connection mamta1;
@@ -2022,7 +2022,7 @@
 0 rows inserted/updated/deleted
 ij(MAMTA1)> set connection mamta2;
 ij(MAMTA2)> -- following will pass now because mamta2 has trigger permission on mamta1.t11TriggerTest
-create trigger tr11t11TriggerTest after insert on mamta1.t11TriggerTest for each statement mode db2sql
+create trigger tr11t11TriggerTest after insert on mamta1.t11TriggerTest for each statement
         insert into mamta1.t12RoutineTest values (1);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- following will fail becuae mamta2 has TRIGGER privilege but not INSERT privilege on mamta1.t11TriggerTest
@@ -2085,7 +2085,7 @@
 ij(MAMTA3)> create table t31TriggerTest(c11 int);
 0 rows inserted/updated/deleted
 ij(MAMTA3)> -- following will pass because all the required privileges are in place for mamta3
-create trigger tr31t31 after insert on t31TriggerTest for each statement mode db2sql
+create trigger tr31t31 after insert on t31TriggerTest for each statement
         insert into mamta1.t13TriggerTest values (values mamta1.selectFromSpecificSchema(1));
 0 rows inserted/updated/deleted
 ij(MAMTA3)> -- following insert will cause a row to be inserted into mamta1.t13TriggerTest if the session user
@@ -2283,7 +2283,7 @@
 0 rows inserted/updated/deleted
 ij(MAMTA4)> drop trigger tr41t41;
 ERROR: Failed with SQLSTATE 42X94
-ij(MAMTA4)> create trigger tr41t41 after insert on t41TriggerTest for each statement mode db2sql
+ij(MAMTA4)> create trigger tr41t41 after insert on t41TriggerTest for each statement
         insert into mamta3.t31TriggerTest (select * from mamta2.v21ViewTest);
 ERROR: Failed with SQLSTATE 28508
 ij(MAMTA4)> insert into t41TriggerTest values(1);
@@ -2427,7 +2427,7 @@
 ij(MAMTA2)> create table t21TriggerRevokeTest (c211 int);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- following will pass because mamta2 has trigger permission on mamta1.t11TriggerRevokeTest
-create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement mode db2sql
+create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement
         insert into t21TriggerRevokeTest values(99);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- no data in the table in which trigger is going to insert
@@ -2461,7 +2461,7 @@
 99         
 1 row selected
 ij(MAMTA2)> -- following attempt to create insert trigger again will fail because trigger privilege has been revoked.
-create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement mode db2sql
+create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement
         insert into t21TriggerRevokeTest values(99);
 ERROR: Failed with SQLSTATE 28506
 ij(MAMTA2)> set connection mamta1;
@@ -2469,7 +2469,7 @@
 0 rows inserted/updated/deleted
 ij(MAMTA1)> set connection mamta2;
 ij(MAMTA2)> -- following attempt to create insert trigger again will pass because mamta2 has got the necessary trigger privilege.
-create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement mode db2sql
+create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement
         insert into t21TriggerRevokeTest values(99);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> select * from t21TriggerRevokeTest;
@@ -2522,7 +2522,7 @@
 ij(MAMTA2)> create table t21TriggerRevokeTest (c211 int);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- following will pass because mamta2 has trigger permission on mamta1.t11TriggerRevokeTest
-create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement mode db2sql
+create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement
         insert into t21TriggerRevokeTest values(99);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- no data in the table in which trigger is going to insert
@@ -2558,7 +2558,7 @@
 99         
 1 row selected
 ij(MAMTA2)> -- following attempt to create insert trigger again will pas because TRIGGER privilege was never revoked.
-create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement mode db2sql
+create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest for each statement
         insert into t21TriggerRevokeTest values(99);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> set connection mamta1;
@@ -2612,11 +2612,11 @@
 ij(MAMTA2)> insert into t21TriggerRevokeTest values(1);
 1 row inserted/updated/deleted
 ij(MAMTA2)> -- following will pass because mamta2 has required permissions on mamta1.t11TriggerRevokeTest
-create trigger tr211t21 after insert on t21TriggerRevokeTest for each statement mode db2sql
+create trigger tr211t21 after insert on t21TriggerRevokeTest for each statement
         insert into mamta1.t11TriggerRevokeTest values(99);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> -- following will pass because mamta2 has required permissions on mamta1.t11TriggerRevokeTest
-create trigger tr212t21 after insert on t21TriggerRevokeTest for each statement mode db2sql
+create trigger tr212t21 after insert on t21TriggerRevokeTest for each statement
         insert into mamta1.t12TriggerRevokeTest values(99);
 0 rows inserted/updated/deleted
 ij(MAMTA2)> insert into t21TriggerRevokeTest values(1);
@@ -2987,7 +2987,7 @@
 0 rows inserted/updated/deleted
 ij(MAMTA1)> set connection mamta2;
 ij(MAMTA2)> create trigger tr11t11 after insert on mamta1.t11TriggerRevokeTest
-for each statement mode db2sql
+for each statement
         update mamta1.t12TriggerRevokeTest set c122 = 99;
 0 rows inserted/updated/deleted
 ij(MAMTA2)> set connection mamta1;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/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;
@@ -132,7 +132,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;
@@ -152,7 +152,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;
@@ -172,7 +172,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;
@@ -193,7 +193,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;
@@ -216,7 +216,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;
@@ -239,7 +239,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;
@@ -262,7 +262,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;
@@ -359,7 +359,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;
@@ -1715,10 +1715,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;
@@ -1734,9 +1734,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);
@@ -1767,9 +1767,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
@@ -1801,11 +1801,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
@@ -1844,7 +1844,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
@@ -1885,9 +1885,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/identifier.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out Mon Oct 30 01:34:06 2006
@@ -103,9 +103,9 @@
 ij> create view "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvy" as select * from idtest1;
 ERROR 42622: The name 'vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvy' is too long. The maximum length is '128'.
 ij> -- trigger
-create trigger ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+create trigger ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx after insert on idtest1 for each row update idtest2 set i=i;
 ERROR 42622: The name 'TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTX' is too long. The maximum length is '128'.
-ij> create trigger "ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx" after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+ij> create trigger "ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx" after insert on idtest1 for each row update idtest2 set i=i;
 ERROR 42622: The name 'ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttx' is too long. The maximum length is '128'.
 ij> -- schema
 create schema ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssx;
@@ -169,9 +169,9 @@
 ij> create view "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvw" as select * from idtest1;
 0 rows inserted/updated/deleted
 ij> -- trigger
-create trigger tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+create trigger tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt after insert on idtest1 for each row update idtest2 set i=i;
 0 rows inserted/updated/deleted
-ij> create trigger "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt" after insert on idtest1 for each row mode db2sql update idtest2 set i=i;
+ij> create trigger "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt" after insert on idtest1 for each row update idtest2 set i=i;
 0 rows inserted/updated/deleted
 ij> -- schema
 create schema ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out Mon Oct 30 01:34:06 2006
@@ -571,7 +571,7 @@
 0 rows inserted/updated/deleted
 ij> create trigger trig_import after INSERT on alltypes
 referencing new as newrow
-for each  row mode db2sql
+for each  row
 insert into test1 values(newrow.chartype);
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/procedureInTrigger.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/procedureInTrigger.out?view=diff&rev=469102&r1=469101&r2=469102
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/procedureInTrigger.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_22/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);
 ERROR X0X95: Operation 'CREATE TRIGGER' cannot be performed on object 'T1' because there is an open ResultSet dependent on that object.
 ij> --- delete a row. check that trigger is fired - procedure should be called once
 delete from t1 where i=10;
@@ -730,7 +730,7 @@
 ERROR 42X94: TRIGGER 'SELECT_FROM_TRIG_TABLE' does not exist.
 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;



Mime
View raw message