From cb4129332006356ece02293745efb8a4d1759845 Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Mon, 5 Jan 2015 21:33:06 +0800
Subject: [PATCH] update mysql driver for lua 5.3

---
 lualib/mysql.lua | 135 ++++++++++++++---------------------------------
 1 file changed, 39 insertions(+), 96 deletions(-)

diff --git a/lualib/mysql.lua b/lualib/mysql.lua
index 58843e68..f78f529b 100755
--- a/lualib/mysql.lua
+++ b/lualib/mysql.lua
@@ -2,27 +2,22 @@
 -- Copyright (C) 2014 Chang Feng
 -- This file is modified version from https://github.com/openresty/lua-resty-mysql
 -- The license is under the BSD license.
+-- Modified by Cloud Wu (remove bit32 for lua 5.3)
 
 local socketchannel = require "socketchannel"
-local bit = require "bit32"
 local mysqlaux = require "mysqlaux.c"
 local crypt = require "crypt"
 
 
 local sub = string.sub
+local strgsub = string.gsub
+local strformat = string.format
 local strbyte = string.byte
 local strchar = string.char
-local strfind = string.find
 local strrep = string.rep
-local null = nil
-local band = bit.band
-local bxor = bit.bxor
-local bor = bit.bor
-local lshift = bit.lshift
-local rshift = bit.rshift
+local strunpack = string.unpack
+local strpack = string.pack
 local sha1= crypt.sha1
-local concat = table.concat
-local unpack = unpack
 local setmetatable = setmetatable
 local error = error
 local tonumber = tonumber
@@ -53,105 +48,53 @@ for i = 0x01, 0x05 do
     -- tiny, short, long, float, double
     converters[i] = tonumber
 end
--- converters[0x08] = tonumber  -- long long
+converters[0x08] = tonumber  -- long long
 converters[0x09] = tonumber  -- int24
 converters[0x0d] = tonumber  -- year
 converters[0xf6] = tonumber  -- newdecimal
 
 
 local function _get_byte2(data, i)
-    local a, b = strbyte(data, i, i + 1)
-    return bor(a, lshift(b, 8)), i + 2
+	return strunpack("<I2",data,i)
 end
 
 
 local function _get_byte3(data, i)
-    local a, b, c = strbyte(data, i, i + 2)
-    return bor(a, lshift(b, 8), lshift(c, 16)), i + 3
+	return strunpack("<I3",data,i)
 end
 
 
 local function _get_byte4(data, i)
-    local a, b, c, d = strbyte(data, i, i + 3)
-    return bor(a, lshift(b, 8), lshift(c, 16), lshift(d, 24)), i + 4
+	return strunpack("<I4",data,i)
 end
 
 
 local function _get_byte8(data, i)
-    local a, b, c, d, e, f, g, h = strbyte(data, i, i + 7)
-
-    -- XXX workaround for the lack of 64-bit support in bitop:
-    local lo = bor(a, lshift(b, 8), lshift(c, 16), lshift(d, 24))
-    local hi = bor(e, lshift(f, 8), lshift(g, 16), lshift(h, 24))
-    return lo + hi * 4294967296, i + 8
-
-    -- return bor(a, lshift(b, 8), lshift(c, 16), lshift(d, 24), lshift(e, 32),
-               -- lshift(f, 40), lshift(g, 48), lshift(h, 56)), i + 8
+	return strunpack("<I8",data,i)
 end
 
 
 local function _set_byte2(n)
-    return strchar(band(n, 0xff), band(rshift(n, 8), 0xff))
+    return strpack("<I2", n)
 end
 
 
 local function _set_byte3(n)
-    return strchar(band(n, 0xff),
-                   band(rshift(n, 8), 0xff),
-                   band(rshift(n, 16), 0xff))
+    return strpack("<I3", n)
 end
 
 
 local function _set_byte4(n)
-    return strchar(band(n, 0xff),
-                   band(rshift(n, 8), 0xff),
-                   band(rshift(n, 16), 0xff),
-                   band(rshift(n, 24), 0xff))
+    return strpack("<I4", n)
 end
 
 
 local function _from_cstring(data, i)
-    local last = strfind(data, "\0", i, true)
-    if not last then
-        return nil, nil
-    end
-
-    return sub(data, i, last), last + 1
+    return strunpack("z", data, i)
 end
 
-
-local function _to_cstring(data)
-    return data .. "\0"
-end
-
-
-local function _to_binary_coded_string(data)
-    return strchar(#data) .. data
-end
-
-
-local function _dump(data)
-    local len = #data
-    local bytes = new_tab(len, 0)
-    for i = 1, len do
-        bytes[i] = strbyte(data, i)
-    end
-    return concat(bytes, " ")
-end
-
-
-
 local function _dumphex(bytes)
-    local result ={}
-
-    for i = 1, string.len(bytes) do
-        local charcode = tonumber(strbyte(bytes, i, i))
-        local hexstr = string.format("%02X", charcode)
-        result[i]=hexstr
-    end
-
-    local res=table.concat(result, " ")
-    return res
+	return strgsub(bytes, ".", function(x) return strformat("%02x ", strbyte(x)) end)
 end
 
 
@@ -159,19 +102,20 @@ local function _compute_token(password, scramble)
     if password == "" then
         return ""
     end
-    --_dump(scramble)
+    --_dumphex(scramble)
 
     local stage1 = sha1(password)
     --print("stage1:", _dumphex(stage1) )
     local stage2 = sha1(stage1)
     local stage3 = sha1(scramble .. stage2)
-    local n = #stage1
-    local bytes = new_tab(n, 0)
-    for i = 1, n do
-         bytes[i] = strchar(bxor(strbyte(stage3, i), strbyte(stage1, i)))
-    end
 
-    return concat(bytes)
+	local i = 0
+	return strgsub(stage3,".",
+		function(x)
+			i = i + 1
+			-- ~ is xor in lua 5.3
+			return strchar(strbyte(x) ~ strbyte(stage1, i))
+		end)
 end
 
 local function _compose_packet(self, req, size)
@@ -253,7 +197,7 @@ local function _from_length_coded_bin(data, pos)
     end
 
     if first == 251 then
-        return null, pos + 1
+        return nil, pos + 1
     end
 
     if first == 252 then
@@ -278,8 +222,8 @@ end
 local function _from_length_coded_str(data, pos)
     local len
     len, pos = _from_length_coded_bin(data, pos)
-    if len == nil or len == null then
-        return null, pos
+    if len == nil then
+        return nil, pos
     end
 
     return sub(data, pos, pos + len - 1), pos + len
@@ -401,7 +345,7 @@ local function _parse_row_data_packet(data, cols, compact)
         local typ = col.type
         local name = col.name
 
-        if value ~= null then
+        if value ~= nil then
             local conv = converters[typ]
             if conv then
                 value = conv(value)
@@ -457,7 +401,7 @@ local function _recv_auth_resp(self)
 
         if typ == 'ERR' then
             local errno, msg, sqlstate = _parse_err_packet(packet)
-            error( string.format("errno:%d, msg:%s,sqlstate:%s",errno,msg,sqlstate))
+            error( strformat("errno:%d, msg:%s,sqlstate:%s",errno,msg,sqlstate))
             --return nil, errno,msg, sqlstate
         end
 
@@ -484,7 +428,7 @@ local function _mysql_login(self,user,password,database)
 
         if typ == "ERR" then
             local errno, msg, sqlstate = _parse_err_packet(packet)
-            error( string.format("errno:%d, msg:%s,sqlstate:%s",errno,msg,sqlstate))
+            error( strformat("errno:%d, msg:%s,sqlstate:%s",errno,msg,sqlstate))
         end
 
         self.protocol_ver = strbyte(packet)
@@ -536,16 +480,15 @@ local function _mysql_login(self,user,password,database)
 
         local client_flags = 260047;
 
-        local req = _set_byte4(client_flags)
-                    .. _set_byte4(self._max_packet_size)
-                    .. "\0" -- TODO: add support for charset encoding
-                    .. strrep("\0", 23)
-                    .. _to_cstring(user)
-                    .. _to_binary_coded_string(token)
-                    .. _to_cstring(database)
+		local req = strpack("<I4I4c24zs1z",
+			client_flags,
+			self._max_packet_size,
+			strrep("\0", 24),	-- TODO: add support for charset encoding
+			user,
+			token,
+			database)
 
-        local packet_len = 4 + 4 + 1 + 23 + #user + 1
-            + #token + 1 + #database + 1
+        local packet_len = #req
 
         local authpacket=_compose_packet(self,req,packet_len)
         return sockchannel:request(authpacket,_recv_auth_resp(self))
@@ -576,7 +519,7 @@ local function read_result(self, sock)
     if typ == "ERR" then
         local errno, msg, sqlstate = _parse_err_packet(packet)
         return nil, msg, errno, sqlstate
-        --error( string.format("errno:%d, msg:%s,sqlstate:%s",errno,msg,sqlstate))
+        --error( strformat("errno:%d, msg:%s,sqlstate:%s",errno,msg,sqlstate))
     end
 
     if typ == 'OK' then
@@ -601,7 +544,7 @@ local function read_result(self, sock)
         local col, err, errno, sqlstate = _recv_field_packet(self, sock)
         if not col then
             return nil, err, errno, sqlstate
-            --error( string.format("errno:%d, msg:%s,sqlstate:%s",errno,msg,sqlstate))
+            --error( strformat("errno:%d, msg:%s,sqlstate:%s",errno,msg,sqlstate))
         end
 
         cols[i] = col