From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <roman.habibov@tarantool.org>
Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
 bits)) (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 9769C42EF5C
 for <tarantool-patches@dev.tarantool.org>;
 Thu,  2 Jul 2020 18:55:56 +0300 (MSK)
Content-Type: text/plain;
	charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3594.4.19\))
From: Roman Khabibov <roman.habibov@tarantool.org>
In-Reply-To: <8fcad2b8-96a5-bdda-8941-3dfa4b153b33@tarantool.org>
Date: Thu, 2 Jul 2020 18:55:55 +0300
Content-Transfer-Encoding: quoted-printable
Message-Id: <F8E59F0D-4C2B-4147-B4EC-997A232561DD@tarantool.org>
References: <20200611151853.24398-1-roman.habibov@tarantool.org>
 <20200611151853.24398-3-roman.habibov@tarantool.org>
 <cda428ae-0eb8-73e3-707b-c1ede80bcffb@tarantool.org>
 <82c74ce7-ffed-e0f0-9eac-f84962055032@tarantool.org>
 <8fcad2b8-96a5-bdda-8941-3dfa4b153b33@tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v3 2/2] sql: print span more properly
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Nikita Pettik <korablev@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org, Vladislav Shpilevoy <v.shpilevoy@tarantool.org>

Hi! Thanks for the review.
Nikita, could you, please, see it?

> On Jun 24, 2020, at 02:12, Vladislav Shpilevoy =
<v.shpilevoy@tarantool.org> wrote:
>=20
> Thanks for the patch!
>=20
> This commit LGTM and can be pushed out of order. You can send it to
> Nikita in a separate branch in a new thread, I think. If you want it
> in earlier than this branch.

commit 623e0ebb8ac53dd1a0c17f45315b15b720cf71ba
Author: Roman Khabibov <roman.habibov@tarantool.org>
Date:   Wed Jun 10 15:03:45 2020 +0300

    sql: print span more properly

    There were several cases where instead of the correct column
    span, the column name was printed. Fix this bug.

    Follow up #4407

diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 7a56136..2955753 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -1849,7 +1849,7 @@ generate_column_metadata(struct Parse *pParse, =
struct SrcList *pTabList,
                 if (space->sequence !=3D NULL &&
                     space->sequence_fieldno =3D=3D (uint32_t) iCol)
                     vdbe_metadata_set_col_autoincrement(v, i);
-                if (colname !=3D NULL)
+                if (span !=3D NULL)
                     vdbe_metadata_set_col_span(v, i, span);
             }
         } else {
diff --git a/test/sql/full_metadata.result =
b/test/sql/full_metadata.result
index 25bac6d..dc1e911 100644
--- a/test/sql/full_metadata.result
+++ b/test/sql/full_metadata.result
@@ -65,7 +65,7 @@ execute("SELECT 'aSd' COLLATE \"unicode_ci\";")
 execute("SELECT c FROM t;")
  | ---
  | - metadata:
- |   - span: C
+ |   - span: c
  |     type: string
  |     is_nullable: true
  |     name: C
@@ -89,16 +89,16 @@ execute("SELECT c COLLATE \"unicode\" FROM t;")
 execute("SELECT id, a, c FROM t;")
  | ---
  | - metadata:
- |   - span: ID
+ |   - span: id
  |     type: integer
  |     is_autoincrement: true
  |     name: ID
  |     is_nullable: false
  |   - type: integer
- |     span: A
+ |     span: a
  |     name: A
  |     is_nullable: false
- |   - span: C
+ |   - span: c
  |     type: string
  |     is_nullable: true
  |     name: C