diff options
| author | Robert Haas <rhaas@postgresql.org> | 2017-12-01 12:53:21 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2017-12-01 12:53:21 -0500 |
| commit | 87c37e3291cb75273ccdf4645b9472dd805c4493 (patch) | |
| tree | 7b952cc4b152b695193efcd98d006fd2d8b65280 /src/backend/parser/analyze.c | |
| parent | 1cbc17aaca82b2e262912da96c49b2e1d2f492e7 (diff) | |
| download | postgresql-87c37e3291cb75273ccdf4645b9472dd805c4493.tar.gz postgresql-87c37e3291cb75273ccdf4645b9472dd805c4493.zip | |
Re-allow INSERT .. ON CONFLICT DO NOTHING on partitioned tables.
Commit 8355a011a0124bdf7ccbada206a967d427039553 was reverted in
f05230752d53c4aa74cffa9b699983bbb6bcb118, but this attempt is
hopefully better-considered: we now pass the correct value to
ExecOpenIndices, which should avoid the crash that we hit before.
Amit Langote, reviewed by Simon Riggs and by me. Some final
editing by me.
Discussion: http://postgr.es/m/7ff1e8ec-dc39-96b1-7f47-ff5965dceeac@lab.ntt.co.jp
Diffstat (limited to 'src/backend/parser/analyze.c')
| -rw-r--r-- | src/backend/parser/analyze.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 757a4a8fd12..d680d2285c6 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -847,16 +847,8 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) /* Process ON CONFLICT, if any. */ if (stmt->onConflictClause) - { - /* Bail out if target relation is partitioned table */ - if (pstate->p_target_rangetblentry->relkind == RELKIND_PARTITIONED_TABLE) - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("ON CONFLICT clause is not supported with partitioned tables"))); - qry->onConflict = transformOnConflictClause(pstate, stmt->onConflictClause); - } /* * If we have a RETURNING clause, we need to add the target relation to |