Merge remote branch 'rails/master' into identity_map

Conflicts:
	activerecord/examples/performance.rb
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_proxy.rb
	activerecord/lib/active_record/autosave_association.rb
	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/nested_attributes.rb
	activerecord/test/cases/relations_test.rb

1 files changed, 1 insertions, 13 deletions

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 7766050632..ab7ed4eb9e 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -112,12 +112,7 @@ module Rails
       end
 
       def database_gemfile_entry
-        entry = ""
-        unless options[:skip_active_record]
-          entry = "gem '#{gem_for_database}'"
-          entry << ", :require => '#{require_for_database}'" if require_for_database
-        end
-        entry
+        options[:skip_active_record] ? "" : "gem '#{gem_for_database}'"
       end
 
       def rails_gemfile_entry
@@ -150,19 +145,12 @@ gem 'rails', '#{Rails::VERSION::STRING}'
         case options[:database]
         when "oracle"     then "ruby-oci8"
         when "postgresql" then "pg"
-        when "sqlite3"    then "sqlite3-ruby"
         when "frontbase"  then "ruby-frontbase"
         when "mysql"      then "mysql2"
         else options[:database]
         end
       end
 
-      def require_for_database
-        case options[:database]
-        when "sqlite3" then "sqlite3"
-        end
-      end
-
       def bundle_if_dev_or_edge
         bundle_command = File.basename(Thor::Util.ruby_command).sub(/ruby/, 'bundle')
         run "#{bundle_command} install" if dev_or_edge?