Add uuid type support to PostgreSQL adapter

3 files changed, 22 insertions, 6 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index 34660577da..a4d9286d52 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -27,6 +27,9 @@ end
 class PostgresqlTimestampWithZone < ActiveRecord::Base
 end
 
+class PostgresqlUUID < ActiveRecord::Base
+end
+
 class PostgresqlDataTypeTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
@@ -61,6 +64,9 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     @first_oid = PostgresqlOid.find(1)
 
     @connection.execute("INSERT INTO postgresql_timestamp_with_zones (time) VALUES ('2010-01-01 10:00:00-1')")
+
+    @connection.execute("INSERT INTO postgresql_uuids (guid, compact_guid) VALUES('d96c3da0-96c1-012f-1316-64ce8f32c6d8', 'f06c715096c1012f131764ce8f32c6d8')")
+    @first_uuid = PostgresqlUUID.find(1)
   end
 
   def test_data_type_of_array_types
@@ -100,6 +106,10 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     assert_equal :integer, @first_oid.column_for_attribute(:obj_id).type
   end
 
+  def test_data_type_of_uuid_types
+    assert_equal :uuid, @first_uuid.column_for_attribute(:guid).type
+  end
+
   def test_array_values
    assert_equal '{35000,21000,18000,17000}', @first_array.commission_by_quarter
    assert_equal '{foo,bar,baz}', @first_array.nicknames
@@ -143,6 +153,11 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     assert_equal '01:23:45:67:89:0a', @first_network_address.mac_address
   end
 
+  def test_uuid_values
+    assert_equal 'd96c3da0-96c1-012f-1316-64ce8f32c6d8', @first_uuid.guid
+    assert_equal 'f06c7150-96c1-012f-1317-64ce8f32c6d8', @first_uuid.compact_guid
+  end
+
   def test_bit_string_values
     assert_equal '00010101', @first_bit_string.bit_string
     assert_equal '00010101', @first_bit_string.bit_string_varying
diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index a44b49466f..bd2fbaa7db 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -136,12 +136,6 @@ module ActiveRecord
           smallint_column = PostgreSQLColumn.new('number', nil, oid, "smallint")
           assert_equal :integer, smallint_column.type
         end
-
-        def test_uuid_column_should_map_to_string
-          oid = PostgreSQLAdapter::OID::Identity.new
-          uuid_column = PostgreSQLColumn.new('unique_id', nil, oid, "uuid")
-          assert_equal :string, uuid_column.type
-        end
       end
     end
   end
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index ab80dd1d6d..ed0b6a86ba 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -257,6 +257,13 @@ class SchemaDumperTest < ActiveRecord::TestCase
       end
     end
 
+    def test_schema_dump_includes_uuid_shorthand_definition
+      output = standard_dump
+      if %r{create_table "poistgresql_uuids"} =~ output
+        assert_match %r{t.uuid "guid"}, output
+      end
+    end
+
     def test_schema_dump_includes_hstores_shorthand_definition
       output = standard_dump
       if %r{create_table "postgresql_hstores"} =~ output