diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-04-10 13:51:29 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-04-10 13:51:53 -0400 |
| commit | 8f0530f58061b185dc385df42e62d78a18d4ae3e (patch) | |
| tree | 63d038ae4012dcdcff3b556dde4c654959f8448e /src/backend/commands/copy.c | |
| parent | 56dd8e85c40fef3e3c2c10afa186ee30416ec507 (diff) | |
| download | postgresql-8f0530f58061b185dc385df42e62d78a18d4ae3e.tar.gz postgresql-8f0530f58061b185dc385df42e62d78a18d4ae3e.zip | |
Improve castNode notation by introducing list-extraction-specific variants.
This extends the castNode() notation introduced by commit 5bcab1114 to
provide, in one step, extraction of a list cell's pointer and coercion to
a concrete node type. For example, "lfirst_node(Foo, lc)" is the same
as "castNode(Foo, lfirst(lc))". Almost half of the uses of castNode
that have appeared so far include a list extraction call, so this is
pretty widely useful, and it saves a few more keystrokes compared to the
old way.
As with the previous patch, back-patch the addition of these macros to
pg_list.h, so that the notation will be available when back-patching.
Patch by me, after an idea of Andrew Gierth's.
Discussion: https://postgr.es/m/14197.1491841216@sss.pgh.pa.us
Diffstat (limited to 'src/backend/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 73677be59e0..b5af2be39bd 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -1034,7 +1034,7 @@ ProcessCopyOptions(ParseState *pstate, /* Extract options from the statement node tree */ foreach(option, options) { - DefElem *defel = castNode(DefElem, lfirst(option)); + DefElem *defel = lfirst_node(DefElem, option); if (strcmp(defel->defname, "format") == 0) { @@ -1488,7 +1488,7 @@ BeginCopy(ParseState *pstate, /* examine queries to determine which error message to issue */ foreach(lc, rewritten) { - Query *q = castNode(Query, lfirst(lc)); + Query *q = lfirst_node(Query, lc); if (q->querySource == QSRC_QUAL_INSTEAD_RULE) ereport(ERROR, @@ -1505,7 +1505,7 @@ BeginCopy(ParseState *pstate, errmsg("multi-statement DO INSTEAD rules are not supported for COPY"))); } - query = castNode(Query, linitial(rewritten)); + query = linitial_node(Query, rewritten); /* The grammar allows SELECT INTO, but we don't support that */ if (query->utilityStmt != NULL && |