Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix regression on eager loading association based on SQL query rather

than existing column.

Fixes #15480.
  • Loading branch information...
commit 2c555ec43ad254ab63cf1e572f999f7521c6cb04 1 parent 4bcf902
@laurocaetano laurocaetano authored
View
7 activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Fix regression on eager loading association based on SQL query rather than
+ existing column.
+
+ Fixes #15480.
+
+ *Lauro Caetano*, *Carlos Antonio da Silva*
+
* Preserve type when dumping PostgreSQL point, bit, bit varying and money
columns.
View
6 activerecord/lib/active_record/associations/preloader/association.rb
@@ -104,11 +104,13 @@ def key_conversion_required?
end
def association_key_type
- @klass.column_types[association_key_name.to_s].type
+ column = @klass.column_types[association_key_name.to_s]
+ column && column.type
end
def owner_key_type
- @model.column_types[owner_key_name.to_s].type
+ column = @model.column_types[owner_key_name.to_s]
+ column && column.type
end
def load_slices(slices)
View
4 activerecord/test/cases/associations/eager_test.rb
@@ -1239,6 +1239,10 @@ def test_deep_including_through_habtm
}
end
+ test "including association based on sql condition and no database column" do
+ assert_equal pets(:parrot), Owner.including_last_pet.first.last_pet
+ end
+
test "include instance dependent associations is deprecated" do
message = "association scope 'posts_with_signature' is"
assert_deprecated message do
View
12 activerecord/test/models/owner.rb
@@ -3,6 +3,18 @@ class Owner < ActiveRecord::Base
has_many :pets, -> { order 'pets.name desc' }
has_many :toys, :through => :pets
+ belongs_to :last_pet, class_name: 'Pet'
+ scope :including_last_pet, -> {
+ select(%q[
+ owners.*, (
+ select p.pet_id from pets p
+ where p.owner_id = owners.owner_id
+ order by p.name desc
+ limit 1
+ ) as last_pet_id
+ ]).includes(:last_pet)
+ }
+
after_commit :execute_blocks
def blocks
Please sign in to comment.
Something went wrong with that request. Please try again.