From 3991ebcb36ac6694b35a3d3ab79a6b9c1e48bed1 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Mon, 16 Nov 2015 06:22:47 +0900
Subject: Add schema dumping support for PostgreSQL geometric data types

---
 activerecord/CHANGELOG.md                          |  4 ++
 .../connection_adapters/postgresql_adapter.rb      | 18 ++++--
 .../cases/adapters/postgresql/geometric_test.rb    | 66 ++++++++++++++++++++--
 3 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 2461dd517b..3724b1a387 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Add schema dumping support for PostgreSQL geometric data types.
+
+    *Ryuta Kamizono*
+
 *   Except keys of `build_record`'s argument from `create_scope` in `initialize_attributes`.
 
     Fixes #21893.
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 719592349b..c6aeee241a 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -100,6 +100,12 @@ module ActiveRecord
         ltree:       { name: "ltree" },
         citext:      { name: "citext" },
         point:       { name: "point" },
+        line:        { name: "line" },
+        lseg:        { name: "lseg" },
+        box:         { name: "box" },
+        path:        { name: "path" },
+        polygon:     { name: "polygon" },
+        circle:      { name: "circle" },
         bit:         { name: "bit" },
         bit_varying: { name: "bit varying" },
         money:       { name: "money" },
@@ -455,15 +461,15 @@ module ActiveRecord
           m.register_type 'macaddr', OID::SpecializedString.new(:macaddr)
           m.register_type 'citext', OID::SpecializedString.new(:citext)
           m.register_type 'ltree', OID::SpecializedString.new(:ltree)
+          m.register_type 'line', OID::SpecializedString.new(:line)
+          m.register_type 'lseg', OID::SpecializedString.new(:lseg)
+          m.register_type 'box', OID::SpecializedString.new(:box)
+          m.register_type 'path', OID::SpecializedString.new(:path)
+          m.register_type 'polygon', OID::SpecializedString.new(:polygon)
+          m.register_type 'circle', OID::SpecializedString.new(:circle)
 
           # FIXME: why are we keeping these types as strings?
           m.alias_type 'interval', 'varchar'
-          m.alias_type 'path', 'varchar'
-          m.alias_type 'line', 'varchar'
-          m.alias_type 'polygon', 'varchar'
-          m.alias_type 'circle', 'varchar'
-          m.alias_type 'lseg', 'varchar'
-          m.alias_type 'box', 'varchar'
 
           register_class_with_precision m, 'time', Type::Time
           register_class_with_precision m, 'timestamp', OID::DateTime
diff --git a/activerecord/test/cases/adapters/postgresql/geometric_test.rb b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
index 3dfac79821..8d0c5bf23f 100644
--- a/activerecord/test/cases/adapters/postgresql/geometric_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
@@ -167,16 +167,18 @@ class PostgresqlPointTest < ActiveRecord::PostgreSQLTestCase
 end
 
 class PostgresqlGeometricTest < ActiveRecord::PostgreSQLTestCase
+  include SchemaDumpingHelper
+
   class PostgresqlGeometric < ActiveRecord::Base; end
 
   setup do
     @connection = ActiveRecord::Base.connection
     @connection.create_table("postgresql_geometrics") do |t|
-      t.column :a_line_segment, :lseg
-      t.column :a_box, :box
-      t.column :a_path, :path
-      t.column :a_polygon, :polygon
-      t.column :a_circle, :circle
+      t.lseg    :a_line_segment
+      t.box     :a_box
+      t.path    :a_path
+      t.polygon :a_polygon
+      t.circle  :a_circle
     end
   end
 
@@ -233,6 +235,60 @@ class PostgresqlGeometricTest < ActiveRecord::PostgreSQLTestCase
     objs = PostgresqlGeometric.find_by_sql "SELECT isclosed(a_path) FROM postgresql_geometrics ORDER BY id ASC"
     assert_equal [false, true], objs.map(&:isclosed)
   end
+
+  def test_schema_dumping
+    output = dump_table_schema("postgresql_geometrics")
+    assert_match %r{t\.lseg\s+"a_line_segment"$}, output
+    assert_match %r{t\.box\s+"a_box"$}, output
+    assert_match %r{t\.path\s+"a_path"$}, output
+    assert_match %r{t\.polygon\s+"a_polygon"$}, output
+    assert_match %r{t\.circle\s+"a_circle"$}, output
+  end
+end
+
+class PostgreSQLGeometricLineTest < ActiveRecord::PostgreSQLTestCase
+  include SchemaDumpingHelper
+
+  class PostgresqlLine < ActiveRecord::Base; end
+
+  setup do
+    unless ActiveRecord::Base.connection.send(:postgresql_version) >= 90400
+      skip("line type is not fully implemented")
+    end
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table("postgresql_lines") do |t|
+      t.line :a_line
+    end
+  end
+
+  teardown do
+    @connection.drop_table 'postgresql_lines', if_exists: true
+  end
+
+  def test_geometric_line_type
+    g = PostgresqlLine.new(
+      a_line: '{2.0, 3, 5.5}'
+    )
+    g.save!
+
+    h = PostgresqlLine.find(g.id)
+    assert_equal '{2,3,5.5}', h.a_line
+  end
+
+  def test_alternative_format_line_type
+    g = PostgresqlLine.new(
+      a_line: '(2.0, 3), (4.0, 6.0)'
+    )
+    g.save!
+
+    h = PostgresqlLine.find(g.id)
+    assert_equal '{1.5,-1,0}', h.a_line
+  end
+
+  def test_schema_dumping_for_line_type
+    output = dump_table_schema("postgresql_lines")
+    assert_match %r{t\.line\s+"a_line"$}, output
+  end
 end
 
 class PostgreSQLGeometricTypesTest < ActiveRecord::PostgreSQLTestCase
-- 
cgit v1.2.3