Fix for ticket #102: Honor the ORDER BY clause in subqueries. (CVS 677)

FossilOrigin-Name: 7e918c8b0df5120e3630811f164defb8c9fedd6d

diff --git a/manifest b/manifest
index 34ab6d1f88a65bd291c376c4d15484b7cf1f2c46..ab09271a93c0eecf4c224a6bff60f35072ab0da0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\sticket\s#64:\sBetter\serror\sreporting\sin\sthe\sshell.\s(CVS\s676)
-D 2002-07-13T17:33:45
+C Fix\sfor\sticket\s#102:\sHonor\sthe\sORDER\sBY\sclause\sin\ssubqueries.\s(CVS\s677)
+D 2002-07-15T18:55:25
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -34,7 +34,7 @@ F src/os.c edb22daad525f49681f41c76683a16c1d39755c7
 F src/os.h 5b9a69875c880d1665ae040cbca1f7b9c82198ab
 F src/pager.c b8415b02a2a5c4e9d8bfd45311a5f15e785c7f1f
 F src/pager.h 6fddfddd3b73aa8abc081b973886320e3c614f0e
-F src/parse.y 9267b7681882205f904f6564fff733d8fbcd58a3
+F src/parse.y 5307e1a7b26241991934d4b50ae70980f3f2aca9
 F src/printf.c 06f4c8725063e0faf0e34824ab70feace7146bf7
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c f4e7221a319da25f549a434a6c664eedcbce4dec
@@ -94,7 +94,7 @@ F test/select4.test 10ba54f24ef6ca7958a7045b001079378db2370c
 F test/select5.test c2a6c4a003316ee42cbbd689eebef8fdce0db2ac
 F test/select6.test efb8d0c07a440441db87db2c4ade6904e1407e85
 F test/sort.test 3b996ce7ca385f9cd559944ac0f4027a23aa546b
-F test/subselect.test 64e71b1be804dc57c72b61d2bd7b506dbc962c40
+F test/subselect.test f0fea8cf9f386d416d64d152e3c65f9116d0f50f
 F test/table.test bc571115def9be8adab6df93aca0b0c05c007eea
 F test/tableapi.test 3c80421a889e1d106df16e5800fa787f0d2914a6
 F test/tclsqlite.test 6f4b9760681c7dbca52a18d0ab46a1679cdc79b9
@@ -141,7 +141,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 72a609ec6492e7d740b6e6184fa14a5e6b04a5dc
-R 7891214f9c076556276edc1f13c9cc97
+P e1842e04c4f47e1ce79575b5c787a164add5d559
+R d457409fb3b351cb718b6f1622dd2dbe
 U drh
-Z 35db130645374838f60c5ae02d3f553f
+Z 467681780f54f7e9f5861979bdae4749

diff --git a/manifest.uuid b/manifest.uuid
index 19c81a44875d4c25ed37862f293778d77bba01ed..7a4f493331c7128c4080b65820837595948e6767 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e1842e04c4f47e1ce79575b5c787a164add5d559
\ No newline at end of file
+7e918c8b0df5120e3630811f164defb8c9fedd6d
\ No newline at end of file

diff --git a/src/parse.y b/src/parse.y
index d98cb8440b803e94c916c7bfad19cdd271cdac72..f986d81ec7023d9ad12ed7d72aa1ccf71f3691ec 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.78 2002/07/08 22:03:32 drh Exp $
+** @(#) $Id: parse.y,v 1.79 2002/07/15 18:55:25 drh Exp $
 */
 %token_prefix TK_
 %token_type {Token}
@@ -346,10 +346,6 @@ seltablist(A) ::= stl_prefix(X) nm(Y) as(Z) on_opt(N) using_opt(U). {
 seltablist(A) ::= stl_prefix(X) LP select(S) RP as(Z) on_opt(N) using_opt(U). {
   A = sqliteSrcListAppend(X,0);
   A->a[A->nSrc-1].pSelect = S;
-  if( S->pOrderBy ){
-    sqliteExprListDelete(S->pOrderBy);
-    S->pOrderBy = 0;
-  }
   if( Z.n ) sqliteSrcListAddAlias(A,&Z);
   if( N ){
     if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; }

diff --git a/test/subselect.test b/test/subselect.test
index 11be13054b02ae0fe4dcb3d48f97db3818f6bf0b..d62659e7b21307c7ac80d5ac227017c68669eea7 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.6 2002/06/29 02:20:09 drh Exp $
+# $Id: subselect.test,v 1.7 2002/07/15 18:55:26 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -100,4 +100,56 @@ do_test subselect-2.3 {
   }
 } {0}
 
+# Verify that the ORDER BY clause is honored in a subquery.
+#
+do_test subselect-3.1 {
+  execsql {
+    CREATE TABLE t3(x int);
+    INSERT INTO t3 SELECT a FROM t1 UNION ALL SELECT b FROM t1;
+    SELECT * FROM t3 ORDER BY x;
+  }
+} {1 2 3 4 5 6}
+do_test subselect-3.2 {
+  execsql {
+    SELECT sum(x) FROM (SELECT x FROM t3 ORDER BY x LIMIT 2);
+  }
+} {3}
+do_test subselect-3.3 {
+  execsql {
+    SELECT sum(x) FROM (SELECT x FROM t3 ORDER BY x DESC LIMIT 2);
+  }
+} {11}
+do_test subselect-3.4 {
+  execsql {
+    SELECT (SELECT x FROM t3 ORDER BY x);
+  }
+} {1}
+do_test subselect-3.5 {
+  execsql {
+    SELECT (SELECT x FROM t3 ORDER BY x DESC);
+  }
+} {6}
+do_test subselect-3.6 {
+  execsql {
+    SELECT (SELECT x FROM t3 ORDER BY x LIMIT 1);
+  }
+} {1}
+do_test subselect-3.7 {
+  execsql {
+    SELECT (SELECT x FROM t3 ORDER BY x DESC LIMIT 1);
+  }
+} {6}
+do_test subselect-3.8 {
+  execsql {
+    SELECT (SELECT x FROM t3 ORDER BY x LIMIT 1 OFFSET 2);
+  }
+} {3}
+do_test subselect-3.9 {
+  execsql {
+    SELECT (SELECT x FROM t3 ORDER BY x DESC LIMIT 1 OFFSET 2);
+  }
+} {4}
+
+
+
 finish_test