Avoid assuming that an expression that contains the sub-expression (? IS FALSE) or...

FossilOrigin-Name: eb7ed90b8a65748f0721aaf7bdddd2207f552be5015603fbfb7044d815ae2f36

diff --git a/manifest b/manifest
index df2f0dca94b83a83e58ab7897adf5b23f20c1bed..65c91096409c87c2a25fda94f1b1aa2a0a624d05 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\susers\sto\seffectively\sdisable\sfts5\scrisismerge\soperations\sby\ssetting\sthe\scrisismerge\sthreshold\sto\shigher\sthan\sthe\smaximum\sallowable\ssegment\sb-trees\son\sa\ssingle\slevel.\sFix\sfor\s[d392017c].
-D 2019-10-09T18:36:32.820
+C Avoid\sassuming\sthat\san\sexpression\sthat\scontains\sthe\ssub-expression\s(?\sIS\sFALSE)\sor\s(?\sIS\sTRUE)\smay\sonly\sbe\strue\sif\s?\sis\snon-null.\sFix\sfor\s[a976c487].
+D 2019-10-09T21:14:00.049
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -477,7 +477,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
 F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
-F src/expr.c 3f4dcbe7cb6644652c2d12b7fa5c9087965229c515e65070cbe99f100c2f2e5f
+F src/expr.c bf8f259596d5d326fd0e64c001670794e473a115b4855d02112e93de171f68a1
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 6271fda51794b569d736eba4097d28f13080cd0c9eb66d5fcecb4b77336fae50
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -1081,7 +1081,7 @@ F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
 F test/istrue.test 75327829744e65cc8700e69340b8e6c192e10e39dfae7ccb0e970d3c4f49090a
-F test/join.test 6ce8296a08e78632c322cde0add78a7ce05466c3d9ec7d5130b38b5b489e7c27
+F test/join.test 7610c1818f8921618279ab633fc03c93d54f6c8fb9e9e7e96b252319ece346d4
 F test/join2.test 10f7047e723ebd68b2f47189be8eed20451a6f665d8bf46f1774c640d1062417
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
@@ -1846,7 +1846,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 907f7965b335d8d5441f2e386bb190d1f93ffcd45ca98d2d1c621dede491fc5e
-R ff04baeec67f3b016fe79aecb67c0a3c
+P 86e497209217abb7bcb491a023cd353f3c7c9c103ebd9f58dd8661b12cf3694c
+R 3aa92836bd3d4a197ed3b39d59e252c3
 U dan
-Z 317dae3e1b55b9ea127da4807cd56a16
+Z 535c0917a90b77d5a689b508b3363400

diff --git a/manifest.uuid b/manifest.uuid
index 52e5001b7195a9b16f94b93d8af347788fedb313..0a4f4430c20bc3dbb9d4097c3adcec62623b9a62 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-86e497209217abb7bcb491a023cd353f3c7c9c103ebd9f58dd8661b12cf3694c
\ No newline at end of file
+eb7ed90b8a65748f0721aaf7bdddd2207f552be5015603fbfb7044d815ae2f36
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index fd6b5712860a9222d3ab0e05227c83c88a11f29c..ba19a331dd9a1752a1c6523e1a8a99986fb9d4a8 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -5149,6 +5149,7 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
     case TK_CASE:
     case TK_IN:
     case TK_FUNCTION:
+    case TK_TRUTH:
       testcase( pExpr->op==TK_ISNOT );
       testcase( pExpr->op==TK_ISNULL );
       testcase( pExpr->op==TK_NOTNULL );
@@ -5157,6 +5158,7 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
       testcase( pExpr->op==TK_CASE );
       testcase( pExpr->op==TK_IN );
       testcase( pExpr->op==TK_FUNCTION );
+      testcase( pExpr->op==TK_TRUTH );
       return WRC_Prune;
     case TK_COLUMN:
       if( pWalker->u.iCur==pExpr->iTable ){

diff --git a/test/join.test b/test/join.test
index f53a90c84a97e47e89aea9b74d2d24a44befd6c6..682186200bb696444d37086cf0bc56eea26b1a88 100644 (file)
--- a/test/join.test
+++ b/test/join.test
@@ -884,4 +884,26 @@ do_execsql_test join-17.110 {
    WHERE NOT(y='a');
 } {1 3 1 3}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test join-18.1 {
+  CREATE TABLE t0(a);
+  CREATE TABLE t1(b);
+  CREATE VIEW v0 AS SELECT a FROM t1 LEFT JOIN t0;
+  INSERT INTO t1 VALUES (1);
+} {}
+
+do_execsql_test join-18.2 {
+  SELECT * FROM v0 WHERE NOT(v0.a IS FALSE);
+} {{}}
+
+do_execsql_test join-18.3 {
+  SELECT * FROM t1 LEFT JOIN t0 WHERE NOT(a IS FALSE);
+} {1 {}}
+
+do_execsql_test join-18.4 {
+  SELECT NOT(v0.a IS FALSE) FROM v0
+} {1}
+
 finish_test
+