aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <>2025-05-16 18:19:11 +0000
committerdrh <>2025-05-16 18:19:11 +0000
commit972a0f5e8d3486b39f6fbb86de65883ffe9dfe06 (patch)
tree8920677bd532e6ee5da5d5b3af2872c4ac566d3e /src
parentcd64392301b921015a9381f2747248b31c0fe606 (diff)
downloadsqlite-972a0f5e8d3486b39f6fbb86de65883ffe9dfe06.tar.gz
sqlite-972a0f5e8d3486b39f6fbb86de65883ffe9dfe06.zip
Improved version of the previous check-in.
FossilOrigin-Name: 036c97e36cb36a2ac765a8e8539433dcb63f69155d4c24857f84faa44eed6eb5
Diffstat (limited to 'src')
-rw-r--r--src/select.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/select.c b/src/select.c
index cf535dc79..3b951afff 100644
--- a/src/select.c
+++ b/src/select.c
@@ -8498,10 +8498,9 @@ int sqlite3Select(
if( iOrderByCol ){
Expr *pX = p->pEList->a[iOrderByCol-1].pExpr;
Expr *pBase = sqlite3ExprSkipCollateAndLikely(pX);
- if( ALWAYS(pBase!=0)
- && pBase->op==TK_IF_NULL_ROW
- ){
- pBase = pX = pBase->pLeft;
+ while( ALWAYS(pBase!=0) && pBase->op==TK_IF_NULL_ROW ){
+ pX = pBase->pLeft;
+ pBase = sqlite3ExprSkipCollateAndLikely(pX);
}
if( ALWAYS(pBase!=0)
&& pBase->op!=TK_AGG_COLUMN