Fix the compound-select-to-subquery converter so that it works with the

new compound-select object linkage introduced as part of the fix
for ticket [31a19d11b97088296].

FossilOrigin-Name: 572d4be4db03ce4afe9ae70f148703c74e0d8de0

diff --git a/manifest b/manifest
index 9310c896919667356a00291ce88c29a2c306108b..0fd54c65859144a951b87d77bbe14f1f11c1092d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sa\s"Synopsis:"\scomment\sin\sthe\sVDBE\sengine.
-D 2014-02-10T15:56:34.917
+C Fix\sthe\scompound-select-to-subquery\sconverter\sso\sthat\sit\sworks\swith\sthe\nnew\scompound-select\sobject\slinkage\sintroduced\sas\spart\sof\sthe\sfix\nfor\sticket\s[31a19d11b97088296].
+D 2014-02-10T18:56:05.414
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -219,7 +219,7 @@ F src/printf.c 85d07756e45d7496d19439dcae3e6e9e0090f269
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c c055a9fa25a4e7fc8c1652c44a31d6382dbb1e8a
+F src/select.c 6afe4c3f3944b229d01c37bb399a9c3761e71698
 F src/shell.c 7dedf7367ee49050b0366bf8dbc8ec2bd15b42c7
 F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@ -1152,7 +1152,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 010c48f671e909cb406f3716102a0032bc72a592
-R 578e19c460bd25472755ddb73b8e954a
+P 0dfa7ee9157ea6b1c745732d6c3fcd066cf4f849
+R 0a0a7ffb9514767b9649cf14141c47c8
 U drh
-Z b51a63f783c162fa8d14eeaf754f2b2d
+Z f074d58f6f28d25d0d7533e32b528413

diff --git a/manifest.uuid b/manifest.uuid
index 2d5b959f982e4832c16ae2a5264875640331dcf0..154f91e86100e50e6c8658d97ffaf511404e7c04 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0dfa7ee9157ea6b1c745732d6c3fcd066cf4f849
\ No newline at end of file
+572d4be4db03ce4afe9ae70f148703c74e0d8de0
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 07cb571daa0162deefa87e762f746dca7c7e82c0..75e495f1087920de78e7db891f3d44e5c6ccaa4e 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3628,6 +3628,9 @@ static int convertCompoundSelectToSubquery(Walker *pWalker, Select *p){
   pNew->pHaving = 0;
   pNew->pOrderBy = 0;
   p->pPrior = 0;
+  p->pNext = 0;
+  p->selFlags &= ~SF_Compound;
+  if( pNew->pPrior ) pNew->pPrior->pNext = pNew;
   pNew->pLimit = 0;
   pNew->pOffset = 0;
   return WRC_Continue;