From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [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 B646F445323 for ; Thu, 16 Jul 2020 17:46:15 +0300 (MSK) From: imeevma@tarantool.org Date: Thu, 16 Jul 2020 17:46:14 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v6 08/22] sql: check args of lower() and upper() List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: korablev@tarantool.org, tsafin@tarantool.org, tarantool-patches@dev.tarantool.org After this patch, the argument types of the lower() and upper() functions will be checked properly. Part of #4159 --- src/box/sql/func.c | 15 +++--- test/sql-tap/cse.test.lua | 8 +-- test/sql-tap/func.test.lua | 8 +-- test/sql-tap/func5.test.lua | 100 +++++++++++++++++++++++++++++++++++- test/sql/boolean.result | 20 ++------ test/sql/types.result | 38 ++++---------- 6 files changed, 127 insertions(+), 62 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index e03d7d2e2..2910f308f 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -872,13 +872,10 @@ case_type##ICUFunc(sql_context *context, int argc, sql_value **argv) \ const char *z2; \ int n; \ UNUSED_PARAMETER(argc); \ - int arg_type = sql_value_type(argv[0]); \ - if (mp_type_is_bloblike(arg_type)) { \ - diag_set(ClientError, ER_INCONSISTENT_TYPES, "text", \ - "varbinary"); \ - context->is_aborted = true; \ - return; \ - } \ + enum mp_type mp_type = sql_value_type(argv[0]); \ + if (mp_type == MP_NIL) \ + return sql_result_null(context); \ + assert(mp_type == MP_STR); \ z2 = (char *)sql_value_text(argv[0]); \ n = sql_value_bytes(argv[0]); \ /* \ @@ -2608,7 +2605,7 @@ static struct { }, { .name = "LOWER", .param_count = 1, - .first_arg = FIELD_TYPE_ANY, + .first_arg = FIELD_TYPE_STRING, .args = FIELD_TYPE_ANY, .is_blob_like_str = false, .returns = FIELD_TYPE_STRING, @@ -2959,7 +2956,7 @@ static struct { }, { .name = "UPPER", .param_count = 1, - .first_arg = FIELD_TYPE_ANY, + .first_arg = FIELD_TYPE_STRING, .args = FIELD_TYPE_ANY, .is_blob_like_str = false, .returns = FIELD_TYPE_STRING, diff --git a/test/sql-tap/cse.test.lua b/test/sql-tap/cse.test.lua index 341b6de01..3c2076a1d 100755 --- a/test/sql-tap/cse.test.lua +++ b/test/sql-tap/cse.test.lua @@ -195,23 +195,23 @@ test:do_execsql_test( -test:do_execsql_test( +test:do_catchsql_test( "cse-1.13", [[ SELECT upper(b), typeof(b), b FROM t1 ]], { -- - "11", "integer", 11, "21", "integer", 21 + 1, "Type mismatch: can not convert 11 to string" -- }) -test:do_execsql_test( +test:do_catchsql_test( "cse-1.14", [[ SELECT b, typeof(b), upper(b), typeof(b), b FROM t1 ]], { -- - 11, "integer", "11", "integer", 11, 21, "integer", "21", "integer", 21 + 1, "Type mismatch: can not convert 11 to string" -- }) diff --git a/test/sql-tap/func.test.lua b/test/sql-tap/func.test.lua index 69d175e16..db267d0f5 100755 --- a/test/sql-tap/func.test.lua +++ b/test/sql-tap/func.test.lua @@ -760,13 +760,13 @@ test:do_execsql_test( -- }) -test:do_execsql_test( +test:do_catchsql_test( "func-5.3", [[ SELECT upper(a), lower(a) FROM t2 ]], { -- - "1","1","","","345","345","","","67890","67890" + 1, "Type mismatch: can not convert 1 to string" -- }) @@ -794,13 +794,13 @@ test:do_execsql_test( -- }) -test:do_execsql_test( +test:do_catchsql_test( "func-6.2", [[ SELECT coalesce(upper(a),'nil') FROM t2 ]], { -- - "1","nil","345","nil","67890" + 1, "Type mismatch: can not convert 1 to string" -- }) diff --git a/test/sql-tap/func5.test.lua b/test/sql-tap/func5.test.lua index 84877a919..b704ed7d5 100755 --- a/test/sql-tap/func5.test.lua +++ b/test/sql-tap/func5.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool test = require("sqltester") -test:plan(85) +test:plan(99) --!./tcltestrunner.lua -- 2010 August 27 @@ -738,4 +738,102 @@ test:do_catchsql_test( 1, "Type mismatch: can not convert varbinary to string" }) +test:do_execsql_test( + "func-5-6.10.1", [[ + SELECT upper(NULL); + ]],{ + "" + }) + +test:do_catchsql_test( + "func-5-6.10.2", [[ + SELECT upper(123); + ]], { + 1, "Type mismatch: can not convert 123 to string" + }) + +test:do_catchsql_test( + "func-5-6.10.3", [[ + SELECT upper(-123); + ]], { + 1, "Type mismatch: can not convert -123 to string" + }) + +test:do_catchsql_test( + "func-5-6.10.4", [[ + SELECT upper(-5.5); + ]], { + 1, "Type mismatch: can not convert -5.5 to string" + }) + +test:do_execsql_test( + "func-5-6.10.5", [[ + SELECT upper('-123'); + ]], { + "-123" + }) + +test:do_catchsql_test( + "func-5-6.10.6", [[ + SELECT upper(false); + ]], { + 1, "Type mismatch: can not convert FALSE to string" + }) + +test:do_catchsql_test( + "func-5-6.10.7", [[ + SELECT upper(X'3334'); + ]], { + 1, "Type mismatch: can not convert varbinary to string" + }) + +test:do_execsql_test( + "func-5-6.11.1", [[ + SELECT lower(NULL); + ]],{ + "" + }) + +test:do_catchsql_test( + "func-5-6.11.2", [[ + SELECT lower(123); + ]], { + 1, "Type mismatch: can not convert 123 to string" + }) + +test:do_catchsql_test( + "func-5-6.11.3", [[ + SELECT lower(-123); + ]], { + 1, "Type mismatch: can not convert -123 to string" + }) + +test:do_catchsql_test( + "func-5-6.11.4", [[ + SELECT lower(-5.5); + ]], { + 1, "Type mismatch: can not convert -5.5 to string" + }) + +test:do_execsql_test( + "func-5-6.11.5", [[ + SELECT lower('-123'); + ]], { + "-123" + }) + +test:do_catchsql_test( + "func-5-6.11.6", [[ + SELECT lower(false); + ]], { + 1, "Type mismatch: can not convert FALSE to string" + }) + +test:do_catchsql_test( + "func-5-6.11.7", [[ + SELECT lower(X'3334'); + ]], { + 1, "Type mismatch: can not convert varbinary to string" + }) + test:finish_test() diff --git a/test/sql/boolean.result b/test/sql/boolean.result index 39098b1f4..7e7f97284 100644 --- a/test/sql/boolean.result +++ b/test/sql/boolean.result @@ -280,25 +280,13 @@ SELECT abs(a) FROM t0; | ... SELECT lower(a) FROM t0; | --- - | - metadata: - | - name: lower(a) - | type: string - | rows: - | - ['false'] - | - ['true'] - | - [null] - | - [null] + | - null + | - 'Type mismatch: can not convert FALSE to string' | ... SELECT upper(a) FROM t0; | --- - | - metadata: - | - name: upper(a) - | type: string - | rows: - | - ['FALSE'] - | - ['TRUE'] - | - [null] - | - [null] + | - null + | - 'Type mismatch: can not convert FALSE to string' | ... SELECT quote(a) FROM t0; | --- diff --git a/test/sql/types.result b/test/sql/types.result index e0cf2d7d9..43cdffad0 100644 --- a/test/sql/types.result +++ b/test/sql/types.result @@ -824,19 +824,13 @@ box.execute("DELETE FROM t WHERE i < 18446744073709551613;") ... box.execute("SELECT lower(i) FROM t;") --- -- metadata: - - name: lower(i) - type: string - rows: - - ['18446744073709551613'] +- null +- 'Type mismatch: can not convert 18446744073709551613 to string' ... box.execute("SELECT upper(i) FROM t;") --- -- metadata: - - name: upper(i) - type: string - rows: - - ['18446744073709551613'] +- null +- 'Type mismatch: can not convert 18446744073709551613 to string' ... box.execute("SELECT abs(i) FROM t;") --- @@ -1310,12 +1304,12 @@ box.execute("SELECT group_concat(v) FROM t;") box.execute("SELECT lower(v) FROM t;") --- - null -- 'Inconsistent types: expected text got varbinary' +- 'Type mismatch: can not convert varbinary to string' ... box.execute("SELECT upper(v) FROM t;") --- - null -- 'Inconsistent types: expected text got varbinary' +- 'Type mismatch: can not convert varbinary to string' ... box.execute("SELECT abs(v) FROM t;") --- @@ -1877,25 +1871,13 @@ box.execute("SELECT group_concat(d) FROM t;") ... box.execute("SELECT lower(d) FROM t;") --- -- metadata: - - name: lower(d) - type: string - rows: - - ['10.0'] - - ['-2.0'] - - ['3.3'] - - ['1.8e+19'] +- null +- 'Type mismatch: can not convert 10.0 to string' ... box.execute("SELECT upper(d) FROM t;") --- -- metadata: - - name: upper(d) - type: string - rows: - - ['10.0'] - - ['-2.0'] - - ['3.3'] - - ['1.8E+19'] +- null +- 'Type mismatch: can not convert 10.0 to string' ... box.execute("SELECT abs(d) FROM t;") --- -- 2.25.1