diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-08-24 04:42:12 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-08-25 17:48:13 -0700 |
| commit | 58c5261efa6ca0134ebfac8a701915d5e36d2c25 (patch) | |
| tree | 8b19eaea07da99f8d9e70bd49a0d5a0fbe349d7f /activerecord/lib/active_record | |
| parent | 3041b0b20374ef627b18b0f8abc627ac316d1fd4 (diff) | |
| download | rails-58c5261efa6ca0134ebfac8a701915d5e36d2c25.tar.gz rails-58c5261efa6ca0134ebfac8a701915d5e36d2c25.tar.bz2 rails-58c5261efa6ca0134ebfac8a701915d5e36d2c25.zip | |
Fixed find_by("sql fragment without bindings") on master
* Also duplicated find_by tests from relations_test.rb to finder_test.rb now
that we have a completely different implementation on the class (in core.rb
with AST caching stuff).
* Also removed a (failing) test that used mocks. Now that we have tests for the
behavior, there's no point having another test that tests the implementation
(that it delegates). Further, what the test was implying is nolonger true with
the current implementation, because Class.find_by is a real method now.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index d22806fbdf..2cbb8442a1 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -151,7 +151,7 @@ module ActiveRecord end def find_by(*args) - return super if current_scope || args.length > 1 || reflect_on_all_aggregations.any? + return super if current_scope || !(Hash === args.first) || reflect_on_all_aggregations.any? hash = args.first |