Fix the NOT NULL logic in the theorem prover that determines when a partial

index can be used.  Ticket [5c6955204c392ae763a95].

FossilOrigin-Name: c2e439bccc40825e211bfa9a88e6a251ff066ca7453d4e7cb5eab56ce7332635

diff --git a/manifest b/manifest
index e79729866ad67a3f07a69bc95bfeae800be975c6..427d778b0733263a93046c49fa60714508c682c4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarning\sseen\swith\sMSVC.
-D 2019-05-04T03:56:47.610
+C Fix\sthe\sNOT\sNULL\slogic\sin\sthe\stheorem\sprover\sthat\sdetermines\swhen\sa\spartial\nindex\scan\sbe\sused.\s\sTicket\s[5c6955204c392ae763a95].
+D 2019-05-04T17:32:07.463
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -471,7 +471,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
 F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
-F src/expr.c f65db06a0fcff760cadfb79d579a41e3eb7eff38848d5d6359137822f4fa2ec9
+F src/expr.c 55e71df830d43bfedd2910e45b097c445a493978b21a0544a54011db1d2fa933
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 0e14d4bef8eac2d87bbd517e492d9084c65008d117823f8922c5e7b2b599bd33
 F src/func.c ac05ea6b47b407586ad2c0878c4c81c3acb08b67ecf86648830f91f40325ae37
@@ -1036,8 +1036,8 @@ F test/index2.test f835d5e13ca163bd78c4459ca15fd2e4ed487407
 F test/index3.test 51685f39345462b84fcf77eb8537af847fdf438cc96b05c45d6aaca4e473ade0
 F test/index4.test ab92e736d5946840236cd61ac3191f91a7856bf6
 F test/index5.test 8621491915800ec274609e42e02a97d67e9b13e7
-F test/index6.test 6b3e6cd4bef343ed4541e74c55936ed112962a6552c085242612b598e12910a4
-F test/index7.test 72b59b8ddc5c13f4962886b4011eb9975014317d17ef36c6297921362fb7dd98
+F test/index6.test 448fa05f5d78f5feee4832fe4017dede4ccbc660601fb7e84d02329389cb638c
+F test/index7.test be02a0b4e53ac4ad7db4995fe02b428597a2e104c4f574b0d4b2f6b082e96b28
 F test/index8.test bc2e3db70e8e62459aaa1bd7e4a9b39664f8f9d7
 F test/index9.test 0aa3e509dddf81f93380396e40e9bb386904c1054924ba8fa9bcdfe85a8e7721
 F test/indexedby.test a52c8c6abfae4fbfb51d99440de4ca1840dbacc606b05e29328a2a8ba7cd914e
@@ -1823,7 +1823,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 5a8a23ee5f60a31dbd167a0966d1ab3d0f1c07df2251906cb73f23d1f5466b46
-R 29fe64c5387c71445cd8a73a2e3fad84
-U mistachkin
-Z 07cacb21f6144af7a617e9e62f40ea51
+P 5862b83eb36b93016d37e5b86ebb183d891bb553901facab1e5d83e114a38ec3
+R 2a4f7414ec472ef9ce3b0f33b024a5f6
+U drh
+Z dbe61bccc5333ce6e53e70d9eca235ed

diff --git a/manifest.uuid b/manifest.uuid
index 1418d3575cdd1b4827c0dcdb43c813c10d2f7845..d5f918aef25c1552edf5e6e326e7ba97f4a2139b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5862b83eb36b93016d37e5b86ebb183d891bb553901facab1e5d83e114a38ec3
\ No newline at end of file
+c2e439bccc40825e211bfa9a88e6a251ff066ca7453d4e7cb5eab56ce7332635
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index ca63eb66c0fc865f878760fb4cbfe6e7bc0b74fa..940abc1ae0d3db7128049e9ce18154782b8cff86 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -4943,7 +4943,11 @@ int sqlite3ExprImpliesExpr(Parse *pParse, Expr *pE1, Expr *pE2, int iTab){
   ){
     return 1;
   }
-  if( pE2->op==TK_NOTNULL && pE1->op!=TK_ISNULL && pE1->op!=TK_IS ){
+  if( pE2->op==TK_NOTNULL
+   && pE1->op!=TK_ISNULL
+   && pE1->op!=TK_IS
+   && pE1->op!=TK_OR
+  ){
     Expr *pX = sqlite3ExprSkipCollate(pE1->pLeft);
     testcase( pX!=pE1->pLeft );
     if( sqlite3ExprCompare(pParse, pX, pE2->pLeft, iTab)==0 ) return 1;

diff --git a/test/index6.test b/test/index6.test
index 29b73f72d47702804b35724abdd00012a562aa81..bb3f629cc2bdfe6fd2bbe7c29504f3a8fca78c50 100644 (file)
--- a/test/index6.test
+++ b/test/index6.test
@@ -410,4 +410,17 @@ do_execsql_test index6-12.1 {
 do_execsql_test index6-12.2 {
   SELECT x FROM t2 WHERE x IN (SELECT a FROM t1) ORDER BY +x;
 } {1 2}
+
+# 2019-05-04
+# Ticket https://www.sqlite.org/src/tktview/5c6955204c392ae763a95
+# Theorem prover error
+#
+do_execsql_test index6-13.1 {
+  DROP TABLE IF EXISTS t0;
+  CREATE TABLE t0(c0);
+  CREATE INDEX index_0 ON t0(c0) WHERE c0 NOT NULL;
+  INSERT INTO t0(c0) VALUES (NULL);
+  SELECT * FROM t0 WHERE c0 OR 1;
+} {{}}
+
 finish_test

diff --git a/test/index7.test b/test/index7.test
index aa0cf8c1f76a8a2753161b2be42f85d7537593c7..bd529dfbcdbac1b68a129fa601648021d2740ed2 100644 (file)
--- a/test/index7.test
+++ b/test/index7.test
@@ -186,7 +186,7 @@ do_test index7-1.15 {
   }
 } {t1 {15 1} t1a {10 1} t1b {8 1} t1c {15 1} ok}
 
-# Queries use partial indices as appropriate times.
+# Queries use partial indices at appropriate times.
 #
 do_test index7-2.1 {
   execsql {