Skip to content

Resolve conflicts in src/backend/parser/analyze.c #2580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RekGRpth wants to merge 1 commit into
base: sync-14x-b13
Choose a base branch
from
+0 −18
Open

Resolve conflicts in src/backend/parser/analyze.c #2580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/backend/parser/analyze.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2444,19 +2444,12 @@ coerceSetOpTypes(ParseState *pstate, Node *sop,
Node *rcolnode = (Node *) rtle->expr;
Oid lcoltype = exprType(lcolnode);
Oid rcoltype = exprType(rcolnode);
<<<<<<< HEAD
int32 lcoltypmod = exprTypmod(lcolnode);
int32 rcoltypmod = exprTypmod(rcolnode);
Node *bestexpr = NULL;
=======
Node *bestexpr;
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
int bestlocation;
Oid rescoltype = pct ? lfirst_oid(pct) : InvalidOid;
int32 rescoltypmod = pcm ? lfirst_int(pcm) : -1;
Oid rescolcoll;

<<<<<<< HEAD
/*
* If the preprocessed coltype is InvalidOid, we fall back
* to the old style type resolution for backward
Expand All @@ -2470,9 +2463,6 @@ coerceSetOpTypes(ParseState *pstate, Node *sop,
context,
&bestexpr);
bestlocation = exprLocation(bestexpr);
/* if same type and same typmod, use typmod; else default */
if (lcoltype == rcoltype && lcoltypmod == rcoltypmod)
rescoltypmod = lcoltypmod;
}
else
{
Expand All @@ -2483,14 +2473,6 @@ coerceSetOpTypes(ParseState *pstate, Node *sop,
bestexpr = lcolnode;
bestlocation = exprLocation(lcolnode);
}
=======
/* select common type, same as CASE et al */
rescoltype = select_common_type(pstate,
list_make2(lcolnode, rcolnode),
context,
&bestexpr);
bestlocation = exprLocation(bestexpr);
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d

/*
* Verify the coercions are actually possible. If not, we'd fail
Expand Down