Commit aabdd309 authored by Bruce Momjian's avatar Bruce Momjian

Remove un-needed references to Name.

parent a6ca6525
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.17 1998/07/19 05:49:18 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.18 1998/07/20 11:17:10 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.21 1998/07/12 21:29:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.22 1998/07/20 11:17:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1286,7 +1286,6 @@ ParseComplexProjection(ParseState *pstate, ...@@ -1286,7 +1286,6 @@ ParseComplexProjection(ParseState *pstate,
{ {
Oid argtype; Oid argtype;
Oid argrelid; Oid argrelid;
Name relname;
Relation rd; Relation rd;
Oid relid; Oid relid;
int attnum; int attnum;
...@@ -1317,7 +1316,6 @@ ParseComplexProjection(ParseState *pstate, ...@@ -1317,7 +1316,6 @@ ParseComplexProjection(ParseState *pstate,
if (RelationIsValid(rd)) if (RelationIsValid(rd))
{ {
relid = RelationGetRelationId(rd); relid = RelationGetRelationId(rd);
relname = RelationGetRelationName(rd);
heap_close(rd); heap_close(rd);
} }
if (RelationIsValid(rd)) if (RelationIsValid(rd))
...@@ -1376,7 +1374,6 @@ ParseComplexProjection(ParseState *pstate, ...@@ -1376,7 +1374,6 @@ ParseComplexProjection(ParseState *pstate,
if (RelationIsValid(rd)) if (RelationIsValid(rd))
{ {
relid = RelationGetRelationId(rd); relid = RelationGetRelationId(rd);
relname = RelationGetRelationName(rd);
heap_close(rd); heap_close(rd);
} }
if (RelationIsValid(rd)) if (RelationIsValid(rd))
...@@ -1414,18 +1411,15 @@ ParseComplexProjection(ParseState *pstate, ...@@ -1414,18 +1411,15 @@ ParseComplexProjection(ParseState *pstate,
if (RelationIsValid(rd)) if (RelationIsValid(rd))
{ {
relid = RelationGetRelationId(rd); relid = RelationGetRelationId(rd);
relname = RelationGetRelationName(rd);
heap_close(rd); heap_close(rd);
} if ((attnum = get_attnum(relid, funcname))
if (RelationIsValid(rd) &&
(attnum = get_attnum(relid, funcname))
!= InvalidAttrNumber) != InvalidAttrNumber)
{ {
param->paramtype = attnumTypeId(rd, attnum); param->paramtype = attnumTypeId(rd, attnum);
param->param_tlist = setup_tlist(funcname, relid); param->param_tlist = setup_tlist(funcname, relid);
return ((Node *) param); return ((Node *) param);
} }
}
break; break;
} }
default: default:
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.17 1998/07/12 21:29:20 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.18 1998/07/20 11:17:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -280,7 +280,7 @@ make_array_ref(Node *expr, ...@@ -280,7 +280,7 @@ make_array_ref(Node *expr,
if (type_struct_array->typelem == InvalidOid) if (type_struct_array->typelem == InvalidOid)
elog(ERROR, "make_array_ref: type %s is not an array", elog(ERROR, "make_array_ref: type %s is not an array",
(Name) &(type_struct_array->typname.data[0])); type_struct_array->typname);
/* get the type tuple for the element type */ /* get the type tuple for the element type */
type_tuple = SearchSysCacheTuple(TYPOID, type_tuple = SearchSysCacheTuple(TYPOID,
...@@ -362,7 +362,7 @@ make_array_set(Expr *target_expr, ...@@ -362,7 +362,7 @@ make_array_set(Expr *target_expr,
if (type_struct_array->typelem == InvalidOid) if (type_struct_array->typelem == InvalidOid)
elog(ERROR, "make_array_ref: type %s is not an array", elog(ERROR, "make_array_ref: type %s is not an array",
(Name) &(type_struct_array->typname.data[0])); type_struct_array->typname);
/* get the type tuple for the element type */ /* get the type tuple for the element type */
type_tuple = SearchSysCacheTuple(TYPOID, type_tuple = SearchSysCacheTuple(TYPOID,
ObjectIdGetDatum(type_struct_array->typelem), ObjectIdGetDatum(type_struct_array->typelem),
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.12 1998/07/12 21:29:21 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.13 1998/07/20 11:17:11 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -234,7 +234,7 @@ GetArrayElementType(Oid typearray) ...@@ -234,7 +234,7 @@ GetArrayElementType(Oid typearray)
if (type_struct_array->typelem == InvalidOid) if (type_struct_array->typelem == InvalidOid)
{ {
elog(ERROR, "GetArrayElementType: type %s is not an array", elog(ERROR, "GetArrayElementType: type %s is not an array",
(Name) &(type_struct_array->typname.data[0])); type_struct_array->typname);
} }
return (type_struct_array->typelem); return (type_struct_array->typelem);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment