You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ma...@apache.org on 2012/02/18 22:53:25 UTC
svn commit: r1290888 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Author: mamta
Date: Sat Feb 18 21:53:24 2012
New Revision: 1290888
URL: http://svn.apache.org/viewvc?rev=1290888&view=rev
Log:
DERBY-4631 Wrong join column returned by right outer join with NATURAL or USING and territory-based collation
Adding test for nested joins.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?rev=1290888&r1=1290887&r2=1290888&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java Sat Feb 18 21:53:24 2012
@@ -532,6 +532,21 @@ public void testUsingClauseAndNaturalJoi
"FROM derby4631_t2 LEFT OUTER JOIN derby4631_t1 " +
"USING(x)",
new String[][] {{"b","b"},{"c","c"}});
+ //Test nested NATURAL LEFT OUTER JOIN. They will return correct data
+ // with both territory and non-territory based dbs.
+ checkLangBasedQuery(s, "SELECT x " +
+ "FROM (values ('b')) v2(x) " +
+ "NATURAL LEFT OUTER JOIN " +
+ "derby4631_t2 NATURAL LEFT OUTER JOIN derby4631_t1 ",
+ new String[][] {{"b"}});
+ //Test nested LEFT OUTER JOIN with USING clause They will return correct
+ // data with both territory and non-territory based dbs.
+ checkLangBasedQuery(s, "SELECT x " +
+ "FROM (values ('b')) v2(x) " +
+ "LEFT OUTER JOIN " +
+ "derby4631_t2 USING(x) " +
+ "LEFT OUTER JOIN derby4631_t1 USING(x) ",
+ new String[][] {{"b"}});
if (collation != null && collation.equals("TERRITORY_BASED:SECONDARY")) {
//We are working with a database with case-insensitive collation.
@@ -565,6 +580,19 @@ public void testUsingClauseAndNaturalJoi
"FROM derby4631_t2 RIGHT OUTER JOIN derby4631_t1 " +
"USING(x)",
new String[][] {{"A","A"},{"B","b"}});
+ //Test nested NATURAL RIGHT OUTER JOIN
+ checkLangBasedQuery(s, "SELECT x " +
+ "FROM (values ('b')) v2(x) " +
+ "NATURAL RIGHT OUTER JOIN " +
+ "derby4631_t2 NATURAL RIGHT OUTER JOIN derby4631_t1 ",
+ new String[][] {{"A"},{"B"}});
+ //Test nested LEFT OUTER JOIN with USING clause
+ checkLangBasedQuery(s, "SELECT x " +
+ "FROM (values ('b')) v2(x) " +
+ "RIGHT OUTER JOIN " +
+ "derby4631_t2 USING(x) " +
+ "RIGHT OUTER JOIN derby4631_t1 USING(x) ",
+ new String[][] {{"A"},{"B"}});
} else {
//Case-sensitive collation will not run into any problems for the
// given data set and hence following is returning correct results.