From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <roman.habibov@tarantool.org>
Received: from smtp5.mail.ru (smtp5.mail.ru [94.100.179.24])
 (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 0ACBE469710
 for <tarantool-patches@dev.tarantool.org>;
 Wed, 10 Jun 2020 15:47:02 +0300 (MSK)
From: Roman Khabibov <roman.habibov@tarantool.org>
Date: Wed, 10 Jun 2020 15:47:01 +0300
Message-Id: <20200610124701.13055-1-roman.habibov@tarantool.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [Tarantool-patches] [PATCH] sql: display collation in metadata for
	scalar
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: tarantool-patches@dev.tarantool.org

Fix bug with the  display of collation for scalar fields in
<SELECT> result, when sql_full_metadata is enabled.

Closes #4755
---

Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/gh-4755-scalar-collation
Issue: https://github.com/tarantool/tarantool/issues/4755

 src/box/sql/select.c                          |  7 +--
 .../gh-4755-scalar-collation-metadata.result  | 52 +++++++++++++++++++
 ...gh-4755-scalar-collation-metadata.test.lua | 18 +++++++
 3 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 test/sql/gh-4755-scalar-collation-metadata.result
 create mode 100755 test/sql/gh-4755-scalar-collation-metadata.test.lua

diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index f39484013..92d20e992 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -1792,9 +1792,10 @@ generate_column_metadata(struct Parse *pParse, struct SrcList *pTabList,
 			continue;
 		if (p->op == TK_VARIABLE)
 			var_pos[var_count++] = i;
-		vdbe_metadata_set_col_type(v, i,
-					   field_type_strs[sql_expr_type(p)]);
-		if (is_full_meta && sql_expr_type(p) == FIELD_TYPE_STRING) {
+		enum field_type type = sql_expr_type(p);
+		vdbe_metadata_set_col_type(v, i, field_type_strs[type]);
+		if (is_full_meta && (type == FIELD_TYPE_STRING ||
+		    type == FIELD_TYPE_SCALAR)) {
 			bool unused;
 			uint32_t id = 0;
 			struct coll *coll = NULL;
diff --git a/test/sql/gh-4755-scalar-collation-metadata.result b/test/sql/gh-4755-scalar-collation-metadata.result
new file mode 100644
index 000000000..eef2d86ad
--- /dev/null
+++ b/test/sql/gh-4755-scalar-collation-metadata.result
@@ -0,0 +1,52 @@
+-- test-run result file version 2
+env = require('test_run')
+ | ---
+ | ...
+test_run = env.new()
+ | ---
+ | ...
+
+--
+-- gh-4755: Collation in metadata must be displayed as for string
+-- filed as for scalar field.
+--
+test_run:cmd("setopt delimiter ';'");
+ | ---
+ | - true
+ | ...
+box.execute([[SET SESSION "sql_full_metadata" = true;]]);
+ | ---
+ | - row_count: 1
+ | ...
+box.execute([[CREATE TABLE test (a SCALAR COLLATE "unicode_ci" PRIMARY KEY,
+                                 b STRING COLLATE "unicode_ci");]]);
+ | ---
+ | - row_count: 1
+ | ...
+box.execute("SELECT * FROM test;");
+ | ---
+ | - metadata:
+ |   - span: A
+ |     type: scalar
+ |     is_nullable: false
+ |     name: A
+ |     collation: unicode_ci
+ |   - span: B
+ |     type: string
+ |     is_nullable: true
+ |     name: B
+ |     collation: unicode_ci
+ |   rows: []
+ | ...
+
+--
+-- Cleanup.
+--
+box.execute([[SET SESSION "sql_full_metadata" = false;]]);
+ | ---
+ | - row_count: 1
+ | ...
+box.execute("DROP TABLE test;");
+ | ---
+ | - row_count: 1
+ | ...
diff --git a/test/sql/gh-4755-scalar-collation-metadata.test.lua b/test/sql/gh-4755-scalar-collation-metadata.test.lua
new file mode 100755
index 000000000..cc883794f
--- /dev/null
+++ b/test/sql/gh-4755-scalar-collation-metadata.test.lua
@@ -0,0 +1,18 @@
+env = require('test_run')
+test_run = env.new()
+
+--
+-- gh-4755: Collation in metadata must be displayed as for string
+-- filed as for scalar field.
+--
+test_run:cmd("setopt delimiter ';'");
+box.execute([[SET SESSION "sql_full_metadata" = true;]]);
+box.execute([[CREATE TABLE test (a SCALAR COLLATE "unicode_ci" PRIMARY KEY,
+                                 b STRING COLLATE "unicode_ci");]]);
+box.execute("SELECT * FROM test;");
+
+--
+-- Cleanup.
+--
+box.execute([[SET SESSION "sql_full_metadata" = false;]]);
+box.execute("DROP TABLE test;");
-- 
2.21.0 (Apple Git-122)