diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index 9c9a6d9e13a28715a7237eb2f7436782b10ca9df..e9a94a57495d465b580e869d600b437370b9ca0a 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -2407,11 +2407,8 @@ index_fill_def(struct Parse *parse, struct index *index,
if (expr->op == TK_COLLATE) {
sql_get_coll_seq(parse, expr->u.zToken, &coll_id);
if (coll_id == COLL_NONE &&
- strcasecmp(expr->u.zToken, "binary") != 0) {
- diag_set(ClientError, ER_NO_SUCH_COLLATION,
- expr->u.zToken);
+ strcmp(expr->u.zToken, "binary") != 0)
goto tnt_error;
- }
} else {
sql_column_collation(space_def, fieldno, &coll_id);
}
diff --git a/src/box/sql/callback.c b/src/box/sql/callback.c
index 3cf3a835d4d132f2ddca527a29dec25079e9bf6f..62904fd20bd466ec528ee5cd0479b8fcda753bb7 100644
--- a/src/box/sql/callback.c
+++ b/src/box/sql/callback.c
@@ -42,15 +42,16 @@
struct coll *
sql_get_coll_seq(Parse *parser, const char *name, uint32_t *coll_id)
{
- if (name == NULL || strcasecmp(name, "binary") == 0) {
+ if (name == NULL || strcmp(name, "binary") == 0) {
*coll_id = COLL_NONE;
return NULL;
}
struct coll_id *p = coll_by_name(name, strlen(name));
if (p == NULL) {
*coll_id = COLL_NONE;
- sqlite3ErrorMsg(parser, "no such collation sequence: %s",
- name);
+ diag_set(ClientError, ER_NO_SUCH_COLLATION, name);
+ parser->rc = SQL_TARANTOOL_ERROR;
+ parser->nErr++;
return NULL;
} else {
*coll_id = p->id;
diff --git a/test/sql-tap/collation.test.lua b/test/sql-tap/collation.test.lua
index dbbe1c0fec3a0ab787aac32c4f57444dd82eb008..9dfc6a3c124f7c9be3d70a4316634b635f5ad323 100755
--- a/test/sql-tap/collation.test.lua
+++ b/test/sql-tap/collation.test.lua
@@ -155,7 +155,7 @@ local data_test_unicode_ci = {
local data_collations = {
-- default collation = binary
{"/*COLLATE DEFAULT*/", data_test_binary_1},
- {"COLLATE BINARY", data_test_binary_1},
+ {"COLLATE \"binary\"", data_test_binary_1},
{"COLLATE \"unicode\"", data_test_unicode},
{"COLLATE \"unicode_ci\"", data_test_unicode_ci},
}
diff --git a/test/sql-tap/distinct.test.lua b/test/sql-tap/distinct.test.lua
index 26a4aace2c02098428f2b439974776adaa233a6a..8f6ca8ed9b9010a3135b61b856abdb11653fd6d2 100755
--- a/test/sql-tap/distinct.test.lua
+++ b/test/sql-tap/distinct.test.lua
@@ -124,9 +124,9 @@ local data = {
{"13.2", 0, "SELECT DISTINCT a, b, c COLLATE \"unicode_ci\" 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", 1, "SELECT DISTINCT a, b, c COLLATE binary 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", 1, "SELECT DISTINCT a, b, c COLLATE \"binary\" FROM t4"},
{"17", 0, --{ \/* Technically, it would be possible to detect that DISTINCT\n ** is a no-op in cases like the following. But SQLite 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/e_select1.test.lua b/test/sql-tap/e_select1.test.lua
index 47fb7a80958327f852a671b34a0d44e055fe0058..e1d814f471f86f2ec0ab0f37384f0fd73962f9ce 100755
--- a/test/sql-tap/e_select1.test.lua
+++ b/test/sql-tap/e_select1.test.lua
@@ -508,11 +508,11 @@ if (0 > 0)
test:do_execsql_test(
"e_select-1.6.0",
[[
- CREATE TABLE t5(a TEXT COLLATE "unicode_ci", b TEXT COLLATE binary);
+ CREATE TABLE t5(a TEXT COLLATE "unicode_ci", b TEXT COLLATE "binary");
INSERT INTO t5 VALUES('AA', 'cc');
INSERT INTO t5 VALUES('BB', 'dd');
INSERT INTO t5 VALUES(NULL, NULL);
- CREATE TABLE t6(a TEXT COLLATE binary, b TEXT COLLATE "unicode_ci");
+ CREATE TABLE t6(a TEXT COLLATE "binary", b TEXT COLLATE "unicode_ci");
INSERT INTO t6 VALUES('aa', 'cc');
INSERT INTO t6 VALUES('bb', 'DD');
INSERT INTO t6 VALUES(NULL, NULL);
@@ -997,7 +997,7 @@ test:do_execsql_test(
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);
+ CREATE TABLE b3(id INT PRIMARY KEY, a TEXT COLLATE "unicode_ci", b TEXT COLLATE "binary");
INSERT INTO b3 VALUES(1, 'abc', 'abc');
INSERT INTO b3 VALUES(2, 'aBC', 'aBC');
INSERT INTO b3 VALUES(3, 'Def', 'Def');
@@ -1289,7 +1289,7 @@ test:do_select_tests(
{"1", "SELECT DISTINCT b FROM h1", {"one", "I", "i", "four", "IV", "iv"}},
{"2", "SELECT DISTINCT b COLLATE \"unicode_ci\" FROM h1", {"one", "I", "four", "IV"}},
{"3", "SELECT DISTINCT x FROM h2", {"One", "Two", "Three", "Four"}},
- {"4", "SELECT DISTINCT x COLLATE binary FROM h2", {
+ {"4", "SELECT DISTINCT x COLLATE \"binary\" FROM h2", {
"One", "Two", "Three", "Four", "one", "two", "three", "four"
}},
})
@@ -1574,7 +1574,7 @@ test:drop_all_tables()
test:do_execsql_test(
"e_select-7.10.0",
[[
- CREATE TABLE y1(a TEXT COLLATE "unicode_ci" PRIMARY KEY, b TEXT COLLATE binary, c TEXT );
+ CREATE TABLE y1(a TEXT COLLATE "unicode_ci" PRIMARY KEY, b TEXT COLLATE "binary", c TEXT );
INSERT INTO y1 VALUES('Abc', 'abc', 'aBC');
]], {
-- <e_select-7.10.0>
@@ -1588,12 +1588,12 @@ test:do_select_tests(
{"1", "SELECT 'abc' UNION SELECT 'ABC'", {"ABC", "abc"}},
{"2", "SELECT 'abc' COLLATE \"unicode_ci\" UNION SELECT 'ABC'", {"ABC" }},
{"3", "SELECT 'abc' UNION SELECT 'ABC' COLLATE \"unicode_ci\"", {"ABC" }},
- {"4", "SELECT 'abc' COLLATE binary UNION SELECT 'ABC' COLLATE \"unicode_ci\"", {"ABC", "abc"}},
- {"5", "SELECT 'abc' COLLATE \"unicode_ci\" UNION SELECT 'ABC' COLLATE binary", {"ABC" }},
+ {"4", "SELECT 'abc' COLLATE \"binary\" UNION SELECT 'ABC' COLLATE \"unicode_ci\"", {"ABC", "abc"}},
+ {"5", "SELECT 'abc' COLLATE \"unicode_ci\" UNION SELECT 'ABC' COLLATE \"binary\"", {"ABC" }},
{"6", "SELECT a FROM y1 UNION SELECT b FROM y1", {"abc" }},
{"7", "SELECT b FROM y1 UNION SELECT a FROM y1", {"Abc", "abc"}},
{"8", "SELECT a FROM y1 UNION SELECT c FROM y1", {"aBC" }},
- {"9", "SELECT a FROM y1 UNION SELECT c COLLATE binary FROM y1", {"aBC" }},
+ {"9", "SELECT a FROM y1 UNION SELECT c COLLATE \"binary\" FROM y1", {"aBC" }},
})
-- EVIDENCE-OF: R-32706-07403 No affinity transformations are applied to
@@ -1932,7 +1932,7 @@ test:do_execsql_test(
test:do_execsql_test(
"e_select-8.9.1",
[[
- SELECT x FROM d4 ORDER BY 1 COLLATE binary
+ SELECT x FROM d4 ORDER BY 1 COLLATE "binary"
]], {
-- <e_select-8.9.1>
"DEF", "JKL", "abc", "ghi"
@@ -1942,7 +1942,7 @@ test:do_execsql_test(
test:do_execsql_test(
"e_select-8.9.2",
[[
- SELECT x COLLATE binary FROM d4 ORDER BY 1 COLLATE "unicode_ci"
+ SELECT x COLLATE "binary" FROM d4 ORDER BY 1 COLLATE "unicode_ci"
]], {
-- <e_select-8.9.2>
"abc", "DEF", "ghi", "JKL"
@@ -1963,7 +1963,7 @@ test:do_execsql_test(
test:do_execsql_test(
"e_select-8.10.1",
[[
- SELECT x COLLATE binary FROM d4 ORDER BY 1
+ SELECT x COLLATE "binary" FROM d4 ORDER BY 1
]], {
-- <e_select-8.10.1>
"DEF", "JKL", "abc", "ghi"
@@ -1973,7 +1973,7 @@ test:do_execsql_test(
test:do_execsql_test(
"e_select-8.10.2",
[[
- SELECT x COLLATE binary FROM d4 ORDER BY x
+ SELECT x COLLATE "binary" FROM d4 ORDER BY x
]], {
-- <e_select-8.10.2>
"abc", "DEF", "ghi", "JKL"
@@ -1983,7 +1983,7 @@ test:do_execsql_test(
test:do_execsql_test(
"e_select-8.10.3",
[[
- SELECT x COLLATE binary AS x FROM d4 ORDER BY x
+ SELECT x COLLATE "binary" AS x FROM d4 ORDER BY x
]], {
-- <e_select-8.10.3>
"DEF", "JKL", "abc", "ghi"
diff --git a/test/sql-tap/identifier_case.test.lua b/test/sql-tap/identifier_case.test.lua
index 096130a520e7f5d50a1e368bed277594b529948b..4878ced652ecc4daae04a9124e32612fe011f8e0 100755
--- a/test/sql-tap/identifier_case.test.lua
+++ b/test/sql-tap/identifier_case.test.lua
@@ -201,10 +201,10 @@ end
-- Check that collaiton names work as identifiers
data = {
- { 1, [[ binary ]], {0}},
- { 2, [[ BINARY ]], {0}},
+ { 1, [[ binary ]], {1, "Collation 'BINARY' does not exist"}},
+ { 2, [[ BINARY ]], {1, "Collation 'BINARY' does not exist"}},
{ 3, [["binary"]], {0}},
- { 4, [["bInaRy"]], {0}},
+ { 4, [["bInaRy"]], {1, "Collation 'bInaRy' does not exist"}},
{ 5, [["unicode"]], {0}},
{ 6, [[ unicode ]], {1,"Collation 'UNICODE' does not exist"}},
{ 7, [["UNICODE"]], {1,"Collation 'UNICODE' does not exist"}}
@@ -234,12 +234,12 @@ test:do_catchsql_test(
{0})
data = {
- { 1, [[ 'a' < 'b' collate binary ]], {0, {1}}},
+ { 1, [[ 'a' < 'b' collate binary ]], {1, "Collation 'BINARY' does not exist"}},
{ 2, [[ 'a' < 'b' collate "binary" ]], {0, {1}}},
{ 3, [[ 'a' < 'b' collate 'binary' ]], {1, [[near "'binary'": syntax error]]}},
{ 4, [[ 'a' < 'b' collate "unicode" ]], {0, {1}}},
{ 5, [[ 5 < 'b' collate "unicode" ]], {0, {1}}},
- { 6, [[ 5 < 'b' collate unicode ]], {1,"no such collation sequence: UNICODE"}},
+ { 6, [[ 5 < 'b' collate unicode ]], {1,"Collation 'UNICODE' does not exist"}},
{ 7, [[ 5 < 'b' collate "unicode_ci" ]], {0, {1}}},
}
diff --git a/test/sql-tap/in3.test.lua b/test/sql-tap/in3.test.lua
index 83139a3e43de8d82a96574e7d45525fc80047498..e6f0d415da8cdfa10ead2bad29c64945674a81b5 100755
--- a/test/sql-tap/in3.test.lua
+++ b/test/sql-tap/in3.test.lua
@@ -206,7 +206,7 @@ test:do_test(
test:do_test(
"in3-1.15",
function()
- return exec_neph(" SELECT a FROM t1 WHERE a COLLATE binary IN (SELECT a FROM t1) ")
+ return exec_neph(" SELECT a FROM t1 WHERE a COLLATE \"binary\" IN (SELECT a FROM t1) ")
end, {
-- <in3-1.15>
0, 1, 3, 5
diff --git a/test/sql-tap/in5.test.lua b/test/sql-tap/in5.test.lua
index 4e2cdcd2420b98e35aa2dca4fa893a118a91badf..ba21170ee31b8eda099a1e28bf90ebb99f5f5066 100755
--- a/test/sql-tap/in5.test.lua
+++ b/test/sql-tap/in5.test.lua
@@ -277,7 +277,7 @@ test:do_execsql_test(
test:do_execsql_test(
"6.1.2",
[[
- SELECT count(*) FROM t1 WHERE a COLLATE BINARY IN (SELECT DISTINCT a FROM t1)
+ SELECT count(*) FROM t1 WHERE a COLLATE "binary" IN (SELECT DISTINCT a FROM t1)
]], {
-- <6.1.2>
1
diff --git a/test/sql-tap/index3.test.lua b/test/sql-tap/index3.test.lua
index 4f950be090afe3c2a56e093061f5dd9e698b4e25..222b895aaf04ea30c3d84b860ff5e8ec4f35cb9f 100755
--- a/test/sql-tap/index3.test.lua
+++ b/test/sql-tap/index3.test.lua
@@ -59,7 +59,7 @@ test:do_execsql_test(
CREATE TABLE t1(a INT , b TEXT , c INT , d INT , e INT ,
PRIMARY KEY(a), UNIQUE(b COLLATE "unicode_ci" DESC));
CREATE INDEX t1c ON t1(c);
- CREATE INDEX t1d ON t1(d COLLATE binary ASC);
+ CREATE INDEX t1d ON t1(d COLLATE "binary" ASC);
WITH RECURSIVE c(x) AS (VALUES(1) UNION SELECT x+1 FROM c WHERE x<30)
INSERT INTO t1(a,b,c,d,e)
SELECT x, printf('ab%03xxy',x), x, x, x FROM c;
diff --git a/test/sql-tap/minmax3.test.lua b/test/sql-tap/minmax3.test.lua
index 1ddf39ff50047bb0dede6456bf8edb9cb715287f..348275ffab102301b41aa56cbadc4f271e34131f 100755
--- a/test/sql-tap/minmax3.test.lua
+++ b/test/sql-tap/minmax3.test.lua
@@ -502,7 +502,7 @@ test:do_execsql_test(
test:do_execsql_test(
"minmax3-4.4",
[[
- SELECT max(x COLLATE binary), max(x COLLATE "unicode_ci") FROM t4;
+ SELECT max(x COLLATE "binary"), max(x COLLATE "unicode_ci") FROM t4;
]], {
-- <minmax3-4.4>
"abc", "BCD"
@@ -564,7 +564,7 @@ test:do_execsql_test(
test:do_execsql_test(
"minmax3-4.13",
[[
- SELECT min(x COLLATE binary), min(x COLLATE "unicode_ci") FROM t4;
+ SELECT min(x COLLATE "binary"), min(x COLLATE "unicode_ci") FROM t4;
]], {
-- <minmax3-4.13>
"BCD", "abc"
diff --git a/test/sql-tap/resolver01.test.lua b/test/sql-tap/resolver01.test.lua
index d08f95bf6ef139d8b184ae9ca7fe30c0ed9572fc..7be2184e5eac00d04619021a8e4d8d23a089304c 100755
--- a/test/sql-tap/resolver01.test.lua
+++ b/test/sql-tap/resolver01.test.lua
@@ -236,7 +236,7 @@ test:do_test(
]])
local r = {}
table.insert(r, test:execsql("SELECT '1', substr(m,2) AS m FROM t4 ORDER BY m;"))
- table.insert(r, test:execsql("SELECT '2', substr(m,2) AS m FROM t4 ORDER BY m COLLATE binary;"))
+ table.insert(r, test:execsql("SELECT '2', substr(m,2) AS m FROM t4 ORDER BY m COLLATE \"binary\";"))
table.insert(r, test:execsql("SELECT '3', substr(m,2) AS m FROM t4 ORDER BY lower(m);"))
return r
end, {
diff --git a/test/sql-tap/selectE.test.lua b/test/sql-tap/selectE.test.lua
index 11b84711e5829500f66688bc7280dcb34cdbdd29..b379f5aa85143955d2b93264cdf5ee23b959ee25 100755
--- a/test/sql-tap/selectE.test.lua
+++ b/test/sql-tap/selectE.test.lua
@@ -84,7 +84,7 @@ test:do_test(
function()
return test:execsql [[
SELECT a FROM t2 EXCEPT SELECT a FROM t3
- ORDER BY a COLLATE binary;
+ ORDER BY a COLLATE "binary";
]]
end, {
-- <selectE-1.2>
@@ -127,7 +127,7 @@ test:do_test(
function()
return test:execsql [[
SELECT a COLLATE "unicode_ci" FROM t2 EXCEPT SELECT a FROM t3
- ORDER BY 1 COLLATE binary
+ ORDER BY 1 COLLATE "binary"
]]
end, {
-- <selectE-2.2>
diff --git a/test/sql-tap/tkt2391.test.lua b/test/sql-tap/tkt2391.test.lua
index 7fa5e1634db27e2dfb9f6bfa7adbd12ff2dc4afc..b48998c5364c9af70989ee8f9f513a5e3b6f3c8b 100755
--- a/test/sql-tap/tkt2391.test.lua
+++ b/test/sql-tap/tkt2391.test.lua
@@ -20,7 +20,7 @@ test:plan(4)
test:do_execsql_test(
"tkt2391.1",
[[
- CREATE TABLE folders(folderid INT , parentid INT , foldername TEXT COLLATE binary primary key);
+ CREATE TABLE folders(folderid INT , parentid INT , foldername TEXT COLLATE "binary" primary key);
INSERT INTO folders VALUES(1, 3, 'FolderA');
INSERT INTO folders VALUES(1, 3, 'folderB');
INSERT INTO folders VALUES(4, 0, 'FolderC');
diff --git a/test/sql-tap/tkt3493.test.lua b/test/sql-tap/tkt3493.test.lua
index 26ca2271bb3d79816d03ad9004e2760377681b43..7e093b21729861e05dc48973116566fed35a5fbd 100755
--- a/test/sql-tap/tkt3493.test.lua
+++ b/test/sql-tap/tkt3493.test.lua
@@ -246,7 +246,7 @@ test:do_execsql_test(
test:do_execsql_test(
"tkt3493-3.1",
[[
- CREATE TABLE t2(a TEXT COLLATE "unicode_ci" PRIMARY KEY, b TEXT COLLATE BINARY);
+ CREATE TABLE t2(a TEXT COLLATE "unicode_ci" PRIMARY KEY, b TEXT COLLATE "binary");
INSERT INTO t2 VALUES('aBc', 'DeF');
]], {
-- <tkt3493-3.1>
@@ -291,7 +291,7 @@ test:do_execsql_test(
test:do_execsql_test(
"tkt3493-3.3.2",
[[
- SELECT a>b COLLATE BINARY FROM t2 GROUP BY a, b
+ SELECT a>b COLLATE "binary" FROM t2 GROUP BY a, b
]], {
-- <tkt3493-3.3.2>
1
diff --git a/test/sql-tap/with1.test.lua b/test/sql-tap/with1.test.lua
index faa99811cff65d8b36998e25da21c65537123224..8200d25f8355022d149f0da4707fc2c64cab92fb 100755
--- a/test/sql-tap/with1.test.lua
+++ b/test/sql-tap/with1.test.lua
@@ -1056,7 +1056,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 COLLATE "binary";
]], {
-- <14.1>