Fix a problem in the xInverse callback for the built-in sum() window function.

FossilOrigin-Name: b6563647382634588ebe5c6a3c35c65a321dc1b3732c809d48ce46759b9dd80f

diff --git a/manifest b/manifest
index 6f4766f97979bc9ea75695dafcb738f8f17909c5..f66a1393ebbf19ee6e8e3fbe44ceb4c991fc6730 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssegfault\scaused\sby\shaving\sidentical\swindow\sfunctions\sin\sthe\sselect-list\nand\sORDER\sBY\sclause\sof\sa\sSELECT\sstatement.
-D 2018-07-02T17:14:37.869
+C Fix\sa\sproblem\sin\sthe\sxInverse\scallback\sfor\sthe\sbuilt-in\ssum()\swindow\sfunction.
+D 2018-07-02T17:45:59.790
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -450,7 +450,7 @@ F src/delete.c 4c8c7604277a2041647f96b78f4b9a47858e9217e4fb333d35e7b5ab32c5b57f
 F src/expr.c 7e257eeffe9553c10a6ac0a1f0177bf740c4da834e7d6e2cbb7d3ebaa3d7f3e1
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c b1da9ef8dc834603bb0d28972378a7ce65897847f9a1e89ab800bbdf24c788ee
-F src/func.c 8a002cd2eb217dcac2e2f3b1f1fc49315081f7c71dff3f0bbbb4c157b5d24b50
+F src/func.c 0aaa0b07ac4ba47529f2ce47434a5a367aec123ed2902ece84bfdd8f2b795fa1
 F src/global.c 9bf034fd560bdd514715170ed8460bb7f823cec113f0569ef3f18a20c7ccd128
 F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
@@ -1626,7 +1626,7 @@ F test/window3.test 87fb18021903fc4d1659b8b2092aea55d611a9606cfa7272686234e5197c
 F test/window4.tcl 7cec7e578aa9f78b7265bff8d552cda17a1d8d89f0449d0e74970a527b8846f5
 F test/window4.test dcd8767869988e0d23d56bc3f8b46ec116de23127b81b5f66fd48d5529072ed1
 F test/window5.test 8187f46597c90b73e8f96659e893353cbda337479cc582f7a488eab351ba08d3
-F test/window6.test 6a7df4ab43b3acaf21486d023f0ae7401e189837c4d10a244f06ef5b809965fa
+F test/window6.test e8100090c9aa161cad55a6471a82b2ccba83534c8afdf3ec287262bb76c5e5df
 F test/windowfault.test 97d5fc404308edb579a5a183e294ed874c844ecf01f0a28ba46df3141ebaee1f
 F test/with1.test 58475190cd8caaeebea8cfeb2a264ec97a0c492b8ffe9ad20cefbb23df462f96
 F test/with2.test e0030e2f0267a910d6c0e4f46f2dfe941c1cc0d4f659ba69b3597728e7e8f1ab
@@ -1744,7 +1744,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 bb9bfc3a12dfb89b1c58f5551cdc89ab7b0fbe03f285f2ed86611786ed02ffd9
-R 869ea010a75065e221583f71c948b611
+P 693b4350d741391226a33ab6a05eaad61e8ef1590176f01e8aed2a212e2d6419
+R 2a905c5056bd462d63ab558902828293
 U dan
-Z 376f884c9201b63aa371e9665eabb618
+Z e86ae3bb9d5c5564eb7cd669366300ff

diff --git a/manifest.uuid b/manifest.uuid
index e0b1989aedb80b5231d57b8ed261e358dfd43322..88034b238c0507e82f0eba34db48a9711a3288c9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-693b4350d741391226a33ab6a05eaad61e8ef1590176f01e8aed2a212e2d6419
\ No newline at end of file
+b6563647382634588ebe5c6a3c35c65a321dc1b3732c809d48ce46759b9dd80f
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index ae2b7671950fde8c32dcb5d072cb3a62c188b90a..110dfe97ae199d9db0eb8661ec0f51dd0fcacde5 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -1530,7 +1530,7 @@ static void sumInverse(sqlite3_context *context, int argc, sqlite3_value**argv){
         p->overflow = 1;
       }
     }else{
-      p->rSum += sqlite3_value_double(argv[0]);
+      p->rSum -= sqlite3_value_double(argv[0]);
       p->approx = 1;
     }
   }

diff --git a/test/window6.test b/test/window6.test
index a244dfff60fb08528500b8c693b716676156fa73..d50f5100937d8fa5dead922b110629a3404857d0 100644 (file)
--- a/test/window6.test
+++ b/test/window6.test
@@ -192,4 +192,22 @@ do_execsql_test 8.1 {
   1 20.0 1   1 10.0 2   2 3.0 1   2 1.0 2  3 100.0 1
 }
 
+do_execsql_test 8.2 {
+  SELECT "counter", "value", SUM("value") OVER 
+  (ORDER BY "id" ROWS 2 PRECEDING) 
+    FROM "sample" 
+  ORDER BY "id"
+} {
+  1 10.0 10.0   1 20.0 30.0   2 1.0 31.0   2 3.0 24.0   3 100.0 104.0
+}
+
+do_execsql_test 8.3 {
+  SELECT SUM("value") OVER 
+  (ORDER BY "id" ROWS BETWEEN 2 PRECEDING AND CURRENT ROW) 
+    FROM "sample" 
+  ORDER BY "id"
+} {
+  10.0   30.0   31.0   24.0   104.0
+}
+
 finish_test