Improvements to the prompt_filename() function in the CLI so that it finds

the database filename even if the connection is not yet fully open.

FossilOrigin-Name: efb3e808a0281014512a812920d526a4909467e925ea000956606318bb6f2e65

diff --git a/manifest b/manifest
index 52a683001131c440656488cf79cae84872e0042e..83e864245e679b7c3df48ef5b1931b91c27a2972 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Latest\supstream\sjimsh0.c.
-D 2026-04-13T10:56:14.049
+C Improvements\sto\sthe\sprompt_filename()\sfunction\sin\sthe\sCLI\sso\sthat\sit\sfinds\nthe\sdatabase\sfilename\seven\sif\sthe\sconnection\sis\snot\syet\sfully\sopen.
+D 2026-04-13T11:34:15.710
 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 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576
-F src/shell.c.in 917bfdcb8a1c2980b8e10fceded37f0dcdd77138d42f3acf0f98bb8f251c0bf3
+F src/shell.c.in 34f1f4a7f86df2309bad20160c345ca8ded319971eb8e1d8e3d439770e64c140
 F src/sqlite.h.in 39d2e09114d2bdb7afd998f4a469c8f8cd065f8093835a7d0422f260fc78fb4f
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e
@@ -1630,7 +1630,7 @@ F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d
 F test/shell8.test 38c9e4d7e85d2a3ecfacaa9f6cda4f7a81bf4fffb5f3f37f9cd76827c6883192
 F test/shell9.test c0e8871061a92151450b3332279a893b516fa73a6c46d4f51a0998407cbf8c89
 F test/shellA.test 05cdaafa1f79913654487ce3aefa038d4106245d58f52e02faf506140a76d480
-F test/shellB.test a42be39e2332877d8ee239e1ca2a78d0a1feda21d90f3dd50f32f26cc3b433de
+F test/shellB.test 82622da7783c32ce931138bec3d5016e802d70361b9f9364b5d49c1dfc2f5af9
 F test/shmlock.test 9f1f729a7fe2c46c88b156af819ac9b72c0714ac6f7246638a73c5752b5fd13c
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
@@ -2198,8 +2198,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 3c212b5d85338f90a5f1a2d1484e54c0bf699eedef19a16f4c0de76a76dd9d07
-R e0962ba2c654c906138751c5846e6218
-U stephan
-Z 17befd6faf62861447677acabc5e0fc5
+P 414ae4dd65182ce571a6abb1a1a2ba2c169b204156f4f8923c42f64805a3ef9f
+R cf324d5615b6d300c87a4273e5c0525e
+U drh
+Z 7119036f9ab631d62dd86cf043f46eef
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 52894c8a5d5c429c227a8ec58a516afa8f6a7f5e..c0cb7e62009aeb0c6482429138c53a75eb743c23 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-414ae4dd65182ce571a6abb1a1a2ba2c169b204156f4f8923c42f64805a3ef9f
+efb3e808a0281014512a812920d526a4909467e925ea000956606318bb6f2e65

diff --git a/src/shell.c.in b/src/shell.c.in
index 70f65502bba8c4a0ad99e20d9aee410915f7c606..d2e6034622e7aa9a6b7c9122885c5219cb37dca4 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -958,7 +958,10 @@ static const char *prompt_filename(ShellState *p){
     zFN = sqlite3_filename_database(pFN);
   }
   if( zFN==0 || zFN[0]==0 ){
-    zFN = "in-memory";
+    zFN = p->pAuxDb->zDbFilename;
+    if( zFN==0 || zFN[0]==0 || cli_strcmp(zFN,":memory:")==0 ){
+      zFN = "in-memory";
+    }
   }
   return zFN;
 }

diff --git a/test/shellB.test b/test/shellB.test
index 566a7bc19e110b6572dfa0a469b60ca91f32e4a9..baae9f984b537f62958bf6d239ce2bce57ba5d8e 100644 (file)
--- a/test/shellB.test
+++ b/test/shellB.test
@@ -49,6 +49,8 @@ ifcapable vtab {
   do_clitest intck01.sql
 }
 do_clitest fptest01.sql
+unset -nocomplain ::env(SQLITE_PS1)
+unset -nocomplain ::env(SQLITE_PS2)
 do_clitest shell-prompt.sql
 
 finish_test