diff --git a/manifest b/manifest
index fce667eaea..0a663ec1c8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\shandling\sof\s"continue"\sand\s"break"\sfrom\sinside\sthe\sloop\sfor\sthe\sright\noperand\sof\sa\sRIGHT\sJOIN.
-D 2022-04-11T17:27:38.662
+C New\stest\scases\sadded.
+D 2022-04-11T18:54:23.445
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -646,9 +646,9 @@ F src/whereexpr.c 174d4ad5be165c610c907abb779ef4a97974d22b84e1ce7898d2d9f6947249
 F src/window.c 42a71595263dbd8ef8248218e4fc7d4b5ddccece52146ad48e079342d93f6f8f
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
-F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
+F test/affinity3.test b5c19d504dec222c0dc66642673d23dce915d35737b68e74d9f237b80493eb53
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
-F test/aggnested.test cc47afa5e11e0d6771a85a4993fa6ff721480ddb53ea538ec3fdbafb720bd505
+F test/aggnested.test 7269d07ac879fce161cb26c8fabe65cba5715742fac8a1fccac570dcdaf28f00
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 2ecb8bbd52416642e41c9081182a8df05d42c75637afd4488aace78cc4b69e13
 F test/alter.test 313073774ab5c3f2ef1d3f0d03757c9d3a81284ae7e1b4a6ca34db088f886896
@@ -707,7 +707,7 @@ F test/autoinc.test 997d6f185f138229dc4251583a1d04816423dddc2fc034871a01aeb1d728
 F test/autoindex1.test 523b26034dc5e0c5ff0865055b4593f75863b82f17748dec9ca64bb8b267c502
 F test/autoindex2.test 12ef578928102baaa0dc23ad397601a2f4ecb0df
 F test/autoindex3.test 2d13958a5617e987624a428d7aed91bf51f322b49b476e3573fadec697ce6da5
-F test/autoindex4.test 75cb1191a552b8201351f5a50d160fcb9387a0fbbfb820c77798bfee7da3f8cf
+F test/autoindex4.test 5df39313526b6f22a26bd119bbd97ca69f28386ab3c671fc10568d921c41eb08
 F test/autoindex5.test 2ee94f033b87ca0160e08d81034c507aff8e230df2627f0304fa309b2fee19a3
 F test/autovacuum.test 00671369bbf96c6a49989a9425f5b78b94075d6a4b031e5e00000c2c32f365df
 F test/autovacuum2.test 76f7eb4fe6a6bf6d33a196a7141dba98886d2fb53a268d7feca285d5da4759d7
@@ -752,7 +752,7 @@ F test/boundary3.tcl 23361e108a125dca9c4080c2feb884fe54d69243
 F test/boundary3.test 56ef82096b4329aca2be74fa1e2b0f762ea0eb45
 F test/boundary4.tcl 0bb4b1a94f4fc5ae59b79b9a2b7a140c405e2983
 F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
-F test/btree01.test 8e1ba2f857608ad8fbf9fcc11f33b15b083711162f9566b0a21fb573f2008593
+F test/btree01.test fef17d9e999ac4f04095948e3438fbe674f4e07bb2c63bb1cad41d87baee077f
 F test/btree02.test 7555a5440453d900410160a52554fe6478af4faf53098f7235f1f443d5a1d6cc
 F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
 F test/busy.test 510dc6daaad18bcbbc085bcc6217d6dc418def5e73f72ce1475eea0cb7834727
@@ -777,7 +777,7 @@ F test/close.test eccbad8ecd611d974cbf47278c3d4e5874faf02d811338d5d348af42d56d64
 F test/closure01.test 9905883f1b171a4638f98fc764879f154e214a306d3d8daf412a15e7f3a9b1e0
 F test/coalesce.test cee0dccb9fbd2d494b77234bccf9dc6c6786eb91
 F test/collate1.test 71a6f27fdc93a92f14d8ab80c05e1937656a5a03197e1a10157314554d630ce8
-F test/collate2.test 9aaa410a00734e48bcb27f3872617d6f69b2a621
+F test/collate2.test 471c6f74573382b89b0f8b88a05256faa52f7964f9e4799e76708a3b1ece6ba4
 F test/collate3.test 89defc49983ddfbf0a0555aca8c0521a676f56a5
 F test/collate4.test c953715fb498b87163e3e73dd94356bff1f317bd
 F test/collate5.test 65d928034d30d2d263a80f6359f7549ee1598ec6
@@ -1141,7 +1141,7 @@ F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
 F test/istrue.test e7f285bb70282625c258e866ce6337d4c762922f5a300e1b50f958aef6e7d9c9
 F test/join.test a1832675aa30f2b422ff934b553e30294ca899484710242a2119ebf21f20a66a
-F test/join2.test bf5ce6bfcef40dd49cfa51dd338eee62551e1efd85cadc68456c9beb43a06914
+F test/join2.test 9751dac84a46a960281ca372fe2350252ef40286dde3c542540bccdea9a2d5c6
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
 F test/join5.test c4df54e2e204d7f1417bfbdd21ca324b4b07415c647595cc47798eacfddc96d3
@@ -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 7ef3e99a73d70405a185d5d31f2d97d3bd99568fd6f10941e75d6c0baa27dc4f
-R 6de58d614948b06c1662abe14fed19fe
+P b6e773a26c2c6ee76ea61acb059b4e676d07ea62f6db9c513638f8986557cf04
+R ea6a6206ccd15b1ede34fe0a185bc5f1
 U drh
-Z e47a7befddcb419a51a3526b7bfafbab
+Z 7ac11620004b739208f6ff19e0608f85
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 11c7f5d20d..3f8fbe197f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b6e773a26c2c6ee76ea61acb059b4e676d07ea62f6db9c513638f8986557cf04
\ No newline at end of file
+bdd1499c0fa4f8aadf4857a0ccc0d839c250369f29766ebef80330964905e63b
\ No newline at end of file
diff --git a/test/affinity3.test b/test/affinity3.test
index ef1533a8f8..48942de72e 100644
--- a/test/affinity3.test
+++ b/test/affinity3.test
@@ -30,11 +30,24 @@ do_execsql_test affinity3-100 {
   FROM customer c
   LEFT JOIN apr i ON i.id=c.id;
   
+  CREATE VIEW v1rj AS
+  SELECT c.id, i.apr
+  FROM apr i
+  RIGHT JOIN customer c ON i.id=c.id;
+  
   CREATE VIEW v2 AS
   SELECT c.id, v1.apr
   FROM customer c
   LEFT JOIN v1 ON v1.id=c.id;
   
+  CREATE VIEW v2rj AS
+  SELECT c.id, v1.apr
+  FROM v1 RIGHT JOIN customer c ON v1.id=c.id;
+  
+  CREATE VIEW v2rjrj AS
+  SELECT c.id, v1rj.apr
+  FROM v1rj RIGHT JOIN customer c ON v1rj.id=c.id;
+  
   INSERT INTO customer (id) VALUES (1);
   INSERT INTO apr (id, apr) VALUES (1, 12);
   INSERT INTO customer (id) VALUES (2);
@@ -44,16 +57,35 @@ do_execsql_test affinity3-110 {
   PRAGMA automatic_index=ON;
   SELECT id, (apr / 100), typeof(apr) apr_type  FROM v1;
 } {1 0.12 real 2 0.1201 real}
+do_execsql_test affinity3-111 {
+  PRAGMA automatic_index=ON;
+  SELECT id, (apr / 100), typeof(apr) apr_type  FROM v1rj;
+} {1 0.12 real 2 0.1201 real}
 do_execsql_test affinity3-120 {
   SELECT id, (apr / 100), typeof(apr) apr_type  FROM v2;
 } {1 0.12 real 2 0.1201 real}
+do_execsql_test affinity3-121 {
+  SELECT id, (apr / 100), typeof(apr) apr_type  FROM v2rj;
+} {1 0.12 real 2 0.1201 real}
+do_execsql_test affinity3-122 {
+  SELECT id, (apr / 100), typeof(apr) apr_type  FROM v2rjrj;
+} {1 0.12 real 2 0.1201 real}
 do_execsql_test affinity3-130 {
   PRAGMA automatic_index=OFF;
   SELECT id, (apr / 100), typeof(apr) apr_type  FROM v1;
 } {1 0.12 real 2 0.1201 real}
+do_execsql_test affinity3-131 {
+  SELECT id, (apr / 100), typeof(apr) apr_type  FROM v1rj;
+} {1 0.12 real 2 0.1201 real}
 do_execsql_test affinity3-140 {
   SELECT id, (apr / 100), typeof(apr) apr_type  FROM v2;
 } {1 0.12 real 2 0.1201 real}
+do_execsql_test affinity3-141 {
+  SELECT id, (apr / 100), typeof(apr) apr_type  FROM v2rj;
+} {1 0.12 real 2 0.1201 real}
+do_execsql_test affinity3-142 {
+  SELECT id, (apr / 100), typeof(apr) apr_type  FROM v2rjrj;
+} {1 0.12 real 2 0.1201 real}
 
 # Ticket https://www.sqlite.org/src/info/7ffd1ca1d2ad4ecf  (2017-01-16)
 # Incorrect affinity when using automatic indexes 
diff --git a/test/aggnested.test b/test/aggnested.test
index 35d5f1e3a6..1b8b608803 100644
--- a/test/aggnested.test
+++ b/test/aggnested.test
@@ -137,6 +137,17 @@ do_test aggnested-3.1 {
        GROUP BY curr.id1);
   }
 } {1 1}
+do_test aggnested-3.1-rj {
+  db eval {
+    SELECT
+     (SELECT sum(value2==xyz) FROM t2)
+    FROM
+     (SELECT curr.value1 as xyz
+        FROM t1 AS other RIGHT JOIN t1 AS curr
+       GROUP BY curr.id1);
+  }
+} {1 1}
+
 do_test aggnested-3.2 {
   db eval {
     DROP TABLE IF EXISTS t1;
diff --git a/test/autoindex4.test b/test/autoindex4.test
index 24604af588..d9ab783e42 100644
--- a/test/autoindex4.test
+++ b/test/autoindex4.test
@@ -32,12 +32,21 @@ do_execsql_test autoindex4-1.1 {
 do_execsql_test autoindex4-1.2 {
   SELECT *, '|' FROM t1 LEFT JOIN t2 ON a=234 AND x=555;
 } {123 abc {} {} | 234 def {} {} | 234 ghi {} {} | 345 jkl {} {} |}
+do_execsql_test autoindex4-1.2-rj {
+  SELECT t1.*, t2.*, '|' FROM t2 RIGHT JOIN t1 ON a=234 AND x=555;
+} {123 abc {} {} | 234 def {} {} | 234 ghi {} {} | 345 jkl {} {} |}
 do_execsql_test autoindex4-1.3 {
   SELECT *, '|' FROM t1 LEFT JOIN t2 ON x=555 WHERE a=234;
 } {234 def {} {} | 234 ghi {} {} |}
+do_execsql_test autoindex4-1.3-rj {
+  SELECT t1.*, t2.*, '|' FROM t2 RIGHT JOIN t1 ON x=555 WHERE a=234;
+} {234 def {} {} | 234 ghi {} {} |}
 do_execsql_test autoindex4-1.4 {
   SELECT *, '|' FROM t1 LEFT JOIN t2 WHERE a=234 AND x=555;
 } {}
+do_execsql_test autoindex4-1.4-rj {
+  SELECT t1.*, t2.*, '|' FROM t2 RIGHT JOIN t1 WHERE a=234 AND x=555;
+} {}
 
 
 do_execsql_test autoindex4-2.0 {
@@ -69,6 +78,14 @@ do_execsql_test autoindex4-3.0 {
     ORDER BY Items.ItemName;
 } {Item1 Item2}
 do_execsql_test autoindex4-3.1 {
+  SELECT Items.ItemName
+    FROM A
+      RIGHT JOIN Items ON (A.Name = Items.ItemName and Items.ItemName = 'dummy')
+      LEFT JOIN B ON (B.Name = Items.ItemName)
+    WHERE Items.Name = 'Parent'
+    ORDER BY Items.ItemName;
+} {Item1 Item2}
+do_execsql_test autoindex4-3.10 {
   CREATE INDEX Items_x1 ON Items(ItemName,Name) WHERE ItemName = 'dummy';
   
   SELECT Items.ItemName
@@ -78,6 +95,14 @@ do_execsql_test autoindex4-3.1 {
     WHERE Items.Name = 'Parent'
     ORDER BY Items.ItemName;
 } {Item1 Item2}
+do_execsql_test autoindex4-3.11 {
+  SELECT Items.ItemName
+    FROM A
+      RIGHT JOIN Items ON (A.Name = Items.ItemName and Items.ItemName = 'dummy')
+      LEFT JOIN B ON (B.Name = Items.ItemName)
+    WHERE Items.Name = 'Parent'
+    ORDER BY Items.ItemName;
+} {Item1 Item2}
 
 # 2021-11-30 - Enhancement to help the automatic index mechanism to
 # create a partial index more often.
diff --git a/test/btree01.test b/test/btree01.test
index 9c309760d5..6e4717ae65 100644
--- a/test/btree01.test
+++ b/test/btree01.test
@@ -148,6 +148,9 @@ do_execsql_test btree01-2.1 {
   INSERT INTO t2(y) VALUES(198),(187),(100);
   SELECT y, c FROM t2 LEFT JOIN t1 ON y=a ORDER BY x;
 } {198 99 187 {} 100 50}
+do_execsql_test btree01-2.2 {
+  SELECT y, c FROM t1 RIGHT JOIN t2 ON y=a ORDER BY x;
+} {198 99 187 {} 100 50}
 
 
 finish_test
diff --git a/test/collate2.test b/test/collate2.test
index d5aadb4eb5..281aa35709 100644
--- a/test/collate2.test
+++ b/test/collate2.test
@@ -684,16 +684,34 @@ do_test collate2-5.3 {
     SELECT collate2t1.b FROM collate2t2 NATURAL JOIN collate2t1;
   }
 } {aa}
-do_test collate2-5.4 {
+do_test collate2-5.4.1 {
   execsql {
-    SELECT collate2t2.b FROM collate2t1 LEFT OUTER JOIN collate2t2 USING (b) order by collate2t1.oid;
+    SELECT collate2t2.b FROM collate2t1 LEFT JOIN collate2t2 USING (b) order by collate2t1.oid;
   }
 } {{} aa {} {} {} aa {} {} {} aa {} {} {} aa {} {} {}}
-do_test collate2-5.5 {
+do_test collate2-5.4.2 {
+  execsql {
+    SELECT collate2t2.b FROM collate2t2 RIGHT JOIN collate2t1 ON collate2t1.b=collate2t2.b
+     ORDER BY collate2t1.oid;
+  }
+} {{} aa {} {} {} aa {} {} {} aa {} {} {} aa {} {} {}}
+do_test collate2-5.4.3 {
+  execsql {
+    SELECT collate2t2.b FROM collate2t1 LEFT JOIN collate2t2 ON collate2t2.b=collate2t1.b
+     ORDER BY collate2t1.oid;
+  }
+} {{} aa {} {} {} {} {} {} {} {} {} {} {} {} {} {} {}}
+do_test collate2-5.5.1 {
   execsql {
     SELECT collate2t1.b, collate2t2.b FROM collate2t2 LEFT OUTER JOIN collate2t1 USING (b);
   }
 } {aa aa}
+do_test collate2-5.5.2 {
+  execsql {
+    SELECT collate2t1.b, collate2t2.b
+      FROM collate2t1 RIGHT JOIN collate2t2 ON collate2t2.b=collate2t1.b
+  }
+} {aa aa}
 
 do_execsql_test 6.1 {
   CREATE TABLE t1(x);
diff --git a/test/join2.test b/test/join2.test
index 8af242b1ad..4142fd15b3 100644
--- a/test/join2.test
+++ b/test/join2.test
@@ -63,6 +63,12 @@ do_test join2-1.6 {
       t1 NATURAL LEFT OUTER JOIN t2 NATURAL JOIN t3
   }
 } {1 11 111 1111}
+do_test join2-1.6-rj {
+  execsql {
+    SELECT * FROM
+      t2 NATURAL RIGHT OUTER JOIN t1 NATURAL JOIN t3
+  }
+} {11 111 1 1111}
 ifcapable subquery {
   do_test join2-1.7 {
     execsql {
@@ -70,6 +76,12 @@ ifcapable subquery {
         t1 NATURAL LEFT OUTER JOIN (t2 NATURAL JOIN t3)
     }
   } {1 11 111 1111 2 22 {} {} 3 33 {} {}}
+  do_test join2-1.7-rj {
+    execsql {
+      SELECT * FROM
+        (t2 NATURAL JOIN t3) NATURAL RIGHT JOIN t1
+    }
+  } {11 111 1111 1 {} {} {} 2 {} {} {} 3}
 }
 
 #-------------------------------------------------------------------------
@@ -88,6 +100,9 @@ do_execsql_test 2.0 {
 do_catchsql_test 2.1 {
   SELECT * FROM aa LEFT JOIN cc ON (a=b) JOIN bb ON (b=coalesce(c,1));
 } {1 {ON clause references tables to its right}}
+do_catchsql_test 2.1b {
+  SELECT * FROM aa RIGHT JOIN cc ON (a=b) JOIN bb ON (b=coalesce(c,1));
+} {1 {ON clause references tables to its right}}
 do_catchsql_test 2.2 {
   SELECT * FROM aa JOIN cc ON (a=b) JOIN bb ON (b=c);
 } {0 {one one one}}