From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id A41BE6EC42; Wed, 11 Aug 2021 19:04:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A41BE6EC42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1628697883; bh=PabeVDn/fUYpwcc78fijVxXJXxv1/fzE1zwXaNiL/Hg=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=v+8NtLpkneWrjtH1tLlwNaNa/6U+yowersb/fF9jZBfPdiFdEm5El1VJSp9IhmHJp p1zFJ4WBmwriU48vn6jUJ4Vw7Suale/E2dDmzEiHxKZEMeccRT32nZx/1MipA7S9aN C0NvoQNarUHKjHo6q+NEg/KOuYo3REmf8QWnNJ1w= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 184C36EC45 for ; Wed, 11 Aug 2021 19:01:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 184C36EC45 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mDqfv-0005kC-Cl; Wed, 11 Aug 2021 19:01:51 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Wed, 11 Aug 2021 19:01:51 +0300 Message-Id: <85872088a5f94a22ae327a4c4624bde6fb8c7fe3.1628697448.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD9F9A2272A1D086A28553D1D5C4B4124EF182A05F538085040214BE1D6E425F5EA5DCCAE1B1967F59A156D85F256A3161F1E8ABB179E47B6C3 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A929372354A9ECCCEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063790B55F3E386DB9B28638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D87D5B12627CF191D4C4A6F7D9483B3917117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3733B5EC72352B9FA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C6B668463F4F89F86DD45D7A95BED746B70FE4B2EF50405CB9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFA183FDCE24978B01699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34951738D4D62E58A403FBD8AE933080B3C6DE71F03E37C321DAAE1C359CE1764810E75D217EF58F231D7E09C32AA3244CE9F518F02CD7D00D6ADF2CE33E070016250262A5EE9971B0729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj6qlzQV0oSZN0d9Fr7vAvEg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D0ABCAC3A41EDBC19002A02C9AAB38F8683D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 6/7] sql: disallow concatination for SCALAR X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Part of #6221 --- src/box/sql/mem.c | 6 ++++-- test/sql-tap/metatypes.test.lua | 11 ++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index e34f24c96..732d1b012 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -1552,12 +1552,14 @@ mem_concat(struct Mem *a, struct Mem *b, struct Mem *result) return 0; } /* Concatenation operation can be applied only to strings and blobs. */ - if (((b->type & (MEM_TYPE_STR | MEM_TYPE_BIN)) == 0)) { + if (((b->type & (MEM_TYPE_STR | MEM_TYPE_BIN)) == 0) || + mem_is_metatype(b)) { diag_set(ClientError, ER_INCONSISTENT_TYPES, "string or varbinary", mem_str(b)); return -1; } - if (((a->type & (MEM_TYPE_STR | MEM_TYPE_BIN)) == 0)) { + if (((a->type & (MEM_TYPE_STR | MEM_TYPE_BIN)) == 0) || + mem_is_metatype(a)) { diag_set(ClientError, ER_INCONSISTENT_TYPES, "string or varbinary", mem_str(a)); return -1; diff --git a/test/sql-tap/metatypes.test.lua b/test/sql-tap/metatypes.test.lua index 50d700cc4..b767e3f31 100755 --- a/test/sql-tap/metatypes.test.lua +++ b/test/sql-tap/metatypes.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool local test = require("sqltester") -test:plan(12) +test:plan(13) -- Check that SCALAR and NUMBER meta-types works as intended. box.execute([[CREATE TABLE t (i INT PRIMARY KEY, s SCALAR, n NUMBER);]]) @@ -124,6 +124,15 @@ test:do_catchsql_test( 1, "Type mismatch: can not convert scalar(1) to unsigned" }) +-- Check that concatination is prohibited for SCALAR values. +test:do_catchsql_test( + "metatypes-5", + [[ + SELECT CAST('asd' AS SCALAR) || 'dsa'; + ]], { + 1, "Inconsistent types: expected string or varbinary got scalar('asd')" + }) + box.execute([[DROP TABLE t;]]) test:finish_test() -- 2.25.1