3 files changed, 43 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 963cdadba5..5fa83928a8 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   `ActiveRecord::Result.each` now returns an `Enumerator` when called without
+     a block, so that it can be chained with other `Enumerable` methods.
+
+    *Ben Woosley*
+
 *   Fixture setup does no longer depend on `ActiveRecord::Base.configurations`.
     This is relevant when `ENV["DATABASE_URL"]` is used in place of a `database.yml`.
 
diff --git a/activerecord/lib/active_record/result.rb b/activerecord/lib/active_record/result.rb
index bea195e9b8..6156b3a5ba 100644
--- a/activerecord/lib/active_record/result.rb
+++ b/activerecord/lib/active_record/result.rb
@@ -18,7 +18,11 @@ module ActiveRecord
     end
 
     def each
-      hash_rows.each { |row| yield row }
+      if block_given?
+        hash_rows.each { |row| yield row }
+      else
+        hash_rows.to_enum
+      end
     end
 
     def to_hash
diff --git a/activerecord/test/cases/result_test.rb b/activerecord/test/cases/result_test.rb
new file mode 100644
index 0000000000..c305d273fb
--- /dev/null
+++ b/activerecord/test/cases/result_test.rb
@@ -0,0 +1,33 @@
+require "cases/helper"
+
+module ActiveRecord
+  class ResultTest < ActiveRecord::TestCase
+
+    def result
+      Result.new(['col_1', 'col_2'], [
+        ['row 1 col 1', 'row 1 col 2'],
+        ['row 2 col 1', 'row 2 col 2']
+      ])
+    end
+
+    def test_to_hash_returns_row_hashes
+      assert_equal [
+        {'col_1' => 'row 1 col 1', 'col_2' => 'row 1 col 2'},
+        {'col_1' => 'row 2 col 1', 'col_2' => 'row 2 col 2'}
+      ], result.to_hash
+    end
+
+    def test_each_with_block_returns_row_hashes
+      result.each do |row|
+        assert_equal ['col_1', 'col_2'], row.keys
+      end
+    end
+
+    def test_each_without_block_returns_an_enumerator
+      result.each.with_index do |row, index|
+        assert_equal ['col_1', 'col_2'], row.keys
+        assert_kind_of Integer, index
+      end
+    end
+  end
+end