[replying via dev]

Happy birthday :-)

IMO this commit shouldn't go to 3.0-final, and should be deferred till 3.0.1 (I updated the Jira to that extent). However since it is already committed, I suggest we keep it, and go with my second alternative:

* 3.0-STABLE branch becomes a branch for 3.0.1 development
* 3.0RC3 tag becomes basis for 3.0-final (we need to clone it though)

This is totally fine with me. If we have last second fixes for 3.0- final, we'll just need to remember to add it to more branches.

Also please update RELEASE-NOTES files on all affected branches.

Andrus


On Apr 5, 2010, at 5:33 PM, Evgeny Ryabitskiy wrote:
Yes... but looks like not very clearly (2 april was my birthday)...
I have re-read it... so you didn't want to commit this patch...
Should I rollback it ?

Evgeny.


2010/4/5 Andrus Adamchik <and...@objectstyle.org>:
Hi Evgeny,

did you read my email to dev list sent on April 2?

Andrus

On Apr 5, 2010, at 5:18 PM, evg...@apache.org wrote:

Author: evgeny
Date: Mon Apr  5 14:18:34 2010
New Revision: 930864

URL: http://svn.apache.org/viewvc?rev=930864&view=rev
Log:
CAY-1354 Wrong Types mapping for selected values in Row Queries

Move logic of Java type resolving from driver to Cayenne type mapping. Reason: Drivers can return here different types (even some specific like
com.oracle.TIMESTAMP)

Modified:

cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5- unpublished/src/main/java/org/apache/cayenne/access/jdbc/ ColumnDescriptor.java

Modified:
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5- unpublished/src/main/java/org/apache/cayenne/access/jdbc/ ColumnDescriptor.java
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java?rev=930864&r1=930863&r2=930864&view=diff

= = = = = = = = = = ====================================================================
---
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5- unpublished/src/main/java/org/apache/cayenne/access/jdbc/ ColumnDescriptor.java
(original)
+++
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5- unpublished/src/main/java/org/apache/cayenne/access/jdbc/ ColumnDescriptor.java
Mon Apr  5 14:18:34 2010
@@ -67,7 +67,7 @@ public class ColumnDescriptor implements
       this.name = columnName;
       this.dataRowKey = columnName;
       this.jdbcType = jdbcType;
-        this.javaClass = javaClass;
+        this.javaClass = TypesMapping.getJavaBySqlType(jdbcType);
   }

   /**







Reply via email to