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 74FBD6EC40; Tue, 17 Aug 2021 16:37:15 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 74FBD6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1629207435; bh=/ZlDr2lEpQE2BWFmm/knGah3tP6al5Kjo53IYAlpCOg=; h=To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Jg/GqeeTE1FXL34l6GKjGc3RuNW1KgBLGd1Zsa/8ZU4zRErkHKNZBV6YzsVGJCHhb Yh8pPeOBcmnboKjE6MrwAaSm1P7eFOGt8TEA5zw37g0ZGy1us2J3Ad0DLQTxVk+uq9 dEbH5oSZCPVjQedYS9+2fnS/HycJEj+DeuXR1pkI= 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 511FB6EC40 for ; Tue, 17 Aug 2021 16:37:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 511FB6EC40 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mFzHF-0003dD-G6; Tue, 17 Aug 2021 16:37:13 +0300 To: imun@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Tue, 17 Aug 2021 16:37:13 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD9F9A2272A1D086A28553D1D5C4B4124EF182A05F53808504092298C2F22781F6B56528CAEA6980442A84FFD99CB7CA11D426397305196CB4D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72DF3470F92485B86EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E78B284398E2029E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8DE0FB1D6A94220AD729C452312883891117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6B1CFA6D474D4A6A4089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C5B73F950BC6E7FFB88F06E038D00DA64049D5002515A71249C2B6934AE262D3EE7EAB7254005DCEDFB29427B7C22B3881E0A4E2319210D9B64D260DF9561598F01A9E91200F654B068F972559010CA1C8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3430FC2BC1B917F018704EE91B73CA54FAE7748551E52E3E9F805E240D64C642CAD5AB6FA0374DC4A21D7E09C32AA3244C82F042C3ECB21F5E5D7F6D80D5FA8597CE0B41342B755BCD729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojuRQ/H5n28tqyoTl9U2uEWQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D272E3817B582B49F636D84CD2B00D2C783D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 1/1] sql: fix quote() function 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" Ater this patch SQL built-in function QUOTE() will return the same DOUBLE in case it receives DOUBLE as an argument. If the argument is not number, string representation of the argument will be returned. Closes #6239 --- https://github.com/tarantool/tarantool/issues/6239 https://github.com/tarantool/tarantool/tree/imeevma/gh-6239-quote-with-double-arg src/box/sql/func.c | 15 +-------------- test/sql-tap/engine.cfg | 3 +++ .../gh-6239-quote-with-double-arg.test.lua | 14 ++++++++++++++ test/sql-tap/trigger5.test.lua | 3 ++- test/sql/types.result | 8 ++++---- 5 files changed, 24 insertions(+), 19 deletions(-) create mode 100755 test/sql-tap/gh-6239-quote-with-double-arg.test.lua diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 1622104d3..2aa637fbc 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -1096,26 +1096,13 @@ quoteFunc(sql_context * context, int argc, sql_value ** argv) assert(argc == 1); UNUSED_PARAMETER(argc); switch (argv[0]->type) { - case MEM_TYPE_DOUBLE:{ - double r1, r2; - char zBuf[50]; - r1 = mem_get_double_unsafe(argv[0]); - sql_snprintf(sizeof(zBuf), zBuf, "%!.15g", r1); - sqlAtoF(zBuf, &r2, 20); - if (r1 != r2) { - sql_snprintf(sizeof(zBuf), zBuf, "%!.20e", - r1); - } - sql_result_text(context, zBuf, -1, - SQL_TRANSIENT); - break; - } 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_DOUBLE: case MEM_TYPE_UINT: case MEM_TYPE_INT: { sql_result_value(context, argv[0]); diff --git a/test/sql-tap/engine.cfg b/test/sql-tap/engine.cfg index 94b0bb1f6..3196c4054 100644 --- a/test/sql-tap/engine.cfg +++ b/test/sql-tap/engine.cfg @@ -23,6 +23,9 @@ "gh-6164-uuid-follow-ups.test.lua": { "memtx": {"engine": "memtx"} }, + "gh-6239-quote-with-double-arg.test.lua": { + "memtx": {"engine": "memtx"} + }, "gh-4077-iproto-execute-no-bind.test.lua": {}, "*": { "memtx": {"engine": "memtx"}, diff --git a/test/sql-tap/gh-6239-quote-with-double-arg.test.lua b/test/sql-tap/gh-6239-quote-with-double-arg.test.lua new file mode 100755 index 000000000..60f85f20f --- /dev/null +++ b/test/sql-tap/gh-6239-quote-with-double-arg.test.lua @@ -0,0 +1,14 @@ +#!/usr/bin/env tarantool +local test = require("sqltester") +test:plan(1) + +-- Make sure that QUOTE() returns DOUBLE in cast it receives DOUBLE. +test:do_execsql_test( + "gh-6239", + [[ + SELECT QUOTE(1.5); + ]], { + 1.5 + }) + +test:finish_test() diff --git a/test/sql-tap/trigger5.test.lua b/test/sql-tap/trigger5.test.lua index 8336cdcf2..7f3762126 100755 --- a/test/sql-tap/trigger5.test.lua +++ b/test/sql-tap/trigger5.test.lua @@ -31,7 +31,8 @@ test:do_execsql_test( INSERT INTO Undo VALUES ((SELECT coalesce(max(id),0) + 1 FROM Undo), (SELECT 'INSERT INTO Item (a,b,c) VALUES (' || CAST(coalesce(old.a,'NULL') AS TEXT) - || ',' || quote(old.b) || ',' || CAST(old.c AS TEXT) || ');')); + || ',' || CAST(quote(old.b) AS STRING) || ',' || + CAST(old.c AS TEXT) || ');')); END; DELETE FROM Item WHERE a = 1; SELECT * FROM Undo; diff --git a/test/sql/types.result b/test/sql/types.result index 07d5b46e4..358667e94 100644 --- a/test/sql/types.result +++ b/test/sql/types.result @@ -1908,10 +1908,10 @@ box.execute("SELECT quote(d) FROM t;") - name: COLUMN_1 type: string rows: - - ['10.0'] - - ['-2.0'] - - ['3.3'] - - ['1.8e+19'] + - [10] + - [-2] + - [3.3] + - [18000000000000000000] ... box.execute("SELECT LEAST(d, 0) FROM t;") --- -- 2.25.1