From: drh <> Date: Thu, 21 Apr 2022 12:11:38 +0000 (+0000) Subject: Further attempts to get name resolution to work correctly with X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fright-join-paren;p=thirdparty%2Fsqlite.git Further attempts to get name resolution to work correctly with parenthisized FROM clauses. Work-in-progress. Lots of crashes and wrong answers. FossilOrigin-Name: 6b326b3bcf9d04c6dfe1d0b5238312bac8edf7c7f342ab47a9e2c9294142660f --- diff --git a/manifest b/manifest index 42973cfbba..313ad0fea0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Attempting\sto\simprove\sname\sresolution\sfor\sparenthesized\sFROM\sclauses.\nOnly\spartially\sworking. -D 2022-04-21T01:49:45.860 +C Further\sattempts\sto\sget\sname\sresolution\sto\swork\scorrectly\swith\nparenthisized\sFROM\sclauses.\s\sWork-in-progress.\s\sLots\sof\scrashes\sand\swrong\nanswers. +D 2022-04-21T12:11:38.749 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -550,14 +550,14 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 F src/prepare.c fd940149c691684e7c1073c3787a7170e44852b02d1275d2e30a5b58e89cfcaf F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c -F src/resolve.c 3cab62f59a2c395bab057382426e7e4dfae3e93e46d46ac4430fd7c543abb5c8 +F src/resolve.c 1f834b1a660eb6c87a5dc1ec07e86c6c917167ceeecbe5042549ce329e5c7021 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 -F src/select.c 66f0c568a9af97f42bf98fcdb3d77704f1607faa1750ca45787385f462245b56 +F src/select.c bad047ff041a8752d4b5902ed06aff23da390606697e0c20993ad912b825f174 F src/shell.c.in ecff6f4ab0e8e25acd578b3eb27ac0bad4d48643c160259a277151d6e9d412e1 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 7baf404c44d09d7920768ef90f1c6c1f76be54019d051859f18af4cd6076a9a5 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657 F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -617,7 +617,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 f304faa8b595121da33f78f1f898af48a4db0caa7e310431aa27039ea5dbab36 +F src/treeview.c 4b68539a800d1d574538b165492feed92e19833dc5e33b97db38b72083303613 F src/trigger.c 372ada38f667c6823a3db15749eb668338e65c793394e55a37e56a489f2d1b55 F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937 @@ -1950,8 +1950,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 07906e3c4fcefa721a1dfd57590778cf9c278e93b1f86128843c743d6aca7106 -R 8ef1dcc2b7747e6f2b70e7e88477d2e3 +P 959b7182144664a13e169fa63b79149f4e7048680d1f481a39507aab6b23e17c +R 6a0763d4ab345bb9ea71431dba0664fc U drh -Z 06c32b51457a6173774b273bce3df523 +Z 33a2504b7a42b02b49eed32233bc89b1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b9b61415d6..47c191039c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -959b7182144664a13e169fa63b79149f4e7048680d1f481a39507aab6b23e17c \ No newline at end of file +6b326b3bcf9d04c6dfe1d0b5238312bac8edf7c7f342ab47a9e2c9294142660f \ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index d2e210e44d..3fb1a6b4e8 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -329,7 +329,7 @@ static int lookupName( assert( pEList->nExpr==pTab->nCol ); for(j=0; jnExpr; j++){ const char *zEName; - assert( pEList->a[j].eEName==ENAME_TAB ); + if( pEList->a[j].eEName!=ENAME_TAB ) continue; zEName = pEList->a[j].zEName; if( zEName[0]=='.' && zEName[1]=='.' && zTab==0 ){ if( sqlite3StrICmp(&zEName[2],zCol)!=0 ) continue; diff --git a/src/select.c b/src/select.c index fe393e497e..c0fd31dea4 100644 --- a/src/select.c +++ b/src/select.c @@ -2179,12 +2179,13 @@ int sqlite3ColumnsFromExprList( *paCol = aCol; for(i=0, pCol=aCol; imallocFailed; i++, pCol++){ + struct ExprList_item *pX = &pEList->a[i]; /* Get an appropriate name for the column */ - if( (zName = pEList->a[i].zEName)!=0 && pEList->a[i].eEName==ENAME_NAME ){ + if( (zName = pX->zEName)!=0 && pX->eEName==ENAME_NAME ){ /* If the column contains an "AS " phrase, use as the name */ }else{ - Expr *pColExpr = sqlite3ExprSkipCollateAndLikely(pEList->a[i].pExpr); + Expr *pColExpr = sqlite3ExprSkipCollateAndLikely(pX->pExpr); while( ALWAYS(pColExpr!=0) && pColExpr->op==TK_DOT ){ pColExpr = pColExpr->pRight; assert( pColExpr!=0 ); @@ -2226,6 +2227,7 @@ int sqlite3ColumnsFromExprList( } pCol->zCnName = zName; pCol->hName = sqlite3StrIHash(zName); + if( pX->bHidden ) pCol->colFlags |= COLFLAG_HIDDEN; sqlite3ColumnPropertiesFromName(0, pCol); if( zName && sqlite3HashInsert(&ht, zName, pCol)==pCol ){ sqlite3OomFault(db); @@ -5845,9 +5847,7 @@ static int selectExpander(Walker *pWalker, Select *p){ } for(j=0; jnCol; j++){ char *zName = pTab->aCol[j].zCnName; - char *zColname; /* The computed column name */ - char *zToFree; /* Malloced string that needs to be freed */ - Token sColname; /* Computed column name as a token */ + struct ExprList_item *pX; /* Newly added ExprList term */ assert( zName ); if( zTName && pSub @@ -5876,13 +5876,6 @@ static int selectExpander(Walker *pWalker, Select *p){ } } pRight = sqlite3Expr(db, TK_ID, zName); - if( longNames ){ - zColname = sqlite3MPrintf(db, "%s.%s", zTabName, zName); - zToFree = zColname; - }else{ - zColname = zName; - zToFree = 0; - } if( (selFlags && SF_NestedFrom)!=0 || IN_RENAME_OBJECT || (pTabList->nSrc>1 @@ -5905,23 +5898,39 @@ static int selectExpander(Walker *pWalker, Select *p){ pExpr = pRight; } pNew = sqlite3ExprListAppend(pParse, pNew, pExpr); - - sqlite3TokenInit(&sColname, zColname); - sqlite3ExprListSetName(pParse, pNew, &sColname, 0); - if( pNew && (p->selFlags & SF_NestedFrom)!=0 && !IN_RENAME_OBJECT ){ - struct ExprList_item *pX = &pNew->a[pNew->nExpr-1]; - sqlite3DbFree(db, pX->zEName); + if( pNew==0 ){ + break; + } + pX = &pNew->a[pNew->nExpr-1]; + assert( pX->zEName==0 ); + if( (selFlags & SF_NestedFrom)!=0 && !IN_RENAME_OBJECT ){ if( pSub ){ pX->zEName = sqlite3DbStrDup(db, pSub->pEList->a[j].zEName); testcase( pX->zEName==0 ); }else{ pX->zEName = sqlite3MPrintf(db, "%s.%s.%s", - zSchemaName, zTabName, zColname); + zSchemaName, zTabName, zName); testcase( pX->zEName==0 ); } pX->eEName = ENAME_TAB; + if( pFrom->fg.isUsing + && sqlite3IdListIndex(pFrom->u3.pUsing, zName)>=0 + ){ + pX->bHidden = 1; + }else + if( i+1nSrc + && pFrom[1].fg.isUsing + && sqlite3IdListIndex(pFrom[1].u3.pUsing, zName)>=0 + ){ + pX->bHidden = 1; + } + }else if( longNames ){ + pX->zEName = sqlite3MPrintf(db, "%s.%s", zTabName, zName); + pX->eEName = ENAME_NAME; + }else{ + pX->zEName = sqlite3DbStrDup(db, zName); + pX->eEName = ENAME_NAME; } - sqlite3DbFree(db, zToFree); } } if( !tableSeen ){ diff --git a/src/sqliteInt.h b/src/sqliteInt.h index ec465cdb33..41f8d2450b 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3005,6 +3005,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 bHidden: 1; /* A "hidden" column of a subquery */ 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 95c14448fd..e051c19b9f 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -806,6 +806,7 @@ void sqlite3TreeViewBareExprList( case ENAME_TAB: fprintf(stdout, "TABLE-ALIAS-NAME(\"%s\") ", zName); if( pList->a[i].bUsed==0 ) fprintf(stdout, "(unused) "); + if( pList->a[i].bHidden!=0 ) fprintf(stdout, "(hidden) "); break; case ENAME_SPAN: fprintf(stdout, "SPAN(\"%s\") ", zName);