diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-12 10:49:49 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-12 14:50:28 -0300 |
| commit | 8d3c67fbc44844d5565b580655ab9705d9fb8a08 (patch) | |
| tree | 918931f8a461d97643262ddd32d0ada41eaefa4a /activerecord/lib/active_record | |
| parent | 33062ee0f1695f548a536177bfbb0e0990fd8228 (diff) | |
| download | rails-8d3c67fbc44844d5565b580655ab9705d9fb8a08.tar.gz rails-8d3c67fbc44844d5565b580655ab9705d9fb8a08.tar.bz2 rails-8d3c67fbc44844d5565b580655ab9705d9fb8a08.zip | |
Merge pull request #10556 from Empact/deprecate-schema-statements-distinct
Deprecate SchemaStatements#distinct, and make SchemaStatements#columns_for_distinct nodoc.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 6e1f43cce6..8ffe150de6 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -710,6 +710,7 @@ module ActiveRecord # distinct("posts.id", ["posts.created_at desc"]) # def distinct(columns, order_by) + ActiveSupport::Deprecation.warn("#distinct is deprecated and shall be removed from future releases.") "DISTINCT #{columns_for_distinct(columns, order_by)}" end @@ -718,7 +719,7 @@ module ActiveRecord # require the order columns appear in the SELECT. # # columns_for_distinct("posts.id", ["posts.created_at desc"]) - def columns_for_distinct(columns, orders) + def columns_for_distinct(columns, orders) # :nodoc: columns end |