Merge commit 'mainstream/master'

12 files changed, 25 insertions, 10 deletions

diff --git a/railties/configs/databases/mysql.yml b/railties/configs/databases/mysql.yml
index 7fcadcdf2c..a4406e4923 100644
--- a/railties/configs/databases/mysql.yml
+++ b/railties/configs/databases/mysql.yml
@@ -18,6 +18,7 @@ development:
   adapter: mysql
   encoding: utf8
   database: <%= app_name %>_development
+  pool: 5
   username: root
   password:
 <% if socket -%>
@@ -33,6 +34,7 @@ test:
   adapter: mysql
   encoding: utf8
   database: <%= app_name %>_test
+  pool: 5
   username: root
   password:
 <% if socket -%>
@@ -45,6 +47,7 @@ production:
   adapter: mysql
   encoding: utf8
   database: <%= app_name %>_production
+  pool: 5
   username: root
   password: 
 <% if socket -%>
diff --git a/railties/configs/databases/postgresql.yml b/railties/configs/databases/postgresql.yml
index 36f6e5ae49..f600e054cf 100644
--- a/railties/configs/databases/postgresql.yml
+++ b/railties/configs/databases/postgresql.yml
@@ -12,6 +12,7 @@ development:
   adapter: postgresql
   encoding: unicode
   database: <%= app_name %>_development
+  pool: 5
   username: <%= app_name %>
   password:
 
@@ -37,6 +38,7 @@ test:
   adapter: postgresql
   encoding: unicode
   database: <%= app_name %>_test
+  pool: 5
   username: <%= app_name %>
   password:
 
@@ -44,5 +46,6 @@ production:
   adapter: postgresql
   encoding: unicode
   database: <%= app_name %>_production
+  pool: 5
   username: <%= app_name %>
   password:
diff --git a/railties/configs/databases/sqlite2.yml b/railties/configs/databases/sqlite2.yml
index fc48bd6753..46f01cb42c 100644
--- a/railties/configs/databases/sqlite2.yml
+++ b/railties/configs/databases/sqlite2.yml
@@ -3,6 +3,7 @@
 development:
   adapter: sqlite
   database: db/development.sqlite2
+  pool: 5
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -10,7 +11,9 @@ development:
 test:
   adapter: sqlite
   database: db/test.sqlite2
+  pool: 5
 
 production:
   adapter: sqlite
   database: db/production.sqlite2
+  pool: 5
diff --git a/railties/configs/databases/sqlite3.yml b/railties/configs/databases/sqlite3.yml
index fff44a4124..025d62a8d8 100644
--- a/railties/configs/databases/sqlite3.yml
+++ b/railties/configs/databases/sqlite3.yml
@@ -3,6 +3,7 @@
 development:
   adapter: sqlite3
   database: db/development.sqlite3
+  pool: 5
   timeout: 5000
 
 # Warning: The database defined as "test" will be erased and
@@ -11,9 +12,11 @@ development:
 test:
   adapter: sqlite3
   database: db/test.sqlite3
+  pool: 5
   timeout: 5000
 
 production:
   adapter: sqlite3
   database: db/production.sqlite3
+  pool: 5
   timeout: 5000
diff --git a/railties/helpers/performance_test.rb b/railties/helpers/performance_test.rb
index 7c89816570..4b60558b43 100644
--- a/railties/helpers/performance_test.rb
+++ b/railties/helpers/performance_test.rb
@@ -1,4 +1,5 @@
-require 'performance/test_helper'
+require 'test_helper'
+require 'performance_test_help'
 
 # Profiling results for each test method are written to tmp/performance.
 class BrowsingTest < ActionController::PerformanceTest
diff --git a/railties/helpers/performance_test_helper.rb b/railties/helpers/performance_test_helper.rb
deleted file mode 100644
index 1aafc7f7e5..0000000000
--- a/railties/helpers/performance_test_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'test_helper'
-require 'performance_test_help'
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 0aec97dece..6500b2d309 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -49,8 +49,10 @@ module Rails
     end
 
     def env
-      require 'active_support/string_inquirer'
-      ActiveSupport::StringInquirer.new(RAILS_ENV)
+      @_env ||= begin
+        require 'active_support/string_inquirer'
+        ActiveSupport::StringInquirer.new(RAILS_ENV)
+      end
     end
 
     def cache
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 80481859e1..46d5fd3a47 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -151,7 +151,7 @@ module Rails
       end
 
       # Gem.activate changes the spec - get the original
-      real_spec = Gem::Specification.load(spec.loaded_from)
+      real_spec = Gem::Specification.load(specification.loaded_from)
       write_spec(directory, real_spec)
 
     end
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index acd3dc8c8c..32c320385d 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -50,7 +50,6 @@ class AppGenerator < Rails::Generator::Base
       m.template "helpers/application.rb",        "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest }
       m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb"
       m.template "helpers/test_helper.rb",        "test/test_helper.rb"
-      m.template "helpers/performance_test_helper.rb", "test/performance/test_helper.rb"
       m.template "helpers/performance_test.rb",   "test/performance/browsing_test.rb"
 
       # database.yml and routes.rb
diff --git a/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb b/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb
index 352ff48054..27c91b0fca 100644
--- a/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb
+++ b/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb
@@ -1,4 +1,5 @@
-require 'performance/test_helper'
+require 'test_helper'
+require 'performance_test_help'
 
 class <%= class_name %>Test < ActionController::PerformanceTest
   # Replace this with your real tests.
diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb
index 0526d526ad..a3525364a2 100644
--- a/railties/lib/rails_generator/lookup.rb
+++ b/railties/lib/rails_generator/lookup.rb
@@ -208,7 +208,8 @@ module Rails
     class GemGeneratorSource < AbstractGemSource
       # Yield latest versions of generator gems.
       def each
-        Gem::cache.search(/_generator$/).inject({}) { |latest, gem|
+        dependency = Gem::Dependency.new(/_generator$/, Gem::Requirement.default)
+        Gem::cache.search(dependency).inject({}) { |latest, gem|
           hem = latest[gem.name]
           latest[gem.name] = gem if hem.nil? or gem.version > hem.version
           latest
diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake
index c65dfc7dd4..e2cb4b9577 100644
--- a/railties/lib/tasks/gems.rake
+++ b/railties/lib/tasks/gems.rake
@@ -11,7 +11,7 @@ end
 def print_gem_status(gem, indent=1)
   code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " "
   puts "   "*(indent-1)+" - [#{code}] #{gem.name} #{gem.requirement.to_s}"
-  gem.dependencies.each { |g| print_gem_status(g, indent+1)}
+  gem.dependencies.each { |g| print_gem_status(g, indent+1)} if gem.loaded?
 end
 
 namespace :gems do
@@ -70,6 +70,7 @@ namespace :gems do
   task :refresh_specs => :base do
     require 'rubygems'
     require 'rubygems/gem_runner'
+    Rails::VendorGemSourceIndex.silence_spec_warnings = true
     Rails.configuration.gems.each do |gem|
       next unless gem.frozen? && (ENV['GEM'].blank? || ENV['GEM'] == gem.name)
       gem.refresh_spec(Rails::GemDependency.unpacked_path) if gem.loaded?