Make sure that integer values are converted to real when pulled from

a REAL table column by GROUP BY.  Ticket #2251.  Also make sure default
values are correctly expanded.  There may be other places in the code
where this issue comes up - we need to look further. (CVS 3659)

FossilOrigin-Name: e11bbf174c5a2fa75e3d1dd450c8b2a18f40e4da

diff --git a/manifest b/manifest
index bfe6bdbb394f2022793d323e201474f4f9cdb8e3..f6ac3764aee8d2fc7009e6d2180d1ebefca46244 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\sOR\soptimization\sif\sit\swould\sconflict\swith\scolumn\naffinity\scoercions.\s\sTicket\s#2249.\s\sAdditional\scleanup\sand\stesting\nof\sthe\sOR\soptimization.\s(CVS\s3658)
-D 2007-02-23T23:13:34
+C Make\ssure\sthat\sinteger\svalues\sare\sconverted\sto\sreal\swhen\spulled\sfrom\na\sREAL\stable\scolumn\sby\sGROUP\sBY.\s\sTicket\s#2251.\s\sAlso\smake\ssure\sdefault\nvalues\sare\scorrectly\sexpanded.\s\sThere\smay\sbe\sother\splaces\sin\sthe\scode\nwhere\sthis\sissue\scomes\sup\s-\swe\sneed\sto\slook\sfurther.\s(CVS\s3659)
+D 2007-02-24T11:52:53
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -65,7 +65,7 @@ F src/complete.c 7d1a44be8f37de125fcafd3d3a018690b3799675
 F src/date.c 393c73fc027597e008dcd81454544659e978b05c
 F src/delete.c 151d08386bf9c9e7f92f6b9106c71efec2def184
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
-F src/expr.c 24d52bd600aa5769ce60c6263275f8013ea5eb87
+F src/expr.c 7815bdb27152e0b9025a089608403f7fa5d279ec
 F src/func.c b7e1e220a6795ecae7649815145ea5f8644dfa5f
 F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
@@ -92,12 +92,12 @@ F src/pragma.c 5091300911670ddaa552bfa12c45cbca1bb7e7d6
 F src/prepare.c 484389c6811415b8f23d259ac9c029613e1c72c3
 F src/printf.c aade23a789d7cc88b397ec0d33a0a01a33a7a9c1
 F src/random.c 6119474a6f6917f708c1dee25b9a8e519a620e88
-F src/select.c 05081fdfdb5f6a1397079097e02f9a76a9ce4019
+F src/select.c 7808a4079c3756ac946ee8c43c7e61f06134cb2e
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c d13ca007cd18192c07a668aeddcdd6a9fe639be9
 F src/sqlite.h.in 6b7383baf76070214f6381f603328ca9b22a7fae
 F src/sqlite3ext.h 011c75fd6459a61454514af07c7a4f1f5c767f27
-F src/sqliteInt.h f70998732d5fc3f9517e48606faf0e2417d08014
+F src/sqliteInt.h cc9f729ca211a11a9d735b66a5f6c968a143e472
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
 F src/tclsqlite.c cd2b3b86ab07c0e0779f6c6e71e72c6c7dc1e704
 F src/test1.c cb314bfa3e9251b545fa3669ec80a8c8a0a86310
@@ -133,7 +133,7 @@ F src/where.c d4a10cf428e5bf855e8a7f6c6a95119ca93489f0
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/all.test b62fcd122052efaff1b0979aefa2dd65cfc8ee52
-F test/alter.test 29234396d738966d512dcb0d71c137a2315d38d7
+F test/alter.test a2cc30e844cb3b5d203416962f56f78fc11b1978
 F test/alter2.test 8b2d81eae944471d473de99ab25ba6d9cda73cd3
 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
 F test/altermalloc.test 19323e0f452834044c27a54c6e78554d706de7ba
@@ -284,7 +284,7 @@ F test/schema.test 8a2ae440fb15f5798a68059e8746402f3137be46
 F test/schema2.test d815923e57e90b8c60ddf5e0d8fd65075e94f57f
 F test/select1.test fa4e941da0a38961635d903530bd292dc149a8e8
 F test/select2.test f3c2678c3a9f3cf08ec4988a3845bda64be6d9e3
-F test/select3.test 33c78663e6b1b41220dcec4eb6affb1a05001ffe
+F test/select3.test 2d473f45c57c0526833e045fca0537badec0dd04
 F test/select4.test 305ba0a6e97efc5544def5e5cb49b54e1bf87fd9
 F test/select5.test 0b47058d3e916c1fc9fe81f44b438e02bade21ce
 F test/select6.test 399f14b9ba37b768afe5d2cd8c12e4f340a69db8
@@ -432,7 +432,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 4692a85edbe27d512f1830b8fb3e2b05b92a0cb5
-R dc63788d974b701458838d84fc2750a6
+P 908daaa9ab86e0bd1da6d0807d6aaba240c3cee0
+R eee73bc2a03f9bdc2ebbcd27a41cf46b
 U drh
-Z 5d96385345b08fab32c52067bf0a8a92
+Z 81fcb798214e4a4eaf239b3e14455f12

diff --git a/manifest.uuid b/manifest.uuid
index e058683dc9e17da25630f75797660a614a376f77..e3c94210a0cc0cf04e885a147476f06a9c4849f6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-908daaa9ab86e0bd1da6d0807d6aaba240c3cee0
\ No newline at end of file
+e11bbf174c5a2fa75e3d1dd450c8b2a18f40e4da
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 12a0023eaadd70922b723c53a77b58030c54cdcc..d0b858efd671058d94b852e60dfd792229f78cb2 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.277 2007/02/23 03:00:45 drh Exp $
+** $Id: expr.c,v 1.278 2007/02/24 11:52:53 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1518,6 +1518,31 @@ static void codeInteger(Vdbe *v, const char *z, int n){
   }
 }
 
+
+/*
+** Generate code that will extract the iColumn-th column from
+** table pTab and push that column value on the stack.  There
+** is an open cursor to pTab in iTable.  If iColumn<0 then
+** code is generated that extracts the rowid.
+*/
+void sqlite3ExprCodeGetColumn(Vdbe *v, Table *pTab, int iColumn, int iTable){
+  if( iColumn<0 ){
+    int op = (pTab && IsVirtual(pTab)) ? OP_VRowid : OP_Rowid;
+    sqlite3VdbeAddOp(v, op, iTable, 0);
+  }else if( pTab==0 ){
+    sqlite3VdbeAddOp(v, OP_Column, iTable, iColumn);
+  }else{
+    int op = IsVirtual(pTab) ? OP_VColumn : OP_Column;
+    sqlite3VdbeAddOp(v, op, iTable, iColumn);
+    sqlite3ColumnDefault(v, pTab, iColumn);
+#ifndef SQLITE_OMIT_FLOATING_POINT
+    if( pTab->aCol[iColumn].affinity==SQLITE_AFF_REAL ){
+      sqlite3VdbeAddOp(v, OP_RealAffinity, 0, 0);
+    }
+#endif
+  }
+}
+
 /*
 ** Generate code into the current Vdbe to evaluate the given
 ** expression and leave the result on the top of stack.
@@ -1558,21 +1583,8 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
         /* This only happens when coding check constraints */
         assert( pParse->ckOffset>0 );
         sqlite3VdbeAddOp(v, OP_Dup, pParse->ckOffset-pExpr->iColumn-1, 1);
-      }else if( pExpr->iColumn>=0 ){
-        Table *pTab = pExpr->pTab;
-        int iCol = pExpr->iColumn;
-        int op = (pTab && IsVirtual(pTab)) ? OP_VColumn : OP_Column;
-        sqlite3VdbeAddOp(v, op, pExpr->iTable, iCol);
-        sqlite3ColumnDefault(v, pTab, iCol);
-#ifndef SQLITE_OMIT_FLOATING_POINT
-        if( pTab && pTab->aCol[iCol].affinity==SQLITE_AFF_REAL ){
-          sqlite3VdbeAddOp(v, OP_RealAffinity, 0, 0);
-        }
-#endif
       }else{
-        Table *pTab = pExpr->pTab;
-        int op = (pTab && IsVirtual(pTab)) ? OP_VRowid : OP_Rowid;
-        sqlite3VdbeAddOp(v, op, pExpr->iTable, 0);
+        sqlite3ExprCodeGetColumn(v, pExpr->pTab, pExpr->iColumn, pExpr->iTable);
       }
       break;
     }

diff --git a/src/select.c b/src/select.c
index 4a9c6f5e95d26975bedb26e869a8c306297423af..84e054658a538e6a4dcc7fe9f8e2b75fd6c87438 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.327 2007/02/14 09:19:36 danielk1977 Exp $
+** $Id: select.c,v 1.328 2007/02/24 11:52:54 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -3144,13 +3144,7 @@ int sqlite3Select(
         for(i=0; i<sAggInfo.nColumn; i++){
           struct AggInfo_col *pCol = &sAggInfo.aCol[i];
           if( pCol->iSorterColumn<j ) continue;
-          if( pCol->iColumn<0 ){
-            sqlite3VdbeAddOp(v, OP_Rowid, pCol->iTable, 0);
-          }else{
-            Table *pTab = pCol->pTab;
-            int op = (pTab && IsVirtual(pTab)) ? OP_VColumn : OP_Column;
-            sqlite3VdbeAddOp(v, op, pCol->iTable, pCol->iColumn);
-          }
+          sqlite3ExprCodeGetColumn(v, pCol->pTab, pCol->iColumn, pCol->iTable);
           j++;
         }
         sqlite3VdbeAddOp(v, OP_MakeRecord, j, 0);

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 737511ab6965c8539af2c9e23d386000b76340f2..e632f0437350165f029e151a736487f1d47f4f57 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.537 2007/02/14 09:19:36 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.538 2007/02/24 11:52:55 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1651,6 +1651,7 @@ void sqlite3DeleteFrom(Parse*, SrcList*, Expr*);
 void sqlite3Update(Parse*, SrcList*, ExprList*, Expr*, int);
 WhereInfo *sqlite3WhereBegin(Parse*, SrcList*, Expr*, ExprList**);
 void sqlite3WhereEnd(WhereInfo*);
+void sqlite3ExprCodeGetColumn(Vdbe*, Table*, int, int);
 void sqlite3ExprCode(Parse*, Expr*);
 void sqlite3ExprCodeAndCache(Parse*, Expr*);
 int sqlite3ExprCodeExprList(Parse*, ExprList*);

diff --git a/test/alter.test b/test/alter.test
index e10af6fa0c792e10fe4693598554a31c4d40ba2c..2eb944cb27e539986d68ced6602cfde12c8f5bd3 100644 (file)
--- a/test/alter.test
+++ b/test/alter.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is testing the ALTER TABLE statement.
 #
-# $Id: alter.test,v 1.17 2006/02/09 02:56:03 drh Exp $
+# $Id: alter.test,v 1.18 2007/02/24 11:52:55 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -630,5 +630,24 @@ do_test alter-7.1 {
   }
 } {text 1 integer 2}
 
+# Make sure that when a column is added by ALTER TABLE ADD COLUMN and has
+# a default value that the default value is used by aggregate functions.
+#
+do_test alter-8.1 {
+  execsql {
+    CREATE TABLE t2(a INTEGER);
+    INSERT INTO t2 VALUES(1);
+    INSERT INTO t2 VALUES(1);
+    INSERT INTO t2 VALUES(2);
+    ALTER TABLE t2 ADD COLUMN b INTEGER DEFAULT 9;
+    SELECT sum(b) FROM t2;
+  }
+} {27}
+do_test alter-8.2 {
+  execsql {
+    SELECT a, sum(b) FROM t2 GROUP BY a;
+  }
+} {1 18 2 9}
+
 
 finish_test

diff --git a/test/select3.test b/test/select3.test
index c3fbd2ee6996032e16eaa61ceda5b9ccd4e3b10f..8d89dabbed54b2b7cc058a5a8932fccd047f4032 100644 (file)
--- a/test/select3.test
+++ b/test/select3.test
@@ -12,7 +12,7 @@
 # focus of this file is testing aggregate functions and the
 # GROUP BY and HAVING clauses of SELECT statements.
 #
-# $Id: select3.test,v 1.19 2006/04/11 14:16:22 drh Exp $
+# $Id: select3.test,v 1.20 2007/02/24 11:52:55 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -235,5 +235,28 @@ do_test select3-7.2 {
   }
 } {{} {}}
 
+# If a table column is of type REAL but we are storing integer values
+# in it, the values are stored as integers to take up less space.  The
+# values are converted by to REAL as they are read out of the table.
+# Make sure the GROUP BY clause does this conversion correctly.
+# Ticket #2251.
+#
+do_test select3-8.1 {
+  execsql {
+    CREATE TABLE A (
+      A1 DOUBLE,
+      A2 VARCHAR COLLATE NOCASE,
+      A3 DOUBLE
+    );
+    INSERT INTO A VALUES(39136,'ABC',1201900000);
+    INSERT INTO A VALUES(39136,'ABC',1207000000);
+    SELECT typeof(sum(a3)) FROM a;
+  }
+} {real}
+do_test select3-8.2 {
+  execsql {
+    SELECT typeof(sum(a3)) FROM a GROUP BY a1;
+  }
+} {real}
 
 finish_test