Fix minor problems with the new join table name resolution logic.

FossilOrigin-Name: 3a6b0db4519072dbd41b1c105bf1a0c6b4dd90380e94a5662645d8d41483c707

diff --git a/manifest b/manifest
index 2b8997de826a488f12fa0bc61c51c89edd390673..3cfaf242e958366c052ed6288525ab74f5340fda 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sability\sto\saccess\sthe\sUSING\scolumns\sof\sthe\sright\sor\sleft\stables\nof\san\sOUTER\sJOIN\seven\sif\sthe\sOUTER\sJOIN\sis\sin\sparentheses.\s\sPrototype\scode\nonly.
-D 2022-04-22T23:18:21.655
+C Fix\sminor\sproblems\swith\sthe\snew\sjoin\stable\sname\sresolution\slogic.
+D 2022-04-23T07:29:34.810
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -504,7 +504,7 @@ F src/date.c 15082566229d4b1e5f24fdb490bf9bcc68824b911d70e3573ef075a1b9e2d26f
 F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
-F src/expr.c 06dfbfb7f469c00eba3c8a7e282765969fe7c772f235a365f51bfffcaa69fe7f
+F src/expr.c 6763de6e372ae113f4a079c5c155956ab18470d52c144ccf3ecb9d3df0704a4a
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e
 F src/func.c a3407a6fbb0d4088d8d502e46f0ace63e0aeae7467ae23a9ca9815bbf9239761
@@ -553,12 +553,12 @@ F src/printf.c 512574910a45341c8ad244bd3d4939968ebdfde215645b676fff01cc46e90757
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c b14bf8a4a1e3cb01eefc48a7e4129b15bb6a18b56d16dd4eca676586464337d0
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 18c2b25560e70da88d9283f96dafab28d4e584caf594df3a838bd993931a6657
+F src/select.c 3b3f8d2c51d6026bfbe26d8762f1844b995aa64d238100ffc86a04727fba134b
 F src/shell.c.in ae0a6fae983caac6f8c824733f0599dfdf7b3a7e8efdef3cb5e3ab2e457ffc35
 F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
-F src/sqliteInt.h 6b76dd4bb8be4c8291f1ae79957b1ff89e0719b763ff015f2a11e7320ce364bf
+F src/sqliteInt.h 1805e812191a7b38bfcc3a05e532603b39764191231dc41b1ea29973b7f82743
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -1951,11 +1951,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 7f8983345d1e3ac28d736fce9f90772aa0e4654670a1db3dd0ee45b55e92f2e4
-R 1d384d62b00b1e8c4deeb5fe7e6e8acf
-T *branch * right-join-colnames
-T *sym-right-join-colnames *
-T -sym-right-join *
+P c3a427575fe71de3061495059e253c72c7213e2925ee2873e4f59fc73bfae103
+R 927028067d4c4ec54024cdb064902dd9
 U drh
-Z 2aa54e030eb9cab6d3b9ad83195a5d2e
+Z 67d139aeb225244d863b58d002516737
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9e243718d40d645b4fd2df98d0dd45917013b8b6..47a744d1388a92dec9a2abda466b97d61561e309 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c3a427575fe71de3061495059e253c72c7213e2925ee2873e4f59fc73bfae103
\ No newline at end of file
+3a6b0db4519072dbd41b1c105bf1a0c6b4dd90380e94a5662645d8d41483c707
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 17098762199c20442a773a66bcda1f05a978712e..f532bba2eb1c049a20fd006fb3234f8f639685b5 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1633,6 +1633,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, const ExprList *p, int flags){
     pItem->done = 0;
     pItem->bNulls = pOldItem->bNulls;
     pItem->bUsed = pOldItem->bUsed;
+    pItem->bUsingTerm = pOldItem->bUsingTerm;
     pItem->bSorterRef = pOldItem->bSorterRef;
     pItem->u = pOldItem->u;
   }

diff --git a/src/select.c b/src/select.c
index 63b22cf35fff891fc923f1e875bb94e1f8088db4..1211f268aefcb6cbdc185ffaee3a83d3d7b38a9a 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -2219,7 +2219,7 @@ int sqlite3ColumnsFromExprList(
     cnt = 0;
     while( zName && (pCollide = sqlite3HashFind(&ht, zName))!=0 ){
       if( pCollide->bUsingTerm ){
-        pCol->colFlags |= COLFLAG_HIDDEN;
+        pCol->colFlags |= COLFLAG_NOEXPAND;
       }
       nName = sqlite3Strlen30(zName);
       if( nName>0 ){
@@ -5872,10 +5872,17 @@ static int selectExpander(Walker *pWalker, Select *p){
             ** result-set list unless the SELECT has the SF_IncludeHidden
             ** bit set.
             */
-            if( (selFlags & SF_IncludeHidden)==0
-             && IsHiddenColumn(&pTab->aCol[j]) && zTName==0
-            ){
-              continue;
+            if( pTab->aCol[j].colFlags & (COLFLAG_HIDDEN|COLFLAG_NOEXPAND) ){
+              if( IsHiddenColumn(&pTab->aCol[j])
+               && (selFlags & SF_IncludeHidden)==0
+              ){
+                continue;
+              }
+              if( (pTab->aCol[j].colFlags & COLFLAG_NOEXPAND)!=0
+               && zTName==0
+              ){
+                continue;
+              }
             }
             tableSeen = 1;
 

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 589a162a5676730b952dadbf529d7466514f2a20..d9f5bc42eaa7be4f2927962675c8bdee5cf3c2fe 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2125,6 +2125,7 @@ struct Column {
 #define COLFLAG_NOTAVAIL  0x0080   /* STORED column not yet calculated */
 #define COLFLAG_BUSY      0x0100   /* Blocks recursion on GENERATED columns */
 #define COLFLAG_HASCOLL   0x0200   /* Has collating sequence name in zCnName */
+#define COLFLAG_NOEXPAND  0x0400   /* Omit this column when expanding "*" */
 #define COLFLAG_GENERATED 0x0060   /* Combo: _STORED, _VIRTUAL */
 #define COLFLAG_NOINSERT  0x0062   /* Combo: _HIDDEN, _STORED, _VIRTUAL */
 
@@ -3005,7 +3006,7 @@ struct ExprList {
     unsigned bSorterRef :1; /* Defer evaluation until after sorting */
     unsigned bNulls :1;     /* True if explicit "NULLS FIRST/LAST" */
     unsigned bUsed :1;      /* This column used in a SF_NestedFrom subquery */
-    unsigned bUsingTerm:1;  /* Term from the USING clause */
+    unsigned bUsingTerm:1;  /* Term from the USING clause of a NestedFrom */
     union {
       struct {             /* Used by any ExprList other than Parse.pConsExpr */
         u16 iOrderByCol;      /* For ORDER BY, column number in result set */