Make sure the affinity and datatype of sub-subqueries are initialized

prior to subqueries as the latter relies on the former.

FossilOrigin-Name: 39b4e6ff9316cc78ea88349091e195b8104d1e9e

diff --git a/manifest b/manifest
index 7f10b643a0b7ea5988ece40640b5fc18668a721a..31cc673a2f9c6427361b14bd71c83776b12361c0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssimple\scomment\stypo.\s\sNo\schanges\sto\scode.
-D 2013-04-24T13:50:09.308
+C Make\ssure\sthe\saffinity\sand\sdatatype\sof\ssub-subqueries\sare\sinitialized\nprior\sto\ssubqueries\sas\sthe\slatter\srelies\son\sthe\sformer.
+D 2013-04-25T00:57:10.497
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 87591ea5bf7d6ed521ad42d5bc69c124debe11a5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -137,7 +137,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
 F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
-F src/expr.c 48048fca951eedbc74aa32262154410d56c83812
+F src/expr.c 437c03d5bb4fe3a53ecab3ad0286d6c5260da7ed
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
 F src/func.c d3fdcff9274bc161152e67ed3f626841c247f4b9
@@ -179,14 +179,14 @@ F src/pragma.c 3eacf001cbf4becbd494f8d82d08fdf1648cf8cb
 F src/prepare.c 743e484233c51109666d402f470523553b41797c
 F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
-F src/resolve.c 10a1b332e3eb36e5d561085e18c58a8578cd7d73
+F src/resolve.c 83cc2d942ee216bc56956c6e6fadb691c1727fa1
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c 8d097454ff56bdda38c4d877757f592a3c823d15
+F src/select.c 6bfbe11e2fef81c5e18d30513ab6c69f171667eb
 F src/shell.c aca9d94653decd4496846dee0c7ba83eaf96a46d
 F src/sqlite.h.in ec279b782bea05db63b8b29481f9642b406004af
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
-F src/sqliteInt.h 2a83cfec9963372b636b0cabd4b200c1f1074a99
+F src/sqliteInt.h 3585ea1bb8776baa9f2675e9ef3d9170e7aeda29
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -258,7 +258,7 @@ F src/vdbetrace.c 3ad1b4e92b60c082a02ac563da4a2735cc7d297c
 F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887
-F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
+F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
 F src/where.c d54e63087b52c309550aa2defdb20ef27add9f9a
 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -719,7 +719,7 @@ F test/select9.test c0ca3cd87a8ebb04de2cb1402c77df55d911a0ea
 F test/selectA.test 06d1032fa9009314c95394f2ca2e60d9f7ae8532
 F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
 F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
-F test/selectD.test 03f7c1ea8d5ab3c637cbc30fcbbbac96b988c162
+F test/selectD.test b0f02a04ef7737decb24e08be2c39b9664b43394
 F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
 F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
@@ -1054,7 +1054,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 1a1cf5aa86734c832d845e07780262a178188d56
-R 52301974d4ec9029bc00a43d1015330a
+P f136bd95824dc95b9e6acdc4d55db263ba13fbaa
+R 35e39801836ac191fc1f292f3b81674a
 U drh
-Z d70e5c91a8e7a901cc898018c72d77a1
+Z 424df927045edc37db2bc00e1032f86c

diff --git a/manifest.uuid b/manifest.uuid
index 6407b99609ae085989ec053a5e735fce2f64b954..4aeba6cd085f81089081e516081410436e3290ac 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f136bd95824dc95b9e6acdc4d55db263ba13fbaa
\ No newline at end of file
+39b4e6ff9316cc78ea88349091e195b8104d1e9e
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index ae6a1dec10820c8b0ba4c6b1b62da791ef19baa7..a974c5a61fd47afcab2919c2b8f02bb4ced59c0a 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1214,6 +1214,7 @@ static int selectNodeIsConstant(Walker *pWalker, Select *NotUsed){
 }
 static int exprIsConst(Expr *p, int initFlag){
   Walker w;
+  memset(&w, 0, sizeof(w));
   w.u.i = initFlag;
   w.xExprCallback = exprNodeIsConstant;
   w.xSelectCallback = selectNodeIsConstant;
@@ -3428,8 +3429,8 @@ void sqlite3ExprCodeConstants(Parse *pParse, Expr *pExpr){
   Walker w;
   if( pParse->cookieGoto ) return;
   if( OptimizationDisabled(pParse->db, SQLITE_FactorOutConst) ) return;
+  memset(&w, 0, sizeof(w));
   w.xExprCallback = evalConstExpr;
-  w.xSelectCallback = 0;
   w.pParse = pParse;
   sqlite3WalkExpr(&w, pExpr);
 }

diff --git a/src/resolve.c b/src/resolve.c
index 9b350caf8018514bcd4740524b395489d2586eae..a8e196926c0e4ec1c2e1cdfc5d9bffd759718a4f 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1283,6 +1283,7 @@ int sqlite3ResolveExprNames(
 #endif
   savedHasAgg = pNC->ncFlags & NC_HasAgg;
   pNC->ncFlags &= ~NC_HasAgg;
+  memset(&w, 0, sizeof(w));
   w.xExprCallback = resolveExprStep;
   w.xSelectCallback = resolveSelectStep;
   w.pParse = pNC->pParse;
@@ -1323,6 +1324,7 @@ void sqlite3ResolveSelectNames(
   Walker w;
 
   assert( p!=0 );
+  memset(&w, 0, sizeof(w));
   w.xExprCallback = resolveExprStep;
   w.xSelectCallback = resolveSelectStep;
   w.pParse = pParse;

diff --git a/src/select.c b/src/select.c
index 1daa5bed36e7878a77d2f9115b823cba0eff9021..a745dc370a4ecbd0b1d0f571eb8dd8219abb8981 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3576,6 +3576,7 @@ static int exprWalkNoop(Walker *NotUsed, Expr *NotUsed2){
 */
 static void sqlite3SelectExpand(Parse *pParse, Select *pSelect){
   Walker w;
+  memset(&w, 0, sizeof(w));
   w.xSelectCallback = selectExpander;
   w.xExprCallback = exprWalkNoop;
   w.pParse = pParse;
@@ -3634,9 +3635,11 @@ static int selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){
 static void sqlite3SelectAddTypeInfo(Parse *pParse, Select *pSelect){
 #ifndef SQLITE_OMIT_SUBQUERY
   Walker w;
+  memset(&w, 0, sizeof(w));
   w.xSelectCallback = selectAddSubqueryTypeInfo;
   w.xExprCallback = exprWalkNoop;
   w.pParse = pParse;
+  w.bSelectDepthFirst = 1;
   sqlite3WalkSelect(&w, pSelect);
 #endif
 }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 3722041b0a35c4db6ae8270cebea2a6ff56aa120..876629a8c87b9be1961afb71f141b8b9eeaf2223 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2588,6 +2588,7 @@ struct Walker {
   int (*xSelectCallback)(Walker*,Select*);  /* Callback for SELECTs */
   Parse *pParse;                            /* Parser context.  */
   int walkerDepth;                          /* Number of subqueries */
+  u8 bSelectDepthFirst;                     /* Do subqueries first */
   union {                                   /* Extra data for callback */
     NameContext *pNC;                          /* Naming context */
     int i;                                     /* Integer value */

diff --git a/src/walker.c b/src/walker.c
index eab96ea24dcd6e6564e4c3fc94e28397de6620d0..e71ed2ac484c916c1cc1007e5e05da471cb49599 100644 (file)
--- a/src/walker.c
+++ b/src/walker.c
@@ -113,7 +113,9 @@ int sqlite3WalkSelectFrom(Walker *pWalker, Select *p){
 /*
 ** Call sqlite3WalkExpr() for every expression in Select statement p.
 ** Invoke sqlite3WalkSelect() for subqueries in the FROM clause and
-** on the compound select chain, p->pPrior.
+** on the compound select chain, p->pPrior.  Invoke the xSelectCallback()
+** either before or after the walk of expressions and FROM clause, depending
+** on whether pWalker->bSelectDepthFirst is false or true, respectively.
 **
 ** Return WRC_Continue under normal conditions.  Return WRC_Abort if
 ** there is an abort request.
@@ -127,14 +129,23 @@ int sqlite3WalkSelect(Walker *pWalker, Select *p){
   rc = WRC_Continue;
   pWalker->walkerDepth++;
   while( p ){
-    rc = pWalker->xSelectCallback(pWalker, p);
-    if( rc ) break;
+    if( !pWalker->bSelectDepthFirst ){
+       rc = pWalker->xSelectCallback(pWalker, p);
+       if( rc ) break;
+    }
     if( sqlite3WalkSelectExpr(pWalker, p)
      || sqlite3WalkSelectFrom(pWalker, p)
     ){
       pWalker->walkerDepth--;
       return WRC_Abort;
     }
+    if( pWalker->bSelectDepthFirst ){
+      rc = pWalker->xSelectCallback(pWalker, p);
+      /* Depth-first search is currently only used for
+      ** selectAddSubqueryTypeInfo() and that routine always returns
+      ** WRC_Continue (0).  So the following branch is never taken. */
+      if( NEVER(rc) ) break;
+    }
     p = p->pPrior;
   }
   pWalker->walkerDepth--;

diff --git a/test/selectD.test b/test/selectD.test
index aa8c328ee9cda72fb2413701351ce0eaacfcecd8..89f999eb6db97d6411df3f2afdae4e012909cc62 100644 (file)
--- a/test/selectD.test
+++ b/test/selectD.test
@@ -152,4 +152,23 @@ for {set i 1} {$i<=2} {incr i} {
   } {111 x1 111 x2 222 x3 {}}
 }
 
+# The following test was added on 2013-04-24 in order to verify that
+# the datatypes and affinities of sub-sub-queries are set prior to computing
+# the datatypes and affinities of the parent sub-queries because the 
+# latter computation depends on the former.
+#
+do_execsql_test selectD-4.1 {
+  CREATE TABLE t41(a INTEGER PRIMARY KEY, b INTEGER);
+  CREATE TABLE t42(d INTEGER PRIMARY KEY, e INTEGER);
+  CREATE TABLE t43(f INTEGER PRIMARY KEY, g INTEGER);
+  EXPLAIN QUERY PLAN
+  SELECT * 
+   FROM t41
+   LEFT JOIN (SELECT count(*) AS cnt, x1.d
+                FROM (t42 INNER JOIN t43 ON d=g) AS x1
+               WHERE x1.d>5
+               GROUP BY x1.d) AS x2
+                  ON t41.b=x2.d;
+} {/.*SEARCH SUBQUERY 1 AS x2 USING AUTOMATIC.*/}
+
 finish_test