aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-05-21 09:43:42 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-05-21 09:43:42 -0700
commitda8469fa7dc5caffc69b5407ac0d94183a72c09e (patch)
treec8d380c029bfe47199a928faf06e362ce2447872 /activerecord/lib
parenteba978ca501ad2ad529b91aba488ecb64ee44e7f (diff)
parent1c614bcb0fb65f0a5541263deacda498e52f447b (diff)
downloadrails-da8469fa7dc5caffc69b5407ac0d94183a72c09e.tar.gz
rails-da8469fa7dc5caffc69b5407ac0d94183a72c09e.tar.bz2
rails-da8469fa7dc5caffc69b5407ac0d94183a72c09e.zip
Merge pull request #1187 from thedarkone/polymorphic-class-fix
Handle polymorphic_type NOT NULL columns
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb b/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
index 1ca448236e..198ad06360 100644
--- a/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
+++ b/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
@@ -19,7 +19,7 @@ module ActiveRecord
def klass
type = owner[reflection.foreign_type]
- type && type.constantize
+ type.presence && type.constantize
end
def raise_on_type_mismatch(record)