OLD | NEW |
1 /* | 1 /* |
2 ** 2008 August 16 | 2 ** 2008 August 16 |
3 ** | 3 ** |
4 ** The author disclaims copyright to this source code. In place of | 4 ** The author disclaims copyright to this source code. In place of |
5 ** a legal notice, here is a blessing: | 5 ** a legal notice, here is a blessing: |
6 ** | 6 ** |
7 ** May you do good and not evil. | 7 ** May you do good and not evil. |
8 ** May you find forgiveness for yourself and forgive others. | 8 ** May you find forgiveness for yourself and forgive others. |
9 ** May you share freely, never taking more than you give. | 9 ** May you share freely, never taking more than you give. |
10 ** | 10 ** |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 SrcList *pSrc; | 98 SrcList *pSrc; |
99 int i; | 99 int i; |
100 struct SrcList_item *pItem; | 100 struct SrcList_item *pItem; |
101 | 101 |
102 pSrc = p->pSrc; | 102 pSrc = p->pSrc; |
103 if( ALWAYS(pSrc) ){ | 103 if( ALWAYS(pSrc) ){ |
104 for(i=pSrc->nSrc, pItem=pSrc->a; i>0; i--, pItem++){ | 104 for(i=pSrc->nSrc, pItem=pSrc->a; i>0; i--, pItem++){ |
105 if( sqlite3WalkSelect(pWalker, pItem->pSelect) ){ | 105 if( sqlite3WalkSelect(pWalker, pItem->pSelect) ){ |
106 return WRC_Abort; | 106 return WRC_Abort; |
107 } | 107 } |
| 108 if( pItem->fg.isTabFunc |
| 109 && sqlite3WalkExprList(pWalker, pItem->u1.pFuncArg) |
| 110 ){ |
| 111 return WRC_Abort; |
| 112 } |
108 } | 113 } |
109 } | 114 } |
110 return WRC_Continue; | 115 return WRC_Continue; |
111 } | 116 } |
112 | 117 |
113 /* | 118 /* |
114 ** Call sqlite3WalkExpr() for every expression in Select statement p. | 119 ** Call sqlite3WalkExpr() for every expression in Select statement p. |
115 ** Invoke sqlite3WalkSelect() for subqueries in the FROM clause and | 120 ** Invoke sqlite3WalkSelect() for subqueries in the FROM clause and |
116 ** on the compound select chain, p->pPrior. | 121 ** on the compound select chain, p->pPrior. |
117 ** | 122 ** |
(...skipping 27 matching lines...) Expand all Loading... |
145 return WRC_Abort; | 150 return WRC_Abort; |
146 } | 151 } |
147 if( pWalker->xSelectCallback2 ){ | 152 if( pWalker->xSelectCallback2 ){ |
148 pWalker->xSelectCallback2(pWalker, p); | 153 pWalker->xSelectCallback2(pWalker, p); |
149 } | 154 } |
150 p = p->pPrior; | 155 p = p->pPrior; |
151 } | 156 } |
152 pWalker->walkerDepth--; | 157 pWalker->walkerDepth--; |
153 return rc & WRC_Abort; | 158 return rc & WRC_Abort; |
154 } | 159 } |
OLD | NEW |