You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ev...@apache.org on 2010/05/24 18:10:03 UTC
svn commit: r947699 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/dba/TypesMapping.java
test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java
Author: evgeny
Date: Mon May 24 16:10:03 2010
New Revision: 947699
URL: http://svn.apache.org/viewvc?rev=947699&view=rev
Log:
CAY-1430 Problems with TINYINT type mapping
Changed TINYINT mapping to Short, and Byte Mapping to SMALLINT
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java?rev=947699&r1=947698&r2=947699&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java Mon May 24 16:10:03 2010
@@ -183,7 +183,7 @@ public class TypesMapping {
sqlEnumJava.put(Integer.valueOf(Types.NUMERIC), JAVA_BIGDECIMAL);
sqlEnumJava.put(Integer.valueOf(Types.REAL), JAVA_FLOAT);
sqlEnumJava.put(Integer.valueOf(Types.SMALLINT), JAVA_SHORT);
- sqlEnumJava.put(Integer.valueOf(Types.TINYINT), JAVA_BYTE);
+ sqlEnumJava.put(Integer.valueOf(Types.TINYINT), JAVA_SHORT);
sqlEnumJava.put(Integer.valueOf(Types.TIME), JAVA_UTILDATE);
sqlEnumJava.put(Integer.valueOf(Types.TIMESTAMP), JAVA_UTILDATE);
sqlEnumJava.put(Integer.valueOf(Types.VARBINARY), JAVA_BYTES);
@@ -201,7 +201,7 @@ public class TypesMapping {
javaSqlEnum.put(JAVA_FLOAT, Integer.valueOf(Types.FLOAT));
javaSqlEnum.put(JAVA_INTEGER, Integer.valueOf(Types.INTEGER));
javaSqlEnum.put(JAVA_SHORT, Integer.valueOf(Types.SMALLINT));
- javaSqlEnum.put(JAVA_BYTE, Integer.valueOf(Types.TINYINT));
+ javaSqlEnum.put(JAVA_BYTE, Integer.valueOf(Types.SMALLINT));
javaSqlEnum.put(JAVA_TIME, Integer.valueOf(Types.TIME));
javaSqlEnum.put(JAVA_TIMESTAMP, Integer.valueOf(Types.TIMESTAMP));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java?rev=947699&r1=947698&r2=947699&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ReturnTypesMappingTest.java Mon May 24 16:10:03 2010
@@ -714,8 +714,7 @@ public class ReturnTypesMappingTest exte
DataRow testRead = (DataRow) context.performQuery(q).get(0);
Object columnValue = testRead.get(columnName);
assertNotNull(columnValue);
- assertTrue(Byte.class.equals(columnValue.getClass())
- || Short.class.equals(columnValue.getClass()));
+ assertTrue(Short.class.equals(columnValue.getClass()));
assertEquals(tinyintValue.intValue(), ((Number)columnValue).intValue());
}