Additional SELECT trace logic: Show the tree after result-set wildcard

expansion but before name resolution.

FossilOrigin-Name: a7babf75418adffa27dec7a9d382a60e1b9364fb51d72b0a10e2769b308b3c54

diff --git a/manifest b/manifest
index 6220e0f079ba094a2737a67aa72bc93888db48a7..5386ee8c8ee2b5c58c5eba5a438232bc91e2d241 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\stest\scases.\s\sOne\sof\sthe\snew\stest\scases\sshows\sa\sflaw\sin\sthe\sbase\sdesign\nof\sRIGHT\sJOIN.
-D 2022-04-16T13:55:48.695
+C Additional\sSELECT\strace\slogic:\s\sShow\sthe\stree\safter\sresult-set\swildcard\nexpansion\sbut\sbefore\sname\sresolution.
+D 2022-04-16T18:33:22.370
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -552,7 +552,7 @@ F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 58b5c54b7e5cd7101b57901f9039dee86224b6a93699a5e8639f402aff43e7cc
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c d273657c2958eb5eee34d68920796b6e0214034dd3a2a88dc8e6dc92a4804271
+F src/select.c 3074a36194727755f60e4496289b267ebc98d183d33f54ef22d5aa312968c0ce
 F src/shell.c.in eb7f10d5e2c47bd014d92ec5db1def21fcc1ed56ffaaa4ee715b6c37c370b47f
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1948,8 +1948,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5bfb862419541de955dae35fc91f6e9fc70e2744bb786d49fa26bede80b9091d
-R 567fa939c6a9dfdced52167ff4c7578b
+P 4c3ce6475a67b1e207a5b63d9e2d38ee5bc45c899ad00ee327f292bf59039b9c
+R c8fd0258e87ea644726dd2408171a53e
 U drh
-Z 987f243665c64e4fbbc2d1f9cc8152ec
+Z 10f070fbe0626760b7aa50e27688efaa
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 37ed90638a7cebcc42fda5ea5b8e8e5ad9a9480f..0ca2ab7f4478c7ee492a4db9d623609788c0c5fb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4c3ce6475a67b1e207a5b63d9e2d38ee5bc45c899ad00ee327f292bf59039b9c
\ No newline at end of file
+a7babf75418adffa27dec7a9d382a60e1b9364fb51d72b0a10e2769b308b3c54
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 245b9cf5df7af1a9dd119caab71badea410631ab..cd8cfb91b516b03f40919068cd18031985dc7d3d 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5882,6 +5882,12 @@ static int selectExpander(Walker *pWalker, Select *p){
       p->selFlags |= SF_ComplexResult;
     }
   }
+#if TREETRACE_ENABLED
+  if( sqlite3TreeTrace & 0x100 ){
+    SELECTTRACE(0x100,pParse,p,("After result-set wildcard expansion:\n"));
+    sqlite3TreeViewSelect(0, p, 0);
+  }
+#endif
   return WRC_Continue;
 }