Somehow, the variant NATIONAL CHAR [ VARYING ] was missing from the

tglsfdc · tglsfdc · commit 7cb253ed1927 · 2000-03-12T20:09:41.000Z
set of SQL-standard type names that we accept.
diff --git 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; }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.154 2000/03/12 00:39:52 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.155 2000/03/12 20:09:41 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -3947,10 +3947,11 @@ character: CHARACTER opt_varying opt_charset`
`3947`	`3947`	`};`
`3948`	`3948`	`$$ = type;`
`3949`	`3949`	`}`
`3950`		`- \| CHAR opt_varying { $$ = xlateSqlType($2? "varchar": "bpchar"); }`
	`3950`	`+ \| CHAR opt_varying { $$ = xlateSqlType($2 ? "varchar": "bpchar"); }`
`3951`	`3951`	`\| VARCHAR { $$ = xlateSqlType("varchar"); }`
`3952`		`- \| NATIONAL CHARACTER opt_varying { $$ = xlateSqlType($3? "varchar": "bpchar"); }`
`3953`		`- \| NCHAR opt_varying { $$ = xlateSqlType($2? "varchar": "bpchar"); }`
	`3952`	`+ \| NATIONAL CHARACTER opt_varying { $$ = xlateSqlType($3 ? "varchar": "bpchar"); }`
	`3953`	`+ \| NATIONAL CHAR opt_varying { $$ = xlateSqlType($3 ? "varchar": "bpchar"); }`
	`3954`	`+ \| NCHAR opt_varying { $$ = xlateSqlType($2 ? "varchar": "bpchar"); }`
`3954`	`3955`	`;`
`3955`	`3956`
`3956`	`3957`	`opt_varying: VARYING { $$ = TRUE; }`