This commit is contained in:
Alexander Kuzmenkov 2021-03-17 18:55:53 +03:00
parent 6403198c84
commit bb17f14d83

View File

@ -65,6 +65,7 @@
#include <Parsers/ASTSetQuery.h> #include <Parsers/ASTSetQuery.h>
#include <Parsers/ASTUseQuery.h> #include <Parsers/ASTUseQuery.h>
#include <Parsers/ASTInsertQuery.h> #include <Parsers/ASTInsertQuery.h>
#include <Parsers/ASTSelectQuery.h>
#include <Parsers/ASTSelectWithUnionQuery.h> #include <Parsers/ASTSelectWithUnionQuery.h>
#include <Parsers/ASTQueryWithOutput.h> #include <Parsers/ASTQueryWithOutput.h>
#include <Parsers/ASTLiteral.h> #include <Parsers/ASTLiteral.h>
@ -116,6 +117,31 @@ namespace ErrorCodes
} }
static bool queryHasWithClause(const IAST * ast)
{
if (const auto * select = dynamic_cast<const ASTSelectQuery *>(ast);
select && select->with())
{
return true;
}
// This is a bit too much, because most of the children are not queries,
// but on the other hand it will let us to avoid breakage when the AST
// structure changes and some new variant of query nesting is added. This
// function is used in fuzzer, so it's better to be defensive and avoid
// weird unexpected errors.
for (const auto & child : ast->children)
{
if (queryHasWithClause(child.get()))
{
return true;
}
}
return false;
}
class Client : public Poco::Util::Application class Client : public Poco::Util::Application
{ {
public: public:
@ -1429,7 +1455,11 @@ private:
// when `lambda()` function gets substituted into a wrong place. // when `lambda()` function gets substituted into a wrong place.
// To avoid dealing with these cases, run the check only for the // To avoid dealing with these cases, run the check only for the
// queries we were able to successfully execute. // queries we were able to successfully execute.
if (!have_error) // The final caveat is that sometimes WITH queries are not executed,
// if they are not referenced by the main SELECT, so they can still
// have the abovementioned problems. Disable this check for such
// queries, for lack of a better solution.
if (!have_error && queryHasWithClause(parsed_query.get()))
{ {
ASTPtr parsed_formatted_query; ASTPtr parsed_formatted_query;
try try