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 A80F5302BA for ; Tue, 4 Jun 2019 10:00:52 -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 Y9JrHS8sYR0r for ; Tue, 4 Jun 2019 10:00:52 -0400 (EDT) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 06022302B2 for ; Tue, 4 Jun 2019 10:00:51 -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] sql: fix collation node duplication in AST From: Roman Khabibov In-Reply-To: Date: Tue, 4 Jun 2019 17:00:49 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: References: 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: Vladislav Shpilevoy Hello, thanks for the review. > On Jun 2, 2019, at 8:09 PM, Vladislav Shpilevoy = wrote: >=20 > Hi! Thanks for the fixes! See 2 comments below. >=20 > On 28/05/2019 17:10, Roman Khabibov wrote: >> Hi! Thanks for the review. >>=20 >>> I vote for the second as the simplest, and add a test provided by me >>> above to ensure we will never break it accidentally. >>>=20 >>> This commit should consist of the test and a comment in = resolveAlias. >>> And keep this nice ASCII schema. >>=20 >> diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c >> index 504096e6d..f952d8c04 100644 >> --- a/src/box/sql/resolve.c >> +++ b/src/box/sql/resolve.c >> @@ -109,6 +109,11 @@ 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. >> + */ >=20 > 1. Please, add a comment, that there is nothing special about > keeping the sequence. Only one collation could be stored, but > the present solution is simpler. diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c index 504096e6d..30b9bd9d6 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. + */ if (pExpr->op =3D=3D TK_COLLATE) { pDup =3D sqlExprAddCollateString(pParse, pDup, = pExpr->u.zToken); >> 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 0bf54576d..3c5d3053a 100755 >> --- a/test/sql-tap/collation.test.lua >> +++ b/test/sql-tap/collation.test.lua >> @@ -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. Must pass. >=20 > 2. Of course it must pass. It is the purpose of test. Please, > drop 'Must pass=E2=80=99. Removed. commit c409d222c500ef2b355d0c4061a3931aa6374780 Author: Roman Khabibov Date: Mon May 6 14:45:51 2019 +0300 test: check that collations isn't ignored in SELECTs =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 SELECT s COLLATE "unicode_ci" FROM a ORDER BY s COLLATE "unicode_ci" =20 Also note: It is disallowed to compare strings with different collations: ISO/IEC JTC 1/SC 32, Part 2: Foundation, page 531 diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c index 504096e6d..30b9bd9d6 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. + */ 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 0bf54576d..9d0076e1d 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. + +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"}) + test:finish_test()