1 files changed, 24 insertions, 7 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb
index bf14b378d8..5aba118518 100644
--- a/activerecord/test/cases/adapters/postgresql/xml_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb
@@ -1,10 +1,9 @@
 # encoding: utf-8
-
 require 'cases/helper'
-require 'active_record/base'
-require 'active_record/connection_adapters/postgresql_adapter'
+require 'support/schema_dumping_helper'
 
 class PostgresqlXMLTest < ActiveRecord::TestCase
+  include SchemaDumpingHelper
   class XmlDataType < ActiveRecord::Base
     self.table_name = 'xml_data_type'
   end
@@ -14,16 +13,16 @@ 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
-      return skip "do not test on PG without xml"
+      skip "do not test on PG without xml"
     end
-    @column = XmlDataType.columns.find { |c| c.name == 'payload' }
+    @column = XmlDataType.columns_hash['payload']
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists xml_data_type'
   end
 
@@ -35,4 +34,22 @@ 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
+
+  def test_schema_dump_with_shorthand
+    output = dump_table_schema("xml_data_type")
+    assert_match %r{t.xml "payload"}, output
+  end
 end