Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch better-error-handling-1 Excluding Merge-Ins
This is equivalent to a diff from 0d743585 to d693be37
|
2019-12-28
| ||
| 09:08 | Second attempt to fix a problem with unwinding the WITH stack of the Parse object following an error. (check-in: 315d1f1a user: dan tags: trunk) | |
| 08:33 | Merge latest trunk changes with this branch. (Closed-Leaf check-in: d693be37 user: dan tags: better-error-handling-1) | |
| 08:26 | Fix an assert() failure in altertable3-22.4. (check-in: c566a91d user: dan tags: better-error-handling-1) | |
| 03:55 | Fix a faulty assert() associated with query search limiting query plans. (check-in: 0d743585 user: drh tags: trunk) | |
| 02:40 | Convert an assert() back into a conditional. The conditional was converted into an assert() by check-in [6ae4ad6ebee4db88] (2009-05-28) because we were unable to find a test case for it. Yongheng's fuzzer just now found that test case. (check-in: 4d0b9109 user: drh tags: trunk) | |
Changes to src/build.c.
| ︙ | ︙ | |||
2621 2622 2623 2624 2625 2626 2627 |
db->xAuth = 0;
pSelTab = sqlite3ResultSetOfSelect(pParse, pSel, SQLITE_AFF_NONE);
db->xAuth = xAuth;
#else
pSelTab = sqlite3ResultSetOfSelect(pParse, pSel, SQLITE_AFF_NONE);
#endif
pParse->nTab = n;
| > > > | | < < < | 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 |
db->xAuth = 0;
pSelTab = sqlite3ResultSetOfSelect(pParse, pSel, SQLITE_AFF_NONE);
db->xAuth = xAuth;
#else
pSelTab = sqlite3ResultSetOfSelect(pParse, pSel, SQLITE_AFF_NONE);
#endif
pParse->nTab = n;
if( pSelTab==0 ){
pTable->nCol = 0;
nErr++;
}else if( pTable->pCheck ){
/* CREATE VIEW name(arglist) AS ...
** The names of the columns in the table are taken from
** arglist which is stored in pTable->pCheck. The pCheck field
** normally holds CHECK constraints on an ordinary table, but for
** a VIEW it holds the list of column names.
*/
sqlite3ColumnsFromExprList(pParse, pTable->pCheck,
&pTable->nCol, &pTable->aCol);
if( db->mallocFailed==0
&& pParse->nErr==0
&& pTable->nCol==pSel->pEList->nExpr
){
sqlite3SelectAddColumnTypeAndCollation(pParse, pTable, pSel,
SQLITE_AFF_NONE);
}
}else{
/* CREATE VIEW name AS... without an argument list. Construct
** the column names from the SELECT statement that defines the view.
*/
assert( pTable->aCol==0 );
pTable->nCol = pSelTab->nCol;
pTable->aCol = pSelTab->aCol;
pSelTab->nCol = 0;
pSelTab->aCol = 0;
assert( sqlite3SchemaMutexHeld(db, 0, pTable->pSchema) );
}
pTable->nNVCol = pTable->nCol;
sqlite3DeleteTable(db, pSelTab);
sqlite3SelectDelete(db, pSel);
EnableLookaside;
#ifndef SQLITE_OMIT_ALTERTABLE
pParse->eParseMode = eParseMode;
|
| ︙ | ︙ |
Changes to src/select.c.
| ︙ | ︙ | |||
4974 4975 4976 4977 4978 4979 4980 |
if( sqlite3IndexedByLookup(pParse, pFrom) ){
return WRC_Abort;
}
}
/* Process NATURAL keywords, and ON and USING clauses of joins.
*/
| | | 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 |
if( sqlite3IndexedByLookup(pParse, pFrom) ){
return WRC_Abort;
}
}
/* Process NATURAL keywords, and ON and USING clauses of joins.
*/
if( pParse->nErr || db->mallocFailed || sqliteProcessJoin(pParse, p) ){
return WRC_Abort;
}
/* For every "*" that occurs in the column list, insert the names of
** all columns in all tables. And for every TABLE.* insert the names
** of all columns in TABLE. The parser inserted a special expression
** with the TK_ASTERISK operator for each "*" that it found in the column
|
| ︙ | ︙ |
Changes to test/altertab3.test.
| ︙ | ︙ | |||
527 528 529 530 531 532 533 534 |
END;
}
do_catchsql_test 23.2 {
ALTER TABLE t1 RENAME TO t1x;
} {1 {error in trigger r1: no such table: main.t2}}
finish_test
| > > > > > > > > > > > > > > > > > > > > > > | 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 |
END;
}
do_catchsql_test 23.2 {
ALTER TABLE t1 RENAME TO t1x;
} {1 {error in trigger r1: no such table: main.t2}}
#------------------------------------------------------------------------
#
reset_db
do_execsql_test 23.1 {
CREATE TABLE v0 (a);
CREATE VIEW v2 (v3) AS
WITH x1 AS (SELECT * FROM v2)
SELECT v3 AS x, v3 AS y FROM v2;
}
do_catchsql_test 23.2 {
SELECT * FROM v2
} {1 {view v2 is circularly defined}}
db close
sqlite3 db test.db
do_catchsql_test 23.3 {
ALTER TABLE v0 RENAME TO t3 ;
} {1 {error in view v2: view v2 is circularly defined}}
finish_test
|