diff options
| author | Simon Riggs | 2018-04-02 20:34:15 +0000 |
|---|---|---|
| committer | Simon Riggs | 2018-04-02 20:34:15 +0000 |
| commit | 7cf8a5c302735d193dcf901b87e03e324903c632 (patch) | |
| tree | 0f9815ae865d08f20e7037c148c3078fad0138e7 /src/backend/parser/parse_relation.c | |
| parent | 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb (diff) | |
Revert "Modified files for MERGE"
This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.
Diffstat (limited to 'src/backend/parser/parse_relation.c')
| -rw-r--r-- | src/backend/parser/parse_relation.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index f7e11f969c0..053ae02c9fe 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -728,16 +728,6 @@ scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte, const char *colname, colname), parser_errposition(pstate, location))); - /* In MERGE WHEN AND condition, no system column is allowed except tableOid or OID */ - if (pstate->p_expr_kind == EXPR_KIND_MERGE_WHEN_AND && - attnum < InvalidAttrNumber && - !(attnum == TableOidAttributeNumber || attnum == ObjectIdAttributeNumber)) - ereport(ERROR, - (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("system column \"%s\" reference in WHEN AND condition is invalid", - colname), - parser_errposition(pstate, location))); - if (attnum != InvalidAttrNumber) { /* now check to see if column actually is defined */ |