svn commit: r179696 [6/8] - in /incubator/derby/code/trunk/java: engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ testing/org/apache/derbyTesting/functionTests/master/jdk14/

[fu...@apache.org]

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out Thu Jun  2 18:54:29 2005
@@ -1024,7 +1024,7 @@
 ij(CONN2)> call app.notifyDMLDone();
 ...nested thread running using expired tec
 ...trying to loop through stale result set
-Got expected exception: SQL Exception: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+Got expected exception: SQL Exception: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 Got expected exception: java.sql.SQLException: Statement closed.
 Got expected exception: java.sql.SQLException: Statement closed.
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerRefClause.out Thu Jun  2 18:54:29 2005
@@ -39,13 +39,13 @@
 ERROR 42Y92: DELETE triggers may only reference old transition variables/tables.
 ij> -- cannot reference columns that don't exist, not bound as normal stmts
 create trigger t1 after delete on x referencing old as old for each row mode db2sql values old.badcol;
-ERROR 42X04: Column 'OLD.BADCOL' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'OLD.BADCOL' is not a column in the target table.
+ERROR 42X04: Column 'OLD.BADCOL' 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.BADCOL' is not a column in the target table.
 ij> create trigger t1 after delete on x referencing old as old for each row mode db2sql values old;
-ERROR 42X04: Column 'OLD' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'OLD' is not a column in the target table.
+ERROR 42X04: Column 'OLD' 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' is not a column in the target table.
 ij> create trigger t1 after delete on x referencing old as oldrow for each row mode db2sql values oldrow.badcol;
-ERROR 42X04: Column 'OLDROW.BADCOL' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'OLDROW.BADCOL' is not a column in the target table.
+ERROR 42X04: Column 'OLDROW.BADCOL' 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 'OLDROW.BADCOL' is not a column in the target table.
 ij> create trigger t1 after delete on x referencing old as oldrow for each row mode db2sql values oldrow;
-ERROR 42X04: Column 'OLDROW' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'OLDROW' is not a column in the target table.
+ERROR 42X04: Column 'OLDROW' 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 'OLDROW' is not a column in the target table.
 ij> -- lets try some basics with old/new table
 create table y (x int);
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ungroupedAggregatesNegative.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ungroupedAggregatesNegative.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ungroupedAggregatesNegative.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ungroupedAggregatesNegative.out Thu Jun  2 18:54:29 2005
@@ -8,9 +8,9 @@
 3 rows inserted/updated/deleted
 ij> -- mix aggregate and non-aggregate expressions in the select list
 select c1, max(c1) from t1;
-ERROR 42Y35: Column reference 'C1' is invalid. When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y35: Column reference 'C1' is invalid. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.  
 ij> select c1 * max(c1) from t1;
-ERROR 42Y35: Column reference 'C1' is invalid. When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y35: Column reference 'C1' is invalid. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.  
 ij> -- aggregate in where clause
 select c1 from t1 where max(c1) = 1;
 ERROR 42903: Invalid use of an aggregate function.
@@ -19,7 +19,7 @@
 ERROR 42Z07: Aggregates are not permitted in the ON clause.
 ij> -- correlated subquery in select list
 select max(c1), (select t2.c1 from t2 where t1.c1 = t2.c1) from t1;
-ERROR 42Y29: The SELECT list of a non-grouped query contains at least 1 invalid expression.  When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y29: The SELECT list of a non-grouped query contains at least one invalid expression. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.
 ij> -- noncorrelated subquery that returns more than 1 row
 select max(c1), (select t2.c1 from t2) from t1;
 ERROR 21000: Scalar subquery is only allowed to return a single row.