You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2008/02/27 17:54:18 UTC
svn commit: r631643 - in /ibatis/trunk/java/mapper/mapper2:
build/version.properties doc/release.txt
src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
Author: jgbutler
Date: Wed Feb 27 08:54:07 2008
New Revision: 631643
URL: http://svn.apache.org/viewvc?rev=631643&view=rev
Log:
Fix for IBATIS-490: improper use of getColumnLabel()
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/doc/release.txt
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=631643&r1=631642&r2=631643&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Wed Feb 27 08:54:07 2008
@@ -1,5 +1,5 @@
#Build version info
-#Mon Jan 14 11:40:37 MST 2008
+#Wed Feb 27 09:38:03 CST 2008
version=2.3.1
-buildDate=2008/01/14 11\:40
-buildNum=698
+buildDate=2008/02/27 09\:38
+buildNum=699
Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=631643&r1=631642&r2=631643&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Wed Feb 27 08:54:07 2008
@@ -8,6 +8,7 @@
o Fixed BATIS-391 - Cannot access Lists within custom objects.
o Fixed IBATIS-388 - Add methods to unwrap all proxied objects
o Fixed IBATIS-484 - Make setType method in JdbcTypeRegistry public
+ o Fixed IBATIS-490 - Improper use of getColumnLabel()
------------------------------
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java?rev=631643&r1=631642&r2=631643&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java Wed Feb 27 08:54:07 2008
@@ -82,7 +82,7 @@
List resultMappingList = new ArrayList();
ResultSetMetaData rsmd = rs.getMetaData();
for (int i = 0, n = rsmd.getColumnCount(); i < n; i++) {
- String columnName = rsmd.getColumnLabel(i + 1);
+ String columnName = rsmd.getColumnName(i + 1);
String upperColumnName = columnName.toUpperCase(java.util.Locale.ENGLISH);
String matchedProp = (String) propertyMap.get(upperColumnName);
Class type = null;
@@ -118,7 +118,7 @@
List resultMappingList = new ArrayList();
ResultSetMetaData rsmd = rs.getMetaData();
for (int i = 0, n = rsmd.getColumnCount(); i < n; i++) {
- String columnName = rsmd.getColumnLabel(i + 1);
+ String columnName = rsmd.getColumnName(i + 1);
ResultMapping resultMapping = new ResultMapping();
resultMapping.setPropertyName(columnName);
resultMapping.setColumnName(columnName);
@@ -137,7 +137,7 @@
List resultMappingList = new ArrayList();
ResultSetMetaData rsmd = rs.getMetaData();
for (int i = 0, n = rsmd.getColumnCount(); i < n; i++) {
- String columnName = rsmd.getColumnLabel(i + 1);
+ String columnName = rsmd.getColumnName(i + 1);
ResultMapping resultMapping = new ResultMapping();
resultMapping.setPropertyName(columnName);
resultMapping.setColumnName(columnName);
@@ -156,7 +156,7 @@
private void initializePrimitiveResults(ResultSet rs) {
try {
ResultSetMetaData rsmd = rs.getMetaData();
- String columnName = rsmd.getColumnLabel(1);
+ String columnName = rsmd.getColumnName(1);
ResultMapping resultMapping = new ResultMapping();
resultMapping.setPropertyName(columnName);
resultMapping.setColumnName(columnName);