aboutsummaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2002-11-10 00:10:20 +0000
committerBruce Momjian <bruce@momjian.us>2002-11-10 00:10:20 +0000
commit3eabc4490ecbf6b9845917811cf930af41aff845 (patch)
tree20c82e911d88675cbaa7ffaacaf99342d729ba8b /src/backend/parser
parentebb531836ada81958bbf95c60dd05dc58eb3e810 (diff)
downloadpostgresql-3eabc4490ecbf6b9845917811cf930af41aff845.tar.gz
postgresql-3eabc4490ecbf6b9845917811cf930af41aff845.zip
Tweak CREATE SEQUENCE grammar to be more SQL1999 standards compliant.
Neil Conway
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/gram.y20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 5fe83ac41db..1ce4cc1bfde 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; }