1 files changed, 22 insertions, 11 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index cfff1f980b..6bb2b26cd5 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -54,6 +54,12 @@ module ActiveRecord
         end
       end
 
+      def test_composite_primary_key
+        with_example_table 'id serial, number serial, PRIMARY KEY (id, number)' do
+          assert_nil @connection.primary_key('ex')
+        end
+      end
+
       def test_primary_key_raises_error_if_table_not_found
         assert_raises(ActiveRecord::StatementInvalid) do
           @connection.primary_key('unobtainium')
@@ -134,18 +140,18 @@ module ActiveRecord
       end
 
       def test_default_sequence_name
-        assert_equal PostgreSQL::Name.new('public', 'accounts_id_seq'),
+        assert_equal 'public.accounts_id_seq',
           @connection.default_sequence_name('accounts', 'id')
 
-        assert_equal PostgreSQL::Name.new('public', 'accounts_id_seq'),
+        assert_equal 'public.accounts_id_seq',
           @connection.default_sequence_name('accounts')
       end
 
       def test_default_sequence_name_bad_table
-        assert_equal PostgreSQL::Name.new(nil, 'zomg_id_seq'),
+        assert_equal 'zomg_id_seq',
           @connection.default_sequence_name('zomg', 'id')
 
-        assert_equal PostgreSQL::Name.new(nil, 'zomg_id_seq'),
+        assert_equal 'zomg_id_seq',
           @connection.default_sequence_name('zomg')
       end
 
@@ -153,7 +159,7 @@ module ActiveRecord
         with_example_table do
           pk, seq = @connection.pk_and_sequence_for('ex')
           assert_equal 'id', pk
-          assert_equal @connection.default_sequence_name('ex', 'id'), seq
+          assert_equal @connection.default_sequence_name('ex', 'id'), seq.to_s
         end
       end
 
@@ -161,7 +167,7 @@ module ActiveRecord
         with_example_table 'code serial primary key' do
           pk, seq = @connection.pk_and_sequence_for('ex')
           assert_equal 'code', pk
-          assert_equal @connection.default_sequence_name('ex', 'code'), seq
+          assert_equal @connection.default_sequence_name('ex', 'code'), seq.to_s
         end
       end
 
@@ -304,11 +310,8 @@ module ActiveRecord
       end
 
       def test_substitute_at
-        bind = @connection.substitute_at(nil, 0)
-        assert_equal Arel.sql('$1'), bind
-
-        bind = @connection.substitute_at(nil, 1)
-        assert_equal Arel.sql('$2'), bind
+        bind = @connection.substitute_at(nil)
+        assert_equal Arel.sql('$1'), bind.to_sql
       end
 
       def test_partial_index
@@ -334,6 +337,14 @@ module ActiveRecord
           @connection.columns_for_distinct("posts.id", ["posts.created_at desc", "posts.position asc"])
       end
 
+      def test_columns_for_distinct_with_case
+        assert_equal(
+          'posts.id, CASE WHEN author.is_active THEN UPPER(author.name) ELSE UPPER(author.email) END AS alias_0',
+          @connection.columns_for_distinct('posts.id',
+            ["CASE WHEN author.is_active THEN UPPER(author.name) ELSE UPPER(author.email) END"])
+        )
+      end
+
       def test_columns_for_distinct_blank_not_nil_orders
         assert_equal "posts.id, posts.created_at AS alias_0",
           @connection.columns_for_distinct("posts.id", ["posts.created_at desc", "", "   "])