aboutsummaryrefslogtreecommitdiff
path: root/src/walker.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2015-08-20 23:54:25 +0000
committerdrh <drh@noemail.net>2015-08-20 23:54:25 +0000
commit89a10b2d5312ce304906e2ee2f9932302ed2b85b (patch)
treeefa18c5656cf051fb0d10a1576ec6f12f957dfc7 /src/walker.c
parent87c44ef2f76229eeb5086e8e5ddb41a0fc6db150 (diff)
parent0fee5969c8928e4043416fdc6cdfff738ce40f55 (diff)
downloadsqlite-89a10b2d5312ce304906e2ee2f9932302ed2b85b.tar.gz
sqlite-89a10b2d5312ce304906e2ee2f9932302ed2b85b.zip
Merge recent trunk enhancements, include table-valued functions.
FossilOrigin-Name: e9196d566690de0e9815f8cd85be7844322b5a79
Diffstat (limited to 'src/walker.c')
-rw-r--r--src/walker.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/walker.c b/src/walker.c
index e30bb60b5..81e0f2cd6 100644
--- a/src/walker.c
+++ b/src/walker.c
@@ -105,6 +105,11 @@ int sqlite3WalkSelectFrom(Walker *pWalker, Select *p){
if( sqlite3WalkSelect(pWalker, pItem->pSelect) ){
return WRC_Abort;
}
+ if( pItem->fg.isTabFunc
+ && sqlite3WalkExprList(pWalker, pItem->u1.pFuncArg)
+ ){
+ return WRC_Abort;
+ }
}
}
return WRC_Continue;