[teiid-commits] teiid SVN: r4051 - in trunk: runtime/src/main/java/org/teiid/transport and 1 other directories.

Author: shawkins Date: 2012-05-02 13:06:23 -0400 (Wed, 02 May 2012) New Revision: 4051 Modified: trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java Log: TEIID-2025 using getCharacterStream for pg_text Modified: trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 17:05:07 UTC (rev 4050) +++ trunk/runtime/src/main/java/org/teiid/odbc/PGUtil.java 2012-05-02 17:06:23 UTC (rev 4051) @@ -102,8 +102,6 @@ case Types.LONGVARCHAR: case Types.CLOB: - return PG_TYPE_TEXT; - case Types.SQLXML: return PG_TYPE_TEXT; Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-05-02 17:05:07 UTC (rev 4050) +++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2012-05-02 17:06:23 UTC (rev 4051) @@ -32,7 +32,6 @@ import java.nio.charset.Charset; import java.security.GeneralSecurityException; import java.sql.Blob; -import java.sql.Clob; import java.sql.ParameterMetaData; import java.sql.ResultSet; import java.sql.SQLException; @@ -482,9 +481,8 @@ break; case PG_TYPE_TEXT: - Clob clob = rs.getClob(column); - if (clob != null) { - Reader r = clob.getCharacterStream(); + Reader r = rs.getCharacterStream(column); + if (r != null) { try { ObjectConverterUtil.write(writer, r, this.maxLobSize, false); } finally { Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-02 17:05:07 UTC (rev 4050) +++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2012-05-02 17:06:23 UTC (rev 4051) @@ -345,4 +345,25 @@ assertTrue(s.execute("select * from tables order by name")); TestMMDatabaseMetaData.compareResultSet("TestODBCSocketTransport/testSelect", s.getResultSet()); } + + @Test public void testPayload() throws Exception { + Statement s = conn.createStatement(); + assertFalse(s.execute("SET PAYLOAD x y")); + assertTrue(s.execute("SELECT commandpayload('x')")); + ResultSet rs = s.getResultSet(); + assertTrue(rs.next()); + String str = rs.getString(1); + assertEquals("y", str); + } + + @Test public void testShowPlan() throws Exception { + Statement s = conn.createStatement(); + assertFalse(s.execute("SET SHOWPLAN ON")); + assertTrue(s.execute("SELECT 1")); + assertTrue(s.execute("SHOW PLAN")); + ResultSet rs = s.getResultSet(); + assertTrue(rs.next()); + String str = rs.getString(1); + assertEquals("ProjectNode\n + Output Columns:expr1 (integer)\n + Statistics:\n 0: Node Output Rows: 1\n 1: Node Process Time: 0\n 2: Node Cumulative Process Time: 0\n 3: Node Cumulative Next Batch Process Time: 0\n 4: Node Next Batch Calls: 1\n 5: Node Blocks: 0\n + Cost Estimates:Estimated Node Cardinality: 1.0\n + Select Columns:1\n", str); + } }