commit f49ff6ffb3b60e3f2f9fe280e5580099e1443128
author drh <drh@noemail.net> Mon Apr 23 20:38:40 2018 +0000
committer drh <drh@noemail.net> Mon Apr 23 20:38:40 2018 +0000
tree 559e5a57cc337005bd9435efe1f99fe423b22266
parent fbe07539d38a28d3e8d9228f8cdd3881ecb50fd0

Fix a problem in sqlite3ExprCompare() associated with UPSERT.

FossilOrigin-Name: 67d0b2c15299dd20bca7254ecb33e71b5eee6024e2709bfdc36f877bf2a5679f

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 6997e84..670da03 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4920,7 +4920,8 @@
     if( sqlite3ExprCompare(pParse, pA->pLeft, pB->pLeft, iTab) ) return 2;
     if( sqlite3ExprCompare(pParse, pA->pRight, pB->pRight, iTab) ) return 2;
     if( sqlite3ExprListCompare(pA->x.pList, pB->x.pList, iTab) ) return 2;
-    if( ALWAYS((combinedFlags & EP_Reduced)==0) && pA->op!=TK_STRING ){
+    assert( (combinedFlags & EP_Reduced)==0 );
+    if( pA->op!=TK_STRING && pA->op!=TK_TRUEFALSE ){
       if( pA->iColumn!=pB->iColumn ) return 2;
       if( pA->iTable!=pB->iTable 
        && (pA->iTable!=iTab || NEVER(pB->iTable>=0)) ) return 2;