[libpostgresql-jdbc-java] 05/07: ResultSet.getObject().getClass().getName() should match up with ResultSetMetaData.getColumnClassName().

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to tag REL8_0_313
in repository libpostgresql-jdbc-java.

commit 7ad171c80f97b2340efaac772b6fedac2c624a6b
Author: Kris Jurka <books at ejurka.com>
Date:   Thu Sep 29 23:03:41 2005 +0000

    ResultSet.getObject().getClass().getName() should match up with
    ResultSetMetaData.getColumnClassName().
    
    Reported by Karl von Randow.
---
 org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java |  3 +--
 org/postgresql/test/jdbc2/ResultSetMetaDataTest.java     | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java b/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
index cce7b64..7aa1f7c 100644
--- a/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
+++ b/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
@@ -3,7 +3,7 @@
 * Copyright (c) 2004-2005, PostgreSQL Global Development Group
 *
 * IDENTIFICATION
-*   $PostgreSQL: pgjdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java,v 1.16 2004/11/09 08:48:50 jurka Exp $
+*   $PostgreSQL: pgjdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java,v 1.17 2005/01/11 08:25:46 jurka Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -650,7 +650,6 @@ public abstract class AbstractJdbc2ResultSetMetaData implements PGResultSetMetaD
         case Types.BIT:
             return ("java.lang.Boolean");
         case Types.SMALLINT:
-            return ("java.lang.Short");
         case Types.INTEGER:
             return ("java.lang.Integer");
         case Types.BIGINT:
diff --git a/org/postgresql/test/jdbc2/ResultSetMetaDataTest.java b/org/postgresql/test/jdbc2/ResultSetMetaDataTest.java
index b0990c4..f421e61 100644
--- a/org/postgresql/test/jdbc2/ResultSetMetaDataTest.java
+++ b/org/postgresql/test/jdbc2/ResultSetMetaDataTest.java
@@ -3,7 +3,7 @@
 * Copyright (c) 2004-2005, PostgreSQL Global Development Group
 *
 * IDENTIFICATION
-*   $PostgreSQL: pgjdbc/org/postgresql/test/jdbc2/ResultSetMetaDataTest.java,v 1.10 2005/01/11 08:25:48 jurka Exp $
+*   $PostgreSQL: pgjdbc/org/postgresql/test/jdbc2/ResultSetMetaDataTest.java,v 1.11 2005/02/01 07:27:55 jurka Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -33,6 +33,7 @@ public class ResultSetMetaDataTest extends TestCase
         TestUtil.dropSequence( conn, "serialtest_a_seq");
         TestUtil.dropSequence( conn, "serialtest_b_seq");
         TestUtil.createTable(conn, "serialtest", "a serial, b bigserial, c int");
+        TestUtil.createTable(conn, "alltypes", "bool boolean, i2 int2, i4 int4, i8 int8, num numeric(10,2), re real, fl float, ch char(3), vc varchar(3), tx text, d date, t time without time zone, tz time with time zone, ts timestamp without time zone, tsz timestamp with time zone, bt bytea");
     }
 
     protected void tearDown() throws Exception
@@ -40,6 +41,7 @@ public class ResultSetMetaDataTest extends TestCase
         TestUtil.dropTable(conn, "rsmd1");
         TestUtil.dropTable(conn, "timetest");
         TestUtil.dropTable(conn, "serialtest");
+        TestUtil.dropTable(conn, "alltypes");
         TestUtil.dropSequence( conn, "serialtest_a_seq");
         TestUtil.dropSequence( conn, "serialtest_b_seq");
         TestUtil.closeDB(conn);
@@ -182,4 +184,15 @@ public class ResultSetMetaDataTest extends TestCase
         stmt.close();
     }
 
+    public void testClassesMatch() throws SQLException {
+        Statement stmt = conn.createStatement();
+        stmt.executeUpdate("INSERT INTO alltypes (bool, i2, i4, i8, num, re, fl, ch, vc, tx, d, t, tz, ts, tsz, bt) VALUES ('t', 2, 4, 8, 3.1, 3.14, 3.141, 'c', 'vc', 'tx', '2004-04-09', '09:01:00', '11:11:00-01','2004-04-09 09:01:00','1999-09-19 14:23:12-09', '\\\\123')");
+        ResultSet rs = stmt.executeQuery("SELECT * FROM alltypes");
+        ResultSetMetaData rsmd = rs.getMetaData();
+        assertTrue(rs.next());
+        for (int i=0; i<rsmd.getColumnCount(); i++) {
+            assertEquals(rs.getObject(i+1).getClass().getName(), rsmd.getColumnClassName(i+1));
+        }
+    }
+
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git