From: drh <drh@noemail.net>
Date: Sat, 28 Sep 2019 16:14:55 +0000 (+0000)
Subject: Improvements to a comment.  No code changes.
X-Git-Tag: version-3.30.0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=018dbb17a8edc12f35bac21db8986dff21067273;p=thirdparty%2Fsqlite.git

Improvements to a comment.  No code changes.

FossilOrigin-Name: 1a3671c7003bfff817a8239424c2f945d9dfced97daadb5a5acab203b9bda69b
---

diff --git a/manifest b/manifest
index a963b23fde..7af6f498f6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sFTS3/4,\sthe\sposlist\send\smarker\smust\sbe\slarger\sthan\sany\sother\spossible\s\nposlist\svalue,\seven\son\sa\scorrupt\sposlist.
-D 2019-09-28T11:19:56.478
+C Improvements\sto\sa\scomment.\s\sNo\scode\schanges.
+D 2019-09-28T16:14:55.074
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -590,7 +590,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c d3615f0cbe4db5949503bf5916f3cd4fa5de855d5b4ef560f3b6dd5629423a1e
-F src/treeview.c dd92b189d8c0623d6cf59cf2e136e4c3b2389ded133eaa15ca51d4714866ebb4
+F src/treeview.c fddeb413159c3eeeaea3f496172f121cf3695606c461dc4e6dcee51417952df5
 F src/trigger.c 845ccc08f60716c58aa28fe6470385c18ef8c4e1d88c93dcf449bc13d464eb2e
 F src/update.c 7f05fad5e145248a00048aeb0bac78b8fdb4ed17216e14a6eb24c55596e87ee7
 F src/upsert.c 710c91bb13e3c3fed5b6fe17cb13e09560bdd003ad8b8c51e6b16c80cfc48b10
@@ -1845,7 +1845,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 326cdc16f4db23c1d17596e4ef8d9d7abc672d48665950029ba53fd40c1b2d99
-R ed248b7a304ff8fe9b8e405158c64edf
+P 752679aea5a6bbde24cbf39e2fa018f7dd1c226d463ca4bd74125303b2255170
+R bb14f4c98f377025f820656b70086f4a
 U drh
-Z e9bd16f73bdbdc86a0b51cacc7a31ea5
+Z b0cbae2801f3a93aa7e679c9abe5db90
diff --git a/manifest.uuid b/manifest.uuid
index 3ad7d0a8dd..7fa33b361c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-752679aea5a6bbde24cbf39e2fa018f7dd1c226d463ca4bd74125303b2255170
\ No newline at end of file
+1a3671c7003bfff817a8239424c2f945d9dfced97daadb5a5acab203b9bda69b
\ No newline at end of file
diff --git a/src/treeview.c b/src/treeview.c
index dcc81b8767..4979f59b58 100644
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -537,9 +537,10 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){
 
     case TK_COLLATE: {
       /* COLLATE operators without the EP_Collate flag are intended to
-      ** emulate collation associated with a table column.  Explicit
-      ** COLLATE operators that appear in the original SQL always have
-      ** the EP_Collate bit set */
+      ** emulate collation associated with a table column.  These show
+      ** up in the treeview output as "SOFT-COLLATE".  Explicit COLLATE
+      ** operators that appear in the original SQL always have the
+      ** EP_Collate bit set and appear in treeview output as just "COLLATE" */
       sqlite3TreeViewLine(pView, "%sCOLLATE %Q%s",
         !ExprHasProperty(pExpr, EP_Collate) ? "SOFT-" : "",
         pExpr->u.zToken, zFlgs);