Change the default control-character escape algorithm from "symbol" to

"ascii", since the "ascii" algorithm works even on terminals that do
not support unicode.

FossilOrigin-Name: d35320495eb282601ab4f3b9efc53c7c1d58e890f025317e34c7046a43c8cb53

diff --git a/manifest b/manifest
index 980e93fc11793ea74ea28e839efe4a776edc280b..8b0a5802d34c53ab8a4fb8223cc83fb417a71e9e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\s"unused\sparameter"\scompiler\swarnings.
-D 2025-02-25T20:02:58.548
+C Change\sthe\sdefault\scontrol-character\sescape\salgorithm\sfrom\s"symbol"\sto\n"ascii",\ssince\sthe\s"ascii"\salgorithm\sworks\seven\son\sterminals\sthat\sdo\nnot\ssupport\sunicode.
+D 2025-02-25T20:10:46.001
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -782,7 +782,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 626c24b258b111f75c22107aa5614ad89810df3026f5ca071116d3fe75925c75
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c a076f7db3a0fcbd9f710d7746cfc07e0b3baadee45eb3136bedc29c598ef8f1c
-F src/shell.c.in 389d7c8cdc1c5322a81ff43df51434dc79a103e1948dad2b5efa3efe5f1a19c9
+F src/shell.c.in aae17e88132d01fe72bd8fc888a1ae6b5806cc3f16449363bf733249e379f362
 F src/sqlite.h.in 95c01911006f42019ee4dacd62101740a75fdfaeeca9b1c5fd7a70cfac3bb6f8
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -1647,7 +1647,7 @@ F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bd
 F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3
 F test/shell8.test aea51ecbcd4494c746b096aeff51d841d04d5f0dc4b62eb42427f16109b87acd
 F test/shell9.test 8742a5b390cdcef6369f5aa223e415aa4255a4129ef249b177887dc635a87209
-F test/shellA.test 09a6dd097ffa984ddf1fc0ddd2ae5f1a199cf11f3894b6a16410471c1536efe3
+F test/shellA.test 079c05c11947ade4ea8d51053d3abb687ec96a3dce6680d01838519b705190c5
 F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
@@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e6784af6d50f715338ae3218fc8ba1b894883c27d797f0b7fd2625cac17d9cd7
-R ed1ab79dc08a09ea5f550a35fad2b849
+P 7a68a3ead8e6c75203641542256bcfa05067bed4bf9035452fbd134534801a08
+R 9150601691b6949cdfd27e2d8fc2b2d5
 U drh
-Z 22f76806aee91f7d6b86860e87290c49
+Z 0c126ce764aac44793da4922fbb2e61b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d1df18eceec31270c814176ab1ace1a8ea35ab46..46582bcacb3d71e2228847710d1ef3fbb1747ad8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a68a3ead8e6c75203641542256bcfa05067bed4bf9035452fbd134534801a08
+d35320495eb282601ab4f3b9efc53c7c1d58e890f025317e34c7046a43c8cb53

diff --git a/src/shell.c.in b/src/shell.c.in
index 011c8c9847a0859cf976f78b194ef02e5e11b84f..72a5cee40bf24fc991c905c898227859dddb6880 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1547,13 +1547,14 @@ static ShellState shellState;
                                    ** top-level SQL statement */
 #define SHELL_PROGRESS_ONCE  0x04  /* Cancel the --limit after firing once */
 
-/* Allowed values for ShellState.eEscMode
+/* Allowed values for ShellState.eEscMode.  The default value should
+** be 0, so to change the default, reorder the names.
 */
-#define SHELL_ESC_SYMBOL       0      /* Substitute U+2400 graphics */
-#define SHELL_ESC_ASCII        1      /* Substitute ^Y for X where Y=X+0x40 */
+#define SHELL_ESC_ASCII        0      /* Substitute ^Y for X where Y=X+0x40 */
+#define SHELL_ESC_SYMBOL       1      /* Substitute U+2400 graphics */
 #define SHELL_ESC_OFF          2      /* Send characters verbatim */
 
-static const char *shell_EscModeNames[] = { "symbol", "ascii", "off" };
+static const char *shell_EscModeNames[] = { "ascii", "symbol", "off" };
 
 /*
 ** These are the allowed shellFlgs values

diff --git a/test/shellA.test b/test/shellA.test
index 8e5e04f79dcef81f4dcaf18090de48c8854b38cc..1a8161bf38d50af32febfad1e77a274b02e56b1e 100644 (file)
--- a/test/shellA.test
+++ b/test/shellA.test
@@ -36,7 +36,7 @@ do_execsql_test shellA-1.0 {
 # and that our calls to the CLI are working.
 #
 do_test shellA-1.2 {
-  exec {*}$CLI test.db {.mode box} {SELECT * FROM t1;}
+  exec {*}$CLI test.db {.mode box --escape symbol} {SELECT * FROM t1;}
 } {
 ┌───┬──────────────────────────┐
 │ a │            x             │
@@ -65,7 +65,7 @@ do_test shellA-1.2 {
 do_test shellA-1.3 {
   exec {*}$CLI test.db {SELECT x FROM t1 WHERE a=2;}
 } {
-␛[31mVT-100 codes␛[0m
+^[[31mVT-100 codes^[[0m
 }
 do_test shellA-1.4 {
   exec {*}$CLI test.db --escape symbol {SELECT x FROM t1 WHERE a=2;}
@@ -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: symbol ascii off}}
+} {1 {unknown control character escape mode "xyz" - choices: ascii symbol off}}
 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: symbol ascii off}}
+} {1 {unknown control character escape mode "abc" - choices: ascii symbol off}}
 
 # ".mode quote"
 #
@@ -123,10 +123,10 @@ line'
 }
 do_test shellA-2.2 {
   exec {*}$CLI test.db --quote {.mode}
-} {current output mode: quote --escape symbol}
-do_test shellA-2.3 {
-  exec {*}$CLI test.db --quote --escape ASCII {.mode}
 } {current output mode: quote --escape ascii}
+do_test shellA-2.3 {
+  exec {*}$CLI test.db --quote --escape SYMBOL {.mode}
+} {current output mode: quote --escape symbol}
 do_test shellA-2.4 {
   exec {*}$CLI test.db --quote --escape OFF {.mode}
 } {current output mode: quote --escape off}