Code EP_InnerJoin constraints at the same time that EP_FromJoin constraints

are coded.

FossilOrigin-Name: b57033d2af2196e2f7e5305f3504fc20da5cadeb66026d38b999fe909cab8ac5

diff --git a/manifest b/manifest
index d44ee42fffd53a94815ed0bb7a9613bfa2505f83..41ccbb6c12b19f088321988014067afb812e09e1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sON-clause\sconstraint\susage\sfix\sfrom\strunk\sinto\sthe\sjoinD\sbranch.
-D 2022-05-04T14:46:08.113
+C Code\sEP_InnerJoin\sconstraints\sat\sthe\ssame\stime\sthat\sEP_FromJoin\sconstraints\nare\scoded.
+D 2022-05-04T17:30:51.826
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -642,7 +642,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 70eae5fd61a0dd2c613e1fbf84baa5f5cf95f974714538b27b3d45f0a00a16c8
 F src/whereInt.h 4db5a877a9d1f38b5c928c1c84297c07f30b9a3bc1f5f66214cf1a8ef90a0556
-F src/wherecode.c cd9da760d391a51013f9ab8bc8ca7ad67f3b96e4857efe0d1dd85f538b3494a6
+F src/wherecode.c 72f8eeed5527450c8e2258160a7bd04534a76c161230d100da0f43a86c6e29ac
 F src/whereexpr.c 174d4ad5be165c610c907abb779ef4a97974d22b84e1ce7898d2d9f6947249e5
 F src/window.c 924e04fd6e0e113d4dba18b78d43fcb8e42b8ebffc8fc728da52cf3ab014cf3c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1952,8 +1952,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P befa8cbc0682bc3269f87e392a1f3d4baacf4db7c716ea84192bb9c13c99490b 544268a723cafdf0460221f5f018e752836436bad0fac90852cec70e63d9dcde
-R 3fa9af57dc36108f156d9655a983b60c
+P 0a20d4a85964fb5f2060b9522356ad2711f41d0d526ba3d2e58fc51029878298
+R 2b01a3d6c7b6f02d4e522e3ed6c45004
 U drh
-Z 77216fee7696ce64d1faeda84f2db610
+Z 351fa3d6764053a0a0ad8bba09a5f2d9
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 992ca0ebf84570fc37e7f31af68f50449e04d70a..932b6d24a5b2703b178c742def54991decd998a7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0a20d4a85964fb5f2060b9522356ad2711f41d0d526ba3d2e58fc51029878298
\ No newline at end of file
+b57033d2af2196e2f7e5305f3504fc20da5cadeb66026d38b999fe909cab8ac5
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index 0a4a0019cf0b188e14de1a8672f99a952d3439e6..a942e6e7fb8a02e4cb246e753af937df9d370233 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2621,7 +2621,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
       pE = pTerm->pExpr;
       assert( pE!=0 );
       if( (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ))
-       && !ExprHasProperty(pE,EP_FromJoin)
+       && !ExprHasProperty(pE,EP_FromJoin|EP_InnerJoin)
       ){
         continue;
       }