2 files changed, 74 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index f5b199b46a..d7ff81a382 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -60,6 +60,43 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
     assert_equal(nil, UUIDType.last.guid)
   end
 
+  def test_treat_invalid_uuid_as_nil
+    uuid = UUIDType.create! guid: 'foobar'
+    assert_equal(nil, uuid.guid)
+  end
+
+  def test_invalid_uuid_dont_modify_before_type_cast
+    uuid = UUIDType.new guid: 'foobar'
+    assert_equal 'foobar', uuid.guid_before_type_cast
+  end
+
+  def test_rfc_4122_regex
+    # Valid uuids
+    ['A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11',
+     '{a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11}',
+     'a0eebc999c0b4ef8bb6d6bb9bd380a11',
+     'a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11',
+     '{a0eebc99-9c0b4ef8-bb6d6bb9-bd380a11}'].each do |valid_uuid|
+      uuid = UUIDType.new guid: valid_uuid
+      assert_not_nil uuid.guid
+    end
+
+    # Invalid uuids
+    [['A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11'],
+     Hash.new,
+     0,
+     0.0,
+     true,
+     'Z0000C99-9C0B-4EF8-BB6D-6BB9BD380A11',
+     '{a0eebc99-9c0b-4ef8-fb6d-6bb9bd380a11}',
+     'a0eebc999r0b4ef8ab6d6bb9bd380a11',
+     'a0ee-bc99------4ef8-bb6d-6bb9-bd38-0a11',
+     '{a0eebc99-bb6d6bb9-bd380a11}'].each do |invalid_uuid|
+      uuid = UUIDType.new guid: invalid_uuid
+      assert_nil uuid.guid
+    end
+  end
+
   def test_uuid_formats
     ["A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11",
      "{a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11}",
@@ -87,10 +124,26 @@ class PostgresqlUUIDGenerationTest < ActiveRecord::TestCase
       t.string 'name'
       t.uuid 'other_uuid', default: 'uuid_generate_v4()'
     end
+
+    # Create custom PostgreSQL function to generate UUIDs
+    # to test dumping tables which columns have defaults with custom functions
+    connection.execute <<-SQL
+    CREATE OR REPLACE FUNCTION my_uuid_generator() RETURNS uuid
+    AS $$ SELECT * FROM uuid_generate_v4() $$
+    LANGUAGE SQL VOLATILE;
+    SQL
+
+    # Create such a table with custom function as default value generator
+    connection.create_table('pg_uuids_2', id: :uuid, default: 'my_uuid_generator()') do |t|
+      t.string 'name'
+      t.uuid 'other_uuid_2', default: 'my_uuid_generator()'
+    end
   end
 
   teardown do
     drop_table "pg_uuids"
+    drop_table 'pg_uuids_2'
+    connection.execute 'DROP FUNCTION IF EXISTS my_uuid_generator();'
   end
 
   if ActiveRecord::Base.connection.supports_extensions?
@@ -122,6 +175,13 @@ class PostgresqlUUIDGenerationTest < ActiveRecord::TestCase
       assert_match(/\bcreate_table "pg_uuids", id: :uuid, default: "uuid_generate_v1\(\)"/, schema.string)
       assert_match(/t\.uuid   "other_uuid", default: "uuid_generate_v4\(\)"/, schema.string)
     end
+
+    def test_schema_dumper_for_uuid_primary_key_with_custom_default
+      schema = StringIO.new
+      ActiveRecord::SchemaDumper.dump(connection, schema)
+      assert_match(/\bcreate_table "pg_uuids_2", id: :uuid, default: "my_uuid_generator\(\)"/, schema.string)
+      assert_match(/t\.uuid   "other_uuid_2", default: "my_uuid_generator\(\)"/, schema.string)
+    end
   end
 end
 
diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb
index 48c6eeb62c..4165dd5ac9 100644
--- a/activerecord/test/cases/adapters/postgresql/xml_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb
@@ -11,7 +11,7 @@ class PostgresqlXMLTest < ActiveRecord::TestCase
     begin
       @connection.transaction do
         @connection.create_table('xml_data_type') do |t|
-          t.xml 'payload', default: {}
+          t.xml 'payload'
         end
       end
     rescue ActiveRecord::StatementInvalid
@@ -32,4 +32,17 @@ class PostgresqlXMLTest < ActiveRecord::TestCase
     @connection.execute %q|insert into xml_data_type (payload) VALUES(null)|
     assert_nil XmlDataType.first.payload
   end
+
+  def test_round_trip
+    data = XmlDataType.new(payload: "<foo>bar</foo>")
+    assert_equal "<foo>bar</foo>", data.payload
+    data.save!
+    assert_equal "<foo>bar</foo>", data.reload.payload
+  end
+
+  def test_update_all
+    data = XmlDataType.create!
+    XmlDataType.update_all(payload: "<bar>baz</bar>")
+    assert_equal "<bar>baz</bar>", data.reload.payload
+  end
 end