diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-09-27 17:42:09 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-09-27 17:42:09 +0000 |
commit | 3f850ee9aae6fb09b92fa58235378a7d6bb83c69 (patch) | |
tree | 3bdf9b4a91ab182787bbd829023f9de331ca4424 /src/backend/parser/parse_target.c | |
parent | d77a9018faffc2eed3f163de0b55e96064eaa25f (diff) | |
download | postgresql-3f850ee9aae6fb09b92fa58235378a7d6bb83c69.tar.gz postgresql-3f850ee9aae6fb09b92fa58235378a7d6bb83c69.zip |
Fix Assert failure in ExpandColumnRefStar --- what I thought was a can't
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.
Diffstat (limited to 'src/backend/parser/parse_target.c')
-rw-r--r-- | src/backend/parser/parse_target.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index bb4b065eebb..01cd5b6305d 100644 --- 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.149 2006/10/04 00:29:56 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.149.2.1 2007/09/27 17:42:09 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); } |