From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 02F582EC38 for ; Wed, 8 May 2019 09:15:28 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5SxlwPLe1Y-c for ; Wed, 8 May 2019 09:15:27 -0400 (EDT) Received: from smtp10.mail.ru (smtp10.mail.ru [94.100.181.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 5D2902EC36 for ; Wed, 8 May 2019 09:15:27 -0400 (EDT) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v1 1/1] sql: create CHAR_LENGTH() and CHARACTER_LENGTH() Date: Wed, 8 May 2019 16:15:25 +0300 Message-Id: <7b8049e47b931a2014b92e26436dc264d56231c9.1557321237.git.imeevma@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: korablev@tarantool.org Cc: tarantool-patches@freelists.org This patch creates SQL functions CHARACTER_LENGTH() and CHAR_LENGTH(). These functions work the same way. Each of them takes only one argument of type TEXT and returns its length. Closes #3929 @TarantoolBot document Title: SQL functions CHAR_LENGTH() and CHARACTER_LENGTH() The SQL functions CHAR_LENGTH() and CHARACTER_LENGTH() take exactly one argument of type TEXT and return its length. They throw an error if the argument is of a different type or if more than one argument is given. --- https://github.com/tarantool/tarantool/issues/3929 https://github.com/tarantool/tarantool/tree/imeevma/gh-3929-character-length-functions src/box/sql/func.c | 27 +++++++++ test/sql-tap/func3.test.lua | 130 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 156 insertions(+), 1 deletion(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index bb7405e..01c271c 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -133,6 +133,29 @@ typeofFunc(sql_context * context, int NotUsed, sql_value ** argv) } /* + * Implementation of the char_length() and character_length() + * functions. + */ +static void +char_length_func(sql_context *context, int argc, sql_value **argv) +{ + assert(argc == 1); + UNUSED_PARAMETER(argc); + if (sql_value_type(argv[0]) != MP_STR) { + diag_set(ClientError, ER_INCONSISTENT_TYPES, "TEXT", + mem_type_to_str(argv[0])); + context->isError = SQL_TARANTOOL_ERROR; + context->fErrorOrAux = 1; + return; + } + const unsigned char *z = sql_value_text(argv[0]); + if (z == NULL) + return; + int len = sql_utf8_char_count(z, sql_value_bytes(argv[0])); + sql_result_int(context, len); +} + +/* * Implementation of the length() function */ static void @@ -1936,6 +1959,10 @@ sqlRegisterBuiltinFunctions(void) FIELD_TYPE_STRING), FUNCTION2(length, 1, 0, 0, lengthFunc, SQL_FUNC_LENGTH, FIELD_TYPE_INTEGER), + FUNCTION(char_length, 1, 0, 0, char_length_func, + FIELD_TYPE_INTEGER), + FUNCTION(character_length, 1, 0, 0, char_length_func, + FIELD_TYPE_INTEGER), FUNCTION(position, 2, 0, 1, position_func, FIELD_TYPE_INTEGER), FUNCTION(printf, -1, 0, 0, printfFunc, FIELD_TYPE_STRING), FUNCTION(unicode, 1, 0, 0, unicodeFunc, FIELD_TYPE_STRING), diff --git a/test/sql-tap/func3.test.lua b/test/sql-tap/func3.test.lua index 6d6411c..a3a548b 100755 --- a/test/sql-tap/func3.test.lua +++ b/test/sql-tap/func3.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool test = require("sqltester") -test:plan(25) +test:plan(37) --!./tcltestrunner.lua -- 2010 August 27 @@ -284,6 +284,134 @@ test:do_test( return test:execsql "EXPLAIN SELECT likely(min(1.0+'2.0',4*11))" end, test:execsql "EXPLAIN SELECT min(1.0+'2.0',4*11)") +-- +-- gh-3929: create SQL functions CHARACTER_LENGTH() and +-- CHAR_LENGTH(). +-- +test:do_test( + "func3-6.1", + function() + local some_text = 'some text' + return test:execsql(string.format([[ + SELECT LENGTH('%s'), CHAR_LENGTH('%s'), CHARACTER_LENGTH('%s'); + ]], some_text, some_text, some_text)) + end, { + -- + 9, 9, 9 + -- + }) + +test:do_test( + "func3-6.2", + function() + local some_text = 'какой-то текст' + return test:execsql(string.format([[ + SELECT LENGTH('%s'), CHAR_LENGTH('%s'), CHARACTER_LENGTH('%s'); + ]], some_text, some_text, some_text)) + end, { + -- + 14, 14, 14 + -- + }) + +test:do_catchsql_test( + "func3-6.3", + [[ + SELECT CHAR_LENGTH(12); + ]], { + -- + 1,"Inconsistent types: expected TEXT got INTEGER" + -- + }) + +test:do_catchsql_test( + "func3-6.4", + [[ + SELECT CHAR_LENGTH(12.34); + ]], { + -- + 1,"Inconsistent types: expected TEXT got REAL" + -- + }) + +test:do_catchsql_test( + "func3-6.5", + [[ + SELECT CHAR_LENGTH(x'12'); + ]], { + -- + 1,"Inconsistent types: expected TEXT got BLOB" + -- + }) + +test:do_catchsql_test( + "func3-6.6", + [[ + SELECT CHAR_LENGTH(true); + ]], { + -- + 1,"Inconsistent types: expected TEXT got BOOLEAN" + -- + }) + +test:do_catchsql_test( + "func3-6.7", + [[ + SELECT CHARACTER_LENGTH(12); + ]], { + -- + 1,"Inconsistent types: expected TEXT got INTEGER" + -- + }) + +test:do_catchsql_test( + "func3-6.8", + [[ + SELECT CHARACTER_LENGTH(12.34); + ]], { + -- + 1,"Inconsistent types: expected TEXT got REAL" + -- + }) + +test:do_catchsql_test( + "func3-6.9", + [[ + SELECT CHARACTER_LENGTH(x'12'); + ]], { + -- + 1,"Inconsistent types: expected TEXT got BLOB" + -- + }) + +test:do_catchsql_test( + "func3-6.10", + [[ + SELECT CHARACTER_LENGTH(true); + ]], { + -- + 1,"Inconsistent types: expected TEXT got BOOLEAN" + -- + }) +test:do_catchsql_test( + "func3-6.11", + [[ + SELECT CHAR_LENGTH('abc', 'efg'); + ]], { + -- + 1,"wrong number of arguments to function CHAR_LENGTH()" + -- + }) + +test:do_catchsql_test( + "func3-6.12", + [[ + SELECT CHARACTER_LENGTH('abc', 'efg'); + ]], { + -- + 1,"wrong number of arguments to function CHARACTER_LENGTH()" + -- + }) test:finish_test() -- 2.7.4