Get the column affinities right when processing an IN operator where

the right-hand side is a subquery with an ORDER BY clause.  Ticket #2295.
This bug has likely been present since version 3.0.0 and it has just now
been noticed, so it seems to be a obscure case. (CVS 3837)

FossilOrigin-Name: 4062ddf3c7f4fd150292304fa33ca76dc35571a1

diff --git a/manifest b/manifest
index 471b5bf1b8cfead9d3ba4c6d5db168fe86b62eb9..bcdcb02bf8fd6557560b25f31d536ca2df6449a1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Blind\scheck-in\sof\schanges\sto\sfix\s#2294\s-\sI\shave\sno\sability\sto\stest.\r\nGentle\swince\susers:\splease\stest\sthis\schange\sand\sif\sit\sworks\sleave\sa\sremark\r\non\sthe\s#2294\sticket.\s\sTnx.\s(CVS\s3836)
-D 2007-04-11T17:54:03
+C Get\sthe\scolumn\saffinities\sright\swhen\sprocessing\san\sIN\soperator\swhere\nthe\sright-hand\sside\sis\sa\ssubquery\swith\san\sORDER\sBY\sclause.\s\sTicket\s#2295.\nThis\sbug\shas\slikely\sbeen\spresent\ssince\sversion\s3.0.0\sand\sit\shas\sjust\snow\nbeen\snoticed,\sso\sit\sseems\sto\sbe\sa\sobscure\scase.\s(CVS\s3837)
+D 2007-04-12T03:54:39
 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -93,12 +93,12 @@ F src/pragma.c 3b992b5b2640d6ae25cef05aa6a42cd1d6c43234
 F src/prepare.c 37207b2b2ccb41d379b01dd62231686bcc48ef1f
 F src/printf.c 0c6f40648770831341ac45ab32423a80b4c87f05
 F src/random.c 6119474a6f6917f708c1dee25b9a8e519a620e88
-F src/select.c 6d6e7c992fb0f170e60e6c1f53fe87f52e73aeba
+F src/select.c e61a72f8eadd6810ee05febaab392f86f1aa4917
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 3ae4654560e91220a95738a73d135d91d937cda1
 F src/sqlite.h.in e429f66f9245c7f8675db24b230c950b8672ad1c
 F src/sqlite3ext.h 7d0d363ea7327e817ef0dfe1b7eee1f171b72890
-F src/sqliteInt.h 347160d30eb61210417f1086aeb57d7d3e2a8191
+F src/sqliteInt.h 6c25db3cdf91d26ffe66c685812c808291c241de
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
 F src/tclsqlite.c ec69eb9ad56d03fbf7570ca1ca5ea947d1ec4b6f
 F src/test1.c 9f85126e66a9a1ec463b609cd0221c151a723e2c
@@ -317,7 +317,7 @@ F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 F test/speed1.test 22e1b27af0683ed44dcd2f93ed817a9c3e65084a
 F test/speed2.test 9b93b93681f82f320caa4b2c9f15c0de4f3a3d33
 F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797
-F test/subselect.test 2d13fb7f450db3595adcdd24079a0dd1d2d6abc2
+F test/subselect.test 974e87f8fc91c5f00dd565316d396a5a6c3106c4
 F test/sync.test d05397b8f89f423dd6dba528692019ab036bc1c3
 F test/table.test feea6a3eb08cf166f570255eea5447e42ef82498
 F test/tableapi.test 036575a98dcce7c92e9f39056839bbad8a715412
@@ -457,7 +457,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 34fec312fd1aeabb04e07d6aa061991775c7b8a1
-R d1534c540b5ae78307739707a6abdcd3
+P ca56c3e2250eda0b312ab6f801b0fd95fb136bfa
+R 77eaaca444233c69514bd1ca325ca11d
 U drh
-Z 17f9de9f818eaf8a3c214b1aa054fe86
+Z 836278c790cb182e1d81cabb92bdc290

diff --git a/manifest.uuid b/manifest.uuid
index 1438ab68f2d2231b11c0638693b7be72f962cbab..b364ab1037fbc9530f8a31da592d32372d49978a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ca56c3e2250eda0b312ab6f801b0fd95fb136bfa
\ No newline at end of file
+4062ddf3c7f4fd150292304fa33ca76dc35571a1
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 7c89ef009e75489f32f8aeeae3985034591cc2fc..2565dcf448c01b2783b3c0b345ef9f6af6c53c41 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.333 2007/04/06 01:04:40 drh Exp $
+** $Id: select.c,v 1.334 2007/04/12 03:54:39 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -553,6 +553,7 @@ static int selectInnerLoop(
       sqlite3VdbeAddOp(v, OP_NotNull, -1, addr1+3);
       sqlite3VdbeAddOp(v, OP_Pop, 1, 0);
       addr2 = sqlite3VdbeAddOp(v, OP_Goto, 0, 0);
+      p->affinity = sqlite3CompareAffinity(pEList->a[0].pExpr,(iParm>>16)&0xff);
       if( pOrderBy ){
         /* At first glance you would think we could optimize out the
         ** ORDER BY in this case since the order of entries in the set
@@ -560,9 +561,7 @@ static int selectInnerLoop(
         ** case the order does matter */
         pushOntoSorter(pParse, pOrderBy, p);
       }else{
-        char affinity = (iParm>>16)&0xFF;
-        affinity = sqlite3CompareAffinity(pEList->a[0].pExpr, affinity);
-        sqlite3VdbeOp3(v, OP_MakeRecord, 1, 0, &affinity, 1);
+        sqlite3VdbeOp3(v, OP_MakeRecord, 1, 0, &p->affinity, 1);
         sqlite3VdbeAddOp(v, OP_IdxInsert, (iParm&0x0000FFFF), 0);
       }
       sqlite3VdbeJumpHere(v, addr2);
@@ -723,7 +722,7 @@ static void generateSortTail(
       sqlite3VdbeAddOp(v, OP_NotNull, -1, sqlite3VdbeCurrentAddr(v)+3);
       sqlite3VdbeAddOp(v, OP_Pop, 1, 0);
       sqlite3VdbeAddOp(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+3);
-      sqlite3VdbeOp3(v, OP_MakeRecord, 1, 0, "c", P3_STATIC);
+      sqlite3VdbeOp3(v, OP_MakeRecord, 1, 0, &p->affinity, 1);
       sqlite3VdbeAddOp(v, OP_IdxInsert, (iParm&0x0000FFFF), 0);
       break;
     }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 6c976deae3e353ca14b030b458baeb3272b9e81d..981af804532ee0ebd2404b4512918afd9c49967a 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.550 2007/04/06 11:26:00 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.551 2007/04/12 03:54:39 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -1266,6 +1266,7 @@ struct Select {
   u8 isAgg;              /* True if this is an aggregate query */
   u8 usesEphm;           /* True if uses an OpenEphemeral opcode */
   u8 disallowOrderBy;    /* Do not allow an ORDER BY to be attached if TRUE */
+  char affinity;         /* MakeRecord with this affinity for SRT_Set */
   SrcList *pSrc;         /* The FROM clause */
   Expr *pWhere;          /* The WHERE clause */
   ExprList *pGroupBy;    /* The GROUP BY clause */

diff --git a/test/subselect.test b/test/subselect.test
index 20d401c6f8ddd2313026d3d6698d600a7b404f0c..a43bca35554e0a68234dba5d1644360a440d7712 100644 (file)
--- a/test/subselect.test
+++ b/test/subselect.test
@@ -12,7 +12,7 @@
 # focus of this file is testing SELECT statements that are part of
 # expressions.
 #
-# $Id: subselect.test,v 1.13 2005/09/08 10:37:01 drh Exp $
+# $Id: subselect.test,v 1.14 2007/04/12 03:54:39 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -175,4 +175,28 @@ do_test subselect-3.10 {
   }
 } {4}
 
+# Ticket #2295.
+# Make sure type affinities work correctly on subqueries with
+# an ORDER BY clause.
+#
+do_test subselect-4.1 {
+  execsql {
+    CREATE TABLE t4(a TEXT, b TEXT);
+    INSERT INTO t4 VALUES('a','1');
+    INSERT INTO t4 VALUES('b','2');
+    INSERT INTO t4 VALUES('c','3');
+    SELECT a FROM t4 WHERE b IN (SELECT b FROM t4 ORDER BY b);
+  }
+} {a b c}
+do_test subselect-4.2 {
+  execsql {
+    SELECT a FROM t4 WHERE b IN (SELECT b FROM t4 ORDER BY b LIMIT 1);
+  }
+} {a}
+do_test subselect-4.3 {
+  execsql {
+    SELECT a FROM t4 WHERE b IN (SELECT b FROM t4 ORDER BY b DESC LIMIT 1);
+  }
+} {c}
+
 finish_test