Fossil SCM
Fix the sqlite3_open() used by "fossil init" so that it will honor the FOSSIL_VFS environment variable.
Commit
7536c6aea562700127969610873a9891d4b4fed0
Parent
d7019134a500927…
1 file changed
+2
-6
M
src/db.c
+2
-6
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -642,15 +642,11 @@ | ||
| 642 | 642 | sqlite3 *db; |
| 643 | 643 | int rc; |
| 644 | 644 | const char *zSql; |
| 645 | 645 | va_list ap; |
| 646 | 646 | |
| 647 | - rc = sqlite3_open(zFileName, &db); | |
| 648 | - if( rc!=SQLITE_OK ){ | |
| 649 | - db_err("[%s] %s", zFileName, sqlite3_errmsg(db)); | |
| 650 | - } | |
| 651 | - sqlite3_busy_timeout(db, 5000); | |
| 647 | + db = openDatabase(zFileName); | |
| 652 | 648 | sqlite3_exec(db, "BEGIN EXCLUSIVE", 0, 0, 0); |
| 653 | 649 | rc = sqlite3_exec(db, zSchema, 0, 0, 0); |
| 654 | 650 | if( rc!=SQLITE_OK ){ |
| 655 | 651 | db_err(sqlite3_errmsg(db)); |
| 656 | 652 | } |
| @@ -697,11 +693,11 @@ | ||
| 697 | 693 | |
| 698 | 694 | /* |
| 699 | 695 | ** Open a database file. Return a pointer to the new database |
| 700 | 696 | ** connection. An error results in process abort. |
| 701 | 697 | */ |
| 702 | -static sqlite3 *openDatabase(const char *zDbName){ | |
| 698 | +LOCAL sqlite3 *openDatabase(const char *zDbName){ | |
| 703 | 699 | int rc; |
| 704 | 700 | const char *zVfs; |
| 705 | 701 | sqlite3 *db; |
| 706 | 702 | |
| 707 | 703 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 708 | 704 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -642,15 +642,11 @@ | |
| 642 | sqlite3 *db; |
| 643 | int rc; |
| 644 | const char *zSql; |
| 645 | va_list ap; |
| 646 | |
| 647 | rc = sqlite3_open(zFileName, &db); |
| 648 | if( rc!=SQLITE_OK ){ |
| 649 | db_err("[%s] %s", zFileName, sqlite3_errmsg(db)); |
| 650 | } |
| 651 | sqlite3_busy_timeout(db, 5000); |
| 652 | sqlite3_exec(db, "BEGIN EXCLUSIVE", 0, 0, 0); |
| 653 | rc = sqlite3_exec(db, zSchema, 0, 0, 0); |
| 654 | if( rc!=SQLITE_OK ){ |
| 655 | db_err(sqlite3_errmsg(db)); |
| 656 | } |
| @@ -697,11 +693,11 @@ | |
| 697 | |
| 698 | /* |
| 699 | ** Open a database file. Return a pointer to the new database |
| 700 | ** connection. An error results in process abort. |
| 701 | */ |
| 702 | static sqlite3 *openDatabase(const char *zDbName){ |
| 703 | int rc; |
| 704 | const char *zVfs; |
| 705 | sqlite3 *db; |
| 706 | |
| 707 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 708 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -642,15 +642,11 @@ | |
| 642 | sqlite3 *db; |
| 643 | int rc; |
| 644 | const char *zSql; |
| 645 | va_list ap; |
| 646 | |
| 647 | db = openDatabase(zFileName); |
| 648 | sqlite3_exec(db, "BEGIN EXCLUSIVE", 0, 0, 0); |
| 649 | rc = sqlite3_exec(db, zSchema, 0, 0, 0); |
| 650 | if( rc!=SQLITE_OK ){ |
| 651 | db_err(sqlite3_errmsg(db)); |
| 652 | } |
| @@ -697,11 +693,11 @@ | |
| 693 | |
| 694 | /* |
| 695 | ** Open a database file. Return a pointer to the new database |
| 696 | ** connection. An error results in process abort. |
| 697 | */ |
| 698 | LOCAL sqlite3 *openDatabase(const char *zDbName){ |
| 699 | int rc; |
| 700 | const char *zVfs; |
| 701 | sqlite3 *db; |
| 702 | |
| 703 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 704 |