From 838101ae04be06138f1bd7418473092b92754293 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Mon, 30 Apr 2012 22:15:29 +0100
Subject: Fix PR #6091
1. ActiveRecord::Base is not ActiveRecord::Relation
2. The order of records from an SQL query is uncertain without an ORDER clause
3. Run your own tests when submitting a pull request
---
activerecord/lib/active_record/querying.rb | 2 +-
activerecord/test/cases/calculations_test.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'activerecord')
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
index 95565b503a..29b8b2fb73 100644
--- a/activerecord/lib/active_record/querying.rb
+++ b/activerecord/lib/active_record/querying.rb
@@ -11,7 +11,7 @@ module ActiveRecord
delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins,
:where, :preload, :eager_load, :includes, :from, :lock, :readonly,
:having, :create_with, :uniq, :references, :none, :to => :scoped
- delegate :count, :average, :minimum, :maximum, :sum, :calculate, :pluck, :to => :scoped
+ delegate :count, :average, :minimum, :maximum, :sum, :calculate, :pluck, :ids, :to => :scoped
# Executes a custom SQL query against your database and returns all the results. The results will
# be returned as an array with columns requested encapsulated as attributes of the model you call
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 4ddd99ea97..e096585f62 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -467,6 +467,6 @@ class CalculationsTest < ActiveRecord::TestCase
end
def test_plucks_with_ids
- assert_equal Company.all.map(&:id), Company.ids
+ assert_equal Company.all.map(&:id).sort, Company.ids.sort
end
end
--
cgit v1.2.3