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 0837F28DF5 for ; Tue, 28 May 2019 10:10:18 -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 B0ZGFisFcPSS for ; Tue, 28 May 2019 10:10:17 -0400 (EDT) Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 BC80F242C1 for ; Tue, 28 May 2019 10:10:17 -0400 (EDT) Content-Type: text/plain; charset=us-ascii 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, 28 May 2019 17:10:15 +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 Hi! Thanks for the review. > 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. 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. + */ 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 @@ -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. Must pass. + +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()=