From: drh <> Date: Mon, 22 Jul 2024 16:15:25 +0000 (+0000) Subject: Allow LIMIT expressions to appear in any outer context. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b554155d80798238f3c2d29c674f90f77b1685d;p=thirdparty%2Fsqlite.git Allow LIMIT expressions to appear in any outer context. FossilOrigin-Name: c9d3427de5b55303279449023b7d7957821bfe97089547dcafcfb913806745ed --- diff --git a/manifest b/manifest index 61c9f2949a..83921a10fc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\sallow\sLIMIT\sand\sOFFSET\sto\sbe\sexpressions\sexcept\sfor\sin\sa\sLATERAL. -D 2024-07-22T13:55:44.442 +C Allow\sLIMIT\sexpressions\sto\sappear\sin\sany\souter\scontext. +D 2024-07-22T16:15:25.528 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -753,7 +753,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 F src/prepare.c d99931f45416652895e502328ca49fe782cfc4e1ebdcda13b3736d991ebf42ce F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c -F src/resolve.c 162059912acd2144abf0e3dfd5021eda2cc3747a613803602a1b60825260c92a +F src/resolve.c faf549360137f79582853f0e631e586e1d8e50b01c81b4e8e3413f6a6629955e F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 1f5f1663fe84ee1963a55aef8871f1e7740a8030db517dcbfa16e27c6187fe74 F src/shell.c.in b7d435c137eb323981adff814f172dbaabb9ba504fef17cb11d4681c1633ee13 @@ -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 4f0515138acb5f04b5b2f8b9efa47e1b09f35060fb260dad44617dd88ae1bab8 -R d6545588619662bad3511b4f22e61e5d +P 10347821376db1d33895fa794ac093ec6c2cc28daebe9adfd2578cbd1b3ce386 +R 4c95a122c5976ab28e0a9c267f355dab U drh -Z 6dd3e2c8789ac77f9ca2c0674f0e25d2 +Z 86e33b4ab8ddc73e7f8283d820eff8d6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b30fb5273b..81d835c70f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -10347821376db1d33895fa794ac093ec6c2cc28daebe9adfd2578cbd1b3ce386 +c9d3427de5b55303279449023b7d7957821bfe97089547dcafcfb913806745ed diff --git a/src/resolve.c b/src/resolve.c index cca6ef85be..87432bc392 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -1868,7 +1868,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){ memset(&sNC, 0, sizeof(sNC)); sNC.pParse = pParse; sNC.pWinSelect = p; - if( p->selFlags & SF_Lateral ) sNC.pNext = pOuterNC; + sNC.pNext = pOuterNC; if( sqlite3ResolveExprNames(&sNC, p->pLimit) ){ return WRC_Abort; }