diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-27 11:09:58 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-27 11:13:56 -0800 |
| commit | 2adf78d335dd55ef39559e9e209f1ce96c948095 (patch) | |
| tree | 6bd98d92f4c9a64a426f55e98a40b9318dd89972 /activerecord | |
| parent | 4bc2ae0da1dd812aee759f6d13ad428354cd0e13 (diff) | |
| download | rails-2adf78d335dd55ef39559e9e209f1ce96c948095.tar.gz rails-2adf78d335dd55ef39559e9e209f1ce96c948095.tar.bz2 rails-2adf78d335dd55ef39559e9e209f1ce96c948095.zip | |
removing dead code
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index 6a0c8e8545..56a7df0944 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -79,10 +79,9 @@ module ActiveRecord conditions = self.conditions[i] if reflection == chain.last - column = column_for(table.table_name, key.to_s) + column = column_for(table.table_name, key.to_s) bind_val = bind(scope, column, owner[foreign_key]) - scope = scope.where(table[key].eq(bind_val)) - #scope = scope.where(table[key].eq(owner[foreign_key])) + scope = scope.where(table[key].eq(bind_val)) if reflection.type scope = scope.where(table[reflection.type].eq(owner.class.base_class.name)) |