diff --git a/manifest b/manifest index 93abd3fa04..7a7af3e22e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\san\soptional\scodec\sto\sthe\spager\slayer.\s(CVS\s1214) -D 2004-02-09T01:20:37 +C Add\stest\scase\sfor\sticket\s#601.\s(CVS\s1215) +D 2004-02-09T14:35:28 F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -107,7 +107,7 @@ F test/memleak.test a18e6810cae96d2f6f5136920267adbefc8e1e90 F test/minmax.test 6680b8d79b9b6e026a476ebfb91f310f7774568e F test/misc1.test 0b98d493b0cf55cb5f53e1f3df8107c166eecb5a F test/misc2.test 10c2ce26407d37411b96273e552d5095393732be -F test/misc3.test 01698429c87174fbad2bf35c6d737b4f83264490 +F test/misc3.test 43a93337aa0183e382a5ab26d64848e18bed8276 F test/misuse.test 1095f26d1aed406c65e1d2eba651c4bb7c38cbff F test/notnull.test 7a08117a71e74b0321aaa937dbeb41a09d6eb1d0 F test/null.test c14d0f4739f21e929b8115b72bf0c765b6bb1721 @@ -183,7 +183,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 1736d415d776aa1cbdd33d987d21365ebf260f11 -R 429365f2137a58eb3bc313df232c3720 +P 2f0c122cfb84dea58d112324a0bdd8b85552a9fa +R d18a2a09d807f6210998c6b4e404fd9c U drh -Z a349ad5865c2d07827b7d95bf499b627 +Z 427bc38262d3a60f06bbf19ed3ec6be5 diff --git a/manifest.uuid b/manifest.uuid index 6383a3520a..ea6e160b29 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2f0c122cfb84dea58d112324a0bdd8b85552a9fa \ No newline at end of file +096312dacb9eb2f8da3cec1504aef8629b505e7f \ No newline at end of file diff --git a/test/misc3.test b/test/misc3.test index 980ec5a747..1ccc92c7d5 100644 --- a/test/misc3.test +++ b/test/misc3.test @@ -13,7 +13,7 @@ # This file implements tests for miscellanous features that were # left out of other test files. # -# $Id: misc3.test,v 1.6 2004/01/14 21:59:24 drh Exp $ +# $Id: misc3.test,v 1.7 2004/02/09 14:35:28 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -207,5 +207,34 @@ do_test misc3-4.3 { } } {64} +# Ticket #601: Putting a left join inside "SELECT * FROM ()" +# gives different results that if the outer "SELECT * FROM ..." is omitted. +# +do_test misc4-5.1 { + execsql { + CREATE TABLE x1 (b, c); + INSERT INTO x1 VALUES('dog',3); + INSERT INTO x1 VALUES('cat',1); + INSERT INTO x1 VALUES('dog',4); + CREATE TABLE x2 (c, e); + INSERT INTO x2 VALUES(1,'one'); + INSERT INTO x2 VALUES(2,'two'); + INSERT INTO x2 VALUES(3,'three'); + INSERT INTO x2 VALUES(4,'four'); + SELECT x2.c AS c, e, b FROM x2 LEFT JOIN + (SELECT b, max(c) AS c FROM x1 GROUP BY b) + USING(c); + } +} {1 one cat 2 two {} 3 three {} 4 four dog} +do_test misc4-5.2 { + execsql { + SELECT * FROM ( + SELECT x2.c AS c, e, b FROM x2 LEFT JOIN + (SELECT b, max(c) AS c FROM x1 GROUP BY b) + USING(c) + ); + } +} {1 one cat 2 two {} 3 three {} 4 four dog} + finish_test