Some minor tweaks in SQLTester in prep for larger refactoring.

FossilOrigin-Name: 1d93f93ac9708839e62d2f1b489adc5d47ff290c2d5aef4dd56be4e1e46c81b2

diff --git a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
index c1995f85771a43561d6fa1b20b8f9d4bb78db636..277065a5c669610480aad0d978856954cd5445d8 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
+++ b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
@@ -34,6 +34,19 @@ class SkipTestRemainder extends RuntimeException {
   }
 }
 
+/**
+   Modes for how to handle SQLTester.execSql()'s
+   result output.
+ */
+enum ResultBufferMode {
+  //! Do not append to result buffer
+  NONE,
+  //! Append output escaped.
+  ESCAPED,
+  //! Append output as-is
+  ASIS
+};
+
 /**
    This class provides an application which aims to implement the
    rudimentary SQL-driven test tool described in the accompanying
@@ -110,14 +123,14 @@ public class SQLTester {
         ++nTestFile;
         final TestScript ts = new TestScript(f);
         currentScript = ts;
-        outln("---------> Test ",ts.getName()," ...");
+        outln("----->>>>> Test [",ts.getName(),"]");
         try{
           ts.run(this);
         }catch(SkipTestRemainder e){
           /* not an error */
           ++nAbortedScript;
         }
-        outln("<--------- ",nTest," test(s) in ",f);
+        outln("<<<<<----- ",nTest," test(s) in [",f,"]");
       }
     }finally{
       currentScript = null;
@@ -250,7 +263,7 @@ public class SQLTester {
   }
 
   public int execSql(sqlite3 db, boolean throwOnError,
-                     boolean appendToResult, String sql) throws Exception {
+                     ResultBufferMode appendMode, String sql) throws Exception {
     final OutputPointer.Int32 oTail = new OutputPointer.Int32();
     final OutputPointer.sqlite3_stmt outStmt = new OutputPointer.sqlite3_stmt();
     final byte[] sqlUtf8 = sql.getBytes(StandardCharsets.UTF_8);
@@ -260,7 +273,8 @@ public class SQLTester {
     int rc = 0;
     sqlite3_stmt stmt = null;
     int spacing = 0 /* emit a space for --result if>0 */ ;
-    final StringBuilder sb = appendToResult ? resultBuffer : null;
+    final StringBuilder sb = (ResultBufferMode.NONE==appendMode)
+      ? null : resultBuffer;
     //outln("sqlChunk len= = ",sqlChunk.length);
     while(pos < sqlChunk.length){
       if(pos > 0){
@@ -297,7 +311,16 @@ public class SQLTester {
               sb.append( nullView );
               continue;
             }
-            sb.append( escapeSqlValue(val) );
+            switch(appendMode){
+              case ESCAPED:
+                sb.append( escapeSqlValue(val) );
+                break;
+              case ASIS:
+                sb.append( val );
+                break;
+              default:
+                Util.toss(RuntimeException.class, "Unhandled ResultBufferMode.");
+            }
           }
           //sb.append('\n');
         }
@@ -453,7 +476,7 @@ class GlobCommand extends Command {
     t.incrementTestCounter();
     final String sql = t.takeInputBuffer();
     //t.verbose(argv[0]," SQL =\n",sql);
-    int rc = t.execSql(null, true, true, sql);
+    int rc = t.execSql(null, true, ResultBufferMode.ESCAPED, sql);
     final String result = t.getResultBufferText().trim();
     final String sArgs = Util.argvToString(argv);
     //t.verbose(argv[0]," rc = ",rc," result buffer:\n", result,"\nargs:\n",sArgs);
@@ -525,7 +548,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, true, sql);
+    int rc = t.execSql(null, true, ResultBufferMode.ESCAPED, sql);
     final String result = t.getResultBufferText().trim();
     final String sArgs = argv.length>1 ? Util.argvToString(argv) : "";
     //t.verbose(argv[0]," rc = ",rc," result buffer:\n", result,"\nargs:\n",sArgs);
@@ -541,7 +564,7 @@ class RunCommand extends Command {
     affirmHasContent(content);
     final sqlite3 db = (1==argv.length)
       ? t.getCurrentDb() : t.getDbById( Integer.parseInt(argv[1]) );
-    int rc = t.execSql(db, false, false, content);
+    int rc = t.execSql(db, false, ResultBufferMode.NONE, content);
     if( 0!=rc ){
       String msg = sqlite3_errmsg(db);
       t.verbose(argv[0]," non-fatal command error #",rc,": ",

diff --git a/ext/jni/src/org/sqlite/jni/tester/TestScript.java b/ext/jni/src/org/sqlite/jni/tester/TestScript.java
index d5af694faa78763edcf2489669e35459d4bcd2dc..f5a0134cc9bdd3b6f3fb1d860691c1456da681cd 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/tester/TestScript.java
+++ b/ext/jni/src/org/sqlite/jni/tester/TestScript.java
@@ -132,7 +132,10 @@ class TestScript {
     }
     // Chunk the newly-cleaned text into individual commands and their input...
     final List<String> rc = new ArrayList<>();
-    final Pattern p = Pattern.compile("^--[a-z]", Pattern.MULTILINE);
+    final Pattern p = Pattern.compile(
+      "^--(?!end)[a-z]+", Pattern.MULTILINE
+      // --end is a marker used by --tableresult and --(not)glob.
+    );
     final Matcher m = p.matcher(tmp);
     int ndxPrev = 0, pos = 0, i = 0;
     String chunk;

diff --git a/manifest b/manifest
index 28f2f21610d7f751a1fc9d14cdd91291b6e558ca..3d7601d397ba4d0a9208ac3b965af56cb870ccbe 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\scurrent-statement\stracking\sfrom\sthe\sJNI\sinternals\sbecause\sit\swill\sbreak\sdown\sin\sthe\sface\sof\sclient-side\smixed-mode\snative/java\scode,\se.g.\sin\scases\slike\sSQLTester.\sThis\smakes\stracing\sof\ssqlite3_stmt\sa\smicron\sslower\sbut\salso\sreliably\scorrect.
-D 2023-08-08T22:10:27.484
+C Some\sminor\stweaks\sin\sSQLTester\sin\sprep\sfor\slarger\srefactoring.
+D 2023-08-09T09:56:37.905
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -266,8 +266,8 @@ 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 3d9c40f8ed58ec0df05ca160986ea06ec84ec1f338b069cfba9604bbba467a01
-F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 1d54d137405287b7b88b9428134c6208f2c60fb01ad5d0e9126829e4044df1a7
-F ext/jni/src/org/sqlite/jni/tester/TestScript.java 52350fb458d7d2816377a824c18c498c4a97f0026b64278f62ff1c382a92a070
+F ext/jni/src/org/sqlite/jni/tester/SQLTester.java d771f9e08f229a6bab80283c4ab5197df5aba9aa09d30e34d13fdc3f35dcbca1
+F ext/jni/src/org/sqlite/jni/tester/TestScript.java e2000ce5db1f2ea23a417bcf6f2ce6ceb93415d81deefce44af5e29dcd7cef7c
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md 4a4868c70a68aa1829c1f7659daa78198187199d176778efb86a239c9e58802c
 F ext/jni/src/tests/000_first.test bd912c4d88f4f85264de1b53267114891bdb4c6d0d2e847343bc3ff482ec296e
 F ext/jni/src/tests/010_ignored.test ce2de6742ff1bf98d8976fda0f260ff3d280e8f8c0a99309fb59fcfef2556fcd
@@ -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 adae7d78692af73e770a9cc0a4264ab32ecc18a5c0deb64f3c1e790d959bab43
-R a655364567e3dc78a32998da5ce271ea
+P 4c0ec89dca00a9199d1e36768c034aa5eff03b13b5e015cf580f160dc4f141ad
+R 4e458d29aca7fb31fe732db9fc592362
 U stephan
-Z 4250ef5d2c5cf8abb783ee5c1cb8e821
+Z cd7ae073790f5058633c4b99263e9219
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 304f1c6b9ec774dd8b7a69d87653d52bfd3579d9..8826aaa5d8a34583eb0d2b6d3ac3ab389abb0936 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4c0ec89dca00a9199d1e36768c034aa5eff03b13b5e015cf580f160dc4f141ad
\ No newline at end of file
+1d93f93ac9708839e62d2f1b489adc5d47ff290c2d5aef4dd56be4e1e46c81b2
\ No newline at end of file