Fix a problem with the handling of NULL values in the min() window function.

FossilOrigin-Name: b76f35b09235d44dc3d176377bbb9c18b7cdc9392800103ff53c54730a427a5c

diff --git a/manifest b/manifest
index af25dfdb2cf9fd3c861f39c2b202b67d66c9262c..e5b14ee41038eba8b4f092e3de4766b0f9c86dd7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Try\sto\simprove\sthe\serror\smessages\sfor\smisformed\sframe\sspecifications\sin\nwindow\sdefinitions.
-D 2018-07-06T17:19:20.546
+C Fix\sa\sproblem\swith\sthe\shandling\sof\sNULL\svalues\sin\sthe\smin()\swindow\sfunction.
+D 2018-07-07T17:30:44.852
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -584,7 +584,7 @@ F src/where.c 0bcbf9e191ca07f9ea2008aa80e70ded46bcdffd26560c83397da501f00aece6
 F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
 F src/wherecode.c 3317f2b083a66d3e65a03edf316ade4ccb0a99c9956273282ebb579b95d4ba96
 F src/whereexpr.c 571618c67a3eb5ce0f1158c2792c1aee9b4a4a264392fc4fb1b35467f80abf9a
-F src/window.c 0e127e916e7a56a580242604d438707571ce250b4ad4ae1652b08fad716d9c56
+F src/window.c 635b5beae647b85277eed70a83e02b3d521df26e8ec1f1be00574ff1b853d331
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1624,8 +1624,8 @@ F test/window2.tcl 9bfa842d8a62b0d36dc8c1b5972206393c43847433c6d75940b87fec93ce3
 F test/window2.test 8e6d2a1b9f54dfebee1cde961c8590cd87b4db45c50f44947a211e1b63c2a05e
 F test/window3.tcl 577a3b1ff913208e5248c04dab9df17fd760ce159a752789e26d0cb4a5f91823
 F test/window3.test 87fb18021903fc4d1659b8b2092aea55d611a9606cfa7272686234e5197c4b31
-F test/window4.tcl a7f0e514602c8a6c43bc68c25ecc4def4f3e2abc5f721c4e6cf70eade1a6cfdf
-F test/window4.test 048b4760d0335ccefda73403ff2c054085383cbe5a0e5c175f56eda9d2f419f6
+F test/window4.tcl 9491acccf705d0e0f44177dc20478f978bd0bd4812a6ddd6a350881cc7781876
+F test/window4.test b43a22ad5b748c37925e64c93ed0958ebae1c8d2eca59a79350c22c2e6f609a0
 F test/window5.test 8187f46597c90b73e8f96659e893353cbda337479cc582f7a488eab351ba08d3
 F test/window6.test d2a243f0bf64cfc964fa55b0425ec74d984321bbe650e47d0d74e8f84aa9b7e9
 F test/windowfault.test a44baa1b0bdf339d7792623ad3a6ebe057b1a6d7a7fd7ae880c8b744cfc0dafb
@@ -1745,7 +1745,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 a6dffecc6b35c618cc5e5a06892765bdbec587dcd0ae8686c231a21516e38eab
-R 055d95416b748db9a689b97d7fc462d8
-U drh
-Z 8b00be6f689dd332950878afd9b35e47
+P 927b95a0812787bcb3c28d1a0ea94717dc2cc60f6d480623f0c7cbce0c546fc9
+R df5485ae8f16345ceb222478245270eb
+U dan
+Z 17b9a5fb82ab6bfb44f0f8593c862ee1

diff --git a/manifest.uuid b/manifest.uuid
index 2f86ae14feabb1c6ae880bea64c896c75431abcb..f0290ef46c4fbb2581f2ca03e94465cb75e6cb62 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-927b95a0812787bcb3c28d1a0ea94717dc2cc60f6d480623f0c7cbce0c546fc9
\ No newline at end of file
+b76f35b09235d44dc3d176377bbb9c18b7cdc9392800103ff53c54730a427a5c
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index 24dbc7930005b90b11f6c4312ac15244f874d069..b1ae0b6bcc2ae77db5e6329689e0e4f62a2ddace 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1085,6 +1085,8 @@ static void windowAggStep(
     if( (pWin->pFunc->funcFlags & SQLITE_FUNC_MINMAX) 
       && pWin->eStart!=TK_UNBOUNDED 
     ){
+      int addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, regArg);
+      VdbeCoverage(v);
       if( bInverse==0 ){
         sqlite3VdbeAddOp2(v, OP_AddImm, pWin->regApp+1, 1);
         sqlite3VdbeAddOp2(v, OP_SCopy, regArg, pWin->regApp);
@@ -1096,6 +1098,7 @@ static void windowAggStep(
         sqlite3VdbeAddOp1(v, OP_Delete, pWin->csrApp);
         sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-2);
       }
+      sqlite3VdbeJumpHere(v, addrIsNull);
     }else if( pWin->regApp ){
       assert( pWin->pFunc->xSFunc==nth_valueStepFunc 
            || pWin->pFunc->xSFunc==first_valueStepFunc 

diff --git a/test/window4.tcl b/test/window4.tcl
index 5417c3a3447889aabe722d7aeed40e0bc0f9e99b..011671b66dbe5500dc97c63caab455f167b27e83 100644 (file)
--- a/test/window4.tcl
+++ b/test/window4.tcl
@@ -340,5 +340,17 @@ execsql_float_test 9.7 {
   SELECT cume_dist() OVER () FROM t1
 }
 
+execsql_test 10.0 {
+  DROP TABLE IF EXISTS t7;
+  CREATE TABLE t7(id INTEGER PRIMARY KEY, a INTEGER, b INTEGER);
+  INSERT INTO t7(id, a, b) VALUES
+    (1, 1, 2), (2, 1, NULL), (3, 1, 4),
+    (4, 3, NULL), (5, 3, 8), (6, 3, 1);
+}
+execsql_test 10.1 {
+  SELECT id, min(b) OVER (PARTITION BY a ORDER BY id) FROM t7;
+}
+
+
 finish_test
 

diff --git a/test/window4.test b/test/window4.test
index c81173e1dfdd802441cbec8b92a16cf9adfa6061..d8026fed8b3bd63e67f80b346c21c775d2dc38c9 100644 (file)
--- a/test/window4.test
+++ b/test/window4.test
@@ -1249,4 +1249,16 @@ do_test 9.7 {
   set myres
 } {1.00 1.00 1.00}
 
+do_execsql_test 10.0 {
+  DROP TABLE IF EXISTS t7;
+  CREATE TABLE t7(id INTEGER PRIMARY KEY, a INTEGER, b INTEGER);
+  INSERT INTO t7(id, a, b) VALUES
+    (1, 1, 2), (2, 1, NULL), (3, 1, 4),
+    (4, 3, NULL), (5, 3, 8), (6, 3, 1);
+} {}
+
+do_execsql_test 10.1 {
+  SELECT id, min(b) OVER (PARTITION BY a ORDER BY id) FROM t7;
+} {1 2   2 2   3 2   4 {}   5 8   6 1}
+
 finish_test