From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1 3/3] sql: allow to bind uuid values Date: Mon, 5 Jul 2021 18:06:17 +0300 [thread overview] Message-ID: <e2e290d374e5cb1becda12e24d8cf194f658f0fd.1625497228.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1625497228.git.imeevma@gmail.com> After this patch, uuid values can be binded like any other supported by SQL values. Closes #6164 --- src/box/bind.c | 3 +++ src/box/bind.h | 5 +++++ src/box/lua/execute.c | 5 +++++ src/box/sql/sqlInt.h | 5 +++++ src/box/sql/vdbeapi.c | 11 +++++++++++ test/sql-tap/gh-6164-uuid-follow-ups.test.lua | 16 +++++++++++++++- 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/box/bind.c b/src/box/bind.c index d45a0f9a7..734f65186 100644 --- a/src/box/bind.c +++ b/src/box/bind.c @@ -191,6 +191,9 @@ sql_bind_column(struct sql_stmt *stmt, const struct sql_bind *p, case MP_BIN: return sql_bind_blob64(stmt, pos, (const void *) p->s, p->bytes, SQL_STATIC); + case MP_EXT: + assert(p->ext_type == MP_UUID); + return sql_bind_uuid(stmt, pos, &p->uuid); default: unreachable(); } diff --git a/src/box/bind.h b/src/box/bind.h index 568c558f3..20f3e7942 100644 --- a/src/box/bind.h +++ b/src/box/bind.h @@ -40,6 +40,8 @@ extern "C" { #include <stdlib.h> #include "msgpuck.h" +#include "uuid/tt_uuid.h" +#include "lib/core/mp_extension_types.h" struct sql_stmt; @@ -59,6 +61,8 @@ struct sql_bind { uint32_t bytes; /** MessagePack type of the value. */ enum mp_type type; + /** Subtype of MP_EXT type. */ + enum mp_extension_type ext_type; /** Bind value. */ union { bool b; @@ -67,6 +71,7 @@ struct sql_bind { uint64_t u64; /** For string or blob. */ const char *s; + struct tt_uuid uuid; }; }; diff --git a/src/box/lua/execute.c b/src/box/lua/execute.c index 926a0a61c..3d1352fc6 100644 --- a/src/box/lua/execute.c +++ b/src/box/lua/execute.c @@ -370,6 +370,10 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i) bind->s = mp_decode_bin(&field.sval.data, &bind->bytes); break; case MP_EXT: + if (field.ext_type == MP_UUID) { + bind->uuid = *field.uuidval; + break; + } diag_set(ClientError, ER_SQL_BIND_TYPE, "USERDATA", sql_bind_name(bind)); return -1; @@ -385,6 +389,7 @@ lua_sql_bind_decode(struct lua_State *L, struct sql_bind *bind, int idx, int i) unreachable(); } bind->type = field.type; + bind->ext_type = field.ext_type; lua_pop(L, lua_gettop(L) - idx); return 0; } diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index ef8dcd693..115c52f96 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -326,6 +326,8 @@ struct sql_vfs { #define SQL_LIMIT_LIKE_PATTERN_LENGTH 8 #define SQL_LIMIT_TRIGGER_DEPTH 9 +struct tt_uuid; + enum sql_ret_code { /** sql_step() has another row ready. */ SQL_ROW = 1, @@ -634,6 +636,9 @@ int sql_bind_zeroblob64(sql_stmt *, int, sql_uint64); +int +sql_bind_uuid(struct sql_stmt *stmt, int i, const struct tt_uuid *uuid); + /** * Return the number of wildcards that should be bound to. */ diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index aaae12e41..a9700350d 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -840,6 +840,17 @@ sql_bind_zeroblob64(sql_stmt * pStmt, int i, sql_uint64 n) return sql_bind_zeroblob(pStmt, i, n); } +int +sql_bind_uuid(struct sql_stmt *stmt, int i, const struct tt_uuid *uuid) +{ + struct Vdbe *p = (struct Vdbe *)stmt; + if (vdbeUnbind(p, i) != 0) + return -1; + int rc = sql_bind_type(p, i, "uuid"); + mem_set_uuid(&p->aVar[i - 1], uuid); + return rc; +} + int sql_bind_parameter_count(const struct sql_stmt *stmt) { diff --git a/test/sql-tap/gh-6164-uuid-follow-ups.test.lua b/test/sql-tap/gh-6164-uuid-follow-ups.test.lua index 8872f9f23..426717972 100755 --- a/test/sql-tap/gh-6164-uuid-follow-ups.test.lua +++ b/test/sql-tap/gh-6164-uuid-follow-ups.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool local test = require("sqltester") -test:plan(3) +test:plan(4) local uuid = require('uuid').fromstr('11111111-1111-1111-1111-111111111111') @@ -32,4 +32,18 @@ test:do_execsql_test( true }) +-- Make sure that uuid value can be binded. +box.execute('CREATE TABLE t(i INT PRIMARY KEY, a UUID);') +box.execute('INSERT INTO t VALUES(1, ?);', {uuid}); + +test:do_execsql_test( + "gh-6164-4", + [[ + SELECT * FROM t; + ]], { + 1, uuid + }) + +box.execute([[DROP TABLE t;]]) + test:finish_test() -- 2.25.1
next prev parent reply other threads:[~2021-07-05 15:07 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-05 15:04 [Tarantool-patches] [PATCH v1 0/3] Follow ups for uuid introduction Mergen Imeev via Tarantool-patches 2021-07-05 15:06 ` [Tarantool-patches] [PATCH v1 1/3] sql: introduce uuid to quote() Mergen Imeev via Tarantool-patches 2021-07-07 21:41 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-05 15:06 ` [Tarantool-patches] [PATCH v1 2/3] sql: fix uuid behaviour in least() and greatest() Mergen Imeev via Tarantool-patches 2021-07-07 21:42 ` Vladislav Shpilevoy via Tarantool-patches 2021-07-10 14:36 ` Mergen Imeev via Tarantool-patches 2021-07-05 15:06 ` Mergen Imeev via Tarantool-patches [this message] 2021-07-07 21:44 ` [Tarantool-patches] [PATCH v1 3/3] sql: allow to bind uuid values Vladislav Shpilevoy via Tarantool-patches
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=e2e290d374e5cb1becda12e24d8cf194f658f0fd.1625497228.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 3/3] sql: allow to bind uuid values' \ /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