diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-10-20 02:55:39 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-10-20 02:55:39 +0000 |
| commit | f363b3177d6b50c987c2028fde610e25026be416 (patch) | |
| tree | f59975efa055d245a4160c439c8f6845e0eebb65 /src | |
| parent | 424d9389d61997266aa17dec7ac8247a2459fdef (diff) | |
| download | postgresql-f363b3177d6b50c987c2028fde610e25026be416.tar.gz postgresql-f363b3177d6b50c987c2028fde610e25026be416.zip | |
Remove LIMIT #,# and suggest LIMIT # OFFSET #, per mailing list discussion.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/gram.y | 4 | ||||
| -rw-r--r-- | src/test/regress/expected/limit.out | 2 | ||||
| -rw-r--r-- | src/test/regress/sql/limit.sql | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 4f5f5d6b7e8..0db5bcd7141 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.265 2001/10/20 01:02:14 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.266 2001/10/20 02:55:39 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -3648,7 +3648,7 @@ OptUseOp: USING all_Op { $$ = $2; } select_limit: LIMIT select_offset_value ',' select_limit_value - { $$ = makeList2($2, $4); } + { elog(ERROR,"LIMIT #,# syntax no longer supported. Use LIMIT # OFFSET #."); } | LIMIT select_limit_value OFFSET select_offset_value { $$ = makeList2($4, $2); } | LIMIT select_limit_value diff --git a/src/test/regress/expected/limit.out b/src/test/regress/expected/limit.out index c99e0941567..f960958b2f6 100644 --- a/src/test/regress/expected/limit.out +++ b/src/test/regress/expected/limit.out @@ -98,7 +98,7 @@ SELECT ''::text AS five, unique1, unique2, stringu1 SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek - ORDER BY unique1 LIMIT 900, 5; + ORDER BY unique1 LIMIT 5 OFFSET 900; five | unique1 | unique2 | stringu1 ------+---------+---------+---------- | 900 | 913 | QIAAAA diff --git a/src/test/regress/sql/limit.sql b/src/test/regress/sql/limit.sql index 99842af2f6a..c15a486aff9 100644 --- a/src/test/regress/sql/limit.sql +++ b/src/test/regress/sql/limit.sql @@ -29,4 +29,4 @@ SELECT ''::text AS five, unique1, unique2, stringu1 ORDER BY unique1 OFFSET 990 LIMIT 5; SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek - ORDER BY unique1 LIMIT 900, 5; + ORDER BY unique1 LIMIT 5 OFFSET 900; |