Simplified "hidden" and "no-expand" handling in the *-expander.

FossilOrigin-Name: c6c3115f3a008cf9b0d7c5c812f17e38c8a75a904032c5f05f0bea03a7340527

diff --git a/manifest b/manifest
index 937783049656782fd8945faac9e9d03f7a193419..e7fde4d1c667f599bd07394963d9f9df02a5b22e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sSTAT4\stest\scase\schange\sdue\sto\sthe\sANALYZE\senhancement\sof\n[eb59c46a5aed69bc|check-in\seb59c46a5aed69bc].
-D 2022-05-09T17:55:34.846
+C Simplified\s"hidden"\sand\s"no-expand"\shandling\sin\sthe\s*-expander.
+D 2022-05-10T00:24:01.438
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -553,7 +553,7 @@ F src/printf.c 512574910a45341c8ad244bd3d4939968ebdfde215645b676fff01cc46e90757
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c e9ee235c4151d2b7fa47435a219bfd30bf516a804d2f004639858087ebf3137b
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 6c0fba59d2a74bf606065f23e3bb6a8f29106c84f90ec34290ac4245e83b918c
+F src/select.c cd17de0cab436f0efc4cfeeeef1b8e03c41c40335ec757eff68e341e6a3f763f
 F src/shell.c.in ae0a6fae983caac6f8c824733f0599dfdf7b3a7e8efdef3cb5e3ab2e457ffc35
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1953,8 +1953,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 387c852375bba62df040330944c9e979a6993f95ece3443597c5fc66e34263ca
-R cbb8544fd969bd1dbd19e4e7428f857d
+P 8ce2fecb580da53fc01c53d8de10e2cc99499094215429ba925e777717e369b2
+R 1d734b9b8260c8ccdbe3f05b6dc084ca
 U drh
-Z 4859f8d06796c35fb9e8207cbbd745d2
+Z 5869ac2082a6ad38c03068b658209d1b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 24609f9f4bc40db49c5c26c834c35f27136876bf..cc85684e99dc8a47ac5a7e12fa1e4d85934adedf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ce2fecb580da53fc01c53d8de10e2cc99499094215429ba925e777717e369b2
\ No newline at end of file
+c6c3115f3a008cf9b0d7c5c812f17e38c8a75a904032c5f05f0bea03a7340527
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 7390d24f2beac337407325e0df2383e071d0e949..b53c0c91515457ac0cfe8a75c4449dc22de18df0 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -5882,18 +5882,16 @@ static int selectExpander(Walker *pWalker, Select *p){
             ** result-set list unless the SELECT has the SF_IncludeHidden
             ** bit set.
             */
-            if( pTab->aCol[j].colFlags & (COLFLAG_HIDDEN|COLFLAG_NOEXPAND) ){
-              if( IsHiddenColumn(&pTab->aCol[j])
-               && ALWAYS((selFlags & SF_IncludeHidden)==0)
-              ){
-                continue;
-              }
-              if( ALWAYS((pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0)
-               && zTName==0
-               && (selFlags & (SF_NestedFrom))==0
-              ){
-                continue;
-              }
+            if( (p->selFlags & SF_IncludeHidden)==0
+             && IsHiddenColumn(&pTab->aCol[j]) 
+            ){
+              continue;
+            }
+            if( (pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0
+             && zTName==0
+             && (selFlags & (SF_NestedFrom))==0
+            ){
+              continue;
             }
             tableSeen = 1;