Fix to the logic that computes coalesc() functions to resolve USING terms.

FossilOrigin-Name: 20388548d868511f8c8437718985d75fe9801835811fec716f1700727b9aa367

diff --git a/manifest b/manifest
index e4a8d108140e866da5c58707cb1b8bb72ed918b1..f0c9f00d2b95474db8cc9a1d363e1ea1590218f6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Deal\swith\sOP_Return\sbypass\sin\sthe\sRIGHT\sJOIN\ssubroutine\sby\sadding\sextra\nOP_Returns\swhere\sneeded.
-D 2022-04-17T22:58:23.198
+C Fix\sto\sthe\slogic\sthat\scomputes\scoalesc()\sfunctions\sto\sresolve\sUSING\sterms.
+D 2022-04-17T23:46:18.306
 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 d38fc50ba853bead084c571dae2218620655dfb952eb535b8f29c9757e92fa87
+F src/resolve.c c6591eb339fb21e907485020cb2b7967a6ebd61533bec8841fb12d154e99a7fa
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 1d0c3aece7221fb1e5b10f636eed074ee1318d7bb93e1029004d84447f825562
 F src/shell.c.in eb7f10d5e2c47bd014d92ec5db1def21fcc1ed56ffaaa4ee715b6c37c370b47f
@@ -1948,8 +1948,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 c90602328a4b26f06d76c5343d29ebb7a782186c86ea88f5965a41040cff5346
-R c6c7dddd732c43b8717c6704e8264673
+P 71abe5641f599f27d1f0c800f6182e1168909f8aa99389b835b07d4b5f5483eb
+R 8fb229091ea6e9ef20c8b036edcf4ea5
 U drh
-Z 0ea458b3f473eb82432ab8cf97d554a5
+Z aeae6fd254922cd510b69a69105d63ce
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d418abf9d8f3e48d6071529bbae4a925728afb94..c53f6ff17d26bf23a7459c59079cd7fab0a52edb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-71abe5641f599f27d1f0c800f6182e1168909f8aa99389b835b07d4b5f5483eb
\ No newline at end of file
+20388548d868511f8c8437718985d75fe9801835811fec716f1700727b9aa367
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 0f0b85306025de98d888d676ec9bd750557c300a..d114dfc467dab72ff7908669cca55fe1bca2f1e0 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -680,6 +680,7 @@ static int lookupName(
         pExpr->op = TK_FUNCTION;
         pExpr->u.zToken = "coalesce";
         pExpr->x.pList = pFJMatch;
+        cnt = 1;
         goto lookupname_end;
       }else{
         sqlite3ExprListDelete(db, pFJMatch);