Make the --header option to the CLI sticky, so that it does not get

turned off by subsequence --csv or similar mode change options.

FossilOrigin-Name: 50193066013df50af113576ae0b59af447212472da6d3824ca5aaf7dc9aab3ec

diff --git a/manifest b/manifest
index b7231b0edca27f2328311adeede63bbdeff6507c..f9d0d8ac59062f4995ba2fc71e8417c08b84fbb7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sreading\sa\ssuper-journal\sname\sfrom\sa\sjournal\sfile,\sallocate\sa\snew\sbuffer\srather\sthan\susing\sPager.pTmpSpace.\sThis\sprevents\sa\sbuffer\soverrun\sthat\scould\soccur\swhen\susing\sa\sVFS\swith\sa\slarge\ssqlite3_vfs.mxPathname\svalue\swith\sa\sdatabase\swith\sa\ssmall\spage\ssize.
-D 2026-06-12T18:38:10.239
+C Make\sthe\s--header\soption\sto\sthe\sCLI\ssticky,\sso\sthat\sit\sdoes\snot\sget\nturned\soff\sby\ssubsequence\s--csv\sor\ssimilar\smode\schange\soptions.
+D 2026-06-13T18:17:08.398
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -736,7 +736,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c f5a780a7b604d43b78bca290cace7479bca0c7d8ef9ce855830d9498b975baec
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 5c3a5e3c1e6c3f8ccabeb414e18dce64e6f3e797de225ee93034f2c9e76f289c
-F src/shell.c.in 62559fae745668a0f3d229360844b37d5a7a49b50edbce4a762cafc784e86ba3
+F src/shell.c.in a92f97101ecc324d7235e28d72bdea681e437aab5e35e450d9572f67461da268
 F src/sqlite.h.in e2915e4a86d5e0783afb5cb72411df38d987c7f3c5aa2d5441b8e74d30b649d8
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca
@@ -1622,7 +1622,7 @@ F test/sharedA.test 64bdd21216dda2c6a3bd3475348ccdc108160f34682c97f2f51c19fc0e21
 F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707
 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell1.test eda2e527435f139224dda67db6bbd2466597408d4fe5883d647d67fa32d88f7c
+F test/shell1.test 184ca7216b0230a56b63184f88186d9dade702dfa88d30386b338aa30c5685c2
 F test/shell2.test dc541d2681503e55466a24d35a4cbf8ca5b90b8fcdef37fc4db07373a67d31d3
 F test/shell3.test 91efdd545097a61a1f72cf79c9ad5b49da080f3f10282eaf4c3c272cd1012db2
 F test/shell4.test e25580a792b7b54560c3a76b6968bd8189261f38979fe28e6bc6312c5db280db
@@ -2200,9 +2200,9 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 85afd8e291d280ff2124d1650720dd9934271de6efbd5a50eeaf1b621d3d0a6e
-Q +7f71859841af7cb0806f58e9c8013a990fcca72b807a0513156d7127ce5c7b62
-R d448e4f608e28cf5065a9e56c527b1d7
+P aa756c803899a95d5473d32ff222950a3f80fcda5384a7b131d3ba2821af10aa
+Q +b19cef1862444ee694eeea2254aa9a8d74d2343da5a8257c22e3068f388aa2fd
+R 33dbe3599511a937737c1ea3c471ca91
 U drh
-Z 6895f76f564d13e472ce4a5f4bc62928
+Z 0778fdb83f3248984dd0389c115dbb91
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2a511a8db7ffd414d57d491ae9d26831184a44c0..cb54e1df0dccecad799f9da52d79a3e89a650c1d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa756c803899a95d5473d32ff222950a3f80fcda5384a7b131d3ba2821af10aa
+50193066013df50af113576ae0b59af447212472da6d3824ca5aaf7dc9aab3ec

diff --git a/src/shell.c.in b/src/shell.c.in
index 71cf8eb25ecc113cabe236b6972bc33953d226b4..cbd43be529c1cf61086e9e3d1ecc3fd8a069b157 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -13425,8 +13425,10 @@ int SQLITE_CDECL main(int argc, char **argv){
                        cmdline_option_value(argc,argv,++i));
     }else if( cli_strcmp(z,"-header")==0 ){
       data.mode.spec.bTitles = QRF_Yes;
+      data.mode.mFlags |= MFLG_HDR;
      }else if( cli_strcmp(z,"-noheader")==0 ){
       data.mode.spec.bTitles = QRF_No;
+      data.mode.mFlags |= MFLG_HDR;
     }else if( cli_strcmp(z,"-echo")==0 ){
       data.mode.mFlags |= MFLG_ECHO;
     }else if( cli_strcmp(z,"-eqp")==0 ){

diff --git a/test/shell1.test b/test/shell1.test
index 4f12bc0964dd8ef1fee596f2c3c8c53443847490..b23d7b19b7c33d43edad0b9a77d129041c1f9e55 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -122,6 +122,21 @@ do_test shell1-1.9.1 {
 do_test shell1-1.10.1 {
   catchcmd "-csv test.db" ""
 } {0 {}}
+do_test shell1-1.10.2 {
+  catchcmd test.db "CREATE TABLE t1(a,b,c);INSERT INTO t1 VALUES(1,2,3),(4,5,6);"
+  catchcmd "-csv test.db" "SELECT * FROM t1"
+} {0 {1,2,3
+4,5,6}}
+do_test shell1-1.10.3 {
+  catchcmd "-header -csv test.db" "SELECT * FROM t1"
+} {0 {a,b,c
+1,2,3
+4,5,6}}
+do_test shell1-1.10.4 {
+  catchcmd "-csv -header test.db" "SELECT * FROM t1"
+} {0 {a,b,c
+1,2,3
+4,5,6}}
 
 # -html                set output mode to HTML
 do_test shell1-1.11.1 {