From 2be3151cb29a365223589434e05b92bd7e134222 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 18 Feb 2014 13:59:20 +0400
Subject: [PATCH] Fix net_sql.mysql.test
---
test/module/net_sql.mysql.result | 6 +++---
test/module/net_sql.mysql.test | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/test/module/net_sql.mysql.result b/test/module/net_sql.mysql.result
index dcd94189e6..4c32f11aa2 100644
--- a/test/module/net_sql.mysql.result
+++ b/test/module/net_sql.mysql.result
@@ -1,10 +1,10 @@
lua c = box.net.sql.connect('abcd')
---
-error: '[string "-- sql.lua (internal file)..."]:29: Unknown driver ''abcd'''
+error: '../../src/module/sql/sql.lua:29: Unknown driver ''abcd'''
...
lua c = box.net.sql.connect('mysql')
---
-error: '[string "-- sql.lua (internal file)..."]:64: Usage: box.net.sql.connect(''mysql'', host, port, user, password, db, ...)'
+error: '../../src/module/sql/sql.lua:64: Usage: box.net.sql.connect(''mysql'', host, port, user, password, db, ...)'
...
lua dump = function(v) return box.cjson.encode(v) end
---
@@ -33,7 +33,7 @@ port: string
...
lua c:execute('SEL ECT 1')
---
-error: '[string "-- sql.lua (internal file)..."]:105: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''SEL ECT 1'' at line 1'
+error: '../../src/module/sql/sql.lua:105: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''SEL ECT 1'' at line 1'
...
lua dump({c:execute('SELECT ? AS bool1, ? AS bool2, ? AS nil, ? AS num, ? AS str', true, false, nil, 123, 'abc')})
---
diff --git a/test/module/net_sql.mysql.test b/test/module/net_sql.mysql.test
index 36a5631edf..8f879eae50 100644
--- a/test/module/net_sql.mysql.test
+++ b/test/module/net_sql.mysql.test
@@ -11,6 +11,7 @@ server.stop()
server.deploy(init_lua="module/net_sql.mysql.lua")
exec admin "lua c = box.net.sql.connect('abcd')"
+exec admin "lua c = box.net.sql.connect('mysql')"
exec admin "lua dump = function(v) return box.cjson.encode(v) end"
exec admin "lua connect = {}"
--
GitLab