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-11-29 19:54:00 +02:00
parent 9cc6d5f0d5
commit cf6c93b3ae
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql_client.lua
View File

@ -954,7 +954,13 @@ local function get_field_packet(buf)
col.mysql_display_collation = collation col.mysql_display_collation = collation
col.mysql_display_charset = charset col.mysql_display_charset = charset
col.padded = mysql_type == 'char' or nil col.padded = mysql_type == 'char' or nil
col.display_width = math.ceil(display_size / (max_char_widths[charset] or 1)) --NOTE: mysql gives 4x display_size for tinytext, text and mediumtext
--(but not for longtext) on a utf8mb4 connection. bug?
local mcw = max_char_widths[charset] or 1
if mysql_type == 'text' and display_size <= 16777215 * mcw then
mcw = mcw * mcw
end
col.display_width = math.ceil(display_size / mcw)
end end
col.mysql_display_type = mysql_type col.mysql_display_type = mysql_type
col.mysql_buffer_type = buf_type --for param encoding col.mysql_buffer_type = buf_type --for param encoding

31
mysql_client_test.lua
View File

@ -26,10 +26,10 @@ sock.run(function()
f5 bigint(5), f5 bigint(5),
f6 float(2), /* (2) ignored */ f6 float(2), /* (2) ignored */
f7 double, /* can't even give (2) here */ f7 double, /* can't even give (2) here */
f8 timestamp, f8 timestamp default current_timestamp,
f9 date, f9 date default '1000-11-22 12:34:56',
f10 time, f10 time,
f11 datetime, f11 datetime default '1000-11-22 12:34:56',
f12 varchar(100), f12 varchar(100),
f12a varchar(100) not null collate ascii_bin, f12a varchar(100) not null collate ascii_bin,
f13 char(100), f13 char(100),
@ -43,10 +43,14 @@ sock.run(function()
f21 mediumblob, f21 mediumblob,
f22 longblob, f22 longblob,
f23 blob, f23 blob,
f24 tinytext, f24 tinytext,
f25 mediumtext, f24a tinytext collate ascii_bin,
f26 longtext, f25 mediumtext,
f27 text(5), f25a mediumtext collate ascii_bin,
f26 longtext,
f26a longtext collate ascii_bin,
f27 text,
f27a text collate ascii_bin,
f28 varchar(10), f28 varchar(10),
f29 char(10) f29 char(10)
); );
@ -63,6 +67,7 @@ sock.run(function()
for _,k in ipairs(h) do for _,k in ipairs(h) do
local v = col[k] local v = col[k]
v = isnum(v) and fmt('%0.17g', v) or v v = isnum(v) and fmt('%0.17g', v) or v
v = istab(v) and pp.format(v) or v
add(t, fmt('%20s', repl(v, nil, ''))) add(t, fmt('%20s', repl(v, nil, '')))
end end
print(cat(t)) print(cat(t))
@ -100,14 +105,20 @@ sock.run(function()
'name', 'name',
'mysql_type', 'mysql_type',
'mysql_display_type', 'mysql_display_type',
'type', 'size',
'display_width', 'display_width',
'mysql_charset',
'mysql_collation',
'type',
'min',
'max',
'digits',
'decimals', 'decimals',
'has_time', 'has_time',
'padded', 'padded',
'mysql_charset', 'enum_values',
'default',
'mysql_display_charset', 'mysql_display_charset',
'mysql_collation',
'mysql_display_collation', 'mysql_display_collation',
'mysql_buffer_type', 'mysql_buffer_type',
}) })