aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/select.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/select.c b/src/select.c
index 3c59b5d5f..ed0fc6e4c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -5878,12 +5878,13 @@ static int selectExpander(Walker *pWalker, Select *p){
*/
if( pTab->aCol[j].colFlags & (COLFLAG_HIDDEN|COLFLAG_NOEXPAND) ){
if( IsHiddenColumn(&pTab->aCol[j])
- && (selFlags & SF_IncludeHidden)==0
+ && (selFlags & (SF_IncludeHidden|SF_NestedFrom))==0
){
continue;
}
if( (pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0
&& zTName==0
+ && (selFlags & (SF_NestedFrom))==0
){
continue;
}