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 9E51821BC9 for ; Fri, 28 Dec 2018 13:11:22 -0500 (EST) 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 SMGHz-wyDarj for ; Fri, 28 Dec 2018 13:11:22 -0500 (EST) Received: from smtp62.i.mail.ru (smtp62.i.mail.ru [217.69.128.42]) (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 5A8D722AE6 for ; Fri, 28 Dec 2018 13:11:22 -0500 (EST) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v6 5/5] sql: check new box.sql.execute() Date: Fri, 28 Dec 2018 21:11:20 +0300 Message-Id: In-Reply-To: References: 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: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org This commit checks that new implementation of box.sql.execute() is able to pass all tests. This is temporary commit and should be dropped later. Even though this commit is temporary it shows that this patch-set should be pushed after patch for issue #3832. Needed for #3505 --- src/box/execute.c | 14 +++++++++----- src/box/execute.h | 2 +- src/box/iproto.cc | 2 +- src/box/lua/schema.lua | 23 +++++++++++++++++++++++ src/box/lua/sql.c | 10 +++++++--- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/box/execute.c b/src/box/execute.c index ade6e6c..0a75dd6 100644 --- a/src/box/execute.c +++ b/src/box/execute.c @@ -716,6 +716,8 @@ sql_get_description(struct sqlite3_stmt *stmt, struct obuf *out, * column_name simply returns them. */ assert(name != NULL); + if (type == NULL) + type = "UNKNOWN"; size += mp_sizeof_str(strlen(name)); size += mp_sizeof_str(strlen(type)); char *pos = (char *) obuf_alloc(out, size); @@ -888,6 +890,8 @@ lua_sql_get_description(struct sqlite3_stmt *stmt, struct lua_State *L, * column_name simply returns them. */ assert(name != NULL); + if (type == NULL) + type = "UNKNOWN"; lua_pushstring(L, name); lua_setfield(L, -2, "name"); lua_pushstring(L, type); @@ -956,7 +960,7 @@ port_sql_destroy(struct port *base) static inline int sql_execute(sqlite3 *db, struct sqlite3_stmt *stmt, struct port *port, - struct region *region) + struct region *region, int error_id) { int rc, column_count = sqlite3_column_count(stmt); if (column_count > 0) { @@ -973,7 +977,7 @@ sql_execute(sqlite3 *db, struct sqlite3_stmt *stmt, struct port *port, assert(rc != SQLITE_ROW && rc != SQLITE_OK); } if (rc != SQLITE_DONE) { - diag_set(ClientError, ER_SQL_EXECUTE, sqlite3_errmsg(db)); + diag_set(ClientError, error_id, sqlite3_errmsg(db)); return -1; } return 0; @@ -982,7 +986,7 @@ sql_execute(sqlite3 *db, struct sqlite3_stmt *stmt, struct port *port, int sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, uint32_t bind_count, struct port *port, - struct region *region) + struct region *region, int error_id) { struct sqlite3_stmt *stmt; sqlite3 *db = sql_get(); @@ -991,13 +995,13 @@ sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, return -1; } if (sqlite3_prepare_v2(db, sql, len, &stmt, NULL) != SQLITE_OK) { - diag_set(ClientError, ER_SQL_EXECUTE, sqlite3_errmsg(db)); + diag_set(ClientError, error_id, sqlite3_errmsg(db)); return -1; } assert(stmt != NULL); port_sql_create(port, stmt); if (sql_bind(stmt, bind, bind_count) == 0 && - sql_execute(db, stmt, port, region) == 0) + sql_execute(db, stmt, port, region, error_id) == 0) return 0; port_destroy(port); return -1; diff --git a/src/box/execute.h b/src/box/execute.h index cb149a0..ce8f20f 100644 --- a/src/box/execute.h +++ b/src/box/execute.h @@ -105,7 +105,7 @@ lua_sql_bind_list_decode(struct lua_State *L, struct sql_bind **out_bind, int sql_prepare_and_execute(const char *sql, int len, const struct sql_bind *bind, uint32_t bind_count, struct port *port, - struct region *region); + struct region *region, int error_id); #if defined(__cplusplus) } /* extern "C" { */ diff --git a/src/box/iproto.cc b/src/box/iproto.cc index 9dc0462..a6bd354 100644 --- a/src/box/iproto.cc +++ b/src/box/iproto.cc @@ -1634,7 +1634,7 @@ tx_process_sql(struct cmsg *m) sql = msg->sql.sql_text; sql = mp_decode_str(&sql, &len); if (sql_prepare_and_execute(sql, len, bind, bind_count, &port, - &fiber()->gc) != 0) + &fiber()->gc, ER_SQL_EXECUTE) != 0) goto error; /* * Take an obuf only after execute(). Else the buffer can diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua index 8a804f0..02ec2fd 100644 --- a/src/box/lua/schema.lua +++ b/src/box/lua/schema.lua @@ -2456,3 +2456,26 @@ box.feedback.save = function(file_name) end box.NULL = msgpack.NULL + +box.sql.execute = function(sql) + local result = box.sql.new_execute(sql) + if result == nil then return end + local ret = nil + if result.rows ~= nil then + ret = {} + for key, row in pairs(result.rows) do + if type(row) == 'cdata' then + table.insert(ret, row:totable()) + end + end + end + if result.metadata ~= nil then + if ret == nil then ret = {} end + ret[0] = {} + for key, row in pairs(result.metadata) do + table.insert(ret[0], row['name']) + end + setmetatable(ret, {__serialize = 'sequence'}) + end + if ret ~= nil then return ret end +end diff --git a/src/box/lua/sql.c b/src/box/lua/sql.c index 20ba43b..e1c67d8 100644 --- a/src/box/lua/sql.c +++ b/src/box/lua/sql.c @@ -136,10 +136,14 @@ lbox_execute(struct lua_State *L) } if (sql_prepare_and_execute(sql, length, bind, bind_count, &port, - &fiber()->gc) != 0) - return luaT_error(L); + &fiber()->gc, ER_SYSTEM) != 0) + goto sqlerror; port_dump_lua(&port, L); return 1; + +sqlerror: + lua_pushstring(L, sqlite3_errmsg(sql_get())); + return lua_error(L); } static int @@ -155,7 +159,7 @@ void box_lua_sqlite_init(struct lua_State *L) { static const struct luaL_Reg module_funcs [] = { - {"execute", lua_sql_execute}, + {"old_execute", lua_sql_execute}, {"new_execute", lbox_execute}, {"debug", lua_sql_debug}, {NULL, NULL} -- 2.7.4