diff options
| -rw-r--r-- | activerecord/lib/active_record/result.rb | 3 | ||||
| -rw-r--r-- | activerecord/test/cases/result_test.rb | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/result.rb b/activerecord/lib/active_record/result.rb index f45f664efe..b9fd0f5326 100644 --- a/activerecord/lib/active_record/result.rb +++ b/activerecord/lib/active_record/result.rb @@ -81,7 +81,8 @@ module ActiveRecord end def last - hash_rows.last + return nil if @rows.empty? + Hash[@columns.zip(@rows.last)] end def cast_values(type_overrides = {}) # :nodoc: diff --git a/activerecord/test/cases/result_test.rb b/activerecord/test/cases/result_test.rb index 565593c500..83dc5347e0 100644 --- a/activerecord/test/cases/result_test.rb +++ b/activerecord/test/cases/result_test.rb @@ -27,6 +27,11 @@ module ActiveRecord {'col_1' => 'row 1 col 1', 'col_2' => 'row 1 col 2'}, result.first) end + test "last returns last row as a hash" do + assert_equal( + {'col_1' => 'row 3 col 1', 'col_2' => 'row 3 col 2'}, result.last) + end + test "each with block returns row hashes" do result.each do |row| assert_equal ['col_1', 'col_2'], row.keys |