Date: Thu, 21 May 2015 03:12:29 +0200
From: Andres Freund <andres@anarazel.de>
To: Peter Geoghegan <pg@heroku.com>
Cc: Alvaro Herrera <alvherre@2ndquadrant.com>,
 Pg Hackers <pgsql-hackers@postgresql.org>
Subject: Re: Re: [COMMITTERS] pgsql: Add support for INSERT ... ON
 CONFLICT DO NOTHING/UPDATE.
Message-ID: <20150521011229.GX27868@alap3.anarazel.de>
References: <E1YqZCW-0000e6-Od@gemulon.postgresql.org>
 <20150520215816.GI5885@postgresql.org>
 <CAM3SWZRUhr1806zsF28CVRrB=b4t8PWv8d9x29z02xTQoFDyWA@mail.gmail.com>
 <20150520220911.GK5885@postgresql.org>
 <CAM3SWZQXP3Z=iXQ_+HwoqG7417JYf6HKDTmgk-4Xt05OEL_S_Q@mail.gmail.com>
 <CAM3SWZT0Rex4CpZo+re_m2Dh7wunMNsbD-9ZSWWx=JSewW3OVg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: 
 <CAM3SWZT0Rex4CpZo+re_m2Dh7wunMNsbD-9ZSWWx=JSewW3OVg@mail.gmail.com>
Precedence: bulk
Sender: pgsql-hackers-owner@postgresql.org

On 2015-05-20 15:21:49 -0700, Peter Geoghegan wrote:
> On Wed, May 20, 2015 at 3:14 PM, Peter Geoghegan <pg@heroku.com> wrote:
> > I think you're right. The initial commit neglected to update that, and
> > only handled it from ProcessQuery(). So it works for PlannedStmts, not
> > raw parse trees.
> 
> Attached patch fixes this. Thanks for the report.

> diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
> index a95eff1..8fd5ee8 100644
> --- a/src/backend/tcop/utility.c
> +++ b/src/backend/tcop/utility.c
> @@ -1898,7 +1898,14 @@ CreateCommandTag(Node *parsetree)
>  	{
>  			/* raw plannable queries */
>  		case T_InsertStmt:
> -			tag = "INSERT";
> +			{
> +				InsertStmt *stmt = (InsertStmt *) parsetree;
> +
> +				tag = "INSERT";
> +				if (stmt->onConflictClause &&
> +					stmt->onConflictClause->action == ONCONFLICT_UPDATE)
> +					tag = "UPSERT";
> +			}
>  			break;
>  
>  		case T_DeleteStmt:

You realize there's other instances of this in the same damn function?


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers