From: drh <drh@noemail.net>
Date: Sun, 29 Feb 2004 00:50:33 +0000 (+0000)
Subject: Try again to get the HH:MM:SS modifier change right... (CVS 1279)
X-Git-Tag: version-3.6.10~4789
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6829e94bd04e2aeb8cbf9b096927977a326782b;p=thirdparty%2Fsqlite.git

Try again to get the HH:MM:SS modifier change right... (CVS 1279)

FossilOrigin-Name: e20d51f94ed67b8864a435e5735f61f396662c21
---

diff --git a/manifest b/manifest
index c66daed503..d33e69ab2f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\sHH:MM:SS\smodifier\schange\sthat\swas\sjust\schecked\sin.\s(CVS\s1278)
-D 2004-02-29T00:48:09
+C Try\sagain\sto\sget\sthe\sHH:MM:SS\smodifier\schange\sright...\s(CVS\s1279)
+D 2004-02-29T00:50:33
 F Makefile.in afc6c0377773421633e592347097ad036eef6aeb
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -28,7 +28,7 @@ F src/btree.h 41cb3ff6ebc3f6da2d0a074e39ff8c7a2287469f
 F src/btree_rb.c 99feb3ff835106d018a483a1ce403e5cf9c718bc
 F src/build.c c8ab8b467d9a64254b0d4d42083f6313b3a980d1
 F src/copy.c 750e13828c3e4a293123e36aaa7cf0f22466248a
-F src/date.c 1eaa50143359dba81b86209427bda4b194898ebc
+F src/date.c 33a5267827347e106cef2fe001770b6911fcfa3d
 F src/delete.c 82001c74882319f94dab5f6b92a27311b31092ae
 F src/encode.c 9e70ea1e4e746f23f18180949e94f1bb1c2220d3
 F src/expr.c 95ea5d47d11b5085aaeeb77d60b17c2cba13383a
@@ -188,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 559002a52fe3c42fe71ffce364eff4a036ae6b83
-R 47d61c60e5cac681555c838e5c06245c
+P 248b5500900bc8f401006aaa9b7dac090ae419fa
+R 9e6e50874a22e82686efa948b5530e0e
 U drh
-Z b1c426865f411f94cb6b3032493b4773
+Z 6aabfeb88e3f40a15732ea64d28d35d1
diff --git a/manifest.uuid b/manifest.uuid
index 1f678705a6..1a1a24941e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-248b5500900bc8f401006aaa9b7dac090ae419fa
\ No newline at end of file
+e20d51f94ed67b8864a435e5735f61f396662c21
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index 45d9a1fe14..7aba7bcfeb 100644
--- a/src/date.c
+++ b/src/date.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: date.c,v 1.14 2004/02/29 00:48:09 drh Exp $
+** $Id: date.c,v 1.15 2004/02/29 00:50:33 drh Exp $
 **
 ** NOTES:
 **
@@ -581,9 +581,11 @@ static int parseModifier(const char *zMod, DateTime *p){
         computeJD(&tx);
         computeJD(p);
         clearYMD_HMS_TZ(p);
-        if( z[0]=='-' ) tx.rJD = -tx.rJD;
         day = (int)tx.rJD;
-        p->rJD += tx.rJD - day;
+        tx.rJD -= day;
+        tx.rJD -= 0.5;
+        if( z[0]=='-' ) tx.rJD = -tx.rJD;
+        p->rJD += tx.rJD;
         rc = 0;
         break;
       }