diff options
| author | eileencodes <eileencodes@gmail.com> | 2015-09-26 16:07:24 -0400 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2015-09-26 16:26:56 -0400 |
| commit | ee824c8858f2a14aa3014877310971795348e460 (patch) | |
| tree | a3baf298942d698cc87b149112f7c4dedbc5b30a /activerecord/test/models | |
| parent | 7f18ea14c893cb5c9f04d4fda9661126758332b5 (diff) | |
| download | rails-ee824c8858f2a14aa3014877310971795348e460.tar.gz rails-ee824c8858f2a14aa3014877310971795348e460.tar.bz2 rails-ee824c8858f2a14aa3014877310971795348e460.zip | |
Fix regression in inverse_of on through associations
`inverse_of` on through associations was accidently removed/caused to
stop working in commit f8d2899 which was part of a refactoring on
`ThroughReflection`.
To fix we moved `inverse_of` and `check_validity_of_inverse!` to the
`AbstractReflection` so it's available to the `ThroughReflection`
without having to dup any methods. We then need to delegate `inverse_name`
method in `ThroughReflection`. `inverse_name` can't be moved to
`AbstractReflection` without moving methods that set the instance
variable `@automatic_inverse_of`.
This adds a test that ensures that `inverse_of` on a `ThroughReflection`
returns the correct class name, and the correct record for the inverse
relationship.
Fixes #21692
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/company.rb | 3 | ||||
| -rw-r--r-- | activerecord/test/models/developer.rb | 3 | ||||
| -rw-r--r-- | activerecord/test/models/project.rb | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index 67936e8e5d..a96b8ef0f2 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -86,6 +86,9 @@ class Firm < Company has_many :association_with_references, -> { references(:foo) }, :class_name => 'Client' + has_one :lead_developer, class_name: "Developer" + has_many :projects + def log @log ||= [] end diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb index 7565e8f967..7c5941b1af 100644 --- a/activerecord/test/models/developer.rb +++ b/activerecord/test/models/developer.rb @@ -54,6 +54,9 @@ class Developer < ActiveRecord::Base has_many :ratings, through: :comments has_one :ship, dependent: :nullify + belongs_to :firm + has_many :contracted_projects, class_name: "Project" + scope :jamises, -> { where(:name => 'Jamis') } validates_inclusion_of :salary, :in => 50000..200000 diff --git a/activerecord/test/models/project.rb b/activerecord/test/models/project.rb index 7f42a4b1f8..5328330653 100644 --- a/activerecord/test/models/project.rb +++ b/activerecord/test/models/project.rb @@ -11,6 +11,8 @@ class Project < ActiveRecord::Base :before_remove => Proc.new {|o, r| o.developers_log << "before_removing#{r.id}"}, :after_remove => Proc.new {|o, r| o.developers_log << "after_removing#{r.id}"} has_and_belongs_to_many :well_payed_salary_groups, -> { group("developers.salary").having("SUM(salary) > 10000").select("SUM(salary) as salary") }, :class_name => "Developer" + belongs_to :firm + has_one :lead_developer, through: :firm, inverse_of: :contracted_projects attr_accessor :developers_log after_initialize :set_developers_log |