From: drh Date: Fri, 30 Aug 2019 16:00:58 +0000 (+0000) Subject: The expression "(X IS FALSE) IN (FALSE)" does not imply that X is NOT NULL. X-Git-Tag: version-3.30.0~89 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae144a1c9fc092e8756f66cd8d60b80dbbd1e010;p=thirdparty%2Fsqlite.git The expression "(X IS FALSE) IN (FALSE)" does not imply that X is NOT NULL. Ticket [f8f472cbc77ba9c9] FossilOrigin-Name: dd66134817ecbda01c59a05ad0d6ac44bee700ab10cd2119c869dd69af293fe2 --- diff --git a/manifest b/manifest index e12f380013..f9cae012c2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\sexpression\s"(X\sIS\sFALSE)\sBETWEEN\sFALSE\sAND\sTRUE"\sdoes\snot\simplie\sthat\nX\sis\snot\sNULL.\s\sTicket\s[fba33c8b1df6a915] -D 2019-08-30T15:11:08.913 +C The\sexpression\s"(X\sIS\sFALSE)\sIN\s(FALSE)"\sdoes\snot\simply\sthat\sX\sis\sNOT\sNULL.\nTicket\s[f8f472cbc77ba9c9] +D 2019-08-30T16:00:58.750 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -475,7 +475,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 e1d261e3d2ddd29d49d645bf2b919f37b842fa5fc41a936b2dcc3e5a309d58c0 +F src/expr.c e1b74116375bb88c1b4b90b635d417dcd0643ac46bacf5a3caefef60c8e5e115 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 6b79f4c2447691aa9ac86e2a6a774b65f3b3dd053d4220a4893051a0de20f82e F src/func.c 4ee36219698d50d672a28eca4adb0fd6b92e607a1883d318315e0d2fd5044467 @@ -1047,7 +1047,7 @@ F test/index2.test f835d5e13ca163bd78c4459ca15fd2e4ed487407 F test/index3.test 51685f39345462b84fcf77eb8537af847fdf438cc96b05c45d6aaca4e473ade0 F test/index4.test ab92e736d5946840236cd61ac3191f91a7856bf6 F test/index5.test 8621491915800ec274609e42e02a97d67e9b13e7 -F test/index6.test 5b016266f0e823b2a27724da25c18fe38feb474006f9604d9d5f996bfef75b68 +F test/index6.test bae04b456a1845d8d48af751ac5b9bba5571551b96ef39d2b5b1db48cadd0fac F test/index7.test 1d764c0cca45f5a76150b08e127ccc8d52492cfa788b5fafed4be784a351b020 F test/index8.test bc2e3db70e8e62459aaa1bd7e4a9b39664f8f9d7 F test/index9.test 0aa3e509dddf81f93380396e40e9bb386904c1054924ba8fa9bcdfe85a8e7721 @@ -1837,7 +1837,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 45ff2b1f2693bb0231a864a511bb82cf2a5945ab3d806a5bbaf1517ecb287883 -R 9c64b300fe2525056b87d63bc987465b +P 057fb8b1809b8b9c8fff0fd0804153b9644f0545c23c6ddc4758bda3381094b9 +R dbd65dd02f8837e1f86624f44fe9aa97 U drh -Z 75ee72b9565e384807e78e8394c68f11 +Z 96ee8b9606bd233ac998576dd644ea25 diff --git a/manifest.uuid b/manifest.uuid index 0f4dbf8996..98bf5de4ce 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -057fb8b1809b8b9c8fff0fd0804153b9644f0545c23c6ddc4758bda3381094b9 \ No newline at end of file +dd66134817ecbda01c59a05ad0d6ac44bee700ab10cd2119c869dd69af293fe2 \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 27929767c9..e87ff70507 100644 --- a/src/expr.c +++ b/src/expr.c @@ -4995,7 +4995,7 @@ static int exprImpliesNotNull( if( seenNot && ExprHasProperty(p, EP_xIsSelect) ) return 0; assert( ExprHasProperty(p,EP_xIsSelect) || (p->x.pList!=0 && p->x.pList->nExpr>0) ); - return exprImpliesNotNull(pParse, p->pLeft, pNN, iTab, seenNot); + return exprImpliesNotNull(pParse, p->pLeft, pNN, iTab, 1); } case TK_BETWEEN: { ExprList *pList = p->x.pList; diff --git a/test/index6.test b/test/index6.test index d32e909e10..d5bc77c0db 100644 --- a/test/index6.test +++ b/test/index6.test @@ -440,6 +440,7 @@ do_execsql_test index6-14.2 { # 2019-08-30 # Ticket https://www.sqlite.org/src/info/a6408d42b9f44462 # Ticket https://www.sqlite.org/src/info/fba33c8b1df6a915 +# https://sqlite.org/src/info/bac716244fddac1fe841 # do_execsql_test index6-15.1 { DROP TABLE t0; @@ -457,5 +458,9 @@ do_execsql_test index6-15.3 { do_execsql_test index6-15.4 { SELECT 1 FROM t0 WHERE FALSE BETWEEN FALSE AND (t0.c0 IS FALSE); } {1} +do_execsql_test index6-15.5 { + SELECT 1 FROM t0 WHERE (c0 IS FALSE) IN (FALSE); +} {1} + finish_test