From: drh <>
Date: Mon, 17 Nov 2025 19:46:04 +0000 (+0000)
Subject: If SQL is entered as additional command-line arguments to CLI, that counts
X-Git-Tag: artiphishell~221^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07e071e500523a91cd2fef003c0967e1722bbe11;p=thirdparty%2Fsqlite.git

If SQL is entered as additional command-line arguments to CLI, that counts
the same as getting input from a pipe or file for the purpose of determining
the default format mode.

FossilOrigin-Name: 3d55ec15a9e4dc8af4bf1e2884eaa2c809995fb1529633f73287dc7a54153629
---

diff --git a/manifest b/manifest
index 52da629ca5..995c35b249 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\s-textjsonb\soption\sis\son\sby\sdefault\sin\sthe\sstandard\snon-batch\smode\sof\nthe\sCLI.\s\sNew\sfast\sscreening\stest\sfor\sJSONB.
-D 2025-11-17T18:51:55.138
+C If\sSQL\sis\sentered\sas\sadditional\scommand-line\sarguments\sto\sCLI,\sthat\scounts\nthe\ssame\sas\sgetting\sinput\sfrom\sa\spipe\sor\sfile\sfor\sthe\spurpose\sof\sdetermining\nthe\sdefault\sformat\smode.
+D 2025-11-17T19:46:04.211
 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 b5e82438ea3c5d30a425335180e1660dcccaf6cc64f8beec97b8fe6a5fb47da5
+F src/shell.c.in ee5c0326a045f83f27705ef07746c84e532654bdadac3cc3824da6d7dab2ccf5
 F src/sqlite.h.in 795ce84cc136b4e74d882cf4fab56d2927c20b9af9fd2fcea27760a6fe50851b
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998
@@ -2176,8 +2176,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 f6bfcea9a01493af182e9aa0d35df6f81bf9e36220df79139afa287fa43d9aa3
-R b7a01a16064bbc5b3a06e1b50d74bad2
+P fd09f934d64ec07fd56f1b80ab05dafb28b605d5802ff5758eea17d8ad24e3cc
+R 6cfd84a13cbe695177bf002c2876e553
 U drh
-Z a61739906e608ff5d320a84e1182df9a
+Z ac921b72c830caadbe8526f354a297ee
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 71bb9cafa4..4af8924df8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fd09f934d64ec07fd56f1b80ab05dafb28b605d5802ff5758eea17d8ad24e3cc
+3d55ec15a9e4dc8af4bf1e2884eaa2c809995fb1529633f73287dc7a54153629
diff --git a/src/shell.c.in b/src/shell.c.in
index c823b6dc09..f2c6f26cfc 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12274,7 +12274,6 @@ static void main_init(ShellState *p) {
 #else
   p->iCompat = 20251116;
 #endif
-  modeDefault(p);
   p->pAuxDb = &p->aAuxDb[0];
   p->shellFlgs = SHFLG_Lookaside;
   sqlite3_config(SQLITE_CONFIG_LOG, shellLog, p);
@@ -12498,6 +12497,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
         /* Excess arguments are interpreted as SQL (or dot-commands) and
         ** mean that nothing is read from stdin */
         readStdin = 0;
+        stdin_is_interactive = 0;
         nCmd++;
         azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
         shell_check_oom(azCmd);
@@ -12713,6 +12713,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
 #ifndef SQLITE_SHELL_FIDDLE
   sqlite3_appendvfs_init(0,0,0);
 #endif
+  modeDefault(&data);
 
   /* Go ahead and open the database file if it already exists.  If the
   ** file does not exist, delay opening it.  This prevents empty database
@@ -12927,6 +12928,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
         arDotCommand(&data, 1, argv+i, argc-i);
       }
       readStdin = 0;
+      stdin_is_interactive = 0;
       break;
 #endif
     }else if( cli_strcmp(z,"-safe")==0 ){