Re: [Tarantool-patches] [PATCH v2 3/9] sql: remove PRAGMA "sql_compound_select_limit"

[Mergen Imeev <imeevma@tarantool.org>]

Hi! Thank you for review! My answer and diff below.

On Tue, Dec 31, 2019 at 01:11:22AM +0200, Nikita Pettik wrote:
> On 30 Dec 19:43, imeevma@tarantool.org wrote:
> > diff --git a/test/sql-tap/suite.ini b/test/sql-tap/suite.ini
> > index 8f3c3ea..2e8411d 100644
> > --- a/test/sql-tap/suite.ini
> > +++ b/test/sql-tap/suite.ini
> > @@ -21,6 +21,7 @@ disabled = selectA.test.lua ;
> >             analyzeE.test.lua ;
> >             analyzeF.test.lua ;
> >             gh-3350-skip-scan.test.lua ;
> > +           gh2548-select-compound-limit.test.lua ;
> 
> This test is not only about pragma itself. Please, don't disable
> it but instead refactor.
>  
Fixed.

> >  lua_libs = lua/sqltester.lua ../sql/lua/sql_tokenizer.lua ../box/lua/identifier.lua
> >  is_parallel = True
> > -- 
> > 2.7.4
> > 

Diff:

diff --git a/test/sql-tap/gh2548-select-compound-limit.test.lua b/test/sql-tap/gh2548-select-compound-limit.test.lua
index f578870..76769d6 100755
--- a/test/sql-tap/gh2548-select-compound-limit.test.lua
+++ b/test/sql-tap/gh2548-select-compound-limit.test.lua
@@ -1,6 +1,6 @@
 #!/usr/bin/env tarantool
 test = require("sqltester")
-test:plan(14)
+test:plan(9)
 
 -- box.cfg{wal_mode='none'}
 
@@ -62,47 +62,4 @@ test:do_catchsql_test(
         -- </gh2548-select-compound-limit-2>
     })
 
-test:do_execsql_test(
-    "gh2548-select-compound-limit-3.1", [[
-        pragma sql_compound_select_limit
-    ]], {
-        -- <gh2548-select-compound-limit-3.1>
-        30
-        -- </gh2548-select-compound-limit-3.1>
-    })
-
-test:do_execsql_test(
-    "gh2548-select-compound-limit-3.2", [[
-        pragma sql_compound_select_limit=31
-    ]], {
-        -- <gh2548-select-compound-limit-3.2>
-        31
-        -- </gh2548-select-compound-limit-3.2>
-})
-
-test:do_execsql_test(
-    "gh2548-select-compound-limit-3.3",
-    select_string_last, {
-        -- <gh2548-select-compound-limit-3.3>
-        0, 1
-        -- </gh2548-select-compound-limit-3.3>
-    })
-
-test:do_execsql_test(
-    "gh2548-select-compound-limit-3.4", [[
-        pragma sql_compound_select_limit=0
-    ]], {
-        -- <gh2548-select-compound-limit-3.4>
-        0
-        -- </gh2548-select-compound-limit-3.4>
-    })
-
-test:do_execsql_test(
-    "gh2548-select-compound-limit-3.3",
-    select_string_last, {
-        -- <gh2548-select-compound-limit-3.3>
-        0, 1
-        -- </gh2548-select-compound-limit-3.3>
-    })
-
 test:finish_test()
diff --git a/test/sql-tap/suite.ini b/test/sql-tap/suite.ini
index 2e8411d..8f3c3ea 100644
--- a/test/sql-tap/suite.ini
+++ b/test/sql-tap/suite.ini
@@ -21,7 +21,6 @@ disabled = selectA.test.lua ;
            analyzeE.test.lua ;
            analyzeF.test.lua ;
            gh-3350-skip-scan.test.lua ;
-           gh2548-select-compound-limit.test.lua ;
 
 lua_libs = lua/sqltester.lua ../sql/lua/sql_tokenizer.lua ../box/lua/identifier.lua
 is_parallel = True