Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf363b31

Browse files
committed
Remove LIMIT #,# and suggest LIMIT # OFFSET #, per mailing list discussion.
1 parent424d938 commitf363b31

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

‎HISTORY

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ Migration to 7.2
3838

3939
A dump/restore using pg_dump is required for those wishing to migrate
4040
data from any previous release. One significant change is that
41-
SELECT ... LIMIT 10,20 now uses the 10 as the OFFSET and the 20 as
42-
the LIMIT. Previous versions had this reversed. This change was
43-
made for MySQL compatibility.
41+
the SELECT ... LIMIT 10,20 syntax is no longer supported. You must
42+
now use LIMIT 10 OFFSET 20 to accomplish the same thing.
4443

4544

4645

‎doc/src/sgml/ref/select.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.47 2001/09/23 03:39:01 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.48 2001/10/20 02:55:38 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -29,7 +29,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="PARAMETER">expression</replac
2929
[ { UNION | INTERSECT | EXCEPT [ ALL ] } <replaceable class="PARAMETER">select</replaceable> ]
3030
[ ORDER BY <replaceable class="PARAMETER">expression</replaceable> [ ASC | DESC | USING <replaceable class="PARAMETER">operator</replaceable> ] [, ...] ]
3131
[ FOR UPDATE [ OF <replaceable class="PARAMETER">tablename</replaceable> [, ...] ] ]
32-
[ LIMIT[ <replaceable class="PARAMETER">start</replaceable> , ]{ <replaceable class="PARAMETER">count</replaceable> | ALL } ]
32+
[ LIMIT { <replaceable class="PARAMETER">count</replaceable> | ALL } ]
3333
[ OFFSET <replaceable class="PARAMETER">start</replaceable> ]
3434

3535
where <replaceable class="PARAMETER">from_item</replaceable> can be:
@@ -614,7 +614,7 @@ SELECT name FROM distributors ORDER BY code;
614614
<synopsis>
615615
<replaceable class="PARAMETER">table_query</replaceable> UNION [ ALL ] <replaceable class="PARAMETER">table_query</replaceable>
616616
[ ORDER BY <replaceable class="PARAMETER">expression</replaceable> [ ASC | DESC | USING <replaceable class="PARAMETER">operator</replaceable> ] [, ...] ]
617-
[ LIMIT[ <replaceable class="PARAMETER">start</replaceable> , ]{ <replaceable class="PARAMETER">count</replaceable> | ALL } ]
617+
[ LIMIT { <replaceable class="PARAMETER">count</replaceable> | ALL } ]
618618
[ OFFSET <replaceable class="PARAMETER">start</replaceable> ]
619619
</synopsis>
620620

@@ -664,7 +664,7 @@ SELECT name FROM distributors ORDER BY code;
664664
<synopsis>
665665
<replaceable class="PARAMETER">table_query</replaceable> INTERSECT [ ALL ] <replaceable class="PARAMETER">table_query</replaceable>
666666
[ ORDER BY <replaceable class="PARAMETER">expression</replaceable> [ ASC | DESC | USING <replaceable class="PARAMETER">operator</replaceable> ] [, ...] ]
667-
[ LIMIT[ <replaceable class="PARAMETER">start</replaceable> , ]{ <replaceable class="PARAMETER">count</replaceable> | ALL } ]
667+
[ LIMIT { <replaceable class="PARAMETER">count</replaceable> | ALL } ]
668668
[ OFFSET <replaceable class="PARAMETER">start</replaceable> ]
669669
</synopsis>
670670

@@ -705,7 +705,7 @@ SELECT name FROM distributors ORDER BY code;
705705
<synopsis>
706706
<replaceable class="PARAMETER">table_query</replaceable> EXCEPT [ ALL ] <replaceable class="PARAMETER">table_query</replaceable>
707707
[ ORDER BY <replaceable class="PARAMETER">expression</replaceable> [ ASC | DESC | USING <replaceable class="PARAMETER">operator</replaceable> ] [, ...] ]
708-
[ LIMIT[ <replaceable class="PARAMETER">start</replaceable> , ]{ <replaceable class="PARAMETER">count</replaceable> | ALL } ]
708+
[ LIMIT { <replaceable class="PARAMETER">count</replaceable> | ALL } ]
709709
[ OFFSET <replaceable class="PARAMETER">start</replaceable> ]
710710
</synopsis>
711711

@@ -742,7 +742,7 @@ SELECT name FROM distributors ORDER BY code;
742742
</title>
743743
<para>
744744
<synopsis>
745-
LIMIT[ <replaceable class="PARAMETER">start</replaceable> , ]{ <replaceable class="PARAMETER">count</replaceable> | ALL }
745+
LIMIT { <replaceable class="PARAMETER">count</replaceable> | ALL }
746746
OFFSET <replaceable class="PARAMETER">start</replaceable>
747747
</synopsis>
748748

‎doc/src/sgml/sql.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.22 2001/09/23 03:39:01 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.23 2001/10/20 02:55:38 momjian Exp $
33
-->
44

55
<chapter id="sql">
@@ -864,7 +864,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="PARAMETER">expression</replac
864864
[ { UNION | INTERSECT | EXCEPT [ ALL ] } <replaceable class="PARAMETER">select</replaceable> ]
865865
[ ORDER BY <replaceable class="PARAMETER">expression</replaceable> [ ASC | DESC | USING <replaceable class="PARAMETER">operator</replaceable> ] [, ...] ]
866866
[ FOR UPDATE [ OF <replaceable class="PARAMETER">class_name</replaceable> [, ...] ] ]
867-
[ LIMIT[ <replaceable class="PARAMETER">start</replaceable> , ]{ <replaceable class="PARAMETER">count</replaceable> | ALL } ]
867+
[ LIMIT { <replaceable class="PARAMETER">count</replaceable> | ALL } ]
868868
[ OFFSET <replaceable class="PARAMETER">start</replaceable> ]
869869
</synopsis>
870870
</para>

‎src/backend/parser/gram.y

Lines changed: 2 additions & 2 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.265 2001/10/2001:02:14 thomas Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.266 2001/10/20 02:55:39 momjian Exp $
1515
*
1616
* HISTORY
1717
* AUTHORDATEMAJOR EVENT
@@ -3648,7 +3648,7 @@ OptUseOp: USING all_Op{ $$ = $2; }
36483648

36493649

36503650
select_limit:LIMITselect_offset_value','select_limit_value
3651-
{$$ = makeList2($2,$4); }
3651+
{elog(ERROR,"LIMIT #,# syntax no longer supported. Use LIMIT # OFFSET #."); }
36523652
|LIMITselect_limit_valueOFFSETselect_offset_value
36533653
{$$ = makeList2($4,$2); }
36543654
|LIMITselect_limit_value

‎src/test/regress/expected/limit.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ SELECT ''::text AS five, unique1, unique2, stringu1
9898

9999
SELECT ''::text AS five, unique1, unique2, stringu1
100100
FROM onek
101-
ORDER BY unique1 LIMIT900, 5;
101+
ORDER BY unique1 LIMIT5 OFFSET 900;
102102
five | unique1 | unique2 | stringu1
103103
------+---------+---------+----------
104104
| 900 | 913 | QIAAAA

‎src/test/regress/sql/limit.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ SELECT ''::text AS five, unique1, unique2, stringu1
2929
ORDER BY unique1 OFFSET990LIMIT5;
3030
SELECT''::textAS five, unique1, unique2, stringu1
3131
FROM onek
32-
ORDER BY unique1LIMIT900,5;
32+
ORDER BY unique1LIMIT5 OFFSET900;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp