svn commit: r650993 - /db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out

[km...@apache.org]

Author: kmarsden
Date: Wed Apr 23 11:33:26 2008
New Revision: 650993

URL: http://svn.apache.org/viewvc?rev=650993&view=rev
Log:
Update master for DERBY-3373


Modified:
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out?rev=650993&r1=650992&r2=650993&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out (original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/master/orderby.out Wed Apr 23 11:33:26 2008
@@ -1701,7 +1701,12 @@
 ij> -- DERBY-2351 causes this statement to return 4 rows, which it should
 -- instead show an error:
 select distinct c1, c2 from t1 order by c1+1;
-ERROR 4287A: The ORDER BY clause may not specify an expression, since the query specifies DISTINCT.
+C1         |C2        
+----------------------
+1          |c         
+2          |b         
+3          |a         
+4          |c         
 ij> -- DERBY-2351 causes this statement to return 4 rows, which it should
 -- instead show an error. Note that the rows returned are not distinct!
 select distinct c2 from t1 order by c1;
@@ -1723,7 +1728,12 @@
 4          |c         
 ij> -- This query should not work because the expanded * does not include c1+1:
 select distinct * from t1 order by c1+1;
-ERROR 4287A: The ORDER BY clause may not specify an expression, since the query specifies DISTINCT.
+C1         |C2        
+----------------------
+1          |c         
+2          |b         
+3          |a         
+4          |c         
 ij> -- This query also should not work because the order by col is not in result:
 select distinct t1.* from t1, t2 where t1.c1=t2.t2c1 order by t2c1;
 ERROR 42879: The ORDER BY clause may not contain column 'T2C1', since the query specifies DISTINCT and that column does not appear in the query result.
@@ -1807,4 +1817,4 @@
 abc 
 ij> drop table d2352;
 0 rows inserted/updated/deleted
-ij> 
+ij> 
\ No newline at end of file