Fossil SCM

More missing db_unprotect() calls.

drh 2020-08-18 13:17 sec2020
Commit 06d3789a2ad847c6e8b35485318353998d2862eb81b91bb9ca8770113f1465ef
Parent a64e384f0c53ddc…
4 files changed +2 +2 +1 +1
~ src/clone.c ~ src/db.c ~ src/import.c ~ src/sync.c
M src/clone.c
+2
--- src/clone.c
+++ src/clone.c
@@ -238,11 +238,13 @@
238238
 fossil_print("Vacuuming the database... "); fflush(stdout);
239239
 if( db_int(0, "PRAGMA page_count")>1000
240240
 && db_int(0, "PRAGMA page_size")<8192 ){
241241
 db_multi_exec("PRAGMA page_size=8192;");
242242
 }
243
+ db_unprotect(PROTECT_ALL);
243244
 db_multi_exec("VACUUM");
245
+ db_protect_pop();
244246
 fossil_print("\nproject-id: %s\n", db_get("project-code", 0));
245247
 fossil_print("server-id: %s\n", db_get("server-code", 0));
246248
 zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
247249
 fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
248250
 }
249251
--- src/clone.c
+++ src/clone.c
@@ -238,11 +238,13 @@
238 fossil_print("Vacuuming the database... "); fflush(stdout);
239 if( db_int(0, "PRAGMA page_count")>1000
240 && db_int(0, "PRAGMA page_size")<8192 ){
241 db_multi_exec("PRAGMA page_size=8192;");
242 }
 
243 db_multi_exec("VACUUM");
 
244 fossil_print("\nproject-id: %s\n", db_get("project-code", 0));
245 fossil_print("server-id: %s\n", db_get("server-code", 0));
246 zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
247 fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
248 }
249
--- src/clone.c
+++ src/clone.c
@@ -238,11 +238,13 @@
238 fossil_print("Vacuuming the database... "); fflush(stdout);
239 if( db_int(0, "PRAGMA page_count")>1000
240 && db_int(0, "PRAGMA page_size")<8192 ){
241 db_multi_exec("PRAGMA page_size=8192;");
242 }
243 db_unprotect(PROTECT_ALL);
244 db_multi_exec("VACUUM");
245 db_protect_pop();
246 fossil_print("\nproject-id: %s\n", db_get("project-code", 0));
247 fossil_print("server-id: %s\n", db_get("server-code", 0));
248 zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
249 fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
250 }
251
M src/db.c
+2
--- src/db.c
+++ src/db.c
@@ -2300,11 +2300,13 @@
23002300
 */
23012301
 if( db_database_slot("localdb")>=0 ){
23022302
 int nFree = db_int(0, "PRAGMA localdb.freelist_count");
23032303
 int nTotal = db_int(0, "PRAGMA localdb.page_count");
23042304
 if( nFree>nTotal/4 ){
2305
+ db_unprotect(PROTECT_ALL);
23052306
 db_multi_exec("VACUUM localdb;");
2307
+ db_protect_pop();
23062308
 }
23072309
 }
23082310
23092311
 if( g.db ){
23102312
 int rc;
23112313
--- src/db.c
+++ src/db.c
@@ -2300,11 +2300,13 @@
2300 */
2301 if( db_database_slot("localdb")>=0 ){
2302 int nFree = db_int(0, "PRAGMA localdb.freelist_count");
2303 int nTotal = db_int(0, "PRAGMA localdb.page_count");
2304 if( nFree>nTotal/4 ){
 
2305 db_multi_exec("VACUUM localdb;");
 
2306 }
2307 }
2308
2309 if( g.db ){
2310 int rc;
2311
--- src/db.c
+++ src/db.c
@@ -2300,11 +2300,13 @@
2300 */
2301 if( db_database_slot("localdb")>=0 ){
2302 int nFree = db_int(0, "PRAGMA localdb.freelist_count");
2303 int nTotal = db_int(0, "PRAGMA localdb.page_count");
2304 if( nFree>nTotal/4 ){
2305 db_unprotect(PROTECT_ALL);
2306 db_multi_exec("VACUUM localdb;");
2307 db_protect_pop();
2308 }
2309 }
2310
2311 if( g.db ){
2312 int rc;
2313
M src/import.c
+1
--- src/import.c
+++ src/import.c
@@ -1759,10 +1759,11 @@
17591759
 if( forceFlag ) file_delete(g.argv[2]);
17601760
 db_create_repository(g.argv[2]);
17611761
 }
17621762
 db_open_repository(g.argv[2]);
17631763
 db_open_config(0, 0);
1764
+ db_unprotect(PROTECT_ALL);
17641765
17651766
 db_begin_transaction();
17661767
 if( !incrFlag ){
17671768
 db_initial_setup(0, 0, zDefaultUser);
17681769
 db_set("main-branch", gimport.zTrunkName, 0);
17691770
--- src/import.c
+++ src/import.c
@@ -1759,10 +1759,11 @@
1759 if( forceFlag ) file_delete(g.argv[2]);
1760 db_create_repository(g.argv[2]);
1761 }
1762 db_open_repository(g.argv[2]);
1763 db_open_config(0, 0);
 
1764
1765 db_begin_transaction();
1766 if( !incrFlag ){
1767 db_initial_setup(0, 0, zDefaultUser);
1768 db_set("main-branch", gimport.zTrunkName, 0);
1769
--- src/import.c
+++ src/import.c
@@ -1759,10 +1759,11 @@
1759 if( forceFlag ) file_delete(g.argv[2]);
1760 db_create_repository(g.argv[2]);
1761 }
1762 db_open_repository(g.argv[2]);
1763 db_open_config(0, 0);
1764 db_unprotect(PROTECT_ALL);
1765
1766 db_begin_transaction();
1767 if( !incrFlag ){
1768 db_initial_setup(0, 0, zDefaultUser);
1769 db_set("main-branch", gimport.zTrunkName, 0);
1770
M src/sync.c
+1
--- src/sync.c
+++ src/sync.c
@@ -545,7 +545,8 @@
545545
 }
546546
 }else{
547547
 fossil_fatal("backup \"%s\" already exists", zDest);
548548
 }
549549
 }
550
+ db_unprotect(PROTECT_ALL);
550551
 db_multi_exec("VACUUM repository INTO %Q", zDest);
551552
 }
552553
--- src/sync.c
+++ src/sync.c
@@ -545,7 +545,8 @@
545 }
546 }else{
547 fossil_fatal("backup \"%s\" already exists", zDest);
548 }
549 }
 
550 db_multi_exec("VACUUM repository INTO %Q", zDest);
551 }
552
--- src/sync.c
+++ src/sync.c
@@ -545,7 +545,8 @@
545 }
546 }else{
547 fossil_fatal("backup \"%s\" already exists", zDest);
548 }
549 }
550 db_unprotect(PROTECT_ALL);
551 db_multi_exec("VACUUM repository INTO %Q", zDest);
552 }
553

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button