I'm sorry it was wrong diff if the patch diff --git a/src/box/sql/analyze.c b/src/box/sql/analyze.c index f0054c5..6ac035b 100644 --- a/src/box/sql/analyze.c +++ b/src/box/sql/analyze.c @@ -1123,6 +1123,8 @@ analyzeDatabase(Parse * pParse) iTab = pParse->nTab; for (k = sqliteHashFirst(&pSchema->tblHash); k; k = sqliteHashNext(k)) { Table *pTab = (Table *) sqliteHashData(k); + if (space_is_view(pTab)) + continue; analyzeOneTable(pParse, pTab, 0, iStatCur, iMem, iTab); } loadAnalysis(pParse); @@ -1179,8 +1181,12 @@ sqlite3Analyze(Parse * pParse, Token * pName) /* Form 2: Analyze table named */ z = sqlite3NameFromToken(db, pName); if (z) { - if ((pTab = sqlite3LocateTable(pParse, 0, z)) != 0) { - analyzeTable(pParse, pTab, 0); + if ((pTab = sqlite3LocateTable(pParse, 0, z)) != NULL) { + if (space_is_view(pTab)) + sqlite3ErrorMsg(pParse, "VIEW isn't " + "allowed to be analyzed"); + else + analyzeTable(pParse, pTab, 0); } } sqlite3DbFree(db, z); diff --git a/test/sql-tap/analyzeD.test.lua b/test/sql-tap/analyzeD.test.lua index 8fdadf5..ef6aced 100755 --- a/test/sql-tap/analyzeD.test.lua +++ b/test/sql-tap/analyzeD.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool test = require("sqltester") -test:plan(9) +test:plan(15) testprefix = "analyzeD" @@ -139,5 +139,66 @@ test:do_execsql_test( -- }) +test:do_catchsql_test( + "analyzeD-1.9", + [[ + CREATE TABLE table1(id INT PRIMARY KEY, a INT); + CREATE VIEW v AS SELECT * FROM table1; + ANALYZE; + ]], { + -- + 0 + -- + }) + +test:do_execsql_test( + "analyzeD-1.10", + [[ + SELECT * FROM "_sql_stat4" WHERE "tbl" = 'v'; + ]], { + -- + + -- + }) + +test:do_execsql_test( + "analyzeD-1.11", + [[ + SELECT * FROM "_sql_stat1" WHERE "tbl" = 'v'; + ]], { + -- + + -- + }) + +test:do_catchsql_test( + "analyzeD-1.12", + [[ + ANALYZE v; + ]], { + -- + 1, "VIEW isn't allowed to be analyzed" + -- + }) + +test:do_execsql_test( + "analyzeD-1.13", + [[ + SELECT * FROM "_sql_stat4" WHERE "tbl" = 'v'; + ]], { + -- + + -- + }) + +test:do_execsql_test( + "analyzeD-1.14", + [[ + SELECT * FROM "_sql_stat1" WHERE "tbl" = 'v'; + ]], { + -- + + -- + }) test:finish_test()