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 0C6282232E for ; Sat, 29 Dec 2018 04:07:31 -0500 (EST) 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 aDeit8qUT4Ai for ; Sat, 29 Dec 2018 04:07:30 -0500 (EST) Received: from smtp56.i.mail.ru (smtp56.i.mail.ru [217.69.128.36]) (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 AA4282227D for ; Sat, 29 Dec 2018 04:07:30 -0500 (EST) From: Nikita Pettik Subject: [tarantool-patches] [PATCH] sql: fix decoding data of type BOOLEAN Date: Sat, 29 Dec 2018 11:07:18 +0200 Message-Id: <20181229090718.20432-1-korablev@tarantool.org> 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: kyukhin@tarantool.org, Nikita Pettik Closes #3906 --- Branch: https://github.com/tarantool/tarantool/tree/np/gh-3906-fix-displaying-bool Issue: https://github.com/tarantool/tarantool/issues/3906 src/box/sql/vdbeaux.c | 2 +- test/sql-tap/autoinc.test.lua | 2 +- test/sql/types.result | 28 ++++++++++++++++++++++++++++ test/sql/types.test.lua | 11 +++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index fc805e3aa..76bddf2ce 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -3780,7 +3780,7 @@ sqlite3VdbeMsgpackGet(const unsigned char *buf, /* Buffer to deserialize from */ case MP_BOOL:{ assert((unsigned char)*zParse == 0xc2 || (unsigned char)*zParse == 0xc3); - pMem->u.i = (unsigned)*zParse - 0xc2; /* bool -> Integer {0,1} */ + pMem->u.i = (unsigned char)*zParse - 0xc2; pMem->flags = MEM_Int; break; } diff --git a/test/sql-tap/autoinc.test.lua b/test/sql-tap/autoinc.test.lua index 3ac9a856a..3becc342a 100755 --- a/test/sql-tap/autoinc.test.lua +++ b/test/sql-tap/autoinc.test.lua @@ -43,7 +43,7 @@ test:do_execsql_test( SELECT * FROM "_sequence"; ]], { -- - 1,1,"T1",1,0,9223372036854775807LL,1,0,4294967041 + 1,1,"T1",1,0,9223372036854775807LL,1,0,0 -- }) diff --git a/test/sql/types.result b/test/sql/types.result index 1daeb7a8c..1ac599ad5 100644 --- a/test/sql/types.result +++ b/test/sql/types.result @@ -104,3 +104,31 @@ box.sql.execute("DROP VIEW v1;") box.sql.execute("DROP TABLE t1;") --- ... +-- gh-3906: data of type BOOL is displayed as should +-- during SQL SELECT. +-- +format = {{ name = 'ID', type = 'unsigned' }, { name = 'A', type = 'boolean' }} +--- +... +sp = box.schema.space.create("TEST", { format = format } ) +--- +... +i = sp:create_index('primary', {parts = {1, 'unsigned' }}) +--- +... +sp:insert({1, true}) +--- +- [1, true] +... +sp:insert({2, false}) +--- +- [2, false] +... +box.sql.execute("SELECT * FROM test") +--- +- - [1, 1] + - [2, 0] +... +sp:drop() +--- +... diff --git a/test/sql/types.test.lua b/test/sql/types.test.lua index 5f6b4dc49..8eda36159 100644 --- a/test/sql/types.test.lua +++ b/test/sql/types.test.lua @@ -29,3 +29,14 @@ box.space.T1.index.I4.parts box.sql.execute("DROP VIEW v1;") box.sql.execute("DROP TABLE t1;") + +-- gh-3906: data of type BOOL is displayed as should +-- during SQL SELECT. +-- +format = {{ name = 'ID', type = 'unsigned' }, { name = 'A', type = 'boolean' }} +sp = box.schema.space.create("TEST", { format = format } ) +i = sp:create_index('primary', {parts = {1, 'unsigned' }}) +sp:insert({1, true}) +sp:insert({2, false}) +box.sql.execute("SELECT * FROM test") +sp:drop() -- 2.15.1