Fossil SCM
Patch SQLite to provide a better error message to sqlite3_log() when it is unable to open a file.
Commit
a158c4e75d17df82034ed6cbd5b47ac3dd7b6505
Parent
9f1d490dd6e692d…
1 file changed
+4
-2
+4
-2
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -628,11 +628,11 @@ | ||
| 628 | 628 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 629 | 629 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 630 | 630 | */ |
| 631 | 631 | #define SQLITE_VERSION "3.6.23.1" |
| 632 | 632 | #define SQLITE_VERSION_NUMBER 3006023 |
| 633 | -#define SQLITE_SOURCE_ID "2010-03-26 22:28:06 b078b588d617e07886ad156e9f54ade6d823568e" | |
| 633 | +#define SQLITE_SOURCE_ID "2010-03-26 22:28:06 ex-b078b588d617e07886ad156e9f54ade6d823568e" | |
| 634 | 634 | |
| 635 | 635 | /* |
| 636 | 636 | ** CAPI3REF: Run-Time Library Version Numbers |
| 637 | 637 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 638 | 638 | ** |
| @@ -26155,11 +26155,13 @@ | ||
| 26155 | 26155 | flags |= SQLITE_OPEN_READONLY; |
| 26156 | 26156 | openFlags |= O_RDONLY; |
| 26157 | 26157 | fd = open(zName, openFlags, openMode); |
| 26158 | 26158 | } |
| 26159 | 26159 | if( fd<0 ){ |
| 26160 | - rc = SQLITE_CANTOPEN_BKPT; | |
| 26160 | + sqlite3_log(SQLITE_CANTOPEN, "cannot open file [%s]: %s", zName, | |
| 26161 | + strerror(errno)); | |
| 26162 | + rc = SQLITE_CANTOPEN; | |
| 26161 | 26163 | goto open_finished; |
| 26162 | 26164 | } |
| 26163 | 26165 | } |
| 26164 | 26166 | assert( fd>=0 ); |
| 26165 | 26167 | if( pOutFlags ){ |
| 26166 | 26168 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -628,11 +628,11 @@ | |
| 628 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 629 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 630 | */ |
| 631 | #define SQLITE_VERSION "3.6.23.1" |
| 632 | #define SQLITE_VERSION_NUMBER 3006023 |
| 633 | #define SQLITE_SOURCE_ID "2010-03-26 22:28:06 b078b588d617e07886ad156e9f54ade6d823568e" |
| 634 | |
| 635 | /* |
| 636 | ** CAPI3REF: Run-Time Library Version Numbers |
| 637 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 638 | ** |
| @@ -26155,11 +26155,13 @@ | |
| 26155 | flags |= SQLITE_OPEN_READONLY; |
| 26156 | openFlags |= O_RDONLY; |
| 26157 | fd = open(zName, openFlags, openMode); |
| 26158 | } |
| 26159 | if( fd<0 ){ |
| 26160 | rc = SQLITE_CANTOPEN_BKPT; |
| 26161 | goto open_finished; |
| 26162 | } |
| 26163 | } |
| 26164 | assert( fd>=0 ); |
| 26165 | if( pOutFlags ){ |
| 26166 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -628,11 +628,11 @@ | |
| 628 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 629 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 630 | */ |
| 631 | #define SQLITE_VERSION "3.6.23.1" |
| 632 | #define SQLITE_VERSION_NUMBER 3006023 |
| 633 | #define SQLITE_SOURCE_ID "2010-03-26 22:28:06 ex-b078b588d617e07886ad156e9f54ade6d823568e" |
| 634 | |
| 635 | /* |
| 636 | ** CAPI3REF: Run-Time Library Version Numbers |
| 637 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 638 | ** |
| @@ -26155,11 +26155,13 @@ | |
| 26155 | flags |= SQLITE_OPEN_READONLY; |
| 26156 | openFlags |= O_RDONLY; |
| 26157 | fd = open(zName, openFlags, openMode); |
| 26158 | } |
| 26159 | if( fd<0 ){ |
| 26160 | sqlite3_log(SQLITE_CANTOPEN, "cannot open file [%s]: %s", zName, |
| 26161 | strerror(errno)); |
| 26162 | rc = SQLITE_CANTOPEN; |
| 26163 | goto open_finished; |
| 26164 | } |
| 26165 | } |
| 26166 | assert( fd>=0 ); |
| 26167 | if( pOutFlags ){ |
| 26168 |