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 105426F852; Mon, 15 Nov 2021 19:07:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 105426F852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1636992437; bh=4dc9ZzLRYu8nB8VMYB3UTNYihn9+GSPiBYnU8mVD+MM=; 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=SeW5DCjMp1G8Zl95oGYxLX93PwNxMEb9kxwru+4UUeVFt+s8GWZXexlvPDPgx9nFQ dOZmW9CTGFJWsG+2dSQ6v7aO+z+WofTduB82z0zcrbFpSzhHcWuDgZhv9OIv0ZEIiA lMGIGbIS7VTaIqyknhrhHTRSyGUTgBL6n9BfciTQ= 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 0BC836FFBB for ; Mon, 15 Nov 2021 19:06:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0BC836FFBB Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mmeVK-0006K4-9I; Mon, 15 Nov 2021 19:06:46 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Mon, 15 Nov 2021 19:06:45 +0300 Message-Id: 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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9731B3922EC0639792B05E85F1235528D4452084448829B2800894C459B0CD1B94545D457A507A4AFD7AFF0AD4673CD30476574356F5A03885BBE4D158D2C583B X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7EED5D2FAB4CEB1EDEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063737F44C0D48A402588638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D817CB8C937B9F988F7DE278096369BB61117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735201E561CDFBCA1751FCB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6B1CFA6D474D4A6A4089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CA6674D4217F8769DF859EA88143B74C3B83CFFA8AA4320199C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF6EFF71F1B3C06F72699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3430FC2BC1B917F0188A2C4D3A404C6A57431DE92AA5EB7D464A252C38CAAB66B67E6035F055AA8E0E1D7E09C32AA3244CF822414BDE509E9E924D41DB9C691D6C81560E2432555DBB729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojjLiSo6osCe7Xoze2Cs8GaQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DD570B62EE80DFB3475D688C83EE8152883D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 1/2] sql: omit quotes for UUID values in errors 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" This patch removes quotes from the representation of UUID values in the error description. This is because UUID values are printed without quotes elsewhere. --- src/box/sql/mem.c | 2 +- test/sql-tap/cast.test.lua | 4 +- test/sql-tap/decimal.test.lua | 6 +- .../gh-5364-define-bit-wise-rules.test.lua | 8 +-- ...-5756-implicit-cast-in-arithmetic.test.lua | 10 ++-- test/sql-tap/sql-errors.test.lua | 2 +- test/sql-tap/uuid.test.lua | 58 +++++++++---------- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 7ea68f868..9ddeea5bb 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -163,7 +163,7 @@ mem_str(const struct Mem *mem) } case MEM_TYPE_UUID: tt_uuid_to_string(&mem->u.uuid, buf); - return tt_sprintf("%s('%s')", type, buf); + return tt_sprintf("%s(%s)", type, buf); case MEM_TYPE_BOOL: return tt_sprintf("%s(%s)", type, mem->u.b ? "TRUE" : "FALSE"); default: diff --git a/test/sql-tap/cast.test.lua b/test/sql-tap/cast.test.lua index d5c9cbbc6..5861799b3 100755 --- a/test/sql-tap/cast.test.lua +++ b/test/sql-tap/cast.test.lua @@ -1067,7 +1067,7 @@ test:do_catchsql_test( INSERT INTO t3(s) VALUES(]]..uuid..[[); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to string" + "uuid(11111111-1111-1111-1111-111111111111) to string" }) -- Make sure that UUID cannot be implicitly cast to VARBINARY. @@ -1077,7 +1077,7 @@ test:do_catchsql_test( INSERT INTO t4(v) VALUES(]]..uuid..[[); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to varbinary" + "uuid(11111111-1111-1111-1111-111111111111) to varbinary" }) -- Make sure that STRING and VARBINARY cannot be implicitly cast to UUID. diff --git a/test/sql-tap/decimal.test.lua b/test/sql-tap/decimal.test.lua index a6d66b75b..ab211ba81 100755 --- a/test/sql-tap/decimal.test.lua +++ b/test/sql-tap/decimal.test.lua @@ -336,7 +336,7 @@ test:do_catchsql_test( [[ SELECT u > CAST('11111111-1111-1111-1111-111111111111' AS UUID) FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to number" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to number" }) test:do_catchsql_test( @@ -392,7 +392,7 @@ test:do_catchsql_test( [[ SELECT u = CAST('11111111-1111-1111-1111-111111111111' AS UUID) FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to number" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to number" }) test:do_catchsql_test( @@ -562,7 +562,7 @@ test:do_catchsql_test( [[ SELECT cast(cast(x'11111111111111111111111111111111' AS UUID) AS DECIMAL); ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to decimal" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to decimal" }) test:execsql([[ diff --git a/test/sql-tap/gh-5364-define-bit-wise-rules.test.lua b/test/sql-tap/gh-5364-define-bit-wise-rules.test.lua index 2a6a60a81..e1ab8abe8 100755 --- a/test/sql-tap/gh-5364-define-bit-wise-rules.test.lua +++ b/test/sql-tap/gh-5364-define-bit-wise-rules.test.lua @@ -60,7 +60,7 @@ test:do_catchsql_test( SELECT 9 >> CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to unsigned" + "uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_execsql_test( @@ -117,7 +117,7 @@ test:do_catchsql_test( SELECT 9 << CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to unsigned" + "uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_execsql_test( @@ -174,7 +174,7 @@ test:do_catchsql_test( SELECT 9 & CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to unsigned" + "uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_execsql_test( @@ -231,7 +231,7 @@ test:do_catchsql_test( SELECT 9 | CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to unsigned" + "uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:finish_test() diff --git a/test/sql-tap/gh-5756-implicit-cast-in-arithmetic.test.lua b/test/sql-tap/gh-5756-implicit-cast-in-arithmetic.test.lua index bf636a261..46bac159b 100755 --- a/test/sql-tap/gh-5756-implicit-cast-in-arithmetic.test.lua +++ b/test/sql-tap/gh-5756-implicit-cast-in-arithmetic.test.lua @@ -60,7 +60,7 @@ test:do_catchsql_test( SELECT 9 + CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + "uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_execsql_test( @@ -117,7 +117,7 @@ test:do_catchsql_test( SELECT 9 - CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + "uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_execsql_test( @@ -174,7 +174,7 @@ test:do_catchsql_test( SELECT 9 * CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + "uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_execsql_test( @@ -231,7 +231,7 @@ test:do_catchsql_test( SELECT 9 / CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + "uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_execsql_test( @@ -288,7 +288,7 @@ test:do_catchsql_test( SELECT 9 % CAST('11111111-1111-1111-1111-111111111111' AS UUID); ]], { 1, "Type mismatch: can not convert ".. - "uuid('11111111-1111-1111-1111-111111111111') to integer" + "uuid(11111111-1111-1111-1111-111111111111) to integer" }) test:finish_test() diff --git a/test/sql-tap/sql-errors.test.lua b/test/sql-tap/sql-errors.test.lua index 08a675101..a9aa5acf7 100755 --- a/test/sql-tap/sql-errors.test.lua +++ b/test/sql-tap/sql-errors.test.lua @@ -850,7 +850,7 @@ test:do_catchsql_test( [[ SELECT CAST(CAST('11111111-1111-1111-1111-111111111111' AS UUID) AS UNSIGNED); ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to unsigned" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) local bin = '' diff --git a/test/sql-tap/uuid.test.lua b/test/sql-tap/uuid.test.lua index 884b1daf9..8421e50c7 100755 --- a/test/sql-tap/uuid.test.lua +++ b/test/sql-tap/uuid.test.lua @@ -493,7 +493,7 @@ test:do_catchsql_test( [[ SELECT u || u from t2; ]], { - 1, "Inconsistent types: expected string or varbinary got uuid('11111111-1111-1111-1111-111111111111')" + 1, "Inconsistent types: expected string or varbinary got uuid(11111111-1111-1111-1111-111111111111)" }) local func = {language = 'Lua', body = 'function(x) return type(x) end', @@ -552,7 +552,7 @@ test:do_catchsql_test( [[ SELECT cast(u AS UNSIGNED) FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to unsigned" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_execsql_test( @@ -570,7 +570,7 @@ test:do_catchsql_test( [[ SELECT cast(u AS NUMBER) FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to number" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to number" }) test:do_catchsql_test( @@ -578,7 +578,7 @@ test:do_catchsql_test( [[ SELECT cast(u AS DOUBLE) FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to double" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to double" }) test:do_catchsql_test( @@ -586,7 +586,7 @@ test:do_catchsql_test( [[ SELECT cast(u AS INTEGER) FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to integer" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to integer" }) test:do_catchsql_test( @@ -594,7 +594,7 @@ test:do_catchsql_test( [[ SELECT cast(u AS BOOLEAN) FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to boolean" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to boolean" }) test:do_execsql_test( @@ -707,7 +707,7 @@ test:do_catchsql_test( [[ INSERT INTO tu(u) SELECT u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to unsigned" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_catchsql_test( @@ -715,7 +715,7 @@ test:do_catchsql_test( [[ INSERT INTO ts(s) SELECT u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to string" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to string" }) test:do_catchsql_test( @@ -723,7 +723,7 @@ test:do_catchsql_test( [[ INSERT INTO tn(n) SELECT u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to number" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to number" }) test:do_catchsql_test( @@ -731,7 +731,7 @@ test:do_catchsql_test( [[ INSERT INTO td(d) SELECT u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to double" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to double" }) test:do_catchsql_test( @@ -739,7 +739,7 @@ test:do_catchsql_test( [[ INSERT INTO ti(i) SELECT u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to integer" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to integer" }) test:do_catchsql_test( @@ -747,7 +747,7 @@ test:do_catchsql_test( [[ INSERT INTO tb(b) SELECT u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to boolean" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to boolean" }) test:do_catchsql_test( @@ -755,7 +755,7 @@ test:do_catchsql_test( [[ INSERT INTO tv(v) SELECT u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to varbinary" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to varbinary" }) test:do_execsql_test( @@ -945,7 +945,7 @@ test:do_catchsql_test( [[ SELECT -u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_catchsql_test( @@ -953,7 +953,7 @@ test:do_catchsql_test( [[ SELECT u + 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_catchsql_test( @@ -961,7 +961,7 @@ test:do_catchsql_test( [[ SELECT u - 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_catchsql_test( @@ -969,7 +969,7 @@ test:do_catchsql_test( [[ SELECT u * 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_catchsql_test( @@ -977,7 +977,7 @@ test:do_catchsql_test( [[ SELECT u / 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to integer, decimal or double" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to integer, decimal or double" }) test:do_catchsql_test( @@ -985,7 +985,7 @@ test:do_catchsql_test( [[ SELECT u % 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to integer" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to integer" }) -- Check that bitwise operations work with UUIDs as intended. @@ -994,7 +994,7 @@ test:do_catchsql_test( [[ SELECT ~u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to unsigned" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_catchsql_test( @@ -1002,7 +1002,7 @@ test:do_catchsql_test( [[ SELECT u >> 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to unsigned" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_catchsql_test( @@ -1010,7 +1010,7 @@ test:do_catchsql_test( [[ SELECT u << 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to unsigned" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_catchsql_test( @@ -1018,7 +1018,7 @@ test:do_catchsql_test( [[ SELECT u | 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to unsigned" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) test:do_catchsql_test( @@ -1026,7 +1026,7 @@ test:do_catchsql_test( [[ SELECT u & 1 FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to unsigned" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to unsigned" }) -- Check that logical operations work with UUIDs as intended. @@ -1035,7 +1035,7 @@ test:do_catchsql_test( [[ SELECT NOT u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to boolean" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to boolean" }) test:do_catchsql_test( @@ -1043,7 +1043,7 @@ test:do_catchsql_test( [[ SELECT u AND true FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to boolean" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to boolean" }) test:do_catchsql_test( @@ -1051,7 +1051,7 @@ test:do_catchsql_test( [[ SELECT u OR true FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to boolean" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to boolean" }) test:do_catchsql_test( @@ -1059,7 +1059,7 @@ test:do_catchsql_test( [[ SELECT true AND u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to boolean" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to boolean" }) test:do_catchsql_test( @@ -1067,7 +1067,7 @@ test:do_catchsql_test( [[ SELECT true OR u FROM t2; ]], { - 1, "Type mismatch: can not convert uuid('11111111-1111-1111-1111-111111111111') to boolean" + 1, "Type mismatch: can not convert uuid(11111111-1111-1111-1111-111111111111) to boolean" }) -- Check that comparison with UUID works as intended. -- 2.25.1