Skip to content

Support for heroku #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ruby-fu-ninja wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Support for heroku #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49ed5ed
push rails minor minor to 6
ruby-fu-ninja Oct 11, 2012
27d1d9c
Change ActiveRecord::Base.configurations to Rails.configuration.datab…
ruby-fu-ninja Oct 11, 2012
2c44ad9
bump activerecord minor to 10
ruby-fu-ninja Jan 8, 2013
5d4a2a1
Bump activerecord minor minor
ruby-fu-ninja Jan 11, 2013
40d49a1
bump active record
ruby-fu-ninja Feb 11, 2013
0787e1b
bump rails version
ruby-fu-ninja Mar 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/spatial_adapter/postgresql.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/spatial_adapter/railtie.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spatial_adapter.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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