Fix a pointless conditional. Add a test case.

FossilOrigin-Name: 9367632dd7e4fec9197227e35b0627c2e81ebffc

diff --git a/manifest b/manifest
index 0fd54c65859144a951b87d77bbe14f1f11c1092d..02a30132dc1bd8911fa37b37b20918a288538c09 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-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
+C Fix\sa\spointless\sconditional.\s\sAdd\sa\stest\scase.
+D 2014-02-10T21:07:51.589
 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 6afe4c3f3944b229d01c37bb399a9c3761e71698
+F src/select.c 50961f0d0ab8f2d45ff29ec5f91d8db221330ca7
 F src/shell.c 7dedf7367ee49050b0366bf8dbc8ec2bd15b42c7
 F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@ -786,7 +786,7 @@ F test/select6.test e76bd10a56988f15726c097a5d5a7966fe82d3b2
 F test/select7.test 7fd2ef598cfabb6b9ff6ac13973b91d0527df49d
 F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
 F test/select9.test aebc2bb0c3bc44606125033cbcaac2c8d1f33a95
-F test/selectA.test 99cf21df033b93033ea4f34aba14a500f48f04fe
+F test/selectA.test 77adaffe9704cb80e301ebaeff4b107b58d435c5
 F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
 F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
 F test/selectD.test b0f02a04ef7737decb24e08be2c39b9664b43394
@@ -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 0dfa7ee9157ea6b1c745732d6c3fcd066cf4f849
-R 0a0a7ffb9514767b9649cf14141c47c8
+P 572d4be4db03ce4afe9ae70f148703c74e0d8de0
+R b7d0a27ba761fd3ba9cef17cacd1ce16
 U drh
-Z f074d58f6f28d25d0d7533e32b528413
+Z 5a7d977408b7fd9f1bc56f50ea9feaff

diff --git a/manifest.uuid b/manifest.uuid
index 154f91e86100e50e6c8658d97ffaf511404e7c04..7c2363e7eff57259f08130bb455951c19bb2ac20 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-572d4be4db03ce4afe9ae70f148703c74e0d8de0
\ No newline at end of file
+9367632dd7e4fec9197227e35b0627c2e81ebffc
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 75e495f1087920de78e7db891f3d44e5c6ccaa4e..dd445deed32d43286c289b67a9ad51c0dc644e97 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3630,7 +3630,8 @@ static int convertCompoundSelectToSubquery(Walker *pWalker, Select *p){
   p->pPrior = 0;
   p->pNext = 0;
   p->selFlags &= ~SF_Compound;
-  if( pNew->pPrior ) pNew->pPrior->pNext = pNew;
+  assert( pNew->pPrior!=0 );
+  pNew->pPrior->pNext = pNew;
   pNew->pLimit = 0;
   pNew->pOffset = 0;
   return WRC_Continue;

diff --git a/test/selectA.test b/test/selectA.test
index 5fd2288dbf30220f373c3156e315b6f02f33a65d..ca2ec38da46dcdcf2844ed17a8c252f41640ae33 100644 (file)
--- a/test/selectA.test
+++ b/test/selectA.test
@@ -1292,5 +1292,22 @@ do_test selectA-3.97 {
       ORDER BY y COLLATE NOCASE DESC,x,z)))
   }
 } {MAD}
+do_execsql_test selectA-3.98 {
+  WITH RECURSIVE
+    xyz(n) AS (
+      SELECT upper((SELECT x FROM (
+        SELECT x,y,z FROM t2
+        INTERSECT SELECT a,b,c FROM t3
+        EXCEPT SELECT c,b,a FROM t1
+        UNION SELECT a,b,c FROM t3
+        INTERSECT SELECT a,b,c FROM t3
+        EXCEPT SELECT c,b,a FROM t1
+        UNION SELECT a,b,c FROM t3
+        ORDER BY y COLLATE NOCASE DESC,x,z)))
+      UNION ALL
+      SELECT n || '+' FROM xyz WHERE length(n)<5
+    )
+  SELECT n FROM xyz ORDER BY +n;
+} {MAD MAD+ MAD++}
 
 finish_test