From: drh <drh@noemail.net>
Date: Sat, 24 Mar 2018 15:47:31 +0000 (+0000)
Subject: Yet another fault in the sqlite3ExprImpliesNotNull() routine, causing errors
X-Git-Tag: version-3.23.0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3eff266bc37a56743a96ec9fb469f3132e7927f;p=thirdparty%2Fsqlite.git

Yet another fault in the sqlite3ExprImpliesNotNull() routine, causing errors
in the LEFT JOIN strength reduction optimization of check-in
[dd568c27b1d76563].

FossilOrigin-Name: e88cf3d4df64097ebc19aae464b88d0faf9b7d4c30d057042b582d78327e7ad3
---

diff --git a/manifest b/manifest
index 58e37e73e5..d36a1c431b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\sscript\sproblem\scausing\sshell1.test\sto\sfail\swith\n-DSQLITE_OMIT_VIRTUAL_TABLE\sbuilds.
-D 2018-03-24T15:08:48.677
+C Yet\sanother\sfault\sin\sthe\ssqlite3ExprImpliesNotNull()\sroutine,\scausing\serrors\nin\sthe\sLEFT\sJOIN\sstrength\sreduction\soptimization\sof\scheck-in\n[dd568c27b1d76563].
+D 2018-03-24T15:47:31.300
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -443,7 +443,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6
 F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
 F src/delete.c 20c8788451dc737a967c87ea53ad43544d617f5b57d32ccce8bd52a0daf9e89b
-F src/expr.c c370003225a891f2adf2bb0366655734a2433dfc53160b4f1c979459e6db278d
+F src/expr.c 82d8b12a15fa197c4697f2a5a78cfb3abfc90d8058b4c36a8494f0a3d55b8e31
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331
 F src/func.c 94f42cba2cc1c34aeaa441022ba0170ec3fec4bba54db4e0ded085c6dc0fdc51
@@ -1005,7 +1005,7 @@ F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
 F test/istrue.test d6e659764da5ccc03adcdba18fe77d7917ba5e4abd04ef14bd4e4cf43e024b5b
-F test/join.test cffed24d43d2aef94aa2d853458246cb6178498ba47801040d8a5e85a0283bbe
+F test/join.test 730e3e8d511289531efca01f8684f98da1e6de51eacf95c5960d0c46e77719e3
 F test/join2.test 2339e3a8089178607a718c7fa1f6c3826579132396f5304a0f8e9dbefa60c84f
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
@@ -1717,7 +1717,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cf171abe954a5f25262161dd69f2e8cecdbf9446c3f6b298201507dbc743567e
-R 461dece6f48dae565c1f3eeac9cdfdca
-U dan
-Z ac26a7372d2fbc702dbe91b2ace955c2
+P 2e06906e0959e1256fc2feb9dc2c3a9d1e9c19c4ba59585fe52df9af174ab443
+R 60924bc906d95198af7e174bd12ddecc
+U drh
+Z 1363428edd934c95156928d5375763e1
diff --git a/manifest.uuid b/manifest.uuid
index 9d846f731d..e70fae5931 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e06906e0959e1256fc2feb9dc2c3a9d1e9c19c4ba59585fe52df9af174ab443
\ No newline at end of file
+e88cf3d4df64097ebc19aae464b88d0faf9b7d4c30d057042b582d78327e7ad3
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index c09c0c56ce..bb26b3d04f 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -5013,6 +5013,7 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
     case TK_IS:
     case TK_OR:
     case TK_CASE:
+    case TK_IN:
     case TK_FUNCTION:
     case TK_AGG_FUNCTION:
       return WRC_Prune;
diff --git a/test/join.test b/test/join.test
index 35131fd312..21cef43412 100644
--- a/test/join.test
+++ b/test/join.test
@@ -801,6 +801,11 @@ do_execsql_test join-15.100 {
     FROM t1 LEFT JOIN t2
    WHERE CASE WHEN FALSE THEN a=x ELSE 1 END;
 } {1 2 {} {} x 3 4 {} {} x}
+do_execsql_test join-15.105 {
+  SELECT *, 'x'
+    FROM t1 LEFT JOIN t2
+   WHERE a IN (1,3,x,y);
+} {1 2 {} {} x 3 4 {} {} x}
 do_execsql_test join-15.110 {
   DROP TABLE t1;
   DROP TABLE t2;