TEIID-4343 fix to not use the with columns

teiid · Aug 2, 2016 · 17b6da0 · 17b6da0
1 parent 0a37757
commit 17b6da0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/...ctors/translator-hive/src/main/java/org/teiid/translator/hive/ImpalaExecutionFactory.java b/...ctors/translator-hive/src/main/java/org/teiid/translator/hive/ImpalaExecutionFactory.java
@@ -361,6 +361,21 @@ public List<?> translateCommand(Command command, ExecutionContext context) {
     	return super.translateCommand(command, context);
     }
 
+    @Override
+    public List<?> translate(LanguageObject obj, ExecutionContext context) {
+    	if (obj instanceof WithItem) {
+    		WithItem item = (WithItem)obj;
+    		List<ColumnReference> cols = item.getColumns();
+    		item.setColumns(null);
+    		Select select = item.getSubquery().getProjectedQuery();
+			List<DerivedColumn> selectClause = select.getDerivedColumns();
+			for (int i = 0; i < cols.size(); i++) {
+				selectClause.get(i).setAlias(cols.get(i).getName());
+			}
+    	}
+    	return super.translate(obj, context);
+    }
+
     @Override
     protected boolean usesDatabaseVersion() {
     	return true;

diff --git a/...s/translator-hive/src/test/java/org/teiid/translator/hive/TestImpalaExecutionFactory.java b/...s/translator-hive/src/test/java/org/teiid/translator/hive/TestImpalaExecutionFactory.java
@@ -32,6 +32,7 @@
 import org.teiid.language.Expression;
 import org.teiid.language.Function;
 import org.teiid.language.LanguageFactory;
+import org.teiid.language.Select;
 import org.teiid.query.metadata.TransformationMetadata;
 import org.teiid.query.unittest.RealMetadataFactory;
 import org.teiid.translator.TranslatorException;
@@ -128,4 +129,12 @@ private void helpTest(Expression srcExpression, String tgtType, String expectedE
         sqlVisitor.append(obj);
         assertEquals("SELECT DISTINCT c_0 FROM (SELECT MAX(SmallA.StringNum) AS c_0 FROM SmallA GROUP BY SmallA.StringKey) X__", sqlVisitor.toString());
     }
+
+    @Test public void testWith() {
+    	CommandBuilder commandBuilder = new CommandBuilder(RealMetadataFactory.exampleBQTCached());
+        Select obj = (Select) commandBuilder.getCommand("with x as /*+ no_inline */ (SELECT max(StringNum) as a FROM bqt1.SmallA group by stringkey) select * from x");
+        SQLConversionVisitor sqlVisitor = impalaTranslator.getSQLConversionVisitor(); 
+        sqlVisitor.append(obj);
+        assertEquals("WITH x AS (SELECT MAX(SmallA.StringNum) AS a FROM SmallA GROUP BY SmallA.StringKey) SELECT x.a FROM x", sqlVisitor.toString());
+    }
 }