From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 660CA325B2 for ; Fri, 28 Jun 2019 09:12:02 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pfrNfoGtx2qx for ; Fri, 28 Jun 2019 09:12:02 -0400 (EDT) Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 1BA2F32505 for ; Fri, 28 Jun 2019 09:12:01 -0400 (EDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: [tarantool-patches] Re: [PATCH 1/2 v2] test: check that collations isn't ignored in SELECTs From: Roman Khabibov In-Reply-To: Date: Fri, 28 Jun 2019 16:11:59 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: References: <49f3a1279811efc66c580c6039cf1b890ff37889.1561372731.git.roman.habibov@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: "n. pettik" , Vladislav Shpilevoy Hi! Thanks for the review. > On Jun 25, 2019, at 8:30 PM, n.pettik wrote: >=20 >=20 >=20 >> On 24 Jun 2019, at 13:54, Roman Khabibov = wrote: >>=20 >> Add test to check that a new collation isn't ignored regardless >> of a name of a previous one in the following patterns of quries: >=20 > Nit: quries -> queries Fixed. >>=20 >> SELECT s COLLATE "unicode_ci" FROM a ORDER BY s COLLATE = =E2=80=9Cunicode_ci" >=20 > Why do you consider this kind of query? What can be wrong with it? > Specifying collation for result set members doesn=E2=80=99t make much = sense btw. I consider it, because it didn=E2=80=99t work after my addition of = checking from the second patch: +static int +check_collate_arg(struct Parse *parse, struct Expr *expr) +{ + struct Expr *left =3D expr->pLeft; + while (left->op =3D=3D TK_COLLATE) + left =3D left->pLeft; + enum field_type type =3D sql_expr_type(left); + if (type !=3D FIELD_TYPE_STRING && type !=3D FIELD_TYPE_SCALAR) = { + diag_set(ClientError, ER_SQL_PARSER_GENERIC, + "COLLATE clause can't be used with non-string " + "arguments"); + parse->is_aborted =3D true; + return -1; + } + return 0; +} The tree of this query included sequence of collations on left nodes. = This is the result of optimizations in multiSelectOrderBy. Now I can not exactly = say how It occurs. At first time, I didn=E2=80=99t use loop to descend = throughout left nodes. I added this loop, because of that reason. >> Also note: It is disallowed to compare strings with different >> collations: ISO/IEC JTC 1/SC 32, Part 2: Foundation, page 531 >> --- >> src/box/sql/resolve.c | 7 +++++++ >> test/sql-tap/collation.test.lua | 19 ++++++++++++++++++- >> 2 files changed, 25 insertions(+), 1 deletion(-) >>=20 >> diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c >> index fdf3703da..348b3ea9a 100644 >> --- a/src/box/sql/resolve.c >> +++ b/src/box/sql/resolve.c >> @@ -109,6 +109,13 @@ resolveAlias(Parse * pParse, /* Parsing = context */ >> return; >> if (zType[0] !=3D 'G') >> incrAggFunctionDepth(pDup, nSubquery); >> + /* >> + * If there was typed more than one explicit collations in >> + * query, it will be a sequence of left nodes with the >> + * collations in a tree. There is nothing special about >> + * keeping the sequence. Only one collation could be >> + * stored, but the present solution is simpler. >> + */ >=20 > Do not understand how mentioned example is related to this code. > I suppose you might mean example like: >=20 > SELECT s COLLATE =E2=80=9Cunicode=E2=80=9D COLLATE =E2=80=9Cbinary=E2=80= =9D COLLATE =E2=80=9Cunicode_ci=E2=80=9D =E2=80=A6 >=20 > Is this syntax allowed by ANSI? If so, which one (first or last) = collation must be used? >=20 >> if (pExpr->op =3D=3D TK_COLLATE) { >> pDup =3D >> sqlExprAddCollateString(pParse, pDup, = pExpr->u.zToken); >> diff --git a/test/sql-tap/collation.test.lua = b/test/sql-tap/collation.test.lua >> index 79547361c..f36540fc2 100755 >> --- a/test/sql-tap/collation.test.lua >> +++ b/test/sql-tap/collation.test.lua >> @@ -1,6 +1,6 @@ >> #!/usr/bin/env tarantool >> test =3D require("sqltester") >> -test:plan(174) >> +test:plan(177) >>=20 >> local prefix =3D "collation-" >>=20 >> @@ -529,4 +529,21 @@ 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"}) >>=20 >> +-- gh-3805 Check that collation is not ignored. >=20 > Why these test cases are related to the mentioned ticket? > Which collation might be ignored? I see two collations in > two different parts of query. First one is used during sorting > routines, second one is simply ignored (since values of > resulting set are not supposed to be compared with anything else). See above. >> + >> +test:do_execsql_test( >> + "collation-2.6.0", >> + [[ CREATE TABLE a (id INT PRIMARY KEY, s TEXT) ]], >> + {}) >> + >> +test:do_execsql_test( >> + "collation-2.6.1", >> + [[ INSERT INTO a VALUES (1, 'B'), (2, 'b') ]], >> + {}) >> + >> +test:do_execsql_test( >> + "collation-2.6.2", >> + [[ SELECT s COLLATE "unicode_ci" FROM a ORDER BY s COLLATE = "unicode" ]], >> + {"b","B=E2=80=9D}) >> + >> test:finish_test() >> --=20 >> 2.20.1 (Apple Git-117) >>=20 >=20