Fixes #13: Export db_fetch_row

Add support for result set retrieving for MySQL and PostgreSQL drivers and export it to the new Lua SQL API.
2017-01-17 22:42:00 +03:00
parent 50f2c49c93
commit 5e7d79b49f
18 changed files with 421 additions and 247 deletions
--- a/tests/include/api_sql_common.sh
+++ b/tests/include/api_sql_common.sh
@ -0,0 +1,103 @@
+########################################################################
+# Common code for SQL API tests
+#
+# Expects the following variables and callback functions to be defined by the
+# caller:
+#
+#   DB_DRIVER_ARGS -- extra driver-specific arguments to pass to sysbench
+#
+########################################################################
+
+set -eu
+
+SB_ARGS="--verbosity=1 --test=$CRAMTMP/api_sql.lua --max-requests=1 --num-threads=1 $DB_DRIVER_ARGS"
+cat >$CRAMTMP/api_sql.lua <<EOF
+function thread_init()
+  drv = sysbench.sql.driver()
+  con = drv:connect()
+end
+
+function event()
+  print("drv:name() = " .. drv:name())
+  for k,v in pairs(sysbench.sql.type) do print(k .. " = " .. v) end
+  print()
+
+  con:query("DROP TABLE IF EXISTS t")
+  con:query("CREATE TABLE t(a INT)")
+  con:bulk_insert_init("INSERT INTO t VALUES")
+  for i = 1,100 do
+    con:bulk_insert_next(string.format("(%d)", i))
+  end
+  con:bulk_insert_done()
+  print(con:query_row("SELECT COUNT(DISTINCT a) FROM t"))
+  print('--')
+  con:query("DROP TABLE IF EXISTS t2")
+  con:query("CREATE TABLE t2(a INT, b VARCHAR(120), c FLOAT)")
+  con:query("INSERT INTO t2 VALUES (1, 'foo', 0.4)")
+  con:query("INSERT INTO t2 VALUES (NULL, 'bar', 0.2)")
+  con:query("INSERT INTO t2 VALUES (2, NULL, 0.3)")
+  con:query("INSERT INTO t2 VALUES (NULL, NULL, 0.1)")
+
+  print('--')
+  local rs = con:query("SELECT * FROM t2 ORDER BY a")
+  for i = 1, rs.nrows do
+     print(string.format("%s %s %s", unpack(rs:fetch_row(), 1, rs.nfields)))
+  end
+  print('--')
+
+  print(string.format("%s %s", con:query_row("SELECT b, a FROM t2 ORDER BY b")))
+  print('--')
+  con:query("DROP TABLE t2")
+  con:query("ALTER TABLE t ADD COLUMN b CHAR(10)")
+
+  local stmt = con:prepare("UPDATE t SET a = a + ?, b = ?")
+  local a = stmt:bind_create(sysbench.sql.type.INT)
+  local b = stmt:bind_create(sysbench.sql.type.CHAR, 10)
+  stmt:bind_param(a, b)
+  a:set(100)
+  rs = stmt:execute()
+  a:set(200)
+  b:set("01234567890")
+  rs = stmt:execute()
+  rs:free()
+  stmt:close()
+
+  rs = con:query("SELECT MIN(a), MAX(a), MIN(b), MAX(b) FROM t")
+  print(rs.nfields)
+  for i = 1, rs.nrows do
+     print(string.format("%s %s %s %s", unpack(rs:fetch_row(), 1, rs.nfields)))
+  end
+  con:query("DROP TABLE t")
+  print('--')
+end
+EOF
+
+sysbench $SB_ARGS run
+
+########################################################################
+# Multiple connections test
+########################################################################
+cat >$CRAMTMP/api_sql.lua <<EOF
+function thread_init()
+  drv = sysbench.sql.driver()
+  con = {}
+  for i=1,10 do
+    con[i] = drv:connect()
+  end
+end
+
+function event()
+  con[1]:query("DROP TABLE IF EXISTS t")
+  con[2]:query("CREATE TABLE t(a INT)")
+  for i=1,10 do
+    con[i]:query("INSERT INTO t VALUES (" .. i .. ")")
+  end
+  rs = con[1]:query("SELECT * FROM t")
+  for i = 1, rs.nrows do
+     print(string.format("%s", unpack(rs:fetch_row(), 1, rs.nfields)))
+  end
+  con[1]:query("DROP TABLE t")
+end
+EOF
+
+sysbench $SB_ARGS run