diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c
index 7673832764fa52949caae4ad36e30b086ae071ef..466e3494d34e2c17d11fbcb6887308dd762cabe2 100644
--- a/src/box/sql/expr.c
+++ b/src/box/sql/expr.c
@@ -197,6 +197,34 @@ sqlExprSkipCollate(Expr * pExpr)
return pExpr;
}
+/*
+ * Check that left node of @a expr with the collation in the root
+ * can be used with <COLLATE>. If it is not, leave an error
+ * message in pParse.
+ *
+ * @param parse Parser context.
+ * @param expr Expression for checking.
+ *
+ * @retval 0 on success.
+ * @retval -1 on error.
+ */
+static int
+check_collate_arg(struct Parse *parse, struct Expr *expr)
+{
+ struct Expr *left = expr->pLeft;
+ while (left->op == TK_COLLATE)
+ left = left->pLeft;
+ enum field_type type = sql_expr_type(left);
+ if (type != FIELD_TYPE_STRING && type != FIELD_TYPE_SCALAR) {
+ diag_set(ClientError, ER_SQL_PARSER_GENERIC,
+ "COLLATE clause can't be used with non-string "
+ "arguments");
+ parse->is_aborted = true;
+ return -1;
+ }
+ return 0;
+}
+
int
sql_expr_coll(Parse *parse, Expr *p, bool *is_explicit_coll, uint32_t *coll_id,
struct coll **coll)
@@ -4165,6 +4193,8 @@ sqlExprCodeTarget(Parse * pParse, Expr * pExpr, int target)
}
case TK_SPAN:
case TK_COLLATE:{
+ if (check_collate_arg(pParse, pExpr) != 0)
+ break;
return sqlExprCodeTarget(pParse, pExpr->pLeft,
target);
}
@@ -4389,7 +4419,6 @@ int
sqlExprCodeTemp(Parse * pParse, Expr * pExpr, int *pReg)
{
int r2;
- pExpr = sqlExprSkipCollate(pExpr);
if (ConstFactorOk(pParse)
&& pExpr->op != TK_REGISTER && sqlExprIsConstantNotJoin(pExpr)
) {
diff --git a/test/sql-tap/collation.test.lua b/test/sql-tap/collation.test.lua
index 79547361c9a212cc6cf12e0cccfd883964c5b65e..edf4a28b9ce77e57ae01e0ac65012bdfb3644e0f 100755
--- a/test/sql-tap/collation.test.lua
+++ b/test/sql-tap/collation.test.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env tarantool
test = require("sqltester")
-test:plan(174)
+test:plan(190)
local prefix = "collation-"
@@ -529,4 +529,87 @@ test:do_catchsql_test(
'CREATE TABLE test3 (a int, b int, c int, PRIMARY KEY (a, a COLLATE foo, b, c))',
{1, "Collation 'FOO' does not exist"})
+-- gh-3805 Check COLLATE passing with string-like args only.
+
+test:do_execsql_test(
+ "collation-2.7.0",
+ [[ CREATE TABLE test1 (one INT PRIMARY KEY, two INT) ]],
+ {})
+
+test:do_catchsql_test(
+ "collation-2.7.1",
+ 'SELECT one COLLATE "binary" FROM test1',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_catchsql_test(
+ "collation-2.7.2",
+ 'SELECT one COLLATE "unicode_ci" FROM test1',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_catchsql_test(
+ "collation-2.7.3",
+ 'SELECT two COLLATE "binary" FROM test1',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+
+test:do_catchsql_test(
+ "collation-2.7.4",
+ 'SELECT (one + two) COLLATE "binary" FROM test1',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_catchsql_test(
+ "collation-2.7.5",
+ 'SELECT (SELECT one FROM test1) COLLATE "binary"',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_execsql_test(
+ "collation-2.7.6",
+ 'SELECT TRIM(\'A\') COLLATE "binary"',
+ {"A"})
+
+test:do_catchsql_test(
+ "collation-2.7.7",
+ 'SELECT RANDOM() COLLATE "binary"',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_catchsql_test(
+ "collation-2.7.8",
+ 'SELECT LENGTH(\'A\') COLLATE "binary"',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_catchsql_test(
+ "collation-2.7.9",
+ 'SELECT TRUE COLLATE "unicode"',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_catchsql_test(
+ "collation-2.7.10",
+ 'SELECT NOT TRUE COLLATE "unicode"',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_catchsql_test(
+ "collation-2.7.11",
+ 'SELECT TRUE AND TRUE COLLATE "unicode"',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_catchsql_test(
+ "collation-2.7.12",
+ 'SELECT 1 | 1 COLLATE "unicode"',
+ {1, "COLLATE clause can't be used with non-string arguments"})
+
+test:do_execsql_test(
+ "collation-2.7.14",
+ 'SELECT +\'str\' COLLATE "unicode"',
+ {"str"})
+
+test:do_execsql_test(
+ "collation-2.7.15",
+ 'SELECT (\'con\'||\'cat\') COLLATE "unicode"',
+ {"concat"})
+
+test:do_execsql_test(
+ "collation-2.7.16",
+ 'SELECT (SELECT \'str\') COLLATE "binary" COLLATE "binary";',
+ {"str"})
+
test:finish_test()
diff --git a/test/sql-tap/distinct.test.lua b/test/sql-tap/distinct.test.lua
index e6970084e85d5c824fcb39813de12c3420e38ac6..ae35a0db55beca1fe27667b4e8ce5c59dff0b78e 100755
--- a/test/sql-tap/distinct.test.lua
+++ b/test/sql-tap/distinct.test.lua
@@ -121,12 +121,12 @@ local data = {
{"12.1", 0, "SELECT DISTINCT a, d FROM t1"},
{"12.2", 0, "SELECT DISTINCT a, d FROM t4"},
{"13.1", 0, "SELECT DISTINCT a, b, c COLLATE \"unicode_ci\" FROM t1"},
- {"13.2", 0, "SELECT DISTINCT a, b, c COLLATE \"unicode_ci\" FROM t4"},
+ {"13.2", 1, "SELECT DISTINCT a, b, c FROM t4"},
{"14.1", 0, "SELECT DISTINCT a, d COLLATE \"unicode_ci\" FROM t1"},
{"14.2", 1, "SELECT DISTINCT a, d COLLATE \"unicode_ci\" FROM t4"},
{"15 ", 0, "SELECT DISTINCT a, d COLLATE \"binary\" FROM t1"},
{"16.1", 0, "SELECT DISTINCT a, b, c COLLATE \"binary\" FROM t1"},
- {"16.2", 0, "SELECT DISTINCT a, b, c COLLATE \"binary\" FROM t4"},
+ {"16.2", 1, "SELECT DISTINCT a, b, c FROM t4"},
{"17", 0, --{ \/* Technically, it would be possible to detect that DISTINCT\n ** is a no-op in cases like the following. But sql does not\n ** do so. *\/\n
"SELECT DISTINCT t1.id FROM t1, t2 WHERE t1.id=t2.x" },
{"18 ", 1, "SELECT DISTINCT c1, c2 FROM t3"},
@@ -173,7 +173,7 @@ data = {
{"a, b, c FROM t1", {"btree"}, {"A", "B", "C", "a", "b", "c"}},
{"a, b, c FROM t1 ORDER BY a, b, c", {"btree"}, {"A", "B", "C", "a", "b", "c"}},
{"b FROM t1 WHERE a = 'a'", {}, {"b"}},
- {"b FROM t1 ORDER BY +b COLLATE \"binary\"", {"btree", "btree"}, {"B", "b"}},
+ {"b FROM t1 ORDER BY b COLLATE \"binary\"", {"btree", "btree"}, {"B", "b"}},
{"a FROM t1", {}, {"A", "a"}},
{"b COLLATE \"unicode_ci\" FROM t1", {}, {"b"}},
{"b COLLATE \"unicode_ci\" FROM t1 ORDER BY b COLLATE \"unicode_ci\"", {}, {"b"}},
diff --git a/test/sql-tap/identifier_case.test.lua b/test/sql-tap/identifier_case.test.lua
index 4db729f116890e20891f1c17a0a68784ce08cc01..65ed9aea156bb0ce1c6e0860d3ce2b90c4aef3a1 100755
--- a/test/sql-tap/identifier_case.test.lua
+++ b/test/sql-tap/identifier_case.test.lua
@@ -166,7 +166,7 @@ test:do_execsql_test(
test:do_execsql_test(
test_prefix.."4.1",
- string.format([[select * from table1 order by a collate "unicode_ci"]]),
+ string.format([[select * from table1 order by a]]),
{}
)
diff --git a/test/sql-tap/in3.test.lua b/test/sql-tap/in3.test.lua
index 4677c492542915d163f8e29f723a04f21ce6a3de..ce42c5cdb6e83dca6cb80e6c388650023a1ead75 100755
--- a/test/sql-tap/in3.test.lua
+++ b/test/sql-tap/in3.test.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env tarantool
test = require("sqltester")
-test:plan(27)
+test:plan(29)
--!./tcltestrunner.lua
-- 2007 November 29
@@ -186,7 +186,17 @@ test:do_test(
-- </in3-1.13>
})
-
+test:do_execsql_test(
+ "in3-1.14",
+ [[
+ CREATE TABLE t2(a TEXT PRIMARY KEY);
+ INSERT INTO t2 VALUES('A');
+ INSERT INTO t2 VALUES('B');
+ INSERT INTO t2 VALUES('C');
+ ]], {
+ -- <in3-1.14>
+ -- </in3-1.14>
+ })
-- The first of these queries has to use the temp-table, because the
-- collation sequence used for the index on "t1.a" does not match the
@@ -194,23 +204,32 @@ test:do_test(
-- require a temp-table, because the collation sequences match.
--
test:do_test(
- "in3-1.14",
+ "in3-1.15",
function()
- return exec_neph(" SELECT a FROM t1 WHERE a COLLATE \"unicode_ci\" IN (SELECT a FROM t1) ")
+ return exec_neph(" SELECT a FROM t2 WHERE a COLLATE \"unicode_ci\" IN (SELECT a FROM t2) ")
end, {
- -- <in3-1.14>
- 1, 1, 3, 5
- -- </in3-1.14>
+ -- <in3-1.15>
+ 1, "A", "B", "C"
+ -- </in3-1.15>
})
test:do_test(
- "in3-1.15",
+ "in3-1.16",
function()
- return exec_neph(" SELECT a FROM t1 WHERE a COLLATE \"binary\" IN (SELECT a FROM t1) ")
+ return exec_neph(" SELECT a FROM t2 WHERE a COLLATE \"binary\" IN (SELECT a FROM t2) ")
end, {
- -- <in3-1.15>
- 1, 1, 3, 5
- -- </in3-1.15>
+ -- <in3-1.16>
+ 1, "A", "B", "C"
+ -- </in3-1.16>
+ })
+
+test:do_execsql_test(
+ "in3-1.17",
+ [[
+ DROP TABLE t2
+ ]], {
+ -- <in3-1.17>
+ -- </in3-1.17>
})
-- Neither of these queries require a temp-table. The collation sequence
diff --git a/test/sql-tap/resolver01.test.lua b/test/sql-tap/resolver01.test.lua
index 9fcf0c7c0caddf6d52039d2ed333b02ef242f0a1..315c892ac398971cdc86b9c8d9931c1f63240f97 100755
--- a/test/sql-tap/resolver01.test.lua
+++ b/test/sql-tap/resolver01.test.lua
@@ -106,7 +106,7 @@ test:do_catchsql_test(
test:do_catchsql_test(
"resolver01-2.1",
[[
- SELECT 2 AS y FROM t1, t2 ORDER BY y COLLATE "unicode_ci";
+ SELECT 2 AS y FROM t1, t2 ORDER BY y;
]], {
-- <resolver01-2.1>
0, {2}
@@ -116,7 +116,7 @@ test:do_catchsql_test(
test:do_catchsql_test(
"resolver01-2.2",
[[
- SELECT 2 AS yy FROM t1, t2 ORDER BY y COLLATE "unicode_ci";
+ SELECT 2 AS yy FROM t1, t2 ORDER BY y;
]], {
-- <resolver01-2.2>
1, "ambiguous column name: Y"
@@ -126,7 +126,7 @@ test:do_catchsql_test(
test:do_catchsql_test(
"resolver01-2.3",
[[
- SELECT x AS y FROM t3 ORDER BY y COLLATE "unicode_ci";
+ SELECT x AS y FROM t3 ORDER BY y;
]], {
-- <resolver01-2.3>
0, {11, 33}
@@ -136,7 +136,7 @@ test:do_catchsql_test(
test:do_catchsql_test(
"resolver01-2.4",
[[
- SELECT x AS yy FROM t3 ORDER BY y COLLATE "unicode_ci";
+ SELECT x AS yy FROM t3 ORDER BY y;
]], {
-- <resolver01-2.4>
0, {33, 11}
@@ -146,7 +146,7 @@ test:do_catchsql_test(
test:do_catchsql_test(
"resolver01-2.5",
[[
- SELECT x AS yy FROM t3 ORDER BY yy COLLATE "unicode_ci";
+ SELECT x AS yy FROM t3 ORDER BY yy;
]], {
-- <resolver01-2.5>
0, {11, 33}
@@ -156,7 +156,7 @@ test:do_catchsql_test(
test:do_catchsql_test(
"resolver01-2.6",
[[
- SELECT x AS yy FROM t3 ORDER BY 1 COLLATE "unicode_ci";
+ SELECT x AS yy FROM t3 ORDER BY 1;
]], {
-- <resolver01-2.6>
0, {11, 33}
diff --git a/test/sql-tap/select1.test.lua b/test/sql-tap/select1.test.lua
index 58a523787df14c832cfa710559a6cbcec67ae2d6..87689a58479f4b0f293a4f369851f8e2733be997 100755
--- a/test/sql-tap/select1.test.lua
+++ b/test/sql-tap/select1.test.lua
@@ -1672,7 +1672,7 @@ test:do_execsql_test(
test:do_execsql_test(
"select1-10.7",
[[
- SELECT f1 COLLATE "unicode_ci" AS x FROM test1 ORDER BY x
+ SELECT f1 AS x FROM test1 ORDER BY x
]], {
-- <select1-10.7>
11, 33
diff --git a/test/sql-tap/tkt-b75a9ca6b0.test.lua b/test/sql-tap/tkt-b75a9ca6b0.test.lua
index 89817d2afa998eab98c3dc75a75847a6513574da..dde6ab50206e01e340ac895744b83cb648ffc154 100755
--- a/test/sql-tap/tkt-b75a9ca6b0.test.lua
+++ b/test/sql-tap/tkt-b75a9ca6b0.test.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env tarantool
test = require("sqltester")
-test:plan(22)
+test:plan(20)
--!./tcltestrunner.lua
-- 2014-04-21
@@ -57,7 +57,6 @@ local eqps = {
{"SELECT x,y FROM t1 GROUP BY x, y ORDER BY x, y DESC", {1, 3, 2, 2, 3, 1}, {idxscan, sort}},
{"SELECT x,y FROM t1 GROUP BY x, y ORDER BY x DESC, y DESC", {3, 1, 2, 2, 1, 3}, {idxscan, sort}},
{"SELECT x,y FROM t1 GROUP BY x, y ORDER BY x ASC, y ASC", {1, 3, 2, 2, 3, 1}, {idxscan}},
- {"SELECT x,y FROM t1 GROUP BY x, y ORDER BY x COLLATE \"unicode_ci\", y", {1, 3, 2, 2, 3, 1}, {idxscan, sort}},
}
for tn, val in ipairs(eqps) do
local q = val[1]
diff --git a/test/sql-tap/with1.test.lua b/test/sql-tap/with1.test.lua
index ec45e5e76be533fd67f820bb64d1a555045f417f..6985c589e60f6f95d745c8410622fde8c8482cce 100755
--- a/test/sql-tap/with1.test.lua
+++ b/test/sql-tap/with1.test.lua
@@ -1043,7 +1043,7 @@ test:do_catchsql_test(13.3, [[
-- 2015-04-12
--
test:do_execsql_test(14.1, [[
- WITH x AS (SELECT * FROM t) SELECT 0 EXCEPT SELECT 0 ORDER BY 1 COLLATE "binary";
+ WITH x AS (SELECT * FROM t) SELECT 0 EXCEPT SELECT 0 ORDER BY 1;
]], {
-- <14.1>