[teiid-commits] teiid SVN: r2489 - in branches/7.1.x/engine/src/test/java/org/teiid/query: processor and 1 other directory.

Author: shawkins Date: 2010-08-24 20:56:42 -0400 (Tue, 24 Aug 2010) New Revision: 2489 Modified: branches/7.1.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java branches/7.1.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java Log: TEIID-1224 fix for uncorrelated subquery evaluation of a stored procedure Modified: branches/7.1.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java =================================================================== --- branches/7.1.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java 2010-08-24 21:45:14 UTC (rev 2488) +++ branches/7.1.x/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java 2010-08-25 00:56:42 UTC (rev 2489) @@ -25,6 +25,8 @@ import static org.teiid.query.optimizer.TestOptimizer.*; import org.junit.Test; +import org.teiid.core.TeiidComponentException; +import org.teiid.core.TeiidProcessingException; import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities; import org.teiid.query.optimizer.capabilities.FakeCapabilitiesFinder; import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability; @@ -735,15 +737,15 @@ /** * Technically this is not a full push-down, but the subquery will be evaluated prior to pushdown */ - @Test public void testCompareSubquery4() { + @Test public void testCompareSubquery4() throws TeiidComponentException, TeiidProcessingException { ProcessorPlan plan = helpPlan("Select e1 from pm1.g1 where e1 > (select e1 FROM pm2.g1 where e2 = 13)", example1(), //$NON-NLS-1$ - new String[] { "SELECT g_0.e1 FROM pm1.g1 AS g_0 WHERE g_0.e1 > (SELECT g_1.e1 FROM pm2.g1 AS g_1 WHERE g_1.e2 = 13)" }); //$NON-NLS-1$ + new String[] { "SELECT g_0.e1 FROM pm1.g1 AS g_0 WHERE g_0.e1 > (SELECT g_0.e1 FROM pm2.g1 AS g_0 WHERE g_0.e2 = 13)" }, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ checkNodeTypes(plan, FULL_PUSHDOWN); } - @Test public void testScalarSubquery1() { + @Test public void testScalarSubquery1() throws TeiidComponentException, TeiidProcessingException { ProcessorPlan plan = helpPlan("Select e1, (select e1 FROM pm2.g1 where e1 = 'x') from pm1.g1", example1(), //$NON-NLS-1$ - new String[] { "SELECT g_0.e1, (SELECT g_1.e1 FROM pm2.g1 AS g_1 WHERE g_1.e1 = 'x') FROM pm1.g1 AS g_0" }); //$NON-NLS-1$ + new String[] { "SELECT g_0.e1, (SELECT g_0.e1 FROM pm2.g1 AS g_0 WHERE g_0.e1 = 'x') FROM pm1.g1 AS g_0" }, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ checkNodeTypes(plan, FULL_PUSHDOWN); } Modified: branches/7.1.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java =================================================================== --- branches/7.1.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2010-08-24 21:45:14 UTC (rev 2488) +++ branches/7.1.x/engine/src/test/java/org/teiid/query/processor/TestProcessor.java 2010-08-25 00:56:42 UTC (rev 2489) @@ -7522,7 +7522,7 @@ ProcessorPlan plan = helpPlan("select pm1.g1.e1 from pm1.g1 where e1 < (select max(vm1.g1.e1) from vm1.g1)", metadata, //$NON-NLS-1$ null, capFinder, - new String[] { "SELECT g_0.e1 FROM pm1.g1 AS g_0 WHERE g_0.e1 < (SELECT MAX(g_1.e1) FROM pm1.g1 AS g_1)" }, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ + new String[] { "SELECT g_0.e1 FROM pm1.g1 AS g_0 WHERE g_0.e1 < (SELECT MAX(g_0.e1) FROM pm1.g1 AS g_0)" }, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ checkNodeTypes(plan, FULL_PUSHDOWN); HardcodedDataManager hdm = new HardcodedDataManager();