From: drh Date: Wed, 4 Dec 2019 19:45:52 +0000 (+0000) Subject: Window functions are never constant. X-Git-Tag: version-3.31.0~265 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a634c9e653713cfed97f4409486470bc817f514f;p=thirdparty%2Fsqlite.git Window functions are never constant. FossilOrigin-Name: 35f0b5a8c7921f7419eeb11be8201fd6988047042fcaeffa297fc322bc480c1f --- diff --git a/manifest b/manifest index 4945511d74..21e2151b55 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\san\sALWAYS()\sin\sthe\srename\slogic\sreally\sis\salways\strue,\seven\nfor\sfaulty\sinputs. -D 2019-12-04T15:08:58.371 +C Window\sfunctions\sare\snever\sconstant. +D 2019-12-04T19:45:52.712 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -478,7 +478,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7 F src/dbstat.c 6c407e549406c10fde9ac3987f6d734459205239ad370369bc5fcd683084a4fa F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4 -F src/expr.c be8060167e2fcf9861b102602ca40386bf98446ef55e33e0bdee23ff88f16791 +F src/expr.c 208f7345cf977ec3ca4804ecb9b22b24171d8da932ad2a658594052904e98b7c F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12 @@ -1851,7 +1851,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 75b04a4b0d2e65bfcd02cf4e0b6d8f1954957c590814a9b8f9a9ee2adc2ec022 -R e6faf406d0181523009592ea4b4e2b75 +P 54410f0e7710542d5159d0449898598d2b7f7676bfd993644ca47da1bf1fcdac +R b437a01fa2dd5ebcd90d68dab3a8cdde U drh -Z e9d70cfc329b6a3765e17c7dd1f5f7a2 +Z b308fe5294a54ac2642586c321490ca2 diff --git a/manifest.uuid b/manifest.uuid index a083c30287..28cd2ec73b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -54410f0e7710542d5159d0449898598d2b7f7676bfd993644ca47da1bf1fcdac \ No newline at end of file +35f0b5a8c7921f7419eeb11be8201fd6988047042fcaeffa297fc322bc480c1f \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index a3ed249ee0..52b68b7c75 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1941,7 +1941,9 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){ ** and either pWalker->eCode==4 or 5 or the function has the ** SQLITE_FUNC_CONST flag. */ case TK_FUNCTION: - if( pWalker->eCode>=4 || ExprHasProperty(pExpr,EP_ConstFunc) ){ + if( (pWalker->eCode>=4 || ExprHasProperty(pExpr,EP_ConstFunc)) + && !ExprHasProperty(pExpr, EP_WinFunc) + ){ return WRC_Continue; }else{ pWalker->eCode = 0;