db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r179696 [3/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/
Date Fri, 03 Jun 2005 01:54:33 GMT
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursor.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursor.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursor.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursor.out Thu Jun  2 18:54:29 2005
@@ -8,15 +8,15 @@
 PASS: setup complete
 PASS: expected and got true
 Row: 1956,hello world                                       
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
 Row: 1956,hello world                                       
 Row: 456,hi yourself                                       
@@ -26,15 +26,15 @@
 PASS: cursor test complete
 PASS: expected and got true
 Row: 1956,hello world                                       
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 PASS: Attempt to get next on closed cursor caught
 PASS: cursor name set
 No current row

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out Thu Jun  2 18:54:29 2005
@@ -25,7 +25,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c1;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c1;
 ij> -- join #1
 get cursor c2 as 
@@ -39,7 +39,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c2;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c2;
 ij> -- join #2
 get cursor c3 as 
@@ -61,7 +61,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c3;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c3;
 ij> -- union all
 get cursor c4 as
@@ -75,7 +75,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c4;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c4;
 ij> -- error in where clause
 -- single table
@@ -90,7 +90,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c10;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c10;
 ij> -- join #1, error on open (1st row in left)
 -- (cursor will not exist after error on open)
@@ -111,7 +111,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c13;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c13;
 ij> -- join #3, error on 1st row in right
 get cursor c14 as 'select * from t1 a, t1 b where b.c1 <> 1 and b.c1/b.c1 = 1';
@@ -120,7 +120,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c14;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c14;
 ij> -- join #4, error on 2nd row in right
 get cursor c15 as 'select * from t1 a, t1 b where b.c1 <> 2 and b.c1/b.c1 = 1';
@@ -134,7 +134,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c15;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c15;
 ij> -- union all
 get cursor c11 as 'select * from t1 where c1/c1 = 1 union all
@@ -149,7 +149,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c11;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c11;
 ij> -- error in join clause
 get cursor c5 as 'select * from t1, t2 where t1.c1/t2.c1 = 1';
@@ -163,7 +163,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c5;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c5;
 ij> -- error in subquery
 -- subquery in select list
@@ -179,7 +179,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c8;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c8;
 ij> -- join
 get cursor c9 as 'select a.c1, (select c1/c1 from t2 where c1 = a.c1) from t1 a, t1 b
@@ -194,7 +194,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c9;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c9;
 ij> -- subquery in where clause
 -- single table query
@@ -210,7 +210,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c6;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c6;
 ij> -- join
 get cursor c7 as 'select * from t1 a, t1 b
@@ -226,7 +226,7 @@
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c7;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> close c7;
 ij> -- drop the tables
 drop table t1;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/db2Compatibility.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/db2Compatibility.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/db2Compatibility.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/db2Compatibility.out Thu Jun  2 18:54:29 2005
@@ -760,13 +760,13 @@
 ij> insert into testconst2( col1, col2, col3) values( 'a', 'a', 1);
 1 row inserted/updated/deleted
 ij> ALTER TABLE testconst2 DROP FOREIGN KEY noSuchConstraint;
-ERROR 42X86: ALTER table failed. There is no constraint 'APP.NOSUCHCONSTRAINT' on table 'APP.TESTCONST2'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'APP.NOSUCHCONSTRAINT' on table 'APP.TESTCONST2'. 
 ij> ALTER TABLE testconst2 DROP CHECK noSuchConstraint;
-ERROR 42X86: ALTER table failed. There is no constraint 'APP.NOSUCHCONSTRAINT' on table 'APP.TESTCONST2'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'APP.NOSUCHCONSTRAINT' on table 'APP.TESTCONST2'. 
 ij> ALTER TABLE testconst2 DROP UNIQUE noSuchConstraint;
-ERROR 42X86: ALTER table failed. There is no constraint 'APP.NOSUCHCONSTRAINT' on table 'APP.TESTCONST2'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'APP.NOSUCHCONSTRAINT' on table 'APP.TESTCONST2'. 
 ij> ALTER TABLE testconst1 DROP PRIMARY KEY;
-ERROR 42X86: ALTER table failed. There is no constraint 'PRIMARY KEY' on table 'APP.TESTCONST1'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'PRIMARY KEY' on table 'APP.TESTCONST1'. 
 ij> -- clean up
 DROP TABLE testconst1;
 0 rows inserted/updated/deleted
@@ -1276,9 +1276,9 @@
 ERROR 42824: An operand of LIKE is not a string, or the first operand is not a column.
 ij> -- SQLSTATE=22019
 select match_me from likeable where match_me like 'fooZ%bar3' escape esc;
-ERROR 22019: Invalid escape sequence, 'ESC'. The escape string must be exactly one character. It can not be a null or more than one character.
+ERROR 22019: Invalid escape sequence, 'ESC'. The escape string must be exactly one character. It cannot be a null or more than one character.
 ij> select match_me from likeable where match_me like 'fooZ%bar3' escape e;
-ERROR 22019: Invalid escape sequence, 'E'. The escape string must be exactly one character. It can not be a null or more than one character.
+ERROR 22019: Invalid escape sequence, 'E'. The escape string must be exactly one character. It cannot be a null or more than one character.
 ij> -- SQLSTATE=42884
 select match_me from likeable where match_me like 'fooZ%bar3' escape 1;
 ERROR 42884: No authorized routine named 'LIKE' of type 'FUNCTION' having compatible arguments was found.
@@ -1365,7 +1365,7 @@
 ij> values TRIM('x' FROM 'xasdf x');
 ERROR 42X01: Syntax error: Encountered "FROM" at line 1, column 17.
 ij> values SUBSTRING('12345' FROM 3 FOR 2);
-ERROR 42X80: VALUES clause must contain at least 1 element and all elements must be non-empty.
+ERROR 42X80: VALUES clause must contain at least one element. Empty elements are not allowed. 
 ij> -- Tests for explicit nulls. Not allowed in DB2, defect 5589 
 -- Should fail.
 create table t1 ( i int null);
@@ -1678,9 +1678,9 @@
 2          |2          
 ij> -- Prevent Cloudscape from using generated column names for ordering
 select i+1 from t1 order by "SQLCol1";
-ERROR 42X04: Column 'SQLCol1' 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 'SQLCol1' is not a column in the target table.
+ERROR 42X04: Column 'SQLCol1' 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 'SQLCol1' is not a column in the target table.
 ij> select i+1 from t1 order by SQLCol1;
-ERROR 42X04: Column 'SQLCOL1' 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 'SQLCOL1' is not a column in the target table.
+ERROR 42X04: Column 'SQLCOL1' 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 'SQLCOL1' is not a column in the target table.
 ij> values (1,2,3),(4,5,6),(7,8,9) order by "SQLCol1";
 ERROR 42X78: Column 'SQLCol1' is not in the result of the query expression.
 ij> -- Column names for a CREATE VIEW should be specified when result table has unnamed columns. 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out Thu Jun  2 18:54:29 2005
@@ -31,7 +31,7 @@
 ERROR 42X03: Column name 'AA' is in more than one table in the FROM list.
 ij> -- verify using "exposed" names
 select a from s ss (aa, bb, cc, dd, ee, ff);
-ERROR 42X04: Column 'A' 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 'A' is not a column in the target table.
+ERROR 42X04: Column 'A' 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 'A' is not a column in the target table.
 ij> -- positive tests
 -- rename the columns
 select * from s ss (f, e, d, c, b, a) where f = 0;
@@ -97,7 +97,7 @@
 ERROR 42X03: Column name 'AA' is in more than one table in the FROM list.
 ij> -- verify using "exposed" names
 select a from (select * from s) ss (aa, bb, cc, dd, ee, ff);
-ERROR 42X04: Column 'A' 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 'A' is not a column in the target table.
+ERROR 42X04: Column 'A' 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 'A' is not a column in the target table.
 ij> -- ambiguous column reference
 select a from (select * from s a, s b) ss;
 ERROR 42Y34: Column name 'A' matches more than one result column in table 'SS'.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/distinct.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/distinct.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/distinct.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/distinct.out Thu Jun  2 18:54:29 2005
@@ -2280,9 +2280,9 @@
 ij> -- . for update on a select distinct
 -- both should get errors, not updatable.
 select distinct d from u for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> select distinct d from u for update of d;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> -- . positioned update/delete on a select distinct
 get cursor c1 as 'select distinct d from u';
 ij> next c1;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out Thu Jun  2 18:54:29 2005
@@ -294,7 +294,7 @@
 ij> -- PASS:0625 If 1 row is inserted?
    SELECT COUNT(*) 
      FROM CHANGG WHERE DIVORCES IS NULL;
-ERROR 42X04: Column 'DIVORCES' 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 'DIVORCES' is not a column in the target table.
+ERROR 42X04: Column 'DIVORCES' 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 'DIVORCES' is not a column in the target table.
 ij> -- PASS:0625 If ERROR, column does not exist?
    COMMIT WORK;
 ij> ALTER TABLE CHANGG ADD NUMBRR CHAR(11);
@@ -307,7 +307,7 @@
 106        
 ij> -- PASS:0625 If value is 106?
    SELECT MAX(NUMBRR) FROM CHANGGVIEW;
-ERROR 42X04: Column 'NUMBRR' 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 'NUMBRR' is not a column in the target table.
+ERROR 42X04: Column 'NUMBRR' 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 'NUMBRR' is not a column in the target table.
 ij> -- PASS:0625 If ERROR, column does not exist ?
    COMMIT WORK;
 ij> --O   DROP VIEW CHANGGVIEW CASCADE;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out Thu Jun  2 18:54:29 2005
@@ -37,7 +37,7 @@
    ROLLBACK WORK;
 ij> SELECT COUNT (*)
   FROM USIG WHERE NUL IS NULL;
-ERROR 42X04: Column 'NUL' 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 'NUL' is not a column in the target table.
+ERROR 42X04: Column 'NUL' 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 'NUL' is not a column in the target table.
 ij> -- PASS:0840 If ERROR, syntax error/access violation, 0 rows selected?
    ROLLBACK WORK;
 ij> --O   DROP TABLE USIG CASCADE;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dynamicLikeOptimization.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dynamicLikeOptimization.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dynamicLikeOptimization.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dynamicLikeOptimization.out Thu Jun  2 18:54:29 2005
@@ -69,7 +69,7 @@
 -----------
 1          
 ij> execute ll15 using 'values ''raZ''';
-ERROR 22019: Invalid escape sequence, 'raZ'. The escape string must be exactly one character. It can not be a null or more than one character.
+ERROR 22019: Invalid escape sequence, 'raZ'. The escape string must be exactly one character. It cannot be a null or more than one character.
 ij> -- too many like chars
 execute ll15 using 'values ''%''';
 1          
@@ -95,7 +95,7 @@
 1          
 ij> -- match
 execute ll2 using 'values (''Z%foobar'', '''') ';
-ERROR 22019: Invalid escape sequence, ''. The escape string must be exactly one character. It can not be a null or more than one character.
+ERROR 22019: Invalid escape sequence, ''. The escape string must be exactly one character. It cannot be a null or more than one character.
 ij> -- error empty string escape 
 prepare ll2 as 'select 1 from t1 where ''%foobar'' like ? escape ''Z''';
 ij> execute ll2 using 'values ''x%foobar'' ';

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql.out Thu Jun  2 18:54:29 2005
@@ -1083,7 +1083,7 @@
 (1.0e31, ,1.0e-31),
 (-1.0e31, -1.0e-31 ), 
 select a from myNumeric;
-ERROR 42X80: VALUES clause must contain at least 1 element and all elements must be non-empty.
+ERROR 42X80: VALUES clause must contain at least one element. Empty elements are not allowed. 
 ij> select -a from myNumeric;
 1                               
 --------------------------------
@@ -1571,7 +1571,7 @@
 ----------------------
 ERROR 22003: The resulting value is outside the range for the data type DOUBLE.
 ij> values{fn abs(-DOUBLE( NaN)                    )};
-ERROR 42X04: Column 'NAN' 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 'NAN' is not a column in the target table.
+ERROR 42X04: Column 'NAN' 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 'NAN' is not a column in the target table.
 ij> values{fn abs( DOUBLE( 4.9E-324)               )};
 ERROR 22003: The resulting value is outside the range for the data type DOUBLE.
 ij> values{fn abs( DOUBLE( 1.7976931348623157E308) )};
@@ -1834,15 +1834,15 @@
 values{ fn locate( 'hello', 'hello',-1 ) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '-1'.  The string to search for is 'hello'.  The string to search from is 'hello'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '-1'.  The string to search for is 'hello'.  The string to search from is 'hello'. 
 ij> values{ fn locate( 'hello', 'hello',-0 ) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '0'.  The string to search for is 'hello'.  The string to search from is 'hello'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '0'.  The string to search for is 'hello'.  The string to search from is 'hello'. 
 ij> values{ fn locate( 'hello', 'hello', 0 ) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '0'.  The string to search for is 'hello'.  The string to search from is 'hello'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '0'.  The string to search for is 'hello'.  The string to search from is 'hello'. 
 ij> values{ fn locate( 'hello', 'hello', 1 ) };
 1          
 -----------
@@ -1862,7 +1862,7 @@
 ij> values{ fn locate( 'hello', 'hellohello', 0 ) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '0'.  The string to search for is 'hello'.  The string to search from is 'hellohello'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '0'.  The string to search for is 'hello'.  The string to search from is 'hellohello'. 
 ij> values{ fn locate( 'hello', 'hellohello', 1 ) };
 1          
 -----------
@@ -1910,15 +1910,15 @@
 ij> values{ fn locate( '?', '?',-1 ) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '-1'.  The string to search for is '?'.  The string to search from is '?'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '-1'.  The string to search for is '?'.  The string to search from is '?'. 
 ij> values{ fn locate( '?', '?',-0 ) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '0'.  The string to search for is '?'.  The string to search from is '?'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '0'.  The string to search for is '?'.  The string to search from is '?'. 
 ij> values{ fn locate( '?', '?', 0 ) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '0'.  The string to search for is '?'.  The string to search from is '?'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '0'.  The string to search for is '?'.  The string to search from is '?'. 
 ij> values{ fn locate( '?', '?', 1 ) };
 1          
 -----------
@@ -1930,7 +1930,7 @@
 ij> values{ fn locate( '\', '\\',0) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '0'.  The string to search for is '\'.  The string to search from is '\\'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '0'.  The string to search for is '\'.  The string to search from is '\\'. 
 ij> values{ fn locate( '\', '\\',1) };
 1          
 -----------
@@ -1946,7 +1946,7 @@
 ij> values{ fn locate( '/', '//',0) };
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '0'.  The string to search for is '/'.  The string to search from is '//'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '0'.  The string to search for is '/'.  The string to search from is '//'. 
 ij> values{ fn locate( '/', '//',1) };
 1          
 -----------
@@ -2747,11 +2747,11 @@
 ij> select locate(a, b, 0) from foo;
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '0'.  The string to search for is 'abc'.  The string to search from is 'abcd'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '0'.  The string to search for is 'abc'.  The string to search from is 'abcd'. 
 ij> select locate(a, b, -1) from foo;
 1          
 -----------
-ERROR 22014: The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is '-1'.  The string to search for is 'abc'.  The string to search from is 'abcd'. 
+ERROR 22014: The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is '-1'.  The string to search for is 'abc'.  The string to search from is 'abcd'. 
 ij> select locate(a, b, 1) from foo;
 1          
 -----------
@@ -3477,7 +3477,7 @@
 ----------------------
 ERROR 22003: The resulting value is outside the range for the data type DOUBLE.
 ij> values{fn  sqrt(-DOUBLE( NaN)                    )};
-ERROR 42X04: Column 'NAN' 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 'NAN' is not a column in the target table.
+ERROR 42X04: Column 'NAN' 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 'NAN' is not a column in the target table.
 ij> values{fn  sqrt( DOUBLE( 4.9E-324)               )};
 ERROR 22003: The resulting value is outside the range for the data type DOUBLE.
 ij> values{fn  sqrt( DOUBLE( 1.7976931348623157E308) )};
@@ -3598,7 +3598,7 @@
 ij> select { fn mod(dbl, 3) } from modfn;
 ERROR 42Y95: The 'mod' operator with a left operand type of 'DOUBLE' and a right operand type of 'INTEGER' is not supported.
 ij> select { fn mod(67, t) } from modfn where s <> 0;
-ERROR 42X04: Column 'T' 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 'T' is not a column in the target table.
+ERROR 42X04: Column 'T' 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 'T' is not a column in the target table.
 ij> select { fn mod(67, s) } from modfn where s <> 0;
 1          
 -----------

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql_nonSPS.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql_nonSPS.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql_nonSPS.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ejbql_nonSPS.out Thu Jun  2 18:54:29 2005
@@ -45,11 +45,11 @@
 ERROR 42X01: Syntax error: Encountered ")" at line 1, column 18.
 ij> -- Substring tests. Valid only as escaped function
 values substring('asdf', 1);
-ERROR 42X80: VALUES clause must contain at least 1 element and all elements must be non-empty.
+ERROR 42X80: VALUES clause must contain at least one element. Empty elements are not allowed. 
 ij> values substring(X'101101', 3);
-ERROR 42X80: VALUES clause must contain at least 1 element and all elements must be non-empty.
+ERROR 42X80: VALUES clause must contain at least one element. Empty elements are not allowed. 
 ij> values substring('asdf', 1, 2);
-ERROR 42X80: VALUES clause must contain at least 1 element and all elements must be non-empty.
+ERROR 42X80: VALUES clause must contain at least one element. Empty elements are not allowed. 
 ij> values {fn substring('asdf', 1)};
 1   
 ----

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptDatabase.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptDatabase.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptDatabase.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptDatabase.out Thu Jun  2 18:54:29 2005
@@ -9,7 +9,7 @@
 -- try the old password, should fail
 connect 'jdbc:derby:wombat;bootPassword=Thursday';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
-ERROR XBM06: Startup failed, an encrypted database cannot be accessed without the correct boot password.
+ERROR XBM06: Startup failed. An encrypted database cannot be accessed without the correct boot password.  
 ij> connect 'jdbc:derby:wombat;bootPassword=Wednesday';
 ij> -- switch back to old password
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Wednesday, Thursday');
@@ -32,13 +32,13 @@
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', null);
 ERROR XBCX5: Cannot change boot password to null.
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'wrongkey, ');
-ERROR XBCX2: Initializing cipher with a boot password that is too short, must be at least 8 characters long
+ERROR XBCX2: Initializing cipher with a boot password that is too short. The password must be at least 8 characters long.    
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursday');
 ERROR XBCX7: Wrong format for changing boot password.  Format must be : old_boot_password, new_boot_password.
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursday , ');
-ERROR XBCX2: Initializing cipher with a boot password that is too short, must be at least 8 characters long
+ERROR XBCX2: Initializing cipher with a boot password that is too short. The password must be at least 8 characters long.    
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursday , short');
-ERROR XBCX2: Initializing cipher with a boot password that is too short, must be at least 8 characters long
+ERROR XBCX2: Initializing cipher with a boot password that is too short. The password must be at least 8 characters long.    
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursdya , derbypwd');
 ERROR XBCXA: Wrong boot password.
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('bootPassword', 'Thursdayx , derbypwd');
@@ -70,13 +70,13 @@
 ERROR XJ015: Derby system shutdown.
 ij> connect 'jdbc:derby:wombat';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
-ERROR XBM06: Startup failed, an encrypted database cannot be accessed without the correct boot password.
+ERROR XBM06: Startup failed. An encrypted database cannot be accessed without the correct boot password.  
 ij> connect 'jdbc:derby:wombat;bootPassword=Thursday';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
-ERROR XBM06: Startup failed, an encrypted database cannot be accessed without the correct boot password.
+ERROR XBM06: Startup failed. An encrypted database cannot be accessed without the correct boot password.  
 ij> connect 'jdbc:derby:wombat;bootPassword=Saturday';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
-ERROR XBM06: Startup failed, an encrypted database cannot be accessed without the correct boot password.
+ERROR XBM06: Startup failed. An encrypted database cannot be accessed without the correct boot password.  
 ij> connect 'jdbc:derby:wombat;bootPassword=derbypwd';
 ij> values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('bootPassword');
 1                                                                                                                               
@@ -104,7 +104,7 @@
 ERROR XJ015: Derby system shutdown.
 ij> connect 'jdbc:derby:wombat;bootPassword=derbypwd';
 ERROR XJ040: Failed to start database 'wombat', see the next exception for details.
-ERROR XBM06: Startup failed, an encrypted database cannot be accessed without the correct boot password.
+ERROR XBM06: Startup failed. An encrypted database cannot be accessed without the correct boot password.  
 ij> connect 'jdbc:derby:wombat;bootPassword=derbypwdxx';
 ij> select * from t1;
 A                   

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptParams.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptParams.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptParams.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptParams.out Thu Jun  2 18:54:29 2005
@@ -82,36 +82,36 @@
 -- should not work
 connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DESede/CBC/PKCS5Padding';
 ERROR XJ041: Failed to create database 'wombatBad', see the next exception for details.
-ERROR XBM01: Startup failed due to an exception, see next exception for details.
+ERROR XBM01: Startup failed due to an exception. See next exception for details. 
 ERROR XBCXB: Bad encryption padding 'PKCS5Padding' or padding not specified. 'NoPadding' must be used.
 ij> -- create a new database with a bad algorithm
 -- should not work
 connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=Fungus/CBC/NoPadding';
 ERROR XJ041: Failed to create database 'wombatBad', see the next exception for details.
-ERROR XBM01: Startup failed due to an exception, see next exception for details.
+ERROR XBM01: Startup failed due to an exception. See next exception for details. 
 ERROR XBCXC: Encryption algorithm 'Fungus/CBC/NoPadding' does not exist. Please check that the chosen provider 'default' supports this algorithm.
 ij> -- create a new database with another bad algorithm (bad feedback mode)
 -- should not work
 connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DES/CNN/NoPadding';
 ERROR XJ041: Failed to create database 'wombatBad', see the next exception for details.
-ERROR XBM01: Startup failed due to an exception, see next exception for details.
+ERROR XBM01: Startup failed due to an exception. See next exception for details. 
 ERROR XBCXI: The feedback mode 'CNN' is not supported. Supported feedback modes are CBC, CFB, OFB and ECB.
 ij> -- create a new database with a bad provider
 -- should not work
 connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionProvider=com.foo.bar';
 ERROR XJ041: Failed to create database 'wombatBad', see the next exception for details.
-ERROR XBM0G: Failed to start encryption engine. Please make sure you are running Java 2 and have downloaded an encryption provider such as jce and put it in your classpath.
+ERROR XBM0G: Failed to start encryption engine. Please make sure you are running Java 2 and have downloaded an encryption provider such as jce and put it in your class path. 
 ERROR XBCXF: The class 'com.foo.bar' representing the encryption provider cannot be found.
 ij> -- create a new database with a bad encryption algorithm format
 -- should not work
 connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DES';
 ERROR XJ041: Failed to create database 'wombatBad', see the next exception for details.
-ERROR XBM01: Startup failed due to an exception, see next exception for details.
+ERROR XBM01: Startup failed due to an exception. See next exception for details. 
 ERROR XBCXH: The encryptionAlgorithm 'DES' is not in the correct format. The correct format is algorithm/feedbackMode/NoPadding.
 ij> -- create a new database with a non supported feedback mode (PCBC)
 -- should not work
 connect 'jdbc:derby:wombatBad;create=true;dataEncryption=true;bootPassword=ThursdaySaturday;encryptionAlgorithm=DES/PCBC/NoPadding';
 ERROR XJ041: Failed to create database 'wombatBad', see the next exception for details.
-ERROR XBM01: Startup failed due to an exception, see next exception for details.
+ERROR XBM01: Startup failed due to an exception. See next exception for details. 
 ERROR XBCXI: The feedback mode 'PCBC' is not supported. Supported feedback modes are CBC, CFB, OFB and ECB.
 ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptionKey.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptionKey.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptionKey.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/encryptionKey.out Thu Jun  2 18:54:29 2005
@@ -43,11 +43,11 @@
 --  wrong length
 connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=616364656667686961626364656568';
 ERROR XJ040: Failed to start database 'encdbcbc_key', see the next exception for details.
-ERROR XBCXK: The given encryption key does not match the encryption key used when creating the database. Please ensure that you are using the correct encryption key and re-try. 
+ERROR XBCXK: The given encryption key does not match the encryption key used when creating the database. Please ensure that you are using the correct encryption key and try again. 
 ij(CONNECTION1)> -- wrong key
 connect 'jdbc:derby:encdbcbc_key;create=true;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=68626364656667686961626364656568';
 ERROR XJ040: Failed to start database 'encdbcbc_key', see the next exception for details.
-ERROR XBCXK: The given encryption key does not match the encryption key used when creating the database. Please ensure that you are using the correct encryption key and re-try. 
+ERROR XBCXK: The given encryption key does not match the encryption key used when creating the database. Please ensure that you are using the correct encryption key and try again. 
 ij(CONNECTION1)> select * from t1;
 ERROR 08003: No current connection.
 ij(CONNECTION1)> -- correct key
@@ -80,7 +80,7 @@
 ij(CONNECTION4)> -- create db from backup using wrong key
 connect 'jdbc:derby:encdbcbc_key3;createFrom=extinout/bkup1/encdbcbc_key;dataEncryption=true;encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=61226364656667686961626364656568';
 ERROR XJ040: Failed to start database 'encdbcbc_key3', see the next exception for details.
-ERROR XBCXK: The given encryption key does not match the encryption key used when creating the database. Please ensure that you are using the correct encryption key and re-try. 
+ERROR XBCXK: The given encryption key does not match the encryption key used when creating the database. Please ensure that you are using the correct encryption key and try again. 
 ij(CONNECTION4)> select * from t1;
 ERROR 08003: No current connection.
 ij(CONNECTION4)> connect 'jdbc:derby:encdbcbc_key3;shutdown=true';

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/fk_nonSPS.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/fk_nonSPS.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/fk_nonSPS.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/fk_nonSPS.out Thu Jun  2 18:54:29 2005
@@ -339,7 +339,7 @@
 0 rows inserted/updated/deleted
 ij> -- we shouldn't be able to add an fk on p1 now
 alter table f add constraint fk foreign key (x) references p1;
-ERROR X0Y41: Constraint 'FK' is invalid: referenced table APP.P1 has no primary key.  Either add a primary key to APP.P1 or explicity specify the columns of a unique constraint that this foreign key references.
+ERROR X0Y41: Constraint 'FK' is invalid because the referenced table APP.P1 has no primary key.  Either add a primary key to APP.P1 or explicitly specify the columns of a unique constraint that this foreign key references. 
 ij> -- add the constraint and try again
 alter table p1 add constraint pk1 primary key (x);
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/floattypes.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/floattypes.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/floattypes.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/floattypes.out Thu Jun  2 18:54:29 2005
@@ -1619,7 +1619,7 @@
 ij> insert into t(r) values '1.0';
 ERROR 42821: Columns of type 'REAL' cannot hold values of type 'CHAR'. 
 ij> update t set r = NaN;
-ERROR 42X04: Column 'NAN' 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 'NAN' is not a column in the target table.
+ERROR 42X04: Column 'NAN' 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 'NAN' is not a column in the target table.
 ij> update t set r = +3.4021E+38;
 0 rows inserted/updated/deleted
 ij> update t set r = -3.4021E+38;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/forupdate.out Thu Jun  2 18:54:29 2005
@@ -83,44 +83,44 @@
 ij> -- . for update col not in sel list or in table
 -- this gets a 'no such column' error
 select i, v from t1 for update of g;
-ERROR 42X04: Column 'G' 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 'G' is not a column in the target table.
+ERROR 42X04: Column 'G' 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 'G' is not a column in the target table.
 ij> -- . for update col in select not in table (generated col)
 -- this gets a 'no such column' error
 select i+10 as iPlus10, v from t1 for update of iPlus10;
-ERROR 42X04: Column 'IPLUS10' 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 'IPLUS10' is not a column in the target table.
+ERROR 42X04: Column 'IPLUS10' 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 'IPLUS10' is not a column in the target table.
 ij> -- . for update on read only spec, variety of reasons 
 -- these will get cursor not updatable errors:
 -- join is not updatable
 select i from t1, t2 for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> -- no subqueries are updatable
 select i from t1 where i=(select i from t1) for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> select i from t1 where i in (select i from t1) for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> select i from t1 where exists (select i from t1) for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> select i from t1 where exists (select s from t2) for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> select i from t1 where exists (select s from t2 where i=s) for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> -- note subquery in select expr is not updatable
 select (select s from t2) from t1 where exists (select i from t1) for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> select (select s from t2 where i=s) from t1 where exists (select i from t1) for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> select * from (select i, d from t1) a for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> select * from (select i+10, d from t1) a for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> -- constant table not updatable
 select * from (values (1, 2, 3)) a for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> values (1, 2, 3) for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> -- unions are not updatable
 select * from t1 union all select * from t1 for update;
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> -- . table with/without correlation name
 -- the idea is that the delete is against the table name, not the correlation name
 -- we've already seen the without correlation name case in previous tests
@@ -158,7 +158,7 @@
 ij> -- . use column as named in as clause of select v. as named in base table
 -- the column name must be the table's column name, not the select list name
 select i as z from t1 for update of z;
-ERROR 42X04: Column 'Z' 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 'Z' is not a column in the target table.
+ERROR 42X04: Column 'Z' 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 'Z' is not a column in the target table.
 ij> -- . use column as named in as clause that matches underlying column name
 -- this uses the select list name which *is* an underlying column name
 -- note that the column updated is the underlying column, *not* the

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/groupBy.out Thu Jun  2 18:54:29 2005
@@ -10,14 +10,14 @@
 ERROR 42X01: Syntax error: Encountered "1" at line 2, column 27.
 ij> -- column in group by list not in from list
 select a as d from t1 group by d;
-ERROR 42X04: Column 'D' 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 'D' is not a column in the target table.
+ERROR 42X04: Column 'D' 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 'D' is not a column in the target table.
 ij> -- column in group by list not in select list
 select a as b from t1 group by b;
-ERROR 42Y36: Column reference 'A' is invalid.  For a SELECT with a GROUP BY, the SELECT list may only contain grouping columns and valid aggregate expressions.
+ERROR 42Y36: Column reference 'A' is invalid.  For a SELECT list with a GROUP BY, the list may only contain grouping columns and valid aggregate expressions.  
 ij> select a from t1 group by b;
-ERROR 42Y36: Column reference 'A' is invalid.  For a SELECT with a GROUP BY, the SELECT list may only contain grouping columns and valid aggregate expressions.
+ERROR 42Y36: Column reference 'A' is invalid.  For a SELECT list with a GROUP BY, the list may only contain grouping columns and valid aggregate expressions.  
 ij> select a, char(b) from t1 group by a;
-ERROR 42Y36: Column reference 'B' is invalid.  For a SELECT with a GROUP BY, the SELECT list may only contain grouping columns and valid aggregate expressions.
+ERROR 42Y36: Column reference 'B' is invalid.  For a SELECT list with a GROUP BY, the list may only contain grouping columns and valid aggregate expressions.  
 ij> -- columns in group by list must be unique
 select a, b from t1 group by a, a;
 ERROR 42Y19: 'A' appears multiple times in the GROUP BY list. Columns in the GROUP BY list must be unambiguous.
@@ -25,19 +25,19 @@
 ERROR 42Y19: 'A' appears multiple times in the GROUP BY list. Columns in the GROUP BY list must be unambiguous.
 ij> -- cursor with group by is not updatable
 get cursor c1 as 'select a from t1 group by a for update';
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> -- noncorrelated subquery that returns too many rows
 select a, (select a from t2) from t1 group by a;
 ERROR 21000: Scalar subquery is only allowed to return a single row.
 ij> -- correlation on outer table
 select t2.a, (select b from t1 where t1.b = t2.b) from t1 t2 group by t2.a;
-ERROR 42Y30: The SELECT list of a grouped query contains at least 1 invalid expression.  For a SELECT with a GROUP BY, the SELECT list may only contain grouping columns and valid aggregate expressions.
+ERROR 42Y30: The SELECT list of a grouped query contains at least one invalid expression. If a SELECT list has a GROUP BY, the list may only contain grouping columns and valid aggregate expressions.  
 ij> -- having clause
 -- cannot contain column references which are not grouping columns
 select a from t1 group by a having c = 1;
-ERROR 42X04: Column 'C' 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 'C' is not a column in the target table.
+ERROR 42X04: Column 'C' 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 'C' is not a column in the target table.
 ij> select a from t1 o group by a having a = (select a from t1 where b = b.o);
-ERROR 42X04: Column 'B.O' 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 'B.O' is not a column in the target table.
+ERROR 42X04: Column 'B.O' 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 'B.O' is not a column in the target table.
 ij> -- ?s in group by
 select a from t1 group by ?;
 ERROR 42X01: Syntax error: Encountered "?" at line 2, column 27.
@@ -45,7 +45,7 @@
 create table unmapped(c1 long varchar);
 0 rows inserted/updated/deleted
 ij> select c1, max(1) from unmapped group by c1;
-ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> -- clean up
 drop table t1;
 0 rows inserted/updated/deleted
@@ -562,13 +562,13 @@
 ERROR 42X19: The WHERE or HAVING clause or CHECK CONSTRAINT definition is a 'INTEGER' expression.  It must be a BOOLEAN expression.
 ij> -- column references in having clause not allowed if no group by
 select * from t1 having c1 = 1;
-ERROR 42Y35: Column reference 'T1.C1' is invalid. When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y35: Column reference 'T1.C1' is invalid. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.  
 ij> select 1 from t1 having c1 = 1;
-ERROR 42X04: Column 'C1' 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 'C1' is not a column in the target table.
+ERROR 42X04: Column 'C1' 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 'C1' is not a column in the target table.
 ij> -- correlated subquery in having clause
 select * from t1 t1_outer 
 having 1 = (select 1 from t1 where c1 = t1_outer.c1);
-ERROR 42Y35: Column reference 'T1_OUTER.C1' is invalid. When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y35: Column reference 'T1_OUTER.C1' is invalid. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.  
 ij> -- drop the table
 drop table t1;
 0 rows inserted/updated/deleted
@@ -588,22 +588,22 @@
 ij> -- all 6 queries below should fail after bug 5653 is fixed
 -- select * 
 select * from t1 having 1=1;
-ERROR 42Y35: Column reference 'T1.C1' is invalid. When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y35: Column reference 'T1.C1' is invalid. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.  
 ij> -- select column
 select c1 from t1 having 1=1;
-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 with a built-in function sqrt
 select sqrt(c1) from t1 having 1=1;
-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> -- non-correlated subquery in having clause
 select * from t1 having 1 = (select 1 from t1 where c1 = 0.0);
-ERROR 42Y35: Column reference 'T1.C1' is invalid. When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y35: Column reference 'T1.C1' is invalid. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.  
 ij> -- expression in select list
 select (c1 * c1) / c1 from t1 where c1 <> 0 having 1=1;
-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> -- between
 select * from t1 having 1 between 1 and 2;
-ERROR 42Y35: Column reference 'T1.C1' is invalid. When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y35: Column reference 'T1.C1' is invalid. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.  
 ij> -- drop the table
 drop table t1;
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out Thu Jun  2 18:54:29 2005
@@ -32,9 +32,9 @@
 ij> -- now try the fetch on cursors again after commit
 -- cursors jdk1 and jdk2 will give errors
 next jdk1;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk2;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk4;
 C11        |C12        
 -----------------------
@@ -72,11 +72,11 @@
 ij> -- now try the fetch on cursors again after rollback
 -- all the cursors will give errors
 next jdk1;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk2;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk4;
-ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 ij> -- clean up.
 close jdk1;
 ij> close jdk2;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/identifier.out Thu Jun  2 18:54:29 2005
@@ -10,16 +10,16 @@
 0 rows inserted/updated/deleted
 ij> -- duplicate identifiers
 create table t1 (c1 int, C1 int);
-ERROR 42X12: Column name 'C1' appears more than once in the create table statement.
+ERROR 42X12: Column name 'C1' appears more than once in the CREATE TABLE statement.  
 ij> -- duplicate identifier/delimited identifier
 create table t1 (c1 int, "C1" int);
-ERROR 42X12: Column name 'C1' appears more than once in the create table statement.
+ERROR 42X12: Column name 'C1' appears more than once in the CREATE TABLE statement.  
 ij> -- duplicate delimited identifier/identifier
 create table t1 ("C1" int, C1 int);
-ERROR 42X12: Column name 'C1' appears more than once in the create table statement.
+ERROR 42X12: Column name 'C1' appears more than once in the CREATE TABLE statement.  
 ij> -- duplicate delimited identifiers
 create table t1 ("C1" int, "C1" int);
-ERROR 42X12: Column name 'C1' appears more than once in the create table statement.
+ERROR 42X12: Column name 'C1' appears more than once in the CREATE TABLE statement.  
 ij> -- verify preservation of spaces
 create table success1 (c1 int, " C1" int, "  C1  " int);
 0 rows inserted/updated/deleted
@@ -46,7 +46,7 @@
 ij> -- C1 appears twice in the column list - C1 and "C1"
 insert into success1 (C1, "C1", " C1", " C1 ", "  C1  ") 
 values (16, 17, 18, 19, 20);
-ERROR 42X13: Column name 'C1' appears more than once times in the column list of an insert statement.
+ERROR 42X13: Column name 'C1' appears more than once times in the column list of an INSERT statement. 
 ij> -- verify correct handling in a select
 select C1, " C1", " C1", "  C1  " from success1;
 C1         | C1        | C1        |  C1       
@@ -55,11 +55,11 @@
 6          |7          |7          |8          
 ij> -- following should fail for "C1 "
 select c1, "C1 ", " C1", " C1 ", "  C1  " from success1;
-ERROR 42X04: Column 'C1 ' 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 'C1 ' is not a column in the target table.
+ERROR 42X04: Column 'C1 ' 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 'C1 ' is not a column in the target table.
 ij> -- negative testing for an insert
 -- "c1 " should not match
 select c1, "c1 ", " C1", " C1 ", "  C1  "  from success1;
-ERROR 42X04: Column 'c1 ' 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 'c1 ' is not a column in the target table.
+ERROR 42X04: Column 'c1 ' 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 'c1 ' is not a column in the target table.
 ij> -- negative test for max identifier width
 -- NOTE: no negative test for max identifier length of function, savepoint and cursor
 -- tables needed for index, trigger and view test

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests.out Thu Jun  2 18:54:29 2005
@@ -9,7 +9,7 @@
 --export can not create file
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'nodir/t1.dat' , 
                                  null, null, null) ;
-ERROR XIE0I: Got IOException while writing data to the file
+ERROR XIE0I: An IOException occurred while writing data to the file.
 ij> --export table not found
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 'NOTABLE' , 'extinout/t1.dat' , 
                                  null, null, null) ;
@@ -28,7 +28,7 @@
 ij> --export codeset is invalid
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from iep.t1', 
                                     'extinout/t1.dat' , null, null, 'NOSUCHCODESET') ;
-ERROR XIE0I: Got IOException while writing data to the file
+ERROR XIE0I: An IOException occurred while writing data to the file.
 ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('XXXX', 't1' , 'extinout/t1.dat' , 
                                  null, null, null) ;
 ERROR 38000: The exception 'SQL Exception: Schema 'XXXX' does not exist' was thrown while evaluating an expression.
@@ -98,11 +98,11 @@
 ij> --import table not found
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 'NOTABLE' , 'extinout/t1.dat' , 
                                  null, null, null, 0) ;
-ERROR XIE0M: Table 'IEP.NOTABLE' does not exist.
+ERROR XIE0M: Table 'IEP.NOTABLE' does not exist.  
 ij> --import schema is not valid
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('XXXX', 't1' , 'extinout/t1.dat' , 
                                  null, null, null, 0) ;
-ERROR XIE0M: Table 'XXXX.T1' does not exist.
+ERROR XIE0M: Table 'XXXX.T1' does not exist.  
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
                                  null, null, 'INCORRECTCODESET', 0) ;
 ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.
@@ -180,7 +180,7 @@
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('session', 'temp2' , 'extinout/temp1.dat' , 
                                  null, null, null, 0) ;
-ERROR XIE0M: Table 'SESSION.TEMP2' does not exist.
+ERROR XIE0M: Table 'SESSION.TEMP2' does not exist.  
 ij> select * from session.temp2 ;
 ERROR 42X05: Table 'SESSION.TEMP2' does not exist.
 ij> commit ;
@@ -218,11 +218,11 @@
 call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'x1, x2, x3, x4', null,
                                  'extinout/t3.dat' , 
                                  null, null, null, 0) ;
-ERROR XIE08: There is no column by name: x1
+ERROR XIE08: There is no column named: x1.  
 ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'x1, x2, x3', '1,2,3,4', 
                                  'extinout/t3.dat' , 
                                  null, null, null, 0) ;
-ERROR XIE08: There is no column by name: x1
+ERROR XIE08: There is no column named: x1.  
 ij> --import data insert column names count < column indexes does not match
 call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'c1, c2, c3', '1,2,3,4', 
                                  'extinout/t3.dat' , 
@@ -237,8 +237,8 @@
 ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , null, '11,22,12,24', 
                                  'extinout/t3.dat' , 
 				 null, null, null, 0) ;
-ERROR 38000: The exception 'SQL Exception: Column 'COLUMN11' 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 'COLUMN11' is not a column in the target table.' was thrown while evaluating an expression.
-ERROR 42X04: Column 'COLUMN11' 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 'COLUMN11' is not a column in the target table.
+ERROR 38000: The exception 'SQL Exception: Column 'COLUMN11' 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 'COLUMN11' is not a column in the target table.' was thrown while evaluating an expression.
+ERROR 42X04: Column 'COLUMN11' 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 'COLUMN11' is not a column in the target table.
 ij> --repeat the above type cases with empty file and minor variation to paramters
 delete from t3 ;
 12 rows inserted/updated/deleted
@@ -249,11 +249,11 @@
 call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'x1, x2, x3, x4', null, 
                                  'extinout/t3.dat' , 
                                  ';', '^', 'utf-16', 1) ;
-ERROR XIE08: There is no column by name: x1
+ERROR XIE08: There is no column named: x1.  
 ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'x1, x2, x3', '1,2,3,4', 
                                  'extinout/t3.dat' , 
 				    ';', '^', 'utf-16', 1) ;
-ERROR XIE08: There is no column by name: x1
+ERROR XIE08: There is no column named: x1.  
 ij> --import data insert column names count < column indexes does not match
 call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'c1, c2, c3', null, 
                                  'extinout/t3.dat' , 
@@ -282,18 +282,18 @@
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 'ntype' , 'extinout/ntype.dat' , 
                                  null, null, null) ;
-ERROR XIE0B: Column 'CT' in the table is of type CLOB, it is not supported by import/export.
+ERROR XIE0B: Column 'CT' in the table is of type CLOB, it is not supported by the import/export feature.   
 ij> call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from iep.ntype1',
 				   'extinout/ntype.dat' , 
                                    null, null, null) ;
-ERROR XIE0B: Column 'BT' in the table is of type BLOB, it is not supported by import/export.
+ERROR XIE0B: Column 'BT' in the table is of type BLOB, it is not supported by the import/export feature.   
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 'ntype' , 'extinout/ntype.dat' , 
                                  null, null, null, 0) ;
-ERROR XIE0B: Column 'CT' in the table is of type CLOB, it is not supported by import/export.
+ERROR XIE0B: Column 'CT' in the table is of type CLOB, it is not supported by the import/export feature.   
 ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 'ntype1' , null , null, 
                                  'extinout/ntype.dat' , 
                                  null, null, null, 0) ;
-ERROR XIE0B: Column 'BT' in the table is of type BLOB, it is not supported by import/export.
+ERROR XIE0B: Column 'BT' in the table is of type BLOB, it is not supported by the import/export feature.   
 ij> --import should aquire a lock on the table
 create table parent(a int not null primary key);
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out Thu Jun  2 18:54:29 2005
@@ -310,7 +310,7 @@
 ij> --table not found error should issue a implicit rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'notable' , 'extinout/t1.del' , 
                                  null, null, null, 0) ;
-ERROR XIE0M: Table 'NOTABLE' does not exist.
+ERROR XIE0M: Table 'NOTABLE' does not exist.  
 ij> commit ;
 ij> select * from t1 ;
 A          
@@ -370,7 +370,7 @@
 ij> --table not found error should issue a implicit rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'notable' , 'extinout/t1.del' , 
                                  null, null, null, 1) ;
-ERROR XIE0M: Table 'NOTABLE' does not exist.
+ERROR XIE0M: Table 'NOTABLE' does not exist.  
 ij> commit ;
 ij> ---check IMPORT_DATA calls commit/rollback
 select * from t1 ;
@@ -426,7 +426,7 @@
 ij> --table not found error should issue a implicit rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'notable' , 'a' , '1', 'extinout/t1.del' , 
                                  null, null, null, 1) ;
-ERROR XIE0M: Table 'NOTABLE' does not exist.
+ERROR XIE0M: Table 'NOTABLE' does not exist.  
 ij> commit ;
 ij> select * from t1 ;
 A          

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out Thu Jun  2 18:54:29 2005
@@ -2574,7 +2574,7 @@
 ij> values 1, '1.1';
 ERROR 42X61: Types 'INTEGER' and 'CHAR' are not UNION compatible.
 ij> values '1.1', a;
-ERROR 42X04: Column 'A' 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 'A' is not a column in the target table.
+ERROR 42X04: Column 'A' 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 'A' is not a column in the target table.
 ij> values cast(1 as bigint), 'a';
 ERROR 42X61: Types 'BIGINT' and 'CHAR' are not UNION compatible.
 ij> values 'a', cast(1 as bigint);

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExport.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExport.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExport.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExport.out Thu Jun  2 18:54:29 2005
@@ -2,7 +2,7 @@
 testing non-existing data file
 Data file not found: extinout/Z.dat
 testing null data file
-Data file can not be null.
+Data file cannot be null. 
 testing empty table
 testing empty table with Delimited format
 testing empty table import Field/Char Delimiters
@@ -13,11 +13,11 @@
 testing IE with delimiters(%, &) and Cp1252
 testing IE with delimiters(%, &) and UTF-16
 testing IE with delimiters(^, #) and WRONG ENCODEINGH
-Got IOException while writing data to the file
+An IOException occurred while writing data to the file.
 testing datatypes that does not have Export Supprt
-Column 'C1' in the table is of type BLOB, it is not supported by import/export.
-Column 'C1' in the table is of type BLOB, it is not supported by import/export.
-Read endOfFile at unexpected place on line 2
+Column 'C1' in the table is of type BLOB, it is not supported by the import/export feature.   
+Column 'C1' in the table is of type BLOB, it is not supported by the import/export feature.   
+Read endOfFile at unexpected place on line 2.
 PASS: finished testing import and export
 PASS: teardown complete
 PASS: finished cleaning up the temporary objects from database



Mime
View raw message