From 056b265a56908ee96a592959f8fc23289adf5f53 Mon Sep 17 00:00:00 2001 From: Sergey Bronnikov Date: Wed, 20 Jan 2021 16:23:40 +0000 Subject: [PATCH] test: fix luacheck warnings W621 in test/sql-tap W621 (Inconsistent indentation (SPACE followed by TAB)) Part of #5464 (cherry picked from commit 99219d65d30c1b27dc94d39e6c8d2ba63689d59b) --- .luacheckrc | 2 -- test/sql-tap/analyze7.test.lua | 14 +++++++------- test/sql-tap/analyzeD.test.lua | 4 ++-- test/sql-tap/analyzeF.test.lua | 2 +- test/sql-tap/index1.test.lua | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index dbef1f5cb6b6..3c6ba20be0f1 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -53,8 +53,6 @@ files["test/sql-tap/**/*.lua"] = { ignore = { -- A line consists of nothing but whitespace. "611", - -- Inconsistent indentation (SPACE followed by TAB). - "621", -- Line is too long. "631" } diff --git a/test/sql-tap/analyze7.test.lua b/test/sql-tap/analyze7.test.lua index 203a0c3f921a..5db1142cc688 100755 --- a/test/sql-tap/analyze7.test.lua +++ b/test/sql-tap/analyze7.test.lua @@ -29,11 +29,11 @@ test:do_test( DROP TABLE IF EXISTS nums; CREATE TABLE nums(n INT PRIMARY KEY); INSERT into nums WITH RECURSIVE cnt(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM cnt WHERE x<256) SELECT x FROM cnt; - INSERT INTO t1 SELECT n, n, n, n/100, n FROM nums; - EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123; + INSERT INTO t1 SELECT n, n, n, n/100, n FROM nums; + EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123; ]]) end, { - -- + -- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1A (A=?)" -- }) @@ -43,7 +43,7 @@ test:do_execsql_test( [[ EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b=123; ]], { - -- + -- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1B (B=?)" -- }) @@ -68,7 +68,7 @@ test:do_test( test:execsql("ANALYZE;") return test:execsql("EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123;") end, { - -- + -- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1A (A=?)" -- }) @@ -147,9 +147,9 @@ test:do_execsql_test( test:do_execsql_test( "analyze7-3.2.2", [[ - EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2; + EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2; ]], { - -- + -- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1CD (C=?)" -- }) diff --git a/test/sql-tap/analyzeD.test.lua b/test/sql-tap/analyzeD.test.lua index 4a5539699e3f..cafc0ac2331c 100755 --- a/test/sql-tap/analyzeD.test.lua +++ b/test/sql-tap/analyzeD.test.lua @@ -120,7 +120,7 @@ test:do_test( end, { -- <1.7> -- - }) + }) -- Same test as 1.4, except this time the 7 rows that match the a=? condition -- do not feature larger values than all rows in the stat4 table. So sql @@ -133,7 +133,7 @@ test:do_execsql_test( -- <1.8> 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1_C (C=?)" -- - }) + }) test:do_catchsql_test( "analyzeD-1.9", diff --git a/test/sql-tap/analyzeF.test.lua b/test/sql-tap/analyzeF.test.lua index 0b621a3ae1b8..cbb088415a59 100755 --- a/test/sql-tap/analyzeF.test.lua +++ b/test/sql-tap/analyzeF.test.lua @@ -25,7 +25,7 @@ box.internal.sql_create_function("isqrt", "NUMBER", isqrt) test:do_execsql_test( 1.0, [[ - DROP TABLE IF EXISTS t1; + DROP TABLE IF EXISTS t1; CREATE TABLE t1(id INT PRIMARY KEY, x INTEGER, y INTEGER); WITH data(i) AS (SELECT 1 UNION ALL SELECT i+1 FROM data) INSERT INTO t1 SELECT i, isqrt(i), isqrt(i) FROM data LIMIT 500; CREATE INDEX t1y ON t1(y); diff --git a/test/sql-tap/index1.test.lua b/test/sql-tap/index1.test.lua index 8bf81dc60820..168b197597bd 100755 --- a/test/sql-tap/index1.test.lua +++ b/test/sql-tap/index1.test.lua @@ -406,7 +406,7 @@ test:do_test( test:do_catchsql_test( "index-8.1", [[ - CREATE TABLE test1(a INT PRIMARY KEY); + CREATE TABLE test1(a INT PRIMARY KEY); DROP INDEX index1 ON test1 ]], { --