Skip to content

Commit 16ee576

Browse files
lgebhardtlgebhardt
committed
Rename JoinManagers
1 parent 9a9e917 commit 16ee576

File tree

8 files changed

+91
-91
lines changed

8 files changed

+91
-91
lines changed

‎lib/jsonapi-resources.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
require 'jsonapi/callbacks'
4242
require 'jsonapi/link_builder'
4343
require 'jsonapi/active_relation/adapters/join_left_active_record_adapter'
44-
require 'jsonapi/active_relation/join_manager'
45-
require 'jsonapi/active_relation/join_manager_v10'
44+
require 'jsonapi/active_relation/join_manager_through_inverse'
45+
require 'jsonapi/active_relation/join_manager_through_primary'
4646
require 'jsonapi/resource_identity'
4747
require 'jsonapi/resource_fragment'
4848
require 'jsonapi/resource_tree'

‎lib/jsonapi/active_relation/join_manager.rb‎ renamed to ‎lib/jsonapi/active_relation/join_manager_through_inverse.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module ActiveRelation
55

66
# Stores relationship paths starting from the resource_klass, consolidating duplicate paths from
77
# relationships, filters and sorts. When joins are made the table aliases are tracked in join_details
8-
class JoinManager
8+
class JoinManagerThroughInverse
99
attr_reader :resource_klass,
1010
:source_relationship,
1111
:resource_join_tree,

‎lib/jsonapi/active_relation/join_manager_v10.rb‎ renamed to ‎lib/jsonapi/active_relation/join_manager_through_primary.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module ActiveRelation
55

66
# Stores relationship paths starting from the resource_klass, consolidating duplicate paths from
77
# relationships, filters and sorts. When joins are made the table aliases are tracked in join_details
8-
class JoinManagerV10
8+
class JoinManagerThroughPrimary
99
attr_reader :resource_klass,
1010
:source_relationship,
1111
:resource_join_tree,

‎lib/jsonapi/active_relation_retrieval.rb‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ module ClassMethods
2020
def find(filters, options)
2121
sort_criteria = options.fetch(:sort_criteria) { [] }
2222

23-
join_manager = ActiveRelation::JoinManager.new(resource_klass: self,
24-
filters: filters,
25-
sort_criteria: sort_criteria)
23+
join_manager = ActiveRelation::JoinManagerThroughInverse.new(resource_klass: self,
24+
filters: filters,
25+
sort_criteria: sort_criteria)
2626

2727
paginator = options[:paginator]
2828

@@ -42,8 +42,8 @@ def find(filters, options)
4242
#
4343
# @return [Integer] the count
4444
def count(filters, options)
45-
join_manager = ActiveRelation::JoinManager.new(resource_klass: self,
46-
filters: filters)
45+
join_manager = ActiveRelation::JoinManagerThroughInverse.new(resource_klass: self,
46+
filters: filters)
4747

4848
records = apply_request_settings_to_records(records: records(options),
4949
filters: filters,
@@ -103,11 +103,11 @@ def find_fragments(filters, options)
103103

104104
sort_criteria = options.fetch(:sort_criteria) { [] }
105105

106-
join_manager = ActiveRelation::JoinManager.new(resource_klass: resource_klass,
107-
source_relationship: nil,
108-
relationships: linkage_relationships.collect(&:name),
109-
sort_criteria: sort_criteria,
110-
filters: filters)
106+
join_manager = ActiveRelation::JoinManagerThroughInverse.new(resource_klass: resource_klass,
107+
source_relationship: nil,
108+
relationships: linkage_relationships.collect(&:name),
109+
sort_criteria: sort_criteria,
110+
filters: filters)
111111

112112
paginator = options[:paginator]
113113

@@ -331,11 +331,11 @@ def find_related_fragments_from_inverse(source, source_relationship, options, co
331331
end
332332
end
333333

334-
join_manager = ActiveRelation::JoinManager.new(resource_klass: self,
335-
source_relationship: inverse_relationship,
336-
relationships: linkage_relationships.collect(&:name),
337-
sort_criteria: sort_criteria,
338-
filters: filters)
334+
join_manager = ActiveRelation::JoinManagerThroughInverse.new(resource_klass: self,
335+
source_relationship: inverse_relationship,
336+
relationships: linkage_relationships.collect(&:name),
337+
sort_criteria: sort_criteria,
338+
filters: filters)
339339

340340
paginator = options[:paginator]
341341

@@ -511,9 +511,9 @@ def count_related_from_inverse(source_resource, source_relationship, options)
511511
filters = options.fetch(:filters, {})
512512

513513
# Joins in this case are related to the related_klass
514-
join_manager = ActiveRelation::JoinManager.new(resource_klass: self,
515-
source_relationship: inverse_relationship,
516-
filters: filters)
514+
join_manager = ActiveRelation::JoinManagerThroughInverse.new(resource_klass: self,
515+
source_relationship: inverse_relationship,
516+
filters: filters)
517517

518518
records = apply_request_settings_to_records(records: records(options),
519519
resource_klass: self,
@@ -648,7 +648,7 @@ def find_records_by_keys(keys, options)
648648
end
649649

650650
def apply_request_settings_to_records(records:,
651-
join_manager: ActiveRelation::JoinManager.new(resource_klass: self),
651+
join_manager: ActiveRelation::JoinManagerThroughInverse.new(resource_klass: self),
652652
resource_klass: self,
653653
source_ids: nil,
654654
filters: {},

‎lib/jsonapi/active_relation_retrieval_v09.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ def find_fragments(filters, options)
103103
sort_criteria = options.fetch(:sort_criteria) { [] }
104104
order_options = construct_order_options(sort_criteria)
105105

106-
join_manager = ActiveRelation::JoinManager.new(resource_klass: self,
107-
filters: filters,
108-
sort_criteria: sort_criteria)
106+
join_manager = ActiveRelation::JoinManagerThroughInverse.new(resource_klass: self,
107+
filters: filters,
108+
sort_criteria: sort_criteria)
109109

110110
options[:_relation_helper_options] = {
111111
context: context,

‎lib/jsonapi/active_relation_retrieval_v10.rb‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ module ClassMethods
2020
def find(filters, options)
2121
sort_criteria = options.fetch(:sort_criteria) { [] }
2222

23-
join_manager = ActiveRelation::JoinManagerV10.new(resource_klass: self,
24-
filters: filters,
25-
sort_criteria: sort_criteria)
23+
join_manager = ActiveRelation::JoinManagerThroughPrimary.new(resource_klass: self,
24+
filters: filters,
25+
sort_criteria: sort_criteria)
2626

2727
paginator = options[:paginator]
2828

@@ -42,8 +42,8 @@ def find(filters, options)
4242
#
4343
# @return [Integer] the count
4444
def count(filters, options)
45-
join_manager = ActiveRelation::JoinManagerV10.new(resource_klass: self,
46-
filters: filters)
45+
join_manager = ActiveRelation::JoinManagerThroughPrimary.new(resource_klass: self,
46+
filters: filters)
4747

4848
records = apply_request_settings_to_records(records: records(options),
4949
filters: filters,
@@ -103,11 +103,11 @@ def find_fragments(filters, options)
103103

104104
sort_criteria = options.fetch(:sort_criteria) { [] }
105105

106-
join_manager = ActiveRelation::JoinManagerV10.new(resource_klass: resource_klass,
107-
source_relationship: nil,
108-
relationships: linkage_relationships.collect(&:name),
109-
sort_criteria: sort_criteria,
110-
filters: filters)
106+
join_manager = ActiveRelation::JoinManagerThroughPrimary.new(resource_klass: resource_klass,
107+
source_relationship: nil,
108+
relationships: linkage_relationships.collect(&:name),
109+
sort_criteria: sort_criteria,
110+
filters: filters)
111111

112112
paginator = options[:paginator]
113113

@@ -234,9 +234,9 @@ def count_related(source_resource, relationship, options)
234234
filters = options.fetch(:filters, {})
235235

236236
# Joins in this case are related to the related_klass
237-
join_manager = ActiveRelation::JoinManagerV10.new(resource_klass: self,
238-
source_relationship: relationship,
239-
filters: filters)
237+
join_manager = ActiveRelation::JoinManagerThroughPrimary.new(resource_klass: self,
238+
source_relationship: relationship,
239+
filters: filters)
240240

241241
records = apply_request_settings_to_records(records: records(options),
242242
resource_klass: related_klass,
@@ -377,11 +377,11 @@ def find_related_monomorphic_fragments(source_fragments, relationship, options,
377377
sort_criteria << { field: field, direction: sort[:direction] }
378378
end
379379

380-
join_manager = ActiveRelation::JoinManagerV10.new(resource_klass: self,
381-
source_relationship: relationship,
382-
relationships: linkage_relationships.collect(&:name),
383-
sort_criteria: sort_criteria,
384-
filters: filters)
380+
join_manager = ActiveRelation::JoinManagerThroughPrimary.new(resource_klass: self,
381+
source_relationship: relationship,
382+
relationships: linkage_relationships.collect(&:name),
383+
sort_criteria: sort_criteria,
384+
filters: filters)
385385

386386
paginator = options[:paginator]
387387

@@ -493,10 +493,10 @@ def find_related_polymorphic_fragments(source_fragments, relationship, options,
493493
end
494494
end
495495

496-
join_manager = ActiveRelation::JoinManagerV10.new(resource_klass: self,
497-
source_relationship: relationship,
498-
relationships: linkage_relationship_paths,
499-
filters: filters)
496+
join_manager = ActiveRelation::JoinManagerThroughPrimary.new(resource_klass: self,
497+
source_relationship: relationship,
498+
relationships: linkage_relationship_paths,
499+
filters: filters)
500500

501501
paginator = options[:paginator]
502502

@@ -626,7 +626,7 @@ def find_related_polymorphic_fragments(source_fragments, relationship, options,
626626
end
627627

628628
def apply_request_settings_to_records(records:,
629-
join_manager: ActiveRelation::JoinManagerV10.new(resource_klass: self),
629+
join_manager: ActiveRelation::JoinManagerThroughPrimary.new(resource_klass: self),
630630
resource_klass: self,
631631
filters: {},
632632
primary_keys: nil,

0 commit comments

Comments
 (0)