aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2006-04-07 13:50:37 +0000
committerdrh <drh@noemail.net>2006-04-07 13:50:37 +0000
commit30bcf5dbaf75e214e3a983f2da50970e23978f8f (patch)
tree13462e8283a5826ee39398118ffc3ec31af99d99 /src
parent502b962b2df49c68c88c79b5c8c2dd70afa7527d (diff)
downloadsqlite-30bcf5dbaf75e214e3a983f2da50970e23978f8f.tar.gz
sqlite-30bcf5dbaf75e214e3a983f2da50970e23978f8f.zip
Return the correct declared column type, origin column name, origin database
name, etc. from aggregate queries. Ticket #1726 and #1755. (CVS 3169) FossilOrigin-Name: e64809f0ae98ce9d152cf030cae72bf3df3e2403
Diffstat (limited to 'src')
-rw-r--r--src/select.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/select.c b/src/select.c
index 1670ccc50..53aa72755 100644
--- 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.310 2006/03/26 01:21:23 drh Exp $
+** $Id: select.c,v 1.311 2006/04/07 13:50:37 drh Exp $
*/
#include "sqliteInt.h"
@@ -805,6 +805,7 @@ static const char *columnType(
assert( pExpr->op!=TK_AS );
switch( pExpr->op ){
+ case TK_AGG_COLUMN:
case TK_COLUMN: {
/* The expression is a column. Locate the table the column is being
** extracted from in NameContext.pSrcList. This table may be real