Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out?rev=179696&r1=179695&r2=179696&view=diff ============================================================================== --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out Thu Jun 2 18:54:29 2005 @@ -64,7 +64,7 @@ 6 |5 |varchar_50_col |char_30_col ij> -- Negative test - column in SET clause twice update t1 set int_col = 1, int_col = 2; -ERROR 42X16: Column name 'INT_COL' appears multiple times in the SET clause of an update statement. +ERROR 42X16: Column name 'INT_COL' appears multiple times in the SET clause of an UPDATE statement. ij> -- Negative test - non-existent column in SET clause update t1 set notacolumn = int_col + 1; ERROR 42X14: 'NOTACOLUMN' is not a column in table or VTI 'APP.T1'. Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/valuesclause.out URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/valuesclause.out?rev=179696&r1=179695&r2=179696&view=diff ============================================================================== --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/valuesclause.out (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/valuesclause.out Thu Jun 2 18:54:29 2005 @@ -126,7 +126,7 @@ ERROR 42X59: The number of columns in each VALUES constructor must be the same. ij> -- empty element values 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> -- all ? parameters in a column position prepare v1 as 'values (1, ?, 2), (3, ?, 4), (5, ?, 7)'; ERROR 42Y10: A table constructor that is not in an INSERT statement has all ? parameters in one of its columns. For each column, at least one of the rows must have a non-parameter. @@ -491,13 +491,13 @@ select exists (values 1) from t1; ERROR 42X01: Syntax error: Encountered "exists" at line 2, column 8. ij> values exists (values 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> -- boolean expression EXISTS diallowed in update set clause too update t1 set c11 = exists(values 1); ERROR 42X01: Syntax error: Encountered "exists" at line 2, column 21. ij> -- ?: not supported anymore values not true ? false : true; -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> -- this test runs in SPS mode too, hence adding a comment line before the sql, so we get correct column number in error message in both SPS and non-SPS mode select not true ? false : true from t1; ERROR 42X01: Syntax error: Encountered "not" at line 2, column 8. Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/views.out URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/views.out?rev=179696&r1=179695&r2=179696&view=diff ============================================================================== --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/views.out (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/views.out Thu Jun 2 18:54:29 2005 @@ -75,7 +75,7 @@ ERROR X0X05: Table 'NOTEXISTS' does not exist. ij> -- duplicate column name in view's column list create view shouldntwork (c1, c2, c1) as select i, s, f from t1; -ERROR 42Y13: Column name 'C1' appears more than once in the create view statement. +ERROR 42Y13: Column name 'C1' appears more than once in the CREATE VIEW statement. ij> -- # of columns in view's column list does not match that in view definition create view shouldntwork (c1, c2, c3) as select i, s from t1; ERROR 42X56: The number of columns in the view column list does not match the number of columns in the underlying query expression in the view definition for 'SHOULDNTWORK'. @@ -121,13 +121,13 @@ ij> -- view updateability -- (No views are currently updateable) insert into sv1 values 1; -ERROR 42Y24: View 'SV1' is not updatable. (Views are currently not updateable.) +ERROR 42Y24: View 'SV1' is not updatable. (Views are currently not updatable.) ij> delete from sv1; -ERROR 42Y24: View 'SV1' is not updatable. (Views are currently not updateable.) +ERROR 42Y24: View 'SV1' is not updatable. (Views are currently not updatable.) ij> update sv1 set s_was_i = 0; -ERROR 42Y24: View 'SV1' is not updatable. (Views are currently not updateable.) +ERROR 42Y24: View 'SV1' is not updatable. (Views are currently not updatable.) ij> get cursor c2 as 'select * from sv1 for update of s_was_i'; -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> -- create index on a view create index i1 on sv2(i); ERROR 42Y62: 'CREATE INDEX' is not allowed on 'APP.SV2' because it is a view. Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xab2354.out URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xab2354.out?rev=179696&r1=179695&r2=179696&view=diff ============================================================================== --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xab2354.out (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xab2354.out Thu Jun 2 18:54:29 2005 @@ -18,12 +18,12 @@ ij(XA)> insert into foo values (2); 1 row inserted/updated/deleted ij(XA)> select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status; -ERROR 42X04: Column 'GXID' 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 'GXID' is not a column in the target table. +ERROR 42X04: Column 'GXID' 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 'GXID' is not a column in the target table. ij(XA)> xa_end xa_success 1; ij(XA)> xa_prepare 1; ij(XA)> xa_getconnection ; ij(XA)> select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status; -ERROR 42X04: Column 'GXID' 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 'GXID' is not a column in the target table. +ERROR 42X04: Column 'GXID' 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 'GXID' is not a column in the target table. ij(XA)> xa_datasource 'wombat' shutdown; ERROR 08006: Database 'wombat' shutdown. ij(XA)> xa_datasource 'wombat'; @@ -37,5 +37,5 @@ IJ ERROR: XAER_DUPID ij(XA)> -- should see two transactions, one global transaction and one local select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status; -ERROR 42X04: Column 'GXID' 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 'GXID' is not a column in the target table. +ERROR 42X04: Column 'GXID' 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 'GXID' is not a column in the target table. ij(XA)>