Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Pull in the change that causes VACUUM to preserve rowid values. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | apple-osx |
| Files: | files | file ages | folders |
| SHA3-256: |
c9af2f71bf1bc92a006d9053b0107a52 |
| User & Date: | drh 2019-02-07 19:28:27.045 |
Context
|
2019-02-08
| ||
| 14:59 | Merge the fix for ticket [4e8e4857d32d401f], so that this branch now contains release 3.27.1 plus the extra patch to preserve ROWID values on VACUUM. (check-in: 0cdae60ed7 user: drh tags: apple-osx) | |
|
2019-02-07
| ||
| 19:28 | Pull in the change that causes VACUUM to preserve rowid values. (check-in: c9af2f71bf user: drh tags: apple-osx) | |
| 19:07 | Change VACUUM so that it preserves ROWID values. (check-in: 49e5d11d46 user: drh tags: trunk) | |
| 18:49 | Merge the offical 3.27.0 release. (check-in: 628291641f user: drh tags: apple-osx) | |
Changes
Changes to src/insert.c.
| ︙ | ︙ | |||
2343 2344 2345 2346 2347 2348 2349 |
addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
sqlite3VdbeVerifyAbortable(v, onError);
addr2 = sqlite3VdbeAddOp3(v, OP_NotExists, iDest, 0, regRowid);
VdbeCoverage(v);
sqlite3RowidConstraint(pParse, onError, pDest);
sqlite3VdbeJumpHere(v, addr2);
autoIncStep(pParse, regAutoinc, regRowid);
| | | 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 |
addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
sqlite3VdbeVerifyAbortable(v, onError);
addr2 = sqlite3VdbeAddOp3(v, OP_NotExists, iDest, 0, regRowid);
VdbeCoverage(v);
sqlite3RowidConstraint(pParse, onError, pDest);
sqlite3VdbeJumpHere(v, addr2);
autoIncStep(pParse, regAutoinc, regRowid);
}else if( pDest->pIndex==0 && !(db->mDbFlags & DBFLAG_Vacuum) ){
addr1 = sqlite3VdbeAddOp2(v, OP_NewRowid, iDest, regRowid);
}else{
addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
assert( (pDest->tabFlags & TF_Autoincrement)==0 );
}
sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
if( db->mDbFlags & DBFLAG_Vacuum ){
|
| ︙ | ︙ |
Changes to test/e_vacuum.test.
| ︙ | ︙ | |||
215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 |
# entries in any tables that do not have an explicit INTEGER PRIMARY
# KEY.
#
# Tests e_vacuum-3.1.1 - 3.1.2 demonstrate that rowids can change when
# a database is VACUUMed. Tests e_vacuum-3.1.3 - 3.1.4 show that adding
# an INTEGER PRIMARY KEY column to a table stops this from happening.
#
do_execsql_test e_vacuum-3.1.1 {
CREATE TABLE t4(x);
INSERT INTO t4(x) VALUES('x');
INSERT INTO t4(x) VALUES('y');
INSERT INTO t4(x) VALUES('z');
DELETE FROM t4 WHERE x = 'y';
SELECT rowid, x FROM t4;
} {1 x 3 z}
do_execsql_test e_vacuum-3.1.2 {
VACUUM;
SELECT rowid, x FROM t4;
| > > | > | 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 |
# entries in any tables that do not have an explicit INTEGER PRIMARY
# KEY.
#
# Tests e_vacuum-3.1.1 - 3.1.2 demonstrate that rowids can change when
# a database is VACUUMed. Tests e_vacuum-3.1.3 - 3.1.4 show that adding
# an INTEGER PRIMARY KEY column to a table stops this from happening.
#
# Update 2019-01-07: Rowids are now preserved by VACUUM.
#
do_execsql_test e_vacuum-3.1.1 {
CREATE TABLE t4(x);
INSERT INTO t4(x) VALUES('x');
INSERT INTO t4(x) VALUES('y');
INSERT INTO t4(x) VALUES('z');
DELETE FROM t4 WHERE x = 'y';
SELECT rowid, x FROM t4;
} {1 x 3 z}
do_execsql_test e_vacuum-3.1.2 {
VACUUM;
SELECT rowid, x FROM t4;
} {1 x 3 z}
# Was: {1 x 2 z}
do_execsql_test e_vacuum-3.1.3 {
CREATE TABLE t5(x, y INTEGER PRIMARY KEY);
INSERT INTO t5(x) VALUES('x');
INSERT INTO t5(x) VALUES('y');
INSERT INTO t5(x) VALUES('z');
DELETE FROM t5 WHERE x = 'y';
|
| ︙ | ︙ |