TEIIDDES-1918 Resolve type mapping issue in RelationalModelProcessor

Teiid-Designer · Nov 15, 2013 · 87a990e · 87a990e
1 parent d392a14
commit 87a990e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/....relational/src/org/teiid/designer/jdbc/relational/impl/RelationalModelProcessorImpl.java b/....relational/src/org/teiid/designer/jdbc/relational/impl/RelationalModelProcessorImpl.java
@@ -1446,14 +1446,14 @@ protected EObject findType( int jdbcType,
             jdbcType = Types.BINARY;
         }
 
-        // First look up by type code ...
-        result = findType(jdbcType, problems);
+        // First look up by name
+        result = findType(typeName, problems);
         if (result != null) {
             return result;
         }
 
-        // Still haven't found one, so look it up by name ...
-        result = findType(typeName, problems);
+        // Still haven't found one, so look it up by typeCode ...
+        result = findType(jdbcType, problems);
         return result;
     }
 

diff --git a/...lational/src/org/teiid/designer/metamodels/relational/util/RelationalTypeMappingImpl.java b/...lational/src/org/teiid/designer/metamodels/relational/util/RelationalTypeMappingImpl.java
@@ -128,10 +128,16 @@ protected String getIdentifier( final EObject datatype ) {
 	public EObject getDatatype( final String jdbcTypeName ) throws ModelerCoreException {
     	EObject result = null;
         if (jdbcTypeName != null) {
-        	Integer typeCode = SQL_TYPE_MAPPING.get(jdbcTypeName.toUpperCase());
-	        if (typeCode != null) {
-	        	result = getDatatype(typeCode);
-	        }
+        	// Look for direct match to Built-in types first
+        	result = this.datatypeManager.getBuiltInDatatype(jdbcTypeName);
+
+        	// No direct match, so look for jdbc type
+        	if(result == null) {
+            	Integer typeCode = SQL_TYPE_MAPPING.get(jdbcTypeName.toUpperCase());
+    	        if (typeCode != null) {
+    	        	result = getDatatype(typeCode);
+    	        }
+        	}
         }
         if (result == null) {
             result = findDatatype(DatatypeConstants.BuiltInNames.OBJECT);