From: drh <> Date: Thu, 2 Jan 2025 21:23:25 +0000 (+0000) Subject: Improve the treeview output for CteUse objects. X-Git-Tag: major-relase~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04364cb3cc108a044a0d9dc7162f4d550adb2f99;p=thirdparty%2Fsqlite.git Improve the treeview output for CteUse objects. FossilOrigin-Name: 2b16d6947ca4a102ddab4d5ba3e340a75e1e5c28e45e874ee5ff52f9b5fb964f --- diff --git a/manifest b/manifest index bc7d18e071..f56dd89bbd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improvements\sto\sthe\sdisplay\sof\ssubqueries\sin\sthe\sFROM\sclause\sfor\streeview\noutput.\s\s(Debug\sand\sanalysis\scode\sonly\s-\sdoes\snot\saffect\sproduction\sbuilds.) -D 2025-01-02T18:43:29.883 +C Improve\sthe\streeview\soutput\sfor\sCteUse\sobjects. +D 2025-01-02T21:23:25.211 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -839,7 +839,7 @@ F src/test_window.c 6d80e11fba89a1796525e6f0048ff0c7789aa2c6b0b11c80827dc1437bd8 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c fe17e03175cae35b6694d0f879e7bc3d1ddea2fd4ab148cba9bbd025b7a7bb12 -F src/treeview.c e5848f30a6000ca0f9a918131c220f5dff652aa08b220c1de4dc45862ca27c88 +F src/treeview.c d1f3003cb21846828f314a304cf9117f5e80ce0be259315a681d25147004d26d F src/trigger.c 247e2d712d5edc6021d52a169f6ac9a9c10d7144bc4ac7ea06c1ed2aa414659f F src/update.c 0e01aa6a3edf9ec112b33eb714b9016a81241497b1fb7c3e74332f4f71756508 F src/upsert.c 215328c3f91623c520ec8672c44323553f12caeb4f01b1090ebdca99fdf7b4f1 @@ -2204,8 +2204,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 322d255ed89c1dee08745e89f3c2bcf495283fd87b7526e70d6525a6e96b0ecf -R 880caaa332dedbabd2ac0f19d743a7f2 +P 4a2d65cdcdd3d21bb7d9ea0efb434484f1b8642c2bb6457db58bc2a5f4fc16e5 +R c71f9b806da01da7c4d2eda55e40e335 U drh -Z 4a0cd1fd6c1443c6320e9f6723abbf4c +Z 07fa7dcff94b36dfa3368297cbe48fff # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b0e812626c..66ca9c4f52 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4a2d65cdcdd3d21bb7d9ea0efb434484f1b8642c2bb6457db58bc2a5f4fc16e5 +2b16d6947ca4a102ddab4d5ba3e340a75e1e5c28e45e874ee5ff52f9b5fb964f diff --git a/src/treeview.c b/src/treeview.c index ab32774d4b..2cfcfb69b0 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -215,7 +215,10 @@ void sqlite3TreeViewSrcList(TreeView *pView, const SrcList *pSrc){ sqlite3_str_appendf(&x, " DDL"); } if( pItem->fg.isCte ){ - sqlite3_str_appendf(&x, " CteUse=0x%p", pItem->u2.pCteUse); + static const char *aMat[] = {",MAT", "", ",NO-MAT"}; + sqlite3_str_appendf(&x, " CteUse=%d%s", + pItem->u2.pCteUse->nUse, + aMat[pItem->u2.pCteUse->eM10d]); } if( pItem->fg.isOn || (pItem->fg.isUsing==0 && pItem->u3.pOn!=0) ){ sqlite3_str_appendf(&x, " isOn");