[teiid-commits] teiid SVN: r2993 - in trunk: common-core/src/main/java/org/teiid/core/types and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-16 10:38:29 -0400 (Wed, 16 Mar 2011)
New Revision: 2993

Modified:
   trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
   trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java
   trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java
Log:
TEIID-1512 fixing the show plan results

Modified: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java	2011-03-16 01:43:50 UTC (rev 2992)
+++ trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java	2011-03-16 14:38:29 UTC (rev 2993)
@@ -291,12 +291,10 @@
         currentValue = cursorRow.get(column-1);
             
         if (currentValue instanceof Streamable<?>) {
-        	if (Boolean.getBoolean(Streamable.FORCE_STREAMING)) {
-        		Object reference = ((Streamable<?>)currentValue).getReference();
-            	if (reference != null) {
-            		currentValue = reference;
-            		return currentValue;
-            	}
+    		Object reference = ((Streamable<?>)currentValue).getReference();
+        	if (reference != null) {
+        		currentValue = reference;
+        		return currentValue;
         	}
             if(currentValue instanceof ClobType){
             	currentValue = new ClobImpl(createInputStreamFactory((ClobType)currentValue), ((ClobType)currentValue).getLength());

Modified: trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java
===================================================================
--- trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java	2011-03-16 01:43:50 UTC (rev 2992)
+++ trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java	2011-03-16 14:38:29 UTC (rev 2993)
@@ -48,7 +48,6 @@
 	
 	public static final String ENCODING = "UTF-8"; //$NON-NLS-1$
 	public static final Charset CHARSET = Charset.forName(ENCODING);
-    public static final String FORCE_STREAMING = "FORCE_STREAMING"; //$NON-NLS-1$
     public static final int STREAMING_BATCH_SIZE_IN_BYTES = 102400; // 100K
 
     private String referenceStreamId = String.valueOf(counter.getAndIncrement());

Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java	2011-03-16 01:43:50 UTC (rev 2992)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestQueryPlans.java	2011-03-16 14:38:29 UTC (rev 2993)
@@ -71,6 +71,7 @@
 		rs = s.executeQuery("show plan");
 		assertTrue(rs.next());
 		assertEquals(rs.getMetaData().getColumnType(1), Types.CLOB);
+		assertTrue(rs.getString(1).startsWith("ProjectNode"));
 		SQLXML plan = rs.getSQLXML(2);
 		assertTrue(plan.getString().startsWith("<?xml"));
 		assertNull(rs.getObject("DEBUG_LOG"));