### Eclipse Workspace Patch 1.0
#P org.teiid.designer.metamodels.relational
Index: src/com/metamatrix/metamodels/relational/util/RelationalTypeMappingImpl.java
===================================================================
--- src/com/metamatrix/metamodels/relational/util/RelationalTypeMappingImpl.java	(revision 1417)
+++ src/com/metamatrix/metamodels/relational/util/RelationalTypeMappingImpl.java	(working copy)
@@ -111,7 +111,7 @@
 
         // register(Types.ARRAY, SQL_TYPE_NAMES.ARRAY, internalFindDatatype(DatatypeConstants.BuiltInNames.) );
         register(Types.BIGINT, SQL_TYPE_NAMES.BIGINT, internalFindDatatype(DatatypeConstants.BuiltInNames.LONG));
-        register(Types.BINARY, SQL_TYPE_NAMES.BINARY, internalFindDatatype(DatatypeConstants.BuiltInNames.OBJECT));
+        register(Types.BINARY, SQL_TYPE_NAMES.BINARY, internalFindDatatype(DatatypeConstants.BuiltInNames.BLOB));
         register(Types.BIT, SQL_TYPE_NAMES.BIT, internalFindDatatype(DatatypeConstants.BuiltInNames.BOOLEAN));
         register(Types.VARBINARY, SQL_TYPE_NAMES.VARBINARY, internalFindDatatype(DatatypeConstants.BuiltInNames.BLOB));
         register(Types.BLOB, SQL_TYPE_NAMES.BLOB, internalFindDatatype(DatatypeConstants.BuiltInNames.BLOB));
@@ -123,8 +123,8 @@
         register(Types.DOUBLE, SQL_TYPE_NAMES.DOUBLE, internalFindDatatype(DatatypeConstants.BuiltInNames.DOUBLE));
         register(Types.INTEGER, SQL_TYPE_NAMES.INTEGER, internalFindDatatype(DatatypeConstants.BuiltInNames.INT));
         register(Types.FLOAT, SQL_TYPE_NAMES.FLOAT, internalFindDatatype(DatatypeConstants.BuiltInNames.FLOAT));
-        register(Types.LONGVARBINARY, SQL_TYPE_NAMES.LONGVARBINARY, internalFindDatatype(DatatypeConstants.BuiltInNames.OBJECT));
-        register(Types.LONGVARCHAR, SQL_TYPE_NAMES.LONGVARCHAR, internalFindDatatype(DatatypeConstants.BuiltInNames.STRING));
+        register(Types.LONGVARBINARY, SQL_TYPE_NAMES.LONGVARBINARY, internalFindDatatype(DatatypeConstants.BuiltInNames.BLOB));
+        register(Types.LONGVARCHAR, SQL_TYPE_NAMES.LONGVARCHAR, internalFindDatatype(DatatypeConstants.BuiltInNames.CLOB));
         register(Types.NCHAR, SQL_TYPE_NAMES.NCHAR, internalFindDatatype(DatatypeConstants.BuiltInNames.STRING));
         register(Types.NUMERIC, SQL_TYPE_NAMES.NUMERIC, internalFindDatatype(DatatypeConstants.BuiltInNames.BIG_DECIMAL));
         register(Types.NVARCHAR, SQL_TYPE_NAMES.NVARCHAR, internalFindDatatype(DatatypeConstants.BuiltInNames.STRING));
#P org.teiid.designer.jdbc.relational
Index: src/com/metamatrix/modeler/jdbc/relational/impl/RelationalModelProcessorImpl.java
===================================================================
--- src/com/metamatrix/modeler/jdbc/relational/impl/RelationalModelProcessorImpl.java	(revision 1417)
+++ src/com/metamatrix/modeler/jdbc/relational/impl/RelationalModelProcessorImpl.java	(working copy)
@@ -1339,7 +1339,7 @@
         // Defect 15386 - Removed the length > 1 check on the Types.CHAR JDBC type
         // The CHAR runtime type is now deprecated, and thus we import JDBC chars of
         // length 1 as strings
-        if (jdbcType == Types.CHAR || jdbcType == Types.VARCHAR || jdbcType == Types.LONGVARCHAR || jdbcType == Types.NCHAR
+        if (jdbcType == Types.CHAR || jdbcType == Types.VARCHAR || jdbcType == Types.NCHAR
             || jdbcType == Types.NVARCHAR || RelationalTypeMapping.SQL_TYPE_NAMES.NCHAR.equals(typeName)
             || RelationalTypeMapping.SQL_TYPE_NAMES.NVARCHAR.equals(typeName)) {
             result = findType(RelationalTypeMapping.SQL_TYPE_NAMES.VARCHAR, problems);