diff options
| author | drh <> | 2022-05-10 00:24:01 +0000 |
|---|---|---|
| committer | drh <> | 2022-05-10 00:24:01 +0000 |
| commit | adef15986a6054a96bb503102327a57b25d64c7d (patch) | |
| tree | 73d7034f50f33079863c2a7eaf50c088b1d254a2 /src | |
| parent | f71b8123df5c0d1913e2b5e148c2a26d319f8fde (diff) | |
| download | sqlite-adef15986a6054a96bb503102327a57b25d64c7d.tar.gz sqlite-adef15986a6054a96bb503102327a57b25d64c7d.zip | |
Simplified "hidden" and "no-expand" handling in the *-expander.
FossilOrigin-Name: c6c3115f3a008cf9b0d7c5c812f17e38c8a75a904032c5f05f0bea03a7340527
Diffstat (limited to 'src')
| -rw-r--r-- | src/select.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/select.c b/src/select.c index 7390d24f2..b53c0c915 100644 --- a/src/select.c +++ b/src/select.c @@ -5882,18 +5882,16 @@ static int selectExpander(Walker *pWalker, Select *p){ ** result-set list unless the SELECT has the SF_IncludeHidden ** bit set. */ - if( pTab->aCol[j].colFlags & (COLFLAG_HIDDEN|COLFLAG_NOEXPAND) ){ - if( IsHiddenColumn(&pTab->aCol[j]) - && ALWAYS((selFlags & SF_IncludeHidden)==0) - ){ - continue; - } - if( ALWAYS((pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0) - && zTName==0 - && (selFlags & (SF_NestedFrom))==0 - ){ - continue; - } + if( (p->selFlags & SF_IncludeHidden)==0 + && IsHiddenColumn(&pTab->aCol[j]) + ){ + continue; + } + if( (pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0 + && zTName==0 + && (selFlags & (SF_NestedFrom))==0 + ){ + continue; } tableSeen = 1; |