sys4/mysql
1
0
Fork 0
mirror of https://github.com/luapower/mysql.git synced 2025-01-01 14:00:27 +01:00
Code Issues Releases Wiki Activity

unimportant

Browse Source
This commit is contained in:
Cosmin Apreutesei 2021-09-09 14:08:14 +03:00
parent 9372919199
commit 3a8130b35b
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mysql_client.lua
View File

@ -871,12 +871,10 @@ end
local UNSIGNED_FLAG = 32 local UNSIGNED_FLAG = 32
function mysql.num_range(type, unsigned, digits, decimals) function mysql.num_range(type, unsigned, digits, decimals)
if type == 'decimal' then if digits and decimals then
if digits and decimals then local max = 10^(digits - decimals) - 1 / 10^decimals
local max = 10^(digits - decimals) - 1 / 10^decimals local min = unsigned and 0 or -max --unsigned decimals is deprecated!
local min = unsigned and 0 or -max --unsigned decimals is deprecated! return min, max
return min, max
end
else else
local range = int_ranges[type] local range = int_ranges[type]
if range then if range then
@ -908,17 +906,19 @@ local function get_field_packet(buf)
local decimals = get_u8(buf) local decimals = get_u8(buf)
local buf_type = buffer_type_names[buf_type_code] local buf_type = buffer_type_names[buf_type_code]
if collation == 63 then if collation == 63 then
col.type = bin_types[buf_type] local type = bin_types[buf_type]
or num_types[buf_type] if not type then
or buf_type type = num_types[buf_type]
if type then
col.decimals = decimals
end
end
col.type = type or buf_type
else else
col.type = text_types[buf_type] col.type = text_types[buf_type]
col.collation = collation_names[collation] col.collation = collation_names[collation]
col.charset = col.collation and col.collation:match'^[^_]+' col.charset = col.collation and col.collation:match'^[^_]+'
end end
if col.type == 'decimal' then
col.decimals = decimals
end
col.buffer_type = buf_type col.buffer_type = buf_type
col.buffer_type_code = buf_type_code col.buffer_type_code = buf_type_code
col.unsigned = band(flags, UNSIGNED_FLAG) ~= 0 or nil col.unsigned = band(flags, UNSIGNED_FLAG) ~= 0 or nil
@ -985,9 +985,9 @@ function mysql.connect(opt)
assert(self.collation, 'charset and/or collation required') assert(self.collation, 'charset and/or collation required')
end end
local host = opt.host self.host = opt.host
local port = opt.port or 3306 self.port = opt.port or 3306
check_io(self, self.tcp:connect(host, port)) check_io(self, self.tcp:connect(self.host, self.port))
local typ, buf = recv_packet(self) local typ, buf = recv_packet(self)
if typ == 'ERR' then if typ == 'ERR' then
@ -1047,7 +1047,6 @@ function mysql.connect(opt)
self.charset_is_ascii_superset = self.charset and not mb_charsets[self.charset] self.charset_is_ascii_superset = self.charset and not mb_charsets[self.charset]
self.schema = opt.schema self.schema = opt.schema
self.user = opt.user self.user = opt.user
self.host_port = host .. ':' .. port
return self return self
end end
@ -1107,12 +1106,11 @@ local function read_result(self, opt)
local compact = opt and opt.compact local compact = opt and opt.compact
local to_array = opt and opt.to_array and #cols == 1 local to_array = opt and opt.to_array and #cols == 1
local sopt = opt or self local null_value = opt and opt.null_value or self.null_value
local null_value = sopt.null_value local datetime_format = opt and opt.datetime_format or self.datetime_format
local datetime_format = sopt.datetime_format local date_format = opt and opt.date_format or self.date_format
local date_format = sopt.date_format local time_format = opt and opt.time_format or self.time_format
local time_format = sopt.time_format local to_lua = opt and opt.to_lua or self.to_lua
local to_lua = sopt.to_lua
local rows = {} local rows = {}
local i = 0 local i = 0

2
mysql_client.md
View File

@ -100,7 +100,7 @@ of 5 characters. Note that, the `errcode` and `sqlstate` might be `nil`
if MySQL does not return them. if MySQL does not return them.
NOTE: 64 bit integers and decimals are converted to Lua numbers by default. NOTE: 64 bit integers and decimals are converted to Lua numbers by default.
That limits the useful integer range of number types to ±2^51 or 15 digits. That limits the useful range of number types to 15 significant digits.
### `cn:query(query, [options]) -> res,nil,cols | nil,err,errcode,sqlstate` ### `cn:query(query, [options]) -> res,nil,cols | nil,err,errcode,sqlstate`