Fossil SCM

Set a default busy-timeout of 10 seconds in the "fossil sql" command, before calling sqlite3_exec() to ATTACH auxiliary database files.

drh 2021-05-26 01:05 trunk
Commit 49df85ac05ca91c47ab6c6442deefdbb6c6034622207fe150a12444307d51c5a
1 file changed +1
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -226,10 +226,11 @@
226226
deltafunc_init(db);
227227
helptext_vtab_register(db);
228228
builtin_vtab_register(db);
229229
g.repositoryOpen = 1;
230230
g.db = db;
231
+ sqlite3_busy_timeout(db, 10000);
231232
sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
232233
db_maybe_set_encryption_key(db, g.zRepositoryName);
233234
if( g.zLocalDbName ){
234235
char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
235236
g.zLocalDbName);
236237
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -226,10 +226,11 @@
226 deltafunc_init(db);
227 helptext_vtab_register(db);
228 builtin_vtab_register(db);
229 g.repositoryOpen = 1;
230 g.db = db;
 
231 sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
232 db_maybe_set_encryption_key(db, g.zRepositoryName);
233 if( g.zLocalDbName ){
234 char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
235 g.zLocalDbName);
236
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -226,10 +226,11 @@
226 deltafunc_init(db);
227 helptext_vtab_register(db);
228 builtin_vtab_register(db);
229 g.repositoryOpen = 1;
230 g.db = db;
231 sqlite3_busy_timeout(db, 10000);
232 sqlite3_db_config(db, SQLITE_DBCONFIG_MAINDBNAME, "repository");
233 db_maybe_set_encryption_key(db, g.zRepositoryName);
234 if( g.zLocalDbName ){
235 char *zSql = sqlite3_mprintf("ATTACH %Q AS 'localdb' KEY ''",
236 g.zLocalDbName);
237

Keyboard Shortcuts

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