From 36c19f7799491c6d93ff26ae6f02732a3d687795 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 1 Jun 2022 11:43:57 +0000 Subject: [PATCH 1/6] Test case for [forum:/forumpost/087de2d9ec|forum post 087de2d9ec] showing a problem when a row-value constraint is used with RIGHT JOIN. FossilOrigin-Name: d1e3e0d26e302587a6cfcb7aa4fcdefe2b3891037732a0df0d0fe10a14454e00 --- manifest | 15 +++++++++------ manifest.uuid | 2 +- test/join8.test | 26 ++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 3a61f64d24..36810889e0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Move\sthe\ssqlite_offset()\sfunction\simplementation\sto\sbe\san\sin-line\sfunction,\nthereby\savoiding\sspecial\scase\scode\sand\sfreeing\sup\sa\sbit\sin\sthe\nFuncDef.flags\sfield. -D 2022-06-01T11:05:59.088 +C Test\scase\sfor\s[forum:/forumpost/087de2d9ec|forum\spost\s087de2d9ec]\sshowing\na\sproblem\swhen\sa\srow-value\sconstraint\sis\sused\swith\sRIGHT\sJOIN. +D 2022-06-01T11:43:57.433 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1166,7 +1166,7 @@ F test/join4.test 1a352e4e267114444c29266ce79e941af5885916 F test/join5.test d22b6cba8fb59ab3f1c82701434c360705eb12d4ce200c449f37b018fc47681a F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c F test/join7.test 2268dcbb54b724391dda3748ea95c60d960607ffeed67885675998e7117697f6 -F test/join8.test 2d7e2d744cd6967cd141e97572af039f3e9494ca33650c057600846b02a1633f +F test/join8.test 1c08a086f8f0dbbfdd6bfff6164832c6ed5dd628fb81f28efa41ef52c1e5d446 F test/join9.test 9056ddd3b0c0f4f9d658f4521038d9a37dc23ead8ca9a505d0b0db2b6a471e05 F test/joinA.test 7eab225dc1c1ab258a5e62513a4ed7cabbd3db971d59d5d92f4fb6fa14c12f6a F test/joinB.test 1b2ba3fc8568b49411787fccbf540570c148e9b6a53a30f80691cb6268098ded @@ -1974,8 +1974,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P d9efe3e92d1c95aee6f5ae37a8ba28d8cf4891d746744ce4aa2464f766821a0b -R 52cfcb84f807d4bfd299e794f93f33ab +P 1c9812c458bd229c862efe5df1b64fae333da9871c8756b5ae4605a81bcda4b5 +R 7626a1252e345aefd56e1d453288afbc +T *branch * row-value-right-join +T *sym-row-value-right-join * +T -sym-trunk * U drh -Z 74e345d13b420413b02c8b365815c584 +Z e453acc504a6b3ed1f36eed480f53cb6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f369ffc8a4..d01187fe04 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1c9812c458bd229c862efe5df1b64fae333da9871c8756b5ae4605a81bcda4b5 \ No newline at end of file +d1e3e0d26e302587a6cfcb7aa4fcdefe2b3891037732a0df0d0fe10a14454e00 \ No newline at end of file diff --git a/test/join8.test b/test/join8.test index 5ee2c067ef..3914938187 100644 --- a/test/join8.test +++ b/test/join8.test @@ -517,4 +517,30 @@ do_execsql_test join8-16070 { SELECT * FROM t1 RIGHT JOIN t2 ON true JOIN t3 ON a<>'' WHERE c IS NOT NULL; } {} +# 2022-06-01 +# https://sqlite.org/forum/forumpost/087de2d9ec +# +reset_db +do_execsql_test join8-17000 { + CREATE TABLE t1(id INTEGER PRIMARY KEY, x INT, y INT); + CREATE TABLE t2(z INT); + INSERT INTO t1(x,y) VALUES(0, 0); +} {} +db null NULL +do_execsql_test join8-17010 { + SELECT * FROM t2 RIGHT JOIN t1 ON true; +} {NULL 1 0 0} +do_execsql_test join8-17020 { + SELECT null=id AND false=y AS "truth" FROM t2 RIGHT JOIN t1 ON true; +} {NULL} +do_execsql_test join8-17030 { + SELECT (null, false)==(id, y) AS "truth" FROM t2 RIGHT JOIN t1; +} {NULL} +do_execsql_test join8-17040 { + SELECT * FROM t2 RIGHT JOIN t1 WHERE null=id AND false=y; +} {} +do_execsql_test join8-17050 { + SELECT * FROM t2 RIGHT JOIN t1 WHERE (null, false)==(id,y); +} {} + finish_test From 47b4969e2d52929c05ede10396c0091ea5105708 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 1 Jun 2022 11:46:39 +0000 Subject: [PATCH 2/6] Fix test cases in the previous check-in to make them postgres-compatible. FossilOrigin-Name: f223ba72b6e02a7ccfd894b4b135f4609b1eb79f547ec279b1c52a6996cd5a73 --- manifest | 15 ++++++--------- manifest.uuid | 2 +- test/join8.test | 8 ++++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 36810889e0..9eb25fe5f2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Test\scase\sfor\s[forum:/forumpost/087de2d9ec|forum\spost\s087de2d9ec]\sshowing\na\sproblem\swhen\sa\srow-value\sconstraint\sis\sused\swith\sRIGHT\sJOIN. -D 2022-06-01T11:43:57.433 +C Fix\stest\scases\sin\sthe\sprevious\scheck-in\sto\smake\sthem\spostgres-compatible. +D 2022-06-01T11:46:39.688 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1166,7 +1166,7 @@ F test/join4.test 1a352e4e267114444c29266ce79e941af5885916 F test/join5.test d22b6cba8fb59ab3f1c82701434c360705eb12d4ce200c449f37b018fc47681a F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c F test/join7.test 2268dcbb54b724391dda3748ea95c60d960607ffeed67885675998e7117697f6 -F test/join8.test 1c08a086f8f0dbbfdd6bfff6164832c6ed5dd628fb81f28efa41ef52c1e5d446 +F test/join8.test 4f6f320bbbfd69b58d76eb03164da04a4fc9aa185a83fd1929858dbfc4e8e661 F test/join9.test 9056ddd3b0c0f4f9d658f4521038d9a37dc23ead8ca9a505d0b0db2b6a471e05 F test/joinA.test 7eab225dc1c1ab258a5e62513a4ed7cabbd3db971d59d5d92f4fb6fa14c12f6a F test/joinB.test 1b2ba3fc8568b49411787fccbf540570c148e9b6a53a30f80691cb6268098ded @@ -1974,11 +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 1c9812c458bd229c862efe5df1b64fae333da9871c8756b5ae4605a81bcda4b5 -R 7626a1252e345aefd56e1d453288afbc -T *branch * row-value-right-join -T *sym-row-value-right-join * -T -sym-trunk * +P d1e3e0d26e302587a6cfcb7aa4fcdefe2b3891037732a0df0d0fe10a14454e00 +R 6b208c28ef42892c79ca868b144025b2 U drh -Z e453acc504a6b3ed1f36eed480f53cb6 +Z e43cb371d9af867c25343be13aaa8a18 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d01187fe04..0ebe0f88d9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d1e3e0d26e302587a6cfcb7aa4fcdefe2b3891037732a0df0d0fe10a14454e00 \ No newline at end of file +f223ba72b6e02a7ccfd894b4b135f4609b1eb79f547ec279b1c52a6996cd5a73 \ No newline at end of file diff --git a/test/join8.test b/test/join8.test index 3914938187..925c0511a3 100644 --- a/test/join8.test +++ b/test/join8.test @@ -531,16 +531,16 @@ do_execsql_test join8-17010 { SELECT * FROM t2 RIGHT JOIN t1 ON true; } {NULL 1 0 0} do_execsql_test join8-17020 { - SELECT null=id AND false=y AS "truth" FROM t2 RIGHT JOIN t1 ON true; + SELECT null=id AND 0=y AS "truth" FROM t2 RIGHT JOIN t1 ON true; } {NULL} do_execsql_test join8-17030 { - SELECT (null, false)==(id, y) AS "truth" FROM t2 RIGHT JOIN t1; + SELECT (null, 0)==(id, y) AS "truth" FROM t2 RIGHT JOIN t1; } {NULL} do_execsql_test join8-17040 { - SELECT * FROM t2 RIGHT JOIN t1 WHERE null=id AND false=y; + SELECT * FROM t2 RIGHT JOIN t1 WHERE null=id AND 0=y; } {} do_execsql_test join8-17050 { - SELECT * FROM t2 RIGHT JOIN t1 WHERE (null, false)==(id,y); + SELECT * FROM t2 RIGHT JOIN t1 WHERE (null, 0)==(id,y); } {} finish_test From 0286cdbca65843f508343de9b139fbdae758d0b8 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 1 Jun 2022 11:58:11 +0000 Subject: [PATCH 3/6] Additional enhancements to the test cases. FossilOrigin-Name: 55cfad74cace74e541b354228e3ad46e17028213a9f639edf2007c6a8f3ba8fc --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/join8.test | 32 +++++++++++++++++++++++++------- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 9eb25fe5f2..ce9e3e0b54 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stest\scases\sin\sthe\sprevious\scheck-in\sto\smake\sthem\spostgres-compatible. -D 2022-06-01T11:46:39.688 +C Additional\senhancements\sto\sthe\stest\scases. +D 2022-06-01T11:58:11.635 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1166,7 +1166,7 @@ F test/join4.test 1a352e4e267114444c29266ce79e941af5885916 F test/join5.test d22b6cba8fb59ab3f1c82701434c360705eb12d4ce200c449f37b018fc47681a F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c F test/join7.test 2268dcbb54b724391dda3748ea95c60d960607ffeed67885675998e7117697f6 -F test/join8.test 4f6f320bbbfd69b58d76eb03164da04a4fc9aa185a83fd1929858dbfc4e8e661 +F test/join8.test ddabb1587ab64fa21d3bd2c2573685c0ed4722d219423d5701473b7334d91793 F test/join9.test 9056ddd3b0c0f4f9d658f4521038d9a37dc23ead8ca9a505d0b0db2b6a471e05 F test/joinA.test 7eab225dc1c1ab258a5e62513a4ed7cabbd3db971d59d5d92f4fb6fa14c12f6a F test/joinB.test 1b2ba3fc8568b49411787fccbf540570c148e9b6a53a30f80691cb6268098ded @@ -1974,8 +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 d1e3e0d26e302587a6cfcb7aa4fcdefe2b3891037732a0df0d0fe10a14454e00 -R 6b208c28ef42892c79ca868b144025b2 +P f223ba72b6e02a7ccfd894b4b135f4609b1eb79f547ec279b1c52a6996cd5a73 +R ba1013862f606feacb0a325a863157ec U drh -Z e43cb371d9af867c25343be13aaa8a18 +Z 3e6d6ce4db0f2a78246c90873b555c53 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0ebe0f88d9..d1f4528f7f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f223ba72b6e02a7ccfd894b4b135f4609b1eb79f547ec279b1c52a6996cd5a73 \ No newline at end of file +55cfad74cace74e541b354228e3ad46e17028213a9f639edf2007c6a8f3ba8fc \ No newline at end of file diff --git a/test/join8.test b/test/join8.test index 925c0511a3..1c3a85038d 100644 --- a/test/join8.test +++ b/test/join8.test @@ -524,23 +524,41 @@ reset_db do_execsql_test join8-17000 { CREATE TABLE t1(id INTEGER PRIMARY KEY, x INT, y INT); CREATE TABLE t2(z INT); - INSERT INTO t1(x,y) VALUES(0, 0); + INSERT INTO t1(id,x,y) VALUES(1, 0, 0); } {} db null NULL do_execsql_test join8-17010 { SELECT * FROM t2 RIGHT JOIN t1 ON true; } {NULL 1 0 0} do_execsql_test join8-17020 { - SELECT null=id AND 0=y AS "truth" FROM t2 RIGHT JOIN t1 ON true; -} {NULL} + SELECT 99=id AND 0=y AS "truth" FROM t2 RIGHT JOIN t1 ON true; +} {0} do_execsql_test join8-17030 { - SELECT (null, 0)==(id, y) AS "truth" FROM t2 RIGHT JOIN t1; -} {NULL} + SELECT (99, 0)==(id, y) AS "truth" FROM t2 RIGHT JOIN t1; +} {0} do_execsql_test join8-17040 { - SELECT * FROM t2 RIGHT JOIN t1 WHERE null=id AND 0=y; + SELECT * FROM t2 RIGHT JOIN t1 WHERE 99=id AND 0=y; +} {} +do_execsql_test join8-17041 { + SELECT * FROM t2 RIGHT JOIN t1 WHERE 99=+id AND 0=y; } {} do_execsql_test join8-17050 { - SELECT * FROM t2 RIGHT JOIN t1 WHERE (null, 0)==(id,y); + SELECT * FROM t2 RIGHT JOIN t1 WHERE (99, 0)==(id,y); } {} +do_execsql_test join8-17051 { + SELECT * FROM t2 RIGHT JOIN t1 WHERE (99, 0)==(+id,y); +} {} +do_execsql_test join8-17060 { + SELECT * FROM t2 RIGHT JOIN t1 WHERE 1=id AND 0=y; +} {NULL 1 0 0} +do_execsql_test join8-17061 { + SELECT * FROM t2 RIGHT JOIN t1 WHERE 1=+id AND 0=y; +} {NULL 1 0 0} +do_execsql_test join8-17070 { + SELECT * FROM t2 RIGHT JOIN t1 WHERE (1, 0)==(id,y); +} {NULL 1 0 0} +do_execsql_test join8-17071 { + SELECT * FROM t2 RIGHT JOIN t1 WHERE (1, 0)==(+id,y); +} {NULL 1 0 0} finish_test From 1324b2830e28a209d682a578c1d0b9c65820b9a4 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 1 Jun 2022 13:01:57 +0000 Subject: [PATCH 4/6] Fix a typo in a comment in a test case. No changes to code. FossilOrigin-Name: 570efa45dd4c6848dcbd550f78fcaa00b6d84dcffe0a2d12e65ea8ee4468c0e8 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/rowvalue.test | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index ce9e3e0b54..3f6551ecc1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Additional\senhancements\sto\sthe\stest\scases. -D 2022-06-01T11:58:11.635 +C Fix\sa\stypo\sin\sa\scomment\sin\sa\stest\scase.\s\sNo\schanges\sto\scode. +D 2022-06-01T13:01:57.890 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1354,7 +1354,7 @@ F test/round1.test 768018b04522ca420b1aba8a24bd76091d269f3bce3902af3ec6ebcee41ab F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81 F test/rowid.test e29025be95baf6b32f0d5edef59a7633028325896a98f1caa8019559ca910350 -F test/rowvalue.test 228b312f8526ed000ecda559a6a9adf30aa2d79dcb12afa5c04eebaafcf55eae +F test/rowvalue.test 00668659c2ffb0ae8711b3f6702979f199170734c00f582622375cde4d03e091 F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256 F test/rowvalue4.test 441e7e366ac6d939a3a95a574031c56ec2a854077a91d66eee5ff1d86cb5be58 @@ -1974,8 +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 f223ba72b6e02a7ccfd894b4b135f4609b1eb79f547ec279b1c52a6996cd5a73 -R ba1013862f606feacb0a325a863157ec +P 55cfad74cace74e541b354228e3ad46e17028213a9f639edf2007c6a8f3ba8fc +R 596d7d7318a29f139f453a88229a9104 U drh -Z 3e6d6ce4db0f2a78246c90873b555c53 +Z ee379ce9a8bb1abceb8b02b54a734fea # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d1f4528f7f..b906607e8b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -55cfad74cace74e541b354228e3ad46e17028213a9f639edf2007c6a8f3ba8fc \ No newline at end of file +570efa45dd4c6848dcbd550f78fcaa00b6d84dcffe0a2d12e65ea8ee4468c0e8 \ No newline at end of file diff --git a/test/rowvalue.test b/test/rowvalue.test index 92d3260e6c..757a150df6 100644 --- a/test/rowvalue.test +++ b/test/rowvalue.test @@ -540,7 +540,7 @@ do_execsql_test 19.36 { SELECT * FROM t1 WHERE (3,32)>=(a,b) ORDER BY a DESC; } {2 22 1 11} -# 2018-02-18: Memory leak nexted row-value. Detected by OSSFuzz. +# 2018-02-18: Memory leak nested row-value. Detected by OSSFuzz. # do_catchsql_test 20.1 { SELECT 1 WHERE (2,(2,0)) IS (2,(2,0)); From 0f4b534b60cdae964ac91540487d09e5cba15f60 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 1 Jun 2022 13:32:47 +0000 Subject: [PATCH 5/6] Candidate fix for the problem with row-value WHERE clause constraints on a RIGHT JOIN. FossilOrigin-Name: fdd782a7bb217e2aceda97a588c0d7874ee19885abfcf0658472d6c3387da6ee --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/whereInt.h | 3 ++- src/wherecode.c | 6 +++++- src/whereexpr.c | 4 ++-- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index 3f6551ecc1..b76494ad96 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\stypo\sin\sa\scomment\sin\sa\stest\scase.\s\sNo\schanges\sto\scode. -D 2022-06-01T13:01:57.890 +C Candidate\sfix\sfor\sthe\sproblem\swith\srow-value\sWHERE\sclause\sconstraints\son\na\sRIGHT\sJOIN. +D 2022-06-01T13:32:47.114 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -658,9 +658,9 @@ F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b F src/where.c c4b64c6fa224e5b89ed547ec0ebdfd243c081509b195e71581164a2fbb8d4a80 -F src/whereInt.h 8da918f392bf202ccc0ee61291455b33ad171d209445f1ff3eaf62e0b6f6b363 -F src/wherecode.c 1d5bed686d60e272e93c04e34fec5b487d086383dd4773a7f2f98f86278e6a94 -F src/whereexpr.c 7c5ee52e1df81d6a43f39e6b6f35d540fd37254e2b6e953a4e2715c3abf26f46 +F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7 +F src/wherecode.c 0b09abfcb88c61c6a6984a3e065786631ff35495e9bdf865e6b74ab0a1299c5b +F src/whereexpr.c 416d6a847bc0c3d391b65e7748dc04d57d3117c82e072c222888f9eb346760da F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627 @@ -1974,8 +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 55cfad74cace74e541b354228e3ad46e17028213a9f639edf2007c6a8f3ba8fc -R 596d7d7318a29f139f453a88229a9104 +P 570efa45dd4c6848dcbd550f78fcaa00b6d84dcffe0a2d12e65ea8ee4468c0e8 +R c4c882d2757518da9fd92a2905b48a17 U drh -Z ee379ce9a8bb1abceb8b02b54a734fea +Z cf509f41e2e3b8543d2bed8e739d8dea # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b906607e8b..6974ba143d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -570efa45dd4c6848dcbd550f78fcaa00b6d84dcffe0a2d12e65ea8ee4468c0e8 \ No newline at end of file +fdd782a7bb217e2aceda97a588c0d7874ee19885abfcf0658472d6c3387da6ee \ No newline at end of file diff --git a/src/whereInt.h b/src/whereInt.h index 41417d2e7f..bc96ff7e67 100644 --- a/src/whereInt.h +++ b/src/whereInt.h @@ -612,8 +612,9 @@ void sqlite3WhereTabFuncArgs(Parse*, SrcItem*, WhereClause*); #define WO_AND 0x0400 /* Two or more AND-connected terms */ #define WO_EQUIV 0x0800 /* Of the form A==B, both columns */ #define WO_NOOP 0x1000 /* This term does not restrict search space */ +#define WO_ROWVAL 0x2000 /* A row-value term */ -#define WO_ALL 0x1fff /* Mask of all possible WO_* values */ +#define WO_ALL 0x3fff /* Mask of all possible WO_* values */ #define WO_SINGLE 0x01ff /* Mask of all non-compound WO_* values */ /* diff --git a/src/wherecode.c b/src/wherecode.c index 66099fb0b7..04f1c374d0 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -2862,7 +2862,11 @@ SQLITE_NOINLINE void sqlite3WhereRightJoinLoop( mAll |= pLoop->maskSelf; for(k=0; knTerm; k++){ WhereTerm *pTerm = &pWC->a[k]; - if( pTerm->wtFlags & TERM_VIRTUAL ) break; + if( (pTerm->wtFlags & (TERM_VIRTUAL|TERM_SLICE))!=0 + && pTerm->eOperator!=WO_ROWVAL + ){ + break; + } if( pTerm->prereqAll & ~mAll ) continue; if( ExprHasProperty(pTerm->pExpr, EP_OuterON|EP_InnerON) ) continue; pSubWhere = sqlite3ExprAnd(pParse, pSubWhere, diff --git a/src/whereexpr.c b/src/whereexpr.c index 38e16b16b3..842300b2cf 100644 --- a/src/whereexpr.c +++ b/src/whereexpr.c @@ -1411,7 +1411,7 @@ static void exprAnalyze( } pTerm = &pWC->a[idxTerm]; pTerm->wtFlags |= TERM_CODED|TERM_VIRTUAL; /* Disable the original */ - pTerm->eOperator = 0; + pTerm->eOperator = WO_ROWVAL; } /* If there is a vector IN term - e.g. "(a, b) IN (SELECT ...)" - create @@ -1612,7 +1612,7 @@ void sqlite3WhereAddLimit(WhereClause *pWC, Select *p){ /* This term is a vector operation that has been decomposed into ** other, subsequent terms. It can be ignored. See tag-20220128a */ assert( pWC->a[ii].wtFlags & TERM_VIRTUAL ); - assert( pWC->a[ii].eOperator==0 ); + assert( pWC->a[ii].eOperator==WO_ROWVAL ); continue; } if( pWC->a[ii].leftCursor!=iCsr ) return; From a5d06a3d5440263d6253cd1f1dc4ba04a1237d86 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 1 Jun 2022 15:53:11 +0000 Subject: [PATCH 6/6] Ensure that all necessary row-value subqueries are invoked while running the right-join post processing. FossilOrigin-Name: e4e71b4cd4c026fc36f0da1703e6237e6ddd8ff2e08dc3c0011632b9e63098cd --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/where.c | 5 +++-- test/join8.test | 11 +++++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index b76494ad96..94985dfece 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Candidate\sfix\sfor\sthe\sproblem\swith\srow-value\sWHERE\sclause\sconstraints\son\na\sRIGHT\sJOIN. -D 2022-06-01T13:32:47.114 +C Ensure\sthat\sall\snecessary\srow-value\ssubqueries\sare\sinvoked\swhile\srunning\nthe\sright-join\spost\sprocessing. +D 2022-06-01T15:53:11.391 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 c4b64c6fa224e5b89ed547ec0ebdfd243c081509b195e71581164a2fbb8d4a80 +F src/where.c 3a69f4403aa994cda45db8f4070d146d8f253f9850b4c827a9ade7d444f889ea F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7 F src/wherecode.c 0b09abfcb88c61c6a6984a3e065786631ff35495e9bdf865e6b74ab0a1299c5b F src/whereexpr.c 416d6a847bc0c3d391b65e7748dc04d57d3117c82e072c222888f9eb346760da @@ -1166,7 +1166,7 @@ F test/join4.test 1a352e4e267114444c29266ce79e941af5885916 F test/join5.test d22b6cba8fb59ab3f1c82701434c360705eb12d4ce200c449f37b018fc47681a F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c F test/join7.test 2268dcbb54b724391dda3748ea95c60d960607ffeed67885675998e7117697f6 -F test/join8.test ddabb1587ab64fa21d3bd2c2573685c0ed4722d219423d5701473b7334d91793 +F test/join8.test 01c46c005f3cd20f530e1b7e17d003a1e6d16ae945ceca395f6c016bbee92e9f F test/join9.test 9056ddd3b0c0f4f9d658f4521038d9a37dc23ead8ca9a505d0b0db2b6a471e05 F test/joinA.test 7eab225dc1c1ab258a5e62513a4ed7cabbd3db971d59d5d92f4fb6fa14c12f6a F test/joinB.test 1b2ba3fc8568b49411787fccbf540570c148e9b6a53a30f80691cb6268098ded @@ -1974,8 +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 570efa45dd4c6848dcbd550f78fcaa00b6d84dcffe0a2d12e65ea8ee4468c0e8 -R c4c882d2757518da9fd92a2905b48a17 +P fdd782a7bb217e2aceda97a588c0d7874ee19885abfcf0658472d6c3387da6ee +R 2a7e87c043f615f17614dd0be598421a U drh -Z cf509f41e2e3b8543d2bed8e739d8dea +Z a0344428253e71e0221f262d3aa80478 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6974ba143d..927e90a7ce 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fdd782a7bb217e2aceda97a588c0d7874ee19885abfcf0658472d6c3387da6ee \ No newline at end of file +e4e71b4cd4c026fc36f0da1703e6237e6ddd8ff2e08dc3c0011632b9e63098cd \ No newline at end of file diff --git a/src/where.c b/src/where.c index d563f7b93b..75925e4ae7 100644 --- a/src/where.c +++ b/src/where.c @@ -6034,6 +6034,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ SrcList *pTabList = pWInfo->pTabList; sqlite3 *db = pParse->db; int iEnd = sqlite3VdbeCurrentAddr(v); + int nRJ = 0; /* Generate loop termination code. */ @@ -6050,8 +6051,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ pRJ->endSubrtn = sqlite3VdbeCurrentAddr(v); sqlite3VdbeAddOp3(v, OP_Return, pRJ->regReturn, pRJ->addrSubrtn, 1); VdbeCoverage(v); - assert( pParse->withinRJSubrtn>0 ); - pParse->withinRJSubrtn--; + nRJ++; } pLoop = pLevel->pWLoop; if( pLevel->op!=OP_Noop ){ @@ -6332,5 +6332,6 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ */ pParse->nQueryLoop = pWInfo->savedNQueryLoop; whereInfoFree(db, pWInfo); + pParse->withinRJSubrtn -= nRJ; return; } diff --git a/test/join8.test b/test/join8.test index 1c3a85038d..528dad3d6c 100644 --- a/test/join8.test +++ b/test/join8.test @@ -560,5 +560,16 @@ do_execsql_test join8-17070 { do_execsql_test join8-17071 { SELECT * FROM t2 RIGHT JOIN t1 WHERE (1, 0)==(+id,y); } {NULL 1 0 0} +do_execsql_test join8-17080 { + CREATE TABLE t3(a INTEGER PRIMARY KEY, b INT); + CREATE TABLE t4(x INT, y INT); + INSERT INTO t3(a,b) VALUES(1, 3); +} {} +do_execsql_test join8-17090 { + SELECT t3.a FROM t4 RIGHT JOIN t3 ON (x=a) WHERE (b, 4)=(SELECT 3, 4); +} {1} +do_execsql_test join8-17091 { + SELECT t3.a FROM t4 RIGHT JOIN t3 ON (x=a) WHERE (b, 4) IS (SELECT 3, 4); +} {1} finish_test