aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <>2022-04-28 17:35:58 +0000
committerdrh <>2022-04-28 17:35:58 +0000
commit4bea8c6b564bf84005df34e4b7f318af6ba37189 (patch)
tree6aff230f1cb135a34e8e7a46d0644573ebd1ccd8 /src
parent09121b0523fd6f2e7795b65222aeace231382ac8 (diff)
downloadsqlite-4bea8c6b564bf84005df34e4b7f318af6ba37189.tar.gz
sqlite-4bea8c6b564bf84005df34e4b7f318af6ba37189.zip
Tweaks to the name resolution on parenthesized joins. A small number of
tests fail now due to extra columns appearing in the expansion of "*". FossilOrigin-Name: c86804917e3fffcf0c19bbf11875667f7968275210fc768e650826bd9c87a5d2
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;
}