[teiid-commits] teiid SVN: r2988 - in trunk: engine/src/test/java/org/teiid/query/unittest and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-10 10:53:30 -0500 (Thu, 10 Mar 2011)
New Revision: 2988

Modified:
   trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java
   trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java
Log:
TEIID-1478 adding a set of the length as well

Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java
===================================================================
--- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java	2011-03-09 22:28:50 UTC (rev 2987)
+++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCMetdataProcessor.java	2011-03-10 15:53:30 UTC (rev 2988)
@@ -238,12 +238,13 @@
 			String columnName = columns.getString(4);
 			int type = columns.getInt(5);
 			String typeName = columns.getString(6);
-			int columnLength = columns.getInt(7);
-			String runtimeType = getRuntimeType(type, typeName, columnLength);
+			int columnSize = columns.getInt(7);
+			String runtimeType = getRuntimeType(type, typeName, columnSize);
 			//note that the resultset is already ordered by position, so we can rely on just adding columns in order
 			Column column = metadataFactory.addColumn(columnName, runtimeType, tableInfo.table);
 			column.setNameInSource(quoteName(columnName));
-			column.setPrecision(columnLength);
+			column.setPrecision(columnSize);
+			column.setLength(columnSize);
 			column.setNativeType(typeName);
 			column.setRadix(columns.getInt(10));
 			column.setNullType(NullType.values()[columns.getShort(11)]);
@@ -264,7 +265,7 @@
                     }
 				} else { //SQLServer quotes bit values
                     String trimedDefault = defaultValue.trim();
-                    if (defaultValue.startsWith("(") && defaultValue.endsWith(")")) {
+                    if (defaultValue.startsWith("(") && defaultValue.endsWith(")")) { //$NON-NLS-1$ //$NON-NLS-2$
                         trimedDefault = defaultValue.substring(1, defaultValue.length() - 1);
                     }
                     column.setDefaultValue(trimedDefault);

Modified: trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java	2011-03-09 22:28:50 UTC (rev 2987)
+++ trunk/engine/src/test/java/org/teiid/query/unittest/FakeMetadataFactory.java	2011-03-10 15:53:30 UTC (rev 2988)
@@ -164,7 +164,7 @@
     		model.setModelType(Model.Type.PHYSICAL);
     	}
     	else {
-    		model.setModelType(Model.Type.PHYSICAL);
+    		model.setModelType(Model.Type.VIRTUAL);
     	}
     	model.setVisible(true);
     	model.setSupportsMultiSourceBindings(false);