[teiid-commits] teiid SVN: r4358 - in trunk/engine/src: test/java/org/teiid/query/processor and 1 other directory.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Wed Aug 22 18:50:26 EDT 2012
Author: shawkins
Date: 2012-08-22 18:50:26 -0400 (Wed, 22 Aug 2012)
New Revision: 4358
Modified:
trunk/engine/src/main/java/org/teiid/query/sql/lang/XMLTable.java
trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
Log:
TEIID-2160 fixing the for ordinality column type
Modified: trunk/engine/src/main/java/org/teiid/query/sql/lang/XMLTable.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/sql/lang/XMLTable.java 2012-08-22 14:36:45 UTC (rev 4357)
+++ trunk/engine/src/main/java/org/teiid/query/sql/lang/XMLTable.java 2012-08-22 22:50:26 UTC (rev 4358)
@@ -26,7 +26,7 @@
private XPathExpression pathExpression;
public XMLColumn(String name) {
- super(name, DataTypeManager.DefaultDataTypes.STRING);
+ super(name, DataTypeManager.DefaultDataTypes.INTEGER);
this.ordinal = true;
}
Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2012-08-22 14:36:45 UTC (rev 4357)
+++ trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2012-08-22 22:50:26 UTC (rev 4358)
@@ -22,6 +22,7 @@
package org.teiid.query.processor;
+import static org.junit.Assert.*;
import static org.teiid.query.processor.TestProcessor.*;
import java.io.FileInputStream;
@@ -52,6 +53,7 @@
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.metadata.TransformationMetadata;
import org.teiid.query.optimizer.capabilities.DefaultCapabilitiesFinder;
+import org.teiid.query.sql.symbol.Expression;
import org.teiid.query.unittest.RealMetadataFactory;
import org.teiid.query.unittest.TimestampUtil;
@@ -320,7 +322,8 @@
Arrays.asList(4, null),
};
- process(sql, expected);
+ ProcessorPlan plan = process(sql, expected);
+ assertEquals(DataTypeManager.DefaultDataClasses.INTEGER, ((Expression)plan.getOutputElements().get(0)).getType());
}
@Test public void testXmlTableDescendantPath() throws Exception {
@@ -514,10 +517,11 @@
TimestampWithTimezone.resetCalendar(null); //$NON-NLS-1$
}
- private void process(String sql, List<?>[] expected) throws Exception {
+ private ProcessorPlan process(String sql, List<?>[] expected) throws Exception {
ProcessorPlan plan = helpGetPlan(helpParse(sql), RealMetadataFactory.example1Cached(), new DefaultCapabilitiesFinder(), createCommandContext());
helpProcess(plan, createCommandContext(), dataManager, expected);
+ return plan;
}
public static BlobType blobFromFile(final String file) {
More information about the teiid-commits
mailing list