From c091ab0207d949aeeeb4b28b949b7baa1e0631dc Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 26 Jan 2012 16:21:45 -0800 Subject: always return the result set from select_all --- activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 +- activerecord/lib/active_record/querying.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') 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 -- cgit v1.2.3