diff --git a/lib/spatial_adapter/postgresql.rb b/lib/spatial_adapter/postgresql.rb index 090aeb7..7cbdef1 100644 --- a/lib/spatial_adapter/postgresql.rb +++ b/lib/spatial_adapter/postgresql.rb @@ -3,6 +3,7 @@ module ActiveRecord::ConnectionAdapters class PostgreSQLAdapter + def postgis_version select_value("SELECT postgis_full_version()").scan(/POSTGIS="([\d\.]*)"/)[0][0] rescue ActiveRecord::StatementInvalid diff --git a/lib/spatial_adapter/railtie.rb b/lib/spatial_adapter/railtie.rb index 1668bb8..228c167 100644 --- a/lib/spatial_adapter/railtie.rb +++ b/lib/spatial_adapter/railtie.rb @@ -2,7 +2,7 @@ module SpatialAdapter class Railtie < Rails::Railtie initializer "spatial_adapter.load_current_database_adapter" do ActiveSupport.on_load :active_record do - adapter = ActiveRecord::Base.configurations[Rails.env]['adapter'] + adapter = Rails.configuration.database_configuration[Rails.env]['adapter'] begin require "spatial_adapter/#{adapter}" rescue LoadError diff --git a/spatial_adapter.gemspec b/spatial_adapter.gemspec index e084c79..c566070 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.2.0' + s.add_dependency 'activerecord', '>= 2.2.2', '<= 3.2.13' s.add_dependency 'GeoRuby', '>= 1.3.0' end