From 6172cc167618b460246367c73d9b77d4d33f58e1 Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@yandex-team.ru>
Date: Thu, 1 Jul 2021 10:51:32 +0300
Subject: [PATCH] Fix build, inferJoinKeyCommonType definition

---
 src/Interpreters/ExpressionAnalyzer.cpp | 2 +-
 src/Interpreters/TableJoin.h            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 33dc919d035..d5739b51659 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -892,7 +892,7 @@ static std::unique_ptr<QueryPlan> buildJoinedPlan(
         * - this function shows the expression JOIN _data1.
         */
     auto interpreter = interpretSubquery(
-        join_element.table_expression, getContext(), original_right_columns, query_options.copy().setWithAllColumns());
+        join_element.table_expression, context, original_right_columns, query_options.copy().setWithAllColumns());
     auto joined_plan = std::make_unique<QueryPlan>();
     interpreter->buildQueryPlan(*joined_plan);
     {
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index 8607cb53dc3..462dd540a00 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -116,7 +116,7 @@ private:
 
     /// Calculates common supertypes for corresponding join key columns.
     template <typename LeftNamesAndTypes, typename RightNamesAndTypes>
-    bool inferJoinKeyCommonType(const LeftNamesAndTypes & left, const RightNamesAndTypes & right, bool to_supertype);
+    bool inferJoinKeyCommonType(const LeftNamesAndTypes & left, const RightNamesAndTypes & right, bool allow_right);
 
     NamesAndTypesList correctedColumnsAddedByJoin() const;