Allow GROUP BY on non-aggregate queries. Ticket #1064 (CVS 2276)

FossilOrigin-Name: 0642d3e3d6636a5f922f75c05252c9c1372d3936

diff --git a/manifest b/manifest
index 83d21a64c63b5c6c9d68581b36831cac617436d1..9f31ffe06dd908ed656ebd52ec0788f0e9142225 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prevent\scollation\ssequences\sand\suser\sfunctions\sfrom\sbeing\sdeleted\sor\schanged\swhile\sSQL\sstatements\sare\sexecuting.\s(CVS\s2275)
-D 2005-01-25T04:27:55
+C Allow\sGROUP\sBY\son\snon-aggregate\squeries.\sTicket\s#1064\s(CVS\s2276)
+D 2005-01-26T03:58:36
 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -58,7 +58,7 @@ F src/parse.y 5f2c197fcb63c6aed1787da436ec5a35247ab7a4
 F src/pragma.c c893f03104e94e0921861bd2d3dbd80c47515f7b
 F src/printf.c 3d20b21cfecadacecac3fb7274e746cb81d3d357
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
-F src/select.c e204ca5292751ed889f2cbcf2d2808a4d29edd2c
+F src/select.c 32fe60f1aff8a540b709008451013f480dc22d55
 F src/shell.c 1f0da77ef0520afd6df71f4781076021874310f3
 F src/sqlite.h.in 7d7c28344e2bd770491b56ed9169be20859c707d
 F src/sqliteInt.h be6fa5e31c65e2b8e10112ee47a6e63ec7de37b5
@@ -109,7 +109,7 @@ F test/capi3.test f50dd4666deba96275f9927fe8ec089a3d8c0efa
 F test/capi3b.test 5b6a66f9f295f79f443b5d3f33187fa5ef6cf336
 F test/collate1.test f79736d2ebf5492167ee4d1f4ab4c09dda776b03
 F test/collate2.test 224a632ba04907c049804b08162efd234aa7871f
-F test/collate3.test 7e30d58e2ae550ad259f2272d203dbb803fd08b9
+F test/collate3.test 210fab018450eeb085e4190cd7ca0aabd99b8c11
 F test/collate4.test b8668612691c4dcf90f67a8df1eeb1544e7fdaf8
 F test/collate5.test 581775b94604b7435dc6a5c6e72fbbf7d69e3830
 F test/collate6.test 6c9470d1606ee3e564675b229653e320c49ec638
@@ -179,9 +179,9 @@ F test/select1.test ad700a2a1c325a23a7206ad4d189e33917de526f
 F test/select2.test 01b9cbc06e5ed662ce0289aa5f47314d54541e82
 F test/select3.test 9de435aa84fc406708cd8dc1b1d60e7f27cea685
 F test/select4.test c239f516aa31f42f2ef7c6d7cd01105f08f934ca
-F test/select5.test 94db800bbeff2e426c0175e07f7a71d4617853b5
+F test/select5.test 2d414f712bff8e590091e08f9b7287600731be00
 F test/select6.test ba1b4dd18a85bf9070c6df8d933ac4cfcacea6a6
-F test/select7.test 63fb77d50f4dfdac4d4115842f083d2eb33a198c
+F test/select7.test 8f3362336c10d828ab6fe9c1b8897b484da8b592
 F test/sort.test 87882e6c72a75d45e98a1c802c1ded0eac557d85
 F test/subquery.test a3ed9f11a4e576ff31b539ab5d65953dc3d27a81
 F test/subselect.test 3f3f7a940dc3195c3139f4d530385cb54665d614
@@ -272,7 +272,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P 557eb2ec9d825c0a2830d3355d0d27b4b5937de2
-R ccc679b6d9c5516b3defef2b60c271aa
+P cabab62bc10568d435806a7059fad7274f0dd4c8
+R ffae8f42ca0f009f38563fe1ef5cdd78
 U danielk1977
-Z 95e1deb222b350d5a7b99118f5214f27
+Z d9bb33809efa4982a979cf246654c1ed

diff --git a/manifest.uuid b/manifest.uuid
index fbe7a2cf5a16b387ff0443b58316f5271e2a8944..c2922406f71773e7bf90c10901750a4307cd1e13 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cabab62bc10568d435806a7059fad7274f0dd4c8
\ No newline at end of file
+0642d3e3d6636a5f922f75c05252c9c1372d3936
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 533d1b231e8de3d83fd9eeeedd5788c82f27bd2b..97c2da0a35ff9b26b2180c132881707a8eee77c7 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements in SQLite.
 **
-** $Id: select.c,v 1.233 2005/01/21 08:13:15 danielk1977 Exp $
+** $Id: select.c,v 1.234 2005/01/26 03:58:36 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -2435,11 +2435,9 @@ int sqlite3Select(
     if( sqlite3ExprResolveNames(pParse, pTabList, pEList, pNC, pHaving, 1, 1) ){
       goto select_end;
     }
-    if( ExprHasProperty(pHaving, EP_Agg) ) isAgg = 1;
   }
-  if( pGroupBy && !isAgg ){
-    sqlite3ErrorMsg(pParse, "GROUP BY may only be used on aggregate queries");
-    goto select_end;
+  if( pGroupBy ){
+    isAgg = 1;
   }
   if( processOrderGroupBy(pParse,pOrderBy,pTabList,pEList,pNC,isAgg,"ORDER")
    || processOrderGroupBy(pParse,pGroupBy,pTabList,pEList,pNC,isAgg,"GROUP")

diff --git a/test/collate3.test b/test/collate3.test
index b1f96e74de39a37cb2c9bd57971dbbc486da4508..02fff218a96c8ca5ebf152fb2f2cc2a735292e90 100644 (file)
--- a/test/collate3.test
+++ b/test/collate3.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is page cache subsystem.
 #
-# $Id: collate3.test,v 1.8 2005/01/22 03:39:39 danielk1977 Exp $
+# $Id: collate3.test,v 1.9 2005/01/26 03:58:36 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -114,11 +114,16 @@ do_test collate3-2.7.1 {
     SELECT count(*) FROM collate3t1 GROUP BY c1;
   }
 } {1 {no such collation sequence: string_compare}} 
+# do_test collate3-2.7.2 {
+#   catchsql {
+#     SELECT * FROM collate3t1 GROUP BY c1;
+#   }
+# } {1 {GROUP BY may only be used on aggregate queries}}
 do_test collate3-2.7.2 {
   catchsql {
     SELECT * FROM collate3t1 GROUP BY c1;
   }
-} {1 {GROUP BY may only be used on aggregate queries}}
+} {1 {no such collation sequence: string_compare}} 
 do_test collate3-2.8 {
   catchsql {
     SELECT DISTINCT c1 FROM collate3t1;

diff --git a/test/select5.test b/test/select5.test
index d09bb0526eb6fdf129bb8eac0a3c31140e17eedc..fb739f24b4a189c634dba71975952d60aa054b0f 100644 (file)
--- a/test/select5.test
+++ b/test/select5.test
@@ -12,7 +12,7 @@
 # focus of this file is testing aggregate functions and the
 # GROUP BY and HAVING clauses of SELECT statements.
 #
-# $Id: select5.test,v 1.8 2004/08/20 18:34:20 drh Exp $
+# $Id: select5.test,v 1.9 2005/01/26 03:58:36 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -116,4 +116,41 @@ do_test select5-4.5 {
   }
 } {0.0}
 
+# Some tests for queries with a GROUP BY clause but no aggregate functions.
+#
+# Note: The query in test case 5-5.5 are not legal SQL. So if the 
+# implementation changes in the future and it returns different results,
+# this is not such a big deal.
+#
+do_test select5-5.1 {
+  execsql {
+    CREATE TABLE t2(a, b, c);
+    INSERT INTO t2 VALUES(1, 2, 3);
+    INSERT INTO t2 VALUES(1, 4, 5);
+    INSERT INTO t2 VALUES(6, 4, 7);
+    CREATE INDEX t2_idx ON t2(a);
+  } 
+} {}
+do_test select5-5.2 {
+  execsql {
+    SELECT a FROM t2 GROUP BY a;
+  } 
+} {1 6}
+do_test select5-5.3 {
+  execsql {
+    SELECT a FROM t2 WHERE a>2 GROUP BY a;
+  } 
+} {6}
+do_test select5-5.4 {
+  execsql {
+    SELECT a, b FROM t2 GROUP BY a, b;
+  } 
+} {1 2 1 4 6 4}
+do_test select5-5.5 {
+  execsql {
+    SELECT a, b FROM t2 GROUP BY a;
+  } 
+} {1 2 6 4}
+
 finish_test
+

diff --git a/test/select7.test b/test/select7.test
index 532525be04e696122350de2bc7c582540f66617b..4f453669fb2a8ffef6905e91f1064eef42ac6edc 100644 (file)
--- a/test/select7.test
+++ b/test/select7.test
@@ -10,7 +10,7 @@
 # focus of this file is testing compute SELECT statements and nested
 # views.
 #
-# $Id: select7.test,v 1.5 2005/01/21 03:12:16 danielk1977 Exp $
+# $Id: select7.test,v 1.6 2005/01/26 03:58:37 danielk1977 Exp $
 
 
 set testdir [file dirname $argv0]
@@ -54,11 +54,20 @@ do_test select7-2.1 {
 
 # Do not allow GROUP BY without an aggregate. Ticket #1039.
 #
+# Change: force any query with a GROUP BY clause to be processed as
+# an aggregate query, whether it contains aggregates or not.
+#
 ifcapable subquery {
+  # do_test select7-3.1 {
+  #   catchsql {
+  #     SELECT * FROM (SELECT * FROM sqlite_master) GROUP BY name
+  #   }
+  # } {1 {GROUP BY may only be used on aggregate queries}}
   do_test select7-3.1 {
     catchsql {
       SELECT * FROM (SELECT * FROM sqlite_master) GROUP BY name
     }
-  } {1 {GROUP BY may only be used on aggregate queries}}
+  } [list 0 [execsql {SELECT * FROM sqlite_master ORDER BY name}]]
 }
 finish_test
+