Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit bb8f8e6

Browse files
committed
Change LIMIT #,# error message to be more generic.
1 parent f363b31 commit bb8f8e6

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/backend/parser/gram.y

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.266 2001/10/20 02:55:39 momjian Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.267 2001/10/20 16:51:02 momjian Exp $
1515
*
1616
* HISTORY
1717
* AUTHOR DATE MAJOR EVENT
@@ -3647,18 +3647,19 @@ OptUseOp: USING all_Op { $$ = $2; }
36473647
;
36483648

36493649

3650-
select_limit: LIMIT select_offset_value ',' select_limit_value
3651-
{ elog(ERROR,"LIMIT #,# syntax no longer supported. Use LIMIT # OFFSET #."); }
3652-
| LIMIT select_limit_value OFFSET select_offset_value
3650+
select_limit: LIMIT select_limit_value OFFSET select_offset_value
36533651
{ $$ = makeList2($4, $2); }
3654-
| LIMIT select_limit_value
3655-
{ $$ = makeList2(NULL, $2); }
36563652
| OFFSET select_offset_value LIMIT select_limit_value
36573653
{ $$ = makeList2($2, $4); }
3654+
| LIMIT select_limit_value
3655+
{ $$ = makeList2(NULL, $2); }
36583656
| OFFSET select_offset_value
36593657
{ $$ = makeList2($2, NULL); }
3658+
| LIMIT select_offset_value ',' select_limit_value
3659+
{ elog(ERROR, "LIMIT #,# syntax no longer supported.\n\tUse separate LIMIT and OFFSET clauses."); }
36603660
;
36613661

3662+
36623663
opt_select_limit: select_limit { $$ = $1; }
36633664
| /* EMPTY */ { $$ = makeList2(NULL,NULL); }
36643665
;

0 commit comments

Comments
 (0)