diff options
Diffstat (limited to 'kexi/3rdparty/kexisql/src/select.c')
| -rw-r--r-- | kexi/3rdparty/kexisql/src/select.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kexi/3rdparty/kexisql/src/select.c b/kexi/3rdparty/kexisql/src/select.c index cc13aec8..28136e76 100644 --- a/kexi/3rdparty/kexisql/src/select.c +++ b/kexi/3rdparty/kexisql/src/select.c @@ -1985,7 +1985,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){ ** This routine does NOT free the Select structure passed in. The ** calling function needs to do that. ** -** The pParent, tqparentTab, and *pParentAgg fields are filled in if this +** The pParent, parentTab, and *pParentAgg fields are filled in if this ** SELECT is a subquery. This routine may try to combine this SELECT ** with its tqparent to form a single flat query. In so doing, it might ** change the tqparent query from a non-aggregate to an aggregate query. @@ -2003,7 +2003,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){ ** pParent will be NULL. During the processing of the outer query, this ** routine is called recursively to handle the subquery. For the recursive ** call, pParent will point to the outer query. Because the subquery is -** the second element in a three-way join, the tqparentTab parameter will +** the second element in a three-way join, the parentTab parameter will ** be 1 (the 2nd value of a 0-indexed array.) */ int sqliteSelect( @@ -2012,7 +2012,7 @@ int sqliteSelect( int eDest, /* How to dispose of the results */ int iParm, /* A parameter used by the eDest disposal method */ Select *pParent, /* Another SELECT for which this is a sub-query */ - int tqparentTab, /* Index in pParent->pSrc of this query */ + int parentTab, /* Index in pParent->pSrc of this query */ int *pParentAgg /* True if pParent uses aggregate functions */ ){ int i; @@ -2232,7 +2232,7 @@ int sqliteSelect( ** If flattening is a possiblity, do so and return immediately. */ if( pParent && pParentAgg && - flattenSubquery(pParse, pParent, tqparentTab, *pParentAgg, isAgg) ){ + flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){ if( isAgg ) *pParentAgg = 1; return rc; } @@ -2414,10 +2414,10 @@ int sqliteSelect( ** the use of the temporary table. */ if( pParent ){ - assert( pParent->pSrc->nSrc>tqparentTab ); - assert( pParent->pSrc->a[tqparentTab].pSelect==p ); + assert( pParent->pSrc->nSrc>parentTab ); + assert( pParent->pSrc->a[parentTab].pSelect==p ); sqliteSelectDelete(p); - pParent->pSrc->a[tqparentTab].pSelect = 0; + pParent->pSrc->a[parentTab].pSelect = 0; } /* The SELECT was successfully coded. Set the return code to 0 |