db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r1071297 - in /db/derby/code/branches/10.5: ./ java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java
Date Wed, 16 Feb 2011 16:07:51 GMT
Author: mikem
Date: Wed Feb 16 16:07:50 2011
New Revision: 1071297

URL: http://svn.apache.org/viewvc?rev=1071297&view=rev
Log:
DERBY-4626: Timestamp truncated when converted to string with explicit calendar

backport change #999485 from trunk to 10.5 branch.

Added a test case. The bug was fixed as part of DERBY-4625. 


Modified:
    db/derby/code/branches/10.5/   (props changed)
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 16:07:50 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.6:942027,957000,957287,958621,962738,965351,987678,997790*,1031623,1055601,1068474
-/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,964402,965647,96
 7304,980089,980684,986689,986834,987539,989099,997325*,999119,1002291,1002682,1002853,1021426,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250
+/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,964402,965647,96
 7304,980089,980684,986689,986834,987539,989099,997325*,999119,999485,1002291,1002682,1002853,1021426,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250

Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java?rev=1071297&r1=1071296&r2=1071297&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java
(original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java
Wed Feb 16 16:07:50 2011
@@ -30,6 +30,7 @@ import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
+import java.util.TimeZone;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -915,6 +916,35 @@ public final class DateTimeTest extends 
     }
 
     /**
+     * Test that conversion from timestamp to string is correct when a
+     * calendar is specified. Specifically, verify that the full nanosecond
+     * resolution is used and that the converted timestamp is not rounded to
+     * microsecond resolution. Regression test case for DERBY-4626.
+     */
+    public void testConvertToStringWithCalendar() throws SQLException {
+        PreparedStatement ps =
+                prepareStatement("values cast(? as varchar(29))");
+
+        // Generate a timestamp representing 2010-09-01 20:31:40.123456789 GMT
+        Timestamp ts = new Timestamp(1283373100000L);
+        ts.setNanos(123456789);
+
+        // Array of (timezone, timestamp string) pairs representing a timezone
+        // with which to test and the expected timestamp string produced.
+        String[][] testData = {
+            { "GMT", "2010-09-01 20:31:40.123456789" },
+            { "Europe/Oslo", "2010-09-01 22:31:40.123456789" },
+        };
+
+        for (int i = 0; i < testData.length; i++) {
+            Calendar cal = Calendar.getInstance(
+                    TimeZone.getTimeZone(testData[i][0]));
+            ps.setTimestamp(1, ts, cal);
+            JDBC.assertSingleValueResultSet(ps.executeQuery(), testData[i][1]);
+        }
+    }
+
+    /**
      * Regression test case for DERBY-4621, which caused the conversion of
      * timestamp and time values to varchar to generate wrong results when
      * a Calendar object was supplied.



Mime
View raw message