diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-03-12 20:09:41 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-03-12 20:09:41 +0000 |
| commit | 7cb253ed1927eabe9d5d30440536995790238784 (patch) | |
| tree | 5a1c8c9c6f538ede664a2788f75639a8ab925a57 /src | |
| parent | 1879175b18211962984e6ff0f3cba344c386b11c (diff) | |
| download | postgresql-7cb253ed1927eabe9d5d30440536995790238784.tar.gz postgresql-7cb253ed1927eabe9d5d30440536995790238784.zip | |
Somehow, the variant NATIONAL CHAR [ VARYING ] was missing from the
set of SQL-standard type names that we accept.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/gram.y | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index fede1f901e8..ab69eb4794f 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.154 2000/03/12 00:39:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.155 2000/03/12 20:09:41 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -3947,10 +3947,11 @@ character: CHARACTER opt_varying opt_charset }; $$ = type; } - | CHAR opt_varying { $$ = xlateSqlType($2? "varchar": "bpchar"); } + | CHAR opt_varying { $$ = xlateSqlType($2 ? "varchar": "bpchar"); } | VARCHAR { $$ = xlateSqlType("varchar"); } - | NATIONAL CHARACTER opt_varying { $$ = xlateSqlType($3? "varchar": "bpchar"); } - | NCHAR opt_varying { $$ = xlateSqlType($2? "varchar": "bpchar"); } + | NATIONAL CHARACTER opt_varying { $$ = xlateSqlType($3 ? "varchar": "bpchar"); } + | NATIONAL CHAR opt_varying { $$ = xlateSqlType($3 ? "varchar": "bpchar"); } + | NCHAR opt_varying { $$ = xlateSqlType($2 ? "varchar": "bpchar"); } ; opt_varying: VARYING { $$ = TRUE; } |