mirror of
https://github.com/postgres/postgres.git
synced 2025-06-26 12:21:12 +03:00
New NameStr macro to convert Name to Str. No need for var.data anymore.
Fewer calls to nameout. Better use of RelationGetRelationName.
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.23 1999/10/01 04:08:24 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.24 1999/11/07 23:08:12 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -179,7 +179,7 @@ checkLockPerms(List *locks, Query *parsetree, int rt_index)
|
||||
ev_rel->rd_rel->relowner);
|
||||
}
|
||||
heap_close(ev_rel, AccessShareLock);
|
||||
evowner = nameout(&(((Form_pg_shadow) GETSTRUCT(usertup))->usename));
|
||||
evowner = pstrdup(NameStr(((Form_pg_shadow) GETSTRUCT(usertup))->usename));
|
||||
|
||||
/*
|
||||
* Check all the locks, that should get fired on this query
|
||||
|
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.38 1999/10/21 02:33:25 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.39 1999/11/07 23:08:12 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -118,9 +118,9 @@ InsertRule(char *rulname,
|
||||
appendStringInfo(&rulebuf, "::text, '%s'::bool);",
|
||||
is_instead);
|
||||
|
||||
pg_exec_query_dest(rulebuf.data, None, true);
|
||||
pg_exec_query_dest(NameStr(rulebuf), None, true);
|
||||
|
||||
pfree(rulebuf.data);
|
||||
pfree(NameStr(rulebuf));
|
||||
|
||||
return LastOidProcessed;
|
||||
}
|
||||
@ -272,7 +272,7 @@ DefineQueryRewrite(RuleStmt *stmt)
|
||||
tle = (TargetEntry *) nth(i - 1, query->targetList);
|
||||
resdom = tle->resdom;
|
||||
attr = event_relation->rd_att->attrs[i - 1];
|
||||
attname = nameout(&(attr->attname));
|
||||
attname = pstrdup(NameStr(attr->attname));
|
||||
|
||||
if (strcmp(resdom->resname, attname) != 0)
|
||||
elog(ERROR, "select rules target entry %d has different column name from %s", i, attname);
|
||||
@ -295,7 +295,8 @@ DefineQueryRewrite(RuleStmt *stmt)
|
||||
|
||||
rule = event_relation->rd_rules->rules[i];
|
||||
if (rule->event == CMD_SELECT)
|
||||
elog(ERROR, "%s is already a view", nameout(&(event_relation->rd_rel->relname)));
|
||||
elog(ERROR, "%s is already a view",
|
||||
RelationGetRelationName(event_relation));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.41 1999/10/01 04:08:24 tgl Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.42 1999/11/07 23:08:13 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -564,12 +564,12 @@ HandleRIRAttributeRule_mutator(Node *node,
|
||||
{
|
||||
NameData name_to_look_for;
|
||||
|
||||
name_to_look_for.data[0] = '\0';
|
||||
NameStr(name_to_look_for)[0] = '\0';
|
||||
namestrcpy(&name_to_look_for,
|
||||
(char *) get_attname(getrelid(this_varno,
|
||||
context->rtable),
|
||||
this_varattno));
|
||||
if (name_to_look_for.data[0])
|
||||
if (NameStr(name_to_look_for)[0])
|
||||
{
|
||||
Node *n;
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.30 1999/10/26 03:12:35 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.31 1999/11/07 23:08:13 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -46,7 +46,7 @@ RewriteGetRuleEventRel(char *rulename)
|
||||
if (!HeapTupleIsValid(htup))
|
||||
elog(ERROR, "Class '%u' not found", eventrel);
|
||||
|
||||
return ((Form_pg_class) GETSTRUCT(htup))->relname.data;
|
||||
return NameStr(((Form_pg_class) GETSTRUCT(htup))->relname);
|
||||
}
|
||||
|
||||
/* ----------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user