From: dan <Dan Kennedy>
Date: Fri, 17 Jun 2022 11:39:24 +0000 (+0000)
Subject: Avoid omitting the rhs of FULL JOINs in cases where it is only correct to omit the... 
X-Git-Tag: version-3.39.0~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a7aff93edd0fb208d93b08dae12fcb68dd8f061;p=thirdparty%2Fsqlite.git

Avoid omitting the rhs of FULL JOINs in cases where it is only correct to omit the rhs of a LEFT JOIN.

FossilOrigin-Name: f23a429d4153518d37387e121f22a30b22e2b31e126ad168e72049a96be86269
---

diff --git a/manifest b/manifest
index c2eeb441fd..c8a84ac6d9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sfix\sto\sthe\squery\sinvariant\stesting\slogic\sof\sfuzzcheck.
-D 2022-06-16T20:29:36.245
+C Avoid\somitting\sthe\srhs\sof\sFULL\sJOINs\sin\scases\swhere\sit\sis\sonly\scorrect\sto\somit\sthe\srhs\sof\sa\sLEFT\sJOIN.
+D 2022-06-17T11:39:24.504
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -657,7 +657,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 267caa227dd38ede46959468118ef4067316dae589d889c200911ff77df53ef1
+F src/where.c 2db3d41a1fd3b93d86680b4f33530d1f96ce9941771ebee80effba071d9d1e38
 F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
 F src/wherecode.c 0b09abfcb88c61c6a6984a3e065786631ff35495e9bdf865e6b74ab0a1299c5b
 F src/whereexpr.c 20255cf03e0b765b742301197d165511ff99e95da0d7ee9c8a2ebc1e888dd049
@@ -1176,6 +1176,7 @@ F test/joinC.test 1f1a602c2127f55f136e2cbd3bf2d26546614bf8cffe5902ec1ac9c07f87f2
 F test/joinD.test 1a430af8dac5b68663f13df534ffe98775e582bac2305b80f1e8eb4ab778672a
 F test/joinE.test d5d182f3812771e2c0d97c9dcf5dbe4c41c8e21c82560e59358731c4a3981d6b
 F test/joinF.test 53dd66158806823ea680dd7543b5406af151b5aafa5cd06a7f3231cd94938127
+F test/joinH.test 743f5afbd5c275adb49a91fd8cfe9c494eca231c05777adb60b1cec19ac6511c
 F test/journal1.test c7b768041b7f494471531e17abc2f4f5ebf9e5096984f43ed17c4eb80ba34497
 F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
 F test/journal3.test 7c3cf23ffc77db06601c1fcfc9743de8441cb77db9d1aa931863d94f5ffa140e
@@ -1977,8 +1978,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 3a461f61b47e6ba6d5dcc2b7470ebde512b57bc68086f65050e07b06f42b7351
-R d0f84b140700e490433349a70f8e673c
-U drh
-Z 3d24c9b621cf5763642f52e3d8949e70
+P 447e62a0946f5d77b7358adcabaeb23a7012cdfbfa1ef6082734cd9b45b2699d
+R 4a775b1d5ba6396498691341f48a10ac
+U dan
+Z 4f025e5a7e8dcede4b711630a37a27ba
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5a0c5b8a70..d6f729e6e8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-447e62a0946f5d77b7358adcabaeb23a7012cdfbfa1ef6082734cd9b45b2699d
\ No newline at end of file
+f23a429d4153518d37387e121f22a30b22e2b31e126ad168e72049a96be86269
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 681cdf99a0..ed2a2d2218 100644
--- a/src/where.c
+++ b/src/where.c
@@ -5246,7 +5246,7 @@ static SQLITE_NOINLINE Bitmask whereOmitNoopJoin(
     WhereLoop *pLoop;
     pLoop = pWInfo->a[i].pWLoop;
     pItem = &pWInfo->pTabList->a[pLoop->iTab];
-    if( (pItem->fg.jointype & JT_LEFT)==0 ) continue;
+    if( (pItem->fg.jointype & (JT_LEFT|JT_RIGHT))!=JT_LEFT ) continue;
     if( (pWInfo->wctrlFlags & WHERE_WANT_DISTINCT)==0
      && (pLoop->wsFlags & WHERE_ONEROW)==0
     ){
diff --git a/test/joinH.test b/test/joinH.test
new file mode 100644
index 0000000000..6dde0c3834
--- /dev/null
+++ b/test/joinH.test
@@ -0,0 +1,57 @@
+# 2022 May 17
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix joinH
+
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a INT);
+  CREATE TABLE t2(b INT);
+  INSERT INTO t2(b) VALUES(NULL);
+}
+
+db nullvalue NULL
+
+do_execsql_test 1.1 {
+  SELECT DISTINCT a FROM t1 FULL JOIN t2 ON true WHERE (b ISNULL);
+} {NULL}
+do_execsql_test 1.2 {
+  SELECT a FROM t1 FULL JOIN t2 ON true;
+} {NULL}
+do_execsql_test 1.3 {
+  SELECT a FROM t1 FULL JOIN t2 ON true WHERE (b ISNULL);
+} {NULL}
+do_execsql_test 1.4 {
+  SELECT DISTINCT a FROM t1 FULL JOIN t2 ON true;
+} {NULL}
+
+#-----------------------------------------------------------
+
+reset_db
+do_execsql_test 2.0 {
+  CREATE TABLE r3(x);
+  CREATE TABLE r4(y INTEGER PRIMARY KEY);
+  INSERT INTO r4 VALUES(55);
+}
+
+do_execsql_test 2.1 {
+  SELECT 'value!' FROM r3 FULL JOIN r4 ON (y=x);
+} {value!}
+
+do_execsql_test 2.2 {
+  SELECT 'value!' FROM r3 FULL JOIN r4 ON (y=x) WHERE +y=55;
+} {value!}
+
+
+finish_test