Debugging enhancment: Show the Expr.y.pTab pointer on TK_COLUMN nodes of

an expression tree in the treeview.

FossilOrigin-Name: 64154ac450e4366d18e7e867841877a69c1f978d3ba9b8754cc133248966731d

diff --git a/manifest b/manifest
index 4dbd3db5ae137b4e73b8bb7d1a2138b816ea4dbe..4c5247ea7f232eaab899790f03ff1742b0a42980 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbad\sinteraction\sbetween\sRBU\sand\s[df51ae19].
-D 2019-12-20T20:03:21.799
+C Debugging\senhancment:\s\sShow\sthe\sExpr.y.pTab\spointer\son\sTK_COLUMN\snodes\sof\nan\sexpression\stree\sin\sthe\streeview.
+D 2019-12-20T20:08:56.865
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -592,7 +592,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 41d928f04d65931b15f629b4938e9f2c7dc259f02eef34cb2cc6e293f5af813f
+F src/treeview.c 7a8097cff1584acd0a228817103513bf1d1bf5ba91ff142b99c83e406c0968f3
 F src/trigger.c 681ccdb910a87243940d63f99b26190d9c5d2534c2ded3c0825b7c0e315a342e
 F src/update.c 07a50767f7d3e26d4c887c31cd66448d700d3215caea6023acf7269336097df7
 F src/upsert.c b445315c8958d8f17ec3297d06842e61dacaad0633ccaec1e4e160de7e562212
@@ -1852,8 +1852,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 a1ba9a37d7a68a6d31f8197c6350589ebe6a12f4e3c193a178dd7ead8bcd565a
-R de245bd90e2a11fcca5b93be06aab877
-T +closed 8394c626c45a2b915ae854408ff91a09a1315ee65a06c7dcad11f48fda317a6b
-U dan
-Z 51144caceb2c2758c3978f6b539555d7
+P 0b9d8a1202c4220fd2ef299b6194533c1bf4018a0cd2d13da7e22c1a7de05ffa
+R a7dcec9aea796d0ba16e01020696fa29
+U drh
+Z 0651a4695143e634bba264926350256b

diff --git a/manifest.uuid b/manifest.uuid
index 502fa2f04afdc2020b51bb349860e9b16c0287c0..e42536538943e41488c77bf5b8c6721ee5488f2b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0b9d8a1202c4220fd2ef299b6194533c1bf4018a0cd2d13da7e22c1a7de05ffa
\ No newline at end of file
+64154ac450e4366d18e7e867841877a69c1f978d3ba9b8754cc133248966731d
\ No newline at end of file

diff --git a/src/treeview.c b/src/treeview.c
index 5b9e0645409a5ad1aec6629a3c06efddf4323c1f..f10e48ae1a9d77a572389e937d28e3721f4469ab 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -432,8 +432,9 @@ void sqlite3TreeViewExpr(TreeView *pView, const Expr *pExpr, u8 moreToFollow){
         sqlite3TreeViewLine(pView, "COLUMN(%d)%s%s",
                                     pExpr->iColumn, zFlgs, zOp2);
       }else{
-        sqlite3TreeViewLine(pView, "{%d:%d}%s",
-                             pExpr->iTable, pExpr->iColumn, zFlgs);
+        sqlite3TreeViewLine(pView, "{%d:%d} pTab=%p%s",
+                        pExpr->iTable, pExpr->iColumn,
+                        pExpr->y.pTab, zFlgs);
       }
       if( ExprHasProperty(pExpr, EP_FixedCol) ){
         sqlite3TreeViewExpr(pView, pExpr->pLeft, 0);