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 5D9A12718B for ; Fri, 22 Jun 2018 11:04:23 -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 ZmkNXeqT_84H for ; Fri, 22 Jun 2018 11:04:23 -0400 (EDT) Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [94.100.177.113]) (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 A8C4327172 for ; Fri, 22 Jun 2018 11:04:22 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v1 1/1] lua: make semicolon as default SQL terminator References: From: Vladislav Shpilevoy Message-ID: <90aafb8e-ac4d-09b1-c8d7-aa4a7eb9bc2c@tarantool.org> Date: Fri, 22 Jun 2018 18:04:17 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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: Kirill Shcherbatov , tarantool-patches@freelists.org Hello. Thanks for the patch! See 6 comments below. On 19/06/2018 18:26, Kirill Shcherbatov wrote: > Branch: http://github.com/tarantool/tarantool/tree/kshch/gh-2125-semi-terminator > Issue: https://github.com/tarantool/tarantool/issues/2125 > > Now semicolon sets as a default terminator on entering > "set language sql". > > Resolves #2125. > --- > src/box/lua/console.lua | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/src/box/lua/console.lua b/src/box/lua/console.lua > index e7cb50a..31e220f 100644 > --- a/src/box/lua/console.lua > +++ b/src/box/lua/console.lua > @@ -67,6 +67,7 @@ local function set_language(storage, value) > local msg = 'Invalid language "%s", supported languages: lua and sql.' > return error(msg:format(value)) > end > + set_delimiter(storage, value == 'sql' and ';' or nil) 1. Why do you set delimiter to '' (nil), when a language is not sql? set_delimiter(storage, nil) is not a no op call. 2. I have done this: \set delimiter ; \set language sql \set language lua And now the ';' has been lost, but I had set it. > storage.language = value > return true > end > @@ -316,7 +317,11 @@ local function local_read(self) > break > end > elseif #buf >= #delim and buf:sub(#buf - #delim + 1) == delim then > - buf = buf:sub(0, #buf - #delim) > + local sub_len = #buf - #delim 3. If you want to save sub_len, then please, do it for the line above as well. elseif #buf >= #delim then local sub_len = ... if buf:sub(sub_len + 1) == delim then ... > + if box.session.language == 'sql' and delim == ';' then 4. I have this: tarantool> \set language sql --- - true ... tarantool> \set delimiter # --- ... tarantool> select 100# --- - - [100] ... tarantool> select 100 Here I used history, and '#' was cut. > + sub_len = sub_len + 1 > + end > + buf = buf:sub(0, sub_len) > break > end > buf = buf.."\n" > @@ -354,8 +359,12 @@ local function client_read(self) > -- Escape sequence to close current connection (like SSH) > return nil > end > - -- remove trailing delimiter > - return buf:sub(1, -#delim-1) > + -- remove trailing delimiter if it is not SQL ; > + if box.session.language == 'sql' and delim == ';' then 5. Same. > + return buf> + else > + return buf:sub(1, -#delim-1) > + end > end > > -- > 6. I have tried to do select 'a; bc'; and expected the result would be --- - - ['a bc'] ... but got this: tarantool> select 'a; --- - error: 'unrecognized token: "''a"' ... Please, check that it works/does not work other DBMSes. (It is not the same as ';' in CREATE TRIGGER. Here ';' is a part of string).