Simplification to the error handling to extension loading in

sqlite3_open().

FossilOrigin-Name: ec8ff892ac9c6a8f81bcf69f1933f4bb69faa743

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

diff --git a/manifest.uuid b/manifest.uuid
index ffbedec871d07138a45d028bc9ba1b50c23edabd..77acfcf1156348c17c79757c8e7b0f773f111c4e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b20ff81ff9c8af500ea96e0ba9d34524220a89f1
\ No newline at end of file
+ec8ff892ac9c6a8f81bcf69f1933f4bb69faa743
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 9aad8fdd4cf8f05c1158aaae876de9e04bf3305e..e771c8eb04876bbf11e84543badcd064344b3f47 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2989,13 +2989,13 @@ static int openDatabase(
   if( rc==SQLITE_OK ){
     sqlite3AutoLoadExtensions(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
-  if( !db->mallocFailed ){
+  if( !db->mallocFailed && rc==SQLITE_OK ){
     extern int sqlite3Fts1Init(sqlite3*);
     rc = sqlite3Fts1Init(db);
   }
@@ -3038,23 +3038,23 @@ static int openDatabase(
   }
 #endif
 
-  /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
-  ** mode.  -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
-  ** mode.  Doing nothing at all also makes NORMAL the default.
-  */
+  if( rc==SQLITE_OK ){
+    /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
+    ** 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
-  db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE;
-  sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt),
-                          SQLITE_DEFAULT_LOCKING_MODE);
+    db->dfltLockMode = SQLITE_DEFAULT_LOCKING_MODE;
+    sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt),
+                            SQLITE_DEFAULT_LOCKING_MODE);
 #endif
 
-  if( rc ) sqlite3Error(db, rc);
+    /* Enable the lookaside-malloc subsystem */
+    setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside,
+                          sqlite3GlobalConfig.nLookaside);
 
-  /* Enable the lookaside-malloc subsystem */
-  setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside,
-                        sqlite3GlobalConfig.nLookaside);
-
-  sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
+    sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
+  }
 
 opendb_out:
   if( db ){