commit ae8e45cb0c26457c9c020055cc3f8421954670d3
author dan <dan@noemail.net> Mon Aug 19 19:59:50 2019 +0000
committer dan <dan@noemail.net> Mon Aug 19 19:59:50 2019 +0000
tree d57171e7b8bb171f1039a87f47974a9e1f6673bc
parent 9105fd51893062a8503c8850e5d88ad49de28495

Fix problems with window frames that use ORDER BY ... NULLS LAST etc.

FossilOrigin-Name: 75d665a494dd7d6e77d5a80af386ee5accc0a53416d5493424dc0fef6c7b01a0

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 6948c5a..e0b5590 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1401,6 +1401,7 @@
     pItem->zSpan = sqlite3DbStrDup(db, pOldItem->zSpan);
     pItem->sortFlags = pOldItem->sortFlags;
     pItem->done = 0;
+    pItem->bNulls = pOldItem->bNulls;
     pItem->bSpanIsTab = pOldItem->bSpanIsTab;
     pItem->bSorterRef = pOldItem->bSorterRef;
     pItem->u = pOldItem->u;

src/window.c

diff --git a/src/window.c b/src/window.c
index b3a7cee..80dfd61 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1876,12 +1876,13 @@
   int reg2 = sqlite3GetTempReg(pParse);
   int arith = OP_Add;
   int addrGe;
+  ExprList *pOrderBy = p->pMWin->pOrderBy;
 
   int regString = ++pParse->nMem;
 
   assert( op==OP_Ge || op==OP_Gt || op==OP_Le );
-  assert( p->pMWin->pOrderBy && p->pMWin->pOrderBy->nExpr==1 );
-  if( p->pMWin->pOrderBy->a[0].sortFlags & KEYINFO_ORDER_DESC ){
+  assert( pOrderBy && pOrderBy->nExpr==1 );
+  if( pOrderBy->a[0].sortFlags & KEYINFO_ORDER_DESC ){
     switch( op ){
       case OP_Ge: op = OP_Le; break;
       case OP_Gt: op = OP_Lt; break;
@@ -1901,6 +1902,22 @@
   VdbeCoverage(v);
   sqlite3VdbeAddOp3(v, arith, regVal, reg1, reg1);
   sqlite3VdbeJumpHere(v, addrGe);
+  if( pOrderBy->a[0].sortFlags & KEYINFO_ORDER_BIGNULL ){
+    int addr;
+    addr = sqlite3VdbeAddOp1(v, OP_NotNull, reg1); VdbeCoverage(v);
+    switch( op ){
+      case OP_Ge: sqlite3VdbeAddOp2(v, OP_Goto, 0, lbl); break;
+      case OP_Gt: sqlite3VdbeAddOp2(v, OP_NotNull, reg2, lbl); break;
+      case OP_Le: sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); break;
+      default: assert( op==OP_Lt ); /* no-op */
+    }
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
+    sqlite3VdbeJumpHere(v, addr);
+    sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); VdbeCoverage(v);
+    if( op==OP_Gt || op==OP_Ge ){
+      sqlite3VdbeChangeP2(v, -1, sqlite3VdbeCurrentAddr(v)+1);
+    }
+  }
   sqlite3VdbeAddOp3(v, op, reg2, lbl, reg1); VdbeCoverage(v);
   sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
   assert( op==OP_Ge || op==OP_Gt || op==OP_Lt || op==OP_Le );