Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | More efficient handling of the LIMIT clause. Scalar subqueries and EXISTS on compound SELECT statements now working properly. Ticket #1473. (CVS 2747) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
edca8913ca012fc0c17343a27f819de9 |
User & Date: | drh 2005-10-06 16:53:15.000 |
References
2010-04-15
| ||
14:43 | • Ticket [02a8e81d44] LIMIT clause on sub-select in FROM clause of a SELECT in a UNION ALL interpreted incorrectly status still Open with 3 other changes (artifact: c271e30545 user: drh) | |
Context
2005-10-10
| ||
00:05 | Make the default TEMP_STORE=1 (TEMP tables stored on disk) in the configure script. (CVS 2748) (check-in: 9753af5349 user: drh tags: trunk) | |
2005-10-06
| ||
16:53 | More efficient handling of the LIMIT clause. Scalar subqueries and EXISTS on compound SELECT statements now working properly. Ticket #1473. (CVS 2747) (check-in: edca8913ca user: drh tags: trunk) | |
13:59 | Check-in (2744) as incomplete and broke pragma integrity_check. This completes the change and fixes the problem. (CVS 2746) (check-in: 4862eaafd8 user: drh tags: trunk) | |
Changes
Changes to src/expr.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** ** $Id: expr.c,v 1.231 2005/10/06 16:53:15 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** Return the 'affinity' of the expression pExpr if any. ** |
︙ | ︙ | |||
1386 1387 1388 1389 1390 1391 1392 | case TK_EXISTS: case TK_SELECT: { /* This has to be a scalar SELECT. Generate code to put the ** value of this select in a memory cell and record the number ** of the memory cell in iColumn. */ | | > > | > > < | < | > > | | 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 | case TK_EXISTS: case TK_SELECT: { /* This has to be a scalar SELECT. Generate code to put the ** value of this select in a memory cell and record the number ** of the memory cell in iColumn. */ static const Token one = { "1", 0, 1 }; Select *pSel; int iMem; int sop; pExpr->iColumn = iMem = pParse->nMem++; pSel = pExpr->pSelect; if( pExpr->op==TK_SELECT ){ sop = SRT_Mem; sqlite3VdbeAddOp(v, OP_MemNull, iMem, 0); VdbeComment((v, "# Init subquery result")); }else{ sop = SRT_Exists; sqlite3VdbeAddOp(v, OP_MemInt, 0, iMem); VdbeComment((v, "# Init EXISTS result")); } sqlite3ExprDelete(pSel->pLimit); pSel->pLimit = sqlite3Expr(TK_INTEGER, 0, 0, &one); sqlite3Select(pParse, pSel, sop, iMem, 0, 0, 0, 0); break; } } if( testAddr ){ sqlite3VdbeJumpHere(v, testAddr); } |
︙ | ︙ |
Changes to src/select.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** ** $Id: select.c,v 1.277 2005/10/06 16:53:15 drh Exp $ */ #include "sqliteInt.h" /* ** Allocate a new Select structure and return a pointer to that ** structure. |
︙ | ︙ | |||
356 357 358 359 360 361 362 | sqlite3VdbeAddOp(v, OP_Sequence, pOrderBy->iECursor, 0); sqlite3VdbeAddOp(v, OP_Pull, pOrderBy->nExpr + 1, 0); sqlite3VdbeAddOp(v, OP_MakeRecord, pOrderBy->nExpr + 2, 0); sqlite3VdbeAddOp(v, OP_IdxInsert, pOrderBy->iECursor, 0); } /* | | | < < < < < | 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 | sqlite3VdbeAddOp(v, OP_Sequence, pOrderBy->iECursor, 0); sqlite3VdbeAddOp(v, OP_Pull, pOrderBy->nExpr + 1, 0); sqlite3VdbeAddOp(v, OP_MakeRecord, pOrderBy->nExpr + 2, 0); sqlite3VdbeAddOp(v, OP_IdxInsert, pOrderBy->iECursor, 0); } /* ** Add code to implement the OFFSET */ static void codeOffset( Vdbe *v, /* Generate code into this VM */ Select *p, /* The SELECT statement being coded */ int iContinue, /* Jump here to skip the current record */ int nPop /* Number of times to pop stack when jumping */ ){ if( p->iOffset>=0 && iContinue!=0 ){ int addr = sqlite3VdbeCurrentAddr(v) + 3; if( nPop>0 ) addr++; sqlite3VdbeAddOp(v, OP_MemIncr, p->iOffset, 0); sqlite3VdbeAddOp(v, OP_IfMemPos, p->iOffset, addr); if( nPop>0 ){ sqlite3VdbeAddOp(v, OP_Pop, nPop, 0); } sqlite3VdbeAddOp(v, OP_Goto, 0, iContinue); VdbeComment((v, "# skip OFFSET records")); } } /* ** Add code that will check to make sure the top N elements of the ** stack are distinct. iTab is a sorting index that holds previously ** seen combinations of the N values. A new entry is made in iTab ** if the current N values are new. |
︙ | ︙ | |||
445 446 447 448 449 450 451 | assert( pEList!=0 ); /* If there was a LIMIT clause on the SELECT statement, then do the check ** to see if this row should be output. */ hasDistinct = distinct>=0 && pEList && pEList->nExpr>0; if( pOrderBy==0 && !hasDistinct ){ | | | 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 | assert( pEList!=0 ); /* If there was a LIMIT clause on the SELECT statement, then do the check ** to see if this row should be output. */ hasDistinct = distinct>=0 && pEList && pEList->nExpr>0; if( pOrderBy==0 && !hasDistinct ){ codeOffset(v, p, iContinue, 0); } /* Pull the requested columns. */ if( nColumn>0 ){ for(i=0; i<nColumn; i++){ sqlite3VdbeAddOp(v, OP_Column, srcTab, i); |
︙ | ︙ | |||
467 468 469 470 471 472 473 | ** and this row has been seen before, then do not make this row ** part of the result. */ if( hasDistinct ){ int n = pEList->nExpr; codeDistinct(v, distinct, iContinue, n, n+1); if( pOrderBy==0 ){ | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | ** and this row has been seen before, then do not make this row ** part of the result. */ if( hasDistinct ){ int n = pEList->nExpr; codeDistinct(v, distinct, iContinue, n, n+1); if( pOrderBy==0 ){ codeOffset(v, p, iContinue, nColumn); } } switch( eDest ){ /* In this mode, write each query result to the key of the temporary ** table iParm. */ |
︙ | ︙ | |||
542 543 544 545 546 547 548 549 550 551 552 553 | aff = sqlite3CompareAffinity(pEList->a[0].pExpr, aff); sqlite3VdbeOp3(v, OP_MakeRecord, 1, 0, &aff, 1); sqlite3VdbeAddOp(v, OP_IdxInsert, (iParm&0x0000FFFF), 0); } sqlite3VdbeJumpHere(v, addr2); break; } /* If this is a scalar select that is part of an expression, then ** store the results in the appropriate memory cell and break out ** of the scan loop. */ | > > > > > > > > > < | | 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 | aff = sqlite3CompareAffinity(pEList->a[0].pExpr, aff); sqlite3VdbeOp3(v, OP_MakeRecord, 1, 0, &aff, 1); sqlite3VdbeAddOp(v, OP_IdxInsert, (iParm&0x0000FFFF), 0); } sqlite3VdbeJumpHere(v, addr2); break; } /* If any row exists in the result set, record that fact and abort. */ case SRT_Exists: { sqlite3VdbeAddOp(v, OP_MemInt, 1, iParm); sqlite3VdbeAddOp(v, OP_Pop, nColumn, 0); /* The LIMIT clause will terminate the loop for us */ break; } /* If this is a scalar select that is part of an expression, then ** store the results in the appropriate memory cell and break out ** of the scan loop. */ case SRT_Mem: { assert( nColumn==1 ); if( pOrderBy ){ pushOntoSorter(pParse, v, pOrderBy); }else{ sqlite3VdbeAddOp(v, OP_MemStore, iParm, 1); /* The LIMIT clause will jump out of the loop for us */ } break; } #endif /* #ifndef SQLITE_OMIT_SUBQUERY */ /* Send the data to the callback function or to a subroutine. In the ** case of a subroutine, the subroutine itself is responsible for |
︙ | ︙ | |||
590 591 592 593 594 595 596 597 598 599 600 601 602 603 | default: { assert( eDest==SRT_Discard ); sqlite3VdbeAddOp(v, OP_Pop, nColumn, 0); break; } #endif } return 0; } /* ** Given an expression list, generate a KeyInfo structure that records ** the collating sequence for each expression in that expression list. ** | > > > > > > > | 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 | default: { assert( eDest==SRT_Discard ); sqlite3VdbeAddOp(v, OP_Pop, nColumn, 0); break; } #endif } /* Jump to the end of the loop if the LIMIT is reached. */ if( p->iLimit>=0 && pOrderBy==0 ){ sqlite3VdbeAddOp(v, OP_MemIncr, p->iLimit, 0); sqlite3VdbeAddOp(v, OP_IfMemZero, p->iLimit, iBreak); } return 0; } /* ** Given an expression list, generate a KeyInfo structure that records ** the collating sequence for each expression in that expression list. ** |
︙ | ︙ | |||
657 658 659 660 661 662 663 | int cont = sqlite3VdbeMakeLabel(v); int addr; int iTab; ExprList *pOrderBy = p->pOrderBy; iTab = pOrderBy->iECursor; addr = 1 + sqlite3VdbeAddOp(v, OP_Sort, iTab, brk); | | < | | 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 | int cont = sqlite3VdbeMakeLabel(v); int addr; int iTab; ExprList *pOrderBy = p->pOrderBy; iTab = pOrderBy->iECursor; addr = 1 + sqlite3VdbeAddOp(v, OP_Sort, iTab, brk); codeOffset(v, p, cont, 0); sqlite3VdbeAddOp(v, OP_Column, iTab, pOrderBy->nExpr + 1); switch( eDest ){ case SRT_Table: case SRT_VirtualTab: { sqlite3VdbeAddOp(v, OP_NewRowid, iParm, 0); sqlite3VdbeAddOp(v, OP_Pull, 1, 0); sqlite3VdbeAddOp(v, OP_Insert, iParm, 0); break; } #ifndef SQLITE_OMIT_SUBQUERY case SRT_Set: { assert( nColumn==1 ); sqlite3VdbeAddOp(v, OP_NotNull, -1, sqlite3VdbeCurrentAddr(v)+3); sqlite3VdbeAddOp(v, OP_Pop, 1, 0); sqlite3VdbeAddOp(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+3); sqlite3VdbeOp3(v, OP_MakeRecord, 1, 0, "n", P3_STATIC); sqlite3VdbeAddOp(v, OP_IdxInsert, (iParm&0x0000FFFF), 0); break; } case SRT_Mem: { assert( nColumn==1 ); sqlite3VdbeAddOp(v, OP_MemStore, iParm, 1); /* The LIMIT clause will terminate the loop for us */ break; } #endif case SRT_Callback: case SRT_Subroutine: { int i; sqlite3VdbeAddOp(v, OP_Integer, p->pEList->nExpr, 0); |
︙ | ︙ | |||
706 707 708 709 710 711 712 713 714 715 716 717 718 719 | break; } default: { /* Do nothing */ break; } } sqlite3VdbeResolveLabel(v, cont); sqlite3VdbeAddOp(v, OP_Next, iTab, addr); sqlite3VdbeResolveLabel(v, brk); } /* ** Return a pointer to a string containing the 'declaration type' of the | > > > > > > > > > > | 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 | break; } default: { /* Do nothing */ break; } } /* Jump to the end of the loop when the LIMIT is reached */ if( p->iLimit>=0 ){ sqlite3VdbeAddOp(v, OP_MemIncr, p->iLimit, 0); sqlite3VdbeAddOp(v, OP_IfMemZero, p->iLimit, brk); } /* The bottom of the loop */ sqlite3VdbeResolveLabel(v, cont); sqlite3VdbeAddOp(v, OP_Next, iTab, addr); sqlite3VdbeResolveLabel(v, brk); } /* ** Return a pointer to a string containing the 'declaration type' of the |
︙ | ︙ | |||
1324 1325 1326 1327 1328 1329 1330 | v = pParse->pVdbe = sqlite3VdbeCreate(pParse->db); } return v; } /* ** Compute the iLimit and iOffset fields of the SELECT based on the | | | | | > | 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 | v = pParse->pVdbe = sqlite3VdbeCreate(pParse->db); } return v; } /* ** Compute the iLimit and iOffset fields of the SELECT based on the ** pLimit and pOffset expressions. pLimit and pOffset hold the expressions ** that appear in the original SQL statement after the LIMIT and OFFSET ** keywords. Or NULL if those keywords are omitted. iLimit and iOffset ** are the integer memory register numbers for counters used to compute ** the limit and offset. If there is no limit and/or offset, then ** iLimit and iOffset are negative. ** ** This routine changes the values if iLimit and iOffset only if ** a limit or offset is defined by pLimit and pOffset. iLimit and ** iOffset should have been preset to appropriate default values ** (usually but not always -1) prior to calling this routine. ** Only if pLimit!=0 or pOffset!=0 do the limit registers get ** redefined. The UNION ALL operator uses this property to force ** the reuse of the same limit and offset registers across multiple ** SELECT statements. */ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){ /* ** "LIMIT -1" always shows all rows. There is some ** contraversy about what the correct behavior should be. ** The current implementation interprets "LIMIT 0" to mean ** no rows. */ if( p->pLimit ){ int iMem = pParse->nMem++; Vdbe *v = sqlite3GetVdbe(pParse); if( v==0 ) return; sqlite3ExprCode(pParse, p->pLimit); sqlite3VdbeAddOp(v, OP_MustBeInt, 0, 0); sqlite3VdbeAddOp(v, OP_Negative, 0, 0); sqlite3VdbeAddOp(v, OP_MemStore, iMem, 1); VdbeComment((v, "# LIMIT counter")); sqlite3VdbeAddOp(v, OP_IfMemZero, iMem, iBreak); p->iLimit = iMem; } if( p->pOffset ){ int iMem = pParse->nMem++; Vdbe *v = sqlite3GetVdbe(pParse); if( v==0 ) return; sqlite3ExprCode(pParse, p->pOffset); |
︙ | ︙ | |||
1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 | /* Generate code for the left and right SELECT statements. */ pOrderBy = p->pOrderBy; switch( p->op ){ case TK_ALL: { if( pOrderBy==0 ){ assert( !pPrior->pLimit ); pPrior->pLimit = p->pLimit; pPrior->pOffset = p->pOffset; rc = sqlite3Select(pParse, pPrior, eDest, iParm, 0, 0, 0, aff); if( rc ){ goto multi_select_end; } p->pPrior = 0; p->iLimit = pPrior->iLimit; p->iOffset = pPrior->iOffset; p->pLimit = 0; p->pOffset = 0; rc = sqlite3Select(pParse, p, eDest, iParm, 0, 0, 0, aff); p->pPrior = pPrior; if( rc ){ goto multi_select_end; } break; } /* For UNION ALL ... ORDER BY fall through to the next case */ } case TK_EXCEPT: case TK_UNION: { int unionTab; /* Cursor number of the temporary table holding result */ | > > > > > > > > | 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 | /* Generate code for the left and right SELECT statements. */ pOrderBy = p->pOrderBy; switch( p->op ){ case TK_ALL: { if( pOrderBy==0 ){ int addr = 0; assert( !pPrior->pLimit ); pPrior->pLimit = p->pLimit; pPrior->pOffset = p->pOffset; rc = sqlite3Select(pParse, pPrior, eDest, iParm, 0, 0, 0, aff); if( rc ){ goto multi_select_end; } p->pPrior = 0; p->iLimit = pPrior->iLimit; p->iOffset = pPrior->iOffset; p->pLimit = 0; p->pOffset = 0; if( p->iLimit>=0 ){ addr = sqlite3VdbeAddOp(v, OP_IfMemZero, p->iLimit, 0); VdbeComment((v, "# Jump ahead if LIMIT reached")); } rc = sqlite3Select(pParse, p, eDest, iParm, 0, 0, 0, aff); p->pPrior = pPrior; if( rc ){ goto multi_select_end; } if( addr ){ sqlite3VdbeJumpHere(v, addr); } break; } /* For UNION ALL ... ORDER BY fall through to the next case */ } case TK_EXCEPT: case TK_UNION: { int unionTab; /* Cursor number of the temporary table holding result */ |
︙ | ︙ | |||
1618 1619 1620 1621 1622 1623 1624 1625 | int iCont, iBreak, iStart; assert( p->pEList ); if( eDest==SRT_Callback ){ generateColumnNames(pParse, 0, p->pEList); } iBreak = sqlite3VdbeMakeLabel(v); iCont = sqlite3VdbeMakeLabel(v); sqlite3VdbeAddOp(v, OP_Rewind, unionTab, iBreak); | > < | 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 | int iCont, iBreak, iStart; assert( p->pEList ); if( eDest==SRT_Callback ){ generateColumnNames(pParse, 0, p->pEList); } iBreak = sqlite3VdbeMakeLabel(v); iCont = sqlite3VdbeMakeLabel(v); computeLimitRegisters(pParse, p, iBreak); sqlite3VdbeAddOp(v, OP_Rewind, unionTab, iBreak); iStart = sqlite3VdbeCurrentAddr(v); rc = selectInnerLoop(pParse, p, p->pEList, unionTab, p->pEList->nExpr, pOrderBy, -1, eDest, iParm, iCont, iBreak, 0); if( rc ){ rc = 1; goto multi_select_end; |
︙ | ︙ | |||
1694 1695 1696 1697 1698 1699 1700 1701 | */ assert( p->pEList ); if( eDest==SRT_Callback ){ generateColumnNames(pParse, 0, p->pEList); } iBreak = sqlite3VdbeMakeLabel(v); iCont = sqlite3VdbeMakeLabel(v); sqlite3VdbeAddOp(v, OP_Rewind, tab1, iBreak); | > < | 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 | */ assert( p->pEList ); if( eDest==SRT_Callback ){ generateColumnNames(pParse, 0, p->pEList); } iBreak = sqlite3VdbeMakeLabel(v); iCont = sqlite3VdbeMakeLabel(v); computeLimitRegisters(pParse, p, iBreak); sqlite3VdbeAddOp(v, OP_Rewind, tab1, iBreak); iStart = sqlite3VdbeAddOp(v, OP_RowKey, tab1, 0); sqlite3VdbeAddOp(v, OP_NotFound, tab2, iCont); rc = selectInnerLoop(pParse, p, p->pEList, tab1, p->pEList->nExpr, pOrderBy, -1, eDest, iParm, iCont, iBreak, 0); if( rc ){ rc = 1; |
︙ | ︙ | |||
2162 2163 2164 2165 2166 2167 2168 | Expr *pExpr; int iCol; Table *pTab; Index *pIdx; int base; Vdbe *v; int seekOp; | < > | 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 | Expr *pExpr; int iCol; Table *pTab; Index *pIdx; int base; Vdbe *v; int seekOp; ExprList *pEList, *pList, eList; struct ExprList_item eListItem; SrcList *pSrc; int brk; /* Check to see if this query is a simple min() or max() query. Return ** zero if it is not. */ if( p->pGroupBy || p->pHaving || p->pWhere ) return 0; pSrc = p->pSrc; if( pSrc->nSrc!=1 ) return 0; |
︙ | ︙ | |||
2229 2230 2231 2232 2233 2234 2235 | /* Generating code to find the min or the max. Basically all we have ** to do is find the first or the last entry in the chosen index. If ** the min() or max() is on the INTEGER PRIMARY KEY, then find the first ** or last entry in the main table. */ sqlite3CodeVerifySchema(pParse, pTab->iDb); base = pSrc->a[0].iCursor; | > | < | 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 | /* Generating code to find the min or the max. Basically all we have ** to do is find the first or the last entry in the chosen index. If ** the min() or max() is on the INTEGER PRIMARY KEY, then find the first ** or last entry in the main table. */ sqlite3CodeVerifySchema(pParse, pTab->iDb); base = pSrc->a[0].iCursor; brk = sqlite3VdbeMakeLabel(v); computeLimitRegisters(pParse, p, brk); if( pSrc->a[0].pSelect==0 ){ sqlite3OpenTableForReading(v, base, pTab); } if( pIdx==0 ){ sqlite3VdbeAddOp(v, seekOp, base, 0); }else{ /* Even though the cursor used to open the index here is closed ** as soon as a single value has been read from it, allocate it ** using (pParse->nTab++) to prevent the cursor id from being ** reused. This is important for statements of the form |
︙ | ︙ | |||
2262 2263 2264 2265 2266 2267 2268 | sqlite3VdbeAddOp(v, OP_Close, iIdx, 0); sqlite3VdbeAddOp(v, OP_MoveGe, base, 0); } eList.nExpr = 1; memset(&eListItem, 0, sizeof(eListItem)); eList.a = &eListItem; eList.a[0].pExpr = pExpr; | | | | 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 | sqlite3VdbeAddOp(v, OP_Close, iIdx, 0); sqlite3VdbeAddOp(v, OP_MoveGe, base, 0); } eList.nExpr = 1; memset(&eListItem, 0, sizeof(eListItem)); eList.a = &eListItem; eList.a[0].pExpr = pExpr; selectInnerLoop(pParse, p, &eList, 0, 0, 0, -1, eDest, iParm, brk, brk, 0); sqlite3VdbeResolveLabel(v, brk); sqlite3VdbeAddOp(v, OP_Close, base, 0); return 1; } /* ** Analyze and ORDER BY or GROUP BY clause in a SELECT statement. Return |
︙ | ︙ | |||
2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 | ExprList *pGroupBy; /* The GROUP BY clause. May be NULL */ Expr *pHaving; /* The HAVING clause. May be NULL */ int isDistinct; /* True if the DISTINCT keyword is present */ int distinct; /* Table to use for the distinct set */ int rc = 1; /* Value to return from this function */ int addrSortIndex; /* Address of an OP_OpenVirtual instruction */ AggInfo sAggInfo; /* Information used by aggregate queries */ if( sqlite3_malloc_failed || pParse->nErr || p==0 ) return 1; if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1; memset(&sAggInfo, 0, sizeof(sAggInfo)); #ifndef SQLITE_OMIT_COMPOUND_SELECT /* If there is are a sequence of queries, do the earlier ones first. | > | 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 | ExprList *pGroupBy; /* The GROUP BY clause. May be NULL */ Expr *pHaving; /* The HAVING clause. May be NULL */ int isDistinct; /* True if the DISTINCT keyword is present */ int distinct; /* Table to use for the distinct set */ int rc = 1; /* Value to return from this function */ int addrSortIndex; /* Address of an OP_OpenVirtual instruction */ AggInfo sAggInfo; /* Information used by aggregate queries */ int iEnd; /* Address of the end of the query */ if( sqlite3_malloc_failed || pParse->nErr || p==0 ) return 1; if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1; memset(&sAggInfo, 0, sizeof(sAggInfo)); #ifndef SQLITE_OMIT_COMPOUND_SELECT /* If there is are a sequence of queries, do the earlier ones first. |
︙ | ︙ | |||
2659 2660 2661 2662 2663 2664 2665 | ** errors before this routine starts. */ if( pParse->nErr>0 ) goto select_end; /* If writing to memory or generating a set ** only a single column may be output. */ | < | 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 | ** errors before this routine starts. */ if( pParse->nErr>0 ) goto select_end; /* If writing to memory or generating a set ** only a single column may be output. */ #ifndef SQLITE_OMIT_SUBQUERY if( (eDest==SRT_Mem || eDest==SRT_Set) && pEList->nExpr>1 ){ sqlite3ErrorMsg(pParse, "only a single result allowed for " "a SELECT that is part of an expression"); goto select_end; } #endif |
︙ | ︙ | |||
2768 2769 2770 2771 2772 2773 2774 | (char*)pKeyInfo, P3_KEYINFO_HANDOFF); }else{ addrSortIndex = -1; } /* Set the limiter. */ | > | < < < < < < < < < | 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 | (char*)pKeyInfo, P3_KEYINFO_HANDOFF); }else{ addrSortIndex = -1; } /* Set the limiter. */ iEnd = sqlite3VdbeMakeLabel(v); computeLimitRegisters(pParse, p, iEnd); /* If the output is destined for a temporary table, open that table. */ if( eDest==SRT_VirtualTab ){ sqlite3VdbeAddOp(v, OP_OpenVirtual, iParm, pEList->nExpr); } /* Open a virtual index to use for the distinct set. */ if( isDistinct ){ KeyInfo *pKeyInfo; distinct = pParse->nTab++; pKeyInfo = keyInfoFromExprList(pParse, p->pEList); sqlite3VdbeOp3(v, OP_OpenVirtual, distinct, 0, |
︙ | ︙ | |||
3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 | assert( pParent->pSrc->nSrc>parentTab ); assert( pParent->pSrc->a[parentTab].pSelect==p ); sqlite3SelectDelete(p); pParent->pSrc->a[parentTab].pSelect = 0; } #endif /* The SELECT was successfully coded. Set the return code to 0 ** to indicate no errors. */ rc = 0; /* Control jumps to here if an error is encountered above, or upon ** successful coding of the SELECT. */ select_end: sqliteFree(sAggInfo.aCol); sqliteFree(sAggInfo.aFunc); return rc; } | > > > > | 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 | assert( pParent->pSrc->nSrc>parentTab ); assert( pParent->pSrc->a[parentTab].pSelect==p ); sqlite3SelectDelete(p); pParent->pSrc->a[parentTab].pSelect = 0; } #endif /* Jump here to skip this query */ sqlite3VdbeResolveLabel(v, iEnd); /* The SELECT was successfully coded. Set the return code to 0 ** to indicate no errors. */ rc = 0; /* Control jumps to here if an error is encountered above, or upon ** successful coding of the SELECT. */ select_end: sqliteFree(sAggInfo.aCol); sqliteFree(sAggInfo.aFunc); return rc; } |
Changes to src/sqliteInt.h.
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* ** 2001 September 15 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Internal interface definitions for SQLite. ** | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* ** 2001 September 15 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Internal interface definitions for SQLite. ** ** @(#) $Id: sqliteInt.h,v 1.422 2005/10/06 16:53:15 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ /* ** Many people are failing to set -DNDEBUG=1 when compiling SQLite. ** Setting NDEBUG makes the code smaller and run faster. So the following |
︙ | ︙ | |||
1145 1146 1147 1148 1149 1150 1151 | #define SRT_Callback 4 /* Invoke a callback with each row of result */ #define SRT_Mem 5 /* Store result in a memory cell */ #define SRT_Set 6 /* Store non-null results as keys in an index */ #define SRT_Table 7 /* Store result as data with an automatic rowid */ #define SRT_VirtualTab 8 /* Create virtual table and store like SRT_Table */ #define SRT_Subroutine 9 /* Call a subroutine to handle results */ | | | 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 | #define SRT_Callback 4 /* Invoke a callback with each row of result */ #define SRT_Mem 5 /* Store result in a memory cell */ #define SRT_Set 6 /* Store non-null results as keys in an index */ #define SRT_Table 7 /* Store result as data with an automatic rowid */ #define SRT_VirtualTab 8 /* Create virtual table and store like SRT_Table */ #define SRT_Subroutine 9 /* Call a subroutine to handle results */ #define SRT_Exists 10 /* Store 1 if the result is not empty */ /* ** An SQL parser context. A copy of this structure is passed through ** the parser and down into all the parser action routine in order to ** carry around information that is global to the entire parse. ** ** The structure is divided into two parts. When the parser and code |
︙ | ︙ |
Changes to src/table.c.
︙ | ︙ | |||
192 193 194 195 196 197 198 | if( azResult==0 ) return; n = (int)azResult[0]; for(i=1; i<n; i++){ if( azResult[i] ) free(azResult[i]); } free(azResult); } } | | | 192 193 194 195 196 197 198 199 | if( azResult==0 ) return; n = (int)azResult[0]; for(i=1; i<n; i++){ if( azResult[i] ) free(azResult[i]); } free(azResult); } } #endif /* SQLITE_OMIT_GET_TABLE */ |
Changes to src/vdbe.c.
︙ | ︙ | |||
39 40 41 42 43 44 45 | ** ** Various scripts scan this source file in order to generate HTML ** documentation, headers files, or other derived files. The formatting ** of the code in this file is, therefore, important. See other comments ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | ** ** Various scripts scan this source file in order to generate HTML ** documentation, headers files, or other derived files. The formatting ** of the code in this file is, therefore, important. See other comments ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** ** $Id: vdbe.c,v 1.492 2005/10/06 16:53:16 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> #include "vdbeInt.h" /* |
︙ | ︙ | |||
4137 4138 4139 4140 4141 4142 4143 | break; } #endif /* SQLITE_OMIT_AUTOINCREMENT */ /* Opcode: MemIncr P1 P2 * ** ** Increment the integer valued memory cell P1 by 1. If P2 is not zero | | | | | > | > > > > > > > > > > > > > > | | 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 | break; } #endif /* SQLITE_OMIT_AUTOINCREMENT */ /* Opcode: MemIncr P1 P2 * ** ** Increment the integer valued memory cell P1 by 1. If P2 is not zero ** and the result after the increment is exactly 0, then jump ** to P2. ** ** This instruction throws an error if the memory cell is not initially ** an integer. */ case OP_MemIncr: { /* no-push */ int i = pOp->p1; Mem *pMem; assert( i>=0 && i<p->nMem ); pMem = &p->aMem[i]; assert( pMem->flags==MEM_Int ); pMem->i++; if( pOp->p2>0 && pMem->i==0 ){ pc = pOp->p2 - 1; } break; } /* Opcode: IfMemPos P1 P2 * ** ** If the value of memory cell P1 is 1 or greater, jump to P2. If ** the memory cell holds an integer of 0 or less or if it holds something ** that is not an integer, then fall thru. */ case OP_IfMemPos: { /* no-push */ int i = pOp->p1; Mem *pMem; assert( i>=0 && i<p->nMem ); pMem = &p->aMem[i]; if( pMem->flags==MEM_Int && pMem->i>0 ){ pc = pOp->p2 - 1; } break; } /* Opcode: IfMemZero P1 P2 * ** ** If the value of memory cell P1 is exactly 0, jump to P2. */ case OP_IfMemZero: { /* no-push */ int i = pOp->p1; Mem *pMem; assert( i>=0 && i<p->nMem ); pMem = &p->aMem[i]; if( pMem->flags==MEM_Int && pMem->i==0 ){ pc = pOp->p2 - 1; } break; } /* Opcode: MemNull P1 * * ** |
︙ | ︙ |
Added test/tkt1473.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 | # 2005 September 19 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. # # This file implements tests to verify that ticket #1473 has been # fixed. # set testdir [file dirname $argv0] source $testdir/tester.tcl do_test tkt1473-1.1 { execsql { CREATE TABLE t1(a,b); INSERT INTO t1 VALUES(1,2); INSERT INTO t1 VALUES(3,4); SELECT * FROM t1 } } {1 2 3 4} do_test tkt1473-1.2 { execsql { SELECT 1 FROM t1 WHERE a=1 UNION ALL SELECT 2 FROM t1 WHERE b=0 } } {1} do_test tkt1473-1.3 { execsql { SELECT 1 FROM t1 WHERE a=1 UNION SELECT 2 FROM t1 WHERE b=0 } } {1} do_test tkt1473-1.4 { execsql { SELECT 1 FROM t1 WHERE a=1 UNION ALL SELECT 2 FROM t1 WHERE b=4 } } {1 2} do_test tkt1473-1.5 { execsql { SELECT 1 FROM t1 WHERE a=1 UNION SELECT 2 FROM t1 WHERE b=4 } } {1 2} do_test tkt1473-1.6 { execsql { SELECT 1 FROM t1 WHERE a=0 UNION ALL SELECT 2 FROM t1 WHERE b=4 } } {2} do_test tkt1473-1.7 { execsql { SELECT 1 FROM t1 WHERE a=0 UNION SELECT 2 FROM t1 WHERE b=4 } } {2} do_test tkt1473-1.8 { execsql { SELECT 1 FROM t1 WHERE a=0 UNION ALL SELECT 2 FROM t1 WHERE b=0 } } {} do_test tkt1473-1.9 { execsql { SELECT 1 FROM t1 WHERE a=0 UNION SELECT 2 FROM t1 WHERE b=0 } } {} do_test tkt1473-2.2 { execsql { SELECT (SELECT 1 FROM t1 WHERE a=1 UNION ALL SELECT 2 FROM t1 WHERE b=0) } } {1} do_test tkt1473-2.3 { execsql { SELECT (SELECT 1 FROM t1 WHERE a=1 UNION SELECT 2 FROM t1 WHERE b=0) } } {1} do_test tkt1473-2.4 { execsql { SELECT (SELECT 1 FROM t1 WHERE a=1 UNION ALL SELECT 2 FROM t1 WHERE b=4) } } {1} do_test tkt1473-2.5 { execsql { SELECT (SELECT 1 FROM t1 WHERE a=1 UNION SELECT 2 FROM t1 WHERE b=4) } } {1} do_test tkt1473-2.6 { execsql { SELECT (SELECT 1 FROM t1 WHERE a=0 UNION ALL SELECT 2 FROM t1 WHERE b=4) } } {2} do_test tkt1473-2.7 { execsql { SELECT (SELECT 1 FROM t1 WHERE a=0 UNION SELECT 2 FROM t1 WHERE b=4) } } {2} do_test tkt1473-2.8 { execsql { SELECT (SELECT 1 FROM t1 WHERE a=0 UNION ALL SELECT 2 FROM t1 WHERE b=0) } } {{}} do_test tkt1473-2.9 { execsql { SELECT (SELECT 1 FROM t1 WHERE a=0 UNION SELECT 2 FROM t1 WHERE b=0) } } {{}} do_test tkt1473-3.2 { execsql { SELECT EXISTS (SELECT 1 FROM t1 WHERE a=1 UNION ALL SELECT 2 FROM t1 WHERE b=0) } } {1} do_test tkt1473-3.3 { execsql { SELECT EXISTS (SELECT 1 FROM t1 WHERE a=1 UNION SELECT 2 FROM t1 WHERE b=0) } } {1} do_test tkt1473-3.4 { execsql { SELECT EXISTS (SELECT 1 FROM t1 WHERE a=1 UNION ALL SELECT 2 FROM t1 WHERE b=4) } } {1} do_test tkt1473-3.5 { execsql { SELECT EXISTS (SELECT 1 FROM t1 WHERE a=1 UNION SELECT 2 FROM t1 WHERE b=4) } } {1} do_test tkt1473-3.6 { execsql { SELECT EXISTS (SELECT 1 FROM t1 WHERE a=0 UNION ALL SELECT 2 FROM t1 WHERE b=4) } } {1} do_test tkt1473-3.7 { execsql { SELECT EXISTS (SELECT 1 FROM t1 WHERE a=0 UNION SELECT 2 FROM t1 WHERE b=4) } } {1} do_test tkt1473-3.8 { execsql { SELECT EXISTS (SELECT 1 FROM t1 WHERE a=0 UNION ALL SELECT 2 FROM t1 WHERE b=0) } } {0} do_test tkt1473-3.9 { execsql { SELECT EXISTS (SELECT 1 FROM t1 WHERE a=0 UNION SELECT 2 FROM t1 WHERE b=0) } } {0} do_test tkt1473-4.1 { execsql { CREATE TABLE t2(x,y); INSERT INTO t2 VALUES(1,2); INSERT INTO t2 SELECT x+2, y+2 FROM t2; INSERT INTO t2 SELECT x+4, y+4 FROM t2; INSERT INTO t2 SELECT x+8, y+8 FROM t2; INSERT INTO t2 SELECT x+16, y+16 FROM t2; INSERT INTO t2 SELECT x+32, y+32 FROM t2; INSERT INTO t2 SELECT x+64, y+64 FROM t2; SELECT count(*), sum(x), sum(y) FROM t2; } } {64 4096 4160} do_test tkt1473-4.2 { execsql { SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=3 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=2 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=4 } } {2 4 8 10} do_test tkt1473-4.3 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=3 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=2 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=4 ) } } {2} do_test tkt1473-4.4 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=-1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=3 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=2 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=4 ) } } {4} do_test tkt1473-4.5 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=-1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=-1 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=2 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=-4 ) } } {8} do_test tkt1473-4.6 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=-1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=-2 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=-3 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=4 ) } } {10} do_test tkt1473-4.7 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=-1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=-2 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=-3 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=-4 ) } } {{}} do_test tkt1473-5.3 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=3 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=2 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=4 ) } } {1} do_test tkt1473-5.4 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=-1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=3 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=2 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=4 ) } } {1} do_test tkt1473-5.5 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=-1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=-1 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=2 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=-4 ) } } {1} do_test tkt1473-5.6 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=-1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=-2 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=-3 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=4 ) } } {1} do_test tkt1473-5.7 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION ALL SELECT 2 FROM t2 WHERE x=-1 UNION ALL SELECT 3 FROM t2 WHERE x=2 UNION ALL SELECT 4 FROM t2 WHERE x=-2 UNION ALL SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION ALL SELECT 7 FROM t2 WHERE y=1 UNION ALL SELECT 8 FROM t2 WHERE y=-3 UNION ALL SELECT 9 FROM t2 WHERE y=3 UNION ALL SELECT 10 FROM t2 WHERE y=-4 ) } } {0} do_test tkt1473-6.3 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION SELECT 2 FROM t2 WHERE x=1 UNION SELECT 3 FROM t2 WHERE x=2 UNION SELECT 4 FROM t2 WHERE x=3 UNION SELECT 5 FROM t2 WHERE x=4 UNION SELECT 6 FROM t2 WHERE y=0 UNION SELECT 7 FROM t2 WHERE y=1 UNION SELECT 8 FROM t2 WHERE y=2 UNION SELECT 9 FROM t2 WHERE y=3 UNION SELECT 10 FROM t2 WHERE y=4 ) } } {1} do_test tkt1473-6.4 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION SELECT 2 FROM t2 WHERE x=-1 UNION SELECT 3 FROM t2 WHERE x=2 UNION SELECT 4 FROM t2 WHERE x=3 UNION SELECT 5 FROM t2 WHERE x=4 UNION SELECT 6 FROM t2 WHERE y=0 UNION SELECT 7 FROM t2 WHERE y=1 UNION SELECT 8 FROM t2 WHERE y=2 UNION SELECT 9 FROM t2 WHERE y=3 UNION SELECT 10 FROM t2 WHERE y=4 ) } } {1} do_test tkt1473-6.5 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION SELECT 2 FROM t2 WHERE x=-1 UNION SELECT 3 FROM t2 WHERE x=2 UNION SELECT 4 FROM t2 WHERE x=-1 UNION SELECT 5 FROM t2 WHERE x=4 UNION SELECT 6 FROM t2 WHERE y=0 UNION SELECT 7 FROM t2 WHERE y=1 UNION SELECT 8 FROM t2 WHERE y=2 UNION SELECT 9 FROM t2 WHERE y=3 UNION SELECT 10 FROM t2 WHERE y=-4 ) } } {1} do_test tkt1473-6.6 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION SELECT 2 FROM t2 WHERE x=-1 UNION SELECT 3 FROM t2 WHERE x=2 UNION SELECT 4 FROM t2 WHERE x=-2 UNION SELECT 5 FROM t2 WHERE x=4 UNION SELECT 6 FROM t2 WHERE y=0 UNION SELECT 7 FROM t2 WHERE y=1 UNION SELECT 8 FROM t2 WHERE y=-3 UNION SELECT 9 FROM t2 WHERE y=3 UNION SELECT 10 FROM t2 WHERE y=4 ) } } {1} do_test tkt1473-6.7 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION SELECT 2 FROM t2 WHERE x=-1 UNION SELECT 3 FROM t2 WHERE x=2 UNION SELECT 4 FROM t2 WHERE x=-2 UNION SELECT 5 FROM t2 WHERE x=4 UNION SELECT 6 FROM t2 WHERE y=0 UNION SELECT 7 FROM t2 WHERE y=1 UNION SELECT 8 FROM t2 WHERE y=-3 UNION SELECT 9 FROM t2 WHERE y=3 UNION SELECT 10 FROM t2 WHERE y=-4 ) } } {0} do_test tkt1473-6.8 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION SELECT 2 FROM t2 WHERE x=-1 UNION SELECT 3 FROM t2 WHERE x=2 UNION SELECT 4 FROM t2 WHERE x=-2 UNION SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION SELECT 7 FROM t2 WHERE y=1 UNION SELECT 8 FROM t2 WHERE y=-3 UNION SELECT 9 FROM t2 WHERE y=3 UNION SELECT 10 FROM t2 WHERE y=4 ) } } {1} do_test tkt1473-6.9 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 UNION SELECT 2 FROM t2 WHERE x=-1 UNION SELECT 3 FROM t2 WHERE x=2 UNION SELECT 4 FROM t2 WHERE x=-2 UNION SELECT 5 FROM t2 WHERE x=4 UNION ALL SELECT 6 FROM t2 WHERE y=0 UNION SELECT 7 FROM t2 WHERE y=1 UNION SELECT 8 FROM t2 WHERE y=-3 UNION SELECT 9 FROM t2 WHERE y=3 UNION SELECT 10 FROM t2 WHERE y=-4 ) } } {0} do_test tkt1473-7.1 { execsql { SELECT 1 FROM t2 WHERE x=1 EXCEPT SELECT 2 FROM t2 WHERE y=2 } } {1} do_test tkt1473-7.2 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=1 EXCEPT SELECT 2 FROM t2 WHERE y=2 ) } } {1} do_test tkt1473-7.3 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=1 EXCEPT SELECT 2 FROM t2 WHERE y=2 ) } } {1} do_test tkt1473-7.4 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=0 EXCEPT SELECT 2 FROM t2 WHERE y=2 ) } } {{}} do_test tkt1473-7.5 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=0 EXCEPT SELECT 2 FROM t2 WHERE y=2 ) } } {0} do_test tkt1473-8.1 { execsql { SELECT 1 FROM t2 WHERE x=1 INTERSECT SELECT 2 FROM t2 WHERE y=2 } } {} do_test tkt1473-8.1 { execsql { SELECT 1 FROM t2 WHERE x=1 INTERSECT SELECT 1 FROM t2 WHERE y=2 } } {1} do_test tkt1473-8.3 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=1 INTERSECT SELECT 2 FROM t2 WHERE y=2 ) } } {{}} do_test tkt1473-8.4 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=1 INTERSECT SELECT 1 FROM t2 WHERE y=2 ) } } {1} do_test tkt1473-8.5 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=1 INTERSECT SELECT 2 FROM t2 WHERE y=2 ) } } {0} do_test tkt1473-8.6 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=1 INTERSECT SELECT 1 FROM t2 WHERE y=2 ) } } {1} do_test tkt1473-8.7 { execsql { SELECT ( SELECT 1 FROM t2 WHERE x=0 INTERSECT SELECT 1 FROM t2 WHERE y=2 ) } } {{}} do_test tkt1473-8.8 { execsql { SELECT EXISTS ( SELECT 1 FROM t2 WHERE x=1 INTERSECT SELECT 1 FROM t2 WHERE y=0 ) } } {0} finish_test |
Changes to test/where.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing the use of indices in WHERE clases. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing the use of indices in WHERE clases. # # $Id: where.test,v 1.37 2005/10/06 16:53:17 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Build some test data # do_test where-1.0 { |
︙ | ︙ | |||
302 303 304 305 306 307 308 | SELECT * FROM t1 WHERE 0 } } {0} do_test where-4.2 { count { SELECT * FROM t1 WHERE 1 LIMIT 1 } | | | 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 | SELECT * FROM t1 WHERE 0 } } {0} do_test where-4.2 { count { SELECT * FROM t1 WHERE 1 LIMIT 1 } } {1 0 4 0} do_test where-4.3 { execsql { SELECT 99 WHERE 0 } } {} do_test where-4.4 { execsql { |
︙ | ︙ |