[teiid-commits] teiid SVN: r3746 - in branches/7.6.x/engine/src: test/java/org/teiid/query/resolver and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-12-15 16:45:35 -0500 (Thu, 15 Dec 2011)
New Revision: 3746

Modified:
   branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java
   branches/7.6.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
Log:
TEIID-1872 fix for implicit temp table creation

Modified: branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java
===================================================================
--- branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java	2011-12-15 19:34:02 UTC (rev 3745)
+++ branches/7.6.x/engine/src/main/java/org/teiid/query/resolver/command/InsertResolver.java	2011-12-15 21:45:35 UTC (rev 3746)
@@ -120,11 +120,7 @@
         resolveTypes(insert, metadata, values, usingQuery);
         
         if (!insert.getGroup().isResolved()) { //define the implicit temp group
-            if(insert.getQueryExpression() != null) {
-                ResolverUtil.resolveImplicitTempGroup(metadata, insert.getGroup(), insert.getQueryExpression().getProjectedSymbols());
-            }else {
-                ResolverUtil.resolveImplicitTempGroup(metadata, insert.getGroup(), insert.getVariables());
-            }
+            ResolverUtil.resolveImplicitTempGroup(metadata, insert.getGroup(), insert.getVariables());
             resolveVariables(metadata, insert, groups);
             
             //ensure that the types match

Modified: branches/7.6.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java
===================================================================
--- branches/7.6.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java	2011-12-15 19:34:02 UTC (rev 3745)
+++ branches/7.6.x/engine/src/test/java/org/teiid/query/resolver/TestResolver.java	2011-12-15 21:45:35 UTC (rev 3746)
@@ -2998,5 +2998,9 @@
     	XMLQuery ex = (XMLQuery) SymbolMap.getExpression((Expression) q.getSelect().getSymbols().get(0));
     	assertEquals(DataTypeManager.DefaultDataClasses.XML, ex.getPassing().get(0).getExpression().getType());
     }
+    
+    @Test public void testImplicitTempTableWithExplicitColumns() {
+    	helpResolve("insert into #temp(x, y) select e1, e2 from pm1.g1");
+    }
 
 }
\ No newline at end of file