From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <tarantool-patches-bounces@dev.tarantool.org>
Received: from [87.239.111.99] (localhost [127.0.0.1])
by dev.tarantool.org (Postfix) with ESMTP id B86006EC44;
Fri, 13 Aug 2021 06:15:56 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B86006EC44
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev;
t=1628824556; 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=YXB+fVHsCh3vGE3zQoiTS0GI5GmcANelbKlh55s64ol9VTet9jinP/2GupS8vERen
LyE4BMla/8H7rqgPUTvLzUsup5vmlIiMIU967fmVu21pB1J/lLW3p+wxRu9TYDiD1l
b5Pkhok3abN0m3QUrSB0vGh6jQMIZLxjp3LW1d3c=
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 321E16EC5B
for <tarantool-patches@dev.tarantool.org>;
Fri, 13 Aug 2021 06:13:06 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 321E16EC5B
Received: by smtpng1.m.smailru.net with esmtpa (envelope-from
<imeevma@tarantool.org>)
id 1mENd3-0000fX-GH; Fri, 13 Aug 2021 06:13:05 +0300
To: vdavydov@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Date: Fri, 13 Aug 2021 06:13:05 +0300
Message-Id: <a9da87dabbf09682f2985f10fd319eb2e59fe4b2.1628824286.git.imeevma@gmail.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <cover.1628824286.git.imeevma@gmail.com>
References: <cover.1628824286.git.imeevma@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-7564579A: 646B95376F6C166E
X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD972FF4A7D76DB5E242D14FEF1BD8BF4AC182A05F538085040F26FE796802360B80DCAC65460378365C4F66F5BDB4F2F8F246299CCE3A4B586
X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A929372354A9ECCCEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063790B55F3E386DB9B28638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8B4C67AD87C34B1525A8A48202E2C060E117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3733B5EC72352B9FA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD186FD1C55BDD38FC3FD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF
X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B5059A91936EF7B6732D126D8CB294D2FCEA
X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C69415AB31670C86CAF7A576AC4CC803AB855D7AE465CAF059C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFE37876E7723AB534DC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A
X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34951738D4D62E58A403FBD8AE933080B3C6DE71F03E37C321DAAE1C359CE1764810E75D217EF58F231D7E09C32AA3244C1D6958AD0DAE46CFDCA863FE0F74072F3A92A9747B6CC886729B2BEF169E0186
X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj0dLV0c3jbkzXQoQeCV2Awg==
X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DA02F51C5A80150EA1363EF52F42EDD5B83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B
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 <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org>
Reply-To: imeevma@tarantool.org
Errors-To: tarantool-patches-bounces@dev.tarantool.org
Sender: "Tarantool-patches" <tarantool-patches-bounces@dev.tarantool.org>
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