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 CA6D86EC57; Mon, 19 Jul 2021 12:17:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CA6D86EC57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626686243; bh=0mYpSrdcC0UEd1C8jO9tYkg8IGcHk9A1CoVGj+BHs84=; h=To:Cc:References:In-Reply-To:Date:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=I4+c5Lpn/2zLncpPc7mJ+rNxpmzFlXXiOzbJtf4XM8s5IcmBc1sNWckEt8vamDyeq v9oCkA1LIlklDBIW7N1itcFiCYuyuEKt7p2RoqIsz0hoE7ZTqCb9j/qnfjPymRAOaF n+7qK5Q/ZqyauPazvWg4XWqTdeDGn66vnV7c9GKE= Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [94.100.177.111]) (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 B13316EC5C for ; Mon, 19 Jul 2021 12:16:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B13316EC5C Received: by smtp51.i.mail.ru with esmtpa (envelope-from ) id 1m5POR-0006m3-CM; Mon, 19 Jul 2021 12:16:56 +0300 To: Cc: References: <8f7da151eb373de4cb4f49901bb74be4801f3e07.1626424203.git.imeevma@gmail.com> In-Reply-To: <8f7da151eb373de4cb4f49901bb74be4801f3e07.1626424203.git.imeevma@gmail.com> Date: Mon, 19 Jul 2021 12:16:52 +0300 Message-ID: <18a101d77c7e$cfef9ef0$6fcedcd0$@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQD0dPzMRKuVIAksNaGzWjRUzQP0JQHxtZy8rQB4T7A= Content-Language: ru X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD941C43E597735A9C386C8E0DDEE7E2465724AB895DD30A549182A05F53808504022E1CF978BA2E6549A08541995EA101FB746D634FFFE36C1BC77B4210FEEAF0D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75C0AD7D016C066E3C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE728A881FD0F09D355EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F2730D8A2E5335305160DDA9C3B3EFDBC7CC7F00164DA146DAFE8445B8C89999728AA50765F790063783E00425F71A4181389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8EDCF5861DED71B2F389733CBF5DBD5E9B5C8C57E37DE458BD9DD9810294C998ED8FC6C240DEA76428AA50765F790063751898D81C3DCE054D32BA5DBAC0009BE395957E7521B51C20BC6067A898B09E4090A508E0FED6299176DF2183F8FC7C06136E347CC761E07C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F790063757B1FBEA53BC6EDBEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: 0D63561A33F958A5AD8B470844EA62F293A18401DB353565D5F6075F7B4DF49AD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7501A9DF589746230F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A541DB4061E938328BC9670D9490E52EE9D51FC3FCB3DA934798405EB54AE0A773DCD4811A57645B1D7E09C32AA3244CDCF2313EB9427880117CF1BD33641A75853296C06374E602729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj+8+KVR9NZrGe2mMkiH+XoQ== X-Mailru-Sender: 9B1A9A1451179B430DCE2B318EA4156239342FC461C88BCFE08627A5ECFFE208E9B2E1F877ED26705C2808D6142752370A8ED71B308007E3DC85537438B7E1A423D748DE48713E689437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 1/4] sql: introduce uuid to quote() 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: Timur Safin via Tarantool-patches Reply-To: Timur Safin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" LGTM : From: imeevma@tarantool.org : Subject: [PATCH v2 1/4] sql: introduce uuid to quote() :=20 : Prior to this patch, built-in SQL function quote() could not work with : uuid. It now returns a string representation of the received uuid. :=20 : Part of #6164 : --- : src/box/sql/func.c | 24 = ++++++++++++------- : test/sql-tap/engine.cfg | 3 +++ : test/sql-tap/gh-6164-uuid-follow-ups.test.lua | 14 +++++++++++ : 3 files changed, 32 insertions(+), 9 deletions(-) : create mode 100755 test/sql-tap/gh-6164-uuid-follow-ups.test.lua :=20 : diff --git a/src/box/sql/func.c b/src/box/sql/func.c : index 84768f17c..d2edda6d3 100644 : --- a/src/box/sql/func.c : +++ b/src/box/sql/func.c : @@ -1095,8 +1095,8 @@ quoteFunc(sql_context * context, int argc, = sql_value : ** argv) : { : assert(argc =3D=3D 1); : UNUSED_PARAMETER(argc); : - switch (sql_value_type(argv[0])) { : - case MP_DOUBLE:{ : + switch (argv[0]->type) { : + case MEM_TYPE_DOUBLE:{ : double r1, r2; : char zBuf[50]; : r1 =3D mem_get_double_unsafe(argv[0]); : @@ -1110,14 +1110,20 @@ quoteFunc(sql_context * context, int argc, = sql_value : ** argv) : SQL_TRANSIENT); : break; : } : - case MP_UINT: : - case MP_INT:{ : + case MEM_TYPE_UUID: { : + char buf[UUID_STR_LEN + 1]; : + tt_uuid_to_string(&argv[0]->u.uuid, &buf[0]); : + sql_result_text(context, buf, UUID_STR_LEN, SQL_TRANSIENT); : + break; : + } : + case MEM_TYPE_UINT: : + case MEM_TYPE_INT: { : sql_result_value(context, argv[0]); : break; : } : - case MP_BIN: : - case MP_ARRAY: : - case MP_MAP: { : + case MEM_TYPE_BIN: : + case MEM_TYPE_ARRAY: : + case MEM_TYPE_MAP: { : char *zText =3D 0; : char const *zBlob =3D mem_as_bin(argv[0]); : int nBlob =3D mem_len_unsafe(argv[0]); : @@ -1143,7 +1149,7 @@ quoteFunc(sql_context * context, int argc, = sql_value : ** argv) : } : break; : } : - case MP_STR:{ : + case MEM_TYPE_STR: { : int i, j; : u64 n; : const unsigned char *zArg =3D mem_as_ustr(argv[0]); : @@ -1171,7 +1177,7 @@ quoteFunc(sql_context * context, int argc, = sql_value : ** argv) : } : break; : } : - case MP_BOOL: { : + case MEM_TYPE_BOOL: { : sql_result_text(context, : SQL_TOKEN_BOOLEAN(mem_get_bool_unsafe(argv[0])), : -1, SQL_TRANSIENT); : diff --git a/test/sql-tap/engine.cfg b/test/sql-tap/engine.cfg : index 693a477b7..94b0bb1f6 100644 : --- a/test/sql-tap/engine.cfg : +++ b/test/sql-tap/engine.cfg : @@ -20,6 +20,9 @@ : "gh-3332-tuple-format-leak.test.lua": { : "memtx": {"engine": "memtx"} : }, : + "gh-6164-uuid-follow-ups.test.lua": { : + "memtx": {"engine": "memtx"} : + }, : "gh-4077-iproto-execute-no-bind.test.lua": {}, : "*": { : "memtx": {"engine": "memtx"}, : diff --git a/test/sql-tap/gh-6164-uuid-follow-ups.test.lua b/test/sql- : tap/gh-6164-uuid-follow-ups.test.lua : new file mode 100755 : index 000000000..a8f662f77 : --- /dev/null : +++ b/test/sql-tap/gh-6164-uuid-follow-ups.test.lua : @@ -0,0 +1,14 @@ : +#!/usr/bin/env tarantool : +local test =3D require("sqltester") : +test:plan(1) : + : +-- Make sure that function quote() can work with uuid. : +test:do_execsql_test( : + "gh-6164-1", : + [[ : + SELECT quote(cast('11111111-1111-1111-1111-111111111111' as = uuid)); : + ]], { : + '11111111-1111-1111-1111-111111111111' : + }) : + : +test:finish_test() : -- : 2.25.1