Add test cases for the fix in the previous commit.

FossilOrigin-Name: c1057b2a60add08e5c80ef2a53932a690b096f2eb03c7de863844deaa8fc9d53

diff --git a/manifest b/manifest
index 5907ed3bd697f3930d5a613bad233befc86777ab..358fbc8568df2dbf69e8aab4c65f422bd7e4bc1e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\sview-self-join\soptimization\sso\sthat\sit\sworks\son\sall\nVIEWs,\snot\sjust\son\sCommon\sTable\sExpressions.
-D 2019-05-23T16:38:12.291
+C Add\stest\scases\sfor\sthe\sfix\sin\sthe\sprevious\scommit.
+D 2019-05-23T16:40:45.620
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1709,7 +1709,7 @@ F test/window8.test df187dc19921f7be0ab709d531d681bd80ccaac96a913a89ecee8b272b91
 F test/windowerr.tcl abf4d6d0c6d360213af98ed7d538295d905689e83692106f3ece0e3afb9d7f36
 F test/windowerr.test 675b5e6debfc9370bfacb0b91e2a93a8923512f92600b16f4ea70a1cd9b8e6e4
 F test/windowfault.test 16e906a2c4110c88372ff4bd5de59ac7397ec2f025912eff8e5677eedd126898
-F test/with1.test f8b59d186a31bcdfbd6683c7e7db8152b81bbefbb90235bfa37707c8bc7b6474
+F test/with1.test d32792084dcb5f6c047d77bb8a032822ef9fe050ade07d0aeffa37753a05e3c9
 F test/with2.test e0030e2f0267a910d6c0e4f46f2dfe941c1cc0d4f659ba69b3597728e7e8f1ab
 F test/with3.test b5f1372097690c6ef84db2f13fc7e64a88c7263c3f88493605f90597e8a68d45
 F test/with4.test 257be66c0c67fee1defbbac0f685c3465e2cad037f21ce65f23f86084f198205
@@ -1828,7 +1828,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cb1d06521de5918a2324a41e207b48c5e5149c23b927b9e3e1f3c3b38b82658e
-R bc0be58ed799178a68209379d96c86c1
-U drh
-Z c15a1e523efaaf6901adea2e440922c6
+P d2fe370cafa9b11f6c3eb4e1c3be48d9d2610b9d2f9d9ebf9e50267f9079dfc0
+R ff989ec1755651fcd43f9c9465026001
+U dan
+Z 150ba3b7918bcf8164acfcb2aad4db4c

diff --git a/manifest.uuid b/manifest.uuid
index 4bbfe56d5bdfaada278deed6b69f9921e83364d9..c3b0f77ef429c6b88197bc0f0bebebf1e2c6083a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d2fe370cafa9b11f6c3eb4e1c3be48d9d2610b9d2f9d9ebf9e50267f9079dfc0
\ No newline at end of file
+c1057b2a60add08e5c80ef2a53932a690b096f2eb03c7de863844deaa8fc9d53
\ No newline at end of file

diff --git a/test/with1.test b/test/with1.test
index dbba19227e12ee2943f017fd41669c0a4170b072..5631bfb69d44b21a255389a930ed5665e80014be 100644 (file)
--- a/test/with1.test
+++ b/test/with1.test
@@ -1117,4 +1117,27 @@ do_execsql_test 23.1 {
   SELECT * FROM v3;
 } {1 A C D E 1 A F G H 1 B C D E 1 B F G H 2 A C D E 2 A F G H 2 B C D E 2 B F G H 3 A C D E 3 A F G H 3 B C D E 3 B F G H 4 A C D E 4 A F G H 4 B C D E 4 B F G H 5 A C D E 5 A F G H 5 B C D E 5 B F G H}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 24.1 {
+  CREATE TABLE t1(a, b, c);
+  CREATE VIEW v1 AS SELECT max(a), min(b) FROM t1 GROUP BY c;
+}
+do_test 24.1 {
+  set program [db eval {EXPLAIN SELECT 1 FROM v1,v1,v1}]
+  expr [lsearch $program OpenDup]>0
+} {1}
+do_execsql_test 24.2 {
+  ATTACH "" AS aux;
+  CREATE VIEW aux.v3 AS VALUES(1);
+  CREATE VIEW main.v3 AS VALUES(3);
+
+  CREATE VIEW aux.v2 AS SELECT * FROM v3;
+  CREATE VIEW main.v2 AS SELECT * FROM v3;
+
+  SELECT * FROM main.v2 AS a, aux.v2 AS b, aux.v2 AS c, main.v2 AS d;
+} {
+  3 1 1 3
+}
+
 finish_test