Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | When a SELECT statement is terminated by a ROLLBACK TO operation, make the error message be "abort due to ROLLBACK" rather than "callback requested query abort". |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | branch-3.8.7 |
| Files: | files | file ages | folders |
| SHA1: |
34fc4a082c192830e48f643549c04a4f |
| User & Date: | drh 2014-11-17 17:13:06 |
Context
|
2014-11-17
| ||
| 19:25 | Improved comments on the BtCursor.skipNext field. No changes to code. (check-in: e956e7db user: drh tags: branch-3.8.7) | |
| 17:13 | When a SELECT statement is terminated by a ROLLBACK TO operation, make the error message be "abort due to ROLLBACK" rather than "callback requested query abort". (check-in: 34fc4a08 user: drh tags: branch-3.8.7) | |
| 15:32 | Fix a bug in the sqlite3TripAllCursors() routine that prevents it from reporting errors. It is unknown at this time whether or not this omission can result in any incorrect result in an actual query. (check-in: 42588207 user: drh tags: branch-3.8.7) | |
Changes
Changes to src/vdbe.c.
2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 |
rc = p->rc;
}else{
int isSchemaChange;
iSavepoint = db->nSavepoint - iSavepoint - 1;
if( p1==SAVEPOINT_ROLLBACK ){
isSchemaChange = (db->flags & SQLITE_InternChanges)!=0;
for(ii=0; ii<db->nDb; ii++){
rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt, SQLITE_ABORT,
isSchemaChange==0);
if( rc!=SQLITE_OK ) goto abort_due_to_error;
}
}else{
isSchemaChange = 0;
}
for(ii=0; ii<db->nDb; ii++){
|
| > |
2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 |
rc = p->rc;
}else{
int isSchemaChange;
iSavepoint = db->nSavepoint - iSavepoint - 1;
if( p1==SAVEPOINT_ROLLBACK ){
isSchemaChange = (db->flags & SQLITE_InternChanges)!=0;
for(ii=0; ii<db->nDb; ii++){
rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt,
SQLITE_ABORT_ROLLBACK,
isSchemaChange==0);
if( rc!=SQLITE_OK ) goto abort_due_to_error;
}
}else{
isSchemaChange = 0;
}
for(ii=0; ii<db->nDb; ii++){
|
Changes to test/savepoint7.test.
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
|
INSERT INTO t2 VALUES($a,$b,$c);
ROLLBACK TO x2;
}
}
} msg]
db eval {RELEASE x1}
list $rc $msg [db eval {SELECT * FROM t2}]
} {1 {callback requested query abort} {}}
do_test savepoint7-2.2 {
db eval {DELETE FROM t2;}
set rc [catch {
db eval {SELECT * FROM t1} {
db eval {
SAVEPOINT x2;
................................................................................
CREATE TABLE t5(pqr);
INSERT INTO t2 VALUES($a,$b,$c);
ROLLBACK TO x2;
}
}
} msg]
list $rc $msg [db eval {SELECT * FROM t2}]
} {1 {callback requested query abort} {}}
finish_test
|
|
|
|
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
|
INSERT INTO t2 VALUES($a,$b,$c);
ROLLBACK TO x2;
}
}
} msg]
db eval {RELEASE x1}
list $rc $msg [db eval {SELECT * FROM t2}]
} {1 {abort due to ROLLBACK} {}}
do_test savepoint7-2.2 {
db eval {DELETE FROM t2;}
set rc [catch {
db eval {SELECT * FROM t1} {
db eval {
SAVEPOINT x2;
................................................................................
CREATE TABLE t5(pqr);
INSERT INTO t2 VALUES($a,$b,$c);
ROLLBACK TO x2;
}
}
} msg]
list $rc $msg [db eval {SELECT * FROM t2}]
} {1 {abort due to ROLLBACK} {}}
finish_test
|