Merge pull request #10556 from Empact/deprecate-schema-statements-distinct

Deprecate SchemaStatements#distinct, and make SchemaStatements#columns_for_distinct nodoc.
Conflicts:
	activerecord/CHANGELOG.md

1 files changed, 24 insertions, 12 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index ff7eb86969..fb88ab7c09 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -226,8 +226,10 @@ module ActiveRecord
       end
 
       def test_distinct_zero_orders
-        assert_equal "DISTINCT posts.id",
-          @connection.distinct("posts.id", [])
+        assert_deprecated do
+          assert_equal "DISTINCT posts.id",
+            @connection.distinct("posts.id", [])
+        end
       end
 
       def test_columns_for_distinct_zero_orders
@@ -236,8 +238,10 @@ module ActiveRecord
       end
 
       def test_distinct_one_order
-        assert_equal "DISTINCT posts.id, posts.created_at AS alias_0",
-          @connection.distinct("posts.id", ["posts.created_at desc"])
+        assert_deprecated do
+          assert_equal "DISTINCT posts.id, posts.created_at AS alias_0",
+            @connection.distinct("posts.id", ["posts.created_at desc"])
+        end
       end
 
       def test_columns_for_distinct_one_order
@@ -246,8 +250,10 @@ module ActiveRecord
       end
 
       def test_distinct_few_orders
-        assert_equal "DISTINCT posts.id, posts.created_at AS alias_0, posts.position AS alias_1",
-          @connection.distinct("posts.id", ["posts.created_at desc", "posts.position asc"])
+        assert_deprecated do
+          assert_equal "DISTINCT posts.id, posts.created_at AS alias_0, posts.position AS alias_1",
+            @connection.distinct("posts.id", ["posts.created_at desc", "posts.position asc"])
+        end
       end
 
       def test_columns_for_distinct_few_orders
@@ -256,8 +262,10 @@ module ActiveRecord
       end
 
       def test_distinct_blank_not_nil_orders
-        assert_equal "DISTINCT posts.id, posts.created_at AS alias_0",
-          @connection.distinct("posts.id", ["posts.created_at desc", "", "   "])
+        assert_deprecated do
+          assert_equal "DISTINCT posts.id, posts.created_at AS alias_0",
+            @connection.distinct("posts.id", ["posts.created_at desc", "", "   "])
+        end
       end
 
       def test_columns_for_distinct_blank_not_nil_orders
@@ -270,8 +278,10 @@ module ActiveRecord
         def order.to_sql
           "posts.created_at desc"
         end
-        assert_equal "DISTINCT posts.id, posts.created_at AS alias_0",
-          @connection.distinct("posts.id", [order])
+        assert_deprecated do
+          assert_equal "DISTINCT posts.id, posts.created_at AS alias_0",
+            @connection.distinct("posts.id", [order])
+        end
       end
 
       def test_columns_for_distinct_with_arel_order
@@ -284,8 +294,10 @@ module ActiveRecord
       end
 
       def test_distinct_with_nulls
-        assert_equal "DISTINCT posts.title, posts.updater_id AS alias_0", @connection.distinct("posts.title", ["posts.updater_id desc nulls first"])
-        assert_equal "DISTINCT posts.title, posts.updater_id AS alias_0", @connection.distinct("posts.title", ["posts.updater_id desc nulls last"])
+        assert_deprecated do
+          assert_equal "DISTINCT posts.title, posts.updater_id AS alias_0", @connection.distinct("posts.title", ["posts.updater_id desc nulls first"])
+          assert_equal "DISTINCT posts.title, posts.updater_id AS alias_0", @connection.distinct("posts.title", ["posts.updater_id desc nulls last"])
+        end
       end
 
       def test_columns_for_distinct_with_nulls