You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2010/12/14 18:20:49 UTC
svn commit: r1049180 - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/DateTime.java
drda/org/apache/derby/impl/drda/AppRequester.java
engine/org/apache/derby/iapi/reference/DRDAConstants.java
Author: rhillegas
Date: Tue Dec 14 17:20:49 2010
New Revision: 1049180
URL: http://svn.apache.org/viewvc?rev=1049180&view=rev
Log:
DERBY-4614: Fix backward compatibility issue when exchanging timestamps.
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java?rev=1049180&r1=1049179&r2=1049180&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/DateTime.java Tue Dec 14 17:20:49 2010
@@ -745,7 +745,7 @@ public class DateTime {
public static int getTimestampLength( boolean supportsTimestampNanoseconds )
{
return supportsTimestampNanoseconds ?
- DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_TIMESTAMP_LENGTH;
+ DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_OLD_TIMESTAMP_LENGTH;
}
}
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java?rev=1049180&r1=1049179&r2=1049180&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java Tue Dec 14 17:20:49 2010
@@ -337,7 +337,7 @@ class AppRequester
protected int getTimestampLength()
{
return supportsTimestampNanoseconds() ?
- DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_TIMESTAMP_LENGTH;
+ DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_OLD_TIMESTAMP_LENGTH;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java?rev=1049180&r1=1049179&r2=1049180&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java Tue Dec 14 17:20:49 2010
@@ -228,6 +228,7 @@ public interface DRDAConstants
// nanoseconds precision: yyyy-mm-dd-hh.mm.ss.ffffff
// In contrast, JDBC supports full nanoseconds precision: yyyy-mm-dd-hh.mm.ss.fffffffff
//
+ public static final int DRDA_OLD_TIMESTAMP_LENGTH = 26;
public static final int DRDA_TIMESTAMP_LENGTH = 29;
public static final int JDBC_TIMESTAMP_LENGTH = 29;