Add the ability to access the USING columns of the right or left tables

of an OUTER JOIN even if the OUTER JOIN is in parentheses.  Prototype code
only.

FossilOrigin-Name: c3a427575fe71de3061495059e253c72c7213e2925ee2873e4f59fc73bfae103

diff --git a/manifest b/manifest
index 7a1705b65931140123fa69a937a548d474ca1eda..2b8997de826a488f12fa0bc61c51c89edd390673 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\slatest\senhancements\sand\sfixes\sfrom\strunk\sonto\sthe\sright-join\sbranch.
-D 2022-04-22T19:52:51.602
+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
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -551,14 +551,14 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c fd940149c691684e7c1073c3787a7170e44852b02d1275d2e30a5b58e89cfcaf
 F src/printf.c 512574910a45341c8ad244bd3d4939968ebdfde215645b676fff01cc46e90757
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
-F src/resolve.c f72bb13359dd5a74d440df25f320dc2c1baff5cde4fc9f0d1bc3feba90b8932a
+F src/resolve.c b14bf8a4a1e3cb01eefc48a7e4129b15bb6a18b56d16dd4eca676586464337d0
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 92b3b250434de59fb87462dcdad79b456ae8ec82ae3194d4081ecb5af41ff0ec
+F src/select.c 18c2b25560e70da88d9283f96dafab28d4e584caf594df3a838bd993931a6657
 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 36b5d1cce15971fa71b53a950de3158197d85dbaf9b8b2f0bc6279347b09606a
+F src/sqliteInt.h 6b76dd4bb8be4c8291f1ae79957b1ff89e0719b763ff015f2a11e7320ce364bf
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -618,7 +618,7 @@ F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c a38f52058b517929e264094abd0b5fd1e8e145a1aa43bc6f6a72ae5218f96c98
-F src/treeview.c 396c21e21c853ebc1830c194fa13f1161dbc76adad0b0a605172ddb78b3b4cdb
+F src/treeview.c 2fb6681614cfdf44c5df1a54a8d17c1fe31c2dbb226db99df8693dbd8c02f598
 F src/trigger.c 372ada38f667c6823a3db15749eb668338e65c793394e55a37e56a489f2d1b55
 F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
@@ -1951,8 +1951,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d942530a6550a0cbe31790e462b0f0d57b9b4a896161878b7d45d11cbc1cb7a3 9425d79cb407dedc259655625369e023d22a04ef7db606ea3eefe7e4d662be1a
-R d5faff9166fcd6ed79adddef328785e0
+P 7f8983345d1e3ac28d736fce9f90772aa0e4654670a1db3dd0ee45b55e92f2e4
+R 1d384d62b00b1e8c4deeb5fe7e6e8acf
+T *branch * right-join-colnames
+T *sym-right-join-colnames *
+T -sym-right-join *
 U drh
-Z c29aa10c7d94195b4cb355a78538b541
+Z 2aa54e030eb9cab6d3b9ad83195a5d2e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 440e93651970207af59ff16c39d7398adc401352..9e243718d40d645b4fd2df98d0dd45917013b8b6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7f8983345d1e3ac28d736fce9f90772aa0e4654670a1db3dd0ee45b55e92f2e4
\ No newline at end of file
+c3a427575fe71de3061495059e253c72c7213e2925ee2873e4f59fc73bfae103
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index e9cfe9d9f1f3024e811bbb72ade9bf4d3ae261c2..7f99152cbbc7eea4eb276ab959fb964063339bb8 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -361,6 +361,7 @@ static int lookupName(
             pExpr->iColumn = j;
             pEList->a[j].bUsed = 1;
             hit = 1;
+            if( pEList->a[j].bUsingTerm ) break;
           }
           if( hit || zTab==0 ) continue;
         }

diff --git a/src/select.c b/src/select.c
index 5e90781effb433d099db54e5f4dfe144c7ec7c60..63b22cf35fff891fc923f1e875bb94e1f8088db4 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -2180,6 +2180,7 @@ int sqlite3ColumnsFromExprList(
 
   for(i=0, pCol=aCol; i<nCol && !db->mallocFailed; i++, pCol++){
     struct ExprList_item *pX = &pEList->a[i];
+    struct ExprList_item *pCollide;
     /* Get an appropriate name for the column
     */
     if( (zName = pX->zEName)!=0 && pX->eEName==ENAME_NAME ){
@@ -2216,7 +2217,10 @@ int sqlite3ColumnsFromExprList(
     ** append an integer to the name so that it becomes unique.
     */
     cnt = 0;
-    while( zName && sqlite3HashFind(&ht, zName)!=0 ){
+    while( zName && (pCollide = sqlite3HashFind(&ht, zName))!=0 ){
+      if( pCollide->bUsingTerm ){
+        pCol->colFlags |= COLFLAG_HIDDEN;
+      }
       nName = sqlite3Strlen30(zName);
       if( nName>0 ){
         for(j=nName-1; j>0 && sqlite3Isdigit(zName[j]); j--){}
@@ -2228,7 +2232,7 @@ int sqlite3ColumnsFromExprList(
     pCol->zCnName = zName;
     pCol->hName = sqlite3StrIHash(zName);
     sqlite3ColumnPropertiesFromName(0, pCol);
-    if( zName && sqlite3HashInsert(&ht, zName, pCol)==pCol ){
+    if( zName && sqlite3HashInsert(&ht, zName, pX)==pX ){
       sqlite3OomFault(db);
     }
   }
@@ -5833,6 +5837,25 @@ static int selectExpander(Walker *pWalker, Select *p){
             iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
             zSchemaName = iDb>=0 ? db->aDb[iDb].zDbSName : "*";
           }
+          if( i+1<pTabList->nSrc
+           && pFrom[1].fg.isUsing
+           && (selFlags & SF_NestedFrom)!=0
+          ){
+            int ii;
+            IdList *pUsing = pFrom[1].u3.pUsing;
+            for(ii=0; ii<pUsing->nId; ii++){
+              const char *zUName = pUsing->a[ii].zName;
+              pRight = sqlite3Expr(db, TK_ID, zUName);
+              pNew = sqlite3ExprListAppend(pParse, pNew, pRight);
+              if( pNew ){
+                struct ExprList_item *pX = &pNew->a[pNew->nExpr-1];
+                assert( pX->zEName==0 );
+                pX->zEName = sqlite3MPrintf(db,"..%s", zUName);
+                pX->eEName = ENAME_TAB;
+                pX->bUsingTerm = 1;
+              }
+            }
+          }
           for(j=0; j<pTab->nCol; j++){
             char *zName = pTab->aCol[j].zCnName;
             struct ExprList_item *pX; /* Newly added ExprList term */
@@ -5849,14 +5872,14 @@ static int selectExpander(Walker *pWalker, Select *p){
             ** result-set list unless the SELECT has the SF_IncludeHidden
             ** bit set.
             */
-            if( (p->selFlags & SF_IncludeHidden)==0
-             && IsHiddenColumn(&pTab->aCol[j]) 
+            if( (selFlags & SF_IncludeHidden)==0
+             && IsHiddenColumn(&pTab->aCol[j]) && zTName==0
             ){
               continue;
             }
             tableSeen = 1;
 
-            if( i>0 && zTName==0 ){
+            if( i>0 && zTName==0 && (selFlags & SF_NestedFrom)==0 ){
               if( pFrom->fg.isUsing
                && sqlite3IdListIndex(pFrom->u3.pUsing, zName)>=0
               ){
@@ -5868,6 +5891,7 @@ static int selectExpander(Walker *pWalker, Select *p){
             pRight = sqlite3Expr(db, TK_ID, zName);
             if( (pTabList->nSrc>1
                  && (  (pFrom->fg.jointype & JT_LTORJ)==0
+                     || (selFlags && SF_NestedFrom)!=0
                      || !inAnyUsingClause(zName,pFrom,pTabList->nSrc-i-1)
                     )
                 )

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index ec465cdb335707426e50751d84fad6b599663570..589a162a5676730b952dadbf529d7466514f2a20 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3003,8 +3003,9 @@ struct ExprList {
     unsigned done :1;       /* A flag to indicate when processing is finished */
     unsigned reusable :1;   /* Constant expression is reusable */
     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 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 */
     union {
       struct {             /* Used by any ExprList other than Parse.pConsExpr */
         u16 iOrderByCol;      /* For ORDER BY, column number in result set */

diff --git a/src/treeview.c b/src/treeview.c
index db73943f0215ecb1dfb9f50a5d8d8df2fb565387..117e21f1af5c938460af49a27d6fc397142bffe9 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -810,7 +810,8 @@ void sqlite3TreeViewBareExprList(
               break;
             case ENAME_TAB:
               fprintf(stdout, "TABLE-ALIAS-NAME(\"%s\") ", zName);
-              if( pList->a[i].bUsed==0 ) fprintf(stdout, "(unused) ");
+              if( pList->a[i].bUsed ) fprintf(stdout, "(used) ");
+              if( pList->a[i].bUsingTerm ) fprintf(stdout, "(USING-term) ");
               break;
             case ENAME_SPAN:
               fprintf(stdout, "SPAN(\"%s\") ", zName);