Index: ext/expert/expert1.test
==================================================================
--- ext/expert/expert1.test
+++ ext/expert/expert1.test
@@ -132,17 +132,19 @@
 } {
   CREATE INDEX t1_idx_000123a7 ON t1(a, b);
   SEARCH TABLE t1 USING COVERING INDEX t1_idx_000123a7 (a=?)
 }
 
+if 0 {
 do_setup_rec_test $tn.6 {
   CREATE TABLE t1(a, b, c);
 } {
   SELECT min(a) FROM t1
 } {
   CREATE INDEX t1_idx_00000061 ON t1(a);
   SEARCH TABLE t1 USING COVERING INDEX t1_idx_00000061
+}
 }
 
 do_setup_rec_test $tn.7 {
   CREATE TABLE t1(a, b, c);
 } {

Index: src/build.c
==================================================================
--- src/build.c
+++ src/build.c
@@ -1441,11 +1441,11 @@
     }
     pTab->iPKey = iCol;
     pTab->keyConf = (u8)onError;
     assert( autoInc==0 || autoInc==1 );
     pTab->tabFlags |= autoInc*TF_Autoincrement;
-    if( pList ) pParse->iPkSortOrder = pList->a[0].sortOrder;
+    if( pList ) pParse->iPkSortOrder = pList->a[0].sortFlags;
   }else if( autoInc ){
 #ifndef SQLITE_OMIT_AUTOINCREMENT
     sqlite3ErrorMsg(pParse, "AUTOINCREMENT is only allowed on an "
        "INTEGER PRIMARY KEY");
 #endif
@@ -1892,11 +1892,11 @@
                   sqlite3ExprAlloc(db, TK_ID, &ipkToken, 0));
     if( pList==0 ) return;
     if( IN_RENAME_OBJECT ){
       sqlite3RenameTokenRemap(pParse, pList->a[0].pExpr, &pTab->iPKey);
     }
-    pList->a[0].sortOrder = pParse->iPkSortOrder;
+    pList->a[0].sortFlags = pParse->iPkSortOrder;
     assert( pParse->pNewTable==pTab );
     pTab->iPKey = -1;
     sqlite3CreateIndex(pParse, 0, 0, 0, pList, pTab->keyConf, 0, 0, 0, 0,
                        SQLITE_IDXTYPE_PRIMARYKEY);
     if( db->mallocFailed || pParse->nErr ) return;
@@ -3150,10 +3150,31 @@
     p->nKeyCol = nCol - 1;
     *ppExtra = ((char*)p) + nByte;
   }
   return p;
 }
+
+/*
+** If expression list pList contains an expression that was parsed with
+** an explicit "NULLS FIRST" or "NULLS LAST" clause, leave an error in
+** pParse and return non-zero. Otherwise, return zero.
+*/
+int sqlite3HasExplicitNulls(Parse *pParse, ExprList *pList){
+  if( pList ){
+    int i;
+    for(i=0; i<pList->nExpr; i++){
+      if( pList->a[i].bNulls ){
+        u8 sf = pList->a[i].sortFlags;
+        sqlite3ErrorMsg(pParse, "unsupported use of NULLS %s", 
+            (sf==0 || sf==3) ? "FIRST" : "LAST"
+        );
+        return 1;
+      }
+    }
+  }
+  return 0;
+}
 
 /*
 ** Create a new index for an SQL table.  pName1.pName2 is the name of the index 
 ** and pTblList is the name of the table that is to be indexed.  Both will 
 ** be NULL for a primary key or an index that is created to satisfy a
@@ -3201,10 +3222,13 @@
   if( IN_DECLARE_VTAB && idxType!=SQLITE_IDXTYPE_PRIMARYKEY ){
     goto exit_create_index;
   }
   if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
     goto exit_create_index;
+  }
+  if( sqlite3HasExplicitNulls(pParse, pList) ){
+    goto exit_create_index;
   }
 
   /*
   ** Find the table that is to be indexed.  Return early if not found.
   */
@@ -3366,11 +3390,11 @@
     sqlite3TokenInit(&prevCol, pCol->zName);
     pList = sqlite3ExprListAppend(pParse, 0,
               sqlite3ExprAlloc(db, TK_ID, &prevCol, 0));
     if( pList==0 ) goto exit_create_index;
     assert( pList->nExpr==1 );
-    sqlite3ExprListSetSortOrder(pList, sortOrder);
+    sqlite3ExprListSetSortOrder(pList, sortOrder, SQLITE_SO_UNDEFINED);
   }else{
     sqlite3ExprListCheckLength(pParse, pList, "index");
     if( pParse->nErr ) goto exit_create_index;
   }
 
@@ -3484,11 +3508,11 @@
     if( !zColl ) zColl = sqlite3StrBINARY;
     if( !db->init.busy && !sqlite3LocateCollSeq(pParse, zColl) ){
       goto exit_create_index;
     }
     pIndex->azColl[i] = zColl;
-    requestedSortOrder = pListItem->sortOrder & sortOrderMask;
+    requestedSortOrder = pListItem->sortFlags & sortOrderMask;
     pIndex->aSortOrder[i] = (u8)requestedSortOrder;
   }
 
   /* Append the table key to the end of the index.  For WITHOUT ROWID
   ** tables (when pPk!=0) this will be the declared PRIMARY KEY.  For
@@ -4702,11 +4726,12 @@
     assert( sqlite3KeyInfoIsWriteable(pKey) );
     for(i=0; i<nCol; i++){
       const char *zColl = pIdx->azColl[i];
       pKey->aColl[i] = zColl==sqlite3StrBINARY ? 0 :
                         sqlite3LocateCollSeq(pParse, zColl);
-      pKey->aSortOrder[i] = pIdx->aSortOrder[i];
+      pKey->aSortFlags[i] = pIdx->aSortOrder[i];
+      assert( 0==(pKey->aSortFlags[i] & KEYINFO_ORDER_BIGNULL) );
     }
     if( pParse->nErr ){
       assert( pParse->rc==SQLITE_ERROR_MISSING_COLLSEQ );
       if( pIdx->bNoQuery==0 ){
         /* Deactivate the index because it contains an unknown collating

Index: src/expr.c
==================================================================
--- src/expr.c
+++ src/expr.c
@@ -1409,12 +1409,13 @@
         pNewExpr->pLeft = pPriorSelectCol;
       }
     }
     pItem->zName = sqlite3DbStrDup(db, pOldItem->zName);
     pItem->zSpan = sqlite3DbStrDup(db, pOldItem->zSpan);
-    pItem->sortOrder = pOldItem->sortOrder;
+    pItem->sortFlags = pOldItem->sortFlags;
     pItem->done = 0;
+    pItem->bNulls = pOldItem->bNulls;
     pItem->bSpanIsTab = pOldItem->bSpanIsTab;
     pItem->bSorterRef = pOldItem->bSorterRef;
     pItem->u = pOldItem->u;
   }
   return pNew;
@@ -1666,19 +1667,38 @@
 }
 
 /*
 ** Set the sort order for the last element on the given ExprList.
 */
-void sqlite3ExprListSetSortOrder(ExprList *p, int iSortOrder){
+void sqlite3ExprListSetSortOrder(ExprList *p, int iSortOrder, int eNulls){
+  struct ExprList_item *pItem;
   if( p==0 ) return;
-  assert( SQLITE_SO_UNDEFINED<0 && SQLITE_SO_ASC>=0 && SQLITE_SO_DESC>0 );
   assert( p->nExpr>0 );
-  if( iSortOrder<0 ){
-    assert( p->a[p->nExpr-1].sortOrder==SQLITE_SO_ASC );
-    return;
+
+  assert( SQLITE_SO_UNDEFINED<0 && SQLITE_SO_ASC==0 && SQLITE_SO_DESC>0 );
+  assert( iSortOrder==SQLITE_SO_UNDEFINED 
+       || iSortOrder==SQLITE_SO_ASC 
+       || iSortOrder==SQLITE_SO_DESC 
+  );
+  assert( eNulls==SQLITE_SO_UNDEFINED 
+       || eNulls==SQLITE_SO_ASC 
+       || eNulls==SQLITE_SO_DESC 
+  );
+
+  pItem = &p->a[p->nExpr-1];
+  assert( pItem->bNulls==0 );
+  if( iSortOrder==SQLITE_SO_UNDEFINED ){
+    iSortOrder = SQLITE_SO_ASC;
   }
-  p->a[p->nExpr-1].sortOrder = (u8)iSortOrder;
+  pItem->sortFlags = (u8)iSortOrder;
+
+  if( eNulls!=SQLITE_SO_UNDEFINED ){
+    pItem->bNulls = 1;
+    if( iSortOrder!=eNulls ){
+      pItem->sortFlags |= KEYINFO_ORDER_BIGNULL;
+    }
+  }
 }
 
 /*
 ** Set the ExprList.a[].zName element of the most recently added item
 ** on the expression list.
@@ -4935,11 +4955,11 @@
   if( pA==0 || pB==0 ) return 1;
   if( pA->nExpr!=pB->nExpr ) return 1;
   for(i=0; i<pA->nExpr; i++){
     Expr *pExprA = pA->a[i].pExpr;
     Expr *pExprB = pB->a[i].pExpr;
-    if( pA->a[i].sortOrder!=pB->a[i].sortOrder ) return 1;
+    if( pA->a[i].sortFlags!=pB->a[i].sortFlags ) return 1;
     if( sqlite3ExprCompare(0, pExprA, pExprB, iTab) ) return 1;
   }
   return 0;
 }
 

Index: src/insert.c
==================================================================
--- src/insert.c
+++ src/insert.c
@@ -830,10 +830,13 @@
   if( pUpsert ){
     if( IsVirtual(pTab) ){
       sqlite3ErrorMsg(pParse, "UPSERT not implemented for virtual table \"%s\"",
               pTab->zName);
       goto insert_cleanup;
+    }
+    if( sqlite3HasExplicitNulls(pParse, pUpsert->pUpsertTarget) ){
+      goto insert_cleanup;
     }
     pTabList->a[0].iCursor = iDataCur;
     pUpsert->pUpsertSrc = pTabList;
     pUpsert->regData = regData;
     pUpsert->iDataCur = iDataCur;

Index: src/parse.y
==================================================================
--- src/parse.y
+++ src/parse.y
@@ -209,10 +209,11 @@
   CONFLICT DATABASE DEFERRED DESC DETACH DO
   EACH END EXCLUSIVE EXPLAIN FAIL FOR
   IGNORE IMMEDIATE INITIALLY INSTEAD LIKE_KW MATCH NO PLAN
   QUERY KEY OF OFFSET PRAGMA RAISE RECURSIVE RELEASE REPLACE RESTRICT ROW ROWS
   ROLLBACK SAVEPOINT TEMP TRIGGER VACUUM VIEW VIRTUAL WITH WITHOUT
+  NULLS FIRST LAST
 %ifdef SQLITE_OMIT_COMPOUND_SELECT
   EXCEPT INTERSECT UNION
 %endif SQLITE_OMIT_COMPOUND_SELECT
 %ifndef SQLITE_OMIT_WINDOWFUNC
   CURRENT FOLLOWING PARTITION PRECEDING RANGE UNBOUNDED
@@ -779,25 +780,30 @@
 %type sortlist {ExprList*}
 %destructor sortlist {sqlite3ExprListDelete(pParse->db, $$);}
 
 orderby_opt(A) ::= .                          {A = 0;}
 orderby_opt(A) ::= ORDER BY sortlist(X).      {A = X;}
-sortlist(A) ::= sortlist(A) COMMA expr(Y) sortorder(Z). {
+sortlist(A) ::= sortlist(A) COMMA expr(Y) sortorder(Z) nulls(X). {
   A = sqlite3ExprListAppend(pParse,A,Y);
-  sqlite3ExprListSetSortOrder(A,Z);
+  sqlite3ExprListSetSortOrder(A,Z,X);
 }
-sortlist(A) ::= expr(Y) sortorder(Z). {
+sortlist(A) ::= expr(Y) sortorder(Z) nulls(X). {
   A = sqlite3ExprListAppend(pParse,0,Y); /*A-overwrites-Y*/
-  sqlite3ExprListSetSortOrder(A,Z);
+  sqlite3ExprListSetSortOrder(A,Z,X);
 }
 
 %type sortorder {int}
 
 sortorder(A) ::= ASC.           {A = SQLITE_SO_ASC;}
 sortorder(A) ::= DESC.          {A = SQLITE_SO_DESC;}
 sortorder(A) ::= .              {A = SQLITE_SO_UNDEFINED;}
 
+%type nulls {int}
+nulls(A) ::= NULLS FIRST.       {A = SQLITE_SO_ASC;}
+nulls(A) ::= NULLS LAST.        {A = SQLITE_SO_DESC;}
+nulls(A) ::= .                  {A = SQLITE_SO_UNDEFINED;}
+
 %type groupby_opt {ExprList*}
 %destructor groupby_opt {sqlite3ExprListDelete(pParse->db, $$);}
 groupby_opt(A) ::= .                      {A = 0;}
 groupby_opt(A) ::= GROUP BY nexprlist(X). {A = X;}
 
@@ -1765,16 +1771,16 @@
 /*
 ** The code generator needs some extra TK_ token values for tokens that
 ** are synthesized and do not actually appear in the grammar:
 */
 %token
-  TRUEFALSE       /* True or false keyword */
-  ISNOT           /* Combination of IS and NOT */
-  FUNCTION        /* A function invocation */
   COLUMN          /* Reference to a table column */
   AGG_FUNCTION    /* An aggregate function */
   AGG_COLUMN      /* An aggregated column */
+  TRUEFALSE       /* True or false keyword */
+  ISNOT           /* Combination of IS and NOT */
+  FUNCTION        /* A function invocation */
   UMINUS          /* Unary minus */
   UPLUS           /* Unary plus */
   TRUTH           /* IS TRUE or IS FALSE or IS NOT TRUE or IS NOT FALSE */
   REGISTER        /* Reference to a VDBE register */
   VECTOR          /* Vector */

Index: src/select.c
==================================================================
--- src/select.c
+++ src/select.c
@@ -662,11 +662,11 @@
     sqlite3VdbeAddOp3(v, OP_Compare, regPrevKey, regBase, pSort->nOBSat);
     pOp = sqlite3VdbeGetOp(v, pSort->addrSortIndex);
     if( pParse->db->mallocFailed ) return;
     pOp->p2 = nKey + nData;
     pKI = pOp->p4.pKeyInfo;
-    memset(pKI->aSortOrder, 0, pKI->nKeyField); /* Makes OP_Jump testable */
+    memset(pKI->aSortFlags, 0, pKI->nKeyField); /* Makes OP_Jump testable */
     sqlite3VdbeChangeP4(v, -1, (char*)pKI, P4_KEYINFO);
     testcase( pKI->nAllField > pKI->nKeyField+2 );
     pOp->p4.pKeyInfo = sqlite3KeyInfoFromExprList(pParse,pSort->pOrderBy,nOBSat,
                                            pKI->nAllField-pKI->nKeyField-1);
     addrJmp = sqlite3VdbeCurrentAddr(v);
@@ -1273,11 +1273,11 @@
 */
 KeyInfo *sqlite3KeyInfoAlloc(sqlite3 *db, int N, int X){
   int nExtra = (N+X)*(sizeof(CollSeq*)+1) - sizeof(CollSeq*);
   KeyInfo *p = sqlite3DbMallocRawNN(db, sizeof(KeyInfo) + nExtra);
   if( p ){
-    p->aSortOrder = (u8*)&p->aColl[N+X];
+    p->aSortFlags = (u8*)&p->aColl[N+X];
     p->nKeyField = (u16)N;
     p->nAllField = (u16)(N+X);
     p->enc = ENC(db);
     p->db = db;
     p->nRef = 1;
@@ -1350,11 +1350,11 @@
   pInfo = sqlite3KeyInfoAlloc(db, nExpr-iStart, nExtra+1);
   if( pInfo ){
     assert( sqlite3KeyInfoIsWriteable(pInfo) );
     for(i=iStart, pItem=pList->a+iStart; i<nExpr; i++, pItem++){
       pInfo->aColl[i-iStart] = sqlite3ExprNNCollSeq(pParse, pItem->pExpr);
-      pInfo->aSortOrder[i-iStart] = pItem->sortOrder;
+      pInfo->aSortFlags[i-iStart] = pItem->sortFlags;
     }
   }
   return pInfo;
 }
 
@@ -2251,11 +2251,11 @@
         pOrderBy->a[i].pExpr =
           sqlite3ExprAddCollateString(pParse, pTerm, pColl->zName);
       }
       assert( sqlite3KeyInfoIsWriteable(pRet) );
       pRet->aColl[i] = pColl;
-      pRet->aSortOrder[i] = pOrderBy->a[i].sortOrder;
+      pRet->aSortFlags[i] = pOrderBy->a[i].sortFlags;
     }
   }
 
   return pRet;
 }
@@ -3226,11 +3226,11 @@
     pKeyDup = sqlite3KeyInfoAlloc(db, nExpr, 1);
     if( pKeyDup ){
       assert( sqlite3KeyInfoIsWriteable(pKeyDup) );
       for(i=0; i<nExpr; i++){
         pKeyDup->aColl[i] = multiSelectCollSeq(pParse, p, i);
-        pKeyDup->aSortOrder[i] = 0;
+        pKeyDup->aSortFlags[i] = 0;
       }
     }
   }
  
   /* Separate the left and the right query from one another
@@ -4403,11 +4403,11 @@
 static u8 minMaxQuery(sqlite3 *db, Expr *pFunc, ExprList **ppMinMax){
   int eRet = WHERE_ORDERBY_NORMAL;      /* Return value */
   ExprList *pEList = pFunc->x.pList;    /* Arguments to agg function */
   const char *zFunc;                    /* Name of aggregate function pFunc */
   ExprList *pOrderBy;
-  u8 sortOrder;
+  u8 sortFlags;
 
   assert( *ppMinMax==0 );
   assert( pFunc->op==TK_AGG_FUNCTION );
   assert( !IsWindowFunc(pFunc) );
   if( pEList==0 || pEList->nExpr!=1 || ExprHasProperty(pFunc, EP_WinFunc) ){
@@ -4414,20 +4414,20 @@
     return eRet;
   }
   zFunc = pFunc->u.zToken;
   if( sqlite3StrICmp(zFunc, "min")==0 ){
     eRet = WHERE_ORDERBY_MIN;
-    sortOrder = SQLITE_SO_ASC;
+    sortFlags = KEYINFO_ORDER_BIGNULL;
   }else if( sqlite3StrICmp(zFunc, "max")==0 ){
     eRet = WHERE_ORDERBY_MAX;
-    sortOrder = SQLITE_SO_DESC;
+    sortFlags = KEYINFO_ORDER_DESC;
   }else{
     return eRet;
   }
   *ppMinMax = pOrderBy = sqlite3ExprListDup(db, pEList, 0);
   assert( pOrderBy!=0 || db->mallocFailed );
-  if( pOrderBy ) pOrderBy->a[0].sortOrder = sortOrder;
+  if( pOrderBy ) pOrderBy->a[0].sortFlags = sortFlags;
   return eRet;
 }
 
 /*
 ** The select statement passed as the first argument is an aggregate query.

Index: src/sqliteInt.h
==================================================================
--- src/sqliteInt.h
+++ src/sqliteInt.h
@@ -2136,13 +2136,16 @@
   u32 nRef;           /* Number of references to this KeyInfo object */
   u8 enc;             /* Text encoding - one of the SQLITE_UTF* values */
   u16 nKeyField;      /* Number of key columns in the index */
   u16 nAllField;      /* Total columns, including key plus others */
   sqlite3 *db;        /* The database connection */
-  u8 *aSortOrder;     /* Sort order for each column. */
+  u8 *aSortFlags;     /* Sort order for each column. */
   CollSeq *aColl[1];  /* Collating sequence for each term of the key */
 };
+
+#define KEYINFO_ORDER_DESC    0x01
+#define KEYINFO_ORDER_BIGNULL 0x02
 
 /*
 ** This object holds a record which has been parsed out into individual
 ** fields, for the purposes of doing a comparison.
 **
@@ -2601,15 +2604,16 @@
   int nExpr;             /* Number of expressions on the list */
   struct ExprList_item { /* For each expression in the list */
     Expr *pExpr;            /* The parse tree for this expression */
     char *zName;            /* Token associated with this expression */
     char *zSpan;            /* Original text of the expression */
-    u8 sortOrder;           /* 1 for DESC or 0 for ASC */
+    u8 sortFlags;           /* Mask of KEYINFO_ORDER_* flags */
     unsigned done :1;       /* A flag to indicate when processing is finished */
     unsigned bSpanIsTab :1; /* zSpan holds DB.TABLE.COLUMN */
     unsigned reusable :1;   /* Constant expression is reusable */
     unsigned bSorterRef :1; /* Defer evaluation until after sorting */
+    unsigned bNulls: 1;     /* True if explicit "NULLS FIRST/LAST" */
     union {
       struct {
         u16 iOrderByCol;      /* For ORDER BY, column number in result set */
         u16 iAlias;           /* Index into Parse.aAlias[] for zName */
       } x;
@@ -3886,11 +3890,11 @@
 void sqlite3ExprAssignVarNumber(Parse*, Expr*, u32);
 void sqlite3ExprDelete(sqlite3*, Expr*);
 void sqlite3ExprUnmapAndDelete(Parse*, Expr*);
 ExprList *sqlite3ExprListAppend(Parse*,ExprList*,Expr*);
 ExprList *sqlite3ExprListAppendVector(Parse*,ExprList*,IdList*,Expr*);
-void sqlite3ExprListSetSortOrder(ExprList*,int);
+void sqlite3ExprListSetSortOrder(ExprList*,int,int);
 void sqlite3ExprListSetName(Parse*,ExprList*,Token*,int);
 void sqlite3ExprListSetSpan(Parse*,ExprList*,const char*,const char*);
 void sqlite3ExprListDelete(sqlite3*, ExprList*);
 u32 sqlite3ExprListFlags(const ExprList*);
 int sqlite3IndexHasDuplicateRootPage(Index*);
@@ -4363,10 +4367,11 @@
 KeyInfo *sqlite3KeyInfoAlloc(sqlite3*,int,int);
 void sqlite3KeyInfoUnref(KeyInfo*);
 KeyInfo *sqlite3KeyInfoRef(KeyInfo*);
 KeyInfo *sqlite3KeyInfoOfIndex(Parse*, Index*);
 KeyInfo *sqlite3KeyInfoFromExprList(Parse*, ExprList*, int, int);
+int sqlite3HasExplicitNulls(Parse*, ExprList*);
 
 #ifdef SQLITE_DEBUG
 int sqlite3KeyInfoIsWriteable(KeyInfo*);
 #endif
 int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *,

Index: src/trigger.c
==================================================================
--- src/trigger.c
+++ src/trigger.c
@@ -461,10 +461,13 @@
       pTriggerStep->pSelect = sqlite3SelectDup(db, pSelect, EXPRDUP_REDUCE);
     }
     pTriggerStep->pIdList = pColumn;
     pTriggerStep->pUpsert = pUpsert;
     pTriggerStep->orconf = orconf;
+    if( pUpsert ){
+      sqlite3HasExplicitNulls(pParse, pUpsert->pUpsertTarget);
+    }
   }else{
     testcase( pColumn );
     sqlite3IdListDelete(db, pColumn);
     testcase( pUpsert );
     sqlite3UpsertDelete(db, pUpsert);

Index: src/vdbe.c
==================================================================
--- src/vdbe.c
+++ src/vdbe.c
@@ -2225,13 +2225,18 @@
     assert( memIsValid(&aMem[p2+idx]) );
     REGISTER_TRACE(p1+idx, &aMem[p1+idx]);
     REGISTER_TRACE(p2+idx, &aMem[p2+idx]);
     assert( i<pKeyInfo->nKeyField );
     pColl = pKeyInfo->aColl[i];
-    bRev = pKeyInfo->aSortOrder[i];
+    bRev = (pKeyInfo->aSortFlags[i] & KEYINFO_ORDER_DESC);
     iCompare = sqlite3MemCompare(&aMem[p1+idx], &aMem[p2+idx], pColl);
     if( iCompare ){
+      if( (pKeyInfo->aSortFlags[i] & KEYINFO_ORDER_BIGNULL) 
+       && ((aMem[p1+idx].flags & MEM_Null) || (aMem[p2+idx].flags & MEM_Null))
+      ){
+        iCompare = -iCompare;
+      }
       if( bRev ) iCompare = -iCompare;
       break;
     }
   }
   break;

Index: src/vdbeaux.c
==================================================================
--- src/vdbeaux.c
+++ src/vdbeaux.c
@@ -1491,18 +1491,20 @@
   sqlite3StrAccumInit(&x, 0, zTemp, nTemp, 0);
   switch( pOp->p4type ){
     case P4_KEYINFO: {
       int j;
       KeyInfo *pKeyInfo = pOp->p4.pKeyInfo;
-      assert( pKeyInfo->aSortOrder!=0 );
+      assert( pKeyInfo->aSortFlags!=0 );
       sqlite3_str_appendf(&x, "k(%d", pKeyInfo->nKeyField);
       for(j=0; j<pKeyInfo->nKeyField; j++){
         CollSeq *pColl = pKeyInfo->aColl[j];
         const char *zColl = pColl ? pColl->zName : "";
         if( strcmp(zColl, "BINARY")==0 ) zColl = "B";
-        sqlite3_str_appendf(&x, ",%s%s", 
-               pKeyInfo->aSortOrder[j] ? "-" : "", zColl);
+        sqlite3_str_appendf(&x, ",%s%s%s", 
+               (pKeyInfo->aSortFlags[j] & KEYINFO_ORDER_DESC) ? "-" : "", 
+               (pKeyInfo->aSortFlags[j] & KEYINFO_ORDER_BIGNULL)? "N." : "", 
+               zColl);
       }
       sqlite3_str_append(&x, ")", 1);
       break;
     }
 #ifdef SQLITE_ENABLE_CURSOR_HINTS
@@ -3811,11 +3813,11 @@
   int nByte;                      /* Number of bytes required for *p */
   nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nKeyField+1);
   p = (UnpackedRecord *)sqlite3DbMallocRaw(pKeyInfo->db, nByte);
   if( !p ) return 0;
   p->aMem = (Mem*)&((char*)p)[ROUND8(sizeof(UnpackedRecord))];
-  assert( pKeyInfo->aSortOrder!=0 );
+  assert( pKeyInfo->aSortFlags!=0 );
   p->pKeyInfo = pKeyInfo;
   p->nField = pKeyInfo->nKeyField + 1;
   return p;
 }
 
@@ -3910,11 +3912,11 @@
   
   idx1 = getVarint32(aKey1, szHdr1);
   if( szHdr1>98307 ) return SQLITE_CORRUPT;
   d1 = szHdr1;
   assert( pKeyInfo->nAllField>=pPKey2->nField || CORRUPT_DB );
-  assert( pKeyInfo->aSortOrder!=0 );
+  assert( pKeyInfo->aSortFlags!=0 );
   assert( pKeyInfo->nKeyField>0 );
   assert( idx1<=szHdr1 || CORRUPT_DB );
   do{
     u32 serial_type1;
 
@@ -3941,11 +3943,16 @@
     */
     rc = sqlite3MemCompare(&mem1, &pPKey2->aMem[i],
                            pKeyInfo->nAllField>i ? pKeyInfo->aColl[i] : 0);
     if( rc!=0 ){
       assert( mem1.szMalloc==0 );  /* See comment below */
-      if( pKeyInfo->aSortOrder[i] ){
+      if( (pKeyInfo->aSortFlags[i] & KEYINFO_ORDER_BIGNULL)
+       && ((mem1.flags & MEM_Null) || (pPKey2->aMem[i].flags & MEM_Null)) 
+      ){
+        rc = -rc;
+      }
+      if( pKeyInfo->aSortFlags[i] & KEYINFO_ORDER_DESC ){
         rc = -rc;  /* Invert the result for DESC sort order. */
       }
       goto debugCompareEnd;
     }
     i++;
@@ -4317,11 +4324,11 @@
   }
 
   VVA_ONLY( mem1.szMalloc = 0; ) /* Only needed by assert() statements */
   assert( pPKey2->pKeyInfo->nAllField>=pPKey2->nField 
        || CORRUPT_DB );
-  assert( pPKey2->pKeyInfo->aSortOrder!=0 );
+  assert( pPKey2->pKeyInfo->aSortFlags!=0 );
   assert( pPKey2->pKeyInfo->nKeyField>0 );
   assert( idx1<=szHdr1 || CORRUPT_DB );
   do{
     u32 serial_type;
 
@@ -4440,12 +4447,18 @@
       serial_type = aKey1[idx1];
       rc = (serial_type!=0);
     }
 
     if( rc!=0 ){
-      if( pPKey2->pKeyInfo->aSortOrder[i] ){
-        rc = -rc;
+      int sortFlags = pPKey2->pKeyInfo->aSortFlags[i];
+      if( sortFlags ){
+        if( (sortFlags & KEYINFO_ORDER_BIGNULL)==0
+         || ((sortFlags & KEYINFO_ORDER_DESC)
+           !=(serial_type==0 || (pRhs->flags&MEM_Null)))
+        ){
+          rc = -rc;
+        }
       }
       assert( vdbeRecordCompareDebug(nKey1, pKey1, pPKey2, rc) );
       assert( mem1.szMalloc==0 );  /* See comment below */
       return rc;
     }
@@ -4658,11 +4671,14 @@
   ** The easiest way to enforce this limit is to consider only records with
   ** 13 fields or less. If the first field is an integer, the maximum legal
   ** header size is (12*5 + 1 + 1) bytes.  */
   if( p->pKeyInfo->nAllField<=13 ){
     int flags = p->aMem[0].flags;
-    if( p->pKeyInfo->aSortOrder[0] ){
+    if( p->pKeyInfo->aSortFlags[0] ){
+      if( p->pKeyInfo->aSortFlags[0] & KEYINFO_ORDER_BIGNULL ){
+        return sqlite3VdbeRecordCompare;
+      }
       p->r1 = 1;
       p->r2 = -1;
     }else{
       p->r1 = -1;
       p->r2 = 1;
@@ -5004,11 +5020,11 @@
   preupdate.op = op;
   preupdate.iNewReg = iReg;
   preupdate.keyinfo.db = db;
   preupdate.keyinfo.enc = ENC(db);
   preupdate.keyinfo.nKeyField = pTab->nCol;
-  preupdate.keyinfo.aSortOrder = (u8*)&fakeSortOrder;
+  preupdate.keyinfo.aSortFlags = (u8*)&fakeSortOrder;
   preupdate.iKey1 = iKey1;
   preupdate.iKey2 = iKey2;
   preupdate.pTab = pTab;
 
   db->pPreUpdate = &preupdate;

Index: src/vdbesort.c
==================================================================
--- src/vdbesort.c
+++ src/vdbesort.c
@@ -827,11 +827,12 @@
       res = vdbeSorterCompareTail(
           pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
       );
     }
   }else{
-    if( pTask->pSorter->pKeyInfo->aSortOrder[0] ){
+    assert( !(pTask->pSorter->pKeyInfo->aSortFlags[0]&KEYINFO_ORDER_BIGNULL) );
+    if( pTask->pSorter->pKeyInfo->aSortFlags[0] ){
       res = res * -1;
     }
   }
 
   return res;
@@ -895,11 +896,12 @@
     if( pTask->pSorter->pKeyInfo->nKeyField>1 ){
       res = vdbeSorterCompareTail(
           pTask, pbKey2Cached, pKey1, nKey1, pKey2, nKey2
       );
     }
-  }else if( pTask->pSorter->pKeyInfo->aSortOrder[0] ){
+  }else if( pTask->pSorter->pKeyInfo->aSortFlags[0] ){
+    assert( !(pTask->pSorter->pKeyInfo->aSortFlags[0]&KEYINFO_ORDER_BIGNULL) );
     res = res * -1;
   }
 
   return res;
 }
@@ -1010,10 +1012,11 @@
       }
     }
 
     if( pKeyInfo->nAllField<13 
      && (pKeyInfo->aColl[0]==0 || pKeyInfo->aColl[0]==db->pDfltColl)
+     && (pKeyInfo->aSortFlags[0] & KEYINFO_ORDER_BIGNULL)==0
     ){
       pSorter->typeMask = SORTER_TYPE_INTEGER | SORTER_TYPE_TEXT;
     }
   }
 

Index: src/where.c
==================================================================
--- src/where.c
+++ src/where.c
@@ -932,10 +932,11 @@
   if( pOrderBy ){
     int n = pOrderBy->nExpr;
     for(i=0; i<n; i++){
       Expr *pExpr = pOrderBy->a[i].pExpr;
       if( pExpr->op!=TK_COLUMN || pExpr->iTable!=pSrc->iCursor ) break;
+      if( pOrderBy->a[i].sortFlags & KEYINFO_ORDER_BIGNULL ) break;
     }
     if( i==n){
       nOrderBy = n;
     }
   }
@@ -1030,11 +1031,11 @@
     j++;
   }
   for(i=0; i<nOrderBy; i++){
     Expr *pExpr = pOrderBy->a[i].pExpr;
     pIdxOrderBy[i].iColumn = pExpr->iColumn;
-    pIdxOrderBy[i].desc = pOrderBy->a[i].sortOrder;
+    pIdxOrderBy[i].desc = pOrderBy->a[i].sortFlags & KEYINFO_ORDER_DESC;
   }
 
   *pmNoOmit = mNoOmit;
   return pIdxInfo;
 }
@@ -3804,11 +3805,11 @@
         /* Get the column number in the table (iColumn) and sort order
         ** (revIdx) for the j-th column of the index.
         */
         if( pIndex ){
           iColumn = pIndex->aiColumn[j];
-          revIdx = pIndex->aSortOrder[j];
+          revIdx = pIndex->aSortOrder[j] & KEYINFO_ORDER_DESC;
           if( iColumn==pIndex->pTable->iPKey ) iColumn = XN_ROWID;
         }else{
           iColumn = XN_ROWID;
           revIdx = 0;
         }
@@ -3856,26 +3857,32 @@
         }
         if( isMatch && (wctrlFlags & WHERE_GROUPBY)==0 ){
           /* Make sure the sort order is compatible in an ORDER BY clause.
           ** Sort order is irrelevant for a GROUP BY clause. */
           if( revSet ){
-            if( (rev ^ revIdx)!=pOrderBy->a[i].sortOrder ) isMatch = 0;
+            if( (rev ^ revIdx)!=(pOrderBy->a[i].sortFlags&KEYINFO_ORDER_DESC) ){
+              isMatch = 0;
+            }
           }else{
-            rev = revIdx ^ pOrderBy->a[i].sortOrder;
+            rev = revIdx ^ (pOrderBy->a[i].sortFlags & KEYINFO_ORDER_DESC);
             if( rev ) *pRevMask |= MASKBIT(iLoop);
             revSet = 1;
           }
+        }
+        if( isMatch && (pOrderBy->a[i].sortFlags & KEYINFO_ORDER_BIGNULL) ){
+          if( j==pLoop->u.btree.nEq ){
+            pLoop->wsFlags |= WHERE_BIGNULL_SORT;
+          }else{
+            isMatch = 0;
+          }
         }
         if( isMatch ){
           if( iColumn==XN_ROWID ){
             testcase( distinctColumns==0 );
             distinctColumns = 1;
           }
           obSat |= MASKBIT(i);
-          if( (wctrlFlags & WHERE_ORDERBY_MIN) && j==pLoop->u.btree.nEq ){
-            pLoop->wsFlags |= WHERE_MIN_ORDERED;
-          }
         }else{
           /* No match found */
           if( j==0 || j<nKeyCol ){
             testcase( isOrderDistinct!=0 );
             isOrderDistinct = 0;
@@ -5065,10 +5072,11 @@
       if( op ){
         sqlite3VdbeAddOp3(v, op, iIndexCur, pIx->tnum, iDb);
         sqlite3VdbeSetP4KeyInfo(pParse, pIx);
         if( (pLoop->wsFlags & WHERE_CONSTRAINT)!=0
          && (pLoop->wsFlags & (WHERE_COLUMN_RANGE|WHERE_SKIPSCAN))==0
+         && (pLoop->wsFlags & WHERE_BIGNULL_SORT)==0
          && (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN)==0
          && pWInfo->eDistinct!=WHERE_DISTINCT_ORDERED
         ){
           sqlite3VdbeChangeP5(v, OPFLAG_SEEKEQ); /* Hint to COMDB2 */
         }
@@ -5206,10 +5214,14 @@
       sqlite3VdbeChangeP5(v, pLevel->p5);
       VdbeCoverage(v);
       VdbeCoverageIf(v, pLevel->op==OP_Next);
       VdbeCoverageIf(v, pLevel->op==OP_Prev);
       VdbeCoverageIf(v, pLevel->op==OP_VNext);
+      if( pLevel->regBignull ){
+        sqlite3VdbeResolveLabel(v, pLevel->addrBignull);
+        sqlite3VdbeAddOp2(v, OP_IfNotZero, pLevel->regBignull, pLevel->p2-1);
+      }
 #ifndef SQLITE_DISABLE_SKIPAHEAD_DISTINCT
       if( addrSeek ) sqlite3VdbeJumpHere(v, addrSeek);
 #endif
     }else{
       sqlite3VdbeResolveLabel(v, pLevel->addrCont);

Index: src/whereInt.h
==================================================================
--- src/whereInt.h
+++ src/whereInt.h
@@ -69,17 +69,19 @@
   int addrNxt;          /* Jump here to start the next IN combination */
   int addrSkip;         /* Jump here for next iteration of skip-scan */
   int addrCont;         /* Jump here to continue with the next loop cycle */
   int addrFirst;        /* First instruction of interior of the loop */
   int addrBody;         /* Beginning of the body of this loop */
+  int regBignull;       /* big-null flag reg. True if a NULL-scan is needed */
+  int addrBignull;      /* Jump here for next part of big-null scan */
 #ifndef SQLITE_LIKE_DOESNT_MATCH_BLOBS
   u32 iLikeRepCntr;     /* LIKE range processing counter register (times 2) */
   int addrLikeRep;      /* LIKE range processing address */
 #endif
   u8 iFrom;             /* Which entry in the FROM clause */
   u8 op, p3, p5;        /* Opcode, P3 & P5 of the opcode that ends the loop */
-  int p1, p2;           /* Operands of the opcode used to ends the loop */
+  int p1, p2;           /* Operands of the opcode used to end the loop */
   union {               /* Information that depends on pWLoop->wsFlags */
     struct {
       int nIn;              /* Number of entries in aInLoop[] */
       struct InLoop {
         int iCur;              /* The VDBE cursor used by this IN operator */
@@ -584,8 +586,8 @@
 #define WHERE_AUTO_INDEX   0x00004000  /* Uses an ephemeral index */
 #define WHERE_SKIPSCAN     0x00008000  /* Uses the skip-scan algorithm */
 #define WHERE_UNQ_WANTED   0x00010000  /* WHERE_ONEROW would have been helpful*/
 #define WHERE_PARTIALIDX   0x00020000  /* The automatic index is partial */
 #define WHERE_IN_EARLYOUT  0x00040000  /* Perhaps quit IN loops early */
-#define WHERE_MIN_ORDERED  0x00080000  /* Column nEq of index is min() expr */
+#define WHERE_BIGNULL_SORT 0x00080000  /* Column nEq of index is BIGNULL */
 
 #endif /* !defined(SQLITE_WHEREINT_H) */

Index: src/wherecode.c
==================================================================
--- src/wherecode.c
+++ src/wherecode.c
@@ -1548,35 +1548,16 @@
     char *zStartAff;             /* Affinity for start of range constraint */
     char *zEndAff = 0;           /* Affinity for end of range constraint */
     u8 bSeekPastNull = 0;        /* True to seek past initial nulls */
     u8 bStopAtNull = 0;          /* Add condition to terminate at NULLs */
     int omitTable;               /* True if we use the index only */
-
+    int regBignull = 0;          /* big-null flag register */
 
     pIdx = pLoop->u.btree.pIndex;
     iIdxCur = pLevel->iIdxCur;
     assert( nEq>=pLoop->nSkip );
 
-    /* If this loop satisfies a sort order (pOrderBy) request that 
-    ** was passed to this function to implement a "SELECT min(x) ..." 
-    ** query, then the caller will only allow the loop to run for
-    ** a single iteration. This means that the first row returned
-    ** should not have a NULL value stored in 'x'. If column 'x' is
-    ** the first one after the nEq equality constraints in the index,
-    ** this requires some special handling.
-    */
-    assert( (pWInfo->pOrderBy!=0 && pWInfo->pOrderBy->nExpr==1)
-         || (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN)==0 );
-    if( pLoop->wsFlags & WHERE_MIN_ORDERED ){
-      assert( (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN) );
-      assert( pWInfo->nOBSat );
-      assert( pIdx->nColumn>nEq );
-      assert( pLoop->nSkip==0 );
-      bSeekPastNull = 1;
-      nExtraReg = 1;
-    }
-
     /* Find any inequality constraint terms for the start and end 
     ** of the range. 
     */
     j = nEq;
     if( pLoop->wsFlags & WHERE_BTM_LIMIT ){
@@ -1612,10 +1593,29 @@
           bSeekPastNull = 1;
         }
       }
     }
     assert( pRangeEnd==0 || (pRangeEnd->wtFlags & TERM_VNULL)==0 );
+
+    /* If the WHERE_BIGNULL_SORT flag is set, then index column nEq uses
+    ** a non-default "big-null" sort (either ASC NULLS LAST or DESC NULLS 
+    ** FIRST). In both cases separate ordered scans are made of those
+    ** index entries for which the column is null and for those for which
+    ** it is not. For an ASC sort, the non-NULL entries are scanned first.
+    ** For DESC, NULL entries are scanned first.
+    */
+    if( (pLoop->wsFlags & (WHERE_TOP_LIMIT|WHERE_BTM_LIMIT))==0
+     && (pLoop->wsFlags & WHERE_BIGNULL_SORT)!=0
+    ){
+      assert( bSeekPastNull==0 && nExtraReg==0 && nBtm==0 && nTop==0 );
+      assert( pRangeEnd==0 && pRangeStart==0 );
+      assert( pLoop->nSkip==0 );
+      nExtraReg = 1;
+      bSeekPastNull = 1;
+      pLevel->regBignull = regBignull = ++pParse->nMem;
+      pLevel->addrBignull = sqlite3VdbeMakeLabel(pParse);
+    }
 
     /* If we are doing a reverse order scan on an ascending index, or
     ** a forward order scan on a descending index, interchange the 
     ** start and end terms (pRangeStart and pRangeEnd).
     */
@@ -1635,11 +1635,11 @@
     regBase = codeAllEqualityTerms(pParse,pLevel,bRev,nExtraReg,&zStartAff);
     assert( zStartAff==0 || sqlite3Strlen30(zStartAff)>=nEq );
     if( zStartAff && nTop ){
       zEndAff = sqlite3DbStrDup(db, &zStartAff[nEq]);
     }
-    addrNxt = pLevel->addrNxt;
+    addrNxt = (regBignull ? pLevel->addrBignull : pLevel->addrNxt);
 
     testcase( pRangeStart && (pRangeStart->eOperator & WO_LE)!=0 );
     testcase( pRangeStart && (pRangeStart->eOperator & WO_GE)!=0 );
     testcase( pRangeEnd && (pRangeEnd->eOperator & WO_LE)!=0 );
     testcase( pRangeEnd && (pRangeEnd->eOperator & WO_GE)!=0 );
@@ -1669,14 +1669,18 @@
       }else{
         startEq = 1;
       }
       bSeekPastNull = 0;
     }else if( bSeekPastNull ){
-      sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
-      nConstraint++;
       startEq = 0;
+      sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
+      start_constraints = 1;
+      nConstraint++;
+    }else if( regBignull ){
+      sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
       start_constraints = 1;
+      nConstraint++;
     }
     codeApplyAffinity(pParse, regBase, nConstraint - bSeekPastNull, zStartAff);
     if( pLoop->nSkip>0 && nConstraint==pLoop->nSkip ){
       /* The skip-scan logic inside the call to codeAllEqualityConstraints()
       ** above has already left the cursor sitting on the correct row,
@@ -1683,10 +1687,15 @@
       ** so no further seeking is needed */
     }else{
       if( pLoop->wsFlags & WHERE_IN_EARLYOUT ){
         sqlite3VdbeAddOp1(v, OP_SeekHit, iIdxCur);
       }
+      if( regBignull ){
+        sqlite3VdbeAddOp2(v, OP_Integer, 1, regBignull);
+        VdbeComment((v, "NULL-scan pass ctr"));
+      }
+
       op = aStartOp[(start_constraints<<2) + (startEq<<1) + bRev];
       assert( op!=0 );
       sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
       VdbeCoverage(v);
       VdbeCoverageIf(v, op==OP_Rewind);  testcase( op==OP_Rewind );
@@ -1694,27 +1703,25 @@
       VdbeCoverageIf(v, op==OP_SeekGT);  testcase( op==OP_SeekGT );
       VdbeCoverageIf(v, op==OP_SeekGE);  testcase( op==OP_SeekGE );
       VdbeCoverageIf(v, op==OP_SeekLE);  testcase( op==OP_SeekLE );
       VdbeCoverageIf(v, op==OP_SeekLT);  testcase( op==OP_SeekLT );
 
-      if( bSeekPastNull && (pLoop->wsFlags & WHERE_TOP_LIMIT)==0 ){
-        /* If bSeekPastNull is set only to skip past the NULL values for
-        ** a query like "SELECT min(a), b FROM t1", then add code so that
-        ** if there are no rows with (a IS NOT NULL), then do the seek 
-        ** without jumping past NULLs instead. This allows the code in 
-        ** select.c to pick a value for "b" in the above query.  */
-        assert( startEq==0 && (op==OP_SeekGT || op==OP_SeekLT) );
-        assert( (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN)!=0 && pWInfo->nOBSat>0 );
-        sqlite3VdbeChangeP2(v, -1, sqlite3VdbeCurrentAddr(v)+1);
+      assert( bSeekPastNull==0 || bStopAtNull==0 );
+      if( regBignull ){
+        assert( bSeekPastNull==1 || bStopAtNull==1 );
+        assert( bSeekPastNull==!bStopAtNull );
+        assert( bStopAtNull==startEq );
         sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+2);
-
-        op = aStartOp[(start_constraints<<2) + (1<<1) + bRev];
-        assert( op==OP_SeekGE || op==OP_SeekLE );
-        sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
+        op = aStartOp[(nConstraint>1)*4 + 2 + bRev];
+        sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, 
+                             nConstraint-startEq);
         VdbeCoverage(v);
+        VdbeCoverageIf(v, op==OP_Rewind);  testcase( op==OP_Rewind );
+        VdbeCoverageIf(v, op==OP_Last);    testcase( op==OP_Last );
         VdbeCoverageIf(v, op==OP_SeekGE);  testcase( op==OP_SeekGE );
         VdbeCoverageIf(v, op==OP_SeekLE);  testcase( op==OP_SeekLE );
+        assert( op==OP_Rewind || op==OP_Last || op==OP_SeekGE || op==OP_SeekLE);
       }
     }
 
     /* Load the value for the inequality constraint at the end of the
     ** range (if any).
@@ -1743,12 +1750,14 @@
         disableTerm(pLevel, pRangeEnd);
       }else{
         endEq = 1;
       }
     }else if( bStopAtNull ){
-      sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
-      endEq = 0;
+      if( regBignull==0 ){
+        sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
+        endEq = 0;
+      }
       nConstraint++;
     }
     sqlite3DbFree(db, zStartAff);
     sqlite3DbFree(db, zEndAff);
 
@@ -1755,12 +1764,35 @@
     /* Top of the loop body */
     pLevel->p2 = sqlite3VdbeCurrentAddr(v);
 
     /* Check if the index cursor is past the end of the range. */
     if( nConstraint ){
+      if( regBignull ){
+        /* Except, skip the end-of-range check while doing the NULL-scan */
+        sqlite3VdbeAddOp2(v, OP_IfNot, regBignull, sqlite3VdbeCurrentAddr(v)+3);
+        VdbeComment((v, "If NULL-scan 2nd pass"));
+        VdbeCoverage(v);
+      }
       op = aEndOp[bRev*2 + endEq];
       sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
+      testcase( op==OP_IdxGT );  VdbeCoverageIf(v, op==OP_IdxGT );
+      testcase( op==OP_IdxGE );  VdbeCoverageIf(v, op==OP_IdxGE );
+      testcase( op==OP_IdxLT );  VdbeCoverageIf(v, op==OP_IdxLT );
+      testcase( op==OP_IdxLE );  VdbeCoverageIf(v, op==OP_IdxLE );
+    }
+    if( regBignull ){
+      /* During a NULL-scan, check to see if we have reached the end of
+      ** the NULLs */
+      assert( bSeekPastNull==!bStopAtNull );
+      assert( bSeekPastNull+bStopAtNull==1 );
+      assert( nConstraint+bSeekPastNull>0 );
+      sqlite3VdbeAddOp2(v, OP_If, regBignull, sqlite3VdbeCurrentAddr(v)+2);
+      VdbeComment((v, "If NULL-scan 1st pass"));
+      VdbeCoverage(v);
+      op = aEndOp[bRev*2 + bSeekPastNull];
+      sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase,
+                           nConstraint+bSeekPastNull);
       testcase( op==OP_IdxGT );  VdbeCoverageIf(v, op==OP_IdxGT );
       testcase( op==OP_IdxGE );  VdbeCoverageIf(v, op==OP_IdxGE );
       testcase( op==OP_IdxLT );  VdbeCoverageIf(v, op==OP_IdxLT );
       testcase( op==OP_IdxLE );  VdbeCoverageIf(v, op==OP_IdxLE );
     }

Index: src/window.c
==================================================================
--- src/window.c
+++ src/window.c
@@ -886,11 +886,11 @@
       if( bIntToNull && pDup && pDup->op==TK_INTEGER ){
         pDup->op = TK_NULL;
         pDup->flags &= ~(EP_IntValue|EP_IsTrue|EP_IsFalse);
       }
       pList = sqlite3ExprListAppend(pParse, pList, pDup);
-      if( pList ) pList->a[nInit+i].sortOrder = pAppend->a[i].sortOrder;
+      if( pList ) pList->a[nInit+i].sortFlags = pAppend->a[i].sortFlags;
     }
   }
   return pList;
 }
 
@@ -1313,12 +1313,12 @@
       KeyInfo *pKeyInfo = sqlite3KeyInfoFromExprList(pParse, pList, 0, 0);
       pWin->csrApp = pParse->nTab++;
       pWin->regApp = pParse->nMem+1;
       pParse->nMem += 3;
       if( pKeyInfo && pWin->pFunc->zName[1]=='i' ){
-        assert( pKeyInfo->aSortOrder[0]==0 );
-        pKeyInfo->aSortOrder[0] = 1;
+        assert( pKeyInfo->aSortFlags[0]==0 );
+        pKeyInfo->aSortFlags[0] = KEYINFO_ORDER_DESC;
       }
       sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pWin->csrApp, 2);
       sqlite3VdbeAppendP4(v, pKeyInfo, P4_KEYINFO);
       sqlite3VdbeAddOp2(v, OP_Integer, 0, pWin->regApp+1);
     }
@@ -1874,16 +1874,17 @@
   Vdbe *v = sqlite3GetVdbe(pParse);
   int reg1 = sqlite3GetTempReg(pParse);
   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].sortOrder ){
+  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;
       default: assert( op==OP_Le ); op = OP_Ge; break;
     }
@@ -1899,10 +1900,32 @@
   sqlite3VdbeAddOp4(v, OP_String8, 0, regString, 0, "", P4_STATIC);
   addrGe = sqlite3VdbeAddOp3(v, OP_Ge, regString, 0, reg1);
   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); 
+        VdbeCoverage(v); 
+        break;
+      case OP_Le: 
+        sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); 
+        VdbeCoverage(v); 
+        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 );
   testcase(op==OP_Ge); VdbeCoverageIf(v, op==OP_Ge);
   testcase(op==OP_Lt); VdbeCoverageIf(v, op==OP_Lt);

Index: test/minmax4.test
==================================================================
--- test/minmax4.test
+++ test/minmax4.test
@@ -197,7 +197,40 @@
   CREATE INDEX i1 ON t1(a, b DESC);
 }
 do_execsql_test 5.1 {
   SELECT MIN(a) FROM t1 WHERE a=123;
 } {123}
+
+#-------------------------------------------------------------------------
+# Tests for ticket f8a7060ece.
+#
+reset_db
+do_execsql_test 6.1.0 {
+  CREATE TABLE t1(a, b, c);
+  INSERT INTO t1 VALUES(NULL, 1, 'x');
+  CREATE INDEX i1 ON t1(a);
+}
+do_execsql_test 6.1.1 {
+  SELECT min(a), b, c FROM t1 WHERE c='x';
+} {{} 1 x}
+do_execsql_test 6.1.2 {
+  INSERT INTO t1 VALUES(1,    2, 'y');
+} {}
+do_execsql_test 6.1.3 {
+  SELECT min(a), b, c FROM t1 WHERE c='x';
+} {{} 1 x}
+
+do_execsql_test 6.2.0 {
+  CREATE TABLE t0(c0 UNIQUE, c1);
+  INSERT INTO t0(c1) VALUES (0);
+  INSERT INTO t0(c0) VALUES (0);
+  CREATE VIEW v0(c0, c1) AS 
+      SELECT t0.c1, t0.c0 FROM t0 WHERE CAST(t0.rowid AS INT) = 1;
+}
+do_execsql_test 6.2.1 {
+  SELECT c0, c1 FROM v0;
+} {0 {}}
+do_execsql_test 6.2.2 {
+  SELECT v0.c0, MIN(v0.c1) FROM v0;
+} {0 {}}
 
 finish_test

ADDED   test/nulls1.test
Index: test/nulls1.test
==================================================================
--- /dev/null
+++ test/nulls1.test
@@ -0,0 +1,242 @@
+# 2019 August 10
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix nulls1
+
+do_execsql_test 1.0 {
+  DROP TABLE IF EXISTS t3;
+  CREATE TABLE t3(a INTEGER);
+  INSERT INTO t3 VALUES(NULL), (10), (30), (20), (NULL);
+} {}
+
+for {set a 0} {$a < 3} {incr a} {
+  foreach {tn limit} {
+    1 ""
+    2 "LIMIT 10"
+  } {
+    do_execsql_test 1.$a.$tn.1 "
+      SELECT a FROM t3 ORDER BY a nULLS FIRST $limit
+    " {{}   {}   10   20   30}
+    
+    do_execsql_test 1.$a.$tn.2 "
+      SELECT a FROM t3 ORDER BY a nULLS LAST $limit
+    " {10   20   30   {}   {}}
+    
+    do_execsql_test 1.$a.$tn.3 "
+      SELECT a FROM t3 ORDER BY a DESC nULLS FIRST $limit
+    " {{}   {}   30   20   10}
+    
+    do_execsql_test 1.$a.$tn.4 "
+      SELECT a FROM t3 ORDER BY a DESC nULLS LAST $limit
+    " {30   20   10   {}   {}}
+  }
+
+  switch $a {
+    0 {
+      execsql { CREATE INDEX i1 ON t3(a) }
+    }
+    1 {
+      execsql { DROP INDEX i1 ; CREATE INDEX i1 ON t3(a DESC) }
+    }
+  }
+}
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 2.0 {
+  CREATE TABLE t2(a, b, c);
+  CREATE INDEX i2 ON t2(a, b);
+  INSERT INTO t2 VALUES(1, 1, 1);
+  INSERT INTO t2 VALUES(1, NULL, 2);
+  INSERT INTO t2 VALUES(1, NULL, 3);
+  INSERT INTO t2 VALUES(1, 4, 4);
+}
+
+do_execsql_test 2.1 {
+  SELECT * FROM t2 WHERE a=1 ORDER BY b NULLS LAST
+} {
+  1 1 1    1 4 4   1 {} 2   1 {} 3
+}
+
+do_execsql_test 2.2 {
+  SELECT * FROM t2 WHERE a=1 ORDER BY b DESC NULLS FIRST
+} {
+  1 {} 3
+  1 {} 2     
+  1 4 4     
+  1 1 1
+}
+
+#-------------------------------------------------------------------------
+#
+reset_db
+do_execsql_test 3.0 {
+  CREATE TABLE t1(a, b, c, d, UNIQUE (b));
+}
+foreach {tn sql err}  {
+  1 { CREATE INDEX i1 ON t1(a ASC NULLS LAST) }           LAST
+  2 { CREATE INDEX i1 ON t1(a ASC NULLS FIRST) }          FIRST
+  3 { CREATE INDEX i1 ON t1(a, b ASC NULLS LAST) }        LAST
+  4 { CREATE INDEX i1 ON t1(a, b ASC NULLS FIRST) }       FIRST
+  5 { CREATE INDEX i1 ON t1(a DESC NULLS LAST) }          LAST
+  6 { CREATE INDEX i1 ON t1(a DESC NULLS FIRST) }         FIRST
+  7 { CREATE INDEX i1 ON t1(a, b DESC NULLS LAST) }       LAST
+  8 { CREATE INDEX i1 ON t1(a, b DESC NULLS FIRST) }      FIRST
+  9  { CREATE TABLE t2(a, b, PRIMARY KEY(a DESC, b NULLS FIRST)) } FIRST
+  10 { CREATE TABLE t2(a, b, UNIQUE(a DESC NULLS FIRST, b)) }      FIRST
+  11 { INSERT INTO t1 VALUES(1, 2, 3, 4)
+          ON CONFLICT (b DESC NULLS LAST) DO UPDATE SET a = a+1 } LAST
+  12 {
+    CREATE TRIGGER tr1 AFTER INSERT ON t1 BEGIN
+      INSERT INTO t1 VALUES(1, 2, 3, 4)
+      ON CONFLICT (b DESC NULLS FIRST) DO UPDATE SET a = a+1;
+    END
+  } FIRST
+} {
+  do_catchsql_test 3.1.$tn $sql "1 {unsupported use of NULLS $err}"
+}
+
+do_execsql_test 3.2 {
+  CREATE TABLE first(nulls, last);
+  INSERT INTO first(last, nulls) VALUES(100,200), (300,400), (200,300);
+  SELECT * FROM first ORDER BY nulls;
+} {
+  200 100
+  300 200
+  400 300
+}
+
+#-------------------------------------------------------------------------
+#
+ifcapable vtab {
+  register_echo_module db
+  do_execsql_test 4.0 {
+    CREATE TABLE tx(a INTEGER PRIMARY KEY, b, c);
+    CREATE INDEX i1 ON tx(b);
+    INSERT INTO tx VALUES(1, 1, 1);
+    INSERT INTO tx VALUES(2, NULL, 2);
+    INSERT INTO tx VALUES(3, 3, 3);
+    INSERT INTO tx VALUES(4, NULL, 4);
+    INSERT INTO tx VALUES(5, 5, 5);
+    CREATE VIRTUAL TABLE te USING echo(tx);
+  }
+
+  do_execsql_test 4.1 {
+    SELECT * FROM tx ORDER BY b NULLS FIRST;
+  } {2 {} 2  4 {} 4  1 1 1  3 3 3  5 5 5}
+  do_execsql_test 4.2 {
+    SELECT * FROM te ORDER BY b NULLS FIRST;
+  } {2 {} 2  4 {} 4  1 1 1  3 3 3  5 5 5}
+
+  do_execsql_test 4.3 {
+    SELECT * FROM tx ORDER BY b NULLS LAST;
+  } {1 1 1  3 3 3  5 5 5  2 {} 2  4 {} 4}
+  do_execsql_test 4.4 {
+    SELECT * FROM te ORDER BY b NULLS LAST;
+  } {1 1 1  3 3 3  5 5 5  2 {} 2  4 {} 4}
+}
+
+#-------------------------------------------------------------------------
+#
+do_execsql_test 5.0 {
+  CREATE TABLE t4(a, b, c);
+  INSERT INTO t4 VALUES(1, 1, 11);
+  INSERT INTO t4 VALUES(1, 2, 12);
+  INSERT INTO t4 VALUES(1, NULL, 1);
+
+  INSERT INTO t4 VALUES(2, NULL, 1);
+  INSERT INTO t4 VALUES(2, 2, 12);
+  INSERT INTO t4 VALUES(2, 1, 11);
+
+  INSERT INTO t4 VALUES(3, NULL, 1);
+  INSERT INTO t4 VALUES(3, 2, 12);
+  INSERT INTO t4 VALUES(3, NULL, 3);
+}
+
+do_execsql_test 5.1 {
+  SELECT * FROM t4 WHERE a IN (1, 2, 3) ORDER BY a, b NULLS LAST
+} {
+  1 1 11   1 2 12   1 {} 1   
+  2 1 11   2 2 12   2 {} 1 
+  3 2 12   3 {} 1   3 {} 3
+}
+do_execsql_test 5.2 {
+  CREATE INDEX t4ab ON t4(a, b);
+  SELECT * FROM t4 WHERE a IN (1, 2, 3) ORDER BY a, b NULLS LAST
+} {
+  1 1 11   1 2 12   1 {} 1   
+  2 1 11   2 2 12   2 {} 1 
+  3 2 12   3 {} 1   3 {} 3
+}
+do_eqp_test 5.3 {
+  SELECT * FROM t4 WHERE a IN (1, 2, 3) ORDER BY a, b NULLS LAST
+} {
+  QUERY PLAN
+  `--SEARCH TABLE t4 USING INDEX t4ab (a=?)
+}
+
+do_execsql_test 5.4 {
+  SELECT * FROM t4 WHERE a IN (1, 2, 3) ORDER BY a DESC, b DESC NULLS FIRST
+} {
+  3 {} 3   3 {} 1   3 2 12   
+  2 {} 1   2 2 12   2 1 11   
+  1 {} 1   1 2 12   1 1 11   
+}
+do_eqp_test 5.5 {
+  SELECT * FROM t4 WHERE a IN (1, 2, 3) ORDER BY a DESC, b DESC NULLS FIRST
+} {
+  QUERY PLAN
+  `--SEARCH TABLE t4 USING INDEX t4ab (a=?)
+}
+
+#-------------------------------------------------------------------------
+#
+do_execsql_test 6.0 {
+  CREATE TABLE t5(a, b, c);
+  WITH s(i) AS (
+    VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<200
+  ) 
+  INSERT INTO t5 SELECT i%2, CASE WHEN (i%10)==0 THEN NULL ELSE i END, i FROM s;
+}
+
+set res1 [db eval { SELECT a,b FROM t5 WHERE a=1 ORDER BY b NULLS LAST, c }]
+set res2 [db eval { 
+  SELECT a,b FROM t5 WHERE a=1 ORDER BY b DESC NULLS FIRST, c DESC 
+}]
+
+do_execsql_test 6.1.1 {
+  CREATE INDEX t5ab ON t5(a, b, c);
+  SELECT a,b FROM t5 WHERE a=1 ORDER BY b NULLS LAST, c;
+} $res1
+do_eqp_test 6.1.2 {
+  SELECT a,b FROM t5 WHERE a=1 ORDER BY b NULLS LAST, c;
+} {
+  QUERY PLAN
+  `--SEARCH TABLE t5 USING COVERING INDEX t5ab (a=?)
+}
+do_execsql_test 6.2.1 {
+  SELECT a,b FROM t5 WHERE a=1 ORDER BY b DESC NULLS FIRST, c DESC 
+} $res2
+do_eqp_test 6.2.2 {
+  SELECT a,b FROM t5 WHERE a=1 ORDER BY b DESC NULLS FIRST, c DESC 
+} {
+  QUERY PLAN
+  `--SEARCH TABLE t5 USING COVERING INDEX t5ab (a=?)
+}
+
+
+finish_test
+
+

Index: test/pg_common.tcl
==================================================================
--- test/pg_common.tcl
+++ test/pg_common.tcl
@@ -68,12 +68,12 @@
 }
 
 proc execsql_test {tn sql} {
   set res [execsql $sql]
   set sql [string map {string_agg group_concat} $sql]
-  set sql [string map [list {NULLS FIRST} {}] $sql]
-  set sql [string map [list {NULLS LAST} {}] $sql]
+  # set sql [string map [list {NULLS FIRST} {}] $sql]
+  # set sql [string map [list {NULLS LAST} {}] $sql]
   puts $::fd "do_execsql_test $tn {"
   puts $::fd "  [string trim $sql]"
   puts $::fd "} {$res}"
   puts $::fd ""
 }

Index: test/window7.test
==================================================================
--- test/window7.test
+++ test/window7.test
@@ -39,56 +39,148 @@
     (7, 97), (8, 98), (9, 99), (0, 100);
 } {}
 
 do_execsql_test 1.1 {
   SELECT a, sum(b) FROM t3 GROUP BY a ORDER BY 1;
-} {0 550   1 460   2 470   3 480   4 490   5 500   6 510   7 520   8 530   9 540}
+} {0 550   1 460   2 470   3 480   4 490   5 500   6 510   7 520   8 530
+  9 540}
 
 do_execsql_test 1.2 {
   SELECT a, sum(b) OVER (
     ORDER BY a GROUPS BETWEEN CURRENT ROW AND CURRENT ROW
   ) FROM t3 ORDER BY 1;
-} {0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540}
+} {0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550
+  0 550   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460
+  1 460   1 460   2 470   2 470   2 470   2 470   2 470   2 470   2 470
+  2 470   2 470   2 470   3 480   3 480   3 480   3 480   3 480   3 480
+  3 480   3 480   3 480   3 480   4 490   4 490   4 490   4 490   4 490
+  4 490   4 490   4 490   4 490   4 490   5 500   5 500   5 500   5 500
+  5 500   5 500   5 500   5 500   5 500   5 500   6 510   6 510   6 510
+  6 510   6 510   6 510   6 510   6 510   6 510   6 510   7 520   7 520
+  7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   8 530
+  8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530
+  9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540
+  9 540}
 
 do_execsql_test 1.3 {
   SELECT a, sum(b) OVER (
     ORDER BY a GROUPS BETWEEN 0 PRECEDING AND 0 FOLLOWING
   ) FROM t3 ORDER BY 1;
-} {0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540}
+} {0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550
+  0 550   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460
+  1 460   1 460   2 470   2 470   2 470   2 470   2 470   2 470   2 470
+  2 470   2 470   2 470   3 480   3 480   3 480   3 480   3 480   3 480
+  3 480   3 480   3 480   3 480   4 490   4 490   4 490   4 490   4 490
+  4 490   4 490   4 490   4 490   4 490   5 500   5 500   5 500   5 500
+  5 500   5 500   5 500   5 500   5 500   5 500   6 510   6 510   6 510
+  6 510   6 510   6 510   6 510   6 510   6 510   6 510   7 520   7 520
+  7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   8 530
+  8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530
+  9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540
+  9 540}
 
 do_execsql_test 1.4 {
   SELECT a, sum(b) OVER (
     ORDER BY a GROUPS BETWEEN 2 PRECEDING AND 2 FOLLOWING
   ) FROM t3 ORDER BY 1;
-} {0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590}
+} {0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480
+  0 1480   0 1480   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960
+  1 1960   1 1960   1 1960   1 1960   2 2450   2 2450   2 2450   2 2450
+  2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   3 2400   3 2400
+  3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400
+  4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450
+  4 2450   4 2450   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500
+  5 2500   5 2500   5 2500   5 2500   6 2550   6 2550   6 2550   6 2550
+  6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   7 2600   7 2600
+  7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600
+  8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100
+  8 2100   8 2100   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590
+  9 1590   9 1590   9 1590   9 1590}
 
 do_execsql_test 1.5 {
   SELECT a, sum(b) OVER (
     ORDER BY a RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING
   ) FROM t3 ORDER BY 1;
-} {0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   2 470   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   3 480   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   4 490   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   5 500   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   6 510   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540}
+} {0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550
+  0 550   1 460   1 460   1 460   1 460   1 460   1 460   1 460   1 460
+  1 460   1 460   2 470   2 470   2 470   2 470   2 470   2 470   2 470
+  2 470   2 470   2 470   3 480   3 480   3 480   3 480   3 480   3 480
+  3 480   3 480   3 480   3 480   4 490   4 490   4 490   4 490   4 490
+  4 490   4 490   4 490   4 490   4 490   5 500   5 500   5 500   5 500
+  5 500   5 500   5 500   5 500   5 500   5 500   6 510   6 510   6 510
+  6 510   6 510   6 510   6 510   6 510   6 510   6 510   7 520   7 520
+  7 520   7 520   7 520   7 520   7 520   7 520   7 520   7 520   8 530
+  8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530   8 530
+  9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540
+  9 540}
 
 do_execsql_test 1.6 {
   SELECT a, sum(b) OVER (
     ORDER BY a RANGE BETWEEN 2 PRECEDING AND 2 FOLLOWING
   ) FROM t3 ORDER BY 1;
-} {0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590}
+} {0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480   0 1480
+  0 1480   0 1480   1 1960   1 1960   1 1960   1 1960   1 1960   1 1960
+  1 1960   1 1960   1 1960   1 1960   2 2450   2 2450   2 2450   2 2450
+  2 2450   2 2450   2 2450   2 2450   2 2450   2 2450   3 2400   3 2400
+  3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400   3 2400
+  4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450   4 2450
+  4 2450   4 2450   5 2500   5 2500   5 2500   5 2500   5 2500   5 2500
+  5 2500   5 2500   5 2500   5 2500   6 2550   6 2550   6 2550   6 2550
+  6 2550   6 2550   6 2550   6 2550   6 2550   6 2550   7 2600   7 2600
+  7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600   7 2600
+  8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100
+  8 2100   8 2100   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590
+  9 1590   9 1590   9 1590   9 1590}
 
 do_execsql_test 1.7 {
   SELECT a, sum(b) OVER (
     ORDER BY a RANGE BETWEEN 2 PRECEDING AND 1 FOLLOWING
   ) FROM t3 ORDER BY 1;
-} {0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   1 1480   1 1480   1 1480   1 1480   1 1480   1 1480   1 1480   1 1480   1 1480   1 1480   2 1960   2 1960   2 1960   2 1960   2 1960   2 1960   2 1960   2 1960   2 1960   2 1960   3 1900   3 1900   3 1900   3 1900   3 1900   3 1900   3 1900   3 1900   3 1900   3 1900   4 1940   4 1940   4 1940   4 1940   4 1940   4 1940   4 1940   4 1940   4 1940   4 1940   5 1980   5 1980   5 1980   5 1980   5 1980   5 1980   5 1980   5 1980   5 1980   5 1980   6 2020   6 2020   6 2020   6 2020   6 2020   6 2020   6 2020   6 2020   6 2020   6 2020   7 2060   7 2060   7 2060   7 2060   7 2060   7 2060   7 2060   7 2060   7 2060   7 2060   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590}
+} {0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010
+  0 1010   0 1010   1 1480   1 1480   1 1480   1 1480   1 1480   1 1480
+  1 1480   1 1480   1 1480   1 1480   2 1960   2 1960   2 1960   2 1960
+  2 1960   2 1960   2 1960   2 1960   2 1960   2 1960   3 1900   3 1900
+  3 1900   3 1900   3 1900   3 1900   3 1900   3 1900   3 1900   3 1900
+  4 1940   4 1940   4 1940   4 1940   4 1940   4 1940   4 1940   4 1940
+  4 1940   4 1940   5 1980   5 1980   5 1980   5 1980   5 1980   5 1980
+  5 1980   5 1980   5 1980   5 1980   6 2020   6 2020   6 2020   6 2020
+  6 2020   6 2020   6 2020   6 2020   6 2020   6 2020   7 2060   7 2060
+  7 2060   7 2060   7 2060   7 2060   7 2060   7 2060   7 2060   7 2060
+  8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100   8 2100
+  8 2100   8 2100   9 1590   9 1590   9 1590   9 1590   9 1590   9 1590
+  9 1590   9 1590   9 1590   9 1590}
 
 do_execsql_test 1.8.1 {
   SELECT a, sum(b) OVER (
     ORDER BY a RANGE BETWEEN 0 PRECEDING AND 1 FOLLOWING
   ) FROM t3 ORDER BY 1;
-} {0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   1 930   1 930   1 930   1 930   1 930   1 930   1 930   1 930   1 930   1 930   2 950   2 950   2 950   2 950   2 950   2 950   2 950   2 950   2 950   2 950   3 970   3 970   3 970   3 970   3 970   3 970   3 970   3 970   3 970   3 970   4 990   4 990   4 990   4 990   4 990   4 990   4 990   4 990   4 990   4 990   5 1010   5 1010   5 1010   5 1010   5 1010   5 1010   5 1010   5 1010   5 1010   5 1010   6 1030   6 1030   6 1030   6 1030   6 1030   6 1030   6 1030   6 1030   6 1030   6 1030   7 1050   7 1050   7 1050   7 1050   7 1050   7 1050   7 1050   7 1050   7 1050   7 1050   8 1070   8 1070   8 1070   8 1070   8 1070   8 1070   8 1070   8 1070   8 1070   8 1070   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540   9 540}
+} {0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010   0 1010
+  0 1010   0 1010   1 930   1 930   1 930   1 930   1 930   1 930   1 930
+  1 930   1 930   1 930   2 950   2 950   2 950   2 950   2 950   2 950
+  2 950   2 950   2 950   2 950   3 970   3 970   3 970   3 970   3 970
+  3 970   3 970   3 970   3 970   3 970   4 990   4 990   4 990   4 990
+  4 990   4 990   4 990   4 990   4 990   4 990   5 1010   5 1010   5 1010
+  5 1010   5 1010   5 1010   5 1010   5 1010   5 1010   5 1010   6 1030
+  6 1030   6 1030   6 1030   6 1030   6 1030   6 1030   6 1030   6 1030
+  6 1030   7 1050   7 1050   7 1050   7 1050   7 1050   7 1050   7 1050
+  7 1050   7 1050   7 1050   8 1070   8 1070   8 1070   8 1070   8 1070
+  8 1070   8 1070   8 1070   8 1070   8 1070   9 540   9 540   9 540   9 540
+  9 540   9 540   9 540   9 540   9 540   9 540}
 
 do_execsql_test 1.8.2 {
   SELECT a, sum(b) OVER (
     ORDER BY a DESC RANGE BETWEEN 0 PRECEDING AND 1 FOLLOWING
   ) FROM t3 ORDER BY 1;
-} {0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   1 1010   1 1010   1 1010   1 1010   1 1010   1 1010   1 1010   1 1010   1 1010   1 1010   2 930   2 930   2 930   2 930   2 930   2 930   2 930   2 930   2 930   2 930   3 950   3 950   3 950   3 950   3 950   3 950   3 950   3 950   3 950   3 950   4 970   4 970   4 970   4 970   4 970   4 970   4 970   4 970   4 970   4 970   5 990   5 990   5 990   5 990   5 990   5 990   5 990   5 990   5 990   5 990   6 1010   6 1010   6 1010   6 1010   6 1010   6 1010   6 1010   6 1010   6 1010   6 1010   7 1030   7 1030   7 1030   7 1030   7 1030   7 1030   7 1030   7 1030   7 1030   7 1030   8 1050   8 1050   8 1050   8 1050   8 1050   8 1050   8 1050   8 1050   8 1050   8 1050   9 1070   9 1070   9 1070   9 1070   9 1070   9 1070   9 1070   9 1070   9 1070   9 1070}
+} {0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550   0 550
+  0 550   1 1010   1 1010   1 1010   1 1010   1 1010   1 1010   1 1010
+  1 1010   1 1010   1 1010   2 930   2 930   2 930   2 930   2 930   2 930
+  2 930   2 930   2 930   2 930   3 950   3 950   3 950   3 950   3 950
+  3 950   3 950   3 950   3 950   3 950   4 970   4 970   4 970   4 970
+  4 970   4 970   4 970   4 970   4 970   4 970   5 990   5 990   5 990
+  5 990   5 990   5 990   5 990   5 990   5 990   5 990   6 1010   6 1010
+  6 1010   6 1010   6 1010   6 1010   6 1010   6 1010   6 1010   6 1010
+  7 1030   7 1030   7 1030   7 1030   7 1030   7 1030   7 1030   7 1030
+  7 1030   7 1030   8 1050   8 1050   8 1050   8 1050   8 1050   8 1050
+  8 1050   8 1050   8 1050   8 1050   9 1070   9 1070   9 1070   9 1070
+  9 1070   9 1070   9 1070   9 1070   9 1070   9 1070}
 
 finish_test

Index: test/window8.tcl
==================================================================
--- test/window8.tcl
+++ test/window8.tcl
@@ -195,34 +195,59 @@
 execsql_test 4.2.1 {
   SELECT sum(b) OVER (
     ORDER BY a RANGE BETWEEN 5 FOLLOWING AND 10 FOLLOWING
   ) FROM t1 ORDER BY 1 NULLS FIRST;
 }
-
 execsql_test 4.2.2 {
+  SELECT sum(b) OVER (
+    ORDER BY a RANGE BETWEEN 5 FOLLOWING AND 10 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+}
+
+execsql_test 4.2.3 {
   SELECT sum(b) OVER (
     ORDER BY a DESC RANGE BETWEEN 5 FOLLOWING AND 10 FOLLOWING
   ) FROM t1 ORDER BY 1 NULLS FIRST;
 }
+execsql_test 4.2.4 {
+  SELECT sum(b) OVER (
+    ORDER BY a DESC RANGE BETWEEN 5 FOLLOWING AND 10 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+}
 
 execsql_test 4.3.1 {
   SELECT sum(b) OVER (
     ORDER BY a NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND 10 FOLLOWING
   ) FROM t1 ORDER BY 1 NULLS FIRST;
 }
+execsql_test 4.3.2 {
+  SELECT sum(b) OVER (
+    ORDER BY a NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND 10 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+}
 
 execsql_test 4.4.1 {
   SELECT sum(b) OVER (
     ORDER BY a NULLS FIRST ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
   ) FROM t1 ORDER BY 1 NULLS FIRST;
 }
-
 execsql_test 4.4.2 {
+  SELECT sum(b) OVER (
+    ORDER BY a NULLS LAST ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+}
+
+execsql_test 4.4.3 {
   SELECT sum(b) OVER (
     ORDER BY a DESC NULLS LAST ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
   ) FROM t1 ORDER BY 1 NULLS FIRST;
 }
+execsql_test 4.4.4 {
+  SELECT sum(b) OVER (
+    ORDER BY a DESC NULLS LAST ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+}
 
 ==========
 
 execsql_test 5.0 {
   INSERT INTO t3 VALUES
@@ -246,10 +271,21 @@
     4 { ORDER BY a NULLS FIRST GROUPS 6 PRECEDING }
     5 { ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING }
     6 { ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING }
     7 { ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING }
+
+    8 { RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING }
+    9 { ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING }
+   10 { PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING }
+   11 { ORDER BY a NULLS LAST GROUPS 6 PRECEDING }
+   12 { ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING }
+   13 { ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING }
+   14 { ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING }
   } {
     execsql_test 5.$tn.$tn2.1 "
       SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
@@ -290,10 +326,11 @@
   SELECT string_agg(a, '.') OVER (
     ORDER BY b DESC NULLS LAST RANGE BETWEEN 7 PRECEDING AND 2 PRECEDING
   )
   FROM t2
 }
+
 
 
 finish_test
 
 

Index: test/window8.test
==================================================================
--- test/window8.test
+++ test/window8.test
@@ -3520,35 +3520,65 @@
 } {6   6   6   9   9}
 
 do_execsql_test 4.2.1 {
   SELECT sum(b) OVER (
     ORDER BY a RANGE BETWEEN 5 FOLLOWING AND 10 FOLLOWING
-  ) FROM t1 ORDER BY 1 ;
+  ) FROM t1 ORDER BY 1 NULLS FIRST;
 } {{}   {}   6   6   6}
 
 do_execsql_test 4.2.2 {
+  SELECT sum(b) OVER (
+    ORDER BY a RANGE BETWEEN 5 FOLLOWING AND 10 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+} {6   6   6   {}   {}}
+
+do_execsql_test 4.2.3 {
   SELECT sum(b) OVER (
     ORDER BY a DESC RANGE BETWEEN 5 FOLLOWING AND 10 FOLLOWING
-  ) FROM t1 ORDER BY 1 ;
+  ) FROM t1 ORDER BY 1 NULLS FIRST;
 } {{}   {}   6   6   6}
+
+do_execsql_test 4.2.4 {
+  SELECT sum(b) OVER (
+    ORDER BY a DESC RANGE BETWEEN 5 FOLLOWING AND 10 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+} {6   6   6   {}   {}}
 
 do_execsql_test 4.3.1 {
   SELECT sum(b) OVER (
-    ORDER BY a  RANGE BETWEEN UNBOUNDED PRECEDING AND 10 FOLLOWING
-  ) FROM t1 ORDER BY 1 ;
+    ORDER BY a NULLS FIRST RANGE BETWEEN UNBOUNDED PRECEDING AND 10 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS FIRST;
 } {6   6   6   15   15}
 
+do_execsql_test 4.3.2 {
+  SELECT sum(b) OVER (
+    ORDER BY a NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND 10 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+} {9   9   15   15   15}
+
 do_execsql_test 4.4.1 {
   SELECT sum(b) OVER (
-    ORDER BY a  ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
-  ) FROM t1 ORDER BY 1 ;
+    ORDER BY a NULLS FIRST ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS FIRST;
 } {3   6   9   9   12}
 
 do_execsql_test 4.4.2 {
   SELECT sum(b) OVER (
-    ORDER BY a DESC  ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
-  ) FROM t1 ORDER BY 1 ;
+    ORDER BY a NULLS LAST ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
+} {5   6   8   9   10}
+
+do_execsql_test 4.4.3 {
+  SELECT sum(b) OVER (
+    ORDER BY a DESC NULLS LAST ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS FIRST;
+} {5   6   8   9   10}
+
+do_execsql_test 4.4.4 {
+  SELECT sum(b) OVER (
+    ORDER BY a DESC NULLS LAST ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING
+  ) FROM t1 ORDER BY 1 NULLS LAST;
 } {5   6   8   9   10}
 
 #==========================================================================
 
 do_execsql_test 5.0 {
@@ -3562,11 +3592,11 @@
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
       WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
@@ -3585,11 +3615,11 @@
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
       WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
@@ -3607,13 +3637,13 @@
 do_execsql_test 5.1.2.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  
+      WINDOW win AS (  ORDER BY a NULLS FIRST 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {899 113 9   899 113 9   899 113 9   899 113 9   899 113 9   899 113 9
   899 113 9   899 113 9   899 113 9   899 113 16   899 113 16   899 113 16
   899 113 16   899 113 16   899 113 16   899 113 16   979 102 44   979 102 44
   979 102 44   979 102 44   979 102 44   979 102 44   979 102 44   979 102 44
   979 102 44   979 102 44   979 102 44   979 102 49   979 102 49   979 102 49
@@ -3631,13 +3661,13 @@
 do_execsql_test 5.1.2.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  
+      WINDOW win AS (  ORDER BY a NULLS FIRST 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {2947 81 11   2947 81 11   2947 81 11   2947 81 11   2947 81 11   2947 81 11
   2947 81 11   2947 81 11   2947 81 11   5287 74 10   5287 74 10   5287 74 10
   5287 74 10   5287 74 10   5287 74 10   5287 74 10   8400 65 9   8400 65 9
   8400 65 9   8400 65 9   8400 65 9   8400 65 9   8400 65 9   8400 65 9
   8400 65 9   9664 57 8   9664 57 8   9664 57 8   9664 57 8   9664 57 8
@@ -3657,11 +3687,11 @@
              min(c) OVER win,
              count(a) OVER win
       FROM t3
       WINDOW win AS (  PARTITION BY coalesce(a, '') 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {777 113 5   777 113 5   777 113 5   777 113 5   777 113 5   805 250 7
   805 250 7   805 250 7   805 250 7   805 250 7   805 250 7   805 250 7
   822 158 6   822 158 6   822 158 6   822 158 6   822 158 6   822 158 6
   840 247 13   840 247 13   840 247 13   840 247 13   840 247 13   840 247 13
   840 247 13   840 247 13   840 247 13   840 247 13   840 247 13   840 247 13
@@ -3681,11 +3711,11 @@
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
       WINDOW win AS (  PARTITION BY coalesce(a, '') 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {962 1 1   962 1 1   962 1 1   962 1 1   962 1 1   962 1 1   962 1 1
   962 1 1   962 1 1   962 1 1   962 1 1   1264 1 1   1264 1 1   1264 1 1
   1264 1 1   1264 1 1   1264 1 1   1264 1 1   1264 1 1   1366 1 1   1366 1 1
   1366 1 1   1366 1 1   1366 1 1   1366 1 1   1519 1 1   1519 1 1   1519 1 1
   1519 1 1   1519 1 1   1804 1 1   1804 1 1   1804 1 1   1804 1 1   1804 1 1
@@ -3701,12 +3731,12 @@
 do_execsql_test 5.1.4.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  GROUPS 6 PRECEDING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY a NULLS FIRST GROUPS 6 PRECEDING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {870 158 0   870 158 0   870 158 0   870 158 0   870 158 0   870 158 0
   934 158 8   934 158 8   934 158 8   934 158 8   934 158 8   934 158 8
   934 158 8   934 158 8   934 158 21   934 158 21   934 158 21   934 158 21
   934 158 21   934 158 21   934 158 21   934 158 21   934 158 21   934 158 21
   934 158 21   934 158 21   934 158 21   934 158 27   934 158 27   934 158 27
@@ -3724,12 +3754,12 @@
 do_execsql_test 5.1.4.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  GROUPS 6 PRECEDING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY a NULLS FIRST GROUPS 6 PRECEDING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {2050 1 1   2050 1 1   2050 1 1   2050 1 1   2050 1 1   2050 1 1   4359 7 2
   4359 7 2   4359 7 2   4359 7 2   4359 7 2   4359 7 2   4359 7 2   4359 7 2
   7840 15 3   7840 15 3   7840 15 3   7840 15 3   7840 15 3   7840 15 3
   7840 15 3   7840 15 3   7840 15 3   7840 15 3   7840 15 3   7840 15 3
   7840 15 3   9206 28 4   9206 28 4   9206 28 4   9206 28 4   9206 28 4
@@ -3748,12 +3778,12 @@
 do_execsql_test 5.1.5.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {102 102 1   113 113 2   113 113 2   133 133 1   148 148 1   160 158 2
   160 158 2   160 158 2   208 208 1   224 223 2   224 223 2   239 234 3
   239 234 3   239 234 3   252 247 3   257 247 5   257 247 5   257 250 4
   257 252 3   295 295 1   309 309 1   336 330 3   336 330 3   336 330 3
   346 346 1   355 354 2   355 354 2   355 354 2   399 393 4   399 393 4
@@ -3771,12 +3801,12 @@
 do_execsql_test 5.1.5.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 25 23   {} 34 29
   {} 36 31   {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 43 37   {} 43 37
   {} 50 42   {} 60 51   {} 61 52   {} 64 55   {} 64 55   {} 67 57   {} 68 58
   {} 69 59   {} 70 60   {} 72 62   {} 78 67   {} 78 67   {} 78 67   {} 85 72
   {} 85 72   133 4 3   223 10 8   223 11 9   226 2 2   226 2 2   239 12 10
@@ -3793,12 +3823,12 @@
 do_execsql_test 5.1.6.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {102 102 1   113 113 2   113 113 2   133 133 1   148 148 1   158 158 1
   158 158 1   160 160 1   208 208 1   223 223 1   224 224 1   234 234 1
   238 238 1   239 239 1   247 247 1   250 250 1   252 252 1   256 256 1
   257 257 1   295 295 1   309 309 1   330 330 1   335 335 1   336 336 1
   346 346 1   354 354 1   355 355 1   355 355 1   393 393 2   393 393 2
@@ -3816,12 +3846,12 @@
 do_execsql_test 5.1.6.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 11 9   {} 12 10
   {} 13 11   {} 16 14   {} 17 15   {} 18 16   {} 22 20   {} 24 22   {} 25 23
   {} 26 24   {} 31 27   {} 34 29   {} 36 31   {} 38 33   {} 38 33   {} 40 34
   {} 41 35   {} 43 37   {} 43 37   {} 49 41   {} 50 42   {} 51 43   {} 54 45
   {} 59 50   {} 60 51   {} 61 52   {} 63 54   {} 64 55   {} 64 55   {} 67 57
@@ -3838,13 +3868,13 @@
 do_execsql_test 5.1.7.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c , b , a 
+      WINDOW win AS (  ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
   979 102 83   979 113 81   979 113 82   979 133 80   979 148 79   979 158 77
   979 158 78   979 160 77   979 208 76   979 223 75   979 224 74   979 234 73
   979 238 72   979 239 71   979 247 70   979 250 69   979 252 68   979 256 67
   979 257 66   979 295 65   979 309 64   979 330 63   979 335 62   979 336 61
@@ -3862,13 +3892,339 @@
 do_execsql_test 5.1.7.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c , b , a 
+      WINDOW win AS (  ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {3830 89 89   4741 88 88   5640 84 84   5640 85 85   5640 86 86   5640 87 87
+  6485 81 81   6485 82 82   6485 83 83   7324 80 80   8163 78 78   8163 79 79
+  8968 73 73   8968 74 74   8968 75 75   8968 76 76   8968 77 77   9745 69 69
+  9745 70 70   9745 71 71   9745 72 72   10504 65 65   10504 66 66
+  10504 67 67   10504 68 68   11215 64 64   11920 63 63   12603 62 62
+  13274 60 60   13274 61 61   13941 59 59   14608 55 55   14608 56 56
+  14608 57 57   14608 58 58   15241 54 54   15870 53 53   16499 52 52
+  17126 49 49   17126 50 50   17126 51 51   17733 44 44   17733 45 45
+  17733 46 46   17733 47 47   17733 48 48   18176 42 42   18176 43 43
+  18597 40 40   18597 41 41   18996 39 39   19395 37 37   19395 38 38
+  19788 36 36   20181 35 35   20536 34 34   20891 30 30   20891 31 31
+  20891 32 32   20891 33 33   21226 28 28   21226 29 29   21535 27 27
+  21830 26 26   22087 22 22   22087 23 23   22087 24 24   22087 25 25
+  22334 21 21   22573 17 17   22573 18 18   22573 19 19   22573 20 20
+  22796 11 11   22796 12 12   22796 13 13   22796 14 14   22796 15 15
+  22796 16 16   22929 10 10   23042 9 9   23155 1 1   23155 2 2   23155 3 3
+  23155 4 4   23155 5 5   23155 6 6   23155 7 7   23155 8 8}
+
+do_execsql_test 5.1.8.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83}
+
+do_execsql_test 5.1.8.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1}
+
+do_execsql_test 5.1.9.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {870 158 0   870 158 0   870 158 0   870 158 0   870 158 0   870 158 0
+  899 113 9   899 113 9   899 113 9   899 113 9   899 113 9   899 113 9
+  899 113 9   899 113 9   899 113 9   899 113 16   899 113 16   899 113 16
+  899 113 16   899 113 16   899 113 16   899 113 16   979 102 44   979 102 44
+  979 102 44   979 102 44   979 102 44   979 102 44   979 102 44   979 102 44
+  979 102 44   979 102 44   979 102 44   979 102 49   979 102 49   979 102 49
+  979 102 49   979 102 49   979 102 56   979 102 56   979 102 56   979 102 56
+  979 102 56   979 102 56   979 102 56   979 102 62   979 102 62   979 102 62
+  979 102 62   979 102 62   979 102 62   979 102 75   979 102 75   979 102 75
+  979 102 75   979 102 75   979 102 75   979 102 75   979 102 75   979 102 75
+  979 102 75   979 102 75   979 102 75   979 102 75   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 113 25   979 113 25   979 113 25   979 113 25   979 113 25   979 113 25
+  979 113 25   979 113 25   979 113 25   979 113 33   979 113 33   979 113 33
+  979 113 33   979 113 33   979 113 33   979 113 33   979 113 33}
+
+do_execsql_test 5.1.9.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {2050 84 11   2050 84 11   2050 84 11   2050 84 11   2050 84 11   2050 84 11
+  4997 75 10   4997 75 10   4997 75 10   4997 75 10   4997 75 10   4997 75 10
+  4997 75 10   4997 75 10   4997 75 10   7337 68 9   7337 68 9   7337 68 9
+  7337 68 9   7337 68 9   7337 68 9   7337 68 9   10450 59 8   10450 59 8
+  10450 59 8   10450 59 8   10450 59 8   10450 59 8   10450 59 8   10450 59 8
+  10450 59 8   11714 51 7   11714 51 7   11714 51 7   11714 51 7   11714 51 7
+  11714 51 7   11714 51 7   11714 51 7   12676 40 6   12676 40 6   12676 40 6
+  12676 40 6   12676 40 6   12676 40 6   12676 40 6   12676 40 6   12676 40 6
+  12676 40 6   12676 40 6   14195 35 5   14195 35 5   14195 35 5   14195 35 5
+  14195 35 5   15999 28 4   15999 28 4   15999 28 4   15999 28 4   15999 28 4
+  15999 28 4   15999 28 4   17365 22 3   17365 22 3   17365 22 3   17365 22 3
+  17365 22 3   17365 22 3   20846 9 2   20846 9 2   20846 9 2   20846 9 2
+  20846 9 2   20846 9 2   20846 9 2   20846 9 2   20846 9 2   20846 9 2
+  20846 9 2   20846 9 2   20846 9 2   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1}
+
+do_execsql_test 5.1.10.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {777 113 5   777 113 5   777 113 5   777 113 5   777 113 5   805 250 7
+  805 250 7   805 250 7   805 250 7   805 250 7   805 250 7   805 250 7
+  822 158 6   822 158 6   822 158 6   822 158 6   822 158 6   822 158 6
+  840 247 13   840 247 13   840 247 13   840 247 13   840 247 13   840 247 13
+  840 247 13   840 247 13   840 247 13   840 247 13   840 247 13   840 247 13
+  840 247 13   870 158 0   870 158 0   870 158 0   870 158 0   870 158 0
+  870 158 0   899 113 9   899 113 9   899 113 9   899 113 9   899 113 9
+  899 113 9   899 113 9   899 113 9   899 113 9   934 223 8   934 223 8
+  934 223 8   934 223 8   934 223 8   934 223 8   934 223 8   934 223 8
+  938 102 11   938 102 11   938 102 11   938 102 11   938 102 11   938 102 11
+  938 102 11   938 102 11   938 102 11   938 102 11   938 102 11   938 148 8
+  938 148 8   938 148 8   938 148 8   938 148 8   938 148 8   938 148 8
+  938 148 8   959 224 7   959 224 7   959 224 7   959 224 7   959 224 7
+  959 224 7   959 224 7   979 133 9   979 133 9   979 133 9   979 133 9
+  979 133 9   979 133 9   979 133 9   979 133 9   979 133 9}
+
+do_execsql_test 5.1.10.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {962 1 1   962 1 1   962 1 1   962 1 1   962 1 1   962 1 1   962 1 1
+  962 1 1   962 1 1   962 1 1   962 1 1   1264 1 1   1264 1 1   1264 1 1
+  1264 1 1   1264 1 1   1264 1 1   1264 1 1   1264 1 1   1366 1 1   1366 1 1
+  1366 1 1   1366 1 1   1366 1 1   1366 1 1   1519 1 1   1519 1 1   1519 1 1
+  1519 1 1   1519 1 1   1804 1 1   1804 1 1   1804 1 1   1804 1 1   1804 1 1
+  1804 1 1   1804 1 1   2050 1 1   2050 1 1   2050 1 1   2050 1 1   2050 1 1
+  2050 1 1   2309 1 1   2309 1 1   2309 1 1   2309 1 1   2309 1 1   2309 1 1
+  2309 1 1   2309 1 1   2340 1 1   2340 1 1   2340 1 1   2340 1 1   2340 1 1
+  2340 1 1   2340 1 1   2947 1 1   2947 1 1   2947 1 1   2947 1 1   2947 1 1
+  2947 1 1   2947 1 1   2947 1 1   2947 1 1   3113 1 1   3113 1 1   3113 1 1
+  3113 1 1   3113 1 1   3113 1 1   3113 1 1   3113 1 1   3113 1 1   3481 1 1
+  3481 1 1   3481 1 1   3481 1 1   3481 1 1   3481 1 1   3481 1 1   3481 1 1
+  3481 1 1   3481 1 1   3481 1 1   3481 1 1   3481 1 1}
+
+do_execsql_test 5.1.11.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST GROUPS 6 PRECEDING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {934 158 27   934 158 27   934 158 27   934 158 27   934 158 27   934 158 27
+  934 223 8   934 223 8   934 223 8   934 223 8   934 223 8   934 223 8
+  934 223 8   934 223 8   934 223 21   934 223 21   934 223 21   934 223 21
+  934 223 21   934 223 21   934 223 21   934 223 21   934 223 21   934 223 21
+  934 223 21   934 223 21   934 223 21   959 102 50   959 102 50   959 102 50
+  959 102 50   959 102 50   959 102 50   959 102 50   959 102 50   959 102 50
+  959 102 50   959 102 50   959 102 58   959 102 58   959 102 58   959 102 58
+  959 102 58   959 102 58   959 102 58   959 102 58   959 113 39   959 113 39
+  959 113 39   959 113 39   959 113 39   959 158 34   959 158 34   959 158 34
+  959 158 34   959 158 34   959 158 34   959 158 34   979 102 49   979 102 49
+  979 102 49   979 102 49   979 102 49   979 102 49   979 102 53   979 102 53
+  979 102 53   979 102 53   979 102 53   979 102 53   979 102 53   979 102 56
+  979 102 56   979 102 56   979 102 56   979 102 56   979 102 56   979 102 56
+  979 102 56   979 102 56   979 102 59   979 102 59   979 102 59   979 102 59
+  979 102 59   979 102 59   979 102 59   979 102 59   979 102 59}
+
+do_execsql_test 5.1.11.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST GROUPS 6 PRECEDING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {2309 1 1   2309 1 1   2309 1 1   2309 1 1   2309 1 1   2309 1 1   2309 1 1
+  2309 1 1   5790 9 2   5790 9 2   5790 9 2   5790 9 2   5790 9 2   5790 9 2
+  5790 9 2   5790 9 2   5790 9 2   5790 9 2   5790 9 2   5790 9 2   5790 9 2
+  7156 22 3   7156 22 3   7156 22 3   7156 22 3   7156 22 3   7156 22 3
+  8960 28 4   8960 28 4   8960 28 4   8960 28 4   8960 28 4   8960 28 4
+  8960 28 4   10479 35 5   10479 35 5   10479 35 5   10479 35 5   10479 35 5
+  11441 40 6   11441 40 6   11441 40 6   11441 40 6   11441 40 6   11441 40 6
+  11441 40 6   11441 40 6   11441 40 6   11441 40 6   11441 40 6   12368 68 9
+  12368 68 9   12368 68 9   12368 68 9   12368 68 9   12368 68 9   12368 68 9
+  12705 51 7   12705 51 7   12705 51 7   12705 51 7   12705 51 7   12705 51 7
+  12705 51 7   12705 51 7   13509 59 8   13509 59 8   13509 59 8   13509 59 8
+  13509 59 8   13509 59 8   13509 59 8   13509 59 8   13509 59 8
+  13949 75 10   13949 75 10   13949 75 10   13949 75 10   13949 75 10
+  13949 75 10   13949 75 10   13949 75 10   13949 75 10   14195 84 11
+  14195 84 11   14195 84 11   14195 84 11   14195 84 11   14195 84 11}
+
+do_execsql_test 5.1.12.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {102 102 1   113 113 2   113 113 2   133 133 1   148 148 1   160 158 2
+  160 158 2   160 158 2   208 208 1   224 223 2   224 223 2   239 234 3
+  239 234 3   239 234 3   252 247 3   257 247 5   257 247 5   257 250 4
+  257 252 3   295 295 1   309 309 1   336 330 3   336 330 3   336 330 3
+  346 346 1   355 354 2   355 354 2   355 354 2   399 393 4   399 393 4
+  399 393 4   399 393 4   399 393 4   412 412 1   421 421 1   430 430 1
+  443 443 1   480 480 2   480 480 2   574 572 2   574 572 2   607 607 1
+  618 618 2   618 618 2   634 627 4   634 627 4   634 627 4   634 627 4
+  634 629 3   652 652 1   667 660 2   671 667 3   671 667 3   671 667 3
+  671 667 3   683 683 1   711 705 2   716 705 3   716 711 2   730 726 2
+  730 726 2   762 759 2   768 759 4   768 762 3   768 762 3   777 777 1
+  792 786 3   794 786 4   794 786 4   794 790 3   805 805 1   822 822 1
+  845 839 5   845 839 5   845 839 5   845 839 5   845 839 5   870 870 2
+  870 870 2   870 870 2   899 899 1   911 911 1   934 929 2   938 929 4
+  938 934 3   938 934 3   963 959 2   963 959 2   979 979 1}
+
+do_execsql_test 5.1.12.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 25 23   {} 34 29
+  {} 36 31   {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 43 37   {} 43 37
+  {} 50 42   {} 60 51   {} 61 52   {} 64 55   {} 64 55   {} 67 57   {} 68 58
+  {} 69 59   {} 70 60   {} 72 62   {} 78 67   {} 78 67   {} 78 67   {} 85 72
+  {} 85 72   133 4 3   223 10 8   223 11 9   226 2 2   226 2 2   239 12 10
+  239 13 11   239 14 12   247 15 13   257 18 16   257 19 17   295 20 18
+  309 21 19   335 22 20   335 23 21   335 24 22   421 35 30   443 37 32
+  504 16 14   504 17 15   607 42 36   683 56 47   710 26 24   710 27 25
+  710 27 25   711 59 50   759 62 53   759 63 54   777 66 56   805 71 61
+  899 81 68   911 82 69   929 83 70   929 84 71   979 89 75   1334 51 43
+  1416 57 48   1416 58 49   1584 29 26   1584 29 26   1584 31 27   1584 32 28
+  1584 32 28   1891 49 41   1922 87 73   1922 88 74   2005 52 44   2005 52 44
+  2005 54 45   2005 55 46   2518 45 38   2518 46 39   2518 46 39   2518 48 40
+  2523 73 63   2523 73 63   2523 75 64   2523 76 65   2523 77 66}
+
+do_execsql_test 5.1.13.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {102 102 1   113 113 2   113 113 2   133 133 1   148 148 1   158 158 1
+  158 158 1   160 160 1   208 208 1   223 223 1   224 224 1   234 234 1
+  238 238 1   239 239 1   247 247 1   250 250 1   252 252 1   256 256 1
+  257 257 1   295 295 1   309 309 1   330 330 1   335 335 1   336 336 1
+  346 346 1   354 354 1   355 355 1   355 355 1   393 393 2   393 393 2
+  398 398 1   399 399 1   399 399 1   412 412 1   421 421 1   430 430 1
+  443 443 1   480 480 2   480 480 2   572 572 1   574 574 1   607 607 1
+  618 618 2   618 618 2   627 627 1   629 629 1   629 629 1   633 633 1
+  634 634 1   652 652 1   660 660 1   667 667 1   667 667 1   670 670 1
+  671 671 1   683 683 1   705 705 1   711 711 1   716 716 1   726 726 1
+  730 730 1   759 759 1   762 762 1   768 768 2   768 768 2   777 777 1
+  786 786 1   790 790 1   792 792 1   794 794 1   805 805 1   822 822 1
+  839 839 2   839 839 2   840 840 1   844 844 1   845 845 1   870 870 2
+  870 870 2   870 870 2   899 899 1   911 911 1   929 929 1   934 934 1
+  938 938 2   938 938 2   959 959 1   963 963 1   979 979 1}
+
+do_execsql_test 5.1.13.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 11 9   {} 12 10
+  {} 13 11   {} 16 14   {} 17 15   {} 18 16   {} 22 20   {} 24 22   {} 25 23
+  {} 26 24   {} 31 27   {} 34 29   {} 36 31   {} 38 33   {} 38 33   {} 40 34
+  {} 41 35   {} 43 37   {} 43 37   {} 49 41   {} 50 42   {} 51 43   {} 54 45
+  {} 59 50   {} 60 51   {} 61 52   {} 63 54   {} 64 55   {} 64 55   {} 67 57
+  {} 68 58   {} 69 59   {} 70 60   {} 72 62   {} 75 64   {} 76 65   {} 78 67
+  {} 78 67   {} 78 67   {} 84 71   {} 85 72   {} 85 72   133 4 3   223 10 8
+  226 2 2   226 2 2   239 14 12   247 15 13   257 19 17   295 20 18
+  309 21 19   335 23 21   421 35 30   443 37 32   607 42 36   627 45 38
+  633 48 40   671 55 46   683 56 47   705 57 48   710 27 25   710 27 25
+  711 58 49   759 62 53   777 66 56   786 29 26   786 29 26   798 32 28
+  798 32 28   805 71 61   845 77 66   899 81 68   911 82 69   929 83 70
+  959 87 73   963 88 74   979 89 75   1258 46 39   1258 46 39   1334 52 44
+  1334 52 44   1678 73 63   1678 73 63}
+
+do_execsql_test 5.1.14.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 113 81   979 113 82   979 133 80   979 148 79   979 158 77
+  979 158 78   979 160 77   979 208 76   979 223 75   979 224 74   979 234 73
+  979 238 72   979 239 71   979 247 70   979 250 69   979 252 68   979 256 67
+  979 257 66   979 295 65   979 309 64   979 330 63   979 335 62   979 336 61
+  979 346 60   979 354 59   979 355 57   979 355 58   979 393 56   979 393 57
+  979 398 55   979 399 53   979 399 54   979 412 53   979 421 52   979 430 51
+  979 443 50   979 480 48   979 480 49   979 572 47   979 574 46   979 607 45
+  979 618 43   979 618 44   979 627 42   979 629 40   979 629 41   979 633 40
+  979 634 39   979 652 38   979 660 37   979 667 35   979 667 36   979 670 35
+  979 671 34   979 683 33   979 705 32   979 711 31   979 716 30   979 726 29
+  979 730 28   979 759 27   979 762 26   979 768 24   979 768 25   979 777 23
+  979 786 22   979 790 21   979 792 20   979 794 19   979 805 18   979 822 17
+  979 839 15   979 839 16   979 840 14   979 844 13   979 845 12   979 870 9
+  979 870 10   979 870 11   979 899 9   979 911 8   979 929 7}
+
+do_execsql_test 5.1.14.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE NO OTHERS  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {3830 89 89   4741 88 88   5640 84 84   5640 85 85   5640 86 86   5640 87 87
   6485 81 81   6485 82 82   6485 83 83   7324 80 80   8163 78 78   8163 79 79
   8968 73 73   8968 74 74   8968 75 75   8968 76 76   8968 77 77   9745 69 69
   9745 70 70   9745 71 71   9745 72 72   10504 65 65   10504 66 66
   10504 67 67   10504 68 68   11215 64 64   11920 63 63   12603 62 62
@@ -3889,11 +4245,11 @@
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
       WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {963 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
@@ -3912,11 +4268,11 @@
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
       WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {22176 1 1   22192 1 1   22196 1 1   22226 1 1   22244 1 1   22256 1 1
   22310 1 1   22316 1 1   22316 1 1   22350 1 1   22378 1 1   22396 1 1
   22444 1 1   22450 1 1   22472 1 1   22484 1 1   22488 1 1   22488 1 1
   22522 1 1   22526 1 1   22526 1 1   22528 1 1   22548 1 1   22712 1 1
   22734 1 1   22756 1 1   22756 1 1   22762 1 1   22762 1 1   22800 1 1
@@ -3934,13 +4290,13 @@
 do_execsql_test 5.2.2.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  
+      WINDOW win AS (  ORDER BY a NULLS FIRST 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {839 113 8   899 113 8   899 113 8   899 113 8   899 113 8   899 113 8
   899 113 8   899 113 8   899 113 15   899 113 15   899 113 15   899 113 15
   899 113 15   899 113 15   899 113 15   899 234 8   963 113 24   979 102 43
   979 102 43   979 102 43   979 102 43   979 102 43   979 102 43   979 102 43
   979 102 43   979 102 43   979 102 43   979 102 48   979 102 48   979 102 48
@@ -3958,13 +4314,13 @@
 do_execsql_test 5.2.2.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  
+      WINDOW win AS (  ORDER BY a NULLS FIRST 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {2048 81 11   2108 81 11   2108 81 11   2690 81 11   2834 81 11   2947 81 11
   2947 81 11   2947 81 11   2947 81 11   4482 74 10   4616 74 10   4844 74 10
   4866 74 10   5287 74 10   5287 74 10   5287 74 10   7421 65 9   7437 65 9
   7717 65 9   8045 65 9   8267 65 9   8400 65 9   8400 65 9   8400 65 9
   8400 65 9   8735 57 8   9329 57 8   9664 57 8   9664 57 8   9664 57 8
@@ -3984,11 +4340,11 @@
              min(c) OVER win,
              count(a) OVER win
       FROM t3
       WINDOW win AS (  PARTITION BY coalesce(a, '') 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {667 158 0   671 250 6   759 158 5   768 113 4   777 113 4   777 113 4
   777 113 4   777 252 4   792 247 12   805 250 6   805 250 6   805 250 6
   805 250 6   805 250 6   805 398 6   822 158 5   822 158 5   822 158 5
   822 158 5   822 346 5   839 113 8   840 247 12   840 247 12   840 247 12
   840 247 12   840 247 12   840 247 12   840 247 12   840 247 12   840 247 12
@@ -4008,11 +4364,11 @@
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
       WINDOW win AS (  PARTITION BY coalesce(a, '') 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {295 1 1   335 1 1   607 1 1   667 1 1   742 1 1   759 1 1   845 1 1
   890 1 1   929 1 1   959 1 1   962 1 1   962 1 1   962 1 1   962 1 1
   962 1 1   962 1 1   962 1 1   962 1 1   962 1 1   1264 1 1   1264 1 1
   1264 1 1   1264 1 1   1264 1 1   1264 1 1   1366 1 1   1366 1 1   1366 1 1
   1366 1 1   1383 1 1   1398 1 1   1406 1 1   1421 1 1   1519 1 1   1519 1 1
@@ -4028,12 +4384,12 @@
 do_execsql_test 5.2.4.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  GROUPS 6 PRECEDING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY a NULLS FIRST GROUPS 6 PRECEDING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {667 158 0   870 158 0   870 158 0   870 158 0   870 158 0   870 355 0
   911 158 7   934 158 7   934 158 7   934 158 7   934 158 7   934 158 7
   934 158 7   934 158 7   934 158 20   934 158 20   934 158 20   934 158 20
   934 158 20   934 158 20   934 158 20   934 158 20   934 158 20   934 158 20
   934 158 20   934 158 20   934 158 20   934 158 26   934 158 26   934 158 26
@@ -4051,12 +4407,12 @@
 do_execsql_test 5.2.4.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  GROUPS 6 PRECEDING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY a NULLS FIRST GROUPS 6 PRECEDING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {1383 1 1   1421 1 1   1651 1 1   1695 1 1   2050 1 1   2050 1 1   3448 7 2
   3732 7 2   4050 7 2   4120 7 2   4136 7 2   4359 7 2   4359 7 2   4359 7 2
   7129 15 3   7135 15 3   7207 15 3   7441 15 3   7447 15 3   7447 15 3
   7593 15 3   7840 15 3   7840 15 3   7840 15 3   7840 15 3   7840 15 3
   7840 15 3   8447 28 4   8599 28 4   9206 28 4   9206 28 4   9206 28 4
@@ -4075,12 +4431,12 @@
 do_execsql_test 5.2.5.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   113 113 1
   113 113 1   158 158 1   160 158 1   160 158 2   223 223 1   224 224 1
   238 234 2   239 234 2   239 238 2   252 250 2   256 252 2   257 247 4
@@ -4098,12 +4454,12 @@
 do_execsql_test 5.2.5.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 4 3   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 10 8
   {} 14 12   {} 15 13   {} 19 17   {} 20 18   {} 21 19   {} 23 21   {} 25 23
   {} 34 29   {} 35 30   {} 36 31   {} 37 32   {} 38 33   {} 38 33   {} 40 34
   {} 41 35   {} 42 36   {} 43 37   {} 43 37   {} 50 42   {} 56 47   {} 60 51
   {} 61 52   {} 62 53   {} 64 55   {} 64 55   {} 66 56   {} 67 57   {} 68 58
@@ -4120,12 +4476,12 @@
 do_execsql_test 5.2.6.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
@@ -4142,12 +4498,12 @@
 do_execsql_test 5.2.6.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 4 3   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 10 8
   {} 11 9   {} 12 10   {} 13 11   {} 14 12   {} 15 13   {} 16 14   {} 17 15
   {} 18 16   {} 19 17   {} 20 18   {} 21 19   {} 22 20   {} 23 21   {} 24 22
   {} 25 23   {} 26 24   {} 31 27   {} 34 29   {} 35 30   {} 36 31   {} 37 32
   {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 42 36   {} 43 37   {} 43 37
@@ -4163,13 +4519,13 @@
 do_execsql_test 5.2.7.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c , b , a 
+      WINDOW win AS (  ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {963 929 6   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
   979 102 83   979 113 80   979 113 81   979 113 82   979 133 79   979 148 78
   979 158 76   979 158 77   979 160 76   979 208 75   979 223 74   979 224 73
   979 234 72   979 238 71   979 239 70   979 247 69   979 250 68   979 252 67
   979 256 66   979 257 65   979 295 64   979 309 64   979 330 62   979 335 61
@@ -4187,13 +4543,338 @@
 do_execsql_test 5.2.7.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c , b , a 
+      WINDOW win AS (  ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {2851 89 89   3778 88 88   4681 87 87   5556 83 83   5574 82 82   5586 81 81
+  5640 84 84   5640 85 85   5640 86 86   7324 80 80   8123 77 77   8129 73 73
+  8129 74 74   8163 78 78   8163 79 79   8940 71 71   8968 75 75   8968 76 76
+  9727 66 66   9745 69 69   9745 70 70   9745 72 72   10504 65 65
+  10504 67 67   10504 68 68   11215 64 64   11844 62 62   11920 63 63
+  13274 60 60   13274 61 61   13897 58 58   13903 57 57   13925 56 56
+  13937 55 55   13941 59 59   15203 53 53   15241 54 54   15832 52 52
+  17100 48 48   17104 46 46   17104 47 47   17106 45 45   17126 49 49
+  17126 50 50   17126 51 51   17569 42 42   17733 44 44   18176 43 43
+  18597 40 40   18597 41 41   18952 37 37   18996 39 39   19395 38 38
+  19760 35 35   19788 36 36   20492 32 32   20492 33 33   20498 30 30
+  20536 34 34   20833 29 29   20871 28 28   20891 31 31   21180 27 27
+  21752 23 23   21830 26 26   22025 21 21   22087 22 22   22087 24 24
+  22087 25 25   22278 20 20   22316 19 19   22549 15 15   22557 14 14
+  22573 17 17   22573 18 18   22706 10 10   22796 11 11   22796 12 12
+  22796 13 13   22796 16 16   23022 4 4   23042 2 2   23042 3 3   23042 9 9
+  23155 1 1   23155 5 5   23155 6 6   23155 7 7   23155 8 8}
+
+do_execsql_test 5.2.8.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {963 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 83   979 102 83
+  979 102 83   979 102 83   979 102 83   979 102 83   979 113 82}
+
+do_execsql_test 5.2.8.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {22176 1 1   22192 1 1   22196 1 1   22226 1 1   22244 1 1   22256 1 1
+  22310 1 1   22316 1 1   22316 1 1   22350 1 1   22378 1 1   22396 1 1
+  22444 1 1   22450 1 1   22472 1 1   22484 1 1   22488 1 1   22488 1 1
+  22522 1 1   22526 1 1   22526 1 1   22528 1 1   22548 1 1   22712 1 1
+  22734 1 1   22756 1 1   22756 1 1   22762 1 1   22762 1 1   22800 1 1
+  22800 1 1   22820 1 1   22846 1 1   22860 1 1   22898 1 1   22908 1 1
+  22916 1 1   22932 1 1   23022 1 1   23042 1 1   23042 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1
+  23155 1 1   23155 1 1   23155 1 1   23155 1 1   23155 1 1}
+
+do_execsql_test 5.2.9.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {667 158 0   870 113 8   870 158 0   870 158 0   870 158 0   870 158 0
+  870 355 0   899 113 8   899 113 8   899 113 8   899 113 8   899 113 8
+  899 113 8   899 113 8   899 113 15   899 113 15   899 113 15   899 113 15
+  899 113 15   899 113 15   899 113 15   899 158 8   963 113 24   979 102 43
+  979 102 43   979 102 43   979 102 43   979 102 43   979 102 43   979 102 43
+  979 102 43   979 102 43   979 102 43   979 102 48   979 102 48   979 102 48
+  979 102 48   979 102 48   979 102 55   979 102 55   979 102 55   979 102 55
+  979 102 55   979 102 55   979 102 55   979 102 61   979 102 61   979 102 61
+  979 102 61   979 102 61   979 102 61   979 102 74   979 102 74   979 102 74
+  979 102 74   979 102 74   979 102 74   979 102 74   979 102 74   979 102 74
+  979 102 74   979 102 74   979 102 74   979 102 74   979 102 82   979 102 82
+  979 102 82   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 113 24   979 113 24   979 113 24   979 113 24   979 113 24   979 113 24
+  979 113 24   979 113 24   979 113 32   979 113 32   979 113 32   979 113 32
+  979 113 32   979 113 32   979 113 32   979 113 32   979 113 43}
+
+do_execsql_test 5.2.9.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {1383 84 11   1421 84 11   1651 84 11   1695 84 11   2050 84 11   2050 84 11
+  4098 75 10   4158 75 10   4158 75 10   4740 75 10   4884 75 10   4997 75 10
+  4997 75 10   4997 75 10   4997 75 10   6532 68 9   6666 68 9   6894 68 9
+  6916 68 9   7337 68 9   7337 68 9   7337 68 9   9471 59 8   9487 59 8
+  9767 59 8   10095 59 8   10317 59 8   10450 59 8   10450 59 8   10450 59 8
+  10450 59 8   10785 51 7   11379 51 7   11714 51 7   11714 51 7   11714 51 7
+  11714 51 7   11714 51 7   11714 51 7   12009 40 6   12381 40 6   12676 40 6
+  12676 40 6   12676 40 6   12676 40 6   12676 40 6   12676 40 6   12676 40 6
+  12676 40 6   12676 40 6   13418 35 5   13566 35 5   14082 35 5   14195 35 5
+  14195 35 5   15040 28 4   15154 28 4   15999 28 4   15999 28 4   15999 28 4
+  15999 28 4   15999 28 4   16606 22 3   16758 22 3   17365 22 3   17365 22 3
+  17365 22 3   17365 22 3   20135 9 2   20141 9 2   20213 9 2   20447 9 2
+  20453 9 2   20453 9 2   20599 9 2   20846 9 2   20846 9 2   20846 9 2
+  20846 9 2   20846 9 2   20846 9 2   22244 1 1   22528 1 1   22846 1 1
+  22916 1 1   22932 1 1   23155 1 1   23155 1 1   23155 1 1}
+
+do_execsql_test 5.2.10.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {667 158 0   671 250 6   759 158 5   768 113 4   777 113 4   777 113 4
+  777 113 4   777 252 4   792 247 12   805 250 6   805 250 6   805 250 6
+  805 250 6   805 250 6   805 398 6   822 158 5   822 158 5   822 158 5
+  822 158 5   822 346 5   839 113 8   840 247 12   840 247 12   840 247 12
+  840 247 12   840 247 12   840 247 12   840 247 12   840 247 12   840 247 12
+  840 247 12   840 247 12   840 393 12   845 224 6   870 102 10   870 158 0
+  870 158 0   870 158 0   870 158 0   870 355 0   899 113 8   899 113 8
+  899 113 8   899 113 8   899 113 8   899 113 8   899 113 8   899 234 8
+  911 223 7   929 148 7   934 223 7   934 223 7   934 223 7   934 223 7
+  934 223 7   934 223 7   934 239 7   938 102 10   938 102 10   938 102 10
+  938 102 10   938 102 10   938 102 10   938 102 10   938 102 10   938 102 10
+  938 148 7   938 148 7   938 148 7   938 148 7   938 148 7   938 148 7
+  938 160 7   938 208 10   959 224 6   959 224 6   959 224 6   959 224 6
+  959 224 6   959 238 6   963 133 8   979 133 8   979 133 8   979 133 8
+  979 133 8   979 133 8   979 133 8   979 133 8   979 330 8}
+
+do_execsql_test 5.2.10.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {295 1 1   335 1 1   607 1 1   667 1 1   742 1 1   759 1 1   845 1 1
+  890 1 1   929 1 1   959 1 1   962 1 1   962 1 1   962 1 1   962 1 1
+  962 1 1   962 1 1   962 1 1   962 1 1   962 1 1   1264 1 1   1264 1 1
+  1264 1 1   1264 1 1   1264 1 1   1264 1 1   1366 1 1   1366 1 1   1366 1 1
+  1366 1 1   1383 1 1   1398 1 1   1406 1 1   1421 1 1   1519 1 1   1519 1 1
+  1535 1 1   1651 1 1   1669 1 1   1682 1 1   1695 1 1   1804 1 1   1804 1 1
+  1804 1 1   1804 1 1   1804 1 1   1897 1 1   1919 1 1   2000 1 1   2048 1 1
+  2050 1 1   2050 1 1   2070 1 1   2086 1 1   2108 1 1   2108 1 1   2134 1 1
+  2150 1 1   2309 1 1   2309 1 1   2309 1 1   2340 1 1   2340 1 1   2340 1 1
+  2430 1 1   2690 1 1   2758 1 1   2770 1 1   2776 1 1   2834 1 1   2848 1 1
+  2947 1 1   2947 1 1   2947 1 1   2947 1 1   2980 1 1   3082 1 1   3088 1 1
+  3088 1 1   3113 1 1   3113 1 1   3113 1 1   3113 1 1   3234 1 1   3481 1 1
+  3481 1 1   3481 1 1   3481 1 1   3481 1 1   3481 1 1}
+
+do_execsql_test 5.2.11.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST GROUPS 6 PRECEDING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {911 223 7   934 158 26   934 158 26   934 158 26   934 158 26   934 158 26
+  934 158 33   934 223 7   934 223 7   934 223 7   934 223 7   934 223 7
+  934 223 7   934 223 20   934 223 20   934 223 20   934 223 20   934 223 20
+  934 223 20   934 223 20   934 223 20   934 223 20   934 223 20   934 223 20
+  934 223 20   934 223 20   934 223 26   934 239 7   959 102 49   959 102 49
+  959 102 49   959 102 49   959 102 49   959 102 49   959 102 49   959 102 49
+  959 102 49   959 102 49   959 102 57   959 102 57   959 102 57   959 102 57
+  959 102 57   959 102 57   959 102 57   959 102 57   959 113 38   959 113 38
+  959 113 38   959 113 38   959 113 49   959 158 33   959 158 33   959 158 33
+  959 158 33   959 158 33   959 158 33   959 158 38   963 102 58   979 102 49
+  979 102 49   979 102 49   979 102 49   979 102 49   979 102 49   979 102 52
+  979 102 52   979 102 52   979 102 52   979 102 52   979 102 52   979 102 52
+  979 102 55   979 102 55   979 102 55   979 102 55   979 102 55   979 102 55
+  979 102 55   979 102 55   979 102 55   979 102 58   979 102 58   979 102 58
+  979 102 58   979 102 58   979 102 58   979 102 58   979 102 58}
+
+do_execsql_test 5.2.11.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST GROUPS 6 PRECEDING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {1398 1 1   1682 1 1   2000 1 1   2070 1 1   2086 1 1   2309 1 1   2309 1 1
+  2309 1 1   5079 9 2   5085 9 2   5157 9 2   5391 9 2   5397 9 2   5397 9 2
+  5543 9 2   5790 9 2   5790 9 2   5790 9 2   5790 9 2   5790 9 2   5790 9 2
+  6397 22 3   6549 22 3   7156 22 3   7156 22 3   7156 22 3   7156 22 3
+  8001 28 4   8115 28 4   8960 28 4   8960 28 4   8960 28 4   8960 28 4
+  8960 28 4   9702 35 5   9850 35 5   10366 35 5   10479 35 5   10479 35 5
+  10774 40 6   11146 40 6   11441 40 6   11441 40 6   11441 40 6   11441 40 6
+  11441 40 6   11441 40 6   11441 40 6   11441 40 6   11441 40 6   11563 68 9
+  11697 68 9   11776 51 7   11925 68 9   11947 68 9   12368 68 9   12368 68 9
+  12368 68 9   12370 51 7   12530 59 8   12546 59 8   12705 51 7   12705 51 7
+  12705 51 7   12705 51 7   12705 51 7   12705 51 7   12826 59 8
+  13050 75 10   13110 75 10   13110 75 10   13154 59 8   13376 59 8
+  13509 59 8   13509 59 8   13509 59 8   13509 59 8   13528 84 11
+  13566 84 11   13692 75 10   13796 84 11   13836 75 10   13840 84 11
+  13949 75 10   13949 75 10   13949 75 10   13949 75 10   14195 84 11
+  14195 84 11}
+
+do_execsql_test 5.2.12.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   113 113 1
+  113 113 1   158 158 1   160 158 1   160 158 2   223 223 1   224 224 1
+  238 234 2   239 234 2   239 238 2   252 250 2   256 252 2   257 247 4
+  257 247 4   257 250 3   335 330 2   336 330 2   336 335 2   355 354 1
+  355 354 2   355 355 1   399 393 3   399 393 3   399 393 3   399 393 3
+  399 393 4   480 480 1   480 480 1   572 572 1   574 574 1   618 618 1
+  618 618 1   633 629 2   634 627 3   634 627 3   634 627 4   634 629 3
+  667 667 1   670 667 2   671 667 2   671 667 2   671 667 3   711 711 1
+  711 711 1   716 705 2   726 726 1   730 730 1   762 762 1   768 759 3
+  768 762 2   768 762 2   792 790 2   792 790 2   794 786 3   794 786 3
+  844 839 4   845 839 4   845 839 4   845 839 4   845 839 4   870 870 1
+  870 870 1   870 870 2   934 934 1   938 929 3   938 934 2   938 934 2
+  959 959 1   963 963 1}
+
+do_execsql_test 5.2.12.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 4 3   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 10 8
+  {} 14 12   {} 15 13   {} 19 17   {} 20 18   {} 21 19   {} 23 21   {} 25 23
+  {} 34 29   {} 35 30   {} 36 31   {} 37 32   {} 38 33   {} 38 33   {} 40 34
+  {} 41 35   {} 42 36   {} 43 37   {} 43 37   {} 50 42   {} 56 47   {} 60 51
+  {} 61 52   {} 62 53   {} 64 55   {} 64 55   {} 66 56   {} 67 57   {} 68 58
+  {} 69 59   {} 70 60   {} 71 61   {} 72 62   {} 78 67   {} 78 67   {} 78 67
+  {} 81 68   {} 82 69   {} 83 70   {} 85 72   {} 85 72   {} 89 75   113 2 2
+  113 2 2   223 11 9   239 12 10   239 13 11   257 18 16   335 22 20
+  335 24 22   355 27 25   355 27 25   504 16 14   504 17 15   705 58 49
+  710 26 24   711 57 48   711 59 50   759 63 54   929 84 71   959 88 74
+  963 87 73   1185 32 28   1185 32 28   1191 29 26   1191 29 26   1334 51 43
+  1334 55 46   1338 52 44   1338 52 44   1584 31 27   1678 77 66   1684 73 63
+  1684 73 63   1885 48 40   1889 46 39   1889 46 39   1891 45 38   1891 49 41
+  2005 54 45   2523 75 64   2523 76 65}
+
+do_execsql_test 5.2.13.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   113 113 1
+  113 113 1   158 158 0   158 158 1   355 355 0   355 355 1   393 393 1
+  393 393 1   399 399 0   399 399 1   480 480 1   480 480 1   618 618 1
+  618 618 1   629 629 0   629 629 1   667 667 0   667 667 1   768 768 1
+  768 768 1   839 839 1   839 839 1   870 870 1   870 870 1   870 870 2
+  938 938 1   938 938 1}
+
+do_execsql_test 5.2.13.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 4 3   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 10 8
+  {} 11 9   {} 12 10   {} 13 11   {} 14 12   {} 15 13   {} 16 14   {} 17 15
+  {} 18 16   {} 19 17   {} 20 18   {} 21 19   {} 22 20   {} 23 21   {} 24 22
+  {} 25 23   {} 26 24   {} 31 27   {} 34 29   {} 35 30   {} 36 31   {} 37 32
+  {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 42 36   {} 43 37   {} 43 37
+  {} 45 38   {} 48 40   {} 49 41   {} 50 42   {} 51 43   {} 54 45   {} 55 46
+  {} 56 47   {} 57 48   {} 58 49   {} 59 50   {} 60 51   {} 61 52   {} 62 53
+  {} 63 54   {} 64 55   {} 64 55   {} 66 56   {} 67 57   {} 68 58   {} 69 59
+  {} 70 60   {} 71 61   {} 72 62   {} 75 64   {} 76 65   {} 77 66   {} 78 67
+  {} 78 67   {} 78 67   {} 81 68   {} 82 69   {} 83 70   {} 84 71   {} 85 72
+  {} 85 72   {} 87 73   {} 88 74   {} 89 75   113 2 2   113 2 2   355 27 25
+  355 27 25   393 29 26   393 29 26   399 32 28   399 32 28   629 46 39
+  629 46 39   667 52 44   667 52 44   839 73 63   839 73 63}
+
+do_execsql_test 5.2.14.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {963 929 6   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 83   979 113 80   979 113 81   979 113 82   979 133 79   979 148 78
+  979 158 76   979 158 77   979 160 76   979 208 75   979 223 74   979 224 73
+  979 234 72   979 238 71   979 239 70   979 247 69   979 250 68   979 252 67
+  979 256 66   979 257 65   979 295 64   979 309 63   979 330 63   979 335 61
+  979 336 60   979 346 59   979 354 58   979 355 56   979 355 58   979 393 55
+  979 393 56   979 398 54   979 399 52   979 399 53   979 412 52   979 421 51
+  979 430 50   979 443 49   979 480 47   979 480 48   979 572 46   979 574 46
+  979 607 44   979 618 42   979 618 43   979 627 41   979 629 40   979 629 40
+  979 633 39   979 634 38   979 652 37   979 660 36   979 667 34   979 667 35
+  979 670 34   979 671 33   979 683 32   979 705 31   979 711 30   979 716 29
+  979 726 28   979 730 27   979 759 26   979 762 25   979 768 23   979 768 24
+  979 777 22   979 786 21   979 790 20   979 792 19   979 794 18   979 805 17
+  979 822 16   979 839 15   979 839 15   979 840 13   979 844 12   979 845 11
+  979 870 8   979 870 9   979 870 10   979 899 8   979 911 7}
+
+do_execsql_test 5.2.14.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE CURRENT ROW  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {2851 89 89   3778 88 88   4681 87 87   5556 83 83   5574 82 82   5586 81 81
   5640 84 84   5640 85 85   5640 86 86   7324 80 80   8123 77 77   8129 73 73
   8129 74 74   8163 78 78   8163 79 79   8940 71 71   8968 75 75   8968 76 76
   9727 66 66   9745 69 69   9745 70 70   9745 72 72   10504 65 65
   10504 67 67   10504 68 68   11215 64 64   11844 62 62   11920 63 63
@@ -4214,11 +4895,11 @@
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
       WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
@@ -4235,11 +4916,11 @@
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
       WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
@@ -4254,13 +4935,13 @@
 do_execsql_test 5.3.2.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  
+      WINDOW win AS (  ORDER BY a NULLS FIRST 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   899 113 9   899 113 9   899 113 9   899 113 9
   899 113 9   899 113 9   899 113 9   899 113 16   899 113 16   899 113 16
   899 113 16   899 113 16   899 113 16   899 113 16   899 113 16   899 113 16
   979 102 44   979 102 44   979 102 44   979 102 44   979 102 44   979 102 49
@@ -4278,13 +4959,13 @@
 do_execsql_test 5.3.2.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  
+      WINDOW win AS (  ORDER BY a NULLS FIRST 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 81 11   {} 81 11   {} 81 11   {} 81 11   {} 81 11   {} 81 11   {} 81 11
   {} 81 11   {} 81 11   2947 74 10   2947 74 10   2947 74 10   2947 74 10
   2947 74 10   2947 74 10   2947 74 10   5287 65 9   5287 65 9   5287 65 9
   5287 65 9   5287 65 9   5287 65 9   5287 65 9   5287 65 9   5287 65 9
   8400 57 8   8400 57 8   8400 57 8   8400 57 8   8400 57 8   8400 57 8
@@ -4304,11 +4985,11 @@
              min(c) OVER win,
              count(a) OVER win
       FROM t3
       WINDOW win AS (  PARTITION BY coalesce(a, '') 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
@@ -4326,11 +5007,11 @@
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
       WINDOW win AS (  PARTITION BY coalesce(a, '') 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
@@ -4345,12 +5026,12 @@
 do_execsql_test 5.3.4.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  GROUPS 6 PRECEDING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY a NULLS FIRST GROUPS 6 PRECEDING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   870 158 0
   870 158 0   870 158 0   870 158 0   870 158 0   870 158 0   870 158 0
   870 158 0   934 158 8   934 158 8   934 158 8   934 158 8   934 158 8
   934 158 8   934 158 8   934 158 8   934 158 8   934 158 8   934 158 8
   934 158 8   934 158 8   934 158 21   934 158 21   934 158 21   934 158 21
@@ -4368,12 +5049,12 @@
 do_execsql_test 5.3.4.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  GROUPS 6 PRECEDING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY a NULLS FIRST GROUPS 6 PRECEDING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   2050 7 2   2050 7 2
   2050 7 2   2050 7 2   2050 7 2   2050 7 2   2050 7 2   2050 7 2   4359 15 3
   4359 15 3   4359 15 3   4359 15 3   4359 15 3   4359 15 3   4359 15 3
   4359 15 3   4359 15 3   4359 15 3   4359 15 3   4359 15 3   4359 15 3
   7840 28 4   7840 28 4   7840 28 4   7840 28 4   7840 28 4   7840 28 4
@@ -4391,12 +5072,12 @@
 do_execsql_test 5.3.5.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   158 158 1   160 160 1   160 160 1   223 223 1   224 224 1
@@ -4414,12 +5095,12 @@
 do_execsql_test 5.3.5.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 2 2   {} 2 2   {} 4 3   {} 5 4   {} 6 5   {} 6 5   {} 8 6
   {} 9 7   {} 10 8   {} 14 12   {} 15 13   {} 19 17   {} 20 18   {} 21 19
   {} 23 21   {} 25 23   {} 27 25   {} 27 25   {} 34 29   {} 35 30   {} 36 31
   {} 37 32   {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 42 36   {} 43 37
   {} 43 37   {} 50 42   {} 56 47   {} 60 51   {} 61 52   {} 62 53   {} 64 55
@@ -4436,12 +5117,12 @@
 do_execsql_test 5.3.6.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
@@ -4457,12 +5138,12 @@
 do_execsql_test 5.3.6.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 2 2   {} 2 2   {} 4 3   {} 5 4   {} 6 5   {} 6 5   {} 8 6
   {} 9 7   {} 10 8   {} 11 9   {} 12 10   {} 13 11   {} 14 12   {} 15 13
   {} 16 14   {} 17 15   {} 18 16   {} 19 17   {} 20 18   {} 21 19   {} 22 20
   {} 23 21   {} 24 22   {} 25 23   {} 26 24   {} 27 25   {} 27 25   {} 29 26
   {} 29 26   {} 31 27   {} 32 28   {} 32 28   {} 34 29   {} 35 30   {} 36 31
@@ -4478,13 +5159,13 @@
 do_execsql_test 5.3.7.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c , b , a 
+      WINDOW win AS (  ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {963 929 6   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
   979 102 83   979 113 80   979 113 81   979 113 82   979 133 79   979 148 78
   979 158 76   979 158 77   979 160 76   979 208 75   979 223 74   979 224 73
   979 234 72   979 238 71   979 239 70   979 247 69   979 250 68   979 252 67
   979 256 66   979 257 65   979 295 64   979 309 64   979 330 62   979 335 61
@@ -4502,13 +5183,328 @@
 do_execsql_test 5.3.7.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c , b , a 
+      WINDOW win AS (  ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {2851 89 89   3778 88 88   4681 87 87   5556 83 83   5574 82 82   5586 81 81
+  5640 84 84   5640 85 85   5640 86 86   7324 80 80   8123 77 77   8129 73 73
+  8129 74 74   8163 78 78   8163 79 79   8940 71 71   8968 75 75   8968 76 76
+  9727 66 66   9745 69 69   9745 70 70   9745 72 72   10504 65 65
+  10504 67 67   10504 68 68   11215 64 64   11844 62 62   11920 63 63
+  13274 60 60   13274 61 61   13897 58 58   13903 57 57   13925 56 56
+  13937 55 55   13941 59 59   15203 53 53   15241 54 54   15832 52 52
+  17100 48 48   17104 46 46   17104 47 47   17106 45 45   17126 49 49
+  17126 50 50   17126 51 51   17569 42 42   17733 44 44   18176 43 43
+  18597 40 40   18597 41 41   18952 37 37   18996 39 39   19395 38 38
+  19760 35 35   19788 36 36   20492 32 32   20492 33 33   20498 30 30
+  20536 34 34   20833 29 29   20871 28 28   20891 31 31   21180 27 27
+  21752 23 23   21830 26 26   22025 21 21   22087 22 22   22087 24 24
+  22087 25 25   22278 20 20   22316 19 19   22549 15 15   22557 14 14
+  22573 17 17   22573 18 18   22706 10 10   22796 11 11   22796 12 12
+  22796 13 13   22796 16 16   23022 4 4   23042 2 2   23042 3 3   23042 9 9
+  23155 1 1   23155 5 5   23155 6 6   23155 7 7   23155 8 8}
+
+do_execsql_test 5.3.8.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0}
+
+do_execsql_test 5.3.8.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1}
+
+do_execsql_test 5.3.9.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   870 158 0
+  870 158 0   870 158 0   870 158 0   870 158 0   870 158 0   870 158 0
+  870 158 0   870 158 0   899 113 9   899 113 9   899 113 9   899 113 9
+  899 113 9   899 113 9   899 113 9   899 113 16   899 113 16   899 113 16
+  899 113 16   899 113 16   899 113 16   899 113 16   899 113 16   899 113 16
+  979 102 44   979 102 44   979 102 44   979 102 44   979 102 44   979 102 49
+  979 102 49   979 102 49   979 102 49   979 102 49   979 102 49   979 102 49
+  979 102 56   979 102 56   979 102 56   979 102 56   979 102 56   979 102 56
+  979 102 62   979 102 62   979 102 62   979 102 62   979 102 62   979 102 62
+  979 102 62   979 102 62   979 102 62   979 102 62   979 102 62   979 102 62
+  979 102 62   979 102 75   979 102 75   979 102 75   979 102 75   979 102 75
+  979 102 75   979 102 75   979 102 75   979 113 25   979 113 25   979 113 25
+  979 113 25   979 113 25   979 113 25   979 113 25   979 113 25   979 113 33
+  979 113 33   979 113 33   979 113 33   979 113 33   979 113 33   979 113 33
+  979 113 33   979 113 33   979 113 33   979 113 33}
+
+do_execsql_test 5.3.9.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 84 11   {} 84 11   {} 84 11   {} 84 11   {} 84 11   {} 84 11
+  2050 75 10   2050 75 10   2050 75 10   2050 75 10   2050 75 10   2050 75 10
+  2050 75 10   2050 75 10   2050 75 10   4997 68 9   4997 68 9   4997 68 9
+  4997 68 9   4997 68 9   4997 68 9   4997 68 9   7337 59 8   7337 59 8
+  7337 59 8   7337 59 8   7337 59 8   7337 59 8   7337 59 8   7337 59 8
+  7337 59 8   10450 51 7   10450 51 7   10450 51 7   10450 51 7   10450 51 7
+  10450 51 7   10450 51 7   10450 51 7   11714 40 6   11714 40 6   11714 40 6
+  11714 40 6   11714 40 6   11714 40 6   11714 40 6   11714 40 6   11714 40 6
+  11714 40 6   11714 40 6   12676 35 5   12676 35 5   12676 35 5   12676 35 5
+  12676 35 5   14195 28 4   14195 28 4   14195 28 4   14195 28 4   14195 28 4
+  14195 28 4   14195 28 4   15999 22 3   15999 22 3   15999 22 3   15999 22 3
+  15999 22 3   15999 22 3   17365 9 2   17365 9 2   17365 9 2   17365 9 2
+  17365 9 2   17365 9 2   17365 9 2   17365 9 2   17365 9 2   17365 9 2
+  17365 9 2   17365 9 2   17365 9 2   20846 1 1   20846 1 1   20846 1 1
+  20846 1 1   20846 1 1   20846 1 1   20846 1 1   20846 1 1}
+
+do_execsql_test 5.3.10.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0}
+
+do_execsql_test 5.3.10.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1}
+
+do_execsql_test 5.3.11.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST GROUPS 6 PRECEDING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   934 158 27   934 158 27   934 158 27   934 158 27   934 158 27
+  934 158 27   934 158 27   934 223 8   934 223 8   934 223 8   934 223 8
+  934 223 8   934 223 8   934 223 8   934 223 8   934 223 8   934 223 8
+  934 223 8   934 223 8   934 223 8   934 223 21   934 223 21   934 223 21
+  934 223 21   934 223 21   934 223 21   959 102 50   959 102 50   959 102 50
+  959 102 50   959 102 50   959 102 50   959 102 50   959 102 50   959 102 50
+  959 102 50   959 102 50   959 102 50   959 102 50   959 102 50   959 102 50
+  959 102 50   959 102 50   959 113 39   959 113 39   959 113 39   959 113 39
+  959 113 39   959 113 39   959 113 39   959 113 39   959 113 39   959 113 39
+  959 113 39   959 158 34   959 158 34   959 158 34   959 158 34   959 158 34
+  979 102 46   979 102 46   979 102 46   979 102 46   979 102 46   979 102 46
+  979 102 46   979 102 47   979 102 47   979 102 47   979 102 47   979 102 47
+  979 102 47   979 102 47   979 102 47   979 102 47   979 102 49   979 102 49
+  979 102 49   979 102 49   979 102 49   979 102 49}
+
+do_execsql_test 5.3.11.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST GROUPS 6 PRECEDING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  2309 9 2   2309 9 2   2309 9 2   2309 9 2   2309 9 2   2309 9 2   2309 9 2
+  2309 9 2   2309 9 2   2309 9 2   2309 9 2   2309 9 2   2309 9 2   5790 22 3
+  5790 22 3   5790 22 3   5790 22 3   5790 22 3   5790 22 3   7156 28 4
+  7156 28 4   7156 28 4   7156 28 4   7156 28 4   7156 28 4   7156 28 4
+  8960 35 5   8960 35 5   8960 35 5   8960 35 5   8960 35 5   10028 68 9
+  10028 68 9   10028 68 9   10028 68 9   10028 68 9   10028 68 9   10028 68 9
+  10396 59 8   10396 59 8   10396 59 8   10396 59 8   10396 59 8   10396 59 8
+  10396 59 8   10396 59 8   10396 59 8   10479 40 6   10479 40 6   10479 40 6
+  10479 40 6   10479 40 6   10479 40 6   10479 40 6   10479 40 6   10479 40 6
+  10479 40 6   10479 40 6   11002 75 10   11002 75 10   11002 75 10
+  11002 75 10   11002 75 10   11002 75 10   11002 75 10   11002 75 10
+  11002 75 10   11441 51 7   11441 51 7   11441 51 7   11441 51 7
+  11441 51 7   11441 51 7   11441 51 7   11441 51 7   12145 84 11
+  12145 84 11   12145 84 11   12145 84 11   12145 84 11   12145 84 11}
+
+do_execsql_test 5.3.12.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   158 158 1   160 160 1   160 160 1   223 223 1   224 224 1
+  238 234 2   239 234 2   239 238 2   252 250 2   256 252 2   257 247 4
+  257 247 4   257 250 3   335 330 2   336 330 2   336 335 2   354 354 1
+  354 354 1   355 355 1   398 393 3   398 393 3   399 393 3   399 398 2
+  399 398 2   572 572 1   574 574 1   633 629 2   634 627 3   634 627 3
+  634 627 3   634 629 3   667 667 1   670 667 2   671 667 2   671 670 2
+  671 670 2   711 711 1   711 711 1   716 705 2   726 726 1   730 730 1
+  762 762 1   762 762 1   762 762 1   768 759 3   792 790 2   792 790 2
+  794 786 3   794 786 3   844 839 4   845 839 4   845 839 4   845 840 3
+  845 840 3   934 934 1   934 934 1   934 934 1   938 929 3   959 959 1
+  963 963 1}
+
+do_execsql_test 5.3.12.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 2 2   {} 2 2   {} 4 3   {} 5 4   {} 6 5   {} 6 5   {} 8 6
+  {} 9 7   {} 10 8   {} 14 12   {} 15 13   {} 19 17   {} 20 18   {} 21 19
+  {} 23 21   {} 25 23   {} 27 25   {} 27 25   {} 34 29   {} 35 30   {} 36 31
+  {} 37 32   {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 42 36   {} 43 37
+  {} 43 37   {} 50 42   {} 56 47   {} 60 51   {} 61 52   {} 62 53   {} 64 55
+  {} 64 55   {} 66 56   {} 67 57   {} 68 58   {} 69 59   {} 70 60   {} 71 61
+  {} 72 62   {} 78 67   {} 78 67   {} 78 67   {} 81 68   {} 82 69   {} 83 70
+  {} 85 72   {} 85 72   {} 89 75   223 11 9   239 12 10   239 13 11
+  257 18 16   335 22 20   335 24 22   504 16 14   504 17 15   671 52 44
+  671 52 44   705 58 49   710 26 24   711 57 48   711 59 50   759 63 54
+  786 32 28   786 32 28   798 29 26   798 29 26   845 73 63   845 73 63
+  929 84 71   959 88 74   963 87 73   1260 46 39   1260 46 39   1334 51 43
+  1334 55 46   1584 31 27   1678 77 66   1885 48 40   1891 45 38   1891 49 41
+  2005 54 45   2523 75 64   2523 76 65}
+
+do_execsql_test 5.3.13.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0
+  {} {} 0   {} {} 0   {} {} 0   {} {} 0   {} {} 0}
+
+do_execsql_test 5.3.13.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 2 2   {} 2 2   {} 4 3   {} 5 4   {} 6 5   {} 6 5   {} 8 6
+  {} 9 7   {} 10 8   {} 11 9   {} 12 10   {} 13 11   {} 14 12   {} 15 13
+  {} 16 14   {} 17 15   {} 18 16   {} 19 17   {} 20 18   {} 21 19   {} 22 20
+  {} 23 21   {} 24 22   {} 25 23   {} 26 24   {} 27 25   {} 27 25   {} 29 26
+  {} 29 26   {} 31 27   {} 32 28   {} 32 28   {} 34 29   {} 35 30   {} 36 31
+  {} 37 32   {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 42 36   {} 43 37
+  {} 43 37   {} 45 38   {} 46 39   {} 46 39   {} 48 40   {} 49 41   {} 50 42
+  {} 51 43   {} 52 44   {} 52 44   {} 54 45   {} 55 46   {} 56 47   {} 57 48
+  {} 58 49   {} 59 50   {} 60 51   {} 61 52   {} 62 53   {} 63 54   {} 64 55
+  {} 64 55   {} 66 56   {} 67 57   {} 68 58   {} 69 59   {} 70 60   {} 71 61
+  {} 72 62   {} 73 63   {} 73 63   {} 75 64   {} 76 65   {} 77 66   {} 78 67
+  {} 78 67   {} 78 67   {} 81 68   {} 82 69   {} 83 70   {} 84 71   {} 85 72
+  {} 85 72   {} 87 73   {} 88 74   {} 89 75}
+
+do_execsql_test 5.3.14.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {963 929 6   979 102 82   979 102 82   979 102 82   979 102 82   979 102 82
+  979 102 83   979 113 80   979 113 81   979 113 82   979 133 79   979 148 78
+  979 158 76   979 158 77   979 160 76   979 208 75   979 223 74   979 224 73
+  979 234 72   979 238 71   979 239 70   979 247 69   979 250 68   979 252 67
+  979 256 66   979 257 65   979 295 64   979 309 63   979 330 63   979 335 61
+  979 336 60   979 346 59   979 354 58   979 355 56   979 355 58   979 393 55
+  979 393 56   979 398 54   979 399 52   979 399 53   979 412 52   979 421 51
+  979 430 50   979 443 49   979 480 47   979 480 48   979 572 46   979 574 46
+  979 607 44   979 618 42   979 618 43   979 627 41   979 629 40   979 629 40
+  979 633 39   979 634 38   979 652 37   979 660 36   979 667 34   979 667 35
+  979 670 34   979 671 33   979 683 32   979 705 31   979 711 30   979 716 29
+  979 726 28   979 730 27   979 759 26   979 762 25   979 768 23   979 768 24
+  979 777 22   979 786 21   979 790 20   979 792 19   979 794 18   979 805 17
+  979 822 16   979 839 15   979 839 15   979 840 13   979 844 12   979 845 11
+  979 870 8   979 870 9   979 870 10   979 899 8   979 911 7}
+
+do_execsql_test 5.3.14.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE GROUP  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {2851 89 89   3778 88 88   4681 87 87   5556 83 83   5574 82 82   5586 81 81
   5640 84 84   5640 85 85   5640 86 86   7324 80 80   8123 77 77   8129 73 73
   8129 74 74   8163 78 78   8163 79 79   8940 71 71   8968 75 75   8968 76 76
   9727 66 66   9745 69 69   9745 70 70   9745 72 72   10504 65 65
   10504 67 67   10504 68 68   11215 64 64   11844 62 62   11920 63 63
@@ -4529,11 +5525,11 @@
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
       WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {102 102 1   113 113 1   113 113 1   133 133 1   148 148 1   158 158 0
   158 158 1   160 160 1   208 208 1   223 223 1   224 224 1   234 234 1
   238 238 1   239 239 1   247 247 1   250 250 1   252 252 1   256 256 1
   257 257 1   295 295 1   309 309 1   330 330 1   335 335 1   336 336 1
   346 346 1   354 354 1   355 355 0   355 355 1   393 393 1   393 393 1
@@ -4552,11 +5548,11 @@
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
       WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
@@ -4571,13 +5567,13 @@
 do_execsql_test 5.4.2.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  
+      WINDOW win AS (  ORDER BY a NULLS FIRST 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {113 113 1   234 234 1   257 257 1   336 336 1   354 354 1   768 768 1
   839 839 1   839 839 1   899 113 10   899 113 10   899 113 10   899 113 10
   899 113 10   899 113 10   899 113 10   899 113 17   899 113 17   899 113 17
   899 113 17   899 113 17   899 113 17   899 113 17   899 899 1   963 113 17
   979 102 34   979 102 45   979 102 45   979 102 45   979 102 45   979 102 45
@@ -4595,13 +5591,13 @@
 do_execsql_test 5.4.2.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  
+      WINDOW win AS (  ORDER BY a NULLS FIRST 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 81 11   {} 81 11   {} 81 11   {} 81 11   113 81 11   257 81 11
   839 81 11   839 81 11   899 81 11   2947 74 10   2947 74 10   2947 74 10
   3368 74 10   3390 74 10   3618 74 10   3752 74 10   5287 65 9   5287 65 9
   5287 65 9   5287 65 9   5420 65 9   5642 65 9   5970 65 9   6250 65 9
   6266 65 9   8400 57 8   8400 57 8   8400 57 8   8400 57 8   8400 57 8
@@ -4621,11 +5617,11 @@
              min(c) OVER win,
              count(a) OVER win
       FROM t3
       WINDOW win AS (  PARTITION BY coalesce(a, '') 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {102 102 1   113 113 1   113 113 1   133 133 1   148 148 1   158 158 0
   158 158 1   160 160 1   208 208 1   223 223 1   224 224 1   234 234 1
   238 238 1   239 239 1   247 247 1   250 250 1   252 252 1   256 256 1
   257 257 1   295 295 1   309 309 1   330 330 1   335 335 1   336 336 1
   346 346 1   354 354 1   355 355 0   355 355 1   393 393 1   393 393 1
@@ -4645,11 +5641,11 @@
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
       WINDOW win AS (  PARTITION BY coalesce(a, '') 
         RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
@@ -4664,12 +5660,12 @@
 do_execsql_test 5.4.4.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  GROUPS 6 PRECEDING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY a NULLS FIRST GROUPS 6 PRECEDING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {158 158 0   355 355 0   399 399 0   629 629 0   667 667 0   870 158 1
   870 158 1   870 158 1   870 158 1   870 158 1   870 158 1   870 870 0
   911 158 1   934 158 1   934 158 9   934 158 9   934 158 9   934 158 9
   934 158 9   934 158 9   934 158 9   934 158 9   934 158 9   934 158 9
   934 158 9   934 158 9   934 158 9   934 158 22   934 158 22   934 158 22
@@ -4687,12 +5683,12 @@
 do_execsql_test 5.4.4.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY a  GROUPS 6 PRECEDING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY a NULLS FIRST GROUPS 6 PRECEDING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 1 1   355 1 1   399 1 1   629 1 1   667 1 1   2050 7 2
   2050 7 2   2050 7 2   2273 7 2   2289 7 2   2359 7 2   2677 7 2   2961 7 2
   4359 15 3   4359 15 3   4359 15 3   4359 15 3   4359 15 3   4359 15 3
   4606 15 3   4752 15 3   4752 15 3   4758 15 3   4992 15 3   5064 15 3
   5070 15 3   7840 28 4   7840 28 4   7840 28 4   7840 28 4   8447 28 4
@@ -4711,12 +5707,12 @@
 do_execsql_test 5.4.5.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {102 102 1   113 113 1   113 113 1   133 133 1   148 148 1   160 158 1
   160 158 2   160 158 2   208 208 1   224 223 2   224 223 2   239 234 3
   239 234 3   239 234 3   252 247 3   257 247 5   257 247 5   257 250 4
   257 252 3   295 295 1   309 309 1   336 330 3   336 330 3   336 330 3
   346 346 1   355 354 1   355 354 2   355 354 2   399 393 3   399 393 3
@@ -4734,12 +5730,12 @@
 do_execsql_test 5.4.5.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 25 23   {} 34 29
   {} 36 31   {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 43 37   {} 43 37
   {} 50 42   {} 60 51   {} 61 52   {} 64 55   {} 64 55   {} 67 57   {} 68 58
   {} 69 59   {} 70 60   {} 72 62   {} 78 67   {} 78 67   {} 78 67   {} 85 72
   {} 85 72   113 2 2   113 2 2   133 4 3   223 10 8   223 11 9   239 12 10
@@ -4756,12 +5752,12 @@
 do_execsql_test 5.4.6.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {102 102 1   113 113 1   113 113 1   133 133 1   148 148 1   158 158 0
   158 158 1   160 160 1   208 208 1   223 223 1   224 224 1   234 234 1
   238 238 1   239 239 1   247 247 1   250 250 1   252 252 1   256 256 1
   257 257 1   295 295 1   309 309 1   330 330 1   335 335 1   336 336 1
   346 346 1   354 354 1   355 355 0   355 355 1   393 393 1   393 393 1
@@ -4779,12 +5775,12 @@
 do_execsql_test 5.4.6.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c  RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      WINDOW win AS (  ORDER BY c NULLS FIRST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {{} 1 1   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 11 9   {} 12 10
   {} 13 11   {} 16 14   {} 17 15   {} 18 16   {} 22 20   {} 24 22   {} 25 23
   {} 26 24   {} 31 27   {} 34 29   {} 36 31   {} 38 33   {} 38 33   {} 40 34
   {} 41 35   {} 43 37   {} 43 37   {} 49 41   {} 50 42   {} 51 43   {} 54 45
   {} 59 50   {} 60 51   {} 61 52   {} 63 54   {} 64 55   {} 64 55   {} 67 57
@@ -4801,13 +5797,13 @@
 do_execsql_test 5.4.7.1 {
   SELECT max(c) OVER win,
              min(c) OVER win,
              count(a) OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c , b , a 
+      WINDOW win AS (  ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
   979 102 83   979 113 81   979 113 82   979 133 80   979 148 79   979 158 77
   979 158 78   979 160 77   979 208 76   979 223 75   979 224 74   979 234 73
   979 238 72   979 239 71   979 247 70   979 250 69   979 252 68   979 256 67
   979 257 66   979 295 65   979 309 64   979 330 63   979 335 62   979 336 61
@@ -4825,13 +5821,335 @@
 do_execsql_test 5.4.7.2 {
   SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
              rank() OVER win,
              dense_rank() OVER win
       FROM t3
-      WINDOW win AS (  ORDER BY c , b , a 
+      WINDOW win AS (  ORDER BY c NULLS FIRST, b NULLS FIRST, a NULLS FIRST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {3830 89 89   4741 88 88   5640 84 84   5640 85 85   5640 86 86   5640 87 87
+  6485 81 81   6485 82 82   6485 83 83   7324 80 80   8163 78 78   8163 79 79
+  8968 73 73   8968 74 74   8968 75 75   8968 76 76   8968 77 77   9745 69 69
+  9745 70 70   9745 71 71   9745 72 72   10504 65 65   10504 66 66
+  10504 67 67   10504 68 68   11215 64 64   11920 63 63   12603 62 62
+  13274 60 60   13274 61 61   13941 59 59   14608 55 55   14608 56 56
+  14608 57 57   14608 58 58   15241 54 54   15870 53 53   16499 52 52
+  17126 49 49   17126 50 50   17126 51 51   17733 44 44   17733 45 45
+  17733 46 46   17733 47 47   17733 48 48   18176 42 42   18176 43 43
+  18597 40 40   18597 41 41   18996 39 39   19395 37 37   19395 38 38
+  19788 36 36   20181 35 35   20536 34 34   20891 30 30   20891 31 31
+  20891 32 32   20891 33 33   21226 28 28   21226 29 29   21535 27 27
+  21830 26 26   22087 22 22   22087 23 23   22087 24 24   22087 25 25
+  22334 21 21   22573 17 17   22573 18 18   22573 19 19   22573 20 20
+  22796 11 11   22796 12 12   22796 13 13   22796 14 14   22796 15 15
+  22796 16 16   22929 10 10   23042 9 9   23155 1 1   23155 2 2   23155 3 3
+  23155 4 4   23155 5 5   23155 6 6   23155 7 7   23155 8 8}
+
+do_execsql_test 5.4.8.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {102 102 1   113 113 1   113 113 1   133 133 1   148 148 1   158 158 0
+  158 158 1   160 160 1   208 208 1   223 223 1   224 224 1   234 234 1
+  238 238 1   239 239 1   247 247 1   250 250 1   252 252 1   256 256 1
+  257 257 1   295 295 1   309 309 1   330 330 1   335 335 1   336 336 1
+  346 346 1   354 354 1   355 355 0   355 355 1   393 393 1   393 393 1
+  398 398 1   399 399 0   399 399 1   412 412 1   421 421 1   430 430 1
+  443 443 1   480 480 1   480 480 1   572 572 1   574 574 1   607 607 1
+  618 618 1   618 618 1   627 627 1   629 629 0   629 629 1   633 633 1
+  634 634 1   652 652 1   660 660 1   667 667 0   667 667 1   670 670 1
+  671 671 1   683 683 1   705 705 1   711 711 1   716 716 1   726 726 1
+  730 730 1   759 759 1   762 762 1   768 768 1   768 768 1   777 777 1
+  786 786 1   790 790 1   792 792 1   794 794 1   805 805 1   822 822 1
+  839 839 1   839 839 1   840 840 1   844 844 1   845 845 1   870 870 0
+  870 870 1   870 870 1   899 899 1   911 911 1   929 929 1   934 934 1
+  938 938 1   938 938 1   959 959 1   963 963 1   979 979 1}
+
+do_execsql_test 5.4.8.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  113 1 1   113 1 1   133 1 1   223 1 1   239 1 1   247 1 1   257 1 1
+  295 1 1   309 1 1   335 1 1   355 1 1   355 1 1   393 1 1   393 1 1
+  399 1 1   399 1 1   421 1 1   443 1 1   607 1 1   627 1 1   629 1 1
+  629 1 1   633 1 1   667 1 1   667 1 1   671 1 1   683 1 1   705 1 1
+  711 1 1   759 1 1   777 1 1   805 1 1   839 1 1   839 1 1   845 1 1
+  899 1 1   911 1 1   929 1 1   959 1 1   963 1 1   979 1 1}
+
+do_execsql_test 5.4.9.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {158 158 0   355 355 0   399 399 0   629 629 0   667 667 0   870 113 1
+  870 158 1   870 158 1   870 158 1   870 158 1   870 158 1   870 158 1
+  870 158 1   870 870 0   899 113 10   899 113 10   899 113 10   899 113 10
+  899 113 10   899 113 10   899 113 10   899 113 17   899 113 17   899 113 17
+  899 113 17   899 113 17   899 113 17   899 113 17   899 158 1   963 113 17
+  979 102 34   979 102 45   979 102 45   979 102 45   979 102 45   979 102 45
+  979 102 50   979 102 50   979 102 50   979 102 50   979 102 50   979 102 50
+  979 102 50   979 102 57   979 102 57   979 102 57   979 102 57   979 102 57
+  979 102 57   979 102 63   979 102 63   979 102 63   979 102 63   979 102 63
+  979 102 63   979 102 63   979 102 63   979 102 63   979 102 63   979 102 63
+  979 102 63   979 102 63   979 102 76   979 102 76   979 102 76   979 102 76
+  979 102 76   979 102 76   979 102 76   979 102 76   979 113 17   979 113 26
+  979 113 26   979 113 26   979 113 26   979 113 26   979 113 26   979 113 26
+  979 113 26   979 113 34   979 113 34   979 113 34   979 113 34   979 113 34
+  979 113 34   979 113 34   979 113 34   979 113 34   979 113 34}
+
+do_execsql_test 5.4.9.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 84 11   {} 84 11   355 84 11   399 84 11   629 84 11   667 84 11
+  2050 75 10   2050 75 10   2050 75 10   2050 75 10   2163 75 10   2307 75 10
+  2889 75 10   2889 75 10   2949 75 10   4997 68 9   4997 68 9   4997 68 9
+  5418 68 9   5440 68 9   5668 68 9   5802 68 9   7337 59 8   7337 59 8
+  7337 59 8   7337 59 8   7470 59 8   7692 59 8   8020 59 8   8300 59 8
+  8316 59 8   10450 51 7   10450 51 7   10450 51 7   10450 51 7   10450 51 7
+  10450 51 7   10785 51 7   11379 51 7   11714 40 6   11714 40 6   11714 40 6
+  11714 40 6   11714 40 6   11714 40 6   11714 40 6   11714 40 6   11714 40 6
+  12009 40 6   12381 40 6   12676 35 5   12676 35 5   12789 35 5   13305 35 5
+  13453 35 5   14195 28 4   14195 28 4   14195 28 4   14195 28 4   14195 28 4
+  15040 28 4   15154 28 4   15999 22 3   15999 22 3   15999 22 3   15999 22 3
+  16606 22 3   16758 22 3   17365 9 2   17365 9 2   17365 9 2   17365 9 2
+  17365 9 2   17365 9 2   17612 9 2   17758 9 2   17758 9 2   17764 9 2
+  17998 9 2   18070 9 2   18076 9 2   20846 1 1   20846 1 1   20846 1 1
+  21069 1 1   21085 1 1   21155 1 1   21473 1 1   21757 1 1}
+
+do_execsql_test 5.4.10.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {102 102 1   113 113 1   113 113 1   133 133 1   148 148 1   158 158 0
+  158 158 1   160 160 1   208 208 1   223 223 1   224 224 1   234 234 1
+  238 238 1   239 239 1   247 247 1   250 250 1   252 252 1   256 256 1
+  257 257 1   295 295 1   309 309 1   330 330 1   335 335 1   336 336 1
+  346 346 1   354 354 1   355 355 0   355 355 1   393 393 1   393 393 1
+  398 398 1   399 399 0   399 399 1   412 412 1   421 421 1   430 430 1
+  443 443 1   480 480 1   480 480 1   572 572 1   574 574 1   607 607 1
+  618 618 1   618 618 1   627 627 1   629 629 0   629 629 1   633 633 1
+  634 634 1   652 652 1   660 660 1   667 667 0   667 667 1   670 670 1
+  671 671 1   683 683 1   705 705 1   711 711 1   716 716 1   726 726 1
+  730 730 1   759 759 1   762 762 1   768 768 1   768 768 1   777 777 1
+  786 786 1   790 790 1   792 792 1   794 794 1   805 805 1   822 822 1
+  839 839 1   839 839 1   840 840 1   844 844 1   845 845 1   870 870 0
+  870 870 1   870 870 1   899 899 1   911 911 1   929 929 1   934 934 1
+  938 938 1   938 938 1   959 959 1   963 963 1   979 979 1}
+
+do_execsql_test 5.4.10.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  PARTITION BY coalesce(a, '') 
+        RANGE BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1   {} 1 1
+  113 1 1   113 1 1   133 1 1   223 1 1   239 1 1   247 1 1   257 1 1
+  295 1 1   309 1 1   335 1 1   355 1 1   355 1 1   393 1 1   393 1 1
+  399 1 1   399 1 1   421 1 1   443 1 1   607 1 1   627 1 1   629 1 1
+  629 1 1   633 1 1   667 1 1   667 1 1   671 1 1   683 1 1   705 1 1
+  711 1 1   759 1 1   777 1 1   805 1 1   839 1 1   839 1 1   845 1 1
+  899 1 1   911 1 1   929 1 1   959 1 1   963 1 1   979 1 1}
+
+do_execsql_test 5.4.11.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST GROUPS 6 PRECEDING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {223 223 1   239 239 1   309 309 1   572 572 1   627 627 1   870 870 1
+  911 911 1   934 158 22   934 158 28   934 158 28   934 158 28   934 158 28
+  934 158 28   934 158 28   934 223 9   934 223 9   934 223 9   934 223 9
+  934 223 9   934 223 9   934 223 9   934 223 9   934 223 9   934 223 9
+  934 223 9   934 223 9   934 223 9   934 223 22   934 223 22   934 223 22
+  934 223 22   934 223 22   934 934 1   959 102 40   959 102 51   959 102 51
+  959 102 51   959 102 51   959 102 51   959 102 51   959 102 51   959 102 51
+  959 102 51   959 102 51   959 102 51   959 102 51   959 102 51   959 102 51
+  959 102 51   959 113 35   959 113 40   959 113 40   959 113 40   959 113 40
+  959 113 40   959 113 40   959 113 40   959 113 40   959 113 40   959 113 40
+  959 158 28   959 158 35   959 158 35   959 158 35   959 158 35   963 102 51
+  979 102 47   979 102 47   979 102 47   979 102 47   979 102 47   979 102 47
+  979 102 47   979 102 48   979 102 48   979 102 48   979 102 48   979 102 48
+  979 102 48   979 102 48   979 102 48   979 102 48   979 102 49   979 102 49
+  979 102 49   979 102 49   979 102 49   979 102 49   979 102 51}
+
+do_execsql_test 5.4.11.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY a NULLS LAST GROUPS 6 PRECEDING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 1 1   {} 1 1   223 1 1   239 1 1   309 1 1   627 1 1   911 1 1
+  2309 9 2   2309 9 2   2309 9 2   2309 9 2   2309 9 2   2309 9 2   2556 9 2
+  2702 9 2   2702 9 2   2708 9 2   2942 9 2   3014 9 2   3020 9 2   5790 22 3
+  5790 22 3   5790 22 3   5790 22 3   6397 22 3   6549 22 3   7156 28 4
+  7156 28 4   7156 28 4   7156 28 4   7156 28 4   8001 28 4   8115 28 4
+  8960 35 5   8960 35 5   9073 35 5   9589 35 5   9737 35 5   10028 68 9
+  10028 68 9   10028 68 9   10396 59 8   10396 59 8   10396 59 8   10396 59 8
+  10449 68 9   10471 68 9   10479 40 6   10479 40 6   10479 40 6   10479 40 6
+  10479 40 6   10479 40 6   10479 40 6   10479 40 6   10479 40 6   10529 59 8
+  10699 68 9   10751 59 8   10774 40 6   10833 68 9   11002 75 10
+  11002 75 10   11002 75 10   11002 75 10   11079 59 8   11115 75 10
+  11146 40 6   11259 75 10   11359 59 8   11375 59 8   11441 51 7
+  11441 51 7   11441 51 7   11441 51 7   11441 51 7   11441 51 7   11776 51 7
+  11841 75 10   11841 75 10   11901 75 10   12145 84 11   12145 84 11
+  12370 51 7   12500 84 11   12544 84 11   12774 84 11   12812 84 11}
+
+do_execsql_test 5.4.12.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {102 102 1   113 113 1   113 113 1   133 133 1   148 148 1   160 158 1
+  160 158 2   160 158 2   208 208 1   224 223 2   224 223 2   239 234 3
+  239 234 3   239 234 3   252 247 3   257 247 5   257 247 5   257 250 4
+  257 252 3   295 295 1   309 309 1   336 330 3   336 330 3   336 330 3
+  346 346 1   355 354 1   355 354 2   355 354 2   399 393 3   399 393 3
+  399 393 3   399 393 4   399 393 4   412 412 1   421 421 1   430 430 1
+  443 443 1   480 480 1   480 480 1   574 572 2   574 572 2   607 607 1
+  618 618 1   618 618 1   634 627 3   634 627 4   634 627 4   634 627 4
+  634 629 3   652 652 1   667 660 2   671 667 2   671 667 3   671 667 3
+  671 667 3   683 683 1   711 705 2   716 705 3   716 711 2   730 726 2
+  730 726 2   762 759 2   768 759 4   768 762 2   768 762 2   777 777 1
+  792 786 3   794 786 4   794 786 4   794 790 3   805 805 1   822 822 1
+  845 839 4   845 839 4   845 839 5   845 839 5   845 839 5   870 870 0
+  870 870 1   870 870 1   899 899 1   911 911 1   934 929 2   938 929 4
+  938 934 2   938 934 2   963 959 2   963 959 2   979 979 1}
+
+do_execsql_test 5.4.12.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 6 PRECEDING AND 7 FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 25 23   {} 34 29
+  {} 36 31   {} 38 33   {} 38 33   {} 40 34   {} 41 35   {} 43 37   {} 43 37
+  {} 50 42   {} 60 51   {} 61 52   {} 64 55   {} 64 55   {} 67 57   {} 68 58
+  {} 69 59   {} 70 60   {} 72 62   {} 78 67   {} 78 67   {} 78 67   {} 85 72
+  {} 85 72   113 2 2   113 2 2   133 4 3   223 10 8   223 11 9   239 12 10
+  239 13 11   239 14 12   247 15 13   257 18 16   257 19 17   295 20 18
+  309 21 19   335 22 20   335 23 21   335 24 22   355 27 25   355 27 25
+  421 35 30   443 37 32   504 16 14   504 17 15   607 42 36   683 56 47
+  710 26 24   711 59 50   759 62 53   759 63 54   777 66 56   805 71 61
+  899 81 68   911 82 69   929 83 70   929 84 71   979 89 75   1185 32 28
+  1185 32 28   1191 29 26   1191 29 26   1334 51 43   1338 52 44   1338 52 44
+  1416 57 48   1416 58 49   1584 31 27   1684 73 63   1684 73 63   1889 46 39
+  1889 46 39   1891 49 41   1922 87 73   1922 88 74   2005 54 45   2005 55 46
+  2518 45 38   2518 48 40   2523 75 64   2523 76 65   2523 77 66}
+
+do_execsql_test 5.4.13.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {102 102 1   113 113 1   113 113 1   133 133 1   148 148 1   158 158 0
+  158 158 1   160 160 1   208 208 1   223 223 1   224 224 1   234 234 1
+  238 238 1   239 239 1   247 247 1   250 250 1   252 252 1   256 256 1
+  257 257 1   295 295 1   309 309 1   330 330 1   335 335 1   336 336 1
+  346 346 1   354 354 1   355 355 0   355 355 1   393 393 1   393 393 1
+  398 398 1   399 399 0   399 399 1   412 412 1   421 421 1   430 430 1
+  443 443 1   480 480 1   480 480 1   572 572 1   574 574 1   607 607 1
+  618 618 1   618 618 1   627 627 1   629 629 0   629 629 1   633 633 1
+  634 634 1   652 652 1   660 660 1   667 667 0   667 667 1   670 670 1
+  671 671 1   683 683 1   705 705 1   711 711 1   716 716 1   726 726 1
+  730 730 1   759 759 1   762 762 1   768 768 1   768 768 1   777 777 1
+  786 786 1   790 790 1   792 792 1   794 794 1   805 805 1   822 822 1
+  839 839 1   839 839 1   840 840 1   844 844 1   845 845 1   870 870 0
+  870 870 1   870 870 1   899 899 1   911 911 1   929 929 1   934 934 1
+  938 938 1   938 938 1   959 959 1   963 963 1   979 979 1}
+
+do_execsql_test 5.4.13.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST RANGE BETWEEN 0 PRECEDING AND 0 FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {{} 1 1   {} 5 4   {} 6 5   {} 6 5   {} 8 6   {} 9 7   {} 11 9   {} 12 10
+  {} 13 11   {} 16 14   {} 17 15   {} 18 16   {} 22 20   {} 24 22   {} 25 23
+  {} 26 24   {} 31 27   {} 34 29   {} 36 31   {} 38 33   {} 38 33   {} 40 34
+  {} 41 35   {} 43 37   {} 43 37   {} 49 41   {} 50 42   {} 51 43   {} 54 45
+  {} 59 50   {} 60 51   {} 61 52   {} 63 54   {} 64 55   {} 64 55   {} 67 57
+  {} 68 58   {} 69 59   {} 70 60   {} 72 62   {} 75 64   {} 76 65   {} 78 67
+  {} 78 67   {} 78 67   {} 84 71   {} 85 72   {} 85 72   113 2 2   113 2 2
+  133 4 3   223 10 8   239 14 12   247 15 13   257 19 17   295 20 18
+  309 21 19   335 23 21   355 27 25   355 27 25   393 29 26   393 29 26
+  399 32 28   399 32 28   421 35 30   443 37 32   607 42 36   627 45 38
+  629 46 39   629 46 39   633 48 40   667 52 44   667 52 44   671 55 46
+  683 56 47   705 57 48   711 58 49   759 62 53   777 66 56   805 71 61
+  839 73 63   839 73 63   845 77 66   899 81 68   911 82 69   929 83 70
+  959 87 73   963 88 74   979 89 75}
+
+do_execsql_test 5.4.14.1 {
+  SELECT max(c) OVER win,
+             min(c) OVER win,
+             count(a) OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
+        ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
+} {979 102 83   979 102 83   979 102 83   979 102 83   979 102 83   979 102 83
+  979 102 83   979 113 81   979 113 82   979 133 80   979 148 79   979 158 77
+  979 158 78   979 160 77   979 208 76   979 223 75   979 224 74   979 234 73
+  979 238 72   979 239 71   979 247 70   979 250 69   979 252 68   979 256 67
+  979 257 66   979 295 65   979 309 64   979 330 63   979 335 62   979 336 61
+  979 346 60   979 354 59   979 355 57   979 355 58   979 393 56   979 393 57
+  979 398 55   979 399 53   979 399 54   979 412 53   979 421 52   979 430 51
+  979 443 50   979 480 48   979 480 49   979 572 47   979 574 46   979 607 45
+  979 618 43   979 618 44   979 627 42   979 629 40   979 629 41   979 633 40
+  979 634 39   979 652 38   979 660 37   979 667 35   979 667 36   979 670 35
+  979 671 34   979 683 33   979 705 32   979 711 31   979 716 30   979 726 29
+  979 730 28   979 759 27   979 762 26   979 768 24   979 768 25   979 777 23
+  979 786 22   979 790 21   979 792 20   979 794 19   979 805 18   979 822 17
+  979 839 15   979 839 16   979 840 14   979 844 13   979 845 12   979 870 9
+  979 870 10   979 870 11   979 899 9   979 911 8   979 929 7}
+
+do_execsql_test 5.4.14.2 {
+  SELECT sum(c) FILTER (WHERE (c%2)!=0) OVER win,
+             rank() OVER win,
+             dense_rank() OVER win
+      FROM t3
+      WINDOW win AS (  ORDER BY c NULLS LAST, b NULLS LAST, a NULLS LAST
         ROWS BETWEEN 6 PRECEDING AND UNBOUNDED FOLLOWING   EXCLUDE TIES  )
-      ORDER BY 1 , 2 , 3
+      ORDER BY 1 NULLS FIRST, 2 NULLS FIRST, 3 NULLS FIRST
 } {3830 89 89   4741 88 88   5640 84 84   5640 85 85   5640 86 86   5640 87 87
   6485 81 81   6485 82 82   6485 83 83   7324 80 80   8163 78 78   8163 79 79
   8968 73 73   8968 74 74   8968 75 75   8968 76 76   8968 77 77   9745 69 69
   9745 70 70   9745 71 71   9745 72 72   10504 65 65   10504 66 66
   10504 67 67   10504 68 68   11215 64 64   11920 63 63   12603 62 62
@@ -4858,18 +6176,18 @@
   INSERT INTO t2 VALUES('C', 1);
 } {}
 
 do_execsql_test 6.1 {
   SELECT group_concat(a, '.') OVER (
-    ORDER BY b  RANGE BETWEEN 7 PRECEDING AND 2 PRECEDING
+    ORDER BY b NULLS FIRST RANGE BETWEEN 7 PRECEDING AND 2 PRECEDING
   )
   FROM t2
 } {A.B   A.B   {}}
 
 do_execsql_test 6.2 {
   SELECT group_concat(a, '.') OVER (
-    ORDER BY b DESC  RANGE BETWEEN 7 PRECEDING AND 2 PRECEDING
+    ORDER BY b DESC NULLS LAST RANGE BETWEEN 7 PRECEDING AND 2 PRECEDING
   )
   FROM t2
 } {{}   A.B   A.B}
 
 finish_test

Index: tool/mkkeywordhash.c
==================================================================
--- tool/mkkeywordhash.c
+++ tool/mkkeywordhash.c
@@ -208,10 +208,11 @@
   { "EXCLUDE",          "TK_EXCLUDE",      WINDOWFUNC             },
   { "EXISTS",           "TK_EXISTS",       ALWAYS                 },
   { "EXPLAIN",          "TK_EXPLAIN",      EXPLAIN                },
   { "FAIL",             "TK_FAIL",         CONFLICT|TRIGGER       },
   { "FILTER",           "TK_FILTER",       WINDOWFUNC             },
+  { "FIRST",            "TK_FIRST",        ALWAYS                 },
   { "FOLLOWING",        "TK_FOLLOWING",    WINDOWFUNC             },
   { "FOR",              "TK_FOR",          TRIGGER                },
   { "FOREIGN",          "TK_FOREIGN",      FKEY                   },
   { "FROM",             "TK_FROM",         ALWAYS                 },
   { "FULL",             "TK_JOIN_KW",      ALWAYS                 },
@@ -233,10 +234,11 @@
   { "INTO",             "TK_INTO",         ALWAYS                 },
   { "IS",               "TK_IS",           ALWAYS                 },
   { "ISNULL",           "TK_ISNULL",       ALWAYS                 },
   { "JOIN",             "TK_JOIN",         ALWAYS                 },
   { "KEY",              "TK_KEY",          ALWAYS                 },
+  { "LAST",             "TK_LAST",         ALWAYS                 },
   { "LEFT",             "TK_JOIN_KW",      ALWAYS                 },
   { "LIKE",             "TK_LIKE_KW",      ALWAYS                 },
   { "LIMIT",            "TK_LIMIT",        ALWAYS                 },
   { "MATCH",            "TK_MATCH",        ALWAYS                 },
   { "NATURAL",          "TK_JOIN_KW",      ALWAYS                 },
@@ -243,10 +245,11 @@
   { "NO",               "TK_NO",           FKEY|WINDOWFUNC        },
   { "NOT",              "TK_NOT",          ALWAYS                 },
   { "NOTHING",          "TK_NOTHING",      UPSERT                 },
   { "NOTNULL",          "TK_NOTNULL",      ALWAYS                 },
   { "NULL",             "TK_NULL",         ALWAYS                 },
+  { "NULLS",            "TK_NULLS",        ALWAYS                 },
   { "OF",               "TK_OF",           ALWAYS                 },
   { "OFFSET",           "TK_OFFSET",       ALWAYS                 },
   { "ON",               "TK_ON",           ALWAYS                 },
   { "OR",               "TK_OR",           ALWAYS                 },
   { "ORDER",            "TK_ORDER",        ALWAYS                 },