Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | :-) (CVS 78) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
923c14fe120c7d5470a18257659154c4 |
User & Date: | drh 2000-06-08 11:13:02.000 |
Context
2000-06-08
| ||
11:25 | :-) (CVS 79) (check-in: 305b043f4f user: drh tags: trunk) | |
11:13 | :-) (CVS 78) (check-in: 923c14fe12 user: drh tags: trunk) | |
01:55 | :-) (CVS 77) (check-in: b3fb15ccde user: drh tags: trunk) | |
Changes
Changes to src/select.c.
︙ | ︙ | |||
20 21 22 23 24 25 26 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements. ** | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements. ** ** $Id: select.c,v 1.20 2000/06/08 11:13:02 drh Exp $ */ #include "sqliteInt.h" /* ** Allocate a new Select structure and return a pointer to that ** structure. */ |
︙ | ︙ | |||
791 792 793 794 795 796 797 798 799 800 801 802 803 804 | if( sqliteExprAnalyzeAggregates(pParse, pGroupBy->a[i].pExpr) ){ return 1; } } } if( pHaving && sqliteExprAnalyzeAggregates(pParse, pHaving) ){ return 1; } } /* Begin generating code. */ v = pParse->pVdbe; if( v==0 ){ | > > > > > > > | 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 | if( sqliteExprAnalyzeAggregates(pParse, pGroupBy->a[i].pExpr) ){ return 1; } } } if( pHaving && sqliteExprAnalyzeAggregates(pParse, pHaving) ){ return 1; } if( pOrderBy ){ for(i=0; i<pOrderBy->nExpr; i++){ if( sqliteExprAnalyzeAggregates(pParse, pOrderBy->a[i].pExpr) ){ return 1; } } } } /* Begin generating code. */ v = pParse->pVdbe; if( v==0 ){ |
︙ | ︙ |
Added test/select5.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | # Copyright (c) 1999, 2000 D. Richard Hipp # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public # License as published by the Free Software Foundation; either # version 2 of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public # License along with this library; if not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # # Author contact information: # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing aggregate functions and the # GROUP BY and HAVING clauses of SELECT statements. # # $Id: select5.test,v 1.1 2000/06/08 11:13:02 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Build some test data # set fd [open data1.txt w] for {set i 1} {$i<32} {incr i} { for {set j 0} {pow(2,$j)<$i} {incr j} {} puts $fd "[expr {32-$i}]\t[expr {10-$j}]" } close $fd execsql { CREATE TABLE t1(x int, y int); COPY t1 FROM 'data1.txt' } file delete data1.txt do_test select5-1.0 { execsql {SELECT DISTINCT y FROM t1 ORDER BY y} } {5 6 7 8 9 10} # Sort by an aggregate function. # do_test select5-1.1 { execsql {SELECT y, count(*) FROM t1 GROUP BY y ORDER BY y} } {5 15 6 8 7 4 8 2 9 1 10 1} do_test select5-1.2 { execsql {SELECT y, count(*) FROM t1 GROUP BY y ORDER BY count(*), y} } {9 1 10 1 8 2 7 4 6 8 5 15} finish_test |