Fix poor choice of error message in corner cases.

tglsfdc · tglsfdc · commit 3dd1ca035d4b · 2004-04-02T21:30:44.000Z
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.167 2004/04/02 19:06:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.168 2004/04/02 21:30:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1221,7 +1221,8 @@ unknown_attribute(ParseState *pstate, Node *relref, char *attname)
 {
 	RangeTblEntry *rte;
 
-	if (IsA(relref, Var))
+	if (IsA(relref, Var) &&
+		((Var *) relref)->varattno == InvalidAttrNumber)
 	{
 		/* Reference the RTE by alias not by actual table name */
 		rte = GetRTEByRangeTablePosn(pstate,

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.167 2004/04/02 19:06:58 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.168 2004/04/02 21:30:44 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1221,7 +1221,8 @@ unknown_attribute(ParseState pstate, Node relref, char *attname)`
`1221`	`1221`	`{`
`1222`	`1222`	`RangeTblEntry *rte;`
`1223`	`1223`
`1224`		`- if (IsA(relref, Var))`
	`1224`	`+ if (IsA(relref, Var) &&`
	`1225`	`+ ((Var *) relref)->varattno == InvalidAttrNumber)`
`1225`	`1226`	`{`
`1226`	`1227`	`/* Reference the RTE by alias not by actual table name */`
`1227`	`1228`	`rte = GetRTEByRangeTablePosn(pstate,`