From: stephan <stephan@noemail.net>
Date: Thu, 10 Aug 2023 05:25:13 +0000 (+0000)
Subject: Give DbException the option of closing the db to simplify error handling in one case.
X-Git-Tag: version-3.43.0~47^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63fb588d30ff6a5e79e74dcdf2b1c8e287f730c4;p=thirdparty%2Fsqlite.git

Give DbException the option of closing the db to simplify error handling in one case.

FossilOrigin-Name: 908c9a44505422a3a15bef3a174d8b931863bc9c74485311a0e62cfec30087bd
---

diff --git a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
index 34b8cd5adc..99b63c29f6 100644
--- a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
+++ b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
@@ -70,8 +70,12 @@ class SQLTesterException extends RuntimeException {
 }
 
 class DbException extends SQLTesterException {
-  protected DbException(sqlite3 db, int rc){
+  DbException(sqlite3 db, int rc, boolean closeDb){
     super("DB error #"+rc+": "+sqlite3_errmsg(db),true);
+    if( closeDb ) sqlite3_close_v2(db);
+  }
+  DbException(sqlite3 db, int rc){
+    this(db, rc, false);
   }
 }
 
@@ -344,10 +348,7 @@ public class SQLTester {
                    null, dbInitSql.toString());
     }
     if( 0!=rc ){
-      final String msg = sqlite3_errmsg(db);
-      sqlite3_close(db);
-      throw new SQLTesterException("db open failed with code "+
-                                   rc+" and message: "+msg);
+      throw new DbException(db, rc, true);
     }
     return aDb[iCurrentDb] = db;
   }
diff --git a/manifest b/manifest
index 58fe6d30f1..d851b7791e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sversion\sof\sREQUIRED_PROPERTIES\ssupport\sfor\sSQLTester,\swith\sTEMPSTORE_(FILE/MEM)\sand\sRECURSIVE_TRIGGERS\soptions.
-D 2023-08-10T05:14:22.157
+C Give\sDbException\sthe\soption\sof\sclosing\sthe\sdb\sto\ssimplify\serror\shandling\sin\sone\scase.
+D 2023-08-10T05:25:13.132
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -266,7 +266,7 @@ F ext/jni/src/org/sqlite/jni/sqlite3.java 62b1b81935ccf3393472d17cb883dc5ff39c38
 F ext/jni/src/org/sqlite/jni/sqlite3_context.java d26573fc7b309228cb49786e9078597d96232257defa955a3425d10897bca810
 F ext/jni/src/org/sqlite/jni/sqlite3_stmt.java 78e6d1b95ac600a9475e9db4623f69449322b0c93d1bd4e1616e76ed547ed9fc
 F ext/jni/src/org/sqlite/jni/sqlite3_value.java 3d1d4903e267bc0bc81d57d21f5e85978eff389a1a6ed46726dbe75f85e6914a
-F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 6eb2db0465cb3d69f59aadab6d2be0aa8aba3181d1f28aa7e1ca21eb840b554e
+F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 4a0504164c632b817f8fc14f93c455da6b7bcf05fcb0bab2cf28e7fda086d009
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md ab7169b08566a082ef55c9ef8a553827f99958ed3e076f31eef757563fae51ba
 F ext/jni/src/tests/000-000-sanity.test 35817746f1909cc9af5d3e890ee94a43c47ce47127da9cca7d39b0e132d36c84
 F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
@@ -2089,8 +2089,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fc5d3cc30d2b96da42ea10dfb39f1631ff93b8384514fffd641b343df51da2a6
-R 9fb1e3deddfffb0e48b6c7087aa53315
+P 48d16c9d2fe5f54b09004b4f09759c4e2ad247ae84130feb557951e32f48976a
+R 76947bac9cc560f2389ffc3d550b2e03
 U stephan
-Z 7f9ad93c32ab9294dee15aaecfd30d3b
+Z 6304bd9479984f92f8657a18da8e93ff
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 44eb2be827..bcd1efb7ec 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48d16c9d2fe5f54b09004b4f09759c4e2ad247ae84130feb557951e32f48976a
\ No newline at end of file
+908c9a44505422a3a15bef3a174d8b931863bc9c74485311a0e62cfec30087bd
\ No newline at end of file