Author: shawkins
Date: 2010-10-26 16:44:55 -0400 (Tue, 26 Oct 2010)
New Revision: 2683
Modified:
trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java
Log:
TEIID-1295 re-fixing multi-source update count.
Modified:
trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java
===================================================================
---
trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2010-10-26
14:11:06 UTC (rev 2682)
+++
trunk/engine/src/main/java/org/teiid/dqp/internal/process/multisource/MultiSourcePlanToProcessConverter.java 2010-10-26
20:44:55 UTC (rev 2683)
@@ -190,7 +190,7 @@
ProjectNode projectNode = new ProjectNode(getID());
- Expression intSum = ResolverUtil.convertExpression(sumCount,
DataTypeManager.DefaultDataTypes.STRING, metadata);
+ Expression intSum = ResolverUtil.getConversion(sumCount,
DataTypeManager.getDataTypeName(sumCount.getType()),
DataTypeManager.DefaultDataTypes.INTEGER, false, metadata.getFunctionLibrary());
Expression rowCount = new ExpressionSymbol("RowCount", intSum);
//$NON-NLS-1$
outputElements = new ArrayList<Expression>(1);
Modified:
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java
===================================================================
---
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2010-10-26
14:11:06 UTC (rev 2682)
+++
trunk/engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java 2010-10-26
20:44:55 UTC (rev 2683)
@@ -249,5 +249,17 @@
final ProcessorDataManager dataMgr = new MultiSourceDataManager();
helpTestMultiSourcePlan(metadata, userSql, multiModel, sources, dataMgr,
expected, FakeMetadataFactory.exampleMultiBindingVDB());
}
+
+ @Test public void testMultiUpdateAll() throws Exception {
+ final QueryMetadataInterface metadata =
FakeMetadataFactory.exampleMultiBinding();
+ final String userSql = "update MultiModel.Phys set a = '1' where b =
'z'"; //$NON-NLS-1$
+ final String multiModel = "MultiModel"; //$NON-NLS-1$
+ final int sources = 3;
+ final List[] expected = new List[] { Arrays.asList(3)};
+ final MultiSourceDataManager dataMgr = new MultiSourceDataManager();
+ dataMgr.setMustRegisterCommands(true);
+ dataMgr.addData("UPDATE MultiModel.Phys SET a = '1' WHERE b =
'z'", new List[] {Arrays.asList(1)}); //$NON-NLS-1$
+ helpTestMultiSourcePlan(metadata, userSql, multiModel, sources, dataMgr,
expected, FakeMetadataFactory.exampleMultiBindingVDB());
+ }
}
Show replies by date