diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 3db79850c8..4e36dfbe77 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -1,5 +1,5 @@
@@ -21,9 +21,9 @@ PostgreSQL documentation
1999-07-20
-CREATE [ TEMPORARY | TEMP ] SEQUENCE seqname [ INCREMENT increment ]
+CREATE [ TEMPORARY | TEMP ] SEQUENCE seqname [ INCREMENT [ BY ] increment ]
[ MINVALUE minvalue ] [ MAXVALUE maxvalue ]
- [ START start ] [ CACHE cache ] [ CYCLE ]
+ [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]
@@ -130,8 +130,8 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE seqnameCYCLE
- The optional CYCLE keyword may be used to enable the sequence
- to wrap around when the
+ The optional keyword may be used to enable
+ the sequence to wrap around when the
maxvalue or
minvalue has been
reached by
@@ -140,11 +140,22 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE seqnameminvalue or
maxvalue,
respectively.
- Without CYCLE, after the limit is reached nextval> calls
- will return an error.
+
+
+ NO CYCLE
+
+
+ If the optional keyword is specified, any
+ calls to nextval after the sequence has reached
+ its maximum value will return an error. If neither
+ or are specified,
+ is the default.
+
+
+
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index f6ace0d2d9..31fb270c63 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.88 2002/09/22 19:42:50 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.89 2002/11/10 00:10:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -798,11 +798,7 @@ init_params(CreateSeqStmt *seq, Form_pg_sequence new)
else if (strcmp(defel->defname, "cache") == 0)
cache_value = defel;
else if (strcmp(defel->defname, "cycle") == 0)
- {
- if (defel->arg != (Node *) NULL)
- elog(ERROR, "DefineSequence: CYCLE ??");
- new->is_cycled = true;
- }
+ new->is_cycled = (defel->arg != NULL);
else
elog(ERROR, "DefineSequence: option \"%s\" not recognized",
defel->defname);
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 5fe83ac41d..1ce4cc1bfd 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.374 2002/11/09 23:56:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.375 2002/11/10 00:10:20 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -1893,11 +1893,15 @@ OptSeqElem: CACHE NumericOnly
}
| CYCLE
{
- $$ = makeDefElem("cycle", (Node *)NULL);
+ $$ = makeDefElem("cycle", (Node *)true);
}
- | INCREMENT NumericOnly
+ | NO CYCLE
{
- $$ = makeDefElem("increment", (Node *)$2);
+ $$ = makeDefElem("cycle", (Node *)false);
+ }
+ | INCREMENT opt_by NumericOnly
+ {
+ $$ = makeDefElem("increment", (Node *)$3);
}
| MAXVALUE NumericOnly
{
@@ -1907,12 +1911,16 @@ OptSeqElem: CACHE NumericOnly
{
$$ = makeDefElem("minvalue", (Node *)$2);
}
- | START NumericOnly
+ | START opt_with NumericOnly
{
- $$ = makeDefElem("start", (Node *)$2);
+ $$ = makeDefElem("start", (Node *)$3);
}
;
+opt_by: BY {}
+ | /* empty */ {}
+ ;
+
NumericOnly:
FloatOnly { $$ = $1; }
| IntegerOnly { $$ = $1; }