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 [4/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/importExportThruIJ.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out Thu Jun  2 18:54:29 2005
@@ -22,8 +22,8 @@
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extin/EndOfFile.txt' , 
                                     null, null, null, 0) ;
-ERROR 38000: The exception 'SQL Exception: Read endOfFile at unexpected place on line 2' was thrown while evaluating an expression.
-ERROR XIE0E: Read endOfFile at unexpected place on line 2
+ERROR 38000: The exception 'SQL Exception: Read endOfFile at unexpected place on line 2.' was thrown while evaluating an expression.
+ERROR XIE0E: Read endOfFile at unexpected place on line 2.
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extin/Tutor1.asc' , 
                                     null, null, null, 0) ;
 0 rows inserted/updated/deleted
@@ -56,8 +56,8 @@
 ij> --this one should fail becuase this is not the right command to handle fixed formats
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T2' , 'extin/Tutor2.asc' , 
                                     null, null, null, 0) ;
-ERROR 38000: The exception 'SQL Exception: Column 'COLUMN2' 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 'COLUMN2' is not a column in the target table.' was thrown while evaluating an expression.
-ERROR 42X04: Column 'COLUMN2' 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 'COLUMN2' is not a column in the target table.
+ERROR 38000: The exception 'SQL Exception: Column 'COLUMN2' 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 'COLUMN2' is not a column in the target table.' was thrown while evaluating an expression.
+ERROR 42X04: Column 'COLUMN2' 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 'COLUMN2' is not a column in the target table.
 ij> values (SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'T2'));
 1          
 -----------
@@ -82,8 +82,8 @@
                                   null , '3, 2, 1, 4, 9, 200' ,
 				  'extin/Tutor3.asc' , 
 				  null, null, null, 0) ;
-ERROR 38000: The exception 'SQL Exception: Column 'COLUMN200' 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 'COLUMN200' is not a column in the target table.' was thrown while evaluating an expression.
-ERROR 42X04: Column 'COLUMN200' 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 'COLUMN200' is not a column in the target table.
+ERROR 38000: The exception 'SQL Exception: Column 'COLUMN200' 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 'COLUMN200' is not a column in the target table.' was thrown while evaluating an expression.
+ERROR 42X04: Column 'COLUMN200' 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 'COLUMN200' is not a column in the target table.
 ij> rollback;
 ij> -- table should not be there
 select count(*) from T3;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/innerjoin.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/innerjoin.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/innerjoin.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/innerjoin.out Thu Jun  2 18:54:29 2005
@@ -45,7 +45,7 @@
 ERROR 42972: An ON clause associated with a JOIN operator is not valid.
 ij> -- should match db2's behavior by raising an error
 select * from t2 b inner join t3 c on a.c1 = b.c1 and b.c1 = c.c1;
-ERROR 42X04: Column 'A.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 'A.C1' is not a column in the target table.
+ERROR 42X04: Column 'A.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 'A.C1' is not a column in the target table.
 ij> select * from t3 b where exists (select * from t1 a inner join t2 on b.c1 = t2.c1);
 ERROR 42972: An ON clause associated with a JOIN operator is not valid.
 ij> select * from t3 where exists (select * from t1 inner join t2 on t3.c1 = t2.c1);

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/insert.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/insert.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/insert.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/insert.out Thu Jun  2 18:54:29 2005
@@ -97,12 +97,12 @@
 0 rows inserted/updated/deleted
 ij> -- Negative test cases - column references in values clause
 insert into t1 values(1, c1);
-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> insert into t1 values("asdf asdf", 2);
-ERROR 42X04: Column 'asdf asdf' 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 'asdf asdf' is not a column in the target table.
+ERROR 42X04: Column 'asdf asdf' 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 'asdf asdf' is not a column in the target table.
 ij> -- Negative test case - syntax error
 insert into t1 values;
-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> -- Too many values in values clause
 insert into t1 values(1,1,1);
 ERROR 42802: The number of values assigned is not the same as the number of specified or implied columns.
@@ -111,7 +111,7 @@
 ERROR 42802: The number of values assigned is not the same as the number of specified or implied columns.
 ij> -- multiple instances of same column in colum list
 insert into t1 (i, i) values(2,2);
-ERROR 42X13: Column name 'I' appears more than once times in the column list of an insert statement.
+ERROR 42X13: Column name 'I' appears more than once times in the column list of an INSERT statement. 
 ij> -- target column list size != source size
 insert into t1 (i, j) values(1);
 ERROR 42802: The number of values assigned is not the same as the number of specified or implied columns.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/intersect.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/intersect.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/intersect.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/intersect.out Thu Jun  2 18:54:29 2005
@@ -1,393 +1,393 @@
-ij> create table t1( id integer not null primary key, i1 integer, i2 integer, c10 char(10), c30 char(30), tm time);
-0 rows inserted/updated/deleted
-ij> create table t2( id integer not null primary key, i1 integer, i2 integer, vc20 varchar(20), d double, dt date);
-0 rows inserted/updated/deleted
-ij> insert into t1(id,i1,i2,c10,c30) values
-  (1,1,1,'a','123456789012345678901234567890'),
-  (2,1,2,'a','bb'),
-  (3,1,3,'b','bb'),
-  (4,1,3,'zz','5'),
-  (5,null,null,null,'1.0'),
-  (6,null,null,null,'a');
-6 rows inserted/updated/deleted
-ij> insert into t2(id,i1,i2,vc20,d) values
-  (1,1,1,'a',1.0),
-  (2,1,2,'a',1.1),
-  (5,null,null,'12345678901234567890',3),
-  (100,1,3,'zz',3),
-  (101,1,2,'bb',null),
-  (102,5,5,'',null),
-  (103,1,3,' a',null),
-  (104,1,3,'null',7.4);
-8 rows inserted/updated/deleted
-ij> -- no duplicates
-select id,i1,i2 from t1 intersect select id,i1,i2 from t2 order by id DESC,i1,i2;
-ID         |I1         |I2         
------------------------------------
-5          |NULL       |NULL       
-2          |1          |2          
-1          |1          |1          
-ij> select id,i1,i2 from t1 intersect distinct select id,i1,i2 from t2 order by id DESC,i1,i2;
-ID         |I1         |I2         
------------------------------------
-5          |NULL       |NULL       
-2          |1          |2          
-1          |1          |1          
-ij> select id,i1,i2 from t1 intersect all select id,i1,i2 from t2 order by 1,2,3;
-ID         |I1         |I2         
------------------------------------
-1          |1          |1          
-2          |1          |2          
-5          |NULL       |NULL       
-ij> -- Only specify order by on some columns
-select id,i1,i2 from t1 intersect select id,i1,i2 from t2 order by i2, id DESC;
-ID         |I1         |I2         
------------------------------------
-1          |1          |1          
-2          |1          |2          
-5          |NULL       |NULL       
-ij> select id,i1,i2 from t1 intersect all select id,i1,i2 from t2 order by 3 DESC, 1;
-ID         |I1         |I2         
------------------------------------
-5          |NULL       |NULL       
-2          |1          |2          
-1          |1          |1          
-ij> -- duplicates
-select i1,i2 from t1 intersect select i1,i2 from t2 order by 1,2;
-I1         |I2         
------------------------
-1          |1          
-1          |2          
-1          |3          
-NULL       |NULL       
-ij> select i1,i2 from t1 intersect distinct select i1,i2 from t2 order by 1,2;
-I1         |I2         
------------------------
-1          |1          
-1          |2          
-1          |3          
-NULL       |NULL       
-ij> select i1,i2 from t1 intersect all select i1,i2 from t2 order by 1,2;
-I1         |I2         
------------------------
-1          |1          
-1          |2          
-1          |3          
-1          |3          
-NULL       |NULL       
-ij> -- right side is empty
-select i1,i2 from t1 intersect select i1,i2 from t2 where id = -1;
-I1         |I2         
------------------------
-ij> select i1,i2 from t1 intersect all select i1,i2 from t2 where id = -1;
-I1         |I2         
------------------------
-ij> -- left side is empty
-select i1,i2 from t1 where id = -1 intersect all select i1,i2 from t2;
-I1         |I2         
------------------------
-ij> -- check precedence
-select i1,i2 from t1 intersect all select i1,i2 from t2 intersect values(5,5),(1,3) order by 1,2;
-1          |2          
------------------------
-1          |3          
-ij> (select i1,i2 from t1 intersect all select i1,i2 from t2) intersect values(5,5),(1,3) order by 1,2;
-1          |2          
------------------------
-1          |3          
-ij> values(-1,-1,-1) union select id,i1,i2 from t1 intersect select id,i1,i2 from t2 order by 1,2,3;
-1          |2          |3          
------------------------------------
--1         |-1         |-1         
-1          |1          |1          
-2          |1          |2          
-5          |NULL       |NULL       
-ij> select id,i1,i2 from t1 intersect select id,i1,i2 from t2 union values(-1,-1,-1) order by 1,2,3;
-1          |2          |3          
------------------------------------
--1         |-1         |-1         
-1          |1          |1          
-2          |1          |2          
-5          |NULL       |NULL       
-ij> -- check conversions
-select c10 from t1 intersect select vc20 from t2 order by 1;
-1                   
---------------------
-a                   
-zz                  
-ij> select c30 from t1 intersect select vc20 from t2;
-1                             
-------------------------------
-a                             
-bb                            
-ij> select c30 from t1 intersect all select vc20 from t2;
-1                             
-------------------------------
-a                             
-bb                            
-ij> -- check insert intersect into table and intersect without order by
-create table r( i1 integer, i2 integer);
-0 rows inserted/updated/deleted
-ij> insert into r select i1,i2 from t1 intersect select i1,i2 from t2;
-4 rows inserted/updated/deleted
-ij> select i1,i2 from r order by 1,2;
-I1         |I2         
------------------------
-1          |1          
-1          |2          
-1          |3          
-NULL       |NULL       
-ij> delete from r;
-4 rows inserted/updated/deleted
-ij> insert into r select i1,i2 from t1 intersect all select i1,i2 from t2;
-5 rows inserted/updated/deleted
-ij> select i1,i2 from r order by 1,2;
-I1         |I2         
------------------------
-1          |1          
-1          |2          
-1          |3          
-1          |3          
-NULL       |NULL       
-ij> delete from r;
-5 rows inserted/updated/deleted
-ij> -- test LOB
-create table t3( i1 integer, cl clob(64), bl blob(1M));
-0 rows inserted/updated/deleted
-ij> insert into t3 values
-  (1, cast( 'aa' as clob(64)), cast(X'01' as blob(1M)));
-1 row inserted/updated/deleted
-ij> create table t4( i1 integer, cl clob(64), bl blob(1M));
-0 rows inserted/updated/deleted
-ij> insert into t4 values
-  (1, cast( 'aa' as clob(64)), cast(X'01' as blob(1M)));
-1 row inserted/updated/deleted
-ij> select cl from t3 intersect select cl from t4 order by 1;
-ERROR X0X67: Columns of type 'CLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
-ij> select bl from t3 intersect select bl from t4 order by 1;
-ERROR X0X67: Columns of type 'BLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
-ij> -- invalid conversion
-select tm from t1 intersect select dt from t2;
-ERROR 42X61: Types 'TIME' and 'DATE' are not INTERSECT compatible.
-ij> select c30 from t1 intersect select d from t2;
-ERROR 42X61: Types 'CHAR' and 'DOUBLE' are not INTERSECT compatible.
-ij> -- different number of columns
-select i1 from t1 intersect select i1,i2 from t2;
-ERROR 42X58: The number of columns on the left and right sides of the INTERSECT must be the same.
-ij> -- ? in select list of intersect
-select ? from t1 intersect select i1 from t2;
-ERROR 42X34: There is a ? parameter in the select list.  This is not allowed.
-ij> select i1 from t1 intersect select ? from t2;
-ERROR 42X34: There is a ? parameter in the select list.  This is not allowed.
-ij> -- except tests
-select id,i1,i2 from t1 except select id,i1,i2 from t2 order by id,i1,i2;
-ID         |I1         |I2         
------------------------------------
-3          |1          |3          
-4          |1          |3          
-6          |NULL       |NULL       
-ij> select id,i1,i2 from t1 except distinct select id,i1,i2 from t2 order by id,i1,i2;
-ID         |I1         |I2         
------------------------------------
-3          |1          |3          
-4          |1          |3          
-6          |NULL       |NULL       
-ij> select id,i1,i2 from t1 except all select id,i1,i2 from t2 order by 1 DESC,2,3;
-ID         |I1         |I2         
------------------------------------
-6          |NULL       |NULL       
-4          |1          |3          
-3          |1          |3          
-ij> select id,i1,i2 from t2 except select id,i1,i2 from t1 order by 1,2,3;
-ID         |I1         |I2         
------------------------------------
-100        |1          |3          
-101        |1          |2          
-102        |5          |5          
-103        |1          |3          
-104        |1          |3          
-ij> select id,i1,i2 from t2 except all select id,i1,i2 from t1 order by 1,2,3;
-ID         |I1         |I2         
------------------------------------
-100        |1          |3          
-101        |1          |2          
-102        |5          |5          
-103        |1          |3          
-104        |1          |3          
-ij> select i1,i2 from t1 except select i1,i2 from t2 order by 1,2;
-I1         |I2         
------------------------
-ij> select i1,i2 from t1 except distinct select i1,i2 from t2 order by 1,2;
-I1         |I2         
------------------------
-ij> select i1,i2 from t1 except all select i1,i2 from t2 order by 1,2;
-I1         |I2         
------------------------
-NULL       |NULL       
-ij> select i1,i2 from t2 except select i1,i2 from t1 order by 1,2;
-I1         |I2         
------------------------
-5          |5          
-ij> select i1,i2 from t2 except all select i1,i2 from t1 order by 1,2;
-I1         |I2         
------------------------
-1          |2          
-1          |3          
-5          |5          
-ij> -- right side is empty
-select i1,i2 from t1 except select i1,i2 from t2 where id = -1 order by 1,2;
-I1         |I2         
------------------------
-1          |1          
-1          |2          
-1          |3          
-NULL       |NULL       
-ij> select i1,i2 from t1 except all select i1,i2 from t2 where id = -1  order by 1,2;
-I1         |I2         
------------------------
-1          |1          
-1          |2          
-1          |3          
-1          |3          
-NULL       |NULL       
-NULL       |NULL       
-ij> -- left side is empty
-select i1,i2 from t1 where id = -1 except select i1,i2 from t2 order by 1,2;
-I1         |I2         
------------------------
-ij> select i1,i2 from t1 where id = -1 except all select i1,i2 from t2 order by 1,2;
-I1         |I2         
------------------------
-ij> -- Check precedence. Union and except have the same precedence. Intersect has higher precedence.
-select i1,i2 from t1 except select i1,i2 from t2 intersect values(-1,-1) order by 1,2;
-1          |2          
------------------------
-1          |1          
-1          |2          
-1          |3          
-NULL       |NULL       
-ij> select i1,i2 from t1 except (select i1,i2 from t2 intersect values(-1,-1)) order by 1,2;
-1          |2          
------------------------
-1          |1          
-1          |2          
-1          |3          
-NULL       |NULL       
-ij> select i1,i2 from t2 except select i1,i2 from t1 union values(5,5) order by 1,2;
-1          |2          
------------------------
-5          |5          
-ij> (select i1,i2 from t2 except select i1,i2 from t1) union values(5,5) order by 1,2;
-1          |2          
------------------------
-5          |5          
-ij> select i1,i2 from t2 except all select i1,i2 from t1 except select i1,i2 from t1 where id = 3 order by 1,2;
-I1         |I2         
------------------------
-1          |2          
-5          |5          
-ij> (select i1,i2 from t2 except all select i1,i2 from t1) except select i1,i2 from t1 where id = 3 order by 1,2;
-I1         |I2         
------------------------
-1          |2          
-5          |5          
-ij> -- check conversions
-select c10 from t1 except select vc20 from t2 order by 1;
-1                   
---------------------
-b                   
-NULL                
-ij> select c30 from t1 except select vc20 from t2 order by 1;
-1                             
-------------------------------
-1.0                           
-123456789012345678901234567890
-5                             
-ij> select c30 from t1 except all select vc20 from t2;
-1                             
-------------------------------
-1.0                           
-123456789012345678901234567890
-5                             
-bb                            
-ij> -- check insert except into table and except without order by
-insert into r select i1,i2 from t2 except select i1,i2 from t1;
-1 row inserted/updated/deleted
-ij> select i1,i2 from r order by 1,2;
-I1         |I2         
------------------------
-5          |5          
-ij> delete from r;
-1 row inserted/updated/deleted
-ij> insert into r select i1,i2 from t2 except all select i1,i2 from t1;
-3 rows inserted/updated/deleted
-ij> select i1,i2 from r order by 1,2;
-I1         |I2         
------------------------
-1          |2          
-1          |3          
-5          |5          
-ij> delete from r;
-3 rows inserted/updated/deleted
-ij> -- test LOB
-select cl from t3 except select cl from t4 order by 1;
-ERROR X0X67: Columns of type 'CLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
-ij> select bl from t3 except select bl from t4 order by 1;
-ERROR X0X67: Columns of type 'BLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
-ij> -- invalid conversion
-select tm from t1 except select dt from t2;
-ERROR 42X61: Types 'TIME' and 'DATE' are not EXCEPT compatible.
-ij> select c30 from t1 except select d from t2;
-ERROR 42X61: Types 'CHAR' and 'DOUBLE' are not EXCEPT compatible.
-ij> -- different number of columns
-select i1 from t1 except select i1,i2 from t2;
-ERROR 42X58: The number of columns on the left and right sides of the EXCEPT must be the same.
-ij> -- ? in select list of except
-select ? from t1 except select i1 from t2;
-ERROR 42X34: There is a ? parameter in the select list.  This is not allowed.
-ij> -- Invalid order by
-select id,i1,i2 from t1 intersect select id,i1,i2 from t2 order by t1.i1;
-ERROR 42877: A qualified column name 'T1.I1' is not allowed in the ORDER BY clause.
-ij> select id,i1,i2 from t1 except select id,i1,i2 from t2 order by t1.i1;
-ERROR 42877: A qualified column name 'T1.I1' is not allowed in the ORDER BY clause.
-ij> -- views using intersect and except
-create view view_intr_uniq as select id,i1,i2 from t1 intersect select id,i1,i2 from t2;
-0 rows inserted/updated/deleted
-ij> select * from view_intr_uniq order by 1 DESC,2,3;
-ID         |I1         |I2         
------------------------------------
-5          |NULL       |NULL       
-2          |1          |2          
-1          |1          |1          
-ij> create view view_intr_all as select id,i1,i2 from t1 intersect all select id,i1,i2 from t2;
-0 rows inserted/updated/deleted
-ij> select * from  view_intr_all order by 1,2,3;
-ID         |I1         |I2         
------------------------------------
-1          |1          |1          
-2          |1          |2          
-5          |NULL       |NULL       
-ij> create view view_ex_uniq as select id,i1,i2 from t1 except select id,i1,i2 from t2;
-0 rows inserted/updated/deleted
-ij> select * from view_ex_uniq order by 1,2,3;
-ID         |I1         |I2         
------------------------------------
-3          |1          |3          
-4          |1          |3          
-6          |NULL       |NULL       
-ij> create view view_ex_all as select id,i1,i2 from t1 except all select id,i1,i2 from t2;
-0 rows inserted/updated/deleted
-ij> select * from view_ex_all order by 1 DESC,2,3;
-ID         |I1         |I2         
------------------------------------
-6          |NULL       |NULL       
-4          |1          |3          
-3          |1          |3          
-ij> -- intersect joins
-select t1.id,t1.i1,t2.i1 from t1 join t2 on t1.id = t2.id
-intersect select t1.id,t1.i2,t2.i2 from t1 join t2 on t1.id = t2.id;
-ID         |2          |3          
------------------------------------
-1          |1          |1          
-5          |NULL       |NULL       
-ij> 
+ij> create table t1( id integer not null primary key, i1 integer, i2 integer, c10 char(10), c30 char(30), tm time);
+0 rows inserted/updated/deleted
+ij> create table t2( id integer not null primary key, i1 integer, i2 integer, vc20 varchar(20), d double, dt date);
+0 rows inserted/updated/deleted
+ij> insert into t1(id,i1,i2,c10,c30) values
+  (1,1,1,'a','123456789012345678901234567890'),
+  (2,1,2,'a','bb'),
+  (3,1,3,'b','bb'),
+  (4,1,3,'zz','5'),
+  (5,null,null,null,'1.0'),
+  (6,null,null,null,'a');
+6 rows inserted/updated/deleted
+ij> insert into t2(id,i1,i2,vc20,d) values
+  (1,1,1,'a',1.0),
+  (2,1,2,'a',1.1),
+  (5,null,null,'12345678901234567890',3),
+  (100,1,3,'zz',3),
+  (101,1,2,'bb',null),
+  (102,5,5,'',null),
+  (103,1,3,' a',null),
+  (104,1,3,'null',7.4);
+8 rows inserted/updated/deleted
+ij> -- no duplicates
+select id,i1,i2 from t1 intersect select id,i1,i2 from t2 order by id DESC,i1,i2;
+ID         |I1         |I2         
+-----------------------------------
+5          |NULL       |NULL       
+2          |1          |2          
+1          |1          |1          
+ij> select id,i1,i2 from t1 intersect distinct select id,i1,i2 from t2 order by id DESC,i1,i2;
+ID         |I1         |I2         
+-----------------------------------
+5          |NULL       |NULL       
+2          |1          |2          
+1          |1          |1          
+ij> select id,i1,i2 from t1 intersect all select id,i1,i2 from t2 order by 1,2,3;
+ID         |I1         |I2         
+-----------------------------------
+1          |1          |1          
+2          |1          |2          
+5          |NULL       |NULL       
+ij> -- Only specify order by on some columns
+select id,i1,i2 from t1 intersect select id,i1,i2 from t2 order by i2, id DESC;
+ID         |I1         |I2         
+-----------------------------------
+1          |1          |1          
+2          |1          |2          
+5          |NULL       |NULL       
+ij> select id,i1,i2 from t1 intersect all select id,i1,i2 from t2 order by 3 DESC, 1;
+ID         |I1         |I2         
+-----------------------------------
+5          |NULL       |NULL       
+2          |1          |2          
+1          |1          |1          
+ij> -- duplicates
+select i1,i2 from t1 intersect select i1,i2 from t2 order by 1,2;
+I1         |I2         
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+NULL       |NULL       
+ij> select i1,i2 from t1 intersect distinct select i1,i2 from t2 order by 1,2;
+I1         |I2         
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+NULL       |NULL       
+ij> select i1,i2 from t1 intersect all select i1,i2 from t2 order by 1,2;
+I1         |I2         
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+1          |3          
+NULL       |NULL       
+ij> -- right side is empty
+select i1,i2 from t1 intersect select i1,i2 from t2 where id = -1;
+I1         |I2         
+-----------------------
+ij> select i1,i2 from t1 intersect all select i1,i2 from t2 where id = -1;
+I1         |I2         
+-----------------------
+ij> -- left side is empty
+select i1,i2 from t1 where id = -1 intersect all select i1,i2 from t2;
+I1         |I2         
+-----------------------
+ij> -- check precedence
+select i1,i2 from t1 intersect all select i1,i2 from t2 intersect values(5,5),(1,3) order by 1,2;
+1          |2          
+-----------------------
+1          |3          
+ij> (select i1,i2 from t1 intersect all select i1,i2 from t2) intersect values(5,5),(1,3) order by 1,2;
+1          |2          
+-----------------------
+1          |3          
+ij> values(-1,-1,-1) union select id,i1,i2 from t1 intersect select id,i1,i2 from t2 order by 1,2,3;
+1          |2          |3          
+-----------------------------------
+-1         |-1         |-1         
+1          |1          |1          
+2          |1          |2          
+5          |NULL       |NULL       
+ij> select id,i1,i2 from t1 intersect select id,i1,i2 from t2 union values(-1,-1,-1) order by 1,2,3;
+1          |2          |3          
+-----------------------------------
+-1         |-1         |-1         
+1          |1          |1          
+2          |1          |2          
+5          |NULL       |NULL       
+ij> -- check conversions
+select c10 from t1 intersect select vc20 from t2 order by 1;
+1                   
+--------------------
+a                   
+zz                  
+ij> select c30 from t1 intersect select vc20 from t2;
+1                             
+------------------------------
+a                             
+bb                            
+ij> select c30 from t1 intersect all select vc20 from t2;
+1                             
+------------------------------
+a                             
+bb                            
+ij> -- check insert intersect into table and intersect without order by
+create table r( i1 integer, i2 integer);
+0 rows inserted/updated/deleted
+ij> insert into r select i1,i2 from t1 intersect select i1,i2 from t2;
+4 rows inserted/updated/deleted
+ij> select i1,i2 from r order by 1,2;
+I1         |I2         
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+NULL       |NULL       
+ij> delete from r;
+4 rows inserted/updated/deleted
+ij> insert into r select i1,i2 from t1 intersect all select i1,i2 from t2;
+5 rows inserted/updated/deleted
+ij> select i1,i2 from r order by 1,2;
+I1         |I2         
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+1          |3          
+NULL       |NULL       
+ij> delete from r;
+5 rows inserted/updated/deleted
+ij> -- test LOB
+create table t3( i1 integer, cl clob(64), bl blob(1M));
+0 rows inserted/updated/deleted
+ij> insert into t3 values
+  (1, cast( 'aa' as clob(64)), cast(X'01' as blob(1M)));
+1 row inserted/updated/deleted
+ij> create table t4( i1 integer, cl clob(64), bl blob(1M));
+0 rows inserted/updated/deleted
+ij> insert into t4 values
+  (1, cast( 'aa' as clob(64)), cast(X'01' as blob(1M)));
+1 row inserted/updated/deleted
+ij> select cl from t3 intersect select cl from t4 order by 1;
+ERROR X0X67: Columns of type 'CLOB' 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> select bl from t3 intersect select bl from t4 order by 1;
+ERROR X0X67: Columns of type 'BLOB' 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> -- invalid conversion
+select tm from t1 intersect select dt from t2;
+ERROR 42X61: Types 'TIME' and 'DATE' are not INTERSECT compatible.
+ij> select c30 from t1 intersect select d from t2;
+ERROR 42X61: Types 'CHAR' and 'DOUBLE' are not INTERSECT compatible.
+ij> -- different number of columns
+select i1 from t1 intersect select i1,i2 from t2;
+ERROR 42X58: The number of columns on the left and right sides of the INTERSECT must be the same.
+ij> -- ? in select list of intersect
+select ? from t1 intersect select i1 from t2;
+ERROR 42X34: There is a ? parameter in the select list.  This is not allowed.
+ij> select i1 from t1 intersect select ? from t2;
+ERROR 42X34: There is a ? parameter in the select list.  This is not allowed.
+ij> -- except tests
+select id,i1,i2 from t1 except select id,i1,i2 from t2 order by id,i1,i2;
+ID         |I1         |I2         
+-----------------------------------
+3          |1          |3          
+4          |1          |3          
+6          |NULL       |NULL       
+ij> select id,i1,i2 from t1 except distinct select id,i1,i2 from t2 order by id,i1,i2;
+ID         |I1         |I2         
+-----------------------------------
+3          |1          |3          
+4          |1          |3          
+6          |NULL       |NULL       
+ij> select id,i1,i2 from t1 except all select id,i1,i2 from t2 order by 1 DESC,2,3;
+ID         |I1         |I2         
+-----------------------------------
+6          |NULL       |NULL       
+4          |1          |3          
+3          |1          |3          
+ij> select id,i1,i2 from t2 except select id,i1,i2 from t1 order by 1,2,3;
+ID         |I1         |I2         
+-----------------------------------
+100        |1          |3          
+101        |1          |2          
+102        |5          |5          
+103        |1          |3          
+104        |1          |3          
+ij> select id,i1,i2 from t2 except all select id,i1,i2 from t1 order by 1,2,3;
+ID         |I1         |I2         
+-----------------------------------
+100        |1          |3          
+101        |1          |2          
+102        |5          |5          
+103        |1          |3          
+104        |1          |3          
+ij> select i1,i2 from t1 except select i1,i2 from t2 order by 1,2;
+I1         |I2         
+-----------------------
+ij> select i1,i2 from t1 except distinct select i1,i2 from t2 order by 1,2;
+I1         |I2         
+-----------------------
+ij> select i1,i2 from t1 except all select i1,i2 from t2 order by 1,2;
+I1         |I2         
+-----------------------
+NULL       |NULL       
+ij> select i1,i2 from t2 except select i1,i2 from t1 order by 1,2;
+I1         |I2         
+-----------------------
+5          |5          
+ij> select i1,i2 from t2 except all select i1,i2 from t1 order by 1,2;
+I1         |I2         
+-----------------------
+1          |2          
+1          |3          
+5          |5          
+ij> -- right side is empty
+select i1,i2 from t1 except select i1,i2 from t2 where id = -1 order by 1,2;
+I1         |I2         
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+NULL       |NULL       
+ij> select i1,i2 from t1 except all select i1,i2 from t2 where id = -1  order by 1,2;
+I1         |I2         
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+1          |3          
+NULL       |NULL       
+NULL       |NULL       
+ij> -- left side is empty
+select i1,i2 from t1 where id = -1 except select i1,i2 from t2 order by 1,2;
+I1         |I2         
+-----------------------
+ij> select i1,i2 from t1 where id = -1 except all select i1,i2 from t2 order by 1,2;
+I1         |I2         
+-----------------------
+ij> -- Check precedence. Union and except have the same precedence. Intersect has higher precedence.
+select i1,i2 from t1 except select i1,i2 from t2 intersect values(-1,-1) order by 1,2;
+1          |2          
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+NULL       |NULL       
+ij> select i1,i2 from t1 except (select i1,i2 from t2 intersect values(-1,-1)) order by 1,2;
+1          |2          
+-----------------------
+1          |1          
+1          |2          
+1          |3          
+NULL       |NULL       
+ij> select i1,i2 from t2 except select i1,i2 from t1 union values(5,5) order by 1,2;
+1          |2          
+-----------------------
+5          |5          
+ij> (select i1,i2 from t2 except select i1,i2 from t1) union values(5,5) order by 1,2;
+1          |2          
+-----------------------
+5          |5          
+ij> select i1,i2 from t2 except all select i1,i2 from t1 except select i1,i2 from t1 where id = 3 order by 1,2;
+I1         |I2         
+-----------------------
+1          |2          
+5          |5          
+ij> (select i1,i2 from t2 except all select i1,i2 from t1) except select i1,i2 from t1 where id = 3 order by 1,2;
+I1         |I2         
+-----------------------
+1          |2          
+5          |5          
+ij> -- check conversions
+select c10 from t1 except select vc20 from t2 order by 1;
+1                   
+--------------------
+b                   
+NULL                
+ij> select c30 from t1 except select vc20 from t2 order by 1;
+1                             
+------------------------------
+1.0                           
+123456789012345678901234567890
+5                             
+ij> select c30 from t1 except all select vc20 from t2;
+1                             
+------------------------------
+1.0                           
+123456789012345678901234567890
+5                             
+bb                            
+ij> -- check insert except into table and except without order by
+insert into r select i1,i2 from t2 except select i1,i2 from t1;
+1 row inserted/updated/deleted
+ij> select i1,i2 from r order by 1,2;
+I1         |I2         
+-----------------------
+5          |5          
+ij> delete from r;
+1 row inserted/updated/deleted
+ij> insert into r select i1,i2 from t2 except all select i1,i2 from t1;
+3 rows inserted/updated/deleted
+ij> select i1,i2 from r order by 1,2;
+I1         |I2         
+-----------------------
+1          |2          
+1          |3          
+5          |5          
+ij> delete from r;
+3 rows inserted/updated/deleted
+ij> -- test LOB
+select cl from t3 except select cl from t4 order by 1;
+ERROR X0X67: Columns of type 'CLOB' 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> select bl from t3 except select bl from t4 order by 1;
+ERROR X0X67: Columns of type 'BLOB' 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> -- invalid conversion
+select tm from t1 except select dt from t2;
+ERROR 42X61: Types 'TIME' and 'DATE' are not EXCEPT compatible.
+ij> select c30 from t1 except select d from t2;
+ERROR 42X61: Types 'CHAR' and 'DOUBLE' are not EXCEPT compatible.
+ij> -- different number of columns
+select i1 from t1 except select i1,i2 from t2;
+ERROR 42X58: The number of columns on the left and right sides of the EXCEPT must be the same.
+ij> -- ? in select list of except
+select ? from t1 except select i1 from t2;
+ERROR 42X34: There is a ? parameter in the select list.  This is not allowed.
+ij> -- Invalid order by
+select id,i1,i2 from t1 intersect select id,i1,i2 from t2 order by t1.i1;
+ERROR 42877: A qualified column name 'T1.I1' is not allowed in the ORDER BY clause.
+ij> select id,i1,i2 from t1 except select id,i1,i2 from t2 order by t1.i1;
+ERROR 42877: A qualified column name 'T1.I1' is not allowed in the ORDER BY clause.
+ij> -- views using intersect and except
+create view view_intr_uniq as select id,i1,i2 from t1 intersect select id,i1,i2 from t2;
+0 rows inserted/updated/deleted
+ij> select * from view_intr_uniq order by 1 DESC,2,3;
+ID         |I1         |I2         
+-----------------------------------
+5          |NULL       |NULL       
+2          |1          |2          
+1          |1          |1          
+ij> create view view_intr_all as select id,i1,i2 from t1 intersect all select id,i1,i2 from t2;
+0 rows inserted/updated/deleted
+ij> select * from  view_intr_all order by 1,2,3;
+ID         |I1         |I2         
+-----------------------------------
+1          |1          |1          
+2          |1          |2          
+5          |NULL       |NULL       
+ij> create view view_ex_uniq as select id,i1,i2 from t1 except select id,i1,i2 from t2;
+0 rows inserted/updated/deleted
+ij> select * from view_ex_uniq order by 1,2,3;
+ID         |I1         |I2         
+-----------------------------------
+3          |1          |3          
+4          |1          |3          
+6          |NULL       |NULL       
+ij> create view view_ex_all as select id,i1,i2 from t1 except all select id,i1,i2 from t2;
+0 rows inserted/updated/deleted
+ij> select * from view_ex_all order by 1 DESC,2,3;
+ID         |I1         |I2         
+-----------------------------------
+6          |NULL       |NULL       
+4          |1          |3          
+3          |1          |3          
+ij> -- intersect joins
+select t1.id,t1.i1,t2.i1 from t1 join t2 on t1.id = t2.id
+intersect select t1.id,t1.i2,t2.i2 from t1 join t2 on t1.id = t2.id;
+ID         |2          |3          
+-----------------------------------
+1          |1          |1          
+5          |NULL       |NULL       
+ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk14/updatableResultSet.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk14/updatableResultSet.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk14/updatableResultSet.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk14/updatableResultSet.out Thu Jun  2 18:54:29 2005
@@ -80,39 +80,39 @@
 Negative Test8 - attempt deleteRow & updateRow on updatable resultset after closing the resultset
 Make sure that we got CONCUR_UPDATABLE? true
 SQL State : XCL16
-Got expected exception ResultSet not open, operation 'deleteRow' not permitted. Verify that autocommit is OFF.
+Got expected exception ResultSet not open. Operation 'deleteRow' not permitted. Verify that autocommit is OFF.
 SQL State : XCL16
-Got expected exception ResultSet not open, operation 'updateRow' not permitted. Verify that autocommit is OFF.
+Got expected exception ResultSet not open. Operation 'updateRow' not permitted. Verify that autocommit is OFF.
 Negative Test9 - try updatable resultset on system table
 SQL State : 42Y90
-Got expected exception FOR UPDATE is not permitted on this type of statement.
+Got expected exception FOR UPDATE is not permitted in this type of statement.  
 Negative Test10 - try updatable resultset on a view
 SQL State : 42Y90
-Got expected exception FOR UPDATE is not permitted on this type of statement.
+Got expected exception FOR UPDATE is not permitted in this type of statement.  
 Negative Test11 - attempt to open updatable resultset when there is join in the select query should fail
 SQL State : 42Y90
-Got expected exception FOR UPDATE is not permitted on this type of statement.
+Got expected exception FOR UPDATE is not permitted in this type of statement.  
 Negative Test12 - With autocommit on, attempt to drop a table when there is an open updatable resultset on it
 Opened an updatable resultset. Now trying to drop that table through another Statement
 SQL State : X0X95
 Got expected exception Operation 'DROP TABLE' cannot be performed on object 'T1' because there is an open ResultSet dependent on that object.
 Since autocommit is on, the drop table exception resulted in a runtime rollback causing updatable resultset object to close
 SQL State : XCL16
-Got expected exception ResultSet not open, operation 'updateRow' not permitted. Verify that autocommit is OFF.
+Got expected exception ResultSet not open. Operation 'updateRow' not permitted. Verify that autocommit is OFF.
 SQL State : XCL16
-Got expected exception ResultSet not open, operation 'deleteRow' not permitted. Verify that autocommit is OFF.
+Got expected exception ResultSet not open. Operation 'deleteRow' not permitted. Verify that autocommit is OFF.
 Negative Test13 - foreign key constraint failure will cause deleteRow to fail
 SQL State : 23503
 Got expected exception DELETE on table 'TABLEWITHPRIMARYKEY' caused a violation of foreign key constraint 'FK' for key (1,1).  The statement has been rolled back.
 Since autocommit is on, the constraint exception resulted in a runtime rollback causing updatable resultset object to close
 SQL State : XCL16
-Got expected exception ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+Got expected exception ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 Negative Test14 - foreign key constraint failure will cause updateRow to fail
 SQL State : 23503
 Got expected exception UPDATE on table 'TABLEWITHPRIMARYKEY' caused a violation of foreign key constraint 'FK' for key (1,1).  The statement has been rolled back.
 Since autocommit is on, the constraint exception resulted in a runtime rollback causing updatable resultset object to close
 SQL State : XCL16
-Got expected exception ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+Got expected exception ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 Negative Test15 - Can't call updateXXX methods on columns that do not correspond to a column in the table
 SQL State : XJ084
 Got expected exception Column does not correspond to a column in the base table. Cant issue {0} on this column.
@@ -284,7 +284,7 @@
 	{3,cc                  }
 Positive Test9c - try to updateXXX on a readonly column. Should get error
 SQL State : 42X31
-Got expected exception Column 'C2' is not in FOR UPDATE list of cursor 'SQLCUR15'.
+Got expected exception Column 'C2' is not in the FOR UPDATE list of cursor 'SQLCUR15'.
 attempt to get an updatable resultset using correlation name for an readonly column. It should work
 The sql is SELECT c1, c2 as col2 FROM t1 abcde FOR UPDATE of c1
 Table t1 after updateRow has following rows
@@ -295,7 +295,7 @@
 	{3,cc                  }
 Positive Test9d - try to updateXXX on a readonly column with correlation name. Should get error
 SQL State : 42X31
-Got expected exception Column 'COL2' is not in FOR UPDATE list of cursor 'SQLCUR17'.
+Got expected exception Column 'COL2' is not in the FOR UPDATE list of cursor 'SQLCUR17'.
 Table t1 has following rows
 	 C1,C2
 	 -- --
@@ -3047,7 +3047,7 @@
 	{2,bb                  }
 	{3,cc                  }
 SQL State : 42X31
-Got expected exception Column 'C2' is not in FOR UPDATE list of cursor 'SQLCUR37'.
+Got expected exception Column 'C2' is not in the FOR UPDATE list of cursor 'SQLCUR37'.
 updateRow passed
   Make sure the contents of table are unchanged
 	 C1,C2

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logop.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logop.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logop.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/logop.out Thu Jun  2 18:54:29 2005
@@ -370,15 +370,15 @@
 select * from s where 1;
 ERROR 42X19: The WHERE or HAVING clause or CHECK CONSTRAINT definition is a 'INTEGER' expression.  It must be a BOOLEAN expression.
 ij> select * from s where 1 and (1=1);
-ERROR 42Y94: An AND or OR has a non-Boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.
+ERROR 42Y94: An AND or OR has a non-boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.  
 ij> select * from s where (1=1) and 1;
-ERROR 42Y94: An AND or OR has a non-Boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.
+ERROR 42Y94: An AND or OR has a non-boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.  
 ij> select * from s where 1 or (1=1);
-ERROR 42Y94: An AND or OR has a non-Boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.
+ERROR 42Y94: An AND or OR has a non-boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.  
 ij> select * from s where (1=1) or 1;
-ERROR 42Y94: An AND or OR has a non-Boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.
+ERROR 42Y94: An AND or OR has a non-boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.  
 ij> select * from s where not 1;
-ERROR 42X40: A NOT has a non-Boolean operand. The operand of NOT must evaluate to TRUE, FALSE, or UNKNOWN.
+ERROR 42X40: A NOT statement has an operand that is not boolean . The operand of NOT must evaluate to TRUE, FALSE, or UNKNOWN. 
 ij> -- Clean up
 drop table t;
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/modifyColumn.out Thu Jun  2 18:54:29 2005
@@ -20,25 +20,25 @@
 ij> alter table alltypes alter n set data type numeric (12,8);
 ERROR 42Z16: Only columns of type VARCHAR may have their length altered. 
 ij> alter table alltypes alter c set data type varchar(10);
-ERROR 42Z15: Invalid Type specified for column 'C'. The type of a column may not be changed.
+ERROR 42Z15: Invalid type specified for column 'C'. The type of a column may not be changed.  
 ij> alter table alltypes alter b set data type varchar(2) for bit data;
-ERROR 42Z15: Invalid Type specified for column 'B'. The type of a column may not be changed.
+ERROR 42Z15: Invalid type specified for column 'B'. The type of a column may not be changed.  
 ij> alter table alltypes alter dc set data type numeric(8,2);
-ERROR 42Z15: Invalid Type specified for column 'DC'. The type of a column may not be changed.
+ERROR 42Z15: Invalid type specified for column 'DC'. The type of a column may not be changed.  
 ij> alter table alltypes alter tn set data type int;
 ERROR 42Z16: Only columns of type VARCHAR may have their length altered. 
 ij> alter table alltypes alter v set data type varchar(1);
-ERROR 42Z17: Invalid Length specified for Column 'V'. Length must be greater than the current column length
+ERROR 42Z17: Invalid length specified for column 'V'. Length must be greater than the current column length.
 ij> alter table alltypes alter v set data type varchar(49);
-ERROR 42Z17: Invalid Length specified for Column 'V'. Length must be greater than the current column length
+ERROR 42Z17: Invalid length specified for column 'V'. Length must be greater than the current column length.
 ij> alter table alltypes alter bv set data type varchar(1) for bit data;
-ERROR 42Z17: Invalid Length specified for Column 'BV'. Length must be greater than the current column length
+ERROR 42Z17: Invalid length specified for column 'BV'. Length must be greater than the current column length.
 ij> alter table alltypes alter bv set data type varchar(2) for bit data;
 0 rows inserted/updated/deleted
 ij> alter table alltypes alter nvc set data type varchar(0);
 ERROR 42X44: Invalid length '0' in column specification.
 ij> alter table alltypes alter nvc set data type varchar(9);
-ERROR 42Z17: Invalid Length specified for Column 'NVC'. Length must be greater than the current column length
+ERROR 42Z17: Invalid length specified for column 'NVC'. Length must be greater than the current column length.
 ij> drop table alltypes;
 0 rows inserted/updated/deleted
 ij> create table t0 (i int not null, v varchar(1) not null, constraint pk primary key(v,i));
@@ -50,10 +50,10 @@
 ij> create table t1 (i int, v varchar(2), constraint fk foreign key  (v,i) references t0(v,i));
 0 rows inserted/updated/deleted
 ij> alter table t0 alter v set data type varchar(3);
-ERROR 42Z19: Column 'V' is being referenced by atleast one foreign key constraint 'FK'. To alter the length of this column, you should drop referencing constraints, perform the ALTER TABLE and then recreate the constraints.
+ERROR 42Z19: Column 'V' is being referenced by at least one foreign key constraint 'FK'. To alter the length of this column, you should drop referencing constraints, perform the ALTER TABLE and then recreate the constraints. 
 ij> -- should fail; can't muck around with fkey constraints.
 alter table t1 alter v set data type varchar(3);
-ERROR 42Z18: Column 'V' is part of a foreign key constraint 'FK'. To alter the length of this column, you should drop the constraint first, perform the ALTER TABLE and then recreate the constraint.
+ERROR 42Z18: Column 'V' is part of a foreign key constraint 'FK'. To alter the length of this column, you should drop the constraint first, perform the ALTER TABLE, and then recreate the constraint.
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> drop table t0;
@@ -69,7 +69,7 @@
 0 rows inserted/updated/deleted
 ij> -- this should fail-- someone is referencing me.
 alter table t0 alter v set data type varchar(3);
-ERROR 42Z19: Column 'V' is being referenced by atleast one foreign key constraint 'FK'. To alter the length of this column, you should drop referencing constraints, perform the ALTER TABLE and then recreate the constraints.
+ERROR 42Z19: Column 'V' is being referenced by at least one foreign key constraint 'FK'. To alter the length of this column, you should drop referencing constraints, perform the ALTER TABLE and then recreate the constraints. 
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> drop table t0;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out Thu Jun  2 18:54:29 2005
@@ -54,7 +54,7 @@
 1          
 -----------
 1          
-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> -- values doConnStmtInt('commit');
 -- values doConnStmtInt('rollback');
 -- values doConnStmtInt('call doConnStmt(''call doConnStmt(''''commit'''')'')');

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out Thu Jun  2 18:54:29 2005
@@ -335,7 +335,7 @@
 ERROR 42X01: Syntax error: Encountered "by" at line 1, column 8.
 ij> -- . order by on column not in query (error)
 select i from obt order by c;
-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> -- . order by on column not in select, in table (error)
 select i from obt order by v;
 I          
@@ -356,10 +356,10 @@
 NULL       
 ij> -- . order by on qualified column name, incorrect correlation name (not allowed)
 select i from obt t order by obt.i;
-ERROR 42X04: Column 'OBT.I' 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 'OBT.I' is not a column in the target table.
+ERROR 42X04: Column 'OBT.I' 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 'OBT.I' is not a column in the target table.
 ij> -- . order by on qualified column name, incorrect column name (not allowed)
 select i from obt t order by obt.notexists;
-ERROR 42X04: Column 'OBT.NOTEXISTS' 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 'OBT.NOTEXISTS' is not a column in the target table.
+ERROR 42X04: Column 'OBT.NOTEXISTS' 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 'OBT.NOTEXISTS' is not a column in the target table.
 ij> -- . order by on qualified column name
 create table t1(c1 int);
 0 rows inserted/updated/deleted
@@ -466,19 +466,19 @@
 ij> select c1 from t1 union select c3 from t3 order by asdf.c3;
 ERROR 42877: A qualified column name 'ASDF.C3' is not allowed in the ORDER BY clause.
 ij> select c1 from t1 order by sys.t1.c1;
-ERROR 42X04: Column 'SYS.T1.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 'SYS.T1.C1' is not a column in the target table.
+ERROR 42X04: Column 'SYS.T1.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 'SYS.T1.C1' is not a column in the target table.
 ij> select c1 from app.t1 order by sys.t1.c1;
-ERROR 42X04: Column 'SYS.T1.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 'SYS.T1.C1' is not a column in the target table.
+ERROR 42X04: Column 'SYS.T1.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 'SYS.T1.C1' is not a column in the target table.
 ij> select c1 from t1 c order by app.c.c1;
 ERROR 42X10: 'APP.C' is not an exposed table name in the scope in which it appears.
 ij> select c1 from app.t1 c order by app.t1.c1;
-ERROR 42X04: Column 'APP.T1.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 'APP.T1.C1' is not a column in the target table.
+ERROR 42X04: Column 'APP.T1.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 'APP.T1.C1' is not a column in the target table.
 ij> -- a is not a column in t1
 select 1 as a from t1 order by t1.a;
-ERROR 42X04: Column 'T1.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 'T1.A' is not a column in the target table.
+ERROR 42X04: Column 'T1.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 'T1.A' is not a column in the target table.
 ij> -- t3.c1 does not exist
 select * from t1, t3 order by t3.c1;
-ERROR 42X04: Column 'T3.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 'T3.C1' is not a column in the target table.
+ERROR 42X04: Column 'T3.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 'T3.C1' is not a column in the target table.
 ij> -- rollback should release the prepared statements
 rollback ;
 ij> -- . order by on join
@@ -688,7 +688,7 @@
 rollback ;
 ij> -- . order by and explicit for update (no, some cols)
 get cursor c1 as 'select i from obt order by i for update of v';
-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> -- . order by and explicit read only (ok)
 get cursor c1 as 'select i from obt order by i for read only';
 ij> next c1;
@@ -1241,35 +1241,35 @@
 0 rows inserted/updated/deleted
 ij> -- error case
 select * from t order 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> select t.* from t order 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> select t.* from t order by t.d;
-ERROR 42X04: Column 'T.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 'T.D' is not a column in the target table.
+ERROR 42X04: Column 'T.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 'T.D' is not a column in the target table.
 ij> select s.* from t s order by s.d;
-ERROR 42X04: Column 'S.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 'S.D' is not a column in the target table.
+ERROR 42X04: Column 'S.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 'S.D' is not a column in the target table.
 ij> select *, d from t order by d;
 ERROR 42X01: Syntax error: Encountered "," at line 1, column 9.
 ij> select t.*, d from t order 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> select t.*, d from t order by t.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> select t.*, d from t order by app.t.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> select s.*, d from t s order by s.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> select t.*, t.d from t order by t.d;
-ERROR 42X04: Column 'T.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 'T.D' is not a column in the target table.
+ERROR 42X04: Column 'T.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 'T.D' is not a column in the target table.
 ij> select s.*, s.d from t s order by s.d;
-ERROR 42X04: Column 'S.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 'S.D' is not a column in the target table.
+ERROR 42X04: Column 'S.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 'S.D' is not a column in the target table.
 ij> select a, b, c from t order 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> select a from t order 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> select t.a from t order by t.d;
-ERROR 42X04: Column 'T.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 'T.D' is not a column in the target table.
+ERROR 42X04: Column 'T.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 'T.D' is not a column in the target table.
 ij> select s.a from t s order by s.d;
-ERROR 42X04: Column 'S.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 'S.D' is not a column in the target table.
+ERROR 42X04: Column 'S.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 'S.D' is not a column in the target table.
 ij> drop table t;
 0 rows inserted/updated/deleted
 ij> -- test fof using table correlation names 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out Thu Jun  2 18:54:29 2005
@@ -1,7 +1,7 @@
 ==============================================
 TESTING BOUNDARY CONDITIONS
 ==============================================
-Expected exception SQL Exception: Parameter 2 cannot be be registered as an OUT parameter because it is an IN parameter.
+Expected exception SQL Exception: Parameter 2 cannot be registered as an OUT parameter because it is an IN parameter. 
 Expected exception SQL Exception: The parameter position '9' is out of range.  The number of parameters for this prepared  statement is '2'.
 Expected exception SQL Exception: The parameter position '0' is out of range.  The number of parameters for this prepared  statement is '2'.
 Expected exception SQL Exception: Return output parameters cannot be set.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/paramij.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/paramij.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/paramij.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/paramij.out Thu Jun  2 18:54:29 2005
@@ -90,7 +90,7 @@
 ij> prepare p1 as 'select * from t1 where lower(?)';
 ERROR 42X19: The WHERE or HAVING clause or CHECK CONSTRAINT definition is a 'VARCHAR' expression.  It must be a BOOLEAN expression.
 ij> prepare p1 as 'select * from t1 where lower(?) and 1=1';
-ERROR 42Y94: An AND or OR has a non-Boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.
+ERROR 42Y94: An AND or OR has a non-boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.  
 ij> prepare p1 as 'select * from t1 where {fn length(?)}';
 ERROR 42X19: The WHERE or HAVING clause or CHECK CONSTRAINT definition is a 'INTEGER' expression.  It must be a BOOLEAN expression.
 ij> prepare p1 as 'select * from t1 where {fn locate(?,''a'',1)}';

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out Thu Jun  2 18:54:29 2005
@@ -428,10 +428,10 @@
 ERROR XCL08: Cursor 'C1' is not on a row.
 ij> -- .different table name
 update t1 set i = i where current of c1;
-ERROR 42X29: Update table 'T1' is not target of cursor 'C1'.
+ERROR 42X29: Update table 'T1' is not the target of cursor 'C1'.
 ij> -- .non-existant table
 update not_exists set i = i where current of c1;
-ERROR 42X29: Update table 'NOT_EXISTS' is not target of cursor 'C1'.
+ERROR 42X29: Update table 'NOT_EXISTS' is not the target of cursor 'C1'.
 ij> close c1;
 ij> -- .update base table, not exposed table name
 -- (this one should work, since base table)
@@ -441,7 +441,7 @@
 ij> -- .match correlation name
 -- (this one should fail, since correlation name)
 update asdf set s = s where current of c2;
-ERROR 42X29: Update table 'ASDF' is not target of cursor 'C2'.
+ERROR 42X29: Update table 'ASDF' is not the target of cursor 'C2'.
 ij> close c2;
 ij> -- .non-updatable cursor
 -- NOTE - forupdate responsible for extensive tests
@@ -686,7 +686,7 @@
 1          |999       |1.1E12                |11:11:11
 ij> -- update column not in FOR UPDATE OF list (negative test)
 update t1 set i = 999 where current of c13;
-ERROR 42X31: Column 'I' is not in FOR UPDATE list of cursor 'C13'.
+ERROR 42X31: Column 'I' is not in the FOR UPDATE list of cursor 'C13'.
 ij> select * from t1;
 I          |V         |D                     |T       
 ------------------------------------------------------
@@ -826,7 +826,7 @@
 -----------
 1          
 ij> execute u1;
-ERROR 42X29: Update table 'T3' is not target of cursor 'C1'.
+ERROR 42X29: Update table 'T3' is not the target of cursor 'C1'.
 ij> select * from t4;
 C1         |C2         
 -----------------------
@@ -848,7 +848,7 @@
 ------------------------------------------------------
 1          |1111111111|1.1E12                |11:11:11
 ij> execute u1;
-ERROR 42X29: Update table 'T3' is not target of cursor 'C1'.
+ERROR 42X29: Update table 'T3' is not the target of cursor 'C1'.
 ij> close c1;
 ij> -- now, reopen c1 on t3, but as a read only cursor
 select * from t3;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/primarykey.out Thu Jun  2 18:54:29 2005
@@ -4,14 +4,14 @@
 -- negative tests
 -- duplicate primary keys
 create table neg (c1 int not null primary key, c2 int, c3 int not null constraint asdf primary key);
-ERROR 42X90: More than 1 primary key constraint specified for table 'NEG'.
+ERROR 42X90: More than one primary key constraint specified for table 'NEG'.
 ij> create table neg (c1 int not null primary key, c2 int, c3 int not null constraint asdf primary key);
-ERROR 42X90: More than 1 primary key constraint specified for table 'NEG'.
+ERROR 42X90: More than one primary key constraint specified for table 'NEG'.
 ij> create table neg (c1 int not null primary key, c2 int not null, primary key(c1, c2));
-ERROR 42X90: More than 1 primary key constraint specified for table 'NEG'.
+ERROR 42X90: More than one primary key constraint specified for table 'NEG'.
 ij> -- duplicate constraint names
 create table neg (c1 int not null constraint asdf primary key, c2 int, c3 int constraint asdf unique);
-ERROR 42X91: Constraint name 'ASDF' appears more than once in the create table statement.
+ERROR 42X91: Constraint name 'ASDF' appears more than once in the CREATE TABLE statement. 
 ij> -- duplicate column names in same constraint column list
 create table neg (c1 int not null, c2 int not null, primary key(c1, c2, c1));
 ERROR 42X92: Column name 'C1' appears more than once in a constraint's column list.



Mime
View raw message