aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--manifest16
-rw-r--r--manifest.uuid2
-rw-r--r--src/expr.c27
-rw-r--r--test/indexexpr2.test67
4 files changed, 92 insertions, 20 deletions
diff --git a/manifest b/manifest
index a38e9488a..68a3beac9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\smissing\sVdbeCoverage()\smacro.
-D 2019-08-29T16:48:10.044
+C Fix\sother\sproblems\ssimilar\sto\sticket\s[c0390363].
+D 2019-08-29T19:34:29.959
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 c54fcc18ff7a9206524c44a3ebfaffcf71bae1fda063bdf254cfe2d4820ee71e
+F src/expr.c 13cbe4b8af90685aa1359e6866c8b86177049f9c273a3c9bc47dda473f843977
F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
F src/fkey.c 6b79f4c2447691aa9ac86e2a6a774b65f3b3dd053d4220a4893051a0de20f82e
F src/func.c 4ee36219698d50d672a28eca4adb0fd6b92e607a1883d318315e0d2fd5044467
@@ -1053,7 +1053,7 @@ F test/index8.test bc2e3db70e8e62459aaa1bd7e4a9b39664f8f9d7
F test/index9.test 0aa3e509dddf81f93380396e40e9bb386904c1054924ba8fa9bcdfe85a8e7721
F test/indexedby.test a52c8c6abfae4fbfb51d99440de4ca1840dbacc606b05e29328a2a8ba7cd914e
F test/indexexpr1.test 0f293369ed6f56764cfc3db05685d45469d9e685ba87e3698527049ba359ae24
-F test/indexexpr2.test efffd39a278d8d9e8c5e9f82ef23178970951df9d725e4aea6d304bf81be6678
+F test/indexexpr2.test b580f378423bca443ffab47ada677203cfcf8a60f48a8aa20065f27c8f7739b5
F test/indexfault.test 98d78a8ff1f5335628b62f886a1cb7c7dac1ef6d48fa39c51ec871c87dce9811
F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
F test/insert.test 72004f6a900a25bd3f1ce9a72e73d02749644666a8ce6d6d2dba061137e5aa63
@@ -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 47cd634c98b502d40a493455ba6d73cbd0dae74944f9cf06fcbcd025f4b49d6e
-R 82040bfc52a0536ad402b4608c120103
-U drh
-Z 90dda46f03caf5162d829380d2711d0e
+P 33da6092d3d04b6eb6ab396b8c4f668e3529e26bf11e26f5fcb9b61fe3470197
+R fddd1b4f06a264ef0d3ea52604d276ee
+U dan
+Z 0c2c6f276dc80545da616e6fc4335cce
diff --git a/manifest.uuid b/manifest.uuid
index 4597b323c..4548ec71c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-33da6092d3d04b6eb6ab396b8c4f668e3529e26bf11e26f5fcb9b61fe3470197 \ No newline at end of file
+96ff2ba9c4bb71d5f7c6f359986a76a5364b7ac3e1a612441543a9eabecf31df \ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 80bc002d7..fbed5f992 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -5014,14 +5014,16 @@ static int exprImpliesNotNull(
case TK_GE:
case TK_PLUS:
case TK_MINUS:
- case TK_STAR:
- case TK_REM:
- case TK_BITAND:
case TK_BITOR:
- case TK_SLASH:
case TK_LSHIFT:
case TK_RSHIFT:
- case TK_CONCAT: {
+ case TK_CONCAT:
+ seenNot = 1;
+ /* Fall thru */
+ case TK_STAR:
+ case TK_REM:
+ case TK_BITAND:
+ case TK_SLASH: {
if( exprImpliesNotNull(pParse, p->pRight, pNN, iTab, seenNot) ) return 1;
/* Fall thru into the next case */
}
@@ -5102,8 +5104,6 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
if( ExprHasProperty(pExpr, EP_FromJoin) ) return WRC_Prune;
switch( pExpr->op ){
case TK_ISNOT:
- case TK_NOT:
- case TK_BITNOT:
case TK_ISNULL:
case TK_NOTNULL:
case TK_IS:
@@ -5128,6 +5128,18 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
}
return WRC_Prune;
+ case TK_AND:
+ if( sqlite3ExprImpliesNonNullRow(pExpr->pLeft, pWalker->u.iCur)
+ && sqlite3ExprImpliesNonNullRow(pExpr->pRight, pWalker->u.iCur)
+ ){
+ pWalker->eCode = 1;
+ }
+ return WRC_Prune;
+
+ case TK_BETWEEN:
+ sqlite3WalkExpr(pWalker, pExpr->pLeft);
+ return WRC_Prune;
+
/* Virtual tables are allowed to use constraints like x=NULL. So
** a term of the form x=y does not prove that y is not null if x
** is the column of a virtual table */
@@ -5148,6 +5160,7 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
){
return WRC_Prune;
}
+
default:
return WRC_Continue;
}
diff --git a/test/indexexpr2.test b/test/indexexpr2.test
index 589a0589a..5d387c752 100644
--- a/test/indexexpr2.test
+++ b/test/indexexpr2.test
@@ -303,15 +303,74 @@ do_execsql_test 8.0 {
INSERT INTO t0(c0) VALUES (NULL);
}
-breakpoint
-do_execsql_test 8.1 {
+do_execsql_test 8.1.1 {
SELECT * FROM t0 WHERE ~('' BETWEEN t0.c0 AND TRUE);
} {{}}
-
-do_execsql_test 8.2 {
+do_execsql_test 8.1.2 {
SELECT ~('' BETWEEN t0.c0 AND TRUE) FROM t0;
} {-1}
+foreach {tn expr} {
+ 1 " 0 == (34 BETWEEN c0 AND 33)"
+ 2 " 1 != (34 BETWEEN c0 AND 33)"
+ 3 "-1 < (34 BETWEEN c0 AND 33)"
+ 4 "-1 <= (34 BETWEEN c0 AND 33)"
+ 5 " 1 > (34 BETWEEN c0 AND 33)"
+ 6 " 1 >= (34 BETWEEN c0 AND 33)"
+ 7 " 1 - (34 BETWEEN c0 AND 33)"
+ 8 "-1 + (34 BETWEEN c0 AND 33)"
+ 9 " 1 | (34 BETWEEN c0 AND 33)"
+ 10 " 1 << (34 BETWEEN c0 AND 33)"
+ 11 " 1 >> (34 BETWEEN c0 AND 33)"
+ 12 " 1 || (34 BETWEEN c0 AND 33)"
+} {
+ do_execsql_test 8.3.$tn.1 "SELECT * FROM t0 WHERE $expr ORDER BY c0" { {} }
+ do_execsql_test 8.3.$tn.2 "SELECT ($expr) IS TRUE FROM t0" { 1 }
+}
+
+do_execsql_test 8.4 {
+ CREATE TABLE t1(a, b);
+ INSERT INTO t1 VALUES(1, 2), (3, 4);
+ CREATE TABLE t2(x, y);
+}
+
+foreach {tn expr} {
+ 1 " 0 == (a=0 AND y=1)"
+ 2 " 1 != (a=0 AND y=1)"
+ 3 "-1 < (a=0 AND y=1)"
+ 4 "-1 <= (a=0 AND y=1)"
+ 5 " 1 > (a=0 AND y=1)"
+ 6 " 1 >= (a=0 AND y=1)"
+ 7 " 1 - (a=0 AND y=1)"
+ 8 "-1 + (a=0 AND y=1)"
+ 9 " 1 | (a=0 AND y=1)"
+ 10 "1 << (a=0 AND y=1)"
+ 11 "1 >> (a=0 AND y=1)"
+ 12 "1 || (a=0 AND y=1)"
+
+ 13 " 0 == (10 BETWEEN y AND b)"
+ 14 " 1 != (10 BETWEEN y AND b)"
+ 15 "-1 < (10 BETWEEN y AND b)"
+ 16 "-1 <= (10 BETWEEN y AND b)"
+ 17 " 1 > (10 BETWEEN y AND b)"
+ 18 " 1 >= (10 BETWEEN y AND b)"
+ 19 " 1 - (10 BETWEEN y AND b)"
+ 20 "-1 + (10 BETWEEN y AND b)"
+ 21 " 1 | (10 BETWEEN y AND b)"
+ 22 " 1 << (10 BETWEEN y AND b)"
+ 23 " 1 >> (10 BETWEEN y AND b)"
+ 24 " 1 || (10 BETWEEN y AND b)"
+
+ 25 " 1 || (10 BETWEEN y AND b)"
+} {
+ do_execsql_test 8.5.$tn.1 "
+ SELECT * FROM t1 LEFT JOIN t2 WHERE $expr
+ " {1 2 {} {} 3 4 {} {}}
+ do_execsql_test 8.5.$tn.2 "
+ SELECT ($expr) IS TRUE FROM t1 LEFT JOIN t2
+ " {1 1}
+}
finish_test
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-29 21:12:04 +0000