fixed support for DATABASE_URL for rake db tasks

- added tests to confirm establish_connection uses DATABASE_URL and
  Rails.env correctly even when no arguments are passed in.
- updated rake db tasks to support DATABASE_URL, and added tests to
  confirm correct behavior for these rake tasks.  (Removed
  establish_connection call from some tasks since in those cases
  the :environment task already made sure the function would be called)
- updated Resolver so that when it resolves the database url, it
  removes hash values with empty strings from the config spec (e.g.
  to support connection to postgresql when no username is specified).

3 files changed, 215 insertions, 0 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e889f0c23c..f4f81f1128 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Fixed support for DATABASE_URL environment variable for rake db tasks. *Grace Liu*
+
 *   rails dbconsole now can use SSL for MySQL. The database.yml options sslca, sslcert, sslcapath, sslcipher,
     and sslkey now affect rails dbconsole. *Jim Kingdon and Lars Petrus*
 
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index d3bbac811c..fbce97e1a9 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -195,5 +195,37 @@ module ApplicationTests
         assert !ActiveRecord::Base.connection.schema_cache.tables["posts"]
       }
     end
+
+    test "active record establish_connection uses Rails.env if DATABASE_URL is not set" do
+      begin
+        require "#{app_path}/config/environment"
+        orig_database_url = ENV.delete("DATABASE_URL")
+        orig_rails_env, Rails.env = Rails.env, 'development'
+        ActiveRecord::Base.establish_connection
+        assert ActiveRecord::Base.connection
+        assert_match /#{ActiveRecord::Base.configurations[Rails.env]['database']}/, ActiveRecord::Base.connection_config[:database]
+      ensure
+        ActiveRecord::Base.remove_connection
+        ENV["DATABASE_URL"] = orig_database_url if orig_database_url
+        Rails.env = orig_rails_env if orig_rails_env
+      end
+    end
+
+    test "active record establish_connection uses DATABASE_URL even if Rails.env is set" do
+      begin
+        require "#{app_path}/config/environment"
+        orig_database_url = ENV.delete("DATABASE_URL")
+        orig_rails_env, Rails.env = Rails.env, 'development'
+        database_url_db_name = "db/database_url_db.sqlite3"
+        ENV["DATABASE_URL"] = "sqlite3://:@localhost/#{database_url_db_name}"
+        ActiveRecord::Base.establish_connection
+        assert ActiveRecord::Base.connection
+        assert_match /#{database_url_db_name}/, ActiveRecord::Base.connection_config[:database]
+      ensure
+        ActiveRecord::Base.remove_connection
+        ENV["DATABASE_URL"] = orig_database_url if orig_database_url
+        Rails.env = orig_rails_env if orig_rails_env
+      end
+    end
   end
 end
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
new file mode 100644
index 0000000000..52c07cee9f
--- /dev/null
+++ b/railties/test/application/rake/dbs_test.rb
@@ -0,0 +1,181 @@
+require "isolation/abstract_unit"
+
+module ApplicationTests
+  module RakeTests
+    class RakeDbsTest < ActiveSupport::TestCase
+      include ActiveSupport::Testing::Isolation
+
+      def setup
+        build_app
+        boot_rails
+        FileUtils.rm_rf("#{app_path}/config/environments")
+      end
+
+      def teardown
+        teardown_app
+      end
+
+      def database_url_db_name
+        "db/database_url_db.sqlite3"
+      end
+
+      def set_database_url
+        ENV['DATABASE_URL'] = "sqlite3://:@localhost/#{database_url_db_name}"
+      end
+
+      def expected
+        @expected ||= {}
+      end
+
+      def db_create_and_drop
+        Dir.chdir(app_path) do
+          output = `bundle exec rake db:create`
+          assert_equal output, ""
+          assert File.exists?(expected[:database])
+          assert_equal expected[:database],
+                        ActiveRecord::Base.connection_config[:database]
+          output = `bundle exec rake db:drop`
+          assert_equal output, ""
+          assert !File.exists?(expected[:database])
+        end
+      end
+
+      test 'db:create and db:drop without database url' do
+        require "#{app_path}/config/environment"
+        expected[:database] = ActiveRecord::Base.configurations[Rails.env]['database']
+        db_create_and_drop
+       end
+
+      test 'db:create and db:drop with database url' do
+        require "#{app_path}/config/environment"
+        set_database_url
+        expected[:database] = database_url_db_name
+        db_create_and_drop
+      end
+
+      def db_migrate_and_status
+        Dir.chdir(app_path) do
+          `rails generate model book title:string`
+          `bundle exec rake db:migrate`
+          output = `bundle exec rake db:migrate:status`
+          assert_match(/database:\s+\S+#{expected[:database]}/, output)
+          assert_match(/up\s+\d{14}\s+Create books/, output)
+        end
+      end
+
+      test 'db:migrate and db:migrate:status without database_url' do
+        require "#{app_path}/config/environment"
+        expected[:database] = ActiveRecord::Base.configurations[Rails.env]['database']
+        db_migrate_and_status
+      end
+
+      test 'db:migrate and db:migrate:status with database_url' do
+        require "#{app_path}/config/environment"
+        set_database_url
+        expected[:database] = database_url_db_name
+        db_migrate_and_status
+      end
+
+      def db_schema_dump
+        Dir.chdir(app_path) do
+          `rails generate model book title:string`
+          `rake db:migrate`
+          `rake db:schema:dump`
+          schema_dump = File.read("db/schema.rb")
+          assert_match(/create_table \"books\"/, schema_dump)
+        end
+      end
+
+      test 'db:schema:dump without database_url' do
+        db_schema_dump
+      end
+
+      test 'db:schema:dump with database_url' do
+        set_database_url
+        db_schema_dump
+      end
+
+      def db_fixtures_load
+        Dir.chdir(app_path) do
+          `rails generate model book title:string`
+          `bundle exec rake db:migrate`
+          `bundle exec rake db:fixtures:load`
+          assert_match /#{expected[:database]}/,
+                    ActiveRecord::Base.connection_config[:database]
+          require "#{app_path}/app/models/book"
+          assert_equal 2, Book.count
+        end
+      end
+
+      test 'db:fixtures:load without database_url' do
+        require "#{app_path}/config/environment"
+        expected[:database] =  ActiveRecord::Base.configurations[Rails.env]['database']
+        db_fixtures_load
+      end
+
+      test 'db:fixtures:load with database_url' do
+        require "#{app_path}/config/environment"
+        set_database_url
+        expected[:database] = database_url_db_name
+        db_fixtures_load
+      end
+
+      def db_structure_dump_and_load
+        Dir.chdir(app_path) do
+          `rails generate model book title:string`
+          `bundle exec rake db:migrate`
+          `bundle exec rake db:structure:dump`
+          structure_dump = File.read("db/structure.sql")
+          assert_match(/CREATE TABLE \"books\"/, structure_dump)
+          `bundle exec rake db:drop`
+          `bundle exec rake db:structure:load`
+          assert_match /#{expected[:database]}/,
+                        ActiveRecord::Base.connection_config[:database]
+          require "#{app_path}/app/models/book"
+          #if structure is not loaded correctly, exception would be raised
+          assert Book.count, 0
+        end
+      end
+
+      test 'db:structure:dump and db:structure:load without database_url' do
+        require "#{app_path}/config/environment"
+        expected[:database] =  ActiveRecord::Base.configurations[Rails.env]['database']
+        db_structure_dump_and_load
+      end
+
+      test 'db:structure:dump and db:structure:load with database_url' do
+        require "#{app_path}/config/environment"
+        set_database_url
+        expected[:database] = database_url_db_name
+        db_structure_dump_and_load
+      end
+
+      def db_test_load_structure
+        Dir.chdir(app_path) do
+          `rails generate model book title:string`
+          `bundle exec rake db:migrate`
+          `bundle exec rake db:structure:dump`
+          `bundle exec rake db:test:load_structure`
+          ActiveRecord::Base.configurations = Rails.application.config.database_configuration
+          ActiveRecord::Base.establish_connection 'test'
+          require "#{app_path}/app/models/book"
+          #if structure is not loaded correctly, exception would be raised
+          assert Book.count, 0
+          assert_match /#{ActiveRecord::Base.configurations['test']['database']}/,
+                        ActiveRecord::Base.connection_config[:database]
+        end
+      end
+
+      test 'db:test:load_structure without database_url' do
+        require "#{app_path}/config/environment"
+        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
+      end
+    end
+  end
+end
\ No newline at end of file