[Tarantool-patches] [PATCH v1 10/10] sql: arguments check for string value functions

imeevma at tarantool.org imeevma at tarantool.org
Fri Aug 13 06:17:29 MSK 2021


This patch enables static and dynamic type check for functions SUBSTR(),
GROUP_CONCAT(), REPLACE(), TRIM(). All these functions afther this patch
will be able to return VARINARY value when VARBINARY arguments are given
instead of STRING arguments.

Closes #6105
---
 src/box/sql/expr.c                |  3 +-
 src/box/sql/func.c                | 63 ++++++++++++++++++++++++-------
 test/sql-tap/aggnested.test.lua   |  8 ++--
 test/sql-tap/distinctagg.test.lua |  3 +-
 test/sql-tap/e_select1.test.lua   | 28 ++++++++------
 test/sql-tap/func.test.lua        | 32 ++++------------
 test/sql-tap/substr.test.lua      |  4 +-
 test/sql-tap/tkt2942.test.lua     | 10 ++---
 test/sql-tap/uuid.test.lua        | 22 ++++-------
 test/sql-tap/view.test.lua        |  2 +-
 test/sql-tap/with1.test.lua       |  2 +-
 test/sql/boolean.result           |  7 +---
 test/sql/prepared.result          |  4 +-
 test/sql/prepared.test.lua        |  2 +-
 test/sql/types.result             | 16 +++-----
 15 files changed, 106 insertions(+), 100 deletions(-)

diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c
index 47005f8e3..17d97a871 100644
--- a/src/box/sql/expr.c
+++ b/src/box/sql/expr.c
@@ -353,7 +353,7 @@ sql_expr_coll(Parse *parse, Expr *p, bool *is_explicit_coll, uint32_t *coll_id,
 					     p->x.pList->nExpr;
 			uint32_t flags = sql_func_flags(p->u.zToken);
 			if (((flags & SQL_FUNC_DERIVEDCOLL) != 0) &&
-			    arg_count > 0) {
+			    arg_count > 0 && p->type == FIELD_TYPE_STRING) {
 				/*
 				 * Now we use quite straightforward
 				 * approach assuming that resulting
@@ -362,7 +362,6 @@ sql_expr_coll(Parse *parse, Expr *p, bool *is_explicit_coll, uint32_t *coll_id,
 				 * built-in functions: trim, upper,
 				 * lower, replace, substr.
 				 */
-				assert(p->type == FIELD_TYPE_STRING);
 				p = p->x.pList->a->pExpr;
 				continue;
 			}
diff --git a/src/box/sql/func.c b/src/box/sql/func.c
index 98f7169c0..1f787d4e0 100644
--- a/src/box/sql/func.c
+++ b/src/box/sql/func.c
@@ -548,16 +548,14 @@ substrFunc(sql_context * context, int argc, sql_value ** argv)
 			cnt++;
 		}
 		z2 += i;
-		sql_result_text64(context, (char *)z, z2 - z,
-				      SQL_TRANSIENT);
+		mem_copy_str(context->pOut, (char *)z, z2 - z);
 	} else {
 		if (p1 + p2 > len) {
 			p2 = len - p1;
 			if (p2 < 0)
 				p2 = 0;
 		}
-		sql_result_blob64(context, (char *)&z[p1], (u64) p2,
-				      SQL_TRANSIENT);
+		mem_copy_bin(context->pOut, (char *)&z[p1], p2);
 	}
 }
 
@@ -1363,7 +1361,10 @@ replaceFunc(sql_context * context, int argc, sql_value ** argv)
 	j += nStr - i;
 	assert(j <= nOut);
 	zOut[j] = 0;
-	sql_result_text(context, (char *)zOut, j, sql_free);
+	if (context->func->def->returns == FIELD_TYPE_STRING)
+		mem_set_str_dynamic(context->pOut, (char *)zOut, j);
+	else
+		mem_set_bin_dynamic(context->pOut, (char *)zOut, j);
 }
 
 /**
@@ -1418,8 +1419,10 @@ trim_procedure(struct sql_context *context, enum trim_side_mask flags,
 		}
 	}
 finish:
-	sql_result_text(context, (char *)input_str, input_str_sz,
-			SQL_TRANSIENT);
+	if (context->func->def->returns == FIELD_TYPE_STRING)
+		mem_copy_str(context->pOut, (char *)input_str, input_str_sz);
+	else
+		mem_copy_bin(context->pOut, (char *)input_str, input_str_sz);
 }
 
 /**
@@ -1842,9 +1845,13 @@ groupConcatFinalize(sql_context * context)
 		} else if (pAccum->accError == STRACCUM_NOMEM) {
 			context->is_aborted = true;
 		} else {
-			sql_result_text(context,
-					    sqlStrAccumFinish(pAccum),
-					    pAccum->nChar, sql_free);
+			char *str = sqlStrAccumFinish(pAccum);
+			int len = pAccum->nChar;
+			assert(len >= 0);
+			if (context->func->def->returns == FIELD_TYPE_STRING)
+				mem_set_str_dynamic(context->pOut, str, len);
+			else
+				mem_set_bin_dynamic(context->pOut, str, len);
 		}
 	}
 }
@@ -2014,8 +2021,15 @@ static struct sql_func_definition definitions[] = {
 	{"GREATEST", -1, {FIELD_TYPE_SCALAR}, FIELD_TYPE_SCALAR, minmaxFunc,
 	 NULL},
 
-	{"GROUP_CONCAT", -1, {FIELD_TYPE_ANY, FIELD_TYPE_ANY},
+	{"GROUP_CONCAT", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_STRING,
+	 groupConcatStep, groupConcatFinalize},
+	{"GROUP_CONCAT", 2, {FIELD_TYPE_STRING, FIELD_TYPE_STRING},
 	 FIELD_TYPE_STRING, groupConcatStep, groupConcatFinalize},
+	{"GROUP_CONCAT", 1, {FIELD_TYPE_VARBINARY}, FIELD_TYPE_VARBINARY,
+	 groupConcatStep, groupConcatFinalize},
+	{"GROUP_CONCAT", 2, {FIELD_TYPE_VARBINARY, FIELD_TYPE_VARBINARY},
+	 FIELD_TYPE_VARBINARY, groupConcatStep, groupConcatFinalize},
+
 	{"HEX", 1, {FIELD_TYPE_VARBINARY}, FIELD_TYPE_STRING, hexFunc, NULL},
 	{"IFNULL", 2, {FIELD_TYPE_ANY, FIELD_TYPE_ANY}, FIELD_TYPE_SCALAR,
 	 sql_builtin_stub, NULL},
@@ -2088,24 +2102,45 @@ static struct sql_func_definition definitions[] = {
 	{"RANDOM", 0, {}, FIELD_TYPE_INTEGER, randomFunc, NULL},
 	{"RANDOMBLOB", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_VARBINARY,
 	 randomBlob, NULL},
-	{"REPLACE", 3, {FIELD_TYPE_ANY, FIELD_TYPE_ANY, FIELD_TYPE_ANY},
+	{"REPLACE", 3,
+	 {FIELD_TYPE_STRING, FIELD_TYPE_STRING, FIELD_TYPE_STRING},
 	 FIELD_TYPE_STRING, replaceFunc, NULL},
+	{"REPLACE", 3,
+	 {FIELD_TYPE_VARBINARY, FIELD_TYPE_VARBINARY, FIELD_TYPE_VARBINARY},
+	 FIELD_TYPE_VARBINARY, replaceFunc, NULL},
 	{"ROUND", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, roundFunc, NULL},
 	{"ROUND", 2, {FIELD_TYPE_DOUBLE, FIELD_TYPE_INTEGER}, FIELD_TYPE_DOUBLE,
 	 roundFunc, NULL},
 	{"ROW_COUNT", 0, {}, FIELD_TYPE_INTEGER, sql_row_count, NULL},
 	{"SOUNDEX", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_STRING, soundexFunc,
 	 NULL},
-	{"SUBSTR", -1, {FIELD_TYPE_ANY, FIELD_TYPE_ANY, FIELD_TYPE_ANY},
+	{"SUBSTR", 2, {FIELD_TYPE_STRING, FIELD_TYPE_INTEGER},
+	 FIELD_TYPE_STRING, substrFunc, NULL},
+	{"SUBSTR", 3,
+	 {FIELD_TYPE_STRING, FIELD_TYPE_INTEGER, FIELD_TYPE_INTEGER},
 	 FIELD_TYPE_STRING, substrFunc, NULL},
+	{"SUBSTR", 2, {FIELD_TYPE_VARBINARY, FIELD_TYPE_INTEGER},
+	 FIELD_TYPE_VARBINARY, substrFunc, NULL},
+	{"SUBSTR", 3,
+	 {FIELD_TYPE_VARBINARY, FIELD_TYPE_INTEGER, FIELD_TYPE_INTEGER},
+	 FIELD_TYPE_VARBINARY, substrFunc, NULL},
 	{"SUM", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_INTEGER, sum_step, sumFinalize},
 	{"SUM", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, sum_step, sumFinalize},
 	{"TOTAL", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_DOUBLE, sum_step,
 	 totalFinalize},
 	{"TOTAL", 1, {FIELD_TYPE_DOUBLE}, FIELD_TYPE_DOUBLE, sum_step,
 	 totalFinalize},
-	{"TRIM", -1, {FIELD_TYPE_ANY, FIELD_TYPE_ANY, FIELD_TYPE_ANY},
+
+	{"TRIM", 2, {FIELD_TYPE_STRING, FIELD_TYPE_INTEGER},
+	 FIELD_TYPE_STRING, trim_func, NULL},
+	{"TRIM", 3, {FIELD_TYPE_STRING, FIELD_TYPE_INTEGER, FIELD_TYPE_STRING},
 	 FIELD_TYPE_STRING, trim_func, NULL},
+	{"TRIM", 2, {FIELD_TYPE_VARBINARY, FIELD_TYPE_INTEGER},
+	 FIELD_TYPE_VARBINARY, trim_func, NULL},
+	{"TRIM", 3,
+	 {FIELD_TYPE_VARBINARY, FIELD_TYPE_INTEGER, FIELD_TYPE_VARBINARY},
+	 FIELD_TYPE_VARBINARY, trim_func, NULL},
+
 	{"TYPEOF", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, typeofFunc, NULL},
 	{"UNICODE", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_INTEGER, unicodeFunc,
 	 NULL},
diff --git a/test/sql-tap/aggnested.test.lua b/test/sql-tap/aggnested.test.lua
index 6a967461d..1684f2249 100755
--- a/test/sql-tap/aggnested.test.lua
+++ b/test/sql-tap/aggnested.test.lua
@@ -24,10 +24,10 @@ test:plan(7)
 test:do_execsql_test(
     "aggnested-1.1",
     [[
-        CREATE TABLE t1(a1 INTEGER PRIMARY KEY);
-        INSERT INTO t1 VALUES(1), (2), (3);
-        CREATE TABLE t2(b1 INTEGER PRIMARY KEY);
-        INSERT INTO t2 VALUES(4), (5);
+        CREATE TABLE t1(a1 STRING PRIMARY KEY);
+        INSERT INTO t1 VALUES('1'), ('2'), ('3');
+        CREATE TABLE t2(b1 STRING PRIMARY KEY);
+        INSERT INTO t2 VALUES('4'), ('5');
         SELECT (SELECT group_concat(a1,'x') FROM t2 LIMIT 1) FROM t1;
     ]],
     {
diff --git a/test/sql-tap/distinctagg.test.lua b/test/sql-tap/distinctagg.test.lua
index 9b1346f7d..7d5e05e3f 100755
--- a/test/sql-tap/distinctagg.test.lua
+++ b/test/sql-tap/distinctagg.test.lua
@@ -82,7 +82,8 @@ test:do_catchsql_test(
 test:do_catchsql_test(
     "distinctagg-2.2",
     [[
-        SELECT group_concat(distinct a,b) FROM t1;
+        SELECT group_concat(distinct CAST(a AS STRING), CAST(b AS STRING))
+        FROM t1;
     ]], {
         -- <distinctagg-2.2>
         1, "DISTINCT aggregates must have exactly one argument"
diff --git a/test/sql-tap/e_select1.test.lua b/test/sql-tap/e_select1.test.lua
index da4db5a55..9f10994ae 100755
--- a/test/sql-tap/e_select1.test.lua
+++ b/test/sql-tap/e_select1.test.lua
@@ -956,7 +956,7 @@ test:do_select_tests(
         {"4", "SELECT *, count(*) FROM a1 JOIN a2", {4, 10, 10, 4, 16}},
         {"5", "SELECT *, sum(three) FROM a1 NATURAL JOIN a2", {3, 6, 2, 3}},
         {"6", "SELECT *, sum(three) FROM a1 NATURAL JOIN a2", {3, 6, 2, 3}},
-        {"7", "SELECT group_concat(three, ''), a1.* FROM a1 NATURAL JOIN a2", {"12", 3, 6}},
+        {"7", "SELECT group_concat('1', ''), a1.* FROM a1 NATURAL JOIN a2", {"11", 3, 6}},
     })
 
 -- EVIDENCE-OF: R-04486-07266 Or, if the dataset contains zero rows, then
@@ -1014,12 +1014,12 @@ test:do_execsql_test(
         INSERT INTO b1 VALUES(7, 's');
         INSERT INTO b1 VALUES(6, 's');
 
-        CREATE TABLE b2(x TEXT, y  INT PRIMARY KEY);
-        INSERT INTO b2 VALUES(NULL, 0);
-        INSERT INTO b2 VALUES(NULL, 1);
-        INSERT INTO b2 VALUES('xyz', 2);
-        INSERT INTO b2 VALUES('abc', 3);
-        INSERT INTO b2 VALUES('xyz', 4);
+        CREATE TABLE b2(x TEXT, y STRING PRIMARY KEY);
+        INSERT INTO b2 VALUES(NULL, '0');
+        INSERT INTO b2 VALUES(NULL, '1');
+        INSERT INTO b2 VALUES('xyz', '2');
+        INSERT INTO b2 VALUES('abc', '3');
+        INSERT INTO b2 VALUES('xyz', '4');
 
         CREATE TABLE b3(id  INT PRIMARY KEY, a  TEXT COLLATE "unicode_ci", b  TEXT COLLATE "binary");
         INSERT INTO b3 VALUES(1, 'abc', 'abc');
@@ -1048,10 +1048,14 @@ test:do_execsql_test(
 test:do_select_tests(
     "e_select-4.9",
     {
-        {"1", "SELECT group_concat(one), two FROM b1 GROUP BY two", {"4,5","f","1","o","6,7","s","2,3","t"}},
-        {"2", "SELECT group_concat(one), sum(one) FROM b1 GROUP BY (one>4)", {"1,2,3,4",10,"5,6,7",18}},
-        {"3", "SELECT group_concat(one) FROM b1 GROUP BY (two>'o'), one%2", {"4","1,5","2,6","3,7"}},
-        {"4", "SELECT group_concat(one) FROM b1 GROUP BY (one==2 OR two=='o')", {"3,4,5,6,7","1,2"}},
+        {"1", [[SELECT group_concat(CAST(one AS STRING)), two FROM b1 GROUP BY
+                two]], {"4,5","f","1","o","6,7","s","2,3","t"}},
+        {"2", [[SELECT group_concat(CAST(one AS STRING)), sum(one) FROM b1
+                GROUP BY (one>4)]], {"1,2,3,4",10,"5,6,7",18}},
+        {"3", [[SELECT group_concat(CAST(one AS STRING)) FROM b1 GROUP BY
+                (two>'o'), one%2]], {"4","1,5","2,6","3,7"}},
+        {"4", [[SELECT group_concat(CAST(one AS STRING)) FROM b1 GROUP BY
+                (one==2 OR two=='o')]], {"3,4,5,6,7","1,2"}},
     })
 
 -- EVIDENCE-OF: R-14926-50129 For the purposes of grouping rows, NULL
@@ -1061,7 +1065,7 @@ test:do_select_tests(
     "e_select-4.10",
     {
         {"1", "SELECT group_concat(y) FROM b2 GROUP BY x", {"0,1","3","2,4"}},
-        {"2", "SELECT count(*) FROM b2 GROUP BY CASE WHEN y<4 THEN NULL ELSE 0 END", {4, 1}},
+        {"2", "SELECT count(*) FROM b2 GROUP BY CASE WHEN y<'4' THEN NULL ELSE 0 END", {4, 1}},
     })
 
 -- EVIDENCE-OF: R-10470-30318 The usual rules for selecting a collation
diff --git a/test/sql-tap/func.test.lua b/test/sql-tap/func.test.lua
index 8bb20bc79..416f27d69 100755
--- a/test/sql-tap/func.test.lua
+++ b/test/sql-tap/func.test.lua
@@ -1,6 +1,6 @@
 #!/usr/bin/env tarantool
 local test = require("sqltester")
-test:plan(14682)
+test:plan(14680)
 
 --!./tcltestrunner.lua
 -- 2001 September 15
@@ -193,26 +193,6 @@ test:do_execsql_test(
         -- </func-2.8>
     })
 
-test:do_execsql_test(
-    "func-2.9",
-    [[
-        SELECT substr(a,1,1) FROM t2
-    ]], {
-        -- <func-2.9>
-        "1", "", "3", "", "6"
-        -- </func-2.9>
-    })
-
-test:do_execsql_test(
-    "func-2.10",
-    [[
-        SELECT substr(a,2,2) FROM t2
-    ]], {
-        -- <func-2.10>
-        "", "", "45", "", "78"
-        -- </func-2.10>
-    })
-
 -- Only do the following tests if TCL has UTF-8 capabilities
 --
 if ("ሴ" ~= "u1234") then
@@ -2256,7 +2236,8 @@ test:do_execsql_test(
 test:do_execsql_test(
     "func-24.10",
     [[
-        SELECT group_concat(CASE t1 WHEN 'this' THEN null ELSE t1 END) FROM tbl1
+        SELECT group_concat(CAST(CASE t1 WHEN 'this' THEN null ELSE t1 END
+                            AS STRING)) FROM tbl1
     ]], {
         -- <func-24.10>
         "program,is,free,software"
@@ -2266,7 +2247,8 @@ test:do_execsql_test(
 test:do_execsql_test(
     "func-24.11",
     [[
-        SELECT group_concat(CASE WHEN t1!='software' THEN null ELSE t1 END) FROM tbl1
+        SELECT group_concat(CAST(CASE WHEN t1!='software' THEN null ELSE t1 END
+                            AS STRING)) FROM tbl1
     ]], {
         -- <func-24.11>
         "software"
@@ -2276,8 +2258,8 @@ test:do_execsql_test(
 test:do_execsql_test(
     "func-24.12",
     [[
-        SELECT group_concat(CASE t1 WHEN 'this' THEN ''
-                              WHEN 'program' THEN null ELSE t1 END) FROM tbl1
+        SELECT group_concat(CAST(CASE t1 WHEN 'this' THEN '' WHEN 'program' THEN
+                            null ELSE t1 END AS STRING)) FROM tbl1
     ]], {
         -- <func-24.12>
         ",is,free,software"
diff --git a/test/sql-tap/substr.test.lua b/test/sql-tap/substr.test.lua
index f64eb94be..e7e6d7aca 100755
--- a/test/sql-tap/substr.test.lua
+++ b/test/sql-tap/substr.test.lua
@@ -57,12 +57,12 @@ local function subblob_test(id, hex, i1, i2, hexresult)
     test:do_execsql_test(
         "substr-"..id..".1",
         string.format(
-            "SELECT HEX(CAST(substr(b, %s, %s) AS VARBINARY)) FROM t1", i1, i2),
+            "SELECT HEX(substr(CAST(b AS VARBINARY), %s, %s)) FROM t1", i1, i2),
         {hexresult})
     --local qstr = string.gsub("' '", string)--"string","map","' ''",["string"]]]=]).."'"
     test:do_execsql_test(
         "substr-"..id..".2",
-        string.format("SELECT HEX(CAST(substr(x'%s', %s, %s) AS VARBINARY))",
+        string.format("SELECT HEX(substr(x'%s', %s, %s))",
                       hex, i1, i2),
         {hexresult})
 end
diff --git a/test/sql-tap/tkt2942.test.lua b/test/sql-tap/tkt2942.test.lua
index 2c06e013e..10da68583 100755
--- a/test/sql-tap/tkt2942.test.lua
+++ b/test/sql-tap/tkt2942.test.lua
@@ -35,11 +35,11 @@ test:plan(4)
 test:do_execsql_test(
     "tkt2942.1",
     [[
-        create table t1(id  INT primary key, "num" int);
-        insert into t1 values (1, 2);
-        insert into t1 values (2, 1);
-        insert into t1 values (3, 3);
-        insert into t1 values (4, 4);
+        create table t1(id  INT primary key, "num" STRING);
+        insert into t1 values (1, '2');
+        insert into t1 values (2, '1');
+        insert into t1 values (3, '3');
+        insert into t1 values (4, '4');
         SELECT group_concat("num") FROM (SELECT "num" FROM t1 ORDER BY "num" DESC);
     ]], {
         -- <tkt2942.1>
diff --git a/test/sql-tap/uuid.test.lua b/test/sql-tap/uuid.test.lua
index 7c5477b33..056d0f636 100755
--- a/test/sql-tap/uuid.test.lua
+++ b/test/sql-tap/uuid.test.lua
@@ -288,14 +288,12 @@ test:do_execsql_test(
         uuid3
     })
 
-test:do_execsql_test(
+test:do_catchsql_test(
     "uuid-6.1.9",
     [[
         SELECT GROUP_CONCAT(u) from t2;
     ]], {
-        "11111111-1111-1111-1111-111111111111,"..
-        "11111111-3333-1111-1111-111111111111,"..
-        "22222222-1111-1111-1111-111111111111"
+        1, "Failed to execute SQL statement: wrong arguments for function GROUP_CONCAT()"
     })
 
 test:do_catchsql_test(
@@ -402,14 +400,12 @@ test:do_catchsql_test(
         1, "Failed to execute SQL statement: wrong arguments for function RANDOMBLOB()"
     })
 
-test:do_execsql_test(
+test:do_catchsql_test(
     "uuid-6.1.23",
     [[
         SELECT REPLACE(u, '1', '2') from t2;
     ]], {
-        "22222222-2222-2222-2222-222222222222",
-        "22222222-3333-2222-2222-222222222222",
-        "22222222-2222-2222-2222-222222222222"
+        1, "Failed to execute SQL statement: wrong arguments for function REPLACE()"
     })
 
 test:do_catchsql_test(
@@ -428,12 +424,12 @@ test:do_catchsql_test(
         1, "Failed to execute SQL statement: wrong arguments for function SOUNDEX()"
     })
 
-test:do_execsql_test(
+test:do_catchsql_test(
     "uuid-6.1.26",
     [[
         SELECT SUBSTR(u, 3, 3) from t2;
     ]], {
-        "111", "111", "222"
+        1, "Failed to execute SQL statement: wrong arguments for function SUBSTR()"
     })
 
 test:do_catchsql_test(
@@ -452,14 +448,12 @@ test:do_catchsql_test(
         1, "Failed to execute SQL statement: wrong arguments for function TOTAL()"
     })
 
-test:do_execsql_test(
+test:do_catchsql_test(
     "uuid-6.1.29",
     [[
         SELECT TRIM(u) from t2;
     ]], {
-        "11111111-1111-1111-1111-111111111111",
-        "11111111-3333-1111-1111-111111111111",
-        "22222222-1111-1111-1111-111111111111"
+        1, "Failed to execute SQL statement: wrong arguments for function TRIM()"
     })
 
 test:do_execsql_test(
diff --git a/test/sql-tap/view.test.lua b/test/sql-tap/view.test.lua
index bea1f7db2..e84fc033d 100755
--- a/test/sql-tap/view.test.lua
+++ b/test/sql-tap/view.test.lua
@@ -1280,7 +1280,7 @@ test:do_execsql_test(
             a(t) AS (
                 SELECT group_concat( substr('a', 1+least(iter/7,4), 1), '') FROM m2 GROUP BY cy
             )
-          SELECT group_concat(trim(t),x'0a') FROM a;
+          SELECT group_concat(CAST(trim(t) AS VARBINARY),x'0a') FROM a;
         SELECT * FROM v;
     ]], {
         -- <view-24.5>
diff --git a/test/sql-tap/with1.test.lua b/test/sql-tap/with1.test.lua
index 35f3dabb3..761004b23 100755
--- a/test/sql-tap/with1.test.lua
+++ b/test/sql-tap/with1.test.lua
@@ -549,7 +549,7 @@ test:do_execsql_test("8.1-mandelbrot", [[
       SELECT group_concat( substr(' .+*#', 1+LEAST(iter/7,4), 1), '')
       FROM m2 GROUP BY cy
     )
-  SELECT group_concat(TRIM(TRAILING FROM t),x'0a') FROM a;
+  SELECT group_concat(CAST(TRIM(TRAILING FROM t) AS VARBINARY),x'0a') FROM a;
 ]], {
   -- <8.1-mandelbrot>
   [[                                    ....#
diff --git a/test/sql/boolean.result b/test/sql/boolean.result
index 83b9a59bf..f82ec8f44 100644
--- a/test/sql/boolean.result
+++ b/test/sql/boolean.result
@@ -365,11 +365,8 @@ SELECT TOTAL(a) FROM t0;
  | ...
 SELECT GROUP_CONCAT(a, ' +++ ') FROM t0;
  | ---
- | - metadata:
- |   - name: COLUMN_1
- |     type: string
- |   rows:
- |   - ['FALSE +++ TRUE']
+ | - null
+ | - 'Failed to execute SQL statement: wrong arguments for function GROUP_CONCAT()'
  | ...
 
 -- Check BOOLEAN as binding parameter.
diff --git a/test/sql/prepared.result b/test/sql/prepared.result
index c4b09e514..9824a061c 100644
--- a/test/sql/prepared.result
+++ b/test/sql/prepared.result
@@ -471,7 +471,7 @@ s = prepare([[WITH RECURSIVE \
                       a(t) AS ( \
                           SELECT group_concat( substr(' .+*#', 1+LEAST(iter/7,4), 1), '') \
                               FROM m2 GROUP BY cy) \
-                  SELECT group_concat(TRIM(TRAILING FROM t),x'0a') FROM a;]])
+                  SELECT group_concat(CAST(TRIM(TRAILING FROM t) AS VARBINARY), x'0a') FROM a;]])
  | ---
  | ...
 
@@ -481,7 +481,7 @@ res = execute(s.stmt_id)
 res.metadata
  | ---
  | - - name: COLUMN_13
- |     type: string
+ |     type: varbinary
  | ...
 unprepare(s.stmt_id)
  | ---
diff --git a/test/sql/prepared.test.lua b/test/sql/prepared.test.lua
index 0a1fdebae..ee2470122 100644
--- a/test/sql/prepared.test.lua
+++ b/test/sql/prepared.test.lua
@@ -176,7 +176,7 @@ s = prepare([[WITH RECURSIVE \
                       a(t) AS ( \
                           SELECT group_concat( substr(' .+*#', 1+LEAST(iter/7,4), 1), '') \
                               FROM m2 GROUP BY cy) \
-                  SELECT group_concat(TRIM(TRAILING FROM t),x'0a') FROM a;]])
+                  SELECT group_concat(CAST(TRIM(TRAILING FROM t) AS VARBINARY), x'0a') FROM a;]])
 
 res = execute(s.stmt_id)
 res.metadata
diff --git a/test/sql/types.result b/test/sql/types.result
index ec80dfc14..cf893d857 100644
--- a/test/sql/types.result
+++ b/test/sql/types.result
@@ -807,11 +807,8 @@ box.execute("SELECT count(i) FROM t;")
 ...
 box.execute("SELECT group_concat(i) FROM t;")
 ---
-- metadata:
-  - name: COLUMN_1
-    type: string
-  rows:
-  - ['1,-1,18446744073709551613']
+- null
+- 'Failed to execute SQL statement: wrong arguments for function GROUP_CONCAT()'
 ...
 box.execute("DELETE FROM t WHERE i < 18446744073709551613;")
 ---
@@ -1279,7 +1276,7 @@ box.execute("SELECT group_concat(v) FROM t;")
 ---
 - metadata:
   - name: COLUMN_1
-    type: string
+    type: varbinary
   rows:
   - ['abc']
 ...
@@ -1841,11 +1838,8 @@ box.execute("SELECT count(d) FROM t;")
 ...
 box.execute("SELECT group_concat(d) FROM t;")
 ---
-- metadata:
-  - name: COLUMN_1
-    type: string
-  rows:
-  - ['10.0,-2.0,3.3,1.8e+19']
+- null
+- 'Failed to execute SQL statement: wrong arguments for function GROUP_CONCAT()'
 ...
 box.execute("SELECT lower(d) FROM t;")
 ---
-- 
2.25.1



More information about the Tarantool-patches mailing list