From: drh <>
Date: Wed, 25 Sep 2024 09:39:11 +0000 (+0000)
Subject: In the CLI, for columnar output formats, try to account for the presence of
X-Git-Tag: version-3.47.0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cd30e3f5b6306b8d657e3dd7376763ab10f0279;p=thirdparty%2Fsqlite.git

In the CLI, for columnar output formats, try to account for the presence of
zero-width and double-width characters in the output and adjust column widths
accordingly.

FossilOrigin-Name: 9592b9ba3ad7a842cdd4c4010da278485a6fdec7e811bda01ebe640162a8c3b6
---

8cd30e3f5b6306b8d657e3dd7376763ab10f0279
diff --cc manifest
index 5a40bbd21d,12999b09d5..e74bcacf3c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\smemory\sleak\sin\ssqlite3expert.c\sintroduced\sby\s[f1d76c86].
- D 2024-09-24T15:11:34.516
 -C Improvements\sto\scomments\son\sdata\sstructures\sand\ssubroutines.
 -D 2024-09-25T09:33:14.835
++C In\sthe\sCLI,\sfor\scolumnar\soutput\sformats,\stry\sto\saccount\sfor\sthe\spresence\sof\nzero-width\sand\sdouble-width\scharacters\sin\sthe\soutput\sand\sadjust\scolumn\swidths\naccordingly.
++D 2024-09-25T09:39:11.501
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -765,10 -765,10 +765,10 @@@ F src/pragma.h e690a356c18e98414d2e870e
  F src/prepare.c 3ba0ad907b7773ed642f66cea8a2c9c8edc18841aa1050b6218dbb3479e86225
  F src/printf.c 6a87534ebfb9e5346011191b1f3a7ebc457f5938c7e4feeea478ecf53f6a41b2
  F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 -F src/resolve.c b2cd748488012312824508639b6af908461e45403037d5c4e19d9b0e8195507f
 +F src/resolve.c 9750a281f7ba073b4e6da2be1a6c4071f5d841a7746c5fb3f70d6d793b6675ea
  F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
  F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
- F src/shell.c.in 375f8a183126be96ec73db4e42c57917ff10a0900846b1b722dd4f8cef537812
+ F src/shell.c.in 9b68a945f3aafc78eac1a256a4a588a9310dbc61a0cd60378c5b7a78f789af50
  F src/sqlite.h.in 77f55bd1978a04a14db211732f0a609077cf60ba4ccf9baf39988f508945419c
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@@ -2213,8 -2213,9 +2213,9 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P f1d76c8636866424fe0b57d8814b8bb1a0ed4e2ca1b75d8e308d4b962ad8dc3b
- R 3c493af72ec7c0caf9ac1da3817622db
- U dan
- Z 3984c94792299f2aa3da5c0fd5ebea46
 -P 47cfad71eddc6fc4414ff853ee172da72527620eee743721806072c6e0a80caa
 -R 711914e97aae1631ec1aaf0c7dbc2c36
 -T +closed 47cfad71eddc6fc4414ff853ee172da72527620eee743721806072c6e0a80caa
++P 42bb941584a1ac922ee6b0b6ecadce71c9259555563cf49913a6f820f3f9b887 b217e3004b58af0e777726bdd652b999ad41815261299ef4ce8f8d2f6b0afe8d
++R 5fcf6775e686fdd76943c66cce860cb0
++T +closed b217e3004b58af0e777726bdd652b999ad41815261299ef4ce8f8d2f6b0afe8d
+ U drh
 -Z 9e5bc0454c6f58b185adbeed59d6a33c
++Z af457fc67e3efab459ef7260d9a5da46
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index f9ccf18fa5,a769bd751d..5d05a8c7ec
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 42bb941584a1ac922ee6b0b6ecadce71c9259555563cf49913a6f820f3f9b887
 -b217e3004b58af0e777726bdd652b999ad41815261299ef4ce8f8d2f6b0afe8d
++9592b9ba3ad7a842cdd4c4010da278485a6fdec7e811bda01ebe640162a8c3b6