From: imeevma@tarantool.org To: korablev@tarantool.org, tsafin@tarantool.org, tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v5 11/17] sql: check args of randomblob() Date: Tue, 14 Jul 2020 18:48:34 +0300 [thread overview] Message-ID: <c13ebc7acd8e40b0c1181f2a43871d061341f02d.1594741192.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1594741192.git.imeevma@gmail.com> After this patch, the argument types of the randomblob() function will be checked properly. Part of #4159 --- src/box/sql/func.c | 12 ++++----- test/sql-tap/func.test.lua | 6 ++--- test/sql-tap/func5.test.lua | 51 ++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index a1b284762..ae9b6d138 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -937,12 +937,10 @@ randomBlob(sql_context * context, int argc, sql_value ** argv) unsigned char *p; assert(argc == 1); UNUSED_PARAMETER(argc); - if (mp_type_is_bloblike(sql_value_type(argv[0]))) { - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, - sql_value_to_diag_str(argv[0]), "numeric"); - 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_UINT); n = sql_value_int(argv[0]); if (n < 1) return; @@ -2734,7 +2732,7 @@ static struct { }, { .name = "RANDOMBLOB", .param_count = 1, - .first_arg = FIELD_TYPE_ANY, + .first_arg = FIELD_TYPE_UNSIGNED, .args = FIELD_TYPE_ANY, .is_blob_like_str = false, .returns = FIELD_TYPE_VARBINARY, diff --git a/test/sql-tap/func.test.lua b/test/sql-tap/func.test.lua index db267d0f5..2ae36fe64 100755 --- a/test/sql-tap/func.test.lua +++ b/test/sql-tap/func.test.lua @@ -982,14 +982,14 @@ test:do_execsql_test( -- </func-9.4> }) -test:do_execsql_test( +test:do_catchsql_test( "func-9.5", [[ SELECT length(randomblob(32)), length(randomblob(-5)), length(randomblob(2000)) ]], { -- <func-9.5> - 32, "", 2000 + 1, "Type mismatch: can not convert -5 to unsigned" -- </func-9.5> }) @@ -2928,7 +2928,7 @@ test:do_catchsql_test( SELECT RANDOMBLOB(X'FF') ]], { -- <func-76.2> - 1, "Type mismatch: can not convert varbinary to numeric" + 1, "Type mismatch: can not convert varbinary to unsigned" -- </func-76.2> }) diff --git a/test/sql-tap/func5.test.lua b/test/sql-tap/func5.test.lua index 170dee9f9..30653e9e1 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(106) +test:plan(113) --!./tcltestrunner.lua -- 2010 August 27 @@ -885,4 +885,53 @@ test:do_execsql_test( 2 }) +test:do_execsql_test( + "func-5-6.13.1", [[ + SELECT randomblob(NULL); + ]],{ + "" + }) + +test:do_execsql_test( + "func-5-6.13.2", [[ + SELECT typeof(randomblob(123)); + ]], { + "varbinary" + }) + +test:do_catchsql_test( + "func-5-6.13.3", [[ + SELECT randomblob(-123); + ]], { + 1, "Type mismatch: can not convert -123 to unsigned" + }) + +test:do_catchsql_test( + "func-5-6.13.4", [[ + SELECT randomblob(-5.5); + ]], { + 1, "Type mismatch: can not convert -5.5 to unsigned" + }) + +test:do_catchsql_test( + "func-5-6.13.5", [[ + SELECT randomblob('-123'); + ]], { + 1, "Type mismatch: can not convert -123 to unsigned" + }) + +test:do_catchsql_test( + "func-5-6.13.6", [[ + SELECT randomblob(false); + ]], { + 1, "Type mismatch: can not convert FALSE to unsigned" + }) + +test:do_catchsql_test( + "func-5-6.13.7", [[ + SELECT randomblob(X'3334'); + ]], { + 1, "Type mismatch: can not convert varbinary to unsigned" + }) + test:finish_test() -- 2.25.1
next prev parent reply other threads:[~2020-07-14 15:48 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-14 15:48 [Tarantool-patches] [PATCH v5 00/17] sql: change implicit cast for assignment imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 01/17] sql: set field_type in mem_set_*() functions imeevma 2020-07-15 12:22 ` Nikita Pettik 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 02/17] sql: change implicit cast for assignment imeevma 2020-07-15 13:41 ` Mergen Imeev 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 03/17] sql: use ApplyType to check function arguments imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 04/17] sql: check args of abs() imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 05/17] sql: check args of avg(), sum() and total() imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 06/17] sql: check args of char() imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 07/17] sql: check args of length() imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 08/17] sql: check operands of LIKE imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 09/17] sql: check args of lower() and upper() imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 10/17] sql: check args of position() imeevma 2020-07-14 15:48 ` imeevma [this message] 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 12/17] sql: check args of replace() imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 13/17] sql: check args of round() imeevma 2020-07-14 15:48 ` [Tarantool-patches] [PATCH v5 14/17] sql: check args of soundex() imeevma 2020-07-14 15:49 ` [Tarantool-patches] [PATCH v5 15/17] sql: check args of substr() imeevma 2020-07-14 15:49 ` [Tarantool-patches] [PATCH v5 16/17] sql: check args of unicode() imeevma 2020-07-14 15:49 ` [Tarantool-patches] [PATCH v5 17/17] sql: check args of zeroblob() imeevma
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c13ebc7acd8e40b0c1181f2a43871d061341f02d.1594741192.git.imeevma@gmail.com \ --to=imeevma@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=tsafin@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v5 11/17] sql: check args of randomblob()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox