*** pgsql/src/backend/parser/parse_relation.c	2005/05/29 17:10:35	1.102.4.1
--- pgsql/src/backend/parser/parse_relation.c	2008/04/05 01:58:51	1.102.4.2
***************
*** 8,14 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.102 2004/12/31 22:00:27 pgsql Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 8,14 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.102.4.1 2005/05/29 17:10:35 tgl Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** addRangeTableEntryForJoin(ParseState *ps
*** 1114,1119 ****
--- 1114,1129 ----
  	Alias	   *eref;
  	int			numaliases;
  
+ 	/*
+ 	 * Fail if join has too many columns --- we must be able to reference
+ 	 * any of the columns with an AttrNumber.
+ 	 */
+ 	if (list_length(aliasvars) > MaxAttrNumber)
+ 		ereport(ERROR,
+ 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+ 				 errmsg("joins can have at most %d columns",
+ 						MaxAttrNumber)));
+ 
  	rte->rtekind = RTE_JOIN;
  	rte->relid = InvalidOid;
  	rte->subquery = NULL;