Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #9120 from hone/db_migrate_with_database_url

fix rake db:migrate when used with ENV['DATABASE_URL']
  • Loading branch information...
commit 3a0b6c8e135e268c1550f93db1b63ba27457dec2 2 parents ebae71a + b1de189
@rafaelfranca rafaelfranca authored
View
4 activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -38,7 +38,7 @@ def spec
private
def resolve_string_connection(spec) # :nodoc:
hash = configurations.fetch(spec) do |k|
- connection_url_to_hash(k)
+ self.class.connection_url_to_hash(k)
end
raise(AdapterNotSpecified, "#{spec} database is not configured") unless hash
@@ -69,7 +69,7 @@ def resolve_hash_connection(spec) # :nodoc:
SIMPLE_INT = /\A\d+\z/
SIMPLE_FLOAT = /\A\d+\.\d+\z/
- def connection_url_to_hash(url) # :nodoc:
+ def self.connection_url_to_hash(url) # :nodoc:
config = URI.parse url
adapter = config.scheme
adapter = "postgresql" if adapter == "postgres"
View
4 activerecord/lib/active_record/railtie.rb
@@ -141,9 +141,7 @@ class Railtie < Rails::Railtie # :nodoc:
# and then establishes the connection.
initializer "active_record.initialize_database" do |app|
ActiveSupport.on_load(:active_record) do
- unless ENV['DATABASE_URL']
- self.configurations = app.config.database_configuration
- end
+ self.configurations = app.config.database_configuration
establish_connection
end
end
View
3  railties/CHANGELOG.md
@@ -1,4 +1,7 @@
## Rails 4.0.0 (unreleased) ##
+* fix rake db:* tasks to work with DATABASE_URL and without config/database.yml
+
+ *Terence Lee*
* Add notice message for destroy action in scaffold generator.
View
8 railties/lib/rails/application/configuration.rb
@@ -101,8 +101,12 @@ def threadsafe!
# contents of the file are processed via ERB before being sent through
# YAML::load.
def database_configuration
- require 'erb'
- YAML.load ERB.new(IO.read(paths["config/database"].first)).result
+ if ENV['DATABASE_URL']
+ {Rails.env => ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.connection_url_to_hash(ENV['DATABASE_URL']).stringify_keys}
+ else
+ require 'erb'
+ YAML.load ERB.new(IO.read(paths["config/database"].first)).result
+ end
rescue Psych::SyntaxError => e
raise "YAML syntax error occurred while parsing #{paths["config/database"].first}. " \
"Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
View
15 railties/test/application/rake/dbs_test.rb
@@ -21,6 +21,8 @@ def database_url_db_name
def set_database_url
ENV['DATABASE_URL'] = "sqlite3://:@localhost/#{database_url_db_name}"
+ # ensure it's using the DATABASE_URL
+ FileUtils.rm_rf("#{app_path}/config/database.yml")
end
def expected
@@ -166,9 +168,16 @@ def db_test_load_structure
end
test 'db:test:load_structure with database_url' do
- require "#{app_path}/config/environment"
- set_database_url
- db_test_load_structure
+ old_rails_env = ENV["RAILS_ENV"]
+ ENV["RAILS_ENV"] = 'test'
+
+ begin
+ require "#{app_path}/config/environment"
+ set_database_url
+ db_test_load_structure
+ ensure
+ ENV["RAILS_ENV"] = old_rails_env
+ end
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.