From e1f49b88501363222a3f13c25c1ec4e08150811b Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 3 Jan 2020 00:28:14 +0000 Subject: [PATCH] Fix a problem in sqlite3TreeViewBareExprList() in which the routine was not interpreting the new ExprList format correctly. FossilOrigin-Name: cd56872afbb4edeff2e8c1cb1c8d47c7a9b333b3fc416c20183250807291fae8 --- manifest | 13 ++++++------- manifest.uuid | 2 +- src/treeview.c | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index ed9effd846..4440d9e596 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\stwo-size\slookaside\smemory\sallocator.\s\sAlso,\sreduce\sthe\sper-entry\nsize\sof\sthe\sExprList\sobject. -D 2020-01-02T22:28:47.433 +C Fix\sa\sproblem\sin\ssqlite3TreeViewBareExprList()\sin\swhich\sthe\sroutine\swas\nnot\sinterpreting\sthe\snew\sExprList\sformat\scorrectly. +D 2020-01-03T00:28:14.306 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -593,7 +593,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 7b17f6e2f20f6cbcb0b215025a86b7457c38451fc7622f705e553d7a488c572d -F src/treeview.c 74d4fb2b6a2eaced4c0a6e22a9caf6e4a975577774456575065c5c921bdb3381 +F src/treeview.c 2f712c821748dccced8977c33de83146e75a193afd17da3da8ad64e0225fee20 F src/trigger.c a40d50e88bd3355f1d2a73f0a3b2d6b42eae26ca4219001b82ef0d064439badc F src/update.c 9ad19af96aff95dc02a923a99f97c1bc0b909009a29a2914b796f786b9ac0c60 F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78 @@ -1853,8 +1853,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 7405e982257611803792617f5d8142c54f9831b4a030f4de8607888c525e6289 34b877742ef78e9bb3f16815180f4ad9cd722beb1d610f713400a3b25d68aa9b -R 896a86b40586a93b7de7ff4de391d81d -T +closed 34b877742ef78e9bb3f16815180f4ad9cd722beb1d610f713400a3b25d68aa9b +P 51665bf0f975fb248964a4be205a4f3285d3f3f8cc697977d264efefbbe20dd8 +R 8459c9056b34d50995b431eb3c997586 U drh -Z 486c5971cb86c4301cea954c124cc71f +Z 2198282fcf120035e4a8ba3edeb717df diff --git a/manifest.uuid b/manifest.uuid index b1fa06af2e..aa6783ac27 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -51665bf0f975fb248964a4be205a4f3285d3f3f8cc697977d264efefbbe20dd8 \ No newline at end of file +cd56872afbb4edeff2e8c1cb1c8d47c7a9b333b3fc416c20183250807291fae8 \ No newline at end of file diff --git a/src/treeview.c b/src/treeview.c index e6ec4161bb..938c1f1a1f 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -730,6 +730,7 @@ void sqlite3TreeViewBareExprList( int j = pList->a[i].u.x.iOrderByCol; char *zName = pList->a[i].zEName; int moreToFollow = inExpr - 1; + if( pList->a[i].eEName!=ENAME_NAME ) zName = 0; if( j || zName ){ sqlite3TreeViewPush(pView, moreToFollow); moreToFollow = 0;