diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-21 15:11:30 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-21 15:25:09 -0700 |
| commit | fdd537e7f929f46a56d81a7a8a037489cd2e68fb (patch) | |
| tree | 771b4617bd8e8ca34c18f6d287f075068f787cef /activerecord | |
| parent | d7877ffc30f2cce8b6df57e81503c6441c1c9790 (diff) | |
| download | rails-fdd537e7f929f46a56d81a7a8a037489cd2e68fb.tar.gz rails-fdd537e7f929f46a56d81a7a8a037489cd2e68fb.tar.bz2 rails-fdd537e7f929f46a56d81a7a8a037489cd2e68fb.zip | |
removing unused code
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 52383bfe9a..ae822c3080 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -2210,7 +2210,7 @@ module ActiveRecord :as => aliased_join_table_name, :engine => arel_engine) jt_foreign_key = jt_as_extra = jt_source_extra = jt_sti_extra = nil - first_key = second_key = as_extra = nil + first_key = second_key = nil if through_reflection.options[:as] # has_many :through against a polymorphic join jt_foreign_key = through_reflection.options[:as].to_s + '_id' @@ -2225,7 +2225,6 @@ module ActiveRecord if source_reflection.options[:as] first_key = "#{source_reflection.options[:as]}_id" - as_extra = aliased_table["#{source_reflection.options[:as]}_type"].eq(source_reflection.active_record.base_class.name) else first_key = through_reflection.klass.base_class.to_s.foreign_key end |