Fix a problem with using LIMIT in window-function queries.

FossilOrigin-Name: c1abd2dda4154cb573bdf627cdef794d3697f874c3b70357aaf5e4ed95ad1d5c

diff --git a/manifest b/manifest
index 149e72f424118290922884a35a9f9a15a9c63f12..af7f3d41bdfebe78824a7cba6555ab5864114af1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\susing\sa\swindow-function\sSELECT\sas\sa\sFROM\sclause\ssub-query\nin\ssome\scircumstances.
-D 2018-06-23T07:59:39.627
+C Fix\sa\sproblem\swith\susing\sLIMIT\sin\swindow-function\squeries.
+D 2018-06-23T16:26:20.289
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -495,7 +495,7 @@ F src/printf.c 7f6f3cba8e0c49c19e30a1ff4e9aeda6e06814dcbad4b664a69e1b6cb6e7e365
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 0934ce541d3d0b2b9127e960bdabb3d2f837f1ef8f469453b712ff6b5dae8abe
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c 3056565056dfc1281bca7da99c205cbce359cf5e1d49134b370cbbc2c0c40807
+F src/select.c e364e5ea8f2b61da53800a56c9ea5d26e9ddf667f10b9459112e26607df5b62c
 F src/shell.c.in 8578421c5fb2a972461b2a996f7173646e55e0dbd2a2eee30c8f5dc7d3dbadfd
 F src/sqlite.h.in 8dbfe617b70b01e661a9ba0b805facb1430df80096ea7508cf7903878b45e689
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1618,7 +1618,7 @@ F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2
 F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
 F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
 F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
-F test/window1.test ebb246c830432c225c6be5c72a785370b3f04053cb1eb3a615bb2dfe25e5454b
+F test/window1.test a28ea12169f00e3d432682d839e3782c494d946d5242b25c677b2e485a2ae291
 F test/window2.tcl 9bfa842d8a62b0d36dc8c1b5972206393c43847433c6d75940b87fec93ce3143
 F test/window2.test 8e6d2a1b9f54dfebee1cde961c8590cd87b4db45c50f44947a211e1b63c2a05e
 F test/window3.tcl 9b82055c8977bdcab164fb4f71dabf86c511c9010c44f958352b610d313182c3
@@ -1743,7 +1743,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 5f04b016467342b5a796bf702ed25b621eb86f2961c1e703d276c93f2cb6aa89
-R 87cd123213468be347dfe04f90b835d5
+P 11d733396f75ef1f206cd6f35630ff176484279861772918b9ea69412c13c62d
+R ddbc3143ac8e172194c66b5644ba016f
 U dan
-Z c259eeea26c0b2a0a6b65320d3361c69
+Z fc8062e5579df2de82bec15da0145aee

diff --git a/manifest.uuid b/manifest.uuid
index 250d2b3dfe733b6327b73739c98811c05909c4a1..390b6be0f843043ce58fe9cebfad0c64f5ac3d4d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-11d733396f75ef1f206cd6f35630ff176484279861772918b9ea69412c13c62d
\ No newline at end of file
+c1abd2dda4154cb573bdf627cdef794d3697f874c3b70357aaf5e4ed95ad1d5c
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 292844556299165bd98b1e4d69740b019777f724..0f09bb14237303d94bfac9a7fddfa8b555d993da 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5933,18 +5933,17 @@ int sqlite3Select(
     if( pWin ){
       int addrGosub = sqlite3VdbeMakeLabel(v);
       int iCont = sqlite3VdbeMakeLabel(v);
+      int iBreak = sqlite3VdbeMakeLabel(v);
       int regGosub = ++pParse->nMem;
-      int addr = 0;
 
       sqlite3WindowCodeStep(pParse, p, pWInfo, regGosub, addrGosub);
 
-      addr = sqlite3VdbeAddOp0(v, OP_Goto);
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, iBreak);
       sqlite3VdbeResolveLabel(v, addrGosub);
-      selectInnerLoop(pParse, p, -1, &sSort, &sDistinct, pDest, iCont, 0);
+      selectInnerLoop(pParse, p, -1, &sSort, &sDistinct, pDest, iCont, iBreak);
       sqlite3VdbeResolveLabel(v, iCont);
       sqlite3VdbeAddOp1(v, OP_Return, regGosub);
-      sqlite3VdbeJumpHere(v, addr);
-
+      sqlite3VdbeResolveLabel(v, iBreak);
     }else
 #endif /* SQLITE_OMIT_WINDOWFUNC */
     {

diff --git a/test/window1.test b/test/window1.test
index f7c3a0ee297ccc7baa6057af9bf0dc7a74be7a88..59c2893e3cc176080d0e0cfe8f067c5bacbb2834 100644 (file)
--- a/test/window1.test
+++ b/test/window1.test
@@ -403,5 +403,43 @@ do_execsql_test 10.1 {
   Grant       South   23
 }
 
+do_execsql_test 10.2 {
+  SELECT emp, region, sum(total) OVER win FROM sales
+  WINDOW win AS (PARTITION BY region ORDER BY total)
+} {
+  Horace East       1  
+  Brad North       22 
+  Alice North      56 
+  Charles North   101 
+  Darrell South     8 
+  Frank South      30 
+  Grant South      53 
+  Elizabeth South 152
+}
+
+do_execsql_test 10.3 {
+  SELECT emp, region, sum(total) OVER win FROM sales
+  WINDOW win AS (PARTITION BY region ORDER BY total)
+  LIMIT 5
+} {
+  Horace East       1  
+  Brad North       22 
+  Alice North      56 
+  Charles North   101 
+  Darrell South     8 
+}
+
+do_execsql_test 10.4 {
+  SELECT emp, region, sum(total) OVER win FROM sales
+  WINDOW win AS (PARTITION BY region ORDER BY total)
+  LIMIT 5 OFFSET 2
+} {
+  Alice North      56 
+  Charles North   101 
+  Darrell South     8 
+  Frank South      30 
+  Grant South      53 
+}
+
 finish_test