2 files changed, 62 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/geometric_test.rb b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
new file mode 100644
index 0000000000..775b1d2d69
--- /dev/null
+++ b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+require "cases/helper"
+require 'support/connection_helper'
+require 'active_record/base'
+require 'active_record/connection_adapters/postgresql_adapter'
+
+class PostgresqlPointTest < ActiveRecord::TestCase
+  include ConnectionHelper
+
+  class PostgresqlPoint < ActiveRecord::Base; end
+
+  def setup
+    @connection = ActiveRecord::Base.connection
+    @connection.transaction do
+      @connection.create_table('postgresql_points') do |t|
+        t.column :x, :point
+      end
+    end
+  end
+
+  teardown do
+    @connection.execute 'DROP TABLE IF EXISTS postgresql_points'
+  end
+
+  def test_column
+    column = PostgresqlPoint.columns_hash["x"]
+    assert_equal :string, column.type
+    assert_equal "point", column.sql_type
+    assert column.text?
+    assert_not column.number?
+    assert_not column.binary?
+    assert_not column.array
+  end
+
+  def test_roundtrip
+    PostgresqlPoint.create! x: [10, 25.2]
+    record = PostgresqlPoint.first
+    assert_equal [10, 25.2], record.x
+
+    record.x = [1.1, 2.2]
+    record.save!
+    assert record.reload
+    assert_equal [1.1, 2.2], record.x
+  end
+end
diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb
index f7af9a35cd..d4f8ef5b4d 100644
--- a/activerecord/test/cases/yaml_serialization_test.rb
+++ b/activerecord/test/cases/yaml_serialization_test.rb
@@ -52,4 +52,21 @@ class YamlSerializationTest < ActiveRecord::TestCase
     assert_equal 123, topic.parent_id
     assert_equal 123, YAML.load(YAML.dump(topic)).parent_id
   end
+
+  def test_new_records_remain_new_after_round_trip
+    topic = Topic.new
+
+    assert topic.new_record?, "Sanity check that new records are new"
+    assert YAML.load(YAML.dump(topic)).new_record?, "Record should be new after deserialization"
+
+    topic.save!
+
+    assert_not topic.new_record?, "Saved records are not new"
+    assert_not YAML.load(YAML.dump(topic)).new_record?, "Saved record should not be new after deserialization"
+
+    topic = Topic.select('title').last
+
+    assert_not topic.new_record?, "Loaded records without ID are not new"
+    assert_not YAML.load(YAML.dump(topic)).new_record?, "Record should not be new after deserialization"
+  end
 end