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

Simplification to the error handling to extension loading in

Browse Source 
sqlite3_open().

FossilOrigin-Name: ec8ff892ac9c6a8f81bcf69f1933f4bb69faa743
This commit is contained in:
drh
2017-02-04 20:15:51 +00:00
parent ff677b20fc
commit 238390c3b4
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Allow\ssqlite3session_apply()\sto\sapply\schangesets\sto\stables\sthat\shave\sbeen\nextended\susing\sALTER\sTABLE\sADD\sCOLUMN. C Simplification\sto\sthe\serror\shandling\sto\sextension\sloading\sin\s\nsqlite3_open().
D 2017-02-04T17:33:30.792 D 2017-02-04T20:15:51.171
F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964 F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@@ -359,7 +359,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
F src/insert.c 444354c23d4d140a57d6eb46f34e376a7f8f62e8 F src/insert.c 444354c23d4d140a57d6eb46f34e376a7f8f62e8
F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258 F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0 F src/main.c eb4f5034ede07e1777e3e31fb2059a0046f499af
F src/malloc.c fc1b9f445290f2145da48fc08730c26e6082b640 F src/malloc.c fc1b9f445290f2145da48fc08730c26e6082b640
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@ -1553,7 +1553,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 97ccf3e4de11ffea46993cb7fb7ab559b9810705 P b20ff81ff9c8af500ea96e0ba9d34524220a89f1
R cad52333a5be0dfe0e9c0b2fb42ed068 R 001e21c81e4051080c5d23cc6f975774
U dan U drh
Z 4713f44978189d862833bfda87ecea6f Z 5c4d22afe8177f7d6c2b43d525198743

2
manifest.uuid
View File

@@ -1 +1 @@
b20ff81ff9c8af500ea96e0ba9d34524220a89f1 ec8ff892ac9c6a8f81bcf69f1933f4bb69faa743

34
src/main.c
View File

@@ -2989,13 +2989,13 @@ static int openDatabase(
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
sqlite3AutoLoadExtensions(db); sqlite3AutoLoadExtensions(db);
rc = sqlite3_errcode(db); rc = sqlite3_errcode(db);
if( rc!=SQLITE_OK ){
goto opendb_out;
}
} }
testcase( rc!=SQLITE_OK && rc!=SQLITE_NOMEM );
testcase( rc!=SQLITE_OK && !db->mallocFailed );
#ifdef SQLITE_ENABLE_FTS1 #ifdef SQLITE_ENABLE_FTS1
if( !db->mallocFailed ){ if( !db->mallocFailed && rc==SQLITE_OK ){
extern int sqlite3Fts1Init(sqlite3*); extern int sqlite3Fts1Init(sqlite3*);
rc = sqlite3Fts1Init(db); rc = sqlite3Fts1Init(db);
} }
@@ -3038,23 +3038,23 @@ static int openDatabase(
} }
#endif #endif
/* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking if( rc==SQLITE_OK ){
** mode. -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
** mode. Doing nothing at all also makes NORMAL the default. ** mode. -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
*/ ** mode. Doing nothing at all also makes NORMAL the default.
*/
#ifdef SQLITE_DEFAULT_LOCKING_MODE #ifdef SQLITE_DEFAULT_LOCKING_MODE
db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE; db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE;
sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt), sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt),
SQLITE_DEFAULT_LOCKING_MODE); SQLITE_DEFAULT_LOCKING_MODE);
#endif #endif
if( rc ) sqlite3Error(db, rc); /* Enable the lookaside-malloc subsystem */
setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside,
sqlite3GlobalConfig.nLookaside);
/* Enable the lookaside-malloc subsystem */ sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside, }
sqlite3GlobalConfig.nLookaside);
sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
opendb_out: opendb_out:
if( db ){ if( db ){