[tarantool-patches] [PATCH 3/3] sql: fix resulting type for concatenation operator

[Nikita Pettik]

Before this patch, resulting type of concatenation operator always was
TEXT (i.e. type of memory cell containing result - MEM_Str). Lets fix it
and return type depending on type of concatenation arguments: if both
arguments are TEXT, then resulting type is TEXT; BLOB otherwise. Note
that other options of combining types of arguments are illegal.

Closes #3544
---
 src/box/sql/vdbe.c      |  5 ++++-
 test/sql/types.result   | 10 ++++++++++
 test/sql/types.test.lua |  4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index 37955858d..b647491bb 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -1587,7 +1587,10 @@ case OP_Concat: {           /* same as TK_CONCAT, in1, in2, out3 */
 	if (sqlVdbeMemGrow(pOut, (int)nByte+2, pOut==pIn2)) {
 		goto no_mem;
 	}
-	MemSetTypeFlag(pOut, MEM_Str);
+	if (pIn1->flags & MEM_Str)
+		MemSetTypeFlag(pOut, MEM_Str);
+	else
+		MemSetTypeFlag(pOut, MEM_Blob);
 	if (pOut!=pIn2) {
 		memcpy(pOut->z, pIn2->z, pIn2->n);
 	}
diff --git a/test/sql/types.result b/test/sql/types.result
index 0cbbd1642..a0159d661 100644
--- a/test/sql/types.result
+++ b/test/sql/types.result
@@ -163,3 +163,13 @@ box.sql.execute("SELECT CAST('abc' AS BLOB) || 'x';")
 ---
 - error: 'Inconsistent types: expected BLOB got TEXT'
 ...
+-- Result of BLOBs concatenation must be BLOB.
+--
+box.sql.execute("SELECT TYPEOF(CAST('abc' AS BLOB) || CAST('cda' AS BLOB))")
+---
+- - ['blob']
+...
+box.sql.execute("VALUES (TYPEOF(randomblob(5) || zeroblob(5)));")
+---
+- - ['blob']
+...
diff --git a/test/sql/types.test.lua b/test/sql/types.test.lua
index e0331bb8f..b944b081b 100644
--- a/test/sql/types.test.lua
+++ b/test/sql/types.test.lua
@@ -52,3 +52,7 @@ box.sql.execute("SELECt 'a' || 'b' || 1;")
 --
 box.sql.execute("SELECT 'abc' || CAST('x' AS BLOB);")
 box.sql.execute("SELECT CAST('abc' AS BLOB) || 'x';")
+-- Result of BLOBs concatenation must be BLOB.
+--
+box.sql.execute("SELECT TYPEOF(CAST('abc' AS BLOB) || CAST('cda' AS BLOB))")
+box.sql.execute("VALUES (TYPEOF(randomblob(5) || zeroblob(5)));")
-- 
2.15.1