Minor changes to fix a few legacy test cases. Snapshot prior to yet another

refactor.

FossilOrigin-Name: b429e7882fd630a490350efa38bfce8686d6727f324a60191337a59d5436828b

diff --git a/ext/qrf/qrf.c b/ext/qrf/qrf.c
index 9b098ef8359054e5d92c793fece72f846a623fe6..0370ac5d838a57db4e49f38069a929495f7ef059 100644 (file)
--- a/ext/qrf/qrf.c
+++ b/ext/qrf/qrf.c
@@ -1706,11 +1706,6 @@ qrf_reinit:
       if( p->spec.zRowSep==0 ) p->spec.zRowSep = "\n";
       break;
     }
-    case QRF_STYLE_Line: {
-      if( p->spec.zColumnSep==0 ) p->spec.zColumnSep = "\n";
-      if( p->spec.zRowSep==0 ) p->spec.zRowSep = "\n";
-      break;
-    }
     case QRF_STYLE_JsonLine:
     case QRF_STYLE_Json: {
       p->spec.eText = QRF_TEXT_Json;
@@ -1941,11 +1936,7 @@ static void qrfOneSimpleRow(Qrf *p){
         qrfWidthPrint(p, p->pOut, -p->u.sLine.mxColWth, p->u.sLine.azCol[i]);
         sqlite3_str_append(p->pOut, " = ", 3);
         qrfRenderValue(p, p->pOut, i);
-        if( i<p->nCol-1 ){
-          sqlite3_str_appendall(p->pOut, p->spec.zColumnSep);
-        }else{
-          sqlite3_str_appendall(p->pOut, p->spec.zRowSep);
-        }
+        sqlite3_str_append(p->pOut, "\n", 1);
       }
       qrfWrite(p);
       break;

diff --git a/manifest b/manifest
index abcbbb2ea2421d8905b1b7ecef3c82ae0c17c034..23e65ddb6a98c4a95ace0877409f1aa8fd3eab54 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\scolumnar\soutputs\salways\sinvoke\sqrfWrite().
-D 2025-11-08T03:44:05.348
+C Minor\schanges\sto\sfix\sa\sfew\slegacy\stest\scases.\s\sSnapshot\sprior\sto\syet\sanother\nrefactor.
+D 2025-11-08T10:48:55.724
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -417,7 +417,7 @@ F ext/misc/windirent.h 02211ce51f3034c675f2dbf4d228194d51b3ee05734678bad5106fff6
 F ext/misc/zipfile.c 09e6e3a3ff40a99677de3c0bc6569bd5f4709b1844ac3d1c1452a456c5a62f1c
 F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee
 F ext/qrf/README.md 550c99ea5f9db2580ec66c12260b28feddc1c8a9b22396bb01bd9c3faaf720b6
-F ext/qrf/qrf.c 75cb2730a5a71338138f5c3db9766617271141438ea5aa494703d0c3cddcfc22
+F ext/qrf/qrf.c 1d30c5c4d00e568ed72cbf71e3182d9f6b9912ce31180070d6d9501f145b6580
 F ext/qrf/qrf.h 642c717aa5a88074f17712a59763f80c9d83e356c3c165953c3f9ba648511087
 F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8
 F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255
@@ -1605,7 +1605,7 @@ F test/shell1.test 5b72afb03752278e18c7faeda7329e6118a04e07a4203837bea9d66866d2c
 F test/shell2.test ab23f01ea2347e4b72bb2399af7ee82aa00f9c059141749f7c4064abca5ad728
 F test/shell3.test 603b448e917537cf77be0f265c05c6f63bc677c63a533c8e96aae923b56f4a0e
 F test/shell4.test 03593fa7908a55f255916ffeda707cdf55680c777736e3da62b1d78cde0d684d
-F test/shell5.test d17e7927ab8b7f720efbdd9b5d05fceb6c3c56c25917901b315400214bf24ef4
+F test/shell5.test 683f9b5df61192426d030874a04adcb15b5f14c5f3062e2637d4378a3e7224f8
 F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bdbb8
 F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3
 F test/shell8.test 641cf21a99c59404c24e3062923734951c4099a6b6b6520de00cf7a1249ee871
@@ -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 25838d282c5f7a922988245f373edfe8adbe28e929abce83afcda2b08472e685
-R 502809efeb093ed3374c38b7aba78f45
+P 21084041196dd6908bb810d8fce80b7f6d5b12ebe474bf62b85128540ad020eb
+R c8236e5308102b8245da0f16fe67a4b5
 U drh
-Z 7c0ff274efb342612203f1ecc7584f11
+Z f0ed1a0a849e17623b9e171efdb9f424
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f4f1d442be3634f594b0cac38b8bd37d2c02eebe..489308fe73a427549d1e246486b2176257e05ec3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-21084041196dd6908bb810d8fce80b7f6d5b12ebe474bf62b85128540ad020eb
+b429e7882fd630a490350efa38bfce8686d6727f324a60191337a59d5436828b

diff --git a/test/shell5.test b/test/shell5.test
index 70a2298bcb6871f5943fa8c52254d8b283cfdd31..9298f15e5bb9cc87a6b3caab24fe646e2c8811c2 100644 (file)
--- a/test/shell5.test
+++ b/test/shell5.test
@@ -576,8 +576,8 @@ do_test_with_ansi_output shell5-6.2 {
   catchcmd test.db {.import -csv shell5.csv t1
 .mode line
 SELECT * FROM t1;}
-} {0 {    1 = あい
-    2 = うえお}}
+} {0 {1 = あい
+2 = うえお}}
 
 # 2024-03-11 https://sqlite.org/forum/forumpost/ca014d7358
 # Import into a table that contains computed columns.