From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp15.mail.ru (smtp15.mail.ru [94.100.176.133]) (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 0E05142EF5C for ; Tue, 23 Jun 2020 00:14:18 +0300 (MSK) References: <20200611151853.24398-1-roman.habibov@tarantool.org> <20200611151853.24398-3-roman.habibov@tarantool.org> From: roman Message-ID: <82c74ce7-ffed-e0f0-9eac-f84962055032@tarantool.org> Date: Tue, 23 Jun 2020 00:14:18 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: en-US Subject: Re: [Tarantool-patches] [PATCH v3 2/2] sql: print span more properly List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org Hi. Thanks for the review. On 16.06.2020 01:18, Vladislav Shpilevoy wrote: > Thanks for the patch! > > On 11/06/2020 17:18, Roman Khabibov wrote: >> There were several cases where instead of the correct column >> span, the column name was printed. Fix this bug. >> >> Follow up #3962 > This is rather a follow up for 4407. Because the > bug was introduced here: > https://github.com/tarantool/tarantool/commit/f89d65652c3003dd62c18a88b73a8ebbae50aab0#diff-6b3f29fe63589aaefab6b4beb6cb572e > > It is not related to auto columns. commit 623e0ebb8ac53dd1a0c17f45315b15b720cf71ba Author: Roman Khabibov 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 != NULL &&                      space->sequence_fieldno == (uint32_t) iCol)                      vdbe_metadata_set_col_autoincrement(v, i); -                if (colname != NULL) +                if (span != 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