From 87d2163ef381cf1bc98628c44019f73429f21222 Mon Sep 17 00:00:00 2001
From: Mergen Imeev <imeevma@gmail.com>
Date: Wed, 12 Dec 2018 22:47:48 +0300
Subject: [PATCH] sql: Show currently set sql_default_engine
After this patch, "PRAGMA sql_default_engine" called without
arguments will return currently set sql_default_engine.
---
src/box/sql/pragma.c | 18 ++++++---
test/sql-tap/gh-3733-pragma.test.lua | 13 +------
...h-2367-pragma.test.lua => pragma.test.lua} | 37 ++++++++++++++-----
3 files changed, 42 insertions(+), 26 deletions(-)
rename test/sql-tap/{gh-2367-pragma.test.lua => pragma.test.lua} (64%)
diff --git a/src/box/sql/pragma.c b/src/box/sql/pragma.c
index ab6c7752bf..084468f6b9 100644
--- a/src/box/sql/pragma.c
+++ b/src/box/sql/pragma.c
@@ -607,12 +607,20 @@ sqlPragma(Parse * pParse, Token * pId, /* First part of [schema.]id field */
pParse->nErr++;
goto pragma_out;
}
- if (sql_default_engine_set(zRight) != 0) {
- pParse->rc = SQL_TARANTOOL_ERROR;
- pParse->nErr++;
- goto pragma_out;
+ if (zRight == NULL) {
+ const char *engine_name =
+ sql_storage_engine_strs[current_session()->
+ sql_default_engine];
+ sqlVdbeLoadString(v, 1, engine_name);
+ sqlVdbeAddOp2(v, OP_ResultRow, 1, 1);
+ } else {
+ if (sql_default_engine_set(zRight) != 0) {
+ pParse->rc = SQL_TARANTOOL_ERROR;
+ pParse->nErr++;
+ goto pragma_out;
+ }
+ sqlVdbeAddOp0(v, OP_Expire);
}
- sqlVdbeAddOp0(v, OP_Expire);
break;
}
diff --git a/test/sql-tap/gh-3733-pragma.test.lua b/test/sql-tap/gh-3733-pragma.test.lua
index 991ef82f01..0f856aaee0 100755
--- a/test/sql-tap/gh-3733-pragma.test.lua
+++ b/test/sql-tap/gh-3733-pragma.test.lua
@@ -1,7 +1,7 @@
#!/usr/bin/env tarantool
test = require("sqltester")
-test:plan(17)
+test:plan(16)
---
--- Prerequisites
@@ -104,17 +104,6 @@ test:do_execsql_test(
-- </pragma-5.4>
})
----
---- pragma sql_default_engine requires value
----
-test:do_catchsql_test(
- "pragma-6.1",
- [[
- pragma sql_default_engine;
- ]], {
- 1, "Illegal parameters, 'sql_default_engine' was not specified"
-})
-
---
--- pragma sql_default_engine accepts string values and rejects IDs
---
diff --git a/test/sql-tap/gh-2367-pragma.test.lua b/test/sql-tap/pragma.test.lua
similarity index 64%
rename from test/sql-tap/gh-2367-pragma.test.lua
rename to test/sql-tap/pragma.test.lua
index d874bcee57..5055ba773d 100755
--- a/test/sql-tap/gh-2367-pragma.test.lua
+++ b/test/sql-tap/pragma.test.lua
@@ -1,7 +1,7 @@
#!/usr/bin/env tarantool
test = require("sqltester")
-test:plan(7)
+test:plan(8)
test:do_catchsql_test(
"pragma-1.3",
@@ -40,14 +40,6 @@ test:do_catchsql_test(
test:do_catchsql_test(
"pragma-2.4",
- [[
- pragma sql_default_engine;
- ]], {
- 1, 'Illegal parameters, \'sql_default_engine\' was not specified'
-})
-
-test:do_catchsql_test(
- "pragma-2.5",
[[
pragma sql_default_engine 'memtx';
]], {
@@ -62,4 +54,31 @@ test:do_catchsql_test(
1, 'near \"1\": syntax error'
})
+--
+-- gh-3832: Some statements do not return column type
+--
+-- Check that "PRAGMA sql_default_engine" called without arguments
+-- returns currently set sql_default_engine.
+test:do_execsql_test(
+ "pragma-3.1",
+ [[
+ pragma sql_default_engine='vinyl';
+ pragma sql_default_engine;
+ ]], {
+ -- <pragma-3.1>
+ 'vinyl'
+ -- <pragma-3.1>
+})
+
+test:do_execsql_test(
+ "pragma-3.2",
+ [[
+ pragma sql_default_engine='memtx';
+ pragma sql_default_engine;
+ ]], {
+ -- <pragma-3.2>
+ 'memtx'
+ -- <pragma-3.2>
+})
+
test:finish_test()
--
GitLab