Fossil SCM
Make sure calls to db_close_config() also close the local checkout when needed.
Commit
aefbd20d6ed9920253467e1858c3e74320bd0c6cbbbdd6706936e3201ef6c0fc
Parent
e28b23159fd3255…
1 file changed
+2
M
src/db.c
+2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1419,10 +1419,11 @@ | ||
| 1419 | 1419 | sqlite3_wal_checkpoint(g.db, 0); |
| 1420 | 1420 | rc = sqlite3_close(g.db); |
| 1421 | 1421 | if( g.fSqlTrace ) fossil_trace("-- db_close_config(%d)\n", rc); |
| 1422 | 1422 | g.db = 0; |
| 1423 | 1423 | g.repositoryOpen = 0; |
| 1424 | + g.localOpen = 0; | |
| 1424 | 1425 | }else{ |
| 1425 | 1426 | return; |
| 1426 | 1427 | } |
| 1427 | 1428 | fossil_free(g.zConfigDbName); |
| 1428 | 1429 | g.zConfigDbName = 0; |
| @@ -3966,10 +3967,11 @@ | ||
| 3966 | 3967 | rDiff = db_double(0.0, "SELECT julianday('now') - julianday(%Q)", g.argv[2]); |
| 3967 | 3968 | fossil_print("Time differences: %s\n", db_timespan_name(rDiff)); |
| 3968 | 3969 | sqlite3_close(g.db); |
| 3969 | 3970 | g.db = 0; |
| 3970 | 3971 | g.repositoryOpen = 0; |
| 3972 | + g.localOpen = 0; | |
| 3971 | 3973 | } |
| 3972 | 3974 | |
| 3973 | 3975 | /* |
| 3974 | 3976 | ** COMMAND: test-without-rowid |
| 3975 | 3977 | ** |
| 3976 | 3978 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1419,10 +1419,11 @@ | |
| 1419 | sqlite3_wal_checkpoint(g.db, 0); |
| 1420 | rc = sqlite3_close(g.db); |
| 1421 | if( g.fSqlTrace ) fossil_trace("-- db_close_config(%d)\n", rc); |
| 1422 | g.db = 0; |
| 1423 | g.repositoryOpen = 0; |
| 1424 | }else{ |
| 1425 | return; |
| 1426 | } |
| 1427 | fossil_free(g.zConfigDbName); |
| 1428 | g.zConfigDbName = 0; |
| @@ -3966,10 +3967,11 @@ | |
| 3966 | rDiff = db_double(0.0, "SELECT julianday('now') - julianday(%Q)", g.argv[2]); |
| 3967 | fossil_print("Time differences: %s\n", db_timespan_name(rDiff)); |
| 3968 | sqlite3_close(g.db); |
| 3969 | g.db = 0; |
| 3970 | g.repositoryOpen = 0; |
| 3971 | } |
| 3972 | |
| 3973 | /* |
| 3974 | ** COMMAND: test-without-rowid |
| 3975 | ** |
| 3976 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1419,10 +1419,11 @@ | |
| 1419 | sqlite3_wal_checkpoint(g.db, 0); |
| 1420 | rc = sqlite3_close(g.db); |
| 1421 | if( g.fSqlTrace ) fossil_trace("-- db_close_config(%d)\n", rc); |
| 1422 | g.db = 0; |
| 1423 | g.repositoryOpen = 0; |
| 1424 | g.localOpen = 0; |
| 1425 | }else{ |
| 1426 | return; |
| 1427 | } |
| 1428 | fossil_free(g.zConfigDbName); |
| 1429 | g.zConfigDbName = 0; |
| @@ -3966,10 +3967,11 @@ | |
| 3967 | rDiff = db_double(0.0, "SELECT julianday('now') - julianday(%Q)", g.argv[2]); |
| 3968 | fossil_print("Time differences: %s\n", db_timespan_name(rDiff)); |
| 3969 | sqlite3_close(g.db); |
| 3970 | g.db = 0; |
| 3971 | g.repositoryOpen = 0; |
| 3972 | g.localOpen = 0; |
| 3973 | } |
| 3974 | |
| 3975 | /* |
| 3976 | ** COMMAND: test-without-rowid |
| 3977 | ** |
| 3978 |