From: dan <Dan Kennedy>
Date: Mon, 25 Aug 2025 11:47:15 +0000 (+0000)
Subject: Add test case to this branch to show that it handles cases where ON clauses use selec... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fon-clause-fix-3rd-try;p=thirdparty%2Fsqlite.git

Add test case to this branch to show that it handles cases where ON clauses use select-list aliases to refer to columns to their right.

FossilOrigin-Name: 4d34ab4acf0343a22ea8097fa4b1e87a1b0a13be864d5bee0c7a8341c09b8002
---

diff --git a/manifest b/manifest
index 24ad7a244a..f3be2338c2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\scases\sin\sjoinI.test\son\sthis\sbranch.
-D 2025-08-23T16:26:36.004
+C Add\stest\scase\sto\sthis\sbranch\sto\sshow\sthat\sit\shandles\scases\swhere\sON\sclauses\suse\sselect-list\saliases\sto\srefer\sto\scolumns\sto\stheir\sright.
+D 2025-08-25T11:47:15.389
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1335,7 +1335,7 @@ F test/joinD.test 2ce62e7353a0702ca5e70008faf319c1d4686aa19fba34275c6d1da0e960be
 F test/joinE.test d5d182f3812771e2c0d97c9dcf5dbe4c41c8e21c82560e59358731c4a3981d6b
 F test/joinF.test 53dd66158806823ea680dd7543b5406af151b5aafa5cd06a7f3231cd94938127
 F test/joinH.test fd76024ff104baec16417db5cafc0894ad4e0863e70803e63c1bba0322706339
-F test/joinI.test c30a1096c80a1300f088feb64fd356309cd14059d78352426550d2676f015ab4
+F test/joinI.test fc7d24a2b1e444979b83bd92c30ebb975cebb5b9eae4442ce94969bd8d083053
 F test/journal1.test bc61a4228db11bffca118bd358ba4b868524bf080f3532749de6c539656e20fa
 F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
 F test/journal3.test e5aeff93a7776cf644dbc48dec277655cff80a1cd24689036abc87869b120ea6
@@ -2170,8 +2170,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d163535ec8d463d74112d38a606fa4d900e66deb1a414c947973cd1880e41526
-R 690bd5803e72eefc9593af834d5d854a
+P 23ac2377315af02b73db6ae37bfeeda1453e41efb702a6b707346956c2d41a9d
+R c3ddbbb4a589ad57ccdec20fe5b32da9
 U dan
-Z fa70e0c9e7cfdd60641dd6afc4b1e883
+Z 8e4e007df157011db9caa6d47ae4eeb7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 83b0dedec4..0496f790b1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23ac2377315af02b73db6ae37bfeeda1453e41efb702a6b707346956c2d41a9d
+4d34ab4acf0343a22ea8097fa4b1e87a1b0a13be864d5bee0c7a8341c09b8002
diff --git a/test/joinI.test b/test/joinI.test
index 96dba7bb8d..577ca4c2c3 100644
--- a/test/joinI.test
+++ b/test/joinI.test
@@ -96,12 +96,25 @@ do_catchsql_test 3.6 {
 #-------------------------------------------------------------------------
 reset_db
 do_execsql_test 4.0 {
+  CREATE TABLE t1(a);
+  CREATE TABLE t2(b);
+  CREATE TABLE t3(c, d);
+}
+
+do_catchsql_test 4.1 {
+  SELECT c+d AS cd FROM t1 LEFT JOIN t2 ON (cd=5) CROSS JOIN t3;
+} {1 {ON clause references tables to its right}}
+
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 5.0 {
   CREATE TABLE parent1(parent1key, child1key, Child2key, child3key);
   CREATE TABLE child1 ( child1key NVARCHAR, value NVARCHAR );
   CREATE TABLE child2 ( child2key NVARCHAR, value NVARCHAR );
 }
 
-do_execsql_test 4.1 {
+do_execsql_test 5.1 {
   SELECT parent1.parent1key, child1.value, child2.value
     FROM parent1
     LEFT OUTER JOIN child1 ON child1.child1key = parent1.child1key
@@ -109,3 +122,4 @@ do_execsql_test 4.1 {
 }
 
 finish_test
+