TEIID-3187 ensuring the translator is set on the capabilities

teiid · Nov 25, 2014 · f77d6ce · f77d6ce
1 parent 3c4525a
commit f77d6ce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java b/engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java
@@ -50,7 +50,7 @@ public static SourceCapabilities convertCapabilities(ExecutionFactory srcCaps) {
 
     public static BasicSourceCapabilities convertCapabilities(ExecutionFactory srcCaps, Object connectorID) {
         BasicSourceCapabilities tgtCaps = new BasicSourceCapabilities();
-
+        tgtCaps.setTranslator(srcCaps);
         tgtCaps.setCapabilitySupport(Capability.QUERY_SELECT_EXPRESSION, srcCaps.supportsSelectExpression());
         tgtCaps.setCapabilitySupport(Capability.QUERY_SELECT_DISTINCT, srcCaps.supportsSelectDistinct());
         tgtCaps.setCapabilitySupport(Capability.QUERY_FROM_GROUP_ALIAS, srcCaps.supportsAliasedTable());

diff --git a/engine/src/test/java/org/teiid/dqp/internal/process/TestConnectorCapabilitiesFinder.java b/engine/src/test/java/org/teiid/dqp/internal/process/TestConnectorCapabilitiesFinder.java
@@ -25,6 +25,8 @@
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -38,6 +40,7 @@
 import org.teiid.query.optimizer.capabilities.SourceCapabilities;
 import org.teiid.translator.ExecutionFactory;
 import org.teiid.translator.TranslatorException;
+import org.teiid.translator.TypeFacility;
 
 
 /**
@@ -117,4 +120,21 @@ public void start() throws TranslatorException {
     	BasicSourceCapabilities bsc = CapabilitiesConverter.convertCapabilities(ef, "conn"); //$NON-NLS-1$
         assertTrue("Did not get expected capabilities", bsc.supportsFunction("ns.func")); //$NON-NLS-1$ //$NON-NLS-2$
     }
+
+    @Test public void testConverts() throws Exception {
+    	ExecutionFactory<Object, Object> ef  = new ExecutionFactory<Object, Object>(){
+    		@Override
+    		public boolean supportsConvert(int fromType, int toType) {
+    			return false;
+    		}
+    		@Override
+    		public List<String> getSupportedFunctions() {
+    			return Arrays.asList("convert");
+    		}
+    	};
+    	ef.start();
+    	BasicSourceCapabilities bsc = CapabilitiesConverter.convertCapabilities(ef, "conn"); //$NON-NLS-1$
+        assertTrue(bsc.supportsFunction("convert")); //$NON-NLS-1$ 
+        assertFalse(bsc.supportsConvert(TypeFacility.RUNTIME_CODES.BIG_DECIMAL, TypeFacility.RUNTIME_CODES.BIG_INTEGER));
+    }
 }