diff --git a/mysql_client.lua b/mysql_client.lua index 17ee73d..6754454 100644 --- a/mysql_client.lua +++ b/mysql_client.lua @@ -3,6 +3,8 @@ --Written by Cosmin Apreutesei. Public domain. --Original code by Yichun Zhang (agentzh). BSD license. +if not ... then require'mysql_client_test'; return end + local ffi = require'ffi' local bit = require'bit' local sha1 = require'sha1'.sha1 diff --git a/mysql_client_test.lua b/mysql_client_test.lua index 944bfee..5698ac2 100644 --- a/mysql_client_test.lua +++ b/mysql_client_test.lua @@ -69,10 +69,11 @@ sock.run(function() local v = col[k] 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 print(cat(t)) end + print() end --pp(conn:query'select * from val where val = 1') @@ -96,40 +97,8 @@ sock.run(function() }) assert(stmt:free()) - local spp = require'sqlpp'.new() - require'sqlpp_mysql' - spp.import'mysql' + conn:close() - local cn = spp.connect(conn) - - local rows, cols = cn:query({get_table_defs=1}, 'select * from test') - print() - pr(cols, { - 'name', - 'mysql_type', - 'mysql_display_type', - 'size', - 'display_width', - 'mysql_charset', - 'mysql_collation', - 'type', - 'min', - 'max', - 'digits', - 'decimals', - 'has_time', - 'padded', - 'enum_values', - 'default', - 'mysql_default', - 'mysql_display_charset', - 'mysql_display_collation', - 'mysql_buffer_type', - }) - - pp(rows) - - cn:close() assert(conn:closed()) end)