diff options
Diffstat (limited to 'src/backend/rewrite')
| -rw-r--r-- | src/backend/rewrite/rewriteDefine.c | 8 | ||||
| -rw-r--r-- | src/backend/rewrite/rewriteHandler.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 396c36f181..86d588bba5 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -171,7 +171,7 @@ InsertRule(char *rulname, if (event_qual != NULL) { /* Find query containing OLD/NEW rtable entries */ - Query *qry = castNode(Query, linitial(action)); + Query *qry = linitial_node(Query, action); qry = getInsertSelectQuery(qry, NULL); recordDependencyOnExpr(&myself, event_qual, qry->rtable, @@ -284,7 +284,7 @@ DefineQueryRewrite(char *rulename, */ foreach(l, action) { - query = castNode(Query, lfirst(l)); + query = lfirst_node(Query, l); if (query->resultRelation == 0) continue; /* Don't be fooled by INSERT/SELECT */ @@ -326,7 +326,7 @@ DefineQueryRewrite(char *rulename, /* * ... the one action must be a SELECT, ... */ - query = castNode(Query, linitial(action)); + query = linitial_node(Query, action); if (!is_instead || query->commandType != CMD_SELECT) ereport(ERROR, @@ -480,7 +480,7 @@ DefineQueryRewrite(char *rulename, foreach(l, action) { - query = castNode(Query, lfirst(l)); + query = lfirst_node(Query, l); if (!query->returningList) continue; diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index cb860ec4e5..4dcb7138e7 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -2367,7 +2367,7 @@ view_cols_are_auto_updatable(Query *viewquery, * there should be a single base relation. */ Assert(list_length(viewquery->jointree->fromlist) == 1); - rtr = castNode(RangeTblRef, linitial(viewquery->jointree->fromlist)); + rtr = linitial_node(RangeTblRef, viewquery->jointree->fromlist); /* Initialize the optional return values */ if (updatable_cols != NULL) @@ -2619,7 +2619,7 @@ adjust_view_column_set(Bitmapset *cols, List *targetlist) foreach(lc, targetlist) { - TargetEntry *tle = (TargetEntry *) lfirst(lc); + TargetEntry *tle = lfirst_node(TargetEntry, lc); Var *var; if (tle->resjunk) @@ -2806,7 +2806,7 @@ rewriteTargetView(Query *parsetree, Relation view) * view contains a single base relation. */ Assert(list_length(viewquery->jointree->fromlist) == 1); - rtr = castNode(RangeTblRef, linitial(viewquery->jointree->fromlist)); + rtr = linitial_node(RangeTblRef, viewquery->jointree->fromlist); base_rt_index = rtr->rtindex; base_rte = rt_fetch(base_rt_index, viewquery->rtable); @@ -3162,7 +3162,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events) */ foreach(lc1, parsetree->cteList) { - CommonTableExpr *cte = (CommonTableExpr *) lfirst(lc1); + CommonTableExpr *cte = lfirst_node(CommonTableExpr, lc1); Query *ctequery = castNode(Query, cte->ctequery); List *newstuff; @@ -3179,7 +3179,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events) if (list_length(newstuff) == 1) { /* Push the single Query back into the CTE node */ - ctequery = castNode(Query, linitial(newstuff)); + ctequery = linitial_node(Query, newstuff); /* WITH queries should never be canSetTag */ Assert(!ctequery->canSetTag); cte->ctequery = (Node *) ctequery; |