From: Roman Khabibov <roman.habibov@tarantool.org> To: tarantool-patches@freelists.org Cc: v.shpilevoy@tarantool.org Subject: [tarantool-patches] [PATCH 1/2] sql: add CHAR description without length Date: Sat, 1 Dec 2018 04:12:50 +0300 [thread overview] Message-ID: <20181201011251.30573-1-roman.habibov@tarantool.org> (raw) Add ability to describe CHAR without specifying the length. Part of #3616 Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/gh-3616-char-in-sub-subquery Issue: https://github.com/tarantool/tarantool/issues/3616 --- src/box/sql/parse.y | 16 +++++++++++-- test/sql-tap/table.test.lua | 47 ++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/box/sql/parse.y b/src/box/sql/parse.y index 6dfc81f70..babfca23a 100644 --- a/src/box/sql/parse.y +++ b/src/box/sql/parse.y @@ -1486,12 +1486,24 @@ typedef(A) ::= TIME . { A.type = AFFINITY_REAL; } typedef(A) ::= DATETIME . { A.type = AFFINITY_REAL; } %type char_len_typedef {struct type_def} -typedef(A) ::= CHAR|VARCHAR char_len_typedef(B) . { +typedef(A) ::= CHAR char_len_typedef(B) . { A.type = AFFINITY_TEXT; (void) B; } -char_len_typedef(A) ::= LP INTEGER(B) RP . { +%type vchar_len_typedef {struct type_def} +typedef(A) ::= VARCHAR vchar_len_typedef(B) . { + A.type = AFFINITY_TEXT; + (void) B; +} + +char_len_typedef(A) ::= . { + (void) A; +} + +char_len_typedef(A) ::= vchar_len_typedef(A) . + +vchar_len_typedef(A) ::= LP INTEGER(B) RP . { (void) A; (void) B; } diff --git a/test/sql-tap/table.test.lua b/test/sql-tap/table.test.lua index 7fd9bac9f..71645e2e2 100755 --- a/test/sql-tap/table.test.lua +++ b/test/sql-tap/table.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool test = require("sqltester") -test:plan(74) +test:plan(78) --!./tcltestrunner.lua -- 2001 September 15 @@ -1393,4 +1393,49 @@ test:do_execsql_test( -- </check-22.cleanup> }) + +-- gh-3616 Add char type without length in definitions. + +test:do_execsql_test( + "table-23.1", + [[ + CREATE TABLE T23( + id INT PRIMARY KEY, + u CHAR + ); + ]], { + -- <table-23.2> + + -- </table-23.2> + }) + +test:do_execsql_test( + "table-23.2", + [[ + INSERT INTO T23 VALUES (1, 'a'), (2, 'b'); + ]], { + -- <table-23.2> + + -- </table-23.2> + }) + +test:do_execsql_test( + "table-23.3", + [[ + SELECT u FROM T23; + ]], { + -- <table-23.3> + "a","b" + -- </table-23.3> + }) + +test:do_execsql_test( + "check-23.cleanup", + [[ + DROP TABLE IF EXISTS t23; + ]], { + -- <check-23.cleanup> + + -- </check-23.cleanup> + }) test:finish_test() -- 2.19.1
next reply other threads:[~2018-12-01 1:12 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-01 1:12 Roman Khabibov [this message] 2018-12-01 1:12 ` [tarantool-patches] [PATCH 2/2] sql: add test for indexed char in sub subquery Roman Khabibov 2018-12-03 13:48 ` [tarantool-patches] Re: [PATCH 1/2] sql: add CHAR description without length Vladislav Shpilevoy
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=20181201011251.30573-1-roman.habibov@tarantool.org \ --to=roman.habibov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [tarantool-patches] [PATCH 1/2] sql: add CHAR description without length' \ /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