From 2c555ec43ad254ab63cf1e572f999f7521c6cb04 Mon Sep 17 00:00:00 2001
From: Lauro Caetano <laurocaetano1@gmail.com>
Date: Mon, 2 Jun 2014 23:07:02 -0300
Subject: [PATCH] Fix regression on eager loading association based on SQL
 query rather than existing column.

Fixes #15480.
---
 activerecord/CHANGELOG.md                            |  7 +++++++
 .../associations/preloader/association.rb            |  6 ++++--
 activerecord/test/cases/associations/eager_test.rb   |  4 ++++
 activerecord/test/models/owner.rb                    | 12 ++++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 02fa504c78a81..90ceb40406754 100644
--- a/activerecord/CHANGELOG.md
+++ b/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.
 
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
index 63773bd5e1ca6..1b83700613cb7 100644
--- a/activerecord/lib/active_record/associations/preloader/association.rb
+++ b/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)
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 4bd4486b41557..910067666a851 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/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
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb
index cf24502d3a70b..2e3a9a36816ee 100644
--- a/activerecord/test/models/owner.rb
+++ b/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