database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

get_relid_attribute_name is dead, long live get_attname

Browse Source 
The modern way is to use a missing_ok argument instead of two separate
almost-identical routines, so do that.

Author: Michaël Paquier
Reviewed-by: Álvaro Herrera
Discussion: https://postgr.es/m/20180201063212.GE6398@paquier.xyz
This commit is contained in:
Alvaro Herrera
2018-02-12 19:30:30 -03:00
parent 88ef48c1cc
commit 8237f27b50
11 changed files with 40 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/postgres_fdw/deparse.c
View File

@ -2176,7 +2176,7 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root,
* FDW option, use attribute name.
*/
if (colname == NULL)
colname = get_relid_attribute_name(rte->relid, varattno);
colname = get_attname(rte->relid, varattno, false);
if (qualify_col)
ADD_REL_QUALIFIER(buf, varno);

2
contrib/postgres_fdw/postgres_fdw.c
View File

@ -5545,7 +5545,7 @@ conversion_error_callback(void *arg)
if (var->varattno == 0)
is_wholerow = true;
else
attname = get_relid_attribute_name(rte->relid, var->varattno);
attname = get_attname(rte->relid, var->varattno, false);
relname = get_rel_name(rte->relid);
}

5
contrib/sepgsql/dml.c
View File

@ -118,10 +118,7 @@ fixup_inherited_columns(Oid parentId, Oid childId, Bitmapset *columns)
continue;
}
attname = get_attname(parentId, attno);
if (!attname)
elog(ERROR, "cache lookup failed for attribute %d of relation %u",
attno, parentId);
attname = get_attname(parentId, attno, false);
attno = get_attnum(childId, attname);
if (attno == InvalidAttrNumber)
elog(ERROR, "cache lookup failed for attribute %s of relation %u",