TEIID-5479 correcting aggregate pushdown metadata

teiid · Sep 18, 2018 · a4fd289 · a4fd289
1 parent 283c773
commit a4fd289
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/.../translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java b/.../translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java
@@ -1290,8 +1290,8 @@ public void testGeometryInsertQueryExpression() throws Exception {
     @Test public void testListAgg() throws Exception {
         TRANSLATOR.setDatabaseVersion("12.0");
         TRANSLATOR.initCapabilities(null);
-        String input = "SELECT listagg(stringkey), listagg(stringkey, ';' order by intkey) FROM BQT1.SmallA";
-        String output = "SELECT listagg(SmallA.StringKey), listagg(SmallA.StringKey, ';') WITHIN GROUP (ORDER BY SmallA.IntKey) FROM SmallA"; //$NON-NLS-1$
+        String input = "SELECT listagg(stringkey), oracle.listagg(stringkey, ';' order by intkey) FROM BQT1.SmallA";
+        String output = "SELECT LISTAGG(SmallA.StringKey), LISTAGG(SmallA.StringKey, ';') WITHIN GROUP (ORDER BY SmallA.IntKey) FROM SmallA"; //$NON-NLS-1$
         TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR);
     }
 

diff --git a/engine/src/main/java/org/teiid/dqp/internal/datamgr/LanguageBridgeFactory.java b/engine/src/main/java/org/teiid/dqp/internal/datamgr/LanguageBridgeFactory.java
@@ -880,16 +880,21 @@ AggregateFunction translate(AggregateSymbol symbol) {
 			params.add(translate(expression));
 		}
     	String name = symbol.getAggregateFunction().name();
-    	if (symbol.getAggregateFunction() == AggregateSymbol.Type.USER_DEFINED) {
-    		name = symbol.getName();
-    	}
-
-    	AggregateFunction af = new AggregateFunction(name, 
+    	if (symbol.getFunctionDescriptor() != null) {
+            name = Symbol.getShortName(symbol.getFunctionDescriptor().getName());
+        } else if (symbol.getAggregateFunction() == AggregateSymbol.Type.USER_DEFINED) {
+            name = symbol.getName();
+        }
+
+        AggregateFunction af = new AggregateFunction(name, 
                                 symbol.isDistinct(), 
                                 params,
                                 symbol.getType());
-    	af.setCondition(translate(symbol.getCondition()));
-    	af.setOrderBy(translate(symbol.getOrderBy(), false));
+        af.setCondition(translate(symbol.getCondition()));
+        af.setOrderBy(translate(symbol.getOrderBy(), false));
+        if (symbol.getFunctionDescriptor() != null) {
+            af.setMetadataObject(symbol.getFunctionDescriptor().getMethod());
+        }
     	return af;
     }