1 files changed, 89 insertions, 9 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/composite_test.rb b/activerecord/test/cases/adapters/postgresql/composite_test.rb
index 224b1b770b..42c68cdae7 100644
--- a/activerecord/test/cases/adapters/postgresql/composite_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/composite_test.rb
@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 require "cases/helper"
-require 'active_record/base'
-require 'active_record/connection_adapters/postgresql_adapter'
+require 'support/connection_helper'
+
+module PostgresqlCompositeBehavior
+  include ConnectionHelper
 
-class PostgresqlCompositeTest < ActiveRecord::TestCase
   class PostgresqlComposite < ActiveRecord::Base
     self.table_name = "postgresql_composites"
   end
 
-  teardown do
-    @connection.execute 'DROP TABLE IF EXISTS postgresql_composites'
-    @connection.execute 'DROP TYPE IF EXISTS full_address'
-  end
-
   def setup
+    super
+
     @connection = ActiveRecord::Base.connection
     @connection.transaction do
       @connection.execute <<-SQL
@@ -29,9 +27,27 @@ class PostgresqlCompositeTest < ActiveRecord::TestCase
     end
   end
 
+  def teardown
+    super
+
+    @connection.execute 'DROP TABLE IF EXISTS postgresql_composites'
+    @connection.execute 'DROP TYPE IF EXISTS full_address'
+    reset_connection
+    PostgresqlComposite.reset_column_information
+  end
+end
+
+# Composites are mapped to `OID::Identity` by default. The user is informed by a warning like:
+#   "unknown OID 5653508: failed to recognize type of 'address'. It will be treated as String."
+# To take full advantage of composite types, we suggest you register your own +OID::Type+.
+# See PostgresqlCompositeWithCustomOIDTest
+class PostgresqlCompositeTest < ActiveRecord::TestCase
+  include PostgresqlCompositeBehavior
+
   def test_column
+    ensure_warning_is_issued
+
     column = PostgresqlComposite.columns_hash["address"]
-    # TODO: Composite columns should have a type
     assert_nil column.type
     assert_equal "full_address", column.sql_type
     assert_not column.number?
@@ -41,6 +57,8 @@ class PostgresqlCompositeTest < ActiveRecord::TestCase
   end
 
   def test_composite_mapping
+    ensure_warning_is_issued
+
     @connection.execute "INSERT INTO postgresql_composites VALUES (1, ROW('Paris', 'Champs-Élysées'));"
     composite = PostgresqlComposite.first
     assert_equal "(Paris,Champs-Élysées)", composite.address
@@ -50,4 +68,66 @@ class PostgresqlCompositeTest < ActiveRecord::TestCase
 
     assert_equal '(Paris,"Rue Basse")', composite.reload.address
   end
+
+  private
+  def ensure_warning_is_issued
+    warning = capture(:stderr) do
+      PostgresqlComposite.columns_hash
+    end
+    assert_match(/unknown OID \d+: failed to recognize type of 'address'\. It will be treated as String\./, warning)
+  end
+end
+
+class PostgresqlCompositeWithCustomOIDTest < ActiveRecord::TestCase
+  include PostgresqlCompositeBehavior
+
+  class FullAddressType < ActiveRecord::Type::Value
+    def type; :full_address end
+
+    def type_cast_from_database(value)
+      if value =~ /\("?([^",]*)"?,"?([^",]*)"?\)/
+        FullAddress.new($1, $2)
+      end
+    end
+
+    def type_cast_from_user(value)
+      value
+    end
+
+    def type_cast_for_database(value)
+      return if value.nil?
+      "(#{value.city},#{value.street})"
+    end
+  end
+
+  FullAddress = Struct.new(:city, :street)
+
+  def setup
+    super
+
+    @connection.type_map.register_type "full_address", FullAddressType.new
+  end
+
+  def test_column
+    column = PostgresqlComposite.columns_hash["address"]
+    assert_equal :full_address, column.type
+    assert_equal "full_address", column.sql_type
+    assert_not column.number?
+    assert_not column.text?
+    assert_not column.binary?
+    assert_not column.array
+  end
+
+  def test_composite_mapping
+    @connection.execute "INSERT INTO postgresql_composites VALUES (1, ROW('Paris', 'Champs-Élysées'));"
+    composite = PostgresqlComposite.first
+    assert_equal "Paris", composite.address.city
+    assert_equal "Champs-Élysées", composite.address.street
+
+    composite.address = FullAddress.new("Paris", "Rue Basse")
+    composite.save!
+
+    assert_equal 'Paris', composite.reload.address.city
+    assert_equal 'Rue Basse', composite.reload.address.street
+  end
 end