aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activerecord/CHANGELOG.md2
-rw-r--r--activerecord/test/cases/adapters/postgresql/xml_test.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 449d94e0eb..74f2b2287f 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,5 @@
* Removed redundant override of `xml` column definition for PG,
- in order to use `xml` column type instead of `text`
+ in order to use `xml` column type instead of `text`.
*Paul Nikitochkin*, *Michael Nikitochkin*
diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb
index 974fbabd58..bf14b378d8 100644
--- a/activerecord/test/cases/adapters/postgresql/xml_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb
@@ -33,7 +33,6 @@ class PostgresqlXMLTest < ActiveRecord::TestCase
def test_null_xml
@connection.execute %q|insert into xml_data_type (payload) VALUES(null)|
- x = XmlDataType.first
- assert_equal(nil, x.payload)
+ assert_nil XmlDataType.first.payload
end
end