diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 23:11:54 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 23:11:54 +0530 |
commit | 9acf0af544f2f5dcaf257bdc25047017c972ffce (patch) | |
tree | b43c0c62af736237fa4d328cbc3e038155801ea6 /activerecord/lib/active_record | |
parent | dbce07b81d24a991ddd29b91f9c358b1f236bda2 (diff) | |
download | rails-9acf0af544f2f5dcaf257bdc25047017c972ffce.tar.gz rails-9acf0af544f2f5dcaf257bdc25047017c972ffce.tar.bz2 rails-9acf0af544f2f5dcaf257bdc25047017c972ffce.zip |
Remove Relation#where_clause
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/relation.rb | 6 | ||||
-rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 8bb019f147..f86677aa51 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -8,7 +8,7 @@ module ActiveRecord include FinderMethods, Calculations, SpawnMethods, QueryMethods delegate :length, :collect, :map, :each, :all?, :include?, :to => :to_a - delegate :insert, :update, :where_clause, :to => :arel + delegate :insert, :update, :to => :arel attr_reader :table, :klass @@ -164,10 +164,6 @@ module ActiveRecord @klass.send(:with_scope, :create => scope_for_create, :find => {}) { yield } end - def where_clause(join_string = " AND ") - arel.send(:where_clauses).join(join_string) - end - def references_eager_loaded_tables? joined_tables = (tables_in_string(arel.joins(arel)) + [table.name, table.table_alias]).compact.uniq (tables_in_string(to_sql) - joined_tables).any? diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index 85ae3d11bb..90ca002c76 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -128,7 +128,7 @@ module ActiveRecord record = where(primary_key.eq(id)).first unless record - conditions = where_clause(', ') + conditions = arel.send(:where_clauses).join(', ') conditions = " [WHERE #{conditions}]" if conditions.present? raise RecordNotFound, "Couldn't find #{@klass.name} with ID=#{id}#{conditions}" end @@ -154,7 +154,7 @@ module ActiveRecord if result.size == expected_size result else - conditions = where_clause(', ') + conditions = arel.send(:where_clauses).join(', ') conditions = " [WHERE #{conditions}]" if conditions.present? error = "Couldn't find all #{@klass.name.pluralize} with IDs " |