database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Fix another case where SQLite assumes that if "~(? AND FALSE)" is true, "?" must be non-null.

Browse Source 
FossilOrigin-Name: 616f5663b3dbd0929128c0990fc6d8bba1513c7ae196b87c450ac0b3b3203ecd
This commit is contained in:
dan
2019-08-29 15:50:16 +00:00
parent 1cd382e350
commit b6a9121bb3
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Avoid\sassuming\sthat\sfor\s"~\s(?\sOR\sTRUE)"\sto\sbe\strue,\s"?"\smust\snot\sbe\sNULL,\sjust\sas\swe\sdo\sfor\s"NOT\s(?\sOR\sTRUE)".\sFix\sfor\sticket\s[c0390363]. C Fix\sanother\scase\swhere\sSQLite\sassumes\sthat\sif\s"~(?\sAND\sFALSE)"\sis\strue,\s"?"\smust\sbe\snon-null.
D 2019-08-29T15:06:35.023 D 2019-08-29T15:50:16.698
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -475,7 +475,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
F src/expr.c 33c1d88c98968fb6407d73da056af50dbc6045fcbf2641e99edb8974f0e19adc F src/expr.c c54fcc18ff7a9206524c44a3ebfaffcf71bae1fda063bdf254cfe2d4820ee71e
F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
F src/fkey.c 6b79f4c2447691aa9ac86e2a6a774b65f3b3dd053d4220a4893051a0de20f82e F src/fkey.c 6b79f4c2447691aa9ac86e2a6a774b65f3b3dd053d4220a4893051a0de20f82e
F src/func.c 4ee36219698d50d672a28eca4adb0fd6b92e607a1883d318315e0d2fd5044467 F src/func.c 4ee36219698d50d672a28eca4adb0fd6b92e607a1883d318315e0d2fd5044467
@@ -1077,7 +1077,7 @@ F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4 F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
F test/istrue.test 75327829744e65cc8700e69340b8e6c192e10e39dfae7ccb0e970d3c4f49090a F test/istrue.test 75327829744e65cc8700e69340b8e6c192e10e39dfae7ccb0e970d3c4f49090a
F test/join.test f505c78a793b0c807d534c1cacf71c7bf96aa734f78d091721f2a6859077b7e8 F test/join.test 6ce8296a08e78632c322cde0add78a7ce05466c3d9ec7d5130b38b5b489e7c27
F test/join2.test 10f7047e723ebd68b2f47189be8eed20451a6f665d8bf46f1774c640d1062417 F test/join2.test 10f7047e723ebd68b2f47189be8eed20451a6f665d8bf46f1774c640d1062417
F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
F test/join4.test 1a352e4e267114444c29266ce79e941af5885916 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
@@ -1837,7 +1837,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P c465d0eb478e42045e08efe8b6fa64d4bd4d747cdf743beae4608562b014169e P 84ae41fd2f50cb7c0c3f6522d0f94817e1bbf96eae5316279e3e32cee4e46e91
R b17ceb5c6a3471208662929e8aee416b R c76b8e8761ede59ea3d32402ab062564
U dan U dan
Z 68262acbccebad319b476c344a9d0307 Z abbce93de6b15f66332b49534306a771

2
manifest.uuid
View File

@@ -1 +1 @@
84ae41fd2f50cb7c0c3f6522d0f94817e1bbf96eae5316279e3e32cee4e46e91 616f5663b3dbd0929128c0990fc6d8bba1513c7ae196b87c450ac0b3b3203ecd

1
src/expr.c
View File

@@ -5103,6 +5103,7 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){
switch( pExpr->op ){ switch( pExpr->op ){
case TK_ISNOT: case TK_ISNOT:
case TK_NOT: case TK_NOT:
case TK_BITNOT:
case TK_ISNULL: case TK_ISNULL:
case TK_NOTNULL: case TK_NOTNULL:
case TK_IS: case TK_IS:

7
test/join.test
View File

@@ -812,11 +812,16 @@ do_execsql_test join-15.105 {
FROM t1 LEFT JOIN t2 FROM t1 LEFT JOIN t2
WHERE a IN (1,3,x,y); WHERE a IN (1,3,x,y);
} {1 2 {} {} x 3 4 {} {} x} } {1 2 {} {} x 3 4 {} {} x}
do_execsql_test join-15.106 { do_execsql_test join-15.106a {
SELECT *, 'x' SELECT *, 'x'
FROM t1 LEFT JOIN t2 FROM t1 LEFT JOIN t2
WHERE NOT ( 'x'='y' AND t2.y=1 ); WHERE NOT ( 'x'='y' AND t2.y=1 );
} {1 2 {} {} x 3 4 {} {} x} } {1 2 {} {} x 3 4 {} {} x}
do_execsql_test join-15.106b {
SELECT *, 'x'
FROM t1 LEFT JOIN t2
WHERE ~ ( 'x'='y' AND t2.y=1 );
} {1 2 {} {} x 3 4 {} {} x}
do_execsql_test join-15.107 { do_execsql_test join-15.107 {
SELECT *, 'x' SELECT *, 'x'
FROM t1 LEFT JOIN t2 FROM t1 LEFT JOIN t2