diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-26 16:21:45 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-31 10:58:16 -0800 |
| commit | c091ab0207d949aeeeb4b28b949b7baa1e0631dc (patch) | |
| tree | 8d037d89301748c7c3493d802cf2709cfe82c577 | |
| parent | 40ce68204808f9905413fe15843a7cc0f1c56988 (diff) | |
| download | rails-c091ab0207d949aeeeb4b28b949b7baa1e0631dc.tar.gz rails-c091ab0207d949aeeeb4b28b949b7baa1e0631dc.tar.bz2 rails-c091ab0207d949aeeeb4b28b949b7baa1e0631dc.zip | |
always return the result set from select_all
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/querying.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 69750a911d..0520fc8b62 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -454,7 +454,7 @@ module ActiveRecord protected def select(sql, name = nil, binds = []) #:nodoc: - exec_query(sql, name, binds).to_a + exec_query(sql, name, binds) end def table_structure(table_name) diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb index a874a62520..34ba480d83 100644 --- a/activerecord/lib/active_record/querying.rb +++ b/activerecord/lib/active_record/querying.rb @@ -36,7 +36,7 @@ module ActiveRecord def find_by_sql(sql, binds = []) logging_query_plan do result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds) - result_set.map! { |record| instantiate(record) } + result_set.map { |record| instantiate(record) } end end |