Add disabled test cases for ticket #2652. We will enable these test cases

after #2652 is fixed.  The fix will be difficult and will probably take
a while.  On the other hand, correlated aggregate queries have never
worked in SQLite and the problem is just now coming to light, so it is
probably not a pressing issue. (CVS 4435)

FossilOrigin-Name: 5c41619e292699c72231cff10e26dfbe9a363a00

diff --git a/manifest b/manifest
index a1951f7dc2ff777ccaf75c224703e67324142ad8..44e630f8fc37ab64c7cddb26203909d6b19c9a9e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunneeded\spSchema\sfield\sfrom\sthe\sExpr\sstructure.\s(CVS\s4434)
-D 2007-09-18T15:55:07
+C Add\sdisabled\stest\scases\sfor\sticket\s#2652.\s\sWe\swill\senable\sthese\stest\scases\nafter\s#2652\sis\sfixed.\s\sThe\sfix\swill\sbe\sdifficult\sand\swill\sprobably\stake\na\swhile.\s\sOn\sthe\sother\shand,\scorrelated\saggregate\squeries\shave\snever\nworked\sin\sSQLite\sand\sthe\sproblem\sis\sjust\snow\scoming\sto\slight,\sso\sit\sis\nprobably\snot\sa\spressing\sissue.\s(CVS\s4435)
+D 2007-09-18T16:53:53
 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -419,7 +419,7 @@ F test/speed1.test 22e1b27af0683ed44dcd2f93ed817a9c3e65084a
 F test/speed2.test 53177056baf6556dcbdcf032bbdfc41c1aa74ded
 F test/speed3.test 688fe59ea7b4eabf62b955447aa6cc3249d69d7d
 F test/sqllimits1.test 2495508114bd84f6fc9ece34d5a7bb3dc69359bc
-F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797
+F test/subquery.test 8203f85db56ba022a57a0589890090c8feed4e59
 F test/subselect.test 974e87f8fc91c5f00dd565316d396a5a6c3106c4
 F test/substr.test d36c864a238e1f51e7829af660906f05d47b5e32
 F test/sync.test d05397b8f89f423dd6dba528692019ab036bc1c3
@@ -580,7 +580,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 8b29f5fbfc723cdf67cf3410cd01f7c17ea39a4b
-R c3880261fcbeb041d8dcc6ffc4cf831e
+P b2d605a2714245febb316a24edc7a076e21a3849
+R e6b647dc9ed6ae5366e798a233d9f71a
 U drh
-Z 7b960caa2f9eed42bfce40d8a538e199
+Z 4b521139eec9fe1b7735660703f3a0ef

diff --git a/manifest.uuid b/manifest.uuid
index a370928ea2660c3028dfb13af7c84a74afd0da36..c3bb23b09e9d5024ebd130cdfe5540fb8bc0266d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b2d605a2714245febb316a24edc7a076e21a3849
\ No newline at end of file
+5c41619e292699c72231cff10e26dfbe9a363a00
\ No newline at end of file

diff --git a/test/subquery.test b/test/subquery.test
index dd65aca45b36923abea5ac294b9101b97af34757..e81269d6e2433a0697a94b6d73a93327ee91334e 100644 (file)
--- a/test/subquery.test
+++ b/test/subquery.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is testing correlated subqueries
 #
-# $Id: subquery.test,v 1.14 2006/01/17 09:35:02 danielk1977 Exp $
+# $Id: subquery.test,v 1.15 2007/09/18 16:53:53 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -417,8 +417,78 @@ do_test subquery-6.4 {
   set callcnt
 } {1}
 
+if 0 {   #############  disable until we get #2652 fixed
+# Ticket #2652.  Allow aggregate functions of outer queries inside
+# a non-aggregate subquery.
+#
+do_test subquery-7.1 {
+  execsql {
+    CREATE TABLE t7(c7);
+    INSERT INTO t7 VALUES(1);
+    INSERT INTO t7 VALUES(2);
+    INSERT INTO t7 VALUES(3);
+    CREATE TABLE t8(c8);
+    INSERT INTO t8 VALUES(100);
+    INSERT INTO t8 VALUES(200);
+    INSERT INTO t8 VALUES(300);
+    CREATE TABLE t9(c9);
+    INSERT INTO t9 VALUES(10000);
+    INSERT INTO t9 VALUES(20000);
+    INSERT INTO t9 VALUES(30000);
 
-
-
+    SELECT (SELECT c7+c8 FROM t7) FROM t8;
+  }
+} {101 201 301}
+do_test subquery-7.2 {
+  execsql {
+    SELECT (SELECT max(c7)+c8 FROM t7) FROM t8;
+  }
+} {103 203 303}
+do_test subquery-7.3 {
+  execsql {
+    SELECT (SELECT c7+max(c8) FROM t8) FROM t7
+  }
+} {301}
+do_test subquery-7.4 {
+  execsql {
+    SELECT (SELECT max(c7)+max(c8) FROM t8) FROM t7
+  }
+} {303}
+do_test subquery-7.5 {
+  execsql {
+    SELECT (SELECT c8 FROM t8 WHERE rowid=max(c7)) FROM t7
+  }
+} {300}
+do_test subquery-7.6 {
+  execsql {
+    SELECT (SELECT (SELECT max(c7+c8+c9) FROM t9) FROM t8) FROM t7
+  }
+} {30101 30102 30103}
+do_test subquery-7.7 {
+  execsql {
+    SELECT (SELECT (SELECT c7+max(c8+c9) FROM t9) FROM t8) FROM t7
+  }
+} {30101 30102 30103}
+do_test subquery-7.8 {
+  execsql {
+    SELECT (SELECT (SELECT max(c7)+c8+c9 FROM t9) FROM t8) FROM t7
+  }
+} {10103}
+do_test subquery-7.9 {
+  execsql {
+    SELECT (SELECT (SELECT c7+max(c8)+c9 FROM t9) FROM t8) FROM t7
+  }
+} {10301 10302 10303}
+do_test subquery-7.10 {
+  execsql {
+    SELECT (SELECT (SELECT c7+c8+max(c9) FROM t9) FROM t8) FROM t7
+  }
+} {30101 30102 30103}
+do_test subquery-7.11 {
+  execsql {
+    SELECT (SELECT (SELECT max(c7)+max(c8)+max(c9) FROM t9) FROM t8) FROM t7
+  }
+} {30303}
+}  ;############# Disabled
 
 finish_test