diff options
Diffstat (limited to 'src/backend/catalog/namespace.c')
| -rw-r--r-- | src/backend/catalog/namespace.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index c6db3d16b92..7f0ea88c438 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.109 2008/07/16 16:55:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.110 2008/08/30 01:39:13 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2189,6 +2189,9 @@ makeRangeVarFromNameList(List *names) * * This is used primarily to form error messages, and so we do not quote * the list elements, for the sake of legibility. + * + * In most scenarios the list elements should always be Value strings, + * but we also allow A_Star for the convenience of ColumnRef processing. */ char * NameListToString(List *names) @@ -2200,9 +2203,18 @@ NameListToString(List *names) foreach(l, names) { + Node *name = (Node *) lfirst(l); + if (l != list_head(names)) appendStringInfoChar(&string, '.'); - appendStringInfoString(&string, strVal(lfirst(l))); + + if (IsA(name, String)) + appendStringInfoString(&string, strVal(name)); + else if (IsA(name, A_Star)) + appendStringInfoString(&string, "*"); + else + elog(ERROR, "unexpected node type in name list: %d", + (int) nodeTag(name)); } return string.data; |