From fd5e4186e1069ecc2ba6ef37e52db6fbbf1ad7bb Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 22 Sep 2026 19:39:43 +0000 Subject: [PATCH] Improved output when errors occur during ".dump" in the CLI. FossilOrigin-Name: c49c3890bb4c993057186fa5294cd8c551f47d27cc4b4e73c96118a30462bb16 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 382bbc9044..6fc06abfb2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sgoofy\scondition\sin\sthe\sprevious\scheck-in -D 2026-09-22T19:11:49.276 +C Improved\soutput\swhen\serrors\soccur\sduring\s".dump"\sin\sthe\sCLI. +D 2026-09-22T19:39:43.935 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -744,7 +744,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 0e0990f60c93db38c735d85e5d1741130e72dd0670aec204b5a39118b53c8044 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 9943a496f5847fe66cd74b7fb4270d6ec4d10a5112369cec6fde02baacbc742f -F src/shell.c.in da61f37ad99c8598436a4845584637b88a0f85f60bf98b043753538d78fb24e7 +F src/shell.c.in 3439c6458c72c04d99c3219c4325e6d69e280b13a2c17d504cfa47a10472acce F src/sqlite.h.in 5941ea0c99996ecc54ff02835e89d12fd6195fa92b285f73b55a55fdcd90efe9 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 5e113c4c0442f2f1b3345d44cbe4b82fad45f2fc0c35f0ed4eef27fb8f1cb394 @@ -2221,8 +2221,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 6698a7e18727b08748eb875c08c93a23afa391d3642e7610a87e86f7528a04bc -R 09c0b7261a6161f9445917e49943b2b5 +P 03e14c500214f182d1bf37127aa0e0eea417115cd76d641c855f4156952da9d5 +R b8fa884c1c775d419e3b0ea200d64f17 U drh -Z e2b6503734bbf92a486740497cb046eb +Z c825c601391b9e973410ab3ca97f56dc # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 232b75eb53..4edb56bbbf 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -03e14c500214f182d1bf37127aa0e0eea417115cd76d641c855f4156952da9d5 +c49c3890bb4c993057186fa5294cd8c551f47d27cc4b4e73c96118a30462bb16 diff --git a/src/shell.c.in b/src/shell.c.in index 579ec99471..ad35e1f039 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -10488,7 +10488,7 @@ static int do_meta_command(const char *zLine, ShellState *p){ sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0); sqlite3_exec(p->db, "RELEASE dump;", 0, 0, 0); if( (p->shellFlgs & SHFLG_DumpDataOnly)==0 ){ - cli_puts(p->nErr?"ROLLBACK; -- due to errors\n":"COMMIT;\n", p->out); + cli_puts(p->nErr?";\nROLLBACK; -- due to errors\n":"COMMIT;\n", p->out); } p->shellFlgs = savedShellFlags; modeFree(&p->mode);