Fix RIGHT JOIN for virtual tables.

FossilOrigin-Name: 75a9116e98b9ac5c1a4c62a01143a016d9ba6a0b495ff7af7468c11947a3e888

diff --git a/manifest b/manifest
index a2d3e3fd54b93aac06283c97983c43f87486947f..aa0aec2054966f6656a8e416bd9e13e6b28cbbc2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\squery\sflattener\smust\sadd\sTK_IF_NULL_ROW\sopcodes\son\ssubstituted\svalues\nthat\sland\son\sthe\sleft\soperand\sof\sa\sRIGHT\sJOIN,\sjust\sas\sit\salready\sdoes\sfor\nthe\sright\soperand\sof\sa\sLEFT\sJOIN.
-D 2022-04-11T20:15:52.179
+C Fix\sRIGHT\sJOIN\sfor\svirtual\stables.
+D 2022-04-11T21:00:38.338
 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 e704ad49ef2907633148e2c2d2a22abba229f0ded23a498e4b9587fd02c6d965
+F src/where.c 728d2d5c6259b576c33a2f5107b871e9819484509126bd40ade8b95224852655
 F src/whereInt.h cd6bddac3a26640b92d86e2b45ecc6e82d663cbcac6fd5d6d9690dfb280b1668
 F src/wherecode.c bdf7de22c7ac38ad92e78214231a6054019521bfab943c2bfd5ddfb9e8ad9255
 F src/whereexpr.c 174d4ad5be165c610c907abb779ef4a97974d22b84e1ce7898d2d9f6947249e5
@@ -1946,8 +1946,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 bdd1499c0fa4f8aadf4857a0ccc0d839c250369f29766ebef80330964905e63b
-R 1528160c8ffde5ccc7d4edc8311e6b3e
+P 8e02cdf5b1128f5e5b82d93903063415ec312694e5ccdd19e99fa35433f1b68a
+R 5708722e4ffecbe2e31f6fd1bda81037
 U drh
-Z 0a6599330cad92a7a73b62ce77e2586b
+Z 577b70851c6bc25c90b72e9816f63b4e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index bd94247551b5954230ab803d88f294643955b81b..fb8b6444cbe30cb96058f878310ed70206cfb2f0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8e02cdf5b1128f5e5b82d93903063415ec312694e5ccdd19e99fa35433f1b68a
\ No newline at end of file
+75a9116e98b9ac5c1a4c62a01143a016d9ba6a0b495ff7af7468c11947a3e888
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index defbc860fcf94cb0e6f1c9039cc30b9c3db8ce9d..f1d3ad2655f6cde5425323e41b8307782aa2ca73 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -6181,7 +6181,12 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
         int iIdxCur;
         mAll |= pWInfo->a[k].pWLoop->maskSelf;
         iIdxCur = pWInfo->a[k].iIdxCur;
-        if( iIdxCur ) sqlite3VdbeAddOp1(v, OP_NullRow, iIdxCur);
+        if( iIdxCur ){
+          sqlite3VdbeAddOp1(v, OP_NullRow, iIdxCur);
+        }
+        if( pWInfo->a[k].pWLoop->wsFlags & WHERE_VIRTUALTABLE ){
+          sqlite3VdbeAddOp1(v, OP_NullRow, pWInfo->a[k].iTabCur);
+        }
       }
       mAll |= pLoop->maskSelf;
       for(k=0; k<pWC->nTerm; k++){