Fix Assert failure in ExpandColumnRefStar --- what I thought was a can't

tglsfdc · tglsfdc · commit a62a359ba268 · 2007-09-27T17:42:03.000Z
happen condition can happen given incorrect input.  The real problem is that
gram.y should try harder to distinguish * from "*" --- the latter is a legal
column name per spec, and someday we ought to treat it that way.  However
fixing that is too invasive for a back-patch, and it's too late for the 8.3
cycle too.  So just reduce the Assert to a plain elog for now.  Per report
from NikhilS.
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.155 2007/09/06 17:31:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.156 2007/09/27 17:42:03 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -826,9 +826,12 @@ ExpandColumnRefStar(ParseState *pstate, ColumnRef *cref,
 		 * (e.g., SELECT * FROM emp, dept)
 		 *
 		 * Since the grammar only accepts bare '*' at top level of SELECT, we
-		 * need not handle the targetlist==false case here.
+		 * need not handle the targetlist==false case here.  However, we must
+		 * test for it because the grammar currently fails to distinguish
+		 * a quoted name "*" from a real asterisk.
 		 */
-		Assert(targetlist);
+		if (!targetlist)
+			elog(ERROR, "invalid use of *");
 
 		return ExpandAllTables(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_target.c,v 1.155 2007/09/06 17:31:58 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.156 2007/09/27 17:42:03 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -826,9 +826,12 @@ ExpandColumnRefStar(ParseState pstate, ColumnRef cref,`
`826`	`826`	`* (e.g., SELECT * FROM emp, dept)`
`827`	`827`	`*`
`828`	`828`	`* Since the grammar only accepts bare '*' at top level of SELECT, we`
`829`		`- * need not handle the targetlist==false case here.`
	`829`	`+ * need not handle the targetlist==false case here. However, we must`
	`830`	`+ * test for it because the grammar currently fails to distinguish`
	`831`	`+ * a quoted name "*" from a real asterisk.`
`830`	`832`	`*/`
`831`		`- Assert(targetlist);`
	`833`	`+ if (!targetlist)`
	`834`	`+ elog(ERROR, "invalid use of *");`
`832`	`835`
`833`	`836`	`return ExpandAllTables(pstate);`
`834`	`837`	`}`