Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Additional error reporting. Open the source database read/write so that it can delete the WAL file when done. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | scrub-backup |
Files: | files | file ages | folders |
SHA1: |
d2efd3c176f0eba2d78105f0bb3161db |
User & Date: | drh 2016-05-05 23:59:22.078 |
Context
2016-05-17
| ||
17:11 | Merge the latest changes from trunk. (check-in: 5021dfe1f3 user: drh tags: scrub-backup) | |
2016-05-05
| ||
23:59 | Additional error reporting. Open the source database read/write so that it can delete the WAL file when done. (check-in: d2efd3c176 user: drh tags: scrub-backup) | |
23:39 | Working when run against sqlite.fossil. (check-in: b0bd9dd625 user: drh tags: scrub-backup) | |
Changes
Changes to ext/misc/scrub.c.
︙ | ︙ | |||
153 154 155 156 157 158 159 | /* Open the source database file */ static void scrubBackupOpenSrc(ScrubState *p){ sqlite3_stmt *pStmt; int rc; /* Open the source database file */ p->rcErr = sqlite3_open_v2(p->zSrcFile, &p->dbSrc, | | | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | /* Open the source database file */ static void scrubBackupOpenSrc(ScrubState *p){ sqlite3_stmt *pStmt; int rc; /* Open the source database file */ p->rcErr = sqlite3_open_v2(p->zSrcFile, &p->dbSrc, SQLITE_OPEN_READWRITE | SQLITE_OPEN_URI | SQLITE_OPEN_PRIVATECACHE, 0); if( p->rcErr ){ scrubBackupErr(p, "cannot open source database: %s", sqlite3_errmsg(p->dbSrc)); return; } p->rcErr = sqlite3_exec(p->dbSrc, "BEGIN", 0, 0, 0); |
︙ | ︙ | |||
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 | } sqlite3_finalize(pStmt); scrub_abort: /* Close the destination database without closing the transaction. If we ** commit, page zero will be overwritten. */ sqlite3_close(s.dbDest); sqlite3_close(s.dbSrc); sqlite3_free(s.page1); if( pzErr ){ *pzErr = s.zErr; }else{ sqlite3_free(s.zErr); } return s.rcErr; } #ifdef SCRUB_STANDALONE /* The main() routine when this utility is run as a stand-alone program */ int main(int argc, char **argv){ char *zErr = 0; int rc; if( argc!=3 ){ fprintf(stderr,"Usage: %s SOURCE DESTINATION\n", argv[0]); exit(1); } rc = sqlite3_scrub_backup(argv[1], argv[2], &zErr); if( rc==SQLITE_NOMEM ){ fprintf(stderr, "%s: out of memory\n", argv[0]); exit(1); } if( zErr ){ fprintf(stderr, "%s: %s\n", argv[0], zErr); sqlite3_free(zErr); exit(1); } return 0; } #endif | > > > > > > > > > > > > > > > | 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 | } sqlite3_finalize(pStmt); scrub_abort: /* Close the destination database without closing the transaction. If we ** commit, page zero will be overwritten. */ sqlite3_close(s.dbDest); /* But do close out the read-transaction on the source database */ sqlite3_exec(s.dbSrc, "COMMIT;", 0, 0, 0); sqlite3_close(s.dbSrc); sqlite3_free(s.page1); if( pzErr ){ *pzErr = s.zErr; }else{ sqlite3_free(s.zErr); } return s.rcErr; } #ifdef SCRUB_STANDALONE /* Error and warning log */ static void errorLogCallback(void *pNotUsed, int iErr, const char *zMsg){ const char *zType; switch( iErr&0xff ){ case SQLITE_WARNING: zType = "WARNING"; break; case SQLITE_NOTICE: zType = "NOTICE"; break; default: zType = "ERROR"; break; } fprintf(stderr, "%s: %s\n", zType, zMsg); } /* The main() routine when this utility is run as a stand-alone program */ int main(int argc, char **argv){ char *zErr = 0; int rc; if( argc!=3 ){ fprintf(stderr,"Usage: %s SOURCE DESTINATION\n", argv[0]); exit(1); } sqlite3_config(SQLITE_CONFIG_LOG, errorLogCallback, 0); rc = sqlite3_scrub_backup(argv[1], argv[2], &zErr); if( rc==SQLITE_NOMEM ){ fprintf(stderr, "%s: out of memory\n", argv[0]); exit(1); } if( zErr ){ fprintf(stderr, "%s: %s\n", argv[0], zErr); sqlite3_free(zErr); exit(1); } return 0; } #endif |