[Tarantool-patches] [PATCH v4 2/2] sql: print span more properly

[Roman Khabibov]

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

Follow up #4407
---
 src/box/sql/select.c          | 2 +-
 test/sql/full_metadata.result | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 26c735ed7..50ab350a9 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 25bac6d86..dc1e91115 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
-- 
2.21.0 (Apple Git-122)