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 DACD96EC40; Thu, 8 Jul 2021 01:10:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DACD96EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1625695802; bh=MW2jOybcjuAbhubZlubj4pe1iZyrzoF0BmGfnysSoUw=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=JLZpkByanUzCmvvlQW8I6iN+iGF/FNNpd3cutMl75mj+10HZ0I4evrHkbn5Oyk8uD J1JGttrHzqccQNoC+VDzGlx4TBsgr4ShdSVrfOz2GUzEe4cgdX/uiHlkJJdbGC+DiO wcIRxXjWyk4JU6iHcj41YcuOOOJZN0wEDksMi9PA= 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 772466EC40 for ; Thu, 8 Jul 2021 01:09:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 772466EC40 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1m1Fjy-0000IV-RJ; Thu, 08 Jul 2021 01:09:59 +0300 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <73484ddc21ae698409d326804b105e748e3bbe12.1625498636.git.imeevma@gmail.com> Message-ID: <281c365c-afe9-0c36-526b-f9edb27452d2@tarantool.org> Date: Thu, 8 Jul 2021 00:09:57 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <73484ddc21ae698409d326804b105e748e3bbe12.1625498636.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FBE6C6848F3EB6EB89AE0756428E32ECE9182A05F53808504038C7E18CC9D338809AE978D77AED9C5DA06A3A594546A82CEDCB718B2CEF9F92 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F65C230EDDCD559EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AAEFEF2B38A4D0058638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D80B5780DA0825DC2C7AD35F2250981806117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD182CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6A1DCCEB63E2F10FB089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5A3404C363D4CA857FB679AA99F38D85463111ED4268DD4DAD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA753753CEE10E4ED4A7410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D343F22CE0A71FDB37E605DE1DB37E642FEE139D4386470F65B913F67D6CCDB75B86F43F64FAD89C9C81D7E09C32AA3244C0E840B01067E3AAA1494B7B890E3719EB4DF56057A86259F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojwWhFrYo6Pn1/Iq1Vcj8LuQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D5A7BC2BE41C6CC15513DAD6EA100A4483841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 2/4] sql: properly show values in type mismatch error 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for the patch! > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 630f1a135..728d3c9a7 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -80,9 +80,11 @@ mem_str(const struct Mem *mem) > if (mem->n > STR_VALUE_MAX_LEN) { > memcpy(buf, mem->z, STR_VALUE_MAX_LEN); > buf[STR_VALUE_MAX_LEN] = '\0'; > - return tt_sprintf("%s...", buf); > + return tt_sprintf("'%s...", buf); Why didn't you put a second ' after ...? The error message does not end here. There are more words after this string usually. The same below. > @@ -102,7 +115,8 @@ mem_str(const struct Mem *mem) > return tt_sprintf("%s...", buf); > } > case MEM_TYPE_UUID: > - return tt_uuid_str(&mem->u.uuid); > + tt_uuid_to_string(&mem->u.uuid, buf); > + return tt_sprintf("'%s'", buf); > case MEM_TYPE_BOOL: > return mem->u.b ? "TRUE" : "FALSE"; > default: