diff options
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; |