diff options
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/resolve.c | 14 |
3 files changed, 13 insertions, 15 deletions
@@ -1,5 +1,5 @@ -C Add\sthe\somitted\s"finish_test"\sto\sthe\send\sof\sjoinA.test. -D 2022-04-19T02:03:18.069 +C Remove\sunnecessary\scases\sfor\sthe\sresolver. +D 2022-04-19T09:39:39.006 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -550,7 +550,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7 F src/prepare.c fd940149c691684e7c1073c3787a7170e44852b02d1275d2e30a5b58e89cfcaf F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c -F src/resolve.c ce4cb0889f1bf5990b698740b88026385cf6f30222fde1f02a3168bb780eb579 +F src/resolve.c a3d58967025858f0f61b7b5d6c45914650acce05c33e4379a43ca4d042a68573 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 459cea7ae6e6ff517b04ad3ec7ed6479b666096a85fcec5b4edec2d5cacca2d8 F src/shell.c.in ecff6f4ab0e8e25acd578b3eb27ac0bad4d48643c160259a277151d6e9d412e1 @@ -1949,8 +1949,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 5c2f670e0fb35648e1d6e1c48f4d8af815cd57d59eac6ba22e253511bb078870 -R bb5ed5e9ec8911fef5a8aa38ca9d5eee +P 0907505cc9bb051280108fe5074211374b31836fae1ae6667a3de69f9d83fc01 +R af8749bf8e5681ed93958baf8fbcfed8 U drh -Z 938a68f2e1d34b25353fa58c5f0735ee +Z 9bd754afd9f14824483f75f7cef5bcee # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 15199a9fe..e2eb30dbd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0907505cc9bb051280108fe5074211374b31836fae1ae6667a3de69f9d83fc01
\ No newline at end of file +5bc9aa68e2f938f6a70dd4b08703fe52416d17efe461ec65d37332b57b827fdd
\ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index 76e635acf..4d5e23dff 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -322,12 +322,11 @@ static int lookupName( if( pItem->fg.isUsing==0 || sqlite3IdListIndex(pItem->u3.pUsing, zCol)<0 ){ + /* Two or more tables have the same column name which is + ** not joined by USING. This is an error. Signal as much + ** by clearing pFJMatch and letting cnt go above 1. */ sqlite3ExprListDelete(db, pFJMatch); pFJMatch = 0; - if( pItem->fg.jointype & JT_LTORJ ){ - cnt++; - continue; - } }else if( (pItem->fg.jointype & JT_RIGHT)==0 ){ /* An INNER or LEFT JOIN. Use the left-most table */ @@ -376,12 +375,11 @@ static int lookupName( if( pItem->fg.isUsing==0 || sqlite3IdListIndex(pItem->u3.pUsing, zCol)<0 ){ + /* Two or more tables have the same column name which is + ** not joined by USING. This is an error. Signal as much + ** by clearing pFJMatch and letting cnt go above 1. */ sqlite3ExprListDelete(db, pFJMatch); pFJMatch = 0; - if( pItem->fg.jointype & JT_LTORJ ){ - cnt++; - continue; - } }else if( (pItem->fg.jointype & JT_RIGHT)==0 ){ /* An INNER or LEFT JOIN. Use the left-most table */ |