database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Add the SQLITE_OPEN_EXRESCODE flag for sqlite3_open_v2().

Browse Source 
FossilOrigin-Name: ff9373f42d8479be5cae6cc15dc7fe0cc125c6c0157f5375bf7e1e77c624655d
This commit is contained in:
drh
2021-11-05 19:36:26 +00:00
parent 695c87f67d
commit 91acf7d353
6 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.c
View File

@@ -3188,8 +3188,8 @@ static int openDatabase(
** dealt with in the previous code block. Besides these, the only
** valid input flags for sqlite3_open_v2() are SQLITE_OPEN_READONLY,
** SQLITE_OPEN_READWRITE, SQLITE_OPEN_CREATE, SQLITE_OPEN_SHAREDCACHE,
** SQLITE_OPEN_PRIVATECACHE, and some reserved bits. Silently mask
** off all other flags.
** SQLITE_OPEN_PRIVATECACHE, SQLITE_OPEN_EXRESCODE, and some reserved
** bits. Silently mask off all other flags.
*/
flags &= ~( SQLITE_OPEN_DELETEONCLOSE |
SQLITE_OPEN_EXCLUSIVE |
@@ -3224,7 +3224,7 @@ static int openDatabase(
}
}
sqlite3_mutex_enter(db->mutex);
db->errMask = 0xff;
db->errMask = (flags & SQLITE_OPEN_EXRESCODE)!=0 ? 0xffffffff : 0xff;
db->nDb = 2;
db->eOpenState = SQLITE_STATE_BUSY;
db->aDb = db->aDbStatic;
@@ -3457,7 +3457,7 @@ opendb_out:
}
rc = sqlite3_errcode(db);
assert( db!=0 || rc==SQLITE_NOMEM );
if( rc==SQLITE_NOMEM ){
if( (rc&0xff)==SQLITE_NOMEM ){
sqlite3_close(db);
db = 0;
}else if( rc!=SQLITE_OK ){
@@ -3472,7 +3472,7 @@ opendb_out:
}
#endif
sqlite3_free_filename(zOpen);
return rc & 0xff;
return rc;
}