Fix timezone parsing in the date/time functions. Ticket #1587. (CVS 2891)

FossilOrigin-Name: 94c87b70161d4d44fbf1602fc2baae22dca08759

diff --git a/manifest b/manifest
index d3c6c26e972dfba00e39fb5141f277701bd81c33..df21c1f599fc7d8dc588eff5db6d59a1193cc628 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sbenign\sreference\sto\san\suninitialized\svariable.\s\sTicket\s#1590.\s(CVS\s2890)
-D 2006-01-09T00:09:02
+C Fix\stimezone\sparsing\sin\sthe\sdate/time\sfunctions.\s\sTicket\s#1587.\s(CVS\s2891)
+D 2006-01-09T00:18:03
 F Makefile.in c79fbdaa264c6afcd435f2fb492551de5a8cf80d
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -39,7 +39,7 @@ F src/btree.h 5663c4f43e8521546ccebc8fc95acb013b8f3184
 F src/build.c 0cf9f744911826ded1c8ee8adbf881ed5a2ef70a
 F src/callback.c 62066afd516f220575e81b1a1239ab92a2eae252
 F src/complete.c df1681cef40dec33a286006981845f87b194e7a4
-F src/date.c 9a1fe548e31a9b14a43b88f711254a968929659d
+F src/date.c a927bdbb51296ac398d2f667086a7072c099e5ab
 F src/delete.c 32ba37cced50d26ed996d67dc7d19195e081bbb7
 F src/experimental.c 50c1e3b34f752f4ac10c36f287db095c2b61766d
 F src/expr.c ed2a272c7afd63232ca04881159ce2366266e35d
@@ -140,7 +140,7 @@ F test/corrupt.test 18c7a995b1af76a8c8600b996257f2c7b7bff083
 F test/corrupt2.test 88342570828f2b8cbbd8369eff3891f5c0bdd5ba
 F test/crash.test 5f5f155393c5685b3842fef79b6fbafa55197d75
 F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
-F test/date.test 30ca15e608a45d868fd419c901795382efe27020
+F test/date.test 288b41dbcc7aa114a976c53b45b78b3aa7736940
 F test/default.test 252298e42a680146b1dd64f563b95bdf088d94fb
 F test/delete.test 525a6953bc3978780cae35f3eaf1027cf4ce887d
 F test/delete2.test d20b08733243f1890079f3b48f2356fbb62212b2
@@ -335,7 +335,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P b2ac0be07ec76ab23b7e5b800c0bc62d0bc97f4b
-R a9919b87664b805fe97fdd7f7e43274b
+P 32998fe8ed38a79eb79d8b13051b47bf74661e3c
+R 05890fde3a3c853b296df6bd6670d3bd
 U drh
-Z d9f487dbde41143452d66ece6be8dc06
+Z d4023a6da63972dce3bf97acfc91ffae

diff --git a/manifest.uuid b/manifest.uuid
index cfa70691479cdf97943f4236443ea7db1c356757..dd17fbde9e8d02ebfee711f893a20361a1976d84 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32998fe8ed38a79eb79d8b13051b47bf74661e3c
\ No newline at end of file
+94c87b70161d4d44fbf1602fc2baae22dca08759
\ No newline at end of file

diff --git a/src/date.c b/src/date.c
index 40f3b1914ab02e52051f9a82bc4cf146b4dec3e7..38471eb195f746ad2776e57b6a6957d87487fb1e 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -16,7 +16,7 @@
 ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: date.c,v 1.48 2006/01/06 14:32:20 drh Exp $
+** $Id: date.c,v 1.49 2006/01/09 00:18:03 drh Exp $
 **
 ** NOTES:
 **
@@ -236,7 +236,7 @@ static void computeJD(DateTime *p){
   if( p->validHMS ){
     p->rJD += (p->h*3600.0 + p->m*60.0 + p->s)/86400.0;
     if( p->validTZ ){
-      p->rJD += p->tz*60/86400.0;
+      p->rJD -= p->tz*60/86400.0;
       p->validHMS = 0;
       p->validTZ = 0;
     }

diff --git a/test/date.test b/test/date.test
index 3fff21b5797519d3b03dbf9f4d4346b15889c75c..0e69315f51b398dcf2a299195a44508510d39d35 100644 (file)
--- a/test/date.test
+++ b/test/date.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing date and time functions.
 #
-# $Id: date.test,v 1.13 2005/03/21 00:43:44 drh Exp $
+# $Id: date.test,v 1.14 2006/01/09 00:18:03 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -142,11 +142,11 @@ datetest 3.17 "strftime('[repeat 200 abc%m123]','2003-10-31')" \
 set now [clock format [clock seconds] -format "%Y-%m-%d" -gmt 1]
 datetest 4.1 {date('now')} $now
 
-datetest 5.1 {datetime('1994-04-16 14:00:00 -05:00')} {1994-04-16 09:00:00}
-datetest 5.2 {datetime('1994-04-16 14:00:00 +05:15')} {1994-04-16 19:15:00}
-datetest 5.3 {datetime('1994-04-16 05:00:00 -08:30')} {1994-04-15 20:30:00}
-datetest 5.4 {datetime('1994-04-16 14:00:00 +11:55')} {1994-04-17 01:55:00}
-datetest 5.5 {datetime('1994-04-16 14:00:00 +11:60')} NULL
+datetest 5.1 {datetime('1994-04-16 14:00:00 +05:00')} {1994-04-16 09:00:00}
+datetest 5.2 {datetime('1994-04-16 14:00:00 -05:15')} {1994-04-16 19:15:00}
+datetest 5.3 {datetime('1994-04-16 05:00:00 +08:30')} {1994-04-15 20:30:00}
+datetest 5.4 {datetime('1994-04-16 14:00:00 -11:55')} {1994-04-17 01:55:00}
+datetest 5.5 {datetime('1994-04-16 14:00:00 -11:60')} NULL
 
 # localtime->utc and utc->localtime conversions.  These tests only work
 # if the localtime is in the US Eastern Time (the time in Charlotte, NC