From: drh <drh@noemail.net>
Date: Thu, 2 Mar 2017 23:40:21 +0000 (+0000)
Subject: Fix a bug in the 'start of ...' date/time modifiers when they follow a
X-Git-Tag: version-3.18.0~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9715f7f033887a2c4ec09592e3668d5fc0d737bd;p=thirdparty%2Fsqlite.git

Fix a bug in the 'start of ...' date/time modifiers when they follow a
julian day number.  Fix for ticket [6097cb92745327a1].

FossilOrigin-Name: 081dbcfb6d82528cefecb36c4491fa6e1a790b17
---

diff --git a/manifest b/manifest
index ff786aa1dc..8ace7675fd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\sRBU\scase\ssimilar\sto\sthe\sprevious.\sThis\sone\sfor\ssystems\swhere\sthe\nsector-size\sis\slarger\sthan\sthe\spage-size.
-D 2017-03-02T16:56:48.085
+C Fix\sa\sbug\sin\sthe\s'start\sof\s...'\sdate/time\smodifiers\swhen\sthey\sfollow\sa\njulian\sday\snumber.\s\sFix\sfor\sticket\s[6097cb92745327a1].
+D 2017-03-02T23:40:21.740
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@ -347,7 +347,7 @@ F src/build.c 51b473eec465f471d607b54e8dbc00751c3f8a1f
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
-F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
+F src/date.c bb4db348be17903f4bbf2ef3cb208add874deab9
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 0d9d5549d42e79ce4d82ff1db1e6c81e36d2f67c
 F src/expr.c 8a29e9b72d4b642189999c41782cd6c5bc43512f
@@ -637,7 +637,7 @@ F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348
 F test/ctime.test ff6c38e822459d6ca743c34901caf57740b08b54
 F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
 F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
-F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc
+F test/date.test e6da60d8ec399de43c076425fbe2eecbc90a31a4
 F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
 F test/dbselftest.c b2e6cfac59066dbcb7334b66304bb15a5508dd42
 F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
@@ -1560,7 +1560,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P edee6a80e1cc7e6a2b8c3c7f76dd794fc8ab9a72
-R f72d0ed562c179232e2d4d139b6c6946
-U dan
-Z a85a6fd6f15328765626feb0d9a72fd7
+P 4012bb3aa91927156ba149caa4e5c622b0729d79
+R 106d75876c31ad808988639b89376fd6
+U drh
+Z d7eafab06f2b8ece511ab9317c8fe2f8
diff --git a/manifest.uuid b/manifest.uuid
index b44fc2cacb..9e61a74210 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4012bb3aa91927156ba149caa4e5c622b0729d79
\ No newline at end of file
+081dbcfb6d82528cefecb36c4491fa6e1a790b17
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index a08248ce2f..6fc66385c5 100644
--- a/src/date.c
+++ b/src/date.c
@@ -748,6 +748,7 @@ static int parseModifier(
       p->validHMS = 1;
       p->h = p->m = 0;
       p->s = 0.0;
+      p->rawS = 0;
       p->validTZ = 0;
       p->validJD = 0;
       if( sqlite3_stricmp(z,"month")==0 ){
diff --git a/test/date.test b/test/date.test
index 2d336e6c00..a9694f18ca 100644
--- a/test/date.test
+++ b/test/date.test
@@ -596,5 +596,15 @@ datetest 16.29 {datetime(5373484,'-176546 months')} NULL
 datetest 16.30 {datetime(5373484,'-14712 years')} {-4713-12-31 12:00:00}
 datetest 16.31 {datetime(5373484,'-14713 years')} NULL
 
+# 2017-03-02: Wrong 'start of day' computation.
+# https://www.sqlite.org/src/info/6097cb92745327a1
+#
+datetest 17.1 {datetime(2457754, 'start of day')} {2016-12-31 00:00:00}
+datetest 17.2 {datetime(2457828)} {2017-03-15 12:00:00}
+datetest 17.3 {datetime(2457828,'start of day')} {2017-03-15 00:00:00}
+datetest 17.4 {datetime(2457828,'start of month')} {2017-03-01 00:00:00}
+datetest 17.5 {datetime(2457828,'start of year')} {2017-01-01 00:00:00}
+
+
 
 finish_test