Fix the parsing of the LIMIT clause when the limit and offset are separated

by a comma.  The offset comes before the limit in that case. Ticket #245. (CVS 872)

FossilOrigin-Name: 6ef91a364b2922f078b7de81816bca3f2ca0fe46

diff --git a/manifest b/manifest
index d94aad72b8596ef725fe1858f91af914a9dda1ee..c1d41288e6ee218bc4a9898a8c63e12f5b9e9cd5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s2.8.0\s(CVS\s870)
-D 2003-02-16T22:49:48
+C Fix\sthe\sparsing\sof\sthe\sLIMIT\sclause\swhen\sthe\slimit\sand\soffset\sare\sseparated\nby\sa\scomma.\s\sThe\soffset\scomes\sbefore\sthe\slimit\sin\sthat\scase.\sTicket\s#245.\s(CVS\s872)
+D 2003-02-20T00:44:52
 F Makefile.in 6606854b1512f185b8e8c779b8d7fc2750463d64
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -35,7 +35,7 @@ F src/os.c b12203e1cc4f3be170d312f624df8cc6e0d1e4d2
 F src/os.h afa3e096213bad86845f8bdca81a9e917505e401
 F src/pager.c 47509f6b2dbf1cba46e52602c1dacf04f9d66e10
 F src/pager.h e5b8e301a732007766dc04880c764d7ee1aa34dd
-F src/parse.y cdaed5009423d851708848bd279147c268e6022e
+F src/parse.y 4c4b2ff3d20d4a2afb51f05ac18edde20a173abe
 F src/printf.c f8fd911a8738f9b2eb07aca2870473d34707055d
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c d12d4c12d6536deccdede90b482d24f0590f5dc8
@@ -79,7 +79,7 @@ F test/insert2.test c288375a64dad3295044714f0dfed4a193cf067f
 F test/intpkey.test e0e283b0cbeaa97eeee183e1cdb91fa73d720866
 F test/ioerr.test 45c8feebe608d7f456fea27ff27a0aaaf0b9c636
 F test/join.test 178b25dc3c5be6cbdd195b904e66bee62475d0bf
-F test/limit.test 9f26f874bc765df5b3f5c92d26d1b12eac6d4cf9
+F test/limit.test 9ffb965a0f5bf7152187ef3d8d1249b96e5620bf
 F test/lock.test 388a3a10962d2d571c0c1821cc35bf069ee73473
 F test/main.test c66b564554b770ee7fdbf6a66c0cd90329bc2c85
 F test/malloc.test 7ba32a9ebd3aeed52ae4aaa6d42ca37e444536fd
@@ -155,7 +155,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 8192c937d524fef703d7ba2eb608c3d74e20440f
-R b51128b47f94629659cb0a963e38da71
+P 5db98b3f4048fc8cd28d8fd225f2b0221ccf1d17
+R 8776043362c8c9062e2ce89efb27c5e7
 U drh
-Z 991ba419e8e6de043b838f542dfeabad
+Z 7efa93af63d1c797dd26115959a7737f

diff --git a/manifest.uuid b/manifest.uuid
index 8d8210ab1dfb7cdcc9ae4457448b29ee0aa61ef0..5fefcee8166100908b4219fb1b9912d7ed497b1a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5db98b3f4048fc8cd28d8fd225f2b0221ccf1d17
\ No newline at end of file
+6ef91a364b2922f078b7de81816bca3f2ca0fe46
\ No newline at end of file

diff --git a/src/parse.y b/src/parse.y
index e9dd9819e38d56ded0d468d360b087cece538820..e38522ec18801d4a20668743c5088979e0946d4d 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.90 2003/01/29 18:46:53 drh Exp $
+** @(#) $Id: parse.y,v 1.91 2003/02/20 00:44:52 drh Exp $
 */
 %token_prefix TK_
 %token_type {Token}
@@ -440,10 +440,10 @@ having_opt(A) ::= HAVING expr(X).  {A = X;}
 %type limit_opt {struct LimitVal}
 limit_opt(A) ::= .                  {A.limit = -1; A.offset = 0;}
 limit_opt(A) ::= LIMIT INTEGER(X).  {A.limit = atoi(X.z); A.offset = 0;}
-limit_opt(A) ::= LIMIT INTEGER(X) limit_sep INTEGER(Y). 
+limit_opt(A) ::= LIMIT INTEGER(X) OFFSET INTEGER(Y). 
                                     {A.limit = atoi(X.z); A.offset = atoi(Y.z);}
-limit_sep ::= OFFSET.
-limit_sep ::= COMMA.
+limit_opt(A) ::= LIMIT INTEGER(X) COMMA INTEGER(Y). 
+                                    {A.limit = atoi(Y.z); A.offset = atoi(X.z);}
 
 /////////////////////////// The DELETE statement /////////////////////////////
 //

diff --git a/test/limit.test b/test/limit.test
index c7e93d783e1b8c29ae8f08d81e4a8abb3f62a046..b07f644da3045f31f550d311b924b62c228cafb4 100644 (file)
--- a/test/limit.test
+++ b/test/limit.test
@@ -12,7 +12,7 @@
 # focus of this file is testing the LIMIT ... OFFSET ... clause
 #  of SELECT statements.
 #
-# $Id: limit.test,v 1.6 2002/09/08 17:23:45 drh Exp $
+# $Id: limit.test,v 1.7 2003/02/20 00:44:53 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -37,15 +37,24 @@ do_test limit-1.0 {
 do_test limit-1.1 {
   execsql {SELECT count(*) FROM t1 LIMIT  5}
 } {32}
-do_test limit-1.2 {
+do_test limit-1.2.1 {
   execsql {SELECT x FROM t1 ORDER BY x LIMIT 5}
 } {0 1 2 3 4}
+do_test limit-1.2.2 {
+  execsql {SELECT x FROM t1 ORDER BY x LIMIT 5 OFFSET 2}
+} {2 3 4 5 6}
+do_test limit-1.2.3 {
+  execsql {SELECT x FROM t1 ORDER BY x LIMIT 2, 5}
+} {2 3 4 5 6}
 do_test limit-1.3 {
   execsql {SELECT x FROM t1 ORDER BY x LIMIT 5 OFFSET 5}
 } {5 6 7 8 9}
-do_test limit-1.4 {
+do_test limit-1.4.1 {
   execsql {SELECT x FROM t1 ORDER BY x LIMIT 50 OFFSET 30}
 } {30 31}
+do_test limit-1.4.2 {
+  execsql {SELECT x FROM t1 ORDER BY x LIMIT 30, 50}
+} {30 31}
 do_test limit-1.5 {
   execsql {SELECT x FROM t1 ORDER BY x LIMIT 50 OFFSET 50}
 } {}