Merge branch 'master' of git://github.com/rails/rails

3 files changed, 17 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index 0dfd966466..d9903243ce 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -411,7 +411,8 @@ module ActiveRecord
             end
           elsif @reflection.klass.scopes[method]
             @_named_scopes_cache ||= {}
-            @_named_scopes_cache[method] ||= with_scope(construct_scope) { @reflection.klass.send(method, *args) }
+            @_named_scopes_cache[method] ||= {}
+            @_named_scopes_cache[method][args] ||= with_scope(construct_scope) { @reflection.klass.send(method, *args) }
           else
             with_scope(construct_scope) do
               if block_given?
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index cb7eade0ab..952f2a3070 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -435,6 +435,7 @@ namespace :db do
     task :create => :environment do
       raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations?
       require 'rails/generators'
+      Rails::Generators.configure!
       require 'rails/generators/rails/session_migration/session_migration_generator'
       Rails::Generators::SessionMigrationGenerator.start [ ENV["MIGRATION"] || "add_sessions_table" ]
     end
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 6782554854..7a48a6596a 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -9,7 +9,7 @@ module ActiveRecord
       (ActiveRecord::Relation::ASSOCIATION_METHODS + ActiveRecord::Relation::MULTI_VALUE_METHODS).each do |query_method|
         attr_accessor :"#{query_method}_values"
 
-        next if [:where, :having].include?(query_method)
+        next if [:where, :having, :select].include?(query_method)
         class_eval <<-CEVAL, __FILE__, __LINE__ + 1
           def #{query_method}(*args, &block)
             new_relation = clone
@@ -21,6 +21,19 @@ module ActiveRecord
         CEVAL
       end
 
+      class_eval <<-CEVAL, __FILE__, __LINE__ + 1
+        def select(*args, &block)
+          if block_given?
+            to_a.select(&block)
+          else
+            new_relation = clone
+            value = Array.wrap(args.flatten).reject {|x| x.blank? }
+            new_relation.select_values += value if value.present?
+            new_relation
+          end
+        end
+      CEVAL
+
       [:where, :having].each do |query_method|
         class_eval <<-CEVAL, __FILE__, __LINE__ + 1
           def #{query_method}(*args, &block)