Update execute interface. Support for passing nil.

Author: GeorgyKirichenko

mysql/driver.c

@@ -205,11 +205,14 @@ lua_mysql_execute(struct lua_State *L)
 		return lua_mysql_push_error(L, conn);
 
 	lua_pushnumber(L, 1);
-	int ret_count = 1;
+	int ret_count = 2;
+	int result_no = 0;
 
+	lua_newtable(L);
 	while (true) {
 		MYSQL_RES *res = mysql_use_result(conn);
 		if (res) {
+			lua_pushnumber(L, ++result_no);
 			int fail = 0;
 			lua_pushcfunction(L, lua_mysql_fetch_result);
 			lua_pushlightuserdata(L, conn);
@@ -228,7 +231,7 @@ lua_mysql_execute(struct lua_State *L)
 			if (fail) {
 				return lua_error(L);
 			}
-			++ret_count;
+			lua_settable(L, -3);
 		}
 		int next_res, status = mysql_next_result_start(&next_res, conn);
 		while (status) {
@@ -350,6 +353,9 @@ lua_mysql_execute_prepared(struct lua_State *L)
 	}
 	if (error)
 		goto done;
+
+	lua_newtable(L);
+	lua_pushnumber(L, 1);
 	meta = mysql_stmt_result_metadata(stmt);
 	if (!meta)
 		goto done;
@@ -390,6 +396,7 @@ lua_mysql_execute_prepared(struct lua_State *L)
 		lua_settable(L, -3);
 		++row_idx;
 	}
+	lua_settable(L, - 3);
 	ret_count = 2;
 
 done:
@@ -509,7 +516,7 @@ lua_mysql_connect(struct lua_State *L)
 	const char *db = lua_tostring(L, 5);
 
 	MYSQL *conn, *tmp_conn = mysql_init(NULL);
-	if (!conn) {
+	if (!tmp_conn) {
 		lua_pushinteger(L, -1);
 		int fail = safe_pushstring(L,
 					  "Can not allocate memory for connector");

mysql/init.lua

@@ -41,6 +41,7 @@ end
 local function conn_get(pool)
     local mysql_conn = pool.queue:get()
     local status
+    local k = mysql_conn
     if mysql_conn == nil then
         status, mysql_conn = driver.connect(pool.host, pool.port or 0,
                                             pool.user, pool.pass, pool.db)
@@ -77,36 +78,33 @@ conn_mt = {
                 return get_error(self.pool.raise, 'Connection is broken')
             end
             local status, datas
-            if ... ~= nil then
-                datas = {self.conn:execute_prepared(sql, ...)}
-                status = datas[1]
+            if select('#', ...) > 0 then
+                status, datas = self.conn:execute_prepared(sql, ...)
             else
-                datas = {self.conn:execute(sql)}
-                status = datas[1]
+                status, datas = self.conn:execute(sql)
             end
             if status ~= 1 then
                 self.queue:put(status == 0)
-                return get_error(self.pool.raise, datas[2])
+                return get_error(self.pool.raise, datas)
             end
             self.queue:put(true)
-            datas[1] = true
-            return unpack(datas)
+            return datas, true
         end,
         begin = function(self)
-            return self:execute('BEGIN')
+            return self:execute('BEGIN') ~= nil
         end,
         commit = function(self)
-            return self:execute('COMMIT')
+            return self:execute('COMMIT') ~= nil
         end,
         rollback = function(self)
-            return self:execute('ROLLBACK')
+            return self:execute('ROLLBACK') ~= nil
         end,
         ping = function(self)
             local pool = self.pool
             self.pool = {raise = false}
             local data, msg = self:execute('SELECT 1 AS code')
             self.pool = pool
-            return data and msg[1].code == 1
+            return msg and data[1][1].code == 1
         end,
         close = function(self)
             if not self.usable then

test/mysql.test.lua

@@ -22,7 +22,7 @@ function test_old_api(t, conn)
     t:plan(16)
     -- Add an extension to 'tap' module
     getmetatable(t).__index.q = function(test, stmt, result, ...)
-        test:is_deeply({conn:execute(stmt, ...)}, {true, result},
+        test:is_deeply({conn:execute(stmt, ...)}, {{result}, true},
             ... ~= nil and stmt..' % '..json.encode({...}) or stmt)
     end
     t:ok(conn:ping(), "ping")
@@ -48,7 +48,7 @@ function test_old_api(t, conn)
         end
 
         t:ok(conn:begin(), "begin")
-        local status = conn:execute("INSERT INTO _tx_test VALUES(10)");
+        local _, status = conn:execute("INSERT INTO _tx_test VALUES(10)");
         t:is(status, true, "insert")
         t:q('SELECT * FROM _tx_test', {{ a  = 10 }})
         t:ok(conn:rollback(), "roolback")
@@ -110,9 +110,9 @@ function test_mysql_int64(t, p)
     conn = p:get()
     conn:execute('create table int64test (id bigint)')
     conn:execute('insert into int64test values(1234567890123456789)')
-    local r, m = conn:execute('select id from int64test')
+    local d, s = conn:execute('select id from int64test')
     conn:execute('drop table int64test')
-    t:ok(m[1]['id'] == 1234567890123456789LL, 'int64 test')
+    t:ok(d[1][1]['id'] == 1234567890123456789LL, 'int64 test')
     p:put(conn)
 end