diff -cr ../cvs-pgsql/src/backend/catalog/information_schema.sql ./src/backend/catalog/information_schema.sql
*** ../cvs-pgsql/src/backend/catalog/information_schema.sql	Wed Nov 12 21:14:46 2003
--- ./src/backend/catalog/information_schema.sql	Mon Dec  1 17:25:59 2003
***************
*** 1651,1657 ****
             CAST(null AS cardinal_number) AS maximum_cardinality,
             CAST('a' || x.objdtdid AS sql_identifier) AS dtd_identifier
  
!     FROM pg_namespace n, pg_type at, pg_namespace nbt, pg_type bt,
           (
             /* columns */
             SELECT c.relnamespace, CAST(c.relname AS sql_identifier),
--- 1651,1657 ----
             CAST(null AS cardinal_number) AS maximum_cardinality,
             CAST('a' || x.objdtdid AS sql_identifier) AS dtd_identifier
  
!     FROM pg_namespace n, pg_type aty, pg_namespace nbt, pg_type bt,
           (
             /* columns */
             SELECT c.relnamespace, CAST(c.relname AS sql_identifier),
***************
*** 1687,1695 ****
           ) AS x (objschema, objname, objtype, objdtdid, objtypeid)
  
      WHERE n.oid = x.objschema
!           AND at.oid = x.objtypeid
!           AND (at.typelem <> 0 AND at.typlen = -1)
!           AND at.typelem = bt.oid
            AND nbt.oid = bt.typnamespace
  
            AND (n.nspname, x.objname, x.objtype, x.objdtdid) IN
--- 1687,1695 ----
           ) AS x (objschema, objname, objtype, objdtdid, objtypeid)
  
      WHERE n.oid = x.objschema
!           AND aty.oid = x.objtypeid
!           AND (aty.typelem <> 0 AND aty.typlen = -1)
!           AND aty.typelem = bt.oid
            AND nbt.oid = bt.typnamespace
  
            AND (n.nspname, x.objname, x.objtype, x.objdtdid) IN
diff -cr ../cvs-pgsql/src/backend/parser/gram.y ./src/backend/parser/gram.y
*** ../cvs-pgsql/src/backend/parser/gram.y	Tue Nov 25 20:13:01 2003
--- ./src/backend/parser/gram.y	Mon Dec  1 20:36:11 2003
***************
*** 7022,7027 ****
--- 7022,7034 ----
  					$$->indirection = NIL;
  					$$->val = (Node *)$1;
  				}
+ 			| c_expr ColId
+ 				{
+ 					$$ = makeNode(ResTarget);
+ 					$$->name = $2;
+ 					$$->indirection = NIL;
+ 					$$->val = (Node *)$1;
+ 				}
  			| '*'
  				{
  					ColumnRef *n = makeNode(ColumnRef);
***************
*** 7334,7340 ****
  			| ALTER
  			| ASSERTION
  			| ASSIGNMENT
- 			| AT
  			| BACKWARD
  			| BEFORE
  			| BEGIN_P
--- 7341,7346 ----
***************
*** 7359,7365 ****
  			| CURSOR
  			| CYCLE
  			| DATABASE
- 			| DAY_P
  			| DEALLOCATE
  			| DECLARE
  			| DEFAULTS
--- 7365,7370 ----
***************
*** 7388,7394 ****
  			| GLOBAL
  			| HANDLER
  			| HOLD
- 			| HOUR_P
  			| IMMEDIATE
  			| IMMUTABLE
  			| IMPLICIT_P
--- 7393,7398 ----
***************
*** 7416,7425 ****
  			| LOCK_P
  			| MATCH
  			| MAXVALUE
- 			| MINUTE_P
  			| MINVALUE
  			| MODE
- 			| MONTH_P
  			| MOVE
  			| NAMES
  			| NATIONAL
--- 7420,7427 ----
***************
*** 7432,7438 ****
  			| OBJECT_P
  			| OF
  			| OIDS
- 			| OPERATOR
  			| OPTION
  			| OUT_P
  			| OWNER
--- 7434,7439 ----
***************
*** 7440,7446 ****
  			| PASSWORD
  			| PATH_P
  			| PENDANT
- 			| PRECISION
  			| PREPARE
  			| PRESERVE
  			| PRIOR
--- 7441,7446 ----
***************
*** 7464,7470 ****
  			| RULE
  			| SCHEMA
  			| SCROLL
- 			| SECOND_P
  			| SECURITY
  			| SEQUENCE
  			| SERIALIZABLE
--- 7464,7469 ----
***************
*** 7506,7516 ****
  			| VERSION
  			| VIEW
  			| VOLATILE
- 			| WITH
- 			| WITHOUT
  			| WORK
  			| WRITE
- 			| YEAR_P
  			| ZONE
  		;
  
--- 7505,7512 ----
***************
*** 7526,7535 ****
   */
  col_name_keyword:
  			  BIGINT
- 			| BIT
  			| BOOLEAN_P
- 			| CHAR_P
- 			| CHARACTER
  			| COALESCE
  			| CONVERT
  			| DEC
--- 7522,7528 ----
***************
*** 7540,7546 ****
  			| INT_P
  			| INTEGER
  			| INTERVAL
- 			| NCHAR
  			| NONE
  			| NULLIF
  			| NUMERIC
--- 7533,7538 ----
***************
*** 7569,7580 ****
   * - thomas 2000-11-28
   */
  func_name_keyword:
! 			  AUTHORIZATION
  			| BETWEEN
  			| BINARY
  			| CROSS
  			| FREEZE
  			| FULL
  			| ILIKE
  			| IN_P
  			| INNER_P
--- 7561,7575 ----
   * - thomas 2000-11-28
   */
  func_name_keyword:
! 			  AT
! 			| AUTHORIZATION
  			| BETWEEN
  			| BINARY
  			| CROSS
+ 			| DAY_P
  			| FREEZE
  			| FULL
+ 			| HOUR_P
  			| ILIKE
  			| IN_P
  			| INNER_P
***************
*** 7583,7595 ****
--- 7578,7598 ----
  			| JOIN
  			| LEFT
  			| LIKE
+ 			| MINUTE_P
+ 			| MONTH_P
  			| NATURAL
  			| NOTNULL
+ 			| OPERATOR
  			| OUTER_P
  			| OVERLAPS
+ 			| PRECISION
  			| RIGHT
+ 			| SECOND_P
  			| SIMILAR
  			| VERBOSE
+ 			| WITH
+ 			| WITHOUT
+ 			| YEAR_P
  		;
  
  /* Reserved keyword --- these keywords are usable only as a ColLabel.
***************
*** 7607,7615 ****
--- 7610,7621 ----
  			| ARRAY
  			| AS
  			| ASC
+ 			| BIT
  			| BOTH
  			| CASE
  			| CAST
+ 			| CHAR_P
+ 			| CHARACTER
  			| CHECK
  			| COLLATE
  			| COLUMN
***************
*** 7641,7646 ****
--- 7647,7653 ----
  			| LIMIT
  			| LOCALTIME
  			| LOCALTIMESTAMP
+ 			| NCHAR
  			| NEW
  			| NOT
  			| NULL_P