From: "n.pettik" <korablev@tarantool.org> To: tarantool-patches@freelists.org Cc: Imeev Mergen <imeevma@tarantool.org> Subject: [tarantool-patches] Re: [PATCH v2 2/2] sql: fix error in case ARRAY/MAP converted to SCALAR Date: Wed, 24 Jul 2019 15:24:32 +0300 [thread overview] Message-ID: <BEF40429-567A-42EB-92F1-01C8DB036886@tarantool.org> (raw) In-Reply-To: <67e721f4818f51861383cdf71cc88c63e45ab450.1563955619.git.imeevma@gmail.com> > --- > src/box/sql/vdbe.c | 13 +++++++++-- > test/sql/types.result | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ > test/sql/types.test.lua | 22 ++++++++++++++++++ > 3 files changed, 95 insertions(+), 2 deletions(-) > > diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c > index 1200ff4..f6aaaa6 100644 > --- a/src/box/sql/vdbe.c > +++ b/src/box/sql/vdbe.c > @@ -2704,8 +2704,17 @@ case OP_ApplyType: { > assert(pIn1 <= &p->aMem[(p->nMem+1 - p->nCursor)]); > assert(memIsValid(pIn1)); > if (mem_apply_type(pIn1, type) != 0) { > - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, > - sql_value_text(pIn1), > + const char *value; > + if ((pIn1->flags & MEM_Subtype) != 0 && > + pIn1->subtype == SQL_SUBTYPE_MSGPACK) { > + if (mp_typeof(*pIn1->z) == MP_MAP) > + value = "map"; > + else > + value = "array"; > + } else { > + value = (const char *)sql_value_text(pIn1); Why not simply patch sql_value_text() to make it convert map/array to string representation? I’m afraid this is unlikely to be the only place where such error may occur. > + } > + diag_set(ClientError, ER_SQL_TYPE_MISMATCH, value, > field_type_strs[type]); > goto abort_due_to_error; > } > diff --git a/test/sql/types.test.lua b/test/sql/types.test.lua > index 22cb105..a99cc9f 100644 > --- a/test/sql/types.test.lua > +++ b/test/sql/types.test.lua > @@ -291,3 +291,25 @@ s:insert({1, true, {1, 2}, {a = 3}, 'asd'}) > box.execute('UPDATE t SET b = false WHERE i = 1;') > s:select() > s:drop() > + > +-- > +-- Make sure that the array/map conversion to scalar error is > +-- displayed correctly. > +-- > +box.execute('DROP TABLE IF EXISTS t1;’) Why ‘IF EXISTS’? Btw I’d better use space:drop() to avoid SQL’s overhead.
next prev parent reply other threads:[~2019-07-24 12:24 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-24 8:11 [tarantool-patches] [PATCH v2 0/2] sql: add ARRAY, MAP and ANY types to mem_apply_type() imeevma 2019-07-24 8:12 ` [tarantool-patches] [PATCH v2 1/2] " imeevma 2019-07-24 8:12 ` [tarantool-patches] [PATCH v2 2/2] sql: fix error in case ARRAY/MAP converted to SCALAR imeevma 2019-07-24 12:24 ` n.pettik [this message] 2019-07-24 22:37 ` [tarantool-patches] " Konstantin Osipov 2019-07-24 23:30 ` n.pettik 2019-07-27 10:16 ` Mergen Imeev 2019-08-07 18:25 ` n.pettik 2019-08-28 13:30 ` Mergen Imeev 2019-08-29 12:19 ` Nikita Pettik 2019-09-02 13:53 ` Mergen Imeev 2019-09-10 13:54 ` korablev 2019-09-11 8:13 ` Mergen Imeev 2019-09-11 9:25 ` Nikita Pettik
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=BEF40429-567A-42EB-92F1-01C8DB036886@tarantool.org \ --to=korablev@tarantool.org \ --cc=imeevma@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH v2 2/2] sql: fix error in case ARRAY/MAP converted to SCALAR' \ /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