More test cases and a bug fix.

FossilOrigin-Name: 9a9c4580772fa35a68b3e27a40fc9bc615144979dfd27b1054538e29a489c024

diff --git a/manifest b/manifest
index e8abbca481ca35e7fd82155e5160b9103a4e3a41..1a3d684092ae7d9096106cdc7d253ac6945bb261 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\stesting\sand\sbug\sfixing.
-D 2025-11-05T22:33:47.393
+C More\stest\scases\sand\sa\sbug\sfix.
+D 2025-11-05T22:48:33.983
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -743,7 +743,7 @@ F src/sqliteInt.h 88f7fc9ce1630d9a5f7e0a8e1f3287cdc63882fba985c18e7eee1b9f457f59
 F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
 F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
-F src/tclsqlite.c be2a4b5593298d1937e7c39b94e552eb74d8ff2297db8cda9c4bac41acc67d74
+F src/tclsqlite.c 6e87dda56e2add1581063c281f9fd2d4f65605bbabd6d36660905e579a20fc13
 F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
 F src/test1.c f880ab766eeedf2c063662bd9538b923fd42c4341b7bfc2150a6d93ab8b9341c
 F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
@@ -1506,7 +1506,7 @@ F test/printf2.test 3f55c1871a5a65507416076f6eb97e738d5210aeda7595a74ee895f2224c
 F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
 F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
 F test/pushdown.test 46a626ef1c0ca79b85296ff2e078b9da20a50e9b804b38f441590c3987580ddd
-F test/qrf01.test 12b211db9dcd5926d657b1ee64b40db059270133d8b0338d0666dbcf301ec35b
+F test/qrf01.test 75acb2a17dfa8cbc5c0e70bcb6b90eb176ec39a08a8427e73210d537e0280f04
 F test/qrf02.test 39b4afdc000bedccdafc0aecf17638df67a67aaa2d2942865ae6abcc48ba0e92
 F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca
 F test/quick.test 1681febc928d686362d50057c642f77a02c62e57
@@ -2173,8 +2173,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d1542696409b67635d0f172042642709452118d62102ebfab2ad3ff2b5732687
-R f4a27ec41a5221a665784b11fc4b6185
+P d6b1bac15a692a69f3707fca721b57b3b283edb3850efa34ba42b02c3669fc71
+R acc04002a644080623c1a504bf28fb0e
 U drh
-Z c4401bada00b73794af6d52fe089dac2
+Z 01fd439849736e72d304f40ceb50953f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 944ac86bc2af4381e029c7b3d5b886767e46af5c..045c236b9ada7a2f3ec6a412b9a0bc1f4b4b870a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d6b1bac15a692a69f3707fca721b57b3b283edb3850efa34ba42b02c3669fc71
+9a9c4580772fa35a68b3e27a40fc9bc615144979dfd27b1054538e29a489c024

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 7471605d86dfdf853da7183ff973304745095169..6fe9edc6fde6b7a3883adfca7926707dfb17f097 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -2198,7 +2198,7 @@ static int dbQrf(SqliteDb *pDb, int objc, Tcl_Obj *const*objv){
       if( rc ) goto format_failed;
       qrf.bWordWrap = v;
       i++;
-    }else if( strcmp(zArg,"-testjsonb")==0 ){
+    }else if( strcmp(zArg,"-textjsonb")==0 ){
       int v = 0;
       rc = Tcl_GetIndexFromObj(pDb->interp, objv[i+1], azBool,
                               "-testjsonb", 0, &v);

diff --git a/test/qrf01.test b/test/qrf01.test
index 181476fa2f8bf380af5a43c98150f31220e6d1e0..4c44a9cdde46a0ee6d55ee2b2c3ad56bec8dcab3 100644 (file)
--- a/test/qrf01.test
+++ b/test/qrf01.test
@@ -367,6 +367,23 @@ do_test 2.5 {
 └───────┴───────┴─────────────────────┘
 }
 
+do_execsql_test 2.10 {
+  UPDATE t1 SET c='Η γρήγορη αλεπού πηδάει πάνω από το τεμπέλικο καφέ σκυλί';
+}
+do_test 2.11 {
+  set result "\n[db format -widths {5 -5 18} -wordwrap on \
+                 {SELECT * FROM t1}]"
+} {
+┌───────┬───────┬────────────────────┐
+│   a   │   b   │         c          │
+├───────┼───────┼────────────────────┤
+│ 1     │     2 │ Η γρήγορη αλεπού   │
+│       │       │ πηδάει πάνω από το │
+│       │       │ τεμπέλικο καφέ     │
+│       │       │ σκυλί              │
+└───────┴───────┴────────────────────┘
+}
+
 
 do_execsql_test 3.0 {
   DELETE FROM t1;
@@ -414,4 +431,39 @@ do_test 3.5 {
   set res
 } {bad control character escape (-esc) "unk": must be ascii, auto, off, or symbol}
 
+do_execsql_test 4.0 {
+  DELETE FROM t1;
+  INSERT INTO t1 VALUES(json('{a:5,b:6}'), jsonb('{c:1,d:2}'), 99);
+}
+do_test 4.1 {
+  set result "\n[db format -text sql {SELECT * FROM t1}]"
+} {
+┌─────────────────┬───────────────────────┬────┐
+│        a        │           b           │ c  │
+├─────────────────┼───────────────────────┼────┤
+│ '{"a":5,"b":6}' │ x'8c1763133117641332' │ 99 │
+└─────────────────┴───────────────────────┴────┘
+}
+do_test 4.2 {
+  set result "\n[db format -text sql -textjsonb on {SELECT * FROM t1}]"
+} {
+┌─────────────────┬─────────────────┬────┐
+│        a        │        b        │ c  │
+├─────────────────┼─────────────────┼────┤
+│ '{"a":5,"b":6}' │ '{"c":1,"d":2}' │ 99 │
+└─────────────────┴─────────────────┴────┘
+}
+do_test 4.3 {
+  set result "\n[db format -text off -textjsonb on -maxwidth 10 \
+              {SELECT a AS json, b AS jsonb, c AS num FROM t1}]"
+} {
+┌─────────────┬─────────────┬─────┐
+│    json     │    jsonb    │ num │
+├─────────────┼─────────────┼─────┤
+│ {"a":5,"b": │ {"c":1,"d": │ 99  │
+│ 6}          │ 2}          │     │
+└─────────────┴─────────────┴─────┘
+}
+
+
 finish_test