Connector/J commit: r6740 - in branches/branch_5_1: . src/com/mysql/jdbc src/testsuite/regression

[mmatthews]

Modified:
   branches/branch_5_1/CHANGES
   branches/branch_5_1/src/com/mysql/jdbc/ResultSetMetaData.java
   branches/branch_5_1/src/testsuite/regression/MetaDataRegressionTest.java
Log:
Fixed BUG#34194 - ResultSetMetaData.getColumnTypeName() returns
      "UNKNOWN" for GEOMETRY type.

Modified: branches/branch_5_1/CHANGES
===================================================================
--- branches/branch_5_1/CHANGES	2008-02-27 05:24:07 UTC (rev 6739)
+++ branches/branch_5_1/CHANGES	2008-02-27 05:34:59 UTC (rev 6740)
@@ -143,6 +143,9 @@
     - Fixed BUG#34703 - Connection.isValid() invalidates connection after
       timeout, even if connection is actually valid.
       
+    - Fixed BUG#34194 - ResultSetMetaData.getColumnTypeName() returns
+      "UNKNOWN" for GEOMETRY type.
+      
 10-09-07 - Version 5.1.5
 
     - Released instead of 5.1.4 to pickup patch for BUG#31053

Modified: branches/branch_5_1/src/com/mysql/jdbc/ResultSetMetaData.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ResultSetMetaData.java	2008-02-27 05:24:07 UTC
(rev 6739)
+++ branches/branch_5_1/src/com/mysql/jdbc/ResultSetMetaData.java	2008-02-27 05:34:59 UTC
(rev 6740)
@@ -371,7 +371,10 @@
 
 		case MysqlDefs.FIELD_TYPE_SET:
 			return "SET"; //$NON-NLS-1$
-
+			
+		case MysqlDefs.FIELD_TYPE_GEOMETRY:
+			return "GEOMETRY"; //$NON-NLS-1$
+			
 		default:
 			return "UNKNOWN"; //$NON-NLS-1$
 		}

Modified: branches/branch_5_1/src/testsuite/regression/MetaDataRegressionTest.java
===================================================================
--- branches/branch_5_1/src/testsuite/regression/MetaDataRegressionTest.java	2008-02-27
05:24:07 UTC (rev 6739)
+++ branches/branch_5_1/src/testsuite/regression/MetaDataRegressionTest.java	2008-02-27
05:34:59 UTC (rev 6740)
@@ -2194,4 +2194,18 @@
 			closeMemberJDBCResources();
 		}
 	}
+	
+	public void testBug34194() throws Exception {
+		createTable("bug34194", "(id integer,geom geometry)");
+		try {
+			this.stmt
+					.execute("insert into bug34194 values('1',GeomFromText('POINT(622572.881
5156121.034)'))");
+			this.rs = this.stmt.executeQuery("select * from bug34194");
+			ResultSetMetaData RSMD = this.rs.getMetaData();
+			assertEquals("GEOMETRY", RSMD.getColumnTypeName(2));
+
+		} finally {
+			closeMemberJDBCResources();
+		}
+	}
 }