From: Roman Khabibov <roman.habibov@tarantool.org> To: tarantool-patches@freelists.org Cc: "n. pettik" <korablev@tarantool.org> Subject: [tarantool-patches] Re: [PATCH 1/2 v2] test: check that collations isn't ignored in SELECTs Date: Fri, 28 Jun 2019 16:13:37 +0300 [thread overview] Message-ID: <6E3410C5-7C18-462A-8A0E-117A7D286545@tarantool.org> (raw) In-Reply-To: <AE5F8A72-D7CD-40A0-BC72-34CD56EC396D@tarantool.org> Forgot. commit 40690ab014e80d954c0139506ed41b0aa18b95d5 Author: Roman Khabibov <roman.habibov@tarantool.org> Date: Mon May 6 14:45:51 2019 +0300 test: check that collations isn't ignored in SELECTs Add test to check that a new collation isn't ignored regardless of a name of a previous one in the following patterns of queries: SELECT s COLLATE "unicode_ci" FROM a ORDER BY s COLLATE "unicode_ci" 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 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] != '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 == TK_COLLATE) { pDup = 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 = require("sqltester") -test:plan(174) +test:plan(177) local prefix = "collation-" @@ -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"}) +-- 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()
next prev parent reply other threads:[~2019-06-28 13:13 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1561372731.git.roman.habibov@tarantool.org> [not found] ` <49f3a1279811efc66c580c6039cf1b890ff37889.1561372731.git.roman.habibov@tarantool.org> 2019-06-25 17:30 ` n.pettik 2019-06-25 17:55 ` Vladislav Shpilevoy 2019-06-28 13:11 ` Roman Khabibov 2019-06-28 13:13 ` Roman Khabibov [this message] 2019-07-02 17:21 ` n.pettik [not found] ` <91edd7e8b72a93c5b5c0592c181576fca98e66fd.1561372731.git.roman.habibov@tarantool.org> 2019-06-25 17:30 ` [tarantool-patches] Re: [PATCH 2/2 v2] sql: allow <COLLATE> only for string-like args n.pettik 2019-06-28 12:57 ` Roman Khabibov 2019-07-02 15:55 ` n.pettik 2019-07-06 1:04 ` Roman Khabibov 2019-07-08 13:38 ` n.pettik 2019-07-16 13:09 ` Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=6E3410C5-7C18-462A-8A0E-117A7D286545@tarantool.org \ --to=roman.habibov@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH 1/2 v2] test: check that collations isn'\''t ignored in SELECTs' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox