From: stephan <stephan@noemail.net>
Date: Wed, 9 Aug 2023 17:23:52 +0000 (+0000)
Subject: SQLTester --result command: do not double-{}-wrap error messages and do not throw... 
X-Git-Tag: version-3.43.0~47^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16e620e07ff5ebdb14827c2be07af651a2a83c5e;p=thirdparty%2Fsqlite.git

SQLTester --result command: do not double-{}-wrap error messages and do not throw on db error.

FossilOrigin-Name: f7be20f5a62f8970f957e5c3a1d1c6536995df5c078dbac34a44f09682e43945
---

diff --git a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
index 308a5259dc..e1a954968b 100644
--- a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
+++ b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
@@ -305,10 +305,13 @@ public class SQLTester {
   }
 
   private void appendDbErr(sqlite3 db, StringBuilder sb, int rc){
-    sb.append(org.sqlite.jni.ResultCode.getEntryForInt(rc))
-      .append(" {")
-      .append(escapeSqlValue(sqlite3_errmsg(db)))
-      .append("}");
+    sb.append(org.sqlite.jni.ResultCode.getEntryForInt(rc)).append(' ');
+    final String msg = escapeSqlValue(sqlite3_errmsg(db));
+    if( '{' == msg.charAt(0) ){
+      sb.append(msg);
+    }else{
+      sb.append('{').append(msg).append('}');
+    }
   }
 
   public int execSql(sqlite3 db, boolean throwOnError,
@@ -662,7 +665,7 @@ class ResultCommand extends Command {
     t.incrementTestCounter();
     final String sql = t.takeInputBuffer();
     //t.verbose(argv[0]," SQL =\n",sql);
-    int rc = t.execSql(null, true, bufferMode, ResultRowMode.ONELINE, sql);
+    int rc = t.execSql(null, false, bufferMode, ResultRowMode.ONELINE, sql);
     final String result = t.getResultText().trim();
     final String sArgs = argv.length>1 ? Util.argvToString(argv) : "";
     if( !result.equals(sArgs) ){
diff --git a/manifest b/manifest
index 990dac6e01..ee605046b6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\stest\scommand\sbody's\strim()\sback\sinto\sthe\sTestScript\sclass\s(to\ssimplify\sCommand-level\scode)\sbut\sdo\sit\safter\sdouble-verbose\shas\shad\sthe\schance\sto\semit\sit\sas-is\s(so\sthat\sdebug\soutput\sis\snot\smangled\sby\sthe\strim).
-D 2023-08-09T17:04:58.035
+C SQLTester\s--result\scommand:\sdo\snot\sdouble-{}-wrap\serror\smessages\sand\sdo\snot\sthrow\son\sdb\serror.
+D 2023-08-09T17:23:52.643
 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_context.java d26573fc7b309228cb49786e907859
 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/Outer.java b06acf9c79e8dbc8fea4a98b00724a6a76e3ee4503eb114671d2885f8fb3df8b
-F ext/jni/src/org/sqlite/jni/tester/SQLTester.java e6753941ce1d344396aa3adf7823fb76130d3f3a0c5f02b57d293370886e057f
+F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 0869fa25e32295e1742e0ab4c2f20e25e47ab5f6d520ab31b7ea075249781548
 F ext/jni/src/org/sqlite/jni/tester/TestScript.java 14f6e5df11b0d0f1357e72c0588171589583cbb8cf212b739d202ea17fdaada7
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md 44449866970341076cec355193f89646825270a2f4f4073b55150cc4a55100d4
 F ext/jni/src/tests/000_first.test cd5fb732520cf36d7a3e5ad94a274c7327a9504b01a1a7f98e1f946df6c539fd
@@ -2090,8 +2090,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 46b79afaafda40cb1f920cc96600adf11e8c688184c9559a08eb86776ccf3663
-R 95e2df2649b37210ba0f30bd88f841aa
+P f15ecb68f7ca129478336b462508d2c40ea052b4040facefdbc67b13e6aea99d
+R 4f9539ed3a0acc150188dac846fdb1dc
 U stephan
-Z 6db045beedb4bf3da5e485334e151e20
+Z 5640a00c9dc31396afba95f58c2ebdf5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3a62236169..1a8ba85369 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f15ecb68f7ca129478336b462508d2c40ea052b4040facefdbc67b13e6aea99d
\ No newline at end of file
+f7be20f5a62f8970f957e5c3a1d1c6536995df5c078dbac34a44f09682e43945
\ No newline at end of file