From 4e254641ff2a5aefbce3398346dcb250aef7bbda Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 19 Oct 2023 18:07:58 +0000
Subject: Simplify the Expr compression logic slightly by adding the new
 EP_FullSize property to expressions that are exceptions to the rule and
 should not be compressed.

FossilOrigin-Name: d5ae82ec52eafed5e3dc8c9d99685f6523fce7d973ef7e8d9d75ed9b8912426a
---
 src/window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/window.c')

diff --git a/src/window.c b/src/window.c
index d46eabc3b..2c449592d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1312,8 +1312,9 @@ void sqlite3WindowAttach(Parse *pParse, Expr *p, Window *pWin){
   if( p ){
     assert( p->op==TK_FUNCTION );
     assert( pWin );
+    assert( ExprIsFullSize(p) );
     p->y.pWin = pWin;
-    ExprSetProperty(p, EP_WinFunc);
+    ExprSetProperty(p, EP_WinFunc|EP_FullSize);
     pWin->pOwner = p;
     if( (p->flags & EP_Distinct) && pWin->eFrmType!=TK_FILTER ){
       sqlite3ErrorMsg(pParse,
-- 
cgit v1.2.3


From 243f2ec6a15201fdcabc791fd7618d85332fe83f Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 8 Nov 2023 21:38:30 +0000
Subject: Make a distinction between functions that consume subtypes and
 functions that generate subtypes.

FossilOrigin-Name: 48a92e3ad855227188a4c5afe4abbb7171761cf6fc930660084d9abeecfd91d9
---
 src/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/window.c')

diff --git a/src/window.c b/src/window.c
index 2c449592d..edbfb6c7e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1038,7 +1038,7 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
       assert( ExprUseXList(pWin->pOwner) );
       assert( pWin->pWFunc!=0 );
       pArgs = pWin->pOwner->x.pList;
-      if( pWin->pWFunc->funcFlags & SQLITE_FUNC_SUBTYPE ){
+      if( pWin->pWFunc->funcFlags & SQLITE_VALUE_SUBTYPE ){
         selectWindowRewriteEList(pParse, pMWin, pSrc, pArgs, pTab, &pSublist);
         pWin->iArgCol = (pSublist ? pSublist->nExpr : 0);
         pWin->bExprArgs = 1;
-- 
cgit v1.2.3


From 194b8d514bc8ba594e88c93cfaba66ff24d00ae8 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 9 Nov 2023 12:08:16 +0000
Subject: Omit the new SQLITE_VALUE_SUBTYPE name.  Stay with legacy
 SQLTIE_SUBTYPE. Add extra documentation to sqlite3_value_subtype() and
 sqlite3_result_subtype() indicating that the SQLITE_SUBTYPE and
 SQLITE_RESULT_SUBTYPE properties are required on functions that use those
 interfaces.

FossilOrigin-Name: 563ad3be60d22c45f1c5b9a3e67738593f8b38f137147c56514166fbabf95365
---
 src/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/window.c')

diff --git a/src/window.c b/src/window.c
index edbfb6c7e..62df349fb 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1038,7 +1038,7 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
       assert( ExprUseXList(pWin->pOwner) );
       assert( pWin->pWFunc!=0 );
       pArgs = pWin->pOwner->x.pList;
-      if( pWin->pWFunc->funcFlags & SQLITE_VALUE_SUBTYPE ){
+      if( pWin->pWFunc->funcFlags & SQLITE_SUBTYPE ){
         selectWindowRewriteEList(pParse, pMWin, pSrc, pArgs, pTab, &pSublist);
         pWin->iArgCol = (pSublist ? pSublist->nExpr : 0);
         pWin->bExprArgs = 1;
-- 
cgit v1.2.3