aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency.rb4
-rw-r--r--activerecord/lib/active_record/associations/join_helper.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 295dccf34e..27069157be 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -163,7 +163,7 @@ module ActiveRecord
def make_outer_joins(parent, child)
tables = table_aliases_for(parent, child)
- join_type = Arel::OuterJoin
+ join_type = Arel::Nodes::OuterJoin
joins = make_constraints parent, child, tables, join_type
joins.concat child.children.flat_map { |c| make_outer_joins(child, c) }
@@ -171,7 +171,7 @@ module ActiveRecord
def make_inner_joins(parent, child)
tables = child.tables
- join_type = Arel::InnerJoin
+ join_type = Arel::Nodes::InnerJoin
joins = make_constraints parent, child, tables, join_type
joins.concat child.children.flat_map { |c| make_inner_joins(child, c) }
diff --git a/activerecord/lib/active_record/associations/join_helper.rb b/activerecord/lib/active_record/associations/join_helper.rb
index f345d16841..3471936b9f 100644
--- a/activerecord/lib/active_record/associations/join_helper.rb
+++ b/activerecord/lib/active_record/associations/join_helper.rb
@@ -4,7 +4,7 @@ module ActiveRecord
module JoinHelper #:nodoc:
def join_type
- Arel::InnerJoin
+ Arel::Nodes::InnerJoin
end
private