diff options
| author | drh <drh@noemail.net> | 2019-09-27 15:15:38 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2019-09-27 15:15:38 +0000 |
| commit | ebc64084847c7d3c96aa8aaaebbcd74f3472b1c4 (patch) | |
| tree | aa999c7e7274e7ee9817e02c6bf18715fe5b5f13 | |
| parent | 818a3b548647d7a314771f455c93be5ff6440047 (diff) | |
| download | sqlite-ebc64084847c7d3c96aa8aaaebbcd74f3472b1c4.tar.gz sqlite-ebc64084847c7d3c96aa8aaaebbcd74f3472b1c4.zip | |
Alternative implementation of the previous check-in which is testable.
FossilOrigin-Name: 102ef64462cf0d78395ccc7ebb8e3bf6b7647c06b7657a037e051697bc08d6b7
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/expr.c | 4 |
3 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ -C Fix\ssqlite3ExprCompare()\sso\sthat\sit\signores\sdifferences\sin\sthe\sExpr.iTable\nfield\sfor\sIN\soperators,\sas\sotherwise\sit\scan\slead\sto\sfalse\snegatives,\swhich\nis\susually\sharmless,\sbut\scan\scause\sproblems\sfor\san\sassert()\sin\sthe\swindow\nfunction\slogic. -D 2019-09-27T15:01:02.442 +C Alternative\simplementation\sof\sthe\sprevious\scheck-in\swhich\sis\stestable. +D 2019-09-27T15:15:38.048 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 be398d5b595be69f759e5bd686c72643b314c4554ab46fecbb35b1b0764df533 +F src/expr.c 1e9a6da29e3e13c14783891e867e19a54e2731c6a9b58d011cc4f3b4742a59e4 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 6b79f4c2447691aa9ac86e2a6a774b65f3b3dd053d4220a4893051a0de20f82e F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12 @@ -1845,7 +1845,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 352878fe1cbcf7b6803624544bba5a95565d1638d4dd09e91764ddad17889301 -R 9e8dd2d92764e8f929452cac96d88716 +P 6a204b192a6c6f21988cab217366f21b14c672b81ceadc43675761a6d8c4484f +R 952d3cb6d35457ec46118b09f2b247c9 U drh -Z 3815533c4dbe2c1ea6f4d3a491fda5ac +Z 82e81fce3607c3830fc29914a247a237 diff --git a/manifest.uuid b/manifest.uuid index e7eb6b7bb..5eceb07f6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6a204b192a6c6f21988cab217366f21b14c672b81ceadc43675761a6d8c4484f
\ No newline at end of file +102ef64462cf0d78395ccc7ebb8e3bf6b7647c06b7657a037e051697bc08d6b7
\ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 22c0d0ee5..3b625a2de 100644 --- a/src/expr.c +++ b/src/expr.c @@ -4956,8 +4956,8 @@ int sqlite3ExprCompare(Parse *pParse, Expr *pA, Expr *pB, int iTab){ ){ if( pA->iColumn!=pB->iColumn ) return 2; if( pA->op2!=pB->op2 ) return 2; - if( pA->iTable!=pB->iTable - && pA->op!=TK_IN + if( pA->op!=TK_IN + && pA->iTable!=pB->iTable && (pA->iTable!=iTab || NEVER(pB->iTable>=0)) ) return 2; } } |