mirror of
https://github.com/postgres/postgres.git
synced 2025-06-27 23:21:58 +03:00
Remove un-needed braces around single statements.
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.9 1998/02/26 04:35:15 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.10 1998/06/15 19:29:06 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -137,9 +137,7 @@ matchLocks(CmdType event,
|
||||
if (parsetree->commandType != CMD_SELECT)
|
||||
{
|
||||
if (parsetree->resultRelation != varno)
|
||||
{
|
||||
return (NULL);
|
||||
}
|
||||
}
|
||||
|
||||
nlocks = rulelocks->numLocks;
|
||||
@ -154,9 +152,7 @@ matchLocks(CmdType event,
|
||||
thisLockWasTriggered(varno,
|
||||
oneLock->attrno,
|
||||
parsetree))
|
||||
{
|
||||
real_locks = lappend(real_locks, oneLock);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.15 1998/06/04 17:26:44 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.16 1998/06/15 19:29:06 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -96,9 +96,7 @@ InsertRule(char *rulname,
|
||||
|
||||
eventrel = heap_openr(evobj);
|
||||
if (eventrel == NULL)
|
||||
{
|
||||
elog(ERROR, "rules cannot be defined on relations not in schema");
|
||||
}
|
||||
eventrel_oid = RelationGetRelationId(eventrel);
|
||||
|
||||
/*
|
||||
@ -128,9 +126,7 @@ InsertRule(char *rulname,
|
||||
'%s'::bool);";
|
||||
if (strlen(template) + strlen(rulname) + strlen(actionbuf) +
|
||||
strlen(qualbuf) + 20 /* fudge fac */ > RULE_PLAN_SIZE)
|
||||
{
|
||||
elog(ERROR, "DefineQueryRewrite: rule plan string too big.");
|
||||
}
|
||||
sprintf(rulebuf, template,
|
||||
rulname, evtype, eventrel_oid, evslot_index, actionbuf,
|
||||
qualbuf, is_instead);
|
||||
@ -209,9 +205,7 @@ DefineQueryRewrite(RuleStmt *stmt)
|
||||
|
||||
event_relation = heap_openr(event_obj->relname);
|
||||
if (event_relation == NULL)
|
||||
{
|
||||
elog(ERROR, "virtual relations not supported yet");
|
||||
}
|
||||
ev_relid = RelationGetRelationId(event_relation);
|
||||
|
||||
if (eslot_string == NULL)
|
||||
|
@ -6,7 +6,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.15 1998/03/30 16:36:43 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.16 1998/06/15 19:29:07 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -299,9 +299,7 @@ ApplyRetrieveRule(Query *parsetree,
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
nothing = TRUE;
|
||||
}
|
||||
|
||||
rtable = copyObject(parsetree->rtable);
|
||||
foreach(rt, rtable)
|
||||
@ -337,9 +335,7 @@ ApplyRetrieveRule(Query *parsetree,
|
||||
rtable = nconc(rtable, rule_rtable);
|
||||
}
|
||||
else
|
||||
{
|
||||
rtable = nconc(rtable, copyObject(rule_action->rtable));
|
||||
}
|
||||
parsetree->rtable = rtable;
|
||||
|
||||
rule_action->rtable = rtable;
|
||||
@ -566,9 +562,7 @@ fireRules(Query *parsetree,
|
||||
*--------------------------------------------------
|
||||
*/
|
||||
if ((info->event == CMD_INSERT) || (info->event == CMD_UPDATE))
|
||||
{
|
||||
FixNew(info, parsetree);
|
||||
}
|
||||
|
||||
/*--------------------------------------------------
|
||||
* Step 3:
|
||||
@ -613,9 +607,7 @@ RewriteQuery(Query *parsetree, bool *instead_flag, List **qual_products)
|
||||
* only for a delete may the targetlist be NULL
|
||||
*/
|
||||
if (event != CMD_DELETE)
|
||||
{
|
||||
Assert(parsetree->targetList != NULL);
|
||||
}
|
||||
|
||||
result_relation = parsetree->resultRelation;
|
||||
|
||||
@ -844,8 +836,6 @@ CheckViewPerms(Relation view, List *rtable)
|
||||
|
||||
aclcheck_res = pg_aclcheck(rte->relname, uname.data, ACL_RD);
|
||||
if (aclcheck_res != ACLCHECK_OK)
|
||||
{
|
||||
elog(ERROR, "%s: %s", rte->relname, aclcheck_error_strings[aclcheck_res]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -6,7 +6,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.13 1998/02/26 04:35:17 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.14 1998/06/15 19:29:07 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -75,9 +75,7 @@ OffsetVarNodes(Node *node, int offset)
|
||||
List *l;
|
||||
|
||||
foreach(l, (List *) node)
|
||||
{
|
||||
OffsetVarNodes(lfirst(l), offset);
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@ -222,9 +220,7 @@ FindMatchingNew(List *tlist, int attno)
|
||||
TargetEntry *tle = lfirst(i);
|
||||
|
||||
if (tle->resdom->resno == attno)
|
||||
{
|
||||
return (tle->expr);
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
@ -288,14 +284,10 @@ ResolveNew(RewriteInfo *info, List *targetlist, Node **nodePtr,
|
||||
((Var *) node)->varnoold = info->current_varno;
|
||||
}
|
||||
else
|
||||
{
|
||||
*nodePtr = make_null(((Var *) node)->vartype);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
*nodePtr = n;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.20 1998/04/27 04:06:26 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.21 1998/06/15 19:29:08 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -69,9 +69,7 @@ RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees)
|
||||
ruleTupdesc, &instead_is_null);
|
||||
|
||||
if (action_is_null || instead_is_null)
|
||||
{
|
||||
elog(ERROR, "internal error: rewrite rule not properly set up");
|
||||
}
|
||||
|
||||
ruleaction = textout((struct varlena *) ruleaction);
|
||||
rule_evqual_string = textout((struct varlena *) rule_evqual_string);
|
||||
|
Reference in New Issue
Block a user