Adds changes for Teiid 8.7 CR2

* Brings client up to date with current teiid releases
Teiid-Designer · Apr 9, 2014 · 430d4fb · 430d4fb
1 parent 13f1104
commit 430d4fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/eval/Evaluator.java b/plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/eval/Evaluator.java
@@ -1183,7 +1183,7 @@ private Object evaluateParameter(DerivedColumn passing)
 					}
 					return XMLSystemFunctions.jsonToXml(rootName, (Clob)lob, true);
 				} catch (Exception e) {
-					throw new TeiidClientException(Messages.gs(Messages.TEIID.TEIID30384, f.getFunctionDescriptor().getName(), e.getMessage()));
+					throw new TeiidClientException(e, Messages.gs(Messages.TEIID.TEIID30384, f.getFunctionDescriptor().getName()));
 				}
 			}
 		} else if (passing.getExpression() instanceof XMLParse) {

diff --git a/plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/function/FunctionLibrary.java b/plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/function/FunctionLibrary.java
@@ -310,6 +310,11 @@ public FunctionDescriptor[] determineNecessaryConversions(String name, Class<?>
                     currentScore++;
                     continue;
                 }
+                if (sourceType.isArray() && targetType.isArray()
+                    && sourceType.getComponentType().equals(targetType.getComponentType())) {
+                    currentScore++;
+                    continue;
+                }
                 if (sourceType.isArray()) {
                     if (isVarArgArrayParam(nextMethod, types, i, targetType)) {
                 		//vararg array parameter