From e18c912acfe1345d2626eeca0399cddc5c75e98d Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Fri, 7 May 1999 18:03:37 +0000
Subject: [PATCH] *** empty log message ***

---
 src/interfaces/ecpg/ChangeLog         | 5 +++++
 src/interfaces/ecpg/preproc/preproc.y | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 3f58d45c567..732b8bef8e0 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -569,6 +569,11 @@ Sat Apr 24 12:39:07 CEST 1999
 	- Synced preproc.y with gram.y.
 	- Allow more than one blank between EXEC and SQL.
 	- Allow statements to be prepared from a character string, too.
+
+Fri Mai  7 07:11:38 CEST 1999
+
+	- Synced preproc.y with gram.y.
+	- Fixed small bug in parser.
 	- Set library version to 3.0.0
 	- Set ecpg version to 2.6.0
 
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 84984acf943..a37889553d7 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -3241,16 +3241,16 @@ Typename:  Array opt_array_bounds
 				{
 					$$ = cat2_str($1, $2.str);
 				}
-		| Character	{ $$ = $1; }
 		| SETOF Array
 				{
 					$$ = cat2_str(make1_str("setof"), $2);
 				}
 		;
 
-Array:  Generic
+Array:  Generic			{ $$ = $1; }
 		| Datetime	{ $$ = $1; }
 		| Numeric	{ $$ = $1; }
+		| Character	{ $$ = $1; }
 		;
 
 Generic:  generic
-- 
GitLab