database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Add tests and fixes for vector operations that use sub-queries with different combinations of LIMIT, OFFSET and ORDER BY clauses.

Browse Source 
FossilOrigin-Name: 092b1c5ff53c9f3cfed079c46e3353d93f99303e
This commit is contained in:
dan
2016-08-02 18:50:15 +00:00
parent f9b2e05c75
commit 51d82d1d24
4 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/select.c
View File

@@ -873,7 +873,8 @@ static void selectInnerLoop(
** ORDER BY in this case since the order of entries in the set
** does not matter. But there might be a LIMIT clause, in which
** case the order does matter */
pushOntoSorter(pParse, pSort, p, regResult, regResult, 1, nPrefixReg);
pushOntoSorter(
pParse, pSort, p, regResult, regResult, nResultCol, nPrefixReg);
}else{
int r1 = sqlite3GetTempReg(pParse);
assert( sqlite3Strlen30(pDest->zAffSdst)==nResultCol );
@@ -1221,6 +1222,10 @@ static void generateSortTail(
regRowid = 0;
regRow = pDest->iSdst;
nSortData = nColumn;
}else if( eDest==SRT_Set ){
regRowid = sqlite3GetTempReg(pParse);
regRow = sqlite3GetTempRange(pParse, nColumn);
nSortData = nColumn;
}else{
regRowid = sqlite3GetTempReg(pParse);
regRow = sqlite3GetTempReg(pParse);
@@ -1285,7 +1290,11 @@ static void generateSortTail(
}
}
if( regRowid ){
sqlite3ReleaseTempReg(pParse, regRow);
if( eDest==SRT_Set ){
sqlite3ReleaseTempRange(pParse, regRow, nColumn);
}else{
sqlite3ReleaseTempReg(pParse, regRow);
}
sqlite3ReleaseTempReg(pParse, regRowid);
}
/* The bottom of the loop