diff --git a/README.rdoc b/README.rdoc index fbf1a52..76e0b98 100644 --- a/README.rdoc +++ b/README.rdoc @@ -11,7 +11,7 @@ handle spatial datatypes in the following databases: The following gems are required: - GeoRuby -- ActiveRecord (version 2.2.2 and up) +- ActiveRecord (version 3.2.0 and up) For PostgreSQL: diff --git a/lib/spatial_adapter/mysql2.rb b/lib/spatial_adapter/mysql2.rb index 0c0b8cc..b67d5c5 100644 --- a/lib/spatial_adapter/mysql2.rb +++ b/lib/spatial_adapter/mysql2.rb @@ -3,7 +3,7 @@ require 'active_record/connection_adapters/mysql2_adapter' module ActiveRecord::ConnectionAdapters - class SpatialMysql2Column < Mysql2Column + class SpatialMysql2Column < Mysql2Adapter::Column include SpatialAdapter::SpatialColumn extend SpatialAdapter::Base::Mysql::SpatialColumn end @@ -18,7 +18,7 @@ def columns(table_name, name = nil)#:nodoc: if field[1] =~ GEOMETRY_REGEXP ActiveRecord::ConnectionAdapters::SpatialMysql2Column else - ActiveRecord::ConnectionAdapters::Mysql2Column + ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column end klass.new(field[0], field[4], field[1], field[2] == "YES") end diff --git a/spatial_adapter.gemspec b/spatial_adapter.gemspec index 07804c3..bf650f1 100644 --- a/spatial_adapter.gemspec +++ b/spatial_adapter.gemspec @@ -34,6 +34,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'activerecord-jdbcmysql-adapter' end - s.add_dependency 'activerecord', '>= 2.2.2', '< 3.1.0' + s.add_dependency 'activerecord', '>= 3.2.0' s.add_dependency 'GeoRuby', '>= 1.3.0' end diff --git a/spec/mysql2_spec.rb b/spec/mysql2_spec.rb index bf0dbda..8e7b2a0 100644 --- a/spec/mysql2_spec.rb +++ b/spec/mysql2_spec.rb @@ -13,7 +13,7 @@ it_should_behave_like 'a modified mysql adapter' do let(:establish){ mysql2_connection } let(:column) do - ActiveRecord::ConnectionAdapters::Mysql2Column + ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column end let(:spatial_column) do ActiveRecord::ConnectionAdapters::SpatialMysql2Column