New test cases for row values and RIGHT JOIN.

FossilOrigin-Name: 5f0582b90fab9111e4a645c692549c35480e62635c596f8c7fa3466bd22f7235

diff --git a/manifest b/manifest
index 0add14d104a4e0a3f6a501a8e8ad9685c44fb4aa..1677ddfdd0258efc1f1d8009a7ad1d040d2e0ac0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\ssubqueries\sassociated\swith\srow-values\sare\sinvoked\sbefore\sbeing\nused\swhen\sprocessing\sa\sRIGHT\sJOIN.\s\sFix\sfor\sthe\sproblem\sdescribed\sby\n[forum:/forumpost/087de2d9ec87305b|forum\spost\s087de2d9ec87305b].
-D 2022-06-01T16:05:25.847
+C New\stest\scases\sfor\srow\svalues\sand\sRIGHT\sJOIN.
+D 2022-06-01T20:08:22.760
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1354,9 +1354,9 @@ F test/round1.test 768018b04522ca420b1aba8a24bd76091d269f3bce3902af3ec6ebcee41ab
 F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test e29025be95baf6b32f0d5edef59a7633028325896a98f1caa8019559ca910350
-F test/rowvalue.test 00668659c2ffb0ae8711b3f6702979f199170734c00f582622375cde4d03e091
+F test/rowvalue.test ff1ffa31cebe12feb6f989e09263f3b1e8c560db94b40fe006126a8435fd6832
 F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
-F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256
+F test/rowvalue3.test 1347e25ca11c547c5a6ff0cc5626f95aa9740e9275bfaec096029f57cb2130ce
 F test/rowvalue4.test 441e7e366ac6d939a3a95a574031c56ec2a854077a91d66eee5ff1d86cb5be58
 F test/rowvalue5.test 00740304ea6a53a8704640c7405690f0045d5d2a6b4b04dde7bccc14c3068ea7
 F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
@@ -1974,9 +1974,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 5933163ed1a8f996e81023c7c5822655dc6411d30016f37fe8863f760530dc5b e4e71b4cd4c026fc36f0da1703e6237e6ddd8ff2e08dc3c0011632b9e63098cd
-R 29237a4ae29ef3cc0374b4c8b3b6c3e8
-T +closed e4e71b4cd4c026fc36f0da1703e6237e6ddd8ff2e08dc3c0011632b9e63098cd
+P 5a9465dcc0c23fc2c66cd4898bcdfd5086fe4c71ec19a95db7221fdf7c0bbbbd
+R 26b2bd3e5fdb1d8e69b29c7f29b2a2d7
 U drh
-Z 8809ed3fb5097c404e378a7b4bbae70a
+Z 9985a346f99ce9b1374a1245c847ef44
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index fa43e2048f0a8461c53074d737d1b7ef40f49f1a..44d538d1c4f3b37134e3e274fff84900878a184d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a9465dcc0c23fc2c66cd4898bcdfd5086fe4c71ec19a95db7221fdf7c0bbbbd
\ No newline at end of file
+5f0582b90fab9111e4a645c692549c35480e62635c596f8c7fa3466bd22f7235
\ No newline at end of file

diff --git a/test/rowvalue.test b/test/rowvalue.test
index 757a150df622401f4b40e0bd2c399cef81c6b42e..12fee8237644230dd82cb501a28e2809fd2bfe6f 100644 (file)
--- a/test/rowvalue.test
+++ b/test/rowvalue.test
@@ -260,11 +260,23 @@ do_catchsql_test 11.8 {
 #
 do_execsql_test 12.1 {
   DROP TABLE IF EXISTS t1;
-  CREATE TABLE t1(a,b); INSERT INTO t1 VALUES(1,2);
+  CREATE TABLE t1(a INT,b INT); INSERT INTO t1 VALUES(1,2);
   DROP TABLE IF EXISTS t2;
-  CREATE TABLE t2(x,y); INSERT INTO t2 VALUES(3,4);
+  CREATE TABLE t2(x INT,y INT); INSERT INTO t2 VALUES(3,4);
   SELECT *,'x' FROM t1 LEFT JOIN t2 ON (a,b)=(x,y);
 } {1 2 {} {} x}
+db null -
+do_execsql_test 12.2 {
+  SELECT t1.*, t2.* FROM t2 RIGHT JOIN t1 ON (a,b)=(x,y);
+} {1 2 - -}
+do_execsql_test 12.3 {
+  SELECT t1.*, t2.* FROM t1 FULL JOIN t2 ON (a,b)=(x,y)
+   ORDER BY coalesce(a,x);
+} {
+  1 2 - -
+  - - 3 4
+}
+db null {}
 
 
 foreach {tn sql} {
@@ -632,9 +644,15 @@ do_execsql_test 26.10 {
 do_execsql_test 26.20 {
   SELECT 2 FROM t1 LEFT JOIN t0 ON (c0, x'') != (NULL, 0);
 } {2}
+do_execsql_test 26.21 {
+  SELECT 21 FROM t0 RIGHT JOIN t1 ON (c0, x'') != (NULL, 0);
+} {21}
 do_execsql_test 26.30 {
   SELECT 3 FROM t1 LEFT JOIN t0 WHERE (c0, x'') != (NULL, 0);
 } {3}
+do_execsql_test 26.31 {
+  SELECT 31 FROM t0 RIGHT JOIN t1 WHERE (c0, x'') != (NULL, 0);
+} {31}
 
 # 2019-12-30 ticket 892575cdba4e1e36
 #
@@ -700,6 +718,9 @@ do_execsql_test 31.1 {
   CREATE TABLE b(b1 UNIQUE,b2);
   SELECT * FROM a LEFT JOIN b ON b2=NULL AND b2=5 WHERE (b1,substr(b.b1,1,1))==(SELECT 1024,'b');
 } {}
+do_execsql_test 31.1b {
+  SELECT * FROM b RIGHT JOIN a ON b2=NULL AND b2=5 WHERE (b1,substr(b.b1,1,1))==(SELECT 1024,'b');
+} {}
 do_execsql_test 31.2 {
   CREATE TABLE t1(a);
   INSERT INTO t1 VALUES(0);
@@ -707,6 +728,9 @@ do_execsql_test 31.2 {
   INSERT INTO t2 VALUES(NULL,123,456);
   SELECT * FROM t1 LEFT JOIN t2 ON b=NULL WHERE (c,d)==(SELECT 123, 456+a);
 } {}
+do_execsql_test 31.2b {
+  SELECT * FROM t2 RIGHT JOIN t1 ON b=NULL WHERE (c,d)==(SELECT 123, 456+a);
+} {}
 
 # 2022-02-03 dbsqlfuzz 80a9fade844b4fb43564efc972bcb2c68270f5d1
 reset_db

diff --git a/test/rowvalue3.test b/test/rowvalue3.test
index 988eea90084aa17620f19f44b1d857587ba6a26d..80ebeb7617ebe4f789f08c0d3fe48da1967125d3 100644 (file)
--- a/test/rowvalue3.test
+++ b/test/rowvalue3.test
@@ -213,7 +213,8 @@ do_execsql_test 5.0 {
   CREATE TABLE T2(a TEXT PRIMARY KEY,n INT);
   INSERT INTO T2(a, n) VALUES('aaa',0);
   SELECT * FROM T2
-  WHERE (a,n) IN (SELECT T1.a, V.n FROM T1, (SELECT * FROM (SELECT 0 n)) V);
+   WHERE (a,n) IN (SELECT T1.a, V.n
+                     FROM T1, (SELECT * FROM (SELECT 0 n) T3) V);
 } {aaa 0}