Enhance treeview to show SOFT-COLLATE for TK_COLLATE operators that omit

the EP_Collate flag.

FossilOrigin-Name: a97804620a27acc30bebd2aaa04e38f2f36de48b0931038ca8bdc9cb0c36b8f4

diff --git a/manifest b/manifest
index bc79f4017a3ac23e0b04f686b59c7813f7cd5565..22c156a6697677334a52da99439276214173d178 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthe\scolumns\sof\sviews\sand\ssub-queries\smaintain\stheir\simplicit\scollation\ssequences\swhen\sthe\s"push-down"\soptimization\sis\sapplied.\sFix\sfor\s[18458b1a].
-D 2019-09-10T15:33:52.829
+C Enhance\streeview\sto\sshow\sSOFT-COLLATE\sfor\sTK_COLLATE\soperators\sthat\somit\nthe\sEP_Collate\sflag.
+D 2019-09-10T17:51:27.783
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -589,7 +589,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 fc8c6c0a8a26afb3a97e3f844d65403dd27cf1450baf4415034fa4ccf00c4d7e
+F src/treeview.c dd92b189d8c0623d6cf59cf2e136e4c3b2389ded133eaa15ca51d4714866ebb4
 F src/trigger.c 845ccc08f60716c58aa28fe6470385c18ef8c4e1d88c93dcf449bc13d464eb2e
 F src/update.c 7f05fad5e145248a00048aeb0bac78b8fdb4ed17216e14a6eb24c55596e87ee7
 F src/upsert.c 710c91bb13e3c3fed5b6fe17cb13e09560bdd003ad8b8c51e6b16c80cfc48b10
@@ -1841,7 +1841,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 b9ec72203c19c2b95e648ac1dfad74eec98d4ff82581cdc10dc4221ba551728f
-R cd3dfdd19ee61439a8f3dafd644637dd
-U dan
-Z 5c236b65c054109c04d341f131258a9f
+P 36997c4ade2ef3a274cd1ac52b44118fb3a05325adb650b7b338ecb43d060575
+R f5a1c0f164d27201c013c3daaa104b97
+U drh
+Z 4233ce0b10c0fb1f5285adf400752dbf

diff --git a/manifest.uuid b/manifest.uuid
index 4cebedacd42ea19b3cf3c857940d4464b2b1d568..7f2e23c3904231aeef626329beea6a2b01c31d45 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-36997c4ade2ef3a274cd1ac52b44118fb3a05325adb650b7b338ecb43d060575
\ No newline at end of file
+a97804620a27acc30bebd2aaa04e38f2f36de48b0931038ca8bdc9cb0c36b8f4
\ No newline at end of file

diff --git a/src/treeview.c b/src/treeview.c
index 6dfdccd7ee0bbeefabbdf2088ddab27e37acce9b..dcc81b8767d395cb95844072a88c34752766646b 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -536,7 +536,13 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){
     }
 
     case TK_COLLATE: {
-      sqlite3TreeViewLine(pView, "COLLATE %Q", pExpr->u.zToken);
+      /* 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 */
+      sqlite3TreeViewLine(pView, "%sCOLLATE %Q%s",
+        !ExprHasProperty(pExpr, EP_Collate) ? "SOFT-" : "",
+        pExpr->u.zToken, zFlgs);
       sqlite3TreeViewExpr(pView, pExpr->pLeft, 0);
       break;
     }