Bug fixes. All tests are now passing.

FossilOrigin-Name: a0fc99a3bdd12f9ac69511c1aea2bd9a3d5de593d44b4a732cfc8f48e0931c76

diff --git a/manifest b/manifest
index f97b931d771de5399c05d09b8c0efac5abb72c09..2925737c6ec358580007d8ddd843281300524d79 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Revamp\sthe\sinternal\sdata\sstructures\sthat\sthe\sCLI\suses\sfor\stracking\sand\nmanaging\sthe\sdisplay\smode.\s\sThis\sis\san\sincremental\scheck-in.\s\sThe\scode\ncompiles\sand\sruns,\sbut\snot\sall\stests\sare\spassing.
-D 2025-11-10T23:40:40.279
+C Bug\sfixes.\s\sAll\stests\sare\snow\spassing.
+D 2025-11-11T00:21:26.959
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -735,7 +735,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a
-F src/shell.c.in d28fd40bd64afa21ca526768a27aad502282444a39b722f68a37a3d2024672f9
+F src/shell.c.in 41eafc6ecd66a9cb99b6efb522c3d25eb074078e689fe8ffcd722f38c23dd1d9
 F src/sqlite.h.in 7403a952a8f1239de7525b73c4e3a0f9540ec0607ed24fec887f5832642d44b8
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 7f236ca1b175ffe03316d974ef57df79b3938466c28d2f95caef5e08c57f3a52
@@ -1610,7 +1610,7 @@ F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bd
 F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3
 F test/shell8.test 641cf21a99c59404c24e3062923734951c4099a6b6b6520de00cf7a1249ee871
 F test/shell9.test 8742a5b390cdcef6369f5aa223e415aa4255a4129ef249b177887dc635a87209
-F test/shellA.test 601e9efaa2604a0e92b8dc0093cbc08d482d7175d2a6c617c70e1acef98ffb4d
+F test/shellA.test 1de183849ddb6b49d9f21a10a2f6f22bc66f962c0bfaed5baa5ecc3dc6d8f2d5
 F test/shmlock.test 9f1f729a7fe2c46c88b156af819ac9b72c0714ac6f7246638a73c5752b5fd13c
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
@@ -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 cb07f3d441b0b2a3ebdfaa9456891a9c8e33fa07b967532a9edfaf6ff3163cb0
-R 3a262412ccd4b8e631d7673d70af954e
+P 8cc581e53c2ab15bd311e082048b7c57b03a754d25c0b4beead08a3362ac1c7a
+R 5ec50f9665eadf1d8e44e1c03a2dcff7
 U drh
-Z 1c09aad6b5e9b13817c0a656960adb4f
+Z 2e2be373085f7686f8e083362b123b95
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 48b4a923558f7d927ba53bec56c79c3d8b01a83e..23f7f7ed407942c3f43e08ec3be1b59783b868b3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8cc581e53c2ab15bd311e082048b7c57b03a754d25c0b4beead08a3362ac1c7a
+a0fc99a3bdd12f9ac69511c1aea2bd9a3d5de593d44b4a732cfc8f48e0931c76

diff --git a/src/shell.c.in b/src/shell.c.in
index 85939f5f20b32b830b0a01879ff824bd63e2563a..68d6678c1a3dd627139ce28c2df69a316f3066c8 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1420,6 +1420,9 @@ static void modeInit(Mode *p){
 #ifdef _WIN32
   p->crlfMode = 1;
 #endif
+  p->spec.zColumnSep = strdup("|");
+  p->spec.zRowSep = strdup("\n");
+  p->spec.zNull = strdup("");
 }
 
 /*
@@ -7924,8 +7927,8 @@ static int do_meta_command(const char *zLine, ShellState *p){
               " for import\n");
         goto meta_command_exit;
       }
-      sCtx.cColSep = (u8)p->mode.spec.zRowSep[0];
-      sCtx.cRowSep = (u8)p->mode.spec.zColumnSep[0];
+      sCtx.cColSep = (u8)p->mode.spec.zColumnSep[0];
+      sCtx.cRowSep = (u8)p->mode.spec.zRowSep[0];
     }
     sCtx.zFile = zFile;
     sCtx.nLine = 1;
@@ -8485,13 +8488,15 @@ static int do_meta_command(const char *zLine, ShellState *p){
         sqlite3_fprintf(p->out, " --wordwrap %s --%squote --escape %s\n",
               p->mode.spec.bWordWrap==QRF_Yes ? "on" : "off",
               p->mode.spec.eText==QRF_TEXT_Sql ? "" : "no",
-              qrfEscNames[p->mode.spec.eEsc]
+              qrfEscNames[p->mode.spec.eEsc==QRF_ESC_Auto?
+                  QRF_ESC_Ascii:p->mode.spec.eEsc]
         );
       }else{
         sqlite3_fprintf(p->out,
               "current output mode: %s --escape %s\n",
               modeDescr[p->mode.eMode],
-              qrfEscNames[p->mode.spec.eEsc]
+              qrfEscNames[p->mode.spec.eEsc==QRF_ESC_Auto?
+                  QRF_ESC_Ascii:p->mode.spec.eEsc]
         );
       }
     }

diff --git a/test/shellA.test b/test/shellA.test
index 52697689708fafba0f509edc4089f4813c826ee5..ad3eecc55b07590189a02625a49d335d86afd28b 100644 (file)
--- a/test/shellA.test
+++ b/test/shellA.test
@@ -101,13 +101,13 @@ do_test shellA-1.9 {
      exec {*}$CLI test.db {.mode test --escape xyz}
   } msg]
   lappend rc $msg
-} {1 {unknown control character escape mode "xyz" - choices: ascii symbol off}}
+} {1 {unknown control character escape mode "xyz" - choices: auto off ascii symbol}}
 do_test shellA-1.10 {
   set rc [catch {
      exec {*}$CLI --escape abc test.db .q
   } msg]
   lappend rc $msg
-} {1 {unknown control character escape mode "abc" - choices: ascii symbol off}}
+} {1 {unknown control character escape mode "abc" - choices: auto off ascii symbol}}
 
 # ".mode quote"
 #