Bug fixes. A basic FULL OUTER JOIN now works.

FossilOrigin-Name: 34bbeeb77bd530b2b1f0390e9e552f65ae35f09a74d80a09dd327e64f9be51a1

diff --git a/manifest b/manifest
index c3406710bb2dbec069cbc85e702011b99a59115f..f2bc29afedc168165b0902930f44e472efb2f51f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sbyte-code\sthat\scomputes\sunmatched\srows\son\sthe\sright\stable\sof\sa\sRIGHT\sJOIN.\nCompiles,\sand\sthe\scode\slooks\ssemi-reasonable,\sbut\sstill\sdoes\snot\srun.\nIncremental\scheck-in.
-D 2022-04-09T14:48:35.562
+C Bug\sfixes.\s\sA\sbasic\sFULL\sOUTER\sJOIN\snow\sworks.
+D 2022-04-09T18:48:11.005
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -639,7 +639,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 7d0b140d373dce6b86e4023239265db5c4af465ea3cf1ff92f9a38369518e166
+F src/where.c ddeca7f959c3da448012737c0bf0c283232a317c7ef0bdc6587352f4189bd8aa
 F src/whereInt.h ecf0d9fe3e35f2546e660c6389e56aedb6fd2434e31a0449b261ff55ebc6df2d
 F src/wherecode.c 39532c183ea306ae44b5ab3119b244407b46970b088c59d5751c5724b4b6ec15
 F src/whereexpr.c ac8985bbd983f34273b1e0d05cd738ff436331674c1b22f4caf6537e1eca4691
@@ -1945,8 +1945,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 549f5a7ee639de80f049445002f58e93c805f9a3d3db1987ec9d139ccef4805e
-R 897adc2c472d0e3292a88884e473c6ff
+P 2db5a498e74241dd19ef51c601f1a2b3b687faed3e1be2d1e3ada737406ac8e9
+R 0ae50938e4462db8bba3d38695099c31
 U drh
-Z 9e61af1d71063444102e67ca76812f4f
+Z 29e379e6c2c78a86783f35cb54daa623
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3031369ad50d7faf37c8f960a4bfc9effc4d700c..df20f470e83d6e7390432042f58cc93b32243507 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2db5a498e74241dd19ef51c601f1a2b3b687faed3e1be2d1e3ada737406ac8e9
\ No newline at end of file
+34bbeeb77bd530b2b1f0390e9e552f65ae35f09a74d80a09dd327e64f9be51a1
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index eec8ccb9810fcc045ed49baef24f8fc671486a99..bec9da8db0a6258f3e84052d6140749258db99cf 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -6009,7 +6009,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
       /* Terminate the subroutine that forms the interior of the loop of
       ** the RIGHT JOIN table */
       WhereRightJoin *pRJ = pLevel->pRJ;
-      sqlite3VdbeChangeP2(v, pRJ->addrSubrtn-1, sqlite3VdbeCurrentAddr(v));
+      sqlite3VdbeChangeP1(v, pRJ->addrSubrtn-1, sqlite3VdbeCurrentAddr(v));
       sqlite3VdbeAddOp2(v, OP_Return, pRJ->regReturn, pRJ->addrSubrtn);
     }
     pLoop = pLevel->pWLoop;
@@ -6184,6 +6184,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
         int iCur = pLevel->iTabCur;
         int r = ++pParse->nMem;
         int nPk;
+        int jmp;
         int addrCont = sqlite3WhereContinueLabel(pSubWInfo);
         if( HasRowid(pTab) ){
           sqlite3ExprCodeGetColumnOfTable(v, pTab, iCur, -1, r);
@@ -6198,8 +6199,9 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
             sqlite3ExprCodeGetColumnOfTable(v, pTab, iCur, iCol,r+iPk);
           }
         }
-        sqlite3VdbeAddOp4Int(v, OP_Filter, pRJ->regBloom, addrCont, r, nPk);
+        jmp = sqlite3VdbeAddOp4Int(v, OP_Filter, pRJ->regBloom, 0, r, nPk);
         sqlite3VdbeAddOp4Int(v, OP_Found, pRJ->iMatch, addrCont, r, nPk);
+        sqlite3VdbeJumpHere(v, jmp);
         sqlite3VdbeAddOp2(v, OP_Gosub, pRJ->regReturn, pRJ->addrSubrtn);
         sqlite3WhereEnd(pSubWInfo);
       }