diff options
author | George Claghorn <george.claghorn@gmail.com> | 2018-01-29 15:56:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-29 15:56:53 -0500 |
commit | ca1d13a1587330b370d737be9acdefababe027b0 (patch) | |
tree | 9fae267a7a83292a3739054dfa11426378947e92 /activerecord/lib/active_record/associations | |
parent | ef83c41724e7d359b6f8ffd5e0918754823bedf3 (diff) | |
parent | 2e8c8d60e7568f9fb82fbed26d86c45d3cf82232 (diff) | |
download | rails-ca1d13a1587330b370d737be9acdefababe027b0.tar.gz rails-ca1d13a1587330b370d737be9acdefababe027b0.tar.bz2 rails-ca1d13a1587330b370d737be9acdefababe027b0.zip |
Merge pull request #31821 from composerinteralia/extra-to_s
Avoid extra calls to to_s
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index de8afc9ccb..443ccaaa72 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -53,7 +53,7 @@ module ActiveRecord # Implements the ids writer method, e.g. foo.item_ids= for Foo.has_many :items def ids_writer(ids) primary_key = reflection.association_primary_key - pk_type = klass.type_for_attribute(primary_key.to_s) + pk_type = klass.type_for_attribute(primary_key) ids = Array(ids).reject(&:blank?) ids.map! { |i| pk_type.cast(i) } diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 735da152b7..ec6f0df484 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -82,11 +82,11 @@ module ActiveRecord end def association_key_type - @klass.type_for_attribute(association_key_name.to_s).type + @klass.type_for_attribute(association_key_name).type end def owner_key_type - @model.type_for_attribute(owner_key_name.to_s).type + @model.type_for_attribute(owner_key_name).type end def load_records(&block) |