From: drh <> Date: Sat, 20 Jul 2024 17:38:56 +0000 (+0000) Subject: Fix rule (1c-ii) of the fromClauseTermCanBeCoroutine() decision so that it X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0303047cc6d04e97c4b9eabb125432acf460334e;p=thirdparty%2Fsqlite.git Fix rule (1c-ii) of the fromClauseTermCanBeCoroutine() decision so that it work with LATERAL. Add testcase() macros to verify bitmask conditions are all checked. FossilOrigin-Name: 23d83a41eab35d16bfc960d62d3b29f7bd465d0507bbc68c72b880553f34b58e --- diff --git a/manifest b/manifest index b5ef9fb4b2..08e8530fbd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stestcase()\smacros\sto\sbitmap\stests\sin\sthe\snew\scode. -D 2024-07-20T14:06:16.633 +C Fix\srule\s(1c-ii)\sof\sthe\sfromClauseTermCanBeCoroutine()\sdecision\sso\sthat\sit\nwork\swith\sLATERAL.\s\sAdd\stestcase()\smacros\sto\sverify\sbitmask\sconditions\sare\nall\schecked. +D 2024-07-20T17:38:56.017 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -755,7 +755,7 @@ F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 85b299024d32eb6fb4490490a82514627cfff3ff18ee426899ff34aa5a039ce5 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c 9224f6b9fbc392f95a2bbdedd554437bfaac63766e34f6a2b30e46a5cb6058e7 +F src/select.c 94ea1909c0c8d166ba6f08060b17915414e0e4d036e99c77b1d05038e3fccbaf F src/shell.c.in b7d435c137eb323981adff814f172dbaabb9ba504fef17cb11d4681c1633ee13 F src/sqlite.h.in 6c884a87bbf8828562b49272025a1e66e3801a196a58b0bdec87edcd2c9c8fc1 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 @@ -2196,8 +2196,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 4ee74b7224ce2d1523295f7aef6dbf56e6071f9673eeff102eeb59b52b991857 -R 98668a2535b86f926eb6b7f52010c01e +P 874bc7bc25e4733bfbb1d0989aa3eed62138ff99e7f31c6753646ea7994cad67 +R 163bdb6a964ae676889e70ef410331e8 U drh -Z 3d8329a45e5d367c8bd578af90e62c37 +Z 9beae14f28c9ec989e414774a76038f5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index c6995178d4..cef80fe4c8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -874bc7bc25e4733bfbb1d0989aa3eed62138ff99e7f31c6753646ea7994cad67 +23d83a41eab35d16bfc960d62d3b29f7bd465d0507bbc68c72b880553f34b58e diff --git a/src/select.c b/src/select.c index 0cf65ed127..59492bd366 100644 --- a/src/select.c +++ b/src/select.c @@ -7287,7 +7287,12 @@ static int fromClauseTermCanBeCoroutine( } if( selFlags & SF_UpdateFrom ) return 0; /* (1c-iii) */ while( 1 /*exit-by-break*/ ){ - if( pItem->fg.jointype & (JT_OUTER|JT_CROSS) ) return 0; /* (1c-ii) */ + if( pItem->fg.jointype & (JT_OUTER|JT_CROSS|JT_LATERAL) ){ + testcase( pItem->fg.jointype & JT_OUTER ); + testcase( pItem->fg.jointype & JT_CROSS ); + testcase( pItem->fg.jointype & JT_LATERAL ); + return 0; /* (1c-ii) */ + } if( i==0 ) break; i--; pItem--;