From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tarantool-patches-bounce@freelists.org>
Received: from localhost (localhost [127.0.0.1])
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 5A9B525DC2
	for <tarantool-patches@freelists.org>; Wed, 16 Jan 2019 10:35:31 -0500 (EST)
Received: from turing.freelists.org ([127.0.0.1])
	by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id RpTb1PkS_VYe for <tarantool-patches@freelists.org>;
	Wed, 16 Jan 2019 10:35:31 -0500 (EST)
Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 0AA9323D52
	for <tarantool-patches@freelists.org>; Wed, 16 Jan 2019 10:35:31 -0500 (EST)
Content-Type: text/plain;
	charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 12.0 \(3445.100.39\))
Subject: [tarantool-patches] Re: [PATCH v3 6/6] sql: set column types for EXPLAIN and PRAGMA
From: "n.pettik" <korablev@tarantool.org>
In-Reply-To: <c087a86c4da62b9b73361b8e483606facd2f92b2.1545844480.git.imeevma@gmail.com>
Date: Wed, 16 Jan 2019 18:35:29 +0300
Content-Transfer-Encoding: quoted-printable
Message-Id: <35575ED0-F934-4EAC-A955-51CD43347A9B@tarantool.org>
References: <cover.1545844480.git.imeevma@gmail.com>
 <c087a86c4da62b9b73361b8e483606facd2f92b2.1545844480.git.imeevma@gmail.com>
Sender: tarantool-patches-bounce@freelists.org
Errors-to: tarantool-patches-bounce@freelists.org
Reply-To: tarantool-patches@freelists.org
List-help: <mailto:ecartis@freelists.org?Subject=help>
List-unsubscribe: <tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-subscribe: <tarantool-patches-request@freelists.org?Subject=subscribe>
List-owner: <mailto:>
List-post: <mailto:tarantool-patches@freelists.org>
List-archive: <http://www.freelists.org/archives/tarantool-patches>
To: tarantool-patches@freelists.org
Cc: Imeev Mergen <imeevma@tarantool.org>


> @@ -471,17 +464,15 @@ sqlite3Pragma(Parse * pParse, Token * pId,	=
/* First part of [schema.]id field */
> 		goto pragma_out;
> 	}
> 	/* Register the result column names for pragmas that return =
results */
> -	if ((pPragma->mPragFlg & PragFlg_NoColumns) =3D=3D 0
> -	    && ((pPragma->mPragFlg & PragFlg_NoColumns1) =3D=3D 0 || =
zRight =3D=3D 0)
> -	    ) {
> -		setPragmaResultColumnNames(v, pPragma);
> -	}
> +	if ((pPragma->mPragFlg & PragFlg_NoColumns) =3D=3D 0 &&
> +	    ((pPragma->mPragFlg & PragFlg_NoColumns1) =3D=3D 0 || zRight =
=3D=3D 0))
> +		vdbe_set_pragma_result_columns(v, pPragma);

zRight !=3D NULL

The rest seems to be OK.=