[teiid-commits] teiid SVN: r4246 - in trunk/engine/src: test/java/org/teiid/query/processor and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-07-19 12:37:08 -0400 (Thu, 19 Jul 2012)
New Revision: 4246

Modified:
   trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java
   trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
Log:
TEIID-2107 fix for left outer join with index issue

Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java	2012-07-19 15:47:33 UTC (rev 4245)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java	2012-07-19 16:37:08 UTC (rev 4246)
@@ -162,7 +162,6 @@
 					if (joinCriteria == null || joinCriteria.isEmpty()) {
 						joinCriteria = new ArrayList<Criteria>();
 						joinCriteria.add(cc);
-						joinNode.setProperty(Info.JOIN_TYPE, JoinType.JOIN_INNER);
 					}
 				}
         		joinNode.setProperty(Info.NON_EQUI_JOIN_CRITERIA, joinCriteria);

Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java	2012-07-19 15:47:33 UTC (rev 4245)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestTempTables.java	2012-07-19 16:37:08 UTC (rev 4246)
@@ -475,6 +475,7 @@
 		execute("insert into x (e2, e1) values (2, 'b')", new List[] {Arrays.asList(1)}); //$NON-NLS-1$
 		execute("insert into x1 (e2, e1) values (3, 'b')", new List[] {Arrays.asList(1)}); //$NON-NLS-1$
 		execute("select x.e1 from x makenotdep, x1 makenotdep where x.e2 = x1.e2 and x.e1 = x1.e1", new List[0]); //$NON-NLS-1$
+		execute("select x.e1 from x left outer join x1 on x.e2 = x1.e2 and x.e1 = x1.e1", new List[] {Arrays.asList("b")}); //$NON-NLS-1$
 	}
 	
 	private void sampleTable() throws Exception {