TEIID-4423 adding unwrap

teiid · Sep 1, 2016 · de8eae1 · de8eae1
1 parent ad9bffc
commit de8eae1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java b/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.naming.InitialContext;
+import javax.resource.ResourceException;
 
 import org.teiid.core.TeiidComponentException;
 import org.teiid.core.TeiidRuntimeException;
@@ -49,6 +50,7 @@
 import org.teiid.query.optimizer.capabilities.SourceCapabilities;
 import org.teiid.query.sql.lang.Command;
 import org.teiid.query.validator.ValidatorReport;
+import org.teiid.resource.spi.WrappedConnection;
 import org.teiid.translator.ExecutionContext;
 import org.teiid.translator.ExecutionFactory;
 import org.teiid.translator.TranslatorException;
@@ -181,6 +183,13 @@ private BasicSourceCapabilities buildCapabilities(ExecutionFactory<Object, Objec
         		if (connection == null) {
             		throw new TranslatorException(QueryPlugin.Event.TEIID31108, QueryPlugin.Util.getString("datasource_not_found", getConnectionName())); //$NON-NLS-1$);
             	}
+        		if (connection instanceof WrappedConnection) {
+                    try {
+                        connection = ((WrappedConnection)connection).unwrap();
+                    } catch (ResourceException e) {
+                        throw new TranslatorException(QueryPlugin.Event.TEIID30477, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30477, getConnectionName()));
+                    }   
+                }
         		LogManager.logDetail(LogConstants.CTX_CONNECTOR, "Initializing the capabilities for", translatorName); //$NON-NLS-1$
         		synchronized (executionFactory) {
             		executionFactory.initCapabilities(connection);

diff --git a/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java b/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
@@ -340,7 +340,7 @@ public synchronized void execute() throws TranslatorException {
 					try {
 						unwrapped = ((WrappedConnection)connection).unwrap();
 					} catch (ResourceException e) {
-						 throw new TranslatorException(QueryPlugin.Event.TEIID30477, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30477));
+						 throw new TranslatorException(QueryPlugin.Event.TEIID30477, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30477, this.manager.getConnectionName()));
 					}	
 				}
 

diff --git a/engine/src/main/resources/org/teiid/query/i18n.properties b/engine/src/main/resources/org/teiid/query/i18n.properties
@@ -1180,7 +1180,7 @@ TEIID30416=Expected a java.sql.Array, or java array type, but got: {0}
 TEIID30431={0} has invalid character: {1}
 TEIID30449=Invalid escape sequence "{0}" with escape character "{1}"
 TEIID30452=Wrong type of child node is being added.
-TEIID30477=Failed to unwrap the source connection for schema {0}.
+TEIID30477=Failed to unwrap the source connection for {0}.
 TEIID30563=The request {0} has been cancelled.=======
 TEIID30564=Invalid locale {0} for collation, using default collation
 TEIID30565=Using collator for locale {0}