From: drh <>
Date: Tue, 1 Feb 2022 00:00:08 +0000 (+0000)
Subject: CLI: In ".mode column" output, if any row contains a newline or wraps, then
X-Git-Tag: version-3.38.0~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5aabdaebd516b9d0a5b07f2f10f721d6cd580f06;p=thirdparty%2Fsqlite.git

CLI: In ".mode column" output, if any row contains a newline or wraps, then
put a single blank line in between each pair of rows to provide additional
visual separately.

FossilOrigin-Name: fd42f4c304079356358e606dd96d4b84cf211c4334c586118b99fe9ad20e20ea
---

diff --git a/manifest b/manifest
index 941a125836..9d4ac64543 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C CLI:\sfor\scolumnar\soutput\smodes,\smake\ssure\sthe\sheader\sis\snot\stoo\sbig.\nAlso,\simprove\sthe\shelp\stext.
-D 2022-01-31T22:14:53.379
+C CLI:\sIn\s".mode\scolumn"\soutput,\sif\sany\srow\scontains\sa\snewline\sor\swraps,\sthen\nput\sa\ssingle\sblank\sline\sin\sbetween\seach\spair\sof\srows\sto\sprovide\sadditional\nvisual\sseparately.
+D 2022-02-01T00:00:08.128
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -553,7 +553,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 24032ae57aec10df2f3fa2e20be0aae7d256bc704124b76c52d763440c7c0fe9
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c a6d2d4bed279d7fe4fcedaf297eaf6441e8e17c6e3947a32d24d23be52ac02f2
-F src/shell.c.in 5f848589c29cd03a9ccde31f1507379eb926ff8352a92ecf7ea4baf00823138d
+F src/shell.c.in 8ae0e33c265c14a6932233b2eb37b090a67a3cb816671da66d26319b1d98cbfd
 F src/sqlite.h.in eaade58049152dac850d57415bcced885ca27ae9582f8aea2cfb7f1db78a521b
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5d54cf13d3406d8eb65d921a0d3c349de6126b732e695e79ecd4830ce86b4f8a
@@ -1942,8 +1942,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ca96ab3ef78479d95e831cacdb80f23c119cbaa77b3821eac7a3f110bfe20cc9
-R 7edb6446ecfd92c5152a5ff12c329ed4
+P 070fae3a09cea675e722340870cb2bee9e1ac96954d3baacfdb7f5400ddb1b20
+R da80598e94d04369e4a04ce4c1915aa8
 U drh
-Z ad9f462a73710576b722f55f5a4feb61
+Z 366282a4b771bc969cd1f7f43a0d9728
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9706a31c8a..30a779ddff 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-070fae3a09cea675e722340870cb2bee9e1ac96954d3baacfdb7f5400ddb1b20
\ No newline at end of file
+fd42f4c304079356358e606dd96d4b84cf211c4334c586118b99fe9ad20e20ea
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index f412f345d9..f59122c717 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3460,6 +3460,8 @@ static void exec_prepared_stmt_columnar(
           print_row_separator(p, nColumn, "+");
         }else if( p->cMode==MODE_Box ){
           print_box_row_separator(p, nColumn, BOX_123, BOX_1234, BOX_134);
+        }else if( p->cMode==MODE_Column ){
+          raw_printf(p->out, "\n");
         }
       }
       j = -1;