From 49ed5ed4d4530d86f4dc33c1af5004c43bad0f1b Mon Sep 17 00:00:00 2001 From: Hamish Evans Date: Thu, 11 Oct 2012 13:48:29 +1300 Subject: [PATCH 1/6] push rails minor minor to 6 --- spatial_adapter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spatial_adapter.gemspec b/spatial_adapter.gemspec index e084c79..9601708 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.6' s.add_dependency 'GeoRuby', '>= 1.3.0' end From 27d1d9ce74d36ef56807344ab5da7426876d4876 Mon Sep 17 00:00:00 2001 From: Hamish Evans Date: Thu, 11 Oct 2012 15:55:51 +1300 Subject: [PATCH 2/6] Change ActiveRecord::Base.configurations to Rails.configuration.database_configuration --- lib/spatial_adapter/postgresql.rb | 1 + lib/spatial_adapter/railtie.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 From 2c44ad9b6610916b17ed36ea2ea4dd9a66c73775 Mon Sep 17 00:00:00 2001 From: Hamish Evans Date: Tue, 8 Jan 2013 15:00:41 +1300 Subject: [PATCH 3/6] bump activerecord minor to 10 --- spatial_adapter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spatial_adapter.gemspec b/spatial_adapter.gemspec index 9601708..244c669 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.6' + s.add_dependency 'activerecord', '>= 2.2.2', '<= 3.2.10' s.add_dependency 'GeoRuby', '>= 1.3.0' end From 5d4a2a11bf4f178fc67fcd87dc3a3a35e4208121 Mon Sep 17 00:00:00 2001 From: Hamish Evans Date: Fri, 11 Jan 2013 13:28:44 +1300 Subject: [PATCH 4/6] Bump activerecord minor minor --- spatial_adapter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spatial_adapter.gemspec b/spatial_adapter.gemspec index 244c669..30fbf0a 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.10' + s.add_dependency 'activerecord', '>= 2.2.2', '<= 3.2.11' s.add_dependency 'GeoRuby', '>= 1.3.0' end From 40d49a15684df07de52176b93320ecd288e00155 Mon Sep 17 00:00:00 2001 From: Hamish Evans Date: Tue, 12 Feb 2013 08:07:14 +1300 Subject: [PATCH 5/6] bump active record --- spatial_adapter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spatial_adapter.gemspec b/spatial_adapter.gemspec index 30fbf0a..bda4fd3 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.11' + s.add_dependency 'activerecord', '>= 2.2.2', '<= 3.2.12' s.add_dependency 'GeoRuby', '>= 1.3.0' end From 0787e1bd41bf4b766912090115708fae714f1e3e Mon Sep 17 00:00:00 2001 From: Hamish Evans Date: Wed, 20 Mar 2013 06:56:09 +1300 Subject: [PATCH 6/6] bump rails version --- spatial_adapter.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spatial_adapter.gemspec b/spatial_adapter.gemspec index bda4fd3..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.12' + s.add_dependency 'activerecord', '>= 2.2.2', '<= 3.2.13' s.add_dependency 'GeoRuby', '>= 1.3.0' end