From a8bd4eb94de2c449a05f4558a29580d24c21af02 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Mon, 27 Feb 2017 22:44:17 +0000
Subject: [PATCH 01/15] appraisal for activerecord 5.1

---
 .travis.yml           |  2 +-
 Appraisals            |  4 ++++
 gemfiles/ar51.gemfile | 11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 gemfiles/ar51.gemfile

diff --git a/.travis.yml b/.travis.yml
index 8b3d959..456c64c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ rvm:
   - 2.2.6
   - jruby-9.0.5.0
 gemfile:
-  - gemfiles/ar50.gemfile
+  - gemfiles/ar51.gemfile
 matrix:
   allow_failures:
     - rvm: jruby-9.0.5.0
diff --git a/Appraisals b/Appraisals
index 477b6be..f9455c2 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,3 +1,7 @@
 appraise "ar50" do
   gem "activerecord", "~> 5.0.0"
 end
+
+appraise "ar51" do
+  gem "activerecord", "~> 5.1.0.beta1"
+end
diff --git a/gemfiles/ar51.gemfile b/gemfiles/ar51.gemfile
new file mode 100644
index 0000000..d332a3b
--- /dev/null
+++ b/gemfiles/ar51.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pg", "~> 0.17", :platform => :ruby
+gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.9", :platform => :jruby
+gem "ffi-geos", :platform => :jruby
+gem "byebug", :platform => :mri_23
+gem "activerecord", "~> 5.1.0.beta1"
+
+gemspec :path => "../"

From 90e0185877dfad277e1f1931ed8e783ab2a08352 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Mon, 27 Feb 2017 23:48:57 +0100
Subject: [PATCH 02/15] up the rgeo-activerecord dependency, drop activerecord
 dependency as rgeo-activerecord implies the correct version already

---
 activerecord-postgis-adapter.gemspec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/activerecord-postgis-adapter.gemspec b/activerecord-postgis-adapter.gemspec
index 4e934b4..3377d85 100644
--- a/activerecord-postgis-adapter.gemspec
+++ b/activerecord-postgis-adapter.gemspec
@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.2.2"
 
-  spec.add_dependency "activerecord", "~> 5.0.0"
-  spec.add_dependency "rgeo-activerecord", "~> 5.0.0"
+  spec.add_dependency "rgeo-activerecord", "~> 5.1.0"
 
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.4"

From 0c9b1f38e64ced3c79e93cc2c363f9c336574d3c Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Tue, 28 Feb 2017 01:51:55 +0100
Subject: [PATCH 03/15] AR's ColumnDefinition has been greatly remodeled in
 5.1, adjusting syntax to rails/rails@ae39b1a0

---
 .../postgis/schema_statements.rb              |   4 +-
 .../postgis/spatial_table_definition.rb       | 105 ++++--------------
 test/ddl_test.rb                              |   2 +-
 3 files changed, 22 insertions(+), 89 deletions(-)

diff --git a/lib/active_record/connection_adapters/postgis/schema_statements.rb b/lib/active_record/connection_adapters/postgis/schema_statements.rb
index 7b52fca..db3a6d5 100644
--- a/lib/active_record/connection_adapters/postgis/schema_statements.rb
+++ b/lib/active_record/connection_adapters/postgis/schema_statements.rb
@@ -51,10 +51,10 @@ def new_column(table_name, column_name, default, cast_type, sql_type_metadata =
         #
         # type_to_sql(:geography, "Point,4326")
         # => "geography(Point,4326)"
-        def type_to_sql(type, limit = nil, precision = nil, scale = nil, array = nil)
+        def type_to_sql(type, options = {})
           case type
           when :geometry, :geography
-            "#{type}(#{limit})"
+            "#{type}(#{options[:limit]})"
           else
             super
           end
diff --git a/lib/active_record/connection_adapters/postgis/spatial_table_definition.rb b/lib/active_record/connection_adapters/postgis/spatial_table_definition.rb
index d2f4fa4..ce36408 100644
--- a/lib/active_record/connection_adapters/postgis/spatial_table_definition.rb
+++ b/lib/active_record/connection_adapters/postgis/spatial_table_definition.rb
@@ -11,109 +11,42 @@ def new_column_definition(name, type, options)
               options.merge!(limit) if limit.is_a?(::Hash)
             end
 
-            geo_type = ColumnDefinition.geo_type(options[:type] || type || info[:type])
+            geo_type = ColumnDefinitionUtils.geo_type(options[:type] || type || info[:type])
             base_type = info[:type] || (options[:geographic] ? :geography : :geometry)
 
             # puts name.dup << " - " << type.to_s << " - " << options.to_s << " :: " << geo_type.to_s << " - " << base_type.to_s
 
-            if options[:geographic]
-              options[:limit] = ColumnDefinition.options_to_limit(geo_type, options)
-            end
+            options[:limit] = ColumnDefinitionUtils.limit_from_options(geo_type, options)
+            options[:spatial_type] = geo_type
             column = super(name, base_type, options)
-            column.spatial_type = geo_type
-            column.geographic = options[:geographic]
-            column.srid = options[:srid]
-            column.has_z = options[:has_z]
-            column.has_m = options[:has_m]
           else
             column = super(name, type, options)
           end
 
           column
         end
-
-        private
-
-        def create_column_definition(name, type)
-          if PostGISAdapter.spatial_column_options(type.to_sym)
-            PostGIS::ColumnDefinition.new(name, type)
-          else
-            super
-          end
-        end
       end
 
-      class ColumnDefinition < PostgreSQL::ColumnDefinition
-        # needs to accept the spatial type? or figure out from limit ?
-
-        def self.options_to_limit(type, options = {})
-          spatial_type = geo_type(type)
-          spatial_type << "Z" if options[:has_z]
-          spatial_type << "M" if options[:has_m]
-          spatial_type << ",#{options[:srid] || 4326}"
-          spatial_type
-        end
-
-        # limit is how column options are passed to #type_to_sql
-        # returns: "Point,4326"
-        def limit
-          "".tap do |value|
-            value << self.class.geo_type(spatial_type)
-            value << "Z" if has_z?
-            value << "M" if has_m?
-            value << ",#{srid}"
+      module ColumnDefinitionUtils
+        class << self
+          def geo_type(type = "GEOMETRY")
+            g_type = type.to_s.delete("_").upcase
+            return "POINT" if g_type == "STPOINT"
+            return "POLYGON" if g_type == "STPOLYGON"
+            g_type
           end
-        end
-
-        def self.geo_type(type = "GEOMETRY")
-          g_type = type.to_s.delete("_").upcase
-          return "POINT" if g_type == "STPOINT"
-          return "POLYGON" if g_type == "STPOLYGON"
-          g_type
-        end
-
-        def spatial_type
-          @spatial_type
-        end
-
-        def spatial_type=(value)
-          @spatial_type = value.to_s
-        end
 
-        def geographic?
-          @geographic
-        end
-
-        def geographic=(value)
-          @geographic = !!value
-        end
-
-        def srid
-          if @srid
-            @srid.to_i
-          else
-            geographic? ? 4326 : PostGISAdapter::DEFAULT_SRID
+          def limit_from_options(type, options = {})
+            spatial_type = geo_type(type)
+            spatial_type << "Z" if options[:has_z]
+            spatial_type << "M" if options[:has_m]
+            spatial_type << ",#{options[:srid] || default_srid(options)}"
+            spatial_type
           end
-        end
-
-        def srid=(value)
-          @srid = value
-        end
 
-        def has_z?
-          @has_z
-        end
-
-        def has_z=(value)
-          @has_z = !!value
-        end
-
-        def has_m?
-          @has_m
-        end
-
-        def has_m=(value)
-          @has_m = !!value
+          def default_srid(options)
+            options[:geographic] ? 4326 : PostGISAdapter::DEFAULT_SRID
+          end
         end
       end
     end
diff --git a/test/ddl_test.rb b/test/ddl_test.rb
index 5d54b4a..0b1a939 100644
--- a/test/ddl_test.rb
+++ b/test/ddl_test.rb
@@ -19,7 +19,7 @@ def test_spatial_column_options
 
   def test_type_to_sql
     adapter = SpatialModel.connection
-    assert_equal "geometry(point,4326)", adapter.type_to_sql(:geometry, "point,4326")
+    assert_equal "geometry(point,4326)", adapter.type_to_sql(:geometry, limit: "point,4326")
   end
 
   def test_create_simple_geometry

From 76cea09164dc2f3d9ff79adaae48453d69051508 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Tue, 28 Feb 2017 01:57:24 +0100
Subject: [PATCH 04/15] passing the column to quote has been removed in AR 5.1

see rails/rails@e646bad5
---
 lib/active_record/connection_adapters/postgis_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active_record/connection_adapters/postgis_adapter.rb b/lib/active_record/connection_adapters/postgis_adapter.rb
index 7d611d8..676c9fa 100644
--- a/lib/active_record/connection_adapters/postgis_adapter.rb
+++ b/lib/active_record/connection_adapters/postgis_adapter.rb
@@ -86,7 +86,7 @@ def srs_database_columns
         }
       end
 
-      def quote(value, column = nil)
+      def quote(value)
         if RGeo::Feature::Geometry.check_type(value)
           "'#{RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true).generate(value)}'"
         elsif value.is_a?(RGeo::Cartesian::BoundingBox)

From 7dc25ee6d14d8b5344139f5c6a1cea7334ef6030 Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Sun, 30 Apr 2017 12:04:15 -0600
Subject: [PATCH 05/15] Export correct spatial types

* Convert "point" to "st_point"
* Convert "polygon" to "st_polygon"

See #226
---
 .../connection_adapters/postgis/spatial_column.rb   | 13 ++++++++++++-
 test/ddl_test.rb                                    |  2 +-
 test/tasks_test.rb                                  |  6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/active_record/connection_adapters/postgis/spatial_column.rb b/lib/active_record/connection_adapters/postgis/spatial_column.rb
index b8838b6..cf780a6 100644
--- a/lib/active_record/connection_adapters/postgis/spatial_column.rb
+++ b/lib/active_record/connection_adapters/postgis/spatial_column.rb
@@ -32,7 +32,7 @@ def initialize(name, default, sql_type_metadata = nil, null = true, table_name =
           super(name, default, sql_type_metadata, null, table_name, default_function, collation)
           if spatial?
             if @srid
-              @limit = { srid: @srid, type: geometric_type.type_name.underscore }
+              @limit = { srid: @srid, type: to_type_name(geometric_type) }
               @limit[:has_z] = true if @has_z
               @limit[:has_m] = true if @has_m
               @limit[:geographic] = true if @geographic
@@ -72,6 +72,17 @@ def build_from_sql_type(sql_type)
           geo_type, @srid, @has_z, @has_m = OID::Spatial.parse_sql_type(sql_type)
           set_geometric_type_from_name(geo_type)
         end
+
+        def to_type_name(geometric_type)
+          name = geometric_type.type_name.underscore
+          if name == "point"
+            "st_point"
+          elsif name == "polygon"
+            "st_polygon"
+          else
+            name
+          end
+        end
       end
     end
   end
diff --git a/test/ddl_test.rb b/test/ddl_test.rb
index 5d54b4a..ee0fb35 100644
--- a/test/ddl_test.rb
+++ b/test/ddl_test.rb
@@ -228,7 +228,7 @@ def test_create_polygon_with_options
     assert_equal false, col.has_z?
     assert_equal true, col.has_m?
     assert_equal 3785, col.srid
-    assert_equal({ has_m: true, type: "polygon", srid: 3785 }, col.limit)
+    assert_equal({ has_m: true, type: "st_polygon", srid: 3785 }, col.limit)
     klass.connection.drop_table(:spatial_models)
     assert_equal 0, count_geometry_columns
   end
diff --git a/test/tasks_test.rb b/test/tasks_test.rb
index 917f6b0..14be369 100644
--- a/test/tasks_test.rb
+++ b/test/tasks_test.rb
@@ -93,8 +93,8 @@ def test_basic_geography_schema_dump
       ActiveRecord::SchemaDumper.dump(connection, file)
     end
     data = File.read(tmp_sql_filename)
-    assert data.index(%(t.geography "latlon1", limit: {:srid=>4326, :type=>"point", :geographic=>true}))
-    assert data.index(%(t.geography "latlon2", limit: {:srid=>4326, :type=>"point", :geographic=>true}))
+    assert data.index(%(t.geography "latlon1", limit: {:srid=>4326, :type=>"st_point", :geographic=>true}))
+    assert data.index(%(t.geography "latlon2", limit: {:srid=>4326, :type=>"st_point", :geographic=>true}))
   end
 
   def test_index_schema_dump
@@ -107,7 +107,7 @@ def test_index_schema_dump
       ActiveRecord::SchemaDumper.dump(connection, file)
     end
     data = File.read(tmp_sql_filename)
-    assert data.index(%(t.geography "latlon", limit: {:srid=>4326, :type=>"point", :geographic=>true}))
+    assert data.index(%(t.geography "latlon", limit: {:srid=>4326, :type=>"st_point", :geographic=>true}))
     assert data.index(%(t.index ["latlon"], name: "index_spatial_test_on_latlon", using: :gist))
   end
 

From 1fc92b282d7f863390f81ee272aa2b3fce29709f Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Sun, 30 Apr 2017 17:23:36 -0600
Subject: [PATCH 06/15] Version 4.0.3

---
 History.md                                           | 12 ++++++++++--
 .../connection_adapters/postgis/version.rb           |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 7e04272..6578189 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+### 4.0.3 / 2017-04-30
+
+* Fix st_point, st_polygon exports (affects schema.rb) #253, #226
+
 ### 4.0.2 / 2016-11-13
 
 * Revert #237
@@ -11,11 +15,15 @@
 * Support ActiveRecord 5.0 (#213)
 * Fix schema dump null issues in JRuby (#229)
 
-### 3.1.4 / 2016-2-7
+### 3.1.5 / 2017-04-30
+
+* Fix st_point, st_polygon exports (affects schema.rb) #252, #226
+
+### 3.1.4 / 2016-02-07
 
 * Ignore PostGIS views on schema dump - #208
 
-### 3.1.3 / 2016-1-15
+### 3.1.3 / 2016-01-15
 
 * Restrict ActiveRecord support to 4.2. See 649707cdf
 
diff --git a/lib/active_record/connection_adapters/postgis/version.rb b/lib/active_record/connection_adapters/postgis/version.rb
index 7ed1be8..b66e7c0 100644
--- a/lib/active_record/connection_adapters/postgis/version.rb
+++ b/lib/active_record/connection_adapters/postgis/version.rb
@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "4.0.2"
+      VERSION = "4.0.3"
     end
   end
 end

From f59ec10cd444dd9dd3078e6b877b36476dd34cc0 Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 14:09:00 -0600
Subject: [PATCH 07/15] Update travis

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 456c64c..e98e780 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
   - jruby-9.0.5.0
 gemfile:
   - gemfiles/ar51.gemfile

From f8a237f5b2a7f7a85a70d05a7b31140e808b599a Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 14:11:34 -0600
Subject: [PATCH 08/15] Update appraisals - AR 5.1 only

---
 Appraisals            |  6 +-----
 gemfiles/ar42.gemfile | 11 -----------
 gemfiles/ar50.gemfile | 11 -----------
 gemfiles/ar51.gemfile | 12 ++++++------
 4 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 gemfiles/ar42.gemfile
 delete mode 100644 gemfiles/ar50.gemfile

diff --git a/Appraisals b/Appraisals
index f9455c2..595bc2e 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,7 +1,3 @@
-appraise "ar50" do
-  gem "activerecord", "~> 5.0.0"
-end
-
 appraise "ar51" do
-  gem "activerecord", "~> 5.1.0.beta1"
+  gem "activerecord", "~> 5.1.0"
 end
diff --git a/gemfiles/ar42.gemfile b/gemfiles/ar42.gemfile
deleted file mode 100644
index 3abe66c..0000000
--- a/gemfiles/ar42.gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "pg", "~> 0.17", :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.9", :platform => :jruby
-gem "ffi-geos", :platform => :jruby
-gem "byebug", :platform => :mri_22
-gem "activerecord", "~> 4.2.0"
-
-gemspec :path => "../"
diff --git a/gemfiles/ar50.gemfile b/gemfiles/ar50.gemfile
deleted file mode 100644
index ac59960..0000000
--- a/gemfiles/ar50.gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "pg", "~> 0.17", :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.9", :platform => :jruby
-gem "ffi-geos", :platform => :jruby
-gem "byebug", :platform => :mri_23
-gem "activerecord", "~> 5.0.0"
-
-gemspec :path => "../"
diff --git a/gemfiles/ar51.gemfile b/gemfiles/ar51.gemfile
index d332a3b..aad2b4a 100644
--- a/gemfiles/ar51.gemfile
+++ b/gemfiles/ar51.gemfile
@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "pg", "~> 0.17", :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.9", :platform => :jruby
-gem "ffi-geos", :platform => :jruby
-gem "byebug", :platform => :mri_23
-gem "activerecord", "~> 5.1.0.beta1"
+gem "pg", "~> 0.17", platform: :ruby
+gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.9", platform: :jruby
+gem "ffi-geos", platform: :jruby
+gem "byebug", platform: :mri_23
+gem "activerecord", "~> 5.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

From 4e138151ee1481e184376ff5685b4135a208f447 Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 14:13:37 -0600
Subject: [PATCH 09/15] Loosen rgeo-activerecord dependency

---
 activerecord-postgis-adapter.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord-postgis-adapter.gemspec b/activerecord-postgis-adapter.gemspec
index 3377d85..7bd0dac 100644
--- a/activerecord-postgis-adapter.gemspec
+++ b/activerecord-postgis-adapter.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.2.2"
 
-  spec.add_dependency "rgeo-activerecord", "~> 5.1.0"
+  spec.add_dependency "rgeo-activerecord", "~> 5.1"
 
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.4"

From 630a3fbc6eb9c856031eb5caffde106756377bd0 Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 14:27:58 -0600
Subject: [PATCH 10/15] Add 5.0 release notes, history

---
 History.md |  4 ++++
 README.md  | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/History.md b/History.md
index 6578189..549ca7c 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,7 @@
+### 5.0.0 / 2017-05-01
+
+* Support ActiveRecord 5.1 - #246
+
 ### 4.0.3 / 2017-04-30
 
 * Fix st_point, st_polygon exports (affects schema.rb) #253, #226
diff --git a/README.md b/README.md
index b3599a0..1462ae7 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,16 @@ gem 'ffi-geos'
 
 _JRuby support for Rails 4.0 and 4.1 was added in version 2.2.0_
 
+#### Version 5.x supports ActiveRecord 5.1+
+
+Requirements:
+
+```
+ActiveRecord 5.1+
+Ruby 2.2.2+, JRuby
+PostGIS 2.0+
+```
+
 #### Version 4.x supports ActiveRecord 5.0+
 
 Requirements:

From 7db90dcc6924331464da39565696852a55889b2f Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 14:28:09 -0600
Subject: [PATCH 11/15] Update contributing instructions

---
 CONTRIBUTING.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 44ba8cb..714d1fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,18 +20,15 @@ bundle install
 
 Make sure the tests pass:
 
-`rake`
+`bundle exec rake`
 
-Run tests against both ActiveRecord 4.0 and 4.1 test gemfiles:
+Run tests against the test gemfiles:
 
 run `rake appraisal` or run the tests manually:
 
 ```
-BUNDLE_GEMFILE=./gemfiles/ar40.gemfile bundle
-BUNDLE_GEMFILE=./gemfiles/ar40.gemfile rake
-
-BUNDLE_GEMFILE=./gemfiles/ar41.gemfile bundle
-BUNDLE_GEMFILE=./gemfiles/ar41.gemfile rake
+BUNDLE_GEMFILE=./gemfiles/ar51.gemfile bundle
+BUNDLE_GEMFILE=./gemfiles/ar51.gemfile rake
 ```
 
 Make your changes and submit a pull request.

From e47dcfc1aa8f83370459302d76a7b2b87748a13c Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 14:28:32 -0600
Subject: [PATCH 12/15] Version 5.0.0

---
 lib/active_record/connection_adapters/postgis/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active_record/connection_adapters/postgis/version.rb b/lib/active_record/connection_adapters/postgis/version.rb
index b66e7c0..0abca58 100644
--- a/lib/active_record/connection_adapters/postgis/version.rb
+++ b/lib/active_record/connection_adapters/postgis/version.rb
@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "4.0.3"
+      VERSION = "5.0.0"
     end
   end
 end

From f4e8f0029e03730abeee8570763e8e5836d60ab4 Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 14:34:53 -0600
Subject: [PATCH 13/15] Update readme (jruby note) [ci skip]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1462ae7..24712bc 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Requirements:
 
 ```
 ActiveRecord 5.1+
-Ruby 2.2.2+, JRuby
+Ruby 2.2.2+ (no JRuby support yet)
 PostGIS 2.0+
 ```
 

From 69e8815874124121c0c1cbd75e41d7d274667132 Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 21:12:13 -0600
Subject: [PATCH 14/15] Require activerecord 5.1+

* The rgeo-activerecord dependency is ~> 5.0, which is insufficient.

Fix #254
---
 activerecord-postgis-adapter.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/activerecord-postgis-adapter.gemspec b/activerecord-postgis-adapter.gemspec
index 7bd0dac..9a5e754 100644
--- a/activerecord-postgis-adapter.gemspec
+++ b/activerecord-postgis-adapter.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.2.2"
 
+  spec.add_dependency "activerecord", "~> 5.1"
   spec.add_dependency "rgeo-activerecord", "~> 5.1"
 
   spec.add_development_dependency "rake", "~> 12.0"

From fdb2a105918ada1b29905997e65992e46ab68f57 Mon Sep 17 00:00:00 2001
From: Tee Parham <tee@neighborland.com>
Date: Mon, 1 May 2017 21:14:55 -0600
Subject: [PATCH 15/15] Version 5.0.1

---
 History.md                                               | 6 +++++-
 lib/active_record/connection_adapters/postgis/version.rb | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index 549ca7c..24f3528 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,8 @@
-### 5.0.0 / 2017-05-01
+### 5.0.1 / 2017-05-01
+
+* Fix activerecord gem dependency - 69e8815
+
+### 5.0.0 / 2017-05-01 *** YANKED
 
 * Support ActiveRecord 5.1 - #246
 
diff --git a/lib/active_record/connection_adapters/postgis/version.rb b/lib/active_record/connection_adapters/postgis/version.rb
index 0abca58..4222f36 100644
--- a/lib/active_record/connection_adapters/postgis/version.rb
+++ b/lib/active_record/connection_adapters/postgis/version.rb
@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "5.0.0"
+      VERSION = "5.0.1"
     end
   end
 end