diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/preproc/keywords.c | 3 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c index 5792017871b..0a5ba188de0 100644 --- a/src/interfaces/ecpg/preproc/keywords.c +++ b/src/interfaces/ecpg/preproc/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.42 2001/07/16 05:07:00 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.43 2001/08/16 20:38:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -227,7 +227,6 @@ static ScanKeyword ScanKeywords[] = { {"second", SECOND_P}, {"select", SELECT}, {"sequence", SEQUENCE}, - {"serial", SERIAL}, {"serializable", SERIALIZABLE}, {"session", SESSION}, {"session_user", SESSION_USER}, diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 83c901bf3a0..dbacf87da80 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -223,7 +223,7 @@ make_name(void) MINVALUE, MODE, MOVE, NEW, NOCREATEDB, NOCREATEUSER, NONE, NOTHING, NOTIFY, NOTNULL, OFFSET, OIDS, OPERATOR, OWNER, PASSWORD, PROCEDURAL, REINDEX, RENAME, RESET, - RETURNS, ROW, RULE, SEQUENCE, SERIAL, SETOF, SHARE, + RETURNS, ROW, RULE, SEQUENCE, SETOF, SHARE, SHOW, START, STATEMENT, STATISTICS, STDIN, STDOUT, SYSID TEMP, TEMPLATE, TOAST, TRUNCATE, TRUSTED, UNLISTEN, UNTIL, VACUUM, VALID, VERBOSE, VERSION @@ -1107,15 +1107,6 @@ columnDef: ColId Typename ColQualList opt_collate } $$ = cat_str(4, $1, $2, $3, $4); } - | ColId SERIAL ColQualList opt_collate - { - if (strlen($4) > 0) - { - sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4); - mmerror(ET_NOTICE, errortext); - } - $$ = cat_str(4, $1, make_str(" serial "), $3, $4); - } ; ColQualList: ColQualList ColConstraint { $$ = cat2_str($1,$2); } @@ -5106,7 +5097,6 @@ ECPGColId: ident { $$ = $1; } | NATIONAL { $$ = make_str("national"); } | NONE { $$ = make_str("none"); } | PATH_P { $$ = make_str("path_p"); } - | SERIAL { $$ = make_str("serial"); } | TIME { $$ = make_str("time"); } | TIMESTAMP { $$ = make_str("timestamp"); } | ECPGKeywords { $$ = $1; } |