From: drh <> Date: Tue, 11 Apr 2023 19:38:47 +0000 (+0000) Subject: New #ifdef to enable building with -DSQLITE_OMIT_WINDOWFUNC. X-Git-Tag: version-3.42.0~155 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67f3765876f1cbb11dee99fc66837ffaf22337b8;p=thirdparty%2Fsqlite.git New #ifdef to enable building with -DSQLITE_OMIT_WINDOWFUNC. FossilOrigin-Name: e1ff83fa2565334b28bd0d6582088c4ae0d2d9a590d973615a4a598683fe419c --- diff --git a/manifest b/manifest index 2be8f39913..bc517744b1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\san\sALWAYS()\sthat\scan\ssometimes\sbe\sfalse.\s\sAdd\sa\stest\scase\sthat\smakes\nthe\stest\sfalse. -D 2023-04-11T15:06:20.059 +C New\s#ifdef\sto\senable\sbuilding\swith\s-DSQLITE_OMIT_WINDOWFUNC. +D 2023-04-11T19:38:47.332 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -625,7 +625,7 @@ F src/printf.c 7eac1a9896a80697e03e08963e210830532ae2ff610e16c193e95af007ca5623 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 -F src/select.c df007d60326a9aad94f5a4915d01e7de19d77627ed09338747a2e8e741a75add +F src/select.c 93bb02212256b49a90589a4664031896e2b2991198153dff1a33a72f437dad94 F src/shell.c.in 80f7c4c1bdabc9dab416b59287458044c01df97035d626ea57ffeabbb289bdc6 F src/sqlite.h.in 4fff9c6cc5d4cbba9532a668112efb6dc469c425e1a2196664d7c07d508363ef F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 @@ -2052,8 +2052,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 68fcfb58df837b40e401dfa4e505f4f0b87554b9cfeb2c527f3558348b73c1be -R bc6a8cda8e023714aac7bd85583d4924 +P c8fb143d64d8e823684cd26799080da4b42bef121ca3c6315b1803a593490926 +R 23a3c5b92c8f88b7b4f263831382c52f U drh -Z 2237c0728bfff0a59ab0f03de511e2c3 +Z 51e0cafc6ddabd2f402c0ebee1449b15 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d69c4529fb..497bd4caa0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c8fb143d64d8e823684cd26799080da4b42bef121ca3c6315b1803a593490926 \ No newline at end of file +e1ff83fa2565334b28bd0d6582088c4ae0d2d9a590d973615a4a598683fe419c \ No newline at end of file diff --git a/src/select.c b/src/select.c index 9e070be0b3..fcf8ae78d9 100644 --- a/src/select.c +++ b/src/select.c @@ -5266,11 +5266,13 @@ static int disableUnusedSubqueryResultColumns(SrcItem *pItem){ ** use UNION, INTERSECT, or EXCEPT. Only UNION ALL is allowed. */ return 0; } +#ifndef SQLITE_OMIT_WINDOWFUNC if( pX->pWin ){ /* This optimization does not work for subqueries that use window ** functions. */ return 0; } +#endif } colUsed = pItem->colUsed; if( pSub->pOrderBy ){