From 30998dd003121b478f123facdf712b21cda54bb9 Mon Sep 17 00:00:00 2001
From: Mergen Imeev <imeevma@gmail.com>
Date: Mon, 5 Jul 2021 11:57:35 +0300
Subject: [PATCH] sql: allow to bind uuid values
After this patch, uuid values can be bound like any other supported by
SQL values.
Part of #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 | 10 +++++++
test/sql-tap/gh-6164-uuid-follow-ups.test.lua | 26 ++++++++++++++++++-
6 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/src/box/bind.c b/src/box/bind.c
index d45a0f9a7d..734f651863 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 568c558f38..143f010ced 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 "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 1b59b2e4ac..62ccaf3f14 100644
--- a/src/box/lua/execute.c
+++ b/src/box/lua/execute.c
@@ -371,6 +371,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;
@@ -386,6 +390,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 ef8dcd693d..115c52f96b 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 aaae12e415..8031ee0dc1 100644
--- a/src/box/sql/vdbeapi.c
+++ b/src/box/sql/vdbeapi.c
@@ -840,6 +840,16 @@ 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 || sql_bind_type(p, i, "uuid") != 0)
+ return -1;
+ mem_set_uuid(&p->aVar[i - 1], uuid);
+ return 0;
+}
+
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 a8f662f773..4fc5052d85 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(1)
+test:plan(4)
-- Make sure that function quote() can work with uuid.
test:do_execsql_test(
@@ -11,4 +11,28 @@ test:do_execsql_test(
'11111111-1111-1111-1111-111111111111'
})
+-- Make sure that uuid value can be binded.
+local uuid1 = require('uuid').fromstr('11111111-1111-1111-1111-111111111111')
+local uuid2 = require('uuid').fromstr('11111111-2222-1111-1111-111111111111')
+local uuid3 = require('uuid').fromstr('11111111-1111-3333-1111-111111111111')
+test:do_test(
+ "gh-6164-2",
+ function()
+ return box.execute([[SELECT ?;]], {uuid1}).rows[1][1]
+ end,
+ uuid1)
+test:do_test(
+ "gh-6164-3",
+ function()
+ return box.execute([[SELECT $2;]], {123, uuid2}).rows[1][1]
+ end,
+ uuid2)
+
+test:do_test(
+ "gh-6164-4",
+ function()
+ return box.execute([[SELECT :two;]], {{[":two"] = uuid3}}).rows[1][1]
+ end,
+ uuid3)
+
test:finish_test()
--
GitLab