From 8c3e46c093023f9430c9772e81d58c9ee24de229 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 16 Mar 2010 11:26:19 -0700
Subject: clean up more warnings, remove unnecessary methods, fix eval line
 numbers. [#4193 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/associations/has_many_association.rb | 4 ++++
 activerecord/lib/active_record/attribute_methods/dirty.rb           | 2 +-
 activerecord/lib/active_record/base.rb                              | 4 ++++
 activerecord/lib/active_record/nested_attributes.rb                 | 4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index 146a6ca55f..0464e8ceea 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -5,6 +5,10 @@ module ActiveRecord
     # If the association has a <tt>:through</tt> option further specialization
     # is provided by its child HasManyThroughAssociation.
     class HasManyAssociation < AssociationCollection #:nodoc:
+      def initialize(owner, reflection)
+        @finder_sql = nil
+        super
+      end
       protected
         def owner_quoted_id
           if @reflection.options[:primary_key]
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index 4a3ab9ea82..64e761e7a4 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -34,7 +34,7 @@ module ActiveRecord
       # <tt>reload</tt> the record and clears changed attributes.
       def reload_with_dirty(*args) #:nodoc:
         reload_without_dirty(*args).tap do
-          previously_changed_attributes.clear
+          @previously_changed.clear
           changed_attributes.clear
         end
       end
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 1488d9f967..3d4172f368 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1045,6 +1045,8 @@ module ActiveRecord #:nodoc:
           object.instance_variable_set(:@readonly, false)
           object.instance_variable_set(:@destroyed, false)
           object.instance_variable_set(:@marked_for_destruction, false)
+          object.instance_variable_set(:@previously_changed, {})
+          object.instance_variable_set(:@changed_attributes, {})
 
           object.send(:_run_find_callbacks)
           object.send(:_run_initialize_callbacks)
@@ -1513,6 +1515,8 @@ module ActiveRecord #:nodoc:
         @readonly = false
         @destroyed = false
         @marked_for_destruction = false
+        @previously_changed = {}
+        @changed_attributes = {}
 
         ensure_proper_type
 
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb
index d8fae495e7..bc491c367f 100644
--- a/activerecord/lib/active_record/nested_attributes.rb
+++ b/activerecord/lib/active_record/nested_attributes.rb
@@ -243,11 +243,11 @@ module ActiveRecord
             # def pirate_attributes=(attributes)
             #   assign_nested_attributes_for_one_to_one_association(:pirate, attributes)
             # end
-            class_eval %{
+            class_eval <<-eoruby, __FILE__, __LINE__ + 1
               def #{association_name}_attributes=(attributes)
                 assign_nested_attributes_for_#{type}_association(:#{association_name}, attributes)
               end
-            }, __FILE__, __LINE__
+            eoruby
           else
             raise ArgumentError, "No association found for name `#{association_name}'. Has it been defined yet?"
           end
-- 
cgit v1.2.3


From df735cf5b712312a161d703f2606b145ea2d3b85 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 16 Mar 2010 15:08:38 -0700
Subject: fisting uninitialized ivar warnings. [#4198 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/aggregations.rb           |  5 +++++
 .../lib/active_record/associations/association_proxy.rb  |  1 +
 .../lib/active_record/attribute_methods/dirty.rb         | 16 ++++++++--------
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb
index 9ecf231a66..08389907ef 100644
--- a/activerecord/lib/active_record/aggregations.rb
+++ b/activerecord/lib/active_record/aggregations.rb
@@ -213,6 +213,11 @@ module ActiveRecord
           module_eval do
             define_method(name) do |*args|
               force_reload = args.first || false
+
+              unless instance_variable_defined?("@#{name}")
+                instance_variable_set("@#{name}", nil)
+              end
+
               if (instance_variable_get("@#{name}").nil? || force_reload) && (!allow_nil || mapping.any? {|pair| !read_attribute(pair.first).nil? })
                 attrs = mapping.collect {|pair| read_attribute(pair.first)}
                 object = case constructor
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb
index 0ff89df1e3..4fb1df3ab9 100644
--- a/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/activerecord/lib/active_record/associations/association_proxy.rb
@@ -53,6 +53,7 @@ module ActiveRecord
 
       def initialize(owner, reflection)
         @owner, @reflection = owner, reflection
+        @updated = false
         reflection.check_validity!
         Array(reflection.options[:extend]).each { |ext| proxy_extend(ext) }
         reset
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index 64e761e7a4..a8698a2f5a 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -18,7 +18,7 @@ module ActiveRecord
       def save_with_dirty(*args) #:nodoc:
         if status = save_without_dirty(*args)
           @previously_changed = changes
-          changed_attributes.clear
+          @changed_attributes.clear
         end
         status
       end
@@ -26,8 +26,8 @@ module ActiveRecord
       # Attempts to <tt>save!</tt> the record and clears changed attributes if successful.
       def save_with_dirty!(*args) #:nodoc:
         save_without_dirty!(*args).tap do
-          @previously_changed = changes 
-          changed_attributes.clear 
+          @previously_changed = changes
+          @changed_attributes.clear
         end
       end
 
@@ -35,7 +35,7 @@ module ActiveRecord
       def reload_with_dirty(*args) #:nodoc:
         reload_without_dirty(*args).tap do
           @previously_changed.clear
-          changed_attributes.clear
+          @changed_attributes.clear
         end
       end
 
@@ -45,12 +45,12 @@ module ActiveRecord
           attr = attr.to_s
 
           # The attribute already has an unsaved change.
-          if changed_attributes.include?(attr)
-            old = changed_attributes[attr]
-            changed_attributes.delete(attr) unless field_changed?(attr, old, value)
+          if attribute_changed?(attr)
+            old = @changed_attributes[attr]
+            @changed_attributes.delete(attr) unless field_changed?(attr, old, value)
           else
             old = clone_attribute_value(:read_attribute, attr)
-            changed_attributes[attr] = old if field_changed?(attr, old, value)
+            @changed_attributes[attr] = old if field_changed?(attr, old, value)
           end
 
           # Carry on.
-- 
cgit v1.2.3


From 843255a763c5e68beaa3a1b0bca306c625c30797 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 17 Mar 2010 10:04:49 -0700
Subject: fixing activerecord tests [#4205 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activerecord/lib/active_record/base.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 3d4172f368..6999d4113d 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -13,6 +13,7 @@ require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/object/singleton_class'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/remove_method'
 require 'arel'
 require 'active_record/errors'
 
-- 
cgit v1.2.3


From 067b350301279f608a369a39aff9b6f5a22357aa Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 17 Mar 2010 10:11:38 -0700
Subject: Move require closer to home

---
 activerecord/lib/active_record/base.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 6999d4113d..3d4172f368 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -13,7 +13,6 @@ require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/object/singleton_class'
 require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/remove_method'
 require 'arel'
 require 'active_record/errors'
 
-- 
cgit v1.2.3


From b652aa81216f718f27ba257238d4c27dd54863b2 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 17 Mar 2010 13:30:17 -0700
Subject: cleaning up a bunch of method already defined warnings [#4209
 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/nested_attributes.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb
index bc491c367f..76ec7eb681 100644
--- a/activerecord/lib/active_record/nested_attributes.rb
+++ b/activerecord/lib/active_record/nested_attributes.rb
@@ -244,6 +244,9 @@ module ActiveRecord
             #   assign_nested_attributes_for_one_to_one_association(:pirate, attributes)
             # end
             class_eval <<-eoruby, __FILE__, __LINE__ + 1
+              if method_defined?(:#{association_name}_attributes=)
+                remove_method(:#{association_name}_attributes=)
+              end
               def #{association_name}_attributes=(attributes)
                 assign_nested_attributes_for_#{type}_association(:#{association_name}, attributes)
               end
-- 
cgit v1.2.3


From 3911a7c197cf40fadab62d17def21db8a3d52f5e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 18 Mar 2010 10:23:14 -0700
Subject: squelching more warnings in the AR tests. [#4218 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/railties/log_subscriber.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/railties/log_subscriber.rb b/activerecord/lib/active_record/railties/log_subscriber.rb
index 48b25032ce..31b98bb6ed 100644
--- a/activerecord/lib/active_record/railties/log_subscriber.rb
+++ b/activerecord/lib/active_record/railties/log_subscriber.rb
@@ -1,6 +1,11 @@
 module ActiveRecord
   module Railties
     class LogSubscriber < Rails::LogSubscriber
+      def initialize
+        super
+        @odd_or_even = false
+      end
+
       def sql(event)
         name = '%s (%.1fms)' % [event.payload[:name], event.duration]
         sql  = event.payload[:sql].squeeze(' ')
@@ -24,4 +29,4 @@ module ActiveRecord
       end
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 587f4682825e0c1fceabc75c83f121578862f3c8 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 18 Mar 2010 13:28:22 -0700
Subject: kill where / having method redefine warnings. [#4225 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/relation/query_methods.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index e00d9cdf27..f7cf68665d 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -6,6 +6,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)
         class_eval <<-CEVAL
           def #{query_method}(*args)
             new_relation = clone
-- 
cgit v1.2.3


From 541194f641c960efe739b16f76999f47742d12ba Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 19 Mar 2010 09:54:44 -0700
Subject: switching migrations to use require cleans up many warnings [#4234
 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/migration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 5825482db7..23e4505f61 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -374,7 +374,7 @@ module ActiveRecord
       end
 
       def load_migration
-        load(filename)
+        require(filename)
         name.constantize
       end
 
-- 
cgit v1.2.3


From d289e15af9b2749ba0ab9534b5469287be6ece05 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Mon, 22 Mar 2010 15:43:14 -0300
Subject: From and lock should be defined to be consistent with other ivars.
 Limit and offset are always defined, no need to test that.

[#4253 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activerecord/lib/active_record/relation.rb             |  7 ++-----
 .../lib/active_record/relation/query_methods.rb        | 18 ++++--------------
 2 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 1a84f70a8e..a20c152eeb 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -15,13 +15,10 @@ module ActiveRecord
     def initialize(klass, table)
       @klass, @table = klass, table
 
-      @readonly_value    = nil
-      @create_with_value = nil
       @implicit_readonly = nil
-      @limit_value       = nil
-      @offset_value      = nil
       @loaded            = nil
 
+      SINGLE_VALUE_METHODS.each {|v| instance_variable_set(:"@#{v}_value", nil)}
       (ASSOCIATION_METHODS + MULTI_VALUE_METHODS).each {|v| instance_variable_set(:"@#{v}_values", [])}
     end
 
@@ -62,7 +59,7 @@ module ActiveRecord
 
       preload = @preload_values
       preload +=  @includes_values unless eager_loading?
-      preload.each {|associations| @klass.send(:preload_associations, @records, associations) } 
+      preload.each {|associations| @klass.send(:preload_associations, @records, associations) }
 
       # @readonly_value is true only if set explicity. @implicit_readonly is true if there are JOINS and no explicit SELECT.
       readonly = @readonly_value.nil? ? @implicit_readonly : @readonly_value
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index f7cf68665d..0250e739b8 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -134,13 +134,8 @@ module ActiveRecord
         arel = h.is_a?(String) ? arel.having(h) : arel.having(*h)
       end
 
-      if defined?(@limit_value) && @limit_value.present?
-        arel = arel.take(@limit_value)
-      end
-
-      if defined?(@offset_value) && @offset_value.present?
-        arel = arel.skip(@offset_value)
-      end
+      arel = arel.take(@limit_value) if @limit_value.present?
+      arel = arel.skip(@offset_value) if @offset_value.present?
 
       @group_values.uniq.each do |g|
         arel = arel.group(g) if g.present?
@@ -163,19 +158,14 @@ module ActiveRecord
         arel = arel.project(quoted_table_name + '.*')
       end
 
-      arel =
-        if defined?(@from_value) && @from_value.present?
-          arel.from(@from_value)
-        else
-          arel.from(quoted_table_name)
-        end
+      arel = @from_value.present? ? arel.from(@from_value) : arel.from(quoted_table_name)
 
       case @lock_value
       when TrueClass
         arel = arel.lock
       when String
         arel = arel.lock(@lock_value)
-      end if defined?(@lock_value)
+      end if @lock_value.present?
 
       arel
     end
-- 
cgit v1.2.3


From b61f6f59805eec4f5bb873a85910c9fe00e839a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 23 Mar 2010 13:40:19 +0100
Subject: Load generators from both lib/rails/generators and lib/generators.
 Using the former since it's less obstrusive.

---
 activerecord/lib/generators/active_record.rb       | 30 --------------------
 .../active_record/migration/migration_generator.rb | 25 ----------------
 .../active_record/migration/templates/migration.rb | 11 --------
 .../active_record/model/model_generator.rb         | 33 ----------------------
 .../active_record/model/templates/migration.rb     | 16 -----------
 .../active_record/model/templates/model.rb         |  5 ----
 .../active_record/observer/observer_generator.rb   | 15 ----------
 .../active_record/observer/templates/observer.rb   |  2 --
 .../session_migration_generator.rb                 | 24 ----------------
 .../session_migration/templates/migration.rb       | 16 -----------
 activerecord/lib/rails/generators/active_record.rb | 30 ++++++++++++++++++++
 .../active_record/migration/migration_generator.rb | 25 ++++++++++++++++
 .../active_record/migration/templates/migration.rb | 11 ++++++++
 .../active_record/model/model_generator.rb         | 33 ++++++++++++++++++++++
 .../active_record/model/templates/migration.rb     | 16 +++++++++++
 .../active_record/model/templates/model.rb         |  5 ++++
 .../active_record/observer/observer_generator.rb   | 15 ++++++++++
 .../active_record/observer/templates/observer.rb   |  2 ++
 .../session_migration_generator.rb                 | 24 ++++++++++++++++
 .../session_migration/templates/migration.rb       | 16 +++++++++++
 20 files changed, 177 insertions(+), 177 deletions(-)
 delete mode 100644 activerecord/lib/generators/active_record.rb
 delete mode 100644 activerecord/lib/generators/active_record/migration/migration_generator.rb
 delete mode 100644 activerecord/lib/generators/active_record/migration/templates/migration.rb
 delete mode 100644 activerecord/lib/generators/active_record/model/model_generator.rb
 delete mode 100644 activerecord/lib/generators/active_record/model/templates/migration.rb
 delete mode 100644 activerecord/lib/generators/active_record/model/templates/model.rb
 delete mode 100644 activerecord/lib/generators/active_record/observer/observer_generator.rb
 delete mode 100644 activerecord/lib/generators/active_record/observer/templates/observer.rb
 delete mode 100644 activerecord/lib/generators/active_record/session_migration/session_migration_generator.rb
 delete mode 100644 activerecord/lib/generators/active_record/session_migration/templates/migration.rb
 create mode 100644 activerecord/lib/rails/generators/active_record.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/model/model_generator.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/model/templates/migration.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/model/templates/model.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/observer/observer_generator.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/observer/templates/observer.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
 create mode 100644 activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rb

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/generators/active_record.rb b/activerecord/lib/generators/active_record.rb
deleted file mode 100644
index 1ca838b4f2..0000000000
--- a/activerecord/lib/generators/active_record.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'rails/generators/named_base'
-require 'rails/generators/migration'
-require 'rails/generators/active_model'
-require 'active_record'
-
-module ActiveRecord
-  module Generators
-    class Base < Rails::Generators::NamedBase #:nodoc:
-      include Rails::Generators::Migration
-
-      def self.source_root
-        @_ar_source_root ||= begin
-          if base_name && generator_name
-            File.expand_path(File.join(base_name, generator_name, 'templates'), File.dirname(__FILE__))
-          end
-        end
-      end
-
-      # Implement the required interface for Rails::Generators::Migration.
-      #
-      def self.next_migration_number(dirname) #:nodoc:
-        if ActiveRecord::Base.timestamped_migrations
-          Time.now.utc.strftime("%Y%m%d%H%M%S")
-        else
-          "%.3d" % (current_migration_number(dirname) + 1)
-        end
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/generators/active_record/migration/migration_generator.rb b/activerecord/lib/generators/active_record/migration/migration_generator.rb
deleted file mode 100644
index 7939977f72..0000000000
--- a/activerecord/lib/generators/active_record/migration/migration_generator.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'generators/active_record'
-
-module ActiveRecord
-  module Generators
-    class MigrationGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      def create_migration_file
-        set_local_assigns!
-        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
-      end
-
-      protected
-        attr_reader :migration_action
-
-        def set_local_assigns!
-          if file_name =~ /^(add|remove)_.*_(?:to|from)_(.*)/
-            @migration_action = $1
-            @table_name       = $2.pluralize
-          end
-        end
-
-    end
-  end
-end
diff --git a/activerecord/lib/generators/active_record/migration/templates/migration.rb b/activerecord/lib/generators/active_record/migration/templates/migration.rb
deleted file mode 100644
index bbb7c53d86..0000000000
--- a/activerecord/lib/generators/active_record/migration/templates/migration.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
-  def self.up<% attributes.each do |attribute| %>
-    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end -%>
-  <%- end %>
-  end
-
-  def self.down<% attributes.reverse.each do |attribute| %>
-    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end -%>
-  <%- end %>
-  end
-end
diff --git a/activerecord/lib/generators/active_record/model/model_generator.rb b/activerecord/lib/generators/active_record/model/model_generator.rb
deleted file mode 100644
index 2641083e0d..0000000000
--- a/activerecord/lib/generators/active_record/model/model_generator.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'generators/active_record'
-
-module ActiveRecord
-  module Generators
-    class ModelGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      check_class_collision
-
-      class_option :migration,  :type => :boolean
-      class_option :timestamps, :type => :boolean
-      class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
-
-      def create_migration_file
-        return unless options[:migration] && options[:parent].nil?
-        migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
-      end
-
-      def create_model_file
-        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
-      end
-
-      hook_for :test_framework
-
-      protected
-
-        def parent_class_name
-          options[:parent] || "ActiveRecord::Base"
-        end
-
-    end
-  end
-end
diff --git a/activerecord/lib/generators/active_record/model/templates/migration.rb b/activerecord/lib/generators/active_record/model/templates/migration.rb
deleted file mode 100644
index 1f68487304..0000000000
--- a/activerecord/lib/generators/active_record/model/templates/migration.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
-  def self.up
-    create_table :<%= table_name %> do |t|
-<% for attribute in attributes -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
-<% end -%>
-<% if options[:timestamps] %>
-      t.timestamps
-<% end -%>
-    end
-  end
-
-  def self.down
-    drop_table :<%= table_name %>
-  end
-end
diff --git a/activerecord/lib/generators/active_record/model/templates/model.rb b/activerecord/lib/generators/active_record/model/templates/model.rb
deleted file mode 100644
index 21ae29e9f2..0000000000
--- a/activerecord/lib/generators/active_record/model/templates/model.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class <%= class_name %> < <%= parent_class_name.classify %>
-<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
-  belongs_to :<%= attribute.name %>
-<% end -%>
-end
diff --git a/activerecord/lib/generators/active_record/observer/observer_generator.rb b/activerecord/lib/generators/active_record/observer/observer_generator.rb
deleted file mode 100644
index a6b57423b8..0000000000
--- a/activerecord/lib/generators/active_record/observer/observer_generator.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'generators/active_record'
-
-module ActiveRecord
-  module Generators
-    class ObserverGenerator < Base
-      check_class_collision :suffix => "Observer"
-
-      def create_observer_file
-        template 'observer.rb', File.join('app/models', class_path, "#{file_name}_observer.rb")
-      end
-
-      hook_for :test_framework
-    end
-  end
-end
diff --git a/activerecord/lib/generators/active_record/observer/templates/observer.rb b/activerecord/lib/generators/active_record/observer/templates/observer.rb
deleted file mode 100644
index b9a3004161..0000000000
--- a/activerecord/lib/generators/active_record/observer/templates/observer.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class <%= class_name %>Observer < ActiveRecord::Observer
-end
diff --git a/activerecord/lib/generators/active_record/session_migration/session_migration_generator.rb b/activerecord/lib/generators/active_record/session_migration/session_migration_generator.rb
deleted file mode 100644
index 59c4792066..0000000000
--- a/activerecord/lib/generators/active_record/session_migration/session_migration_generator.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'generators/active_record'
-
-module ActiveRecord
-  module Generators
-    class SessionMigrationGenerator < Base
-      argument :name, :type => :string, :default => "add_sessions_table"
-
-      def create_migration_file
-        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
-      end
-
-      protected
-
-        def session_table_name
-          current_table_name = ActiveRecord::SessionStore::Session.table_name
-          if ["sessions", "session"].include?(current_table_name)
-            current_table_name = (ActiveRecord::Base.pluralize_table_names ? 'session'.pluralize : 'session')
-          end
-          current_table_name
-        end
-
-    end
-  end
-end
diff --git a/activerecord/lib/generators/active_record/session_migration/templates/migration.rb b/activerecord/lib/generators/active_record/session_migration/templates/migration.rb
deleted file mode 100644
index 919822af7b..0000000000
--- a/activerecord/lib/generators/active_record/session_migration/templates/migration.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
-  def self.up
-    create_table :<%= session_table_name %> do |t|
-      t.string :session_id, :null => false
-      t.text :data
-      t.timestamps
-    end
-
-    add_index :<%= session_table_name %>, :session_id
-    add_index :<%= session_table_name %>, :updated_at
-  end
-
-  def self.down
-    drop_table :<%= session_table_name %>
-  end
-end
diff --git a/activerecord/lib/rails/generators/active_record.rb b/activerecord/lib/rails/generators/active_record.rb
new file mode 100644
index 0000000000..1ca838b4f2
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record.rb
@@ -0,0 +1,30 @@
+require 'rails/generators/named_base'
+require 'rails/generators/migration'
+require 'rails/generators/active_model'
+require 'active_record'
+
+module ActiveRecord
+  module Generators
+    class Base < Rails::Generators::NamedBase #:nodoc:
+      include Rails::Generators::Migration
+
+      def self.source_root
+        @_ar_source_root ||= begin
+          if base_name && generator_name
+            File.expand_path(File.join(base_name, generator_name, 'templates'), File.dirname(__FILE__))
+          end
+        end
+      end
+
+      # Implement the required interface for Rails::Generators::Migration.
+      #
+      def self.next_migration_number(dirname) #:nodoc:
+        if ActiveRecord::Base.timestamped_migrations
+          Time.now.utc.strftime("%Y%m%d%H%M%S")
+        else
+          "%.3d" % (current_migration_number(dirname) + 1)
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
new file mode 100644
index 0000000000..f6159deeeb
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb
@@ -0,0 +1,25 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class MigrationGenerator < Base
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      def create_migration_file
+        set_local_assigns!
+        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
+      end
+
+      protected
+        attr_reader :migration_action
+
+        def set_local_assigns!
+          if file_name =~ /^(add|remove)_.*_(?:to|from)_(.*)/
+            @migration_action = $1
+            @table_name       = $2.pluralize
+          end
+        end
+
+    end
+  end
+end
diff --git a/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
new file mode 100644
index 0000000000..bbb7c53d86
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
@@ -0,0 +1,11 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up<% attributes.each do |attribute| %>
+    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end -%>
+  <%- end %>
+  end
+
+  def self.down<% attributes.reverse.each do |attribute| %>
+    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end -%>
+  <%- end %>
+  end
+end
diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
new file mode 100644
index 0000000000..3e72fbeca8
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
@@ -0,0 +1,33 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class ModelGenerator < Base
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      check_class_collision
+
+      class_option :migration,  :type => :boolean
+      class_option :timestamps, :type => :boolean
+      class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
+
+      def create_migration_file
+        return unless options[:migration] && options[:parent].nil?
+        migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
+      end
+
+      def create_model_file
+        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+      end
+
+      hook_for :test_framework
+
+      protected
+
+        def parent_class_name
+          options[:parent] || "ActiveRecord::Base"
+        end
+
+    end
+  end
+end
diff --git a/activerecord/lib/rails/generators/active_record/model/templates/migration.rb b/activerecord/lib/rails/generators/active_record/model/templates/migration.rb
new file mode 100644
index 0000000000..1f68487304
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/model/templates/migration.rb
@@ -0,0 +1,16 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+<% for attribute in attributes -%>
+      t.<%= attribute.type %> :<%= attribute.name %>
+<% end -%>
+<% if options[:timestamps] %>
+      t.timestamps
+<% end -%>
+    end
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end
diff --git a/activerecord/lib/rails/generators/active_record/model/templates/model.rb b/activerecord/lib/rails/generators/active_record/model/templates/model.rb
new file mode 100644
index 0000000000..21ae29e9f2
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/model/templates/model.rb
@@ -0,0 +1,5 @@
+class <%= class_name %> < <%= parent_class_name.classify %>
+<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
+  belongs_to :<%= attribute.name %>
+<% end -%>
+end
diff --git a/activerecord/lib/rails/generators/active_record/observer/observer_generator.rb b/activerecord/lib/rails/generators/active_record/observer/observer_generator.rb
new file mode 100644
index 0000000000..c1c0e3f25b
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/observer/observer_generator.rb
@@ -0,0 +1,15 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class ObserverGenerator < Base
+      check_class_collision :suffix => "Observer"
+
+      def create_observer_file
+        template 'observer.rb', File.join('app/models', class_path, "#{file_name}_observer.rb")
+      end
+
+      hook_for :test_framework
+    end
+  end
+end
diff --git a/activerecord/lib/rails/generators/active_record/observer/templates/observer.rb b/activerecord/lib/rails/generators/active_record/observer/templates/observer.rb
new file mode 100644
index 0000000000..b9a3004161
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/observer/templates/observer.rb
@@ -0,0 +1,2 @@
+class <%= class_name %>Observer < ActiveRecord::Observer
+end
diff --git a/activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb b/activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
new file mode 100644
index 0000000000..afcda2a98a
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rb
@@ -0,0 +1,24 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class SessionMigrationGenerator < Base
+      argument :name, :type => :string, :default => "add_sessions_table"
+
+      def create_migration_file
+        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
+      end
+
+      protected
+
+        def session_table_name
+          current_table_name = ActiveRecord::SessionStore::Session.table_name
+          if ["sessions", "session"].include?(current_table_name)
+            current_table_name = (ActiveRecord::Base.pluralize_table_names ? 'session'.pluralize : 'session')
+          end
+          current_table_name
+        end
+
+    end
+  end
+end
diff --git a/activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rb b/activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rb
new file mode 100644
index 0000000000..919822af7b
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rb
@@ -0,0 +1,16 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= session_table_name %> do |t|
+      t.string :session_id, :null => false
+      t.text :data
+      t.timestamps
+    end
+
+    add_index :<%= session_table_name %>, :session_id
+    add_index :<%= session_table_name %>, :updated_at
+  end
+
+  def self.down
+    drop_table :<%= session_table_name %>
+  end
+end
-- 
cgit v1.2.3


From 10825be40b982516c9b0d747dbd5b7f1d320873d Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Tue, 23 Mar 2010 10:20:43 -0300
Subject: rake tasks should use the new app generator path [#4257
 state:resolved]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/lib/active_record/railties/databases.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index fa6caa4910..0229793a9a 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -435,7 +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'
-      require 'generators/rails/session_migration/session_migration_generator'
+      require 'rails/generators/rails/session_migration/session_migration_generator'
       Rails::Generators::SessionMigrationGenerator.start [ ENV["MIGRATION"] || "add_sessions_table" ]
     end
 
-- 
cgit v1.2.3


From ed21f0c50270139ddb6993acfdaea4586ffd09a3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 23 Mar 2010 18:20:28 -0700
Subject: expand migration paths before requiring them. [#4240 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/migration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 23e4505f61..d4cda927ad 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -374,7 +374,7 @@ module ActiveRecord
       end
 
       def load_migration
-        require(filename)
+        require(File.expand_path(filename))
         name.constantize
       end
 
-- 
cgit v1.2.3


From e3a2fae05dfce39bbac86780c28b102acc3aa68f Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Thu, 25 Mar 2010 12:27:34 -0300
Subject: Add add_limit_offset! to adapters.

---
 .../abstract/database_statements.rb                | 23 ++++++++++++++++++++++
 .../connection_adapters/mysql_adapter.rb           | 12 +++++++++++
 2 files changed, 35 insertions(+)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index abb695264e..0c87e052c4 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -181,6 +181,29 @@ module ActiveRecord
       # done if the transaction block raises an exception or returns false.
       def rollback_db_transaction() end
 
+      # Appends +LIMIT+ and +OFFSET+ options to an SQL statement, or some SQL
+      # fragment that has the same semantics as LIMIT and OFFSET.
+      #
+      # +options+ must be a Hash which contains a +:limit+ option
+      # and an +:offset+ option.
+      #
+      # This method *modifies* the +sql+ parameter.
+      #
+      # ===== Examples
+      #  add_limit_offset!('SELECT * FROM suppliers', {:limit => 10, :offset => 50})
+      # generates
+      #  SELECT * FROM suppliers LIMIT 10 OFFSET 50
+
+      def add_limit_offset!(sql, options)
+        if limit = options[:limit]
+          sql << " LIMIT #{sanitize_limit(limit)}"
+        end
+        if offset = options[:offset]
+          sql << " OFFSET #{offset.to_i}"
+        end
+        sql
+      end
+
       def default_sequence_name(table, column)
         nil
       end
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 1f1df7e8c3..6946701ee5 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -375,6 +375,18 @@ module ActiveRecord
         execute("RELEASE SAVEPOINT #{current_savepoint_name}")
       end
 
+      def add_limit_offset!(sql, options) #:nodoc:
+        limit, offset = options[:limit], options[:offset]
+        if limit && offset
+          sql << " LIMIT #{offset.to_i}, #{sanitize_limit(limit)}"
+        elsif limit
+          sql << " LIMIT #{sanitize_limit(limit)}"
+        elsif offset
+          sql << " OFFSET #{offset.to_i}"
+        end
+        sql
+      end
+
       # SCHEMA STATEMENTS ========================================
 
       def structure_dump #:nodoc:
-- 
cgit v1.2.3


From 90a4709601873583d32c422c3a6422ef56bbc81b Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Tue, 23 Mar 2010 15:27:00 -0300
Subject: Refactor relation merging to create just one relation and then assign
 values, instead of creating multiple relation objects.

---
 .../lib/active_record/relation/spawn_methods.rb    | 36 +++++++++-------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index a18380f01c..2841ff1239 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -4,30 +4,14 @@ module ActiveRecord
       merged_relation = clone
       return merged_relation unless r
 
-      merged_relation = merged_relation.eager_load(r.eager_load_values).preload(r.preload_values).includes(r.includes_values)
-
-      merged_relation.readonly_value = r.readonly_value unless r.readonly_value.nil?
-      merged_relation.limit_value = r.limit_value if r.limit_value.present?
-      merged_relation.lock_value = r.lock_value unless merged_relation.lock_value
-      merged_relation.offset_value = r.offset_value if r.offset_value.present?
-
-      merged_relation = merged_relation.
-        joins(r.joins_values).
-        group(r.group_values).
-        select(r.select_values).
-        from(r.from_value).
-        having(r.having_values)
-
-      merged_relation.order_values = r.order_values if r.order_values.present?
-
-      merged_relation.create_with_value = @create_with_value
-
-      if @create_with_value && r.create_with_value
-        merged_relation.create_with_value = @create_with_value.merge(r.create_with_value)
-      else
-        merged_relation.create_with_value = r.create_with_value || @create_with_value
+      (ActiveRecord::Relation::ASSOCIATION_METHODS + ActiveRecord::Relation::MULTI_VALUE_METHODS).reject {|m| [:joins, :where].include?(m)}.each do |method|
+        unless (value = r.send(:"#{method}_values")).blank?
+          merged_relation.send(:"#{method}_values=", value)
+        end
       end
 
+      merged_relation = merged_relation.joins(r.joins_values)
+
       merged_wheres = @where_values
 
       r.where_values.each do |w|
@@ -40,6 +24,14 @@ module ActiveRecord
 
       merged_relation.where_values = merged_wheres
 
+      ActiveRecord::Relation::SINGLE_VALUE_METHODS.reject {|m| m == :lock}.each do |method|
+        unless (value = r.send(:"#{method}_value")).nil?
+          merged_relation.send(:"#{method}_value=", value)
+        end
+      end
+
+      merged_relation.lock_value = r.lock_value unless merged_relation.lock_value
+
       merged_relation
     end
 
-- 
cgit v1.2.3


From fc2e25734a175641595db9612d3fb5371cb8aa2c Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Tue, 23 Mar 2010 12:56:35 -0300
Subject: Move methods from association to relation finder methods.

---
 activerecord/lib/active_record/associations.rb            |  9 ---------
 activerecord/lib/active_record/relation/finder_methods.rb | 13 +++++++++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index a5179033f2..bff82f960c 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1673,15 +1673,6 @@ module ActiveRecord
           reflection
         end
 
-        def using_limitable_reflections?(reflections)
-          reflections.collect(&:collection?).length.zero?
-        end
-
-        def column_aliases(join_dependency)
-          join_dependency.joins.collect{|join| join.column_names_with_alias.collect{|column_name, aliased_name|
-              "#{connection.quote_table_name join.aliased_table_name}.#{connection.quote_column_name column_name} AS #{aliased_name}"}}.flatten.join(", ")
-        end
-
         def add_association_callbacks(association_name, options)
           callbacks = %w(before_add after_add before_remove after_remove)
           callbacks.each do |callback_name|
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index d6d3d66642..c1cce679b6 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -175,7 +175,7 @@ module ActiveRecord
     end
 
     def construct_relation_for_association_find(join_dependency)
-      relation = except(:includes, :eager_load, :preload, :select).select(@klass.send(:column_aliases, join_dependency))
+      relation = except(:includes, :eager_load, :preload, :select).select(column_aliases(join_dependency))
       apply_join_dependency(relation, join_dependency)
     end
 
@@ -184,7 +184,7 @@ module ActiveRecord
         relation = association.join_relation(relation)
       end
 
-      limitable_reflections = @klass.send(:using_limitable_reflections?, join_dependency.reflections)
+      limitable_reflections = using_limitable_reflections?(join_dependency.reflections)
 
       if !limitable_reflections && relation.limit_value
         limited_id_condition = construct_limited_ids_condition(relation.except(:select))
@@ -311,5 +311,14 @@ module ActiveRecord
       end
     end
 
+    def column_aliases(join_dependency)
+      join_dependency.joins.collect{|join| join.column_names_with_alias.collect{|column_name, aliased_name|
+          "#{connection.quote_table_name join.aliased_table_name}.#{connection.quote_column_name column_name} AS #{aliased_name}"}}.flatten.join(", ")
+    end
+
+    def using_limitable_reflections?(reflections)
+      reflections.collect(&:collection?).length.zero?
+    end
+
   end
 end
-- 
cgit v1.2.3


From d06a754fdd81a17206c0c404d7d1361200a84b17 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Tue, 23 Mar 2010 12:34:47 -0300
Subject: Remove unused attributes_with_quotes method.

---
 activerecord/lib/active_record/base.rb | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 3d4172f368..367b4ce217 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2053,26 +2053,6 @@ module ActiveRecord #:nodoc:
         default
       end
 
-      # Returns a copy of the attributes hash where all the values have been safely quoted for use in
-      # an SQL statement.
-      def attributes_with_quotes(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
-        quoted = {}
-        connection = self.class.connection
-        attribute_names.each do |name|
-          if (column = column_for_attribute(name)) && (include_primary_key || !column.primary)
-            value = read_attribute(name)
-
-            # We need explicit to_yaml because quote() does not properly convert Time/Date fields to YAML.
-            if value && self.class.serialized_attributes.has_key?(name) && (value.acts_like?(:date) || value.acts_like?(:time))
-              value = value.to_yaml
-            end
-
-            quoted[name] = connection.quote(value, column)
-          end
-        end
-        include_readonly_attributes ? quoted : remove_readonly_attributes(quoted)
-      end
-
       # Returns a copy of the attributes hash where all the values have been safely quoted for use in
       # an Arel insert/update method.
       def arel_attributes_values(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
-- 
cgit v1.2.3


From 5176b28852dc6d0654cdf601d590bddbd6e6da1e Mon Sep 17 00:00:00 2001
From: Rizwan Reza <rizwanreza@gmail.com>
Date: Fri, 26 Mar 2010 13:09:38 +0430
Subject: Better MySQL Error message. [#3775 state:resolved]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 6946701ee5..521bd810d0 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -61,7 +61,7 @@ module ActiveRecord
         begin
           require_library_or_gem('mysql')
         rescue LoadError
-          $stderr.puts '!!! The bundled mysql.rb driver has been removed from Rails 2.2. Please install the mysql gem and try again: gem install mysql.'
+          $stderr.puts '!!! Please install the mysql gem and try again: gem install mysql.'
           raise
         end
       end
-- 
cgit v1.2.3


From 395d6648ce7549f71dd0a76dc061e87f608aaaab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 26 Mar 2010 18:47:55 +0100
Subject: Move application configuration to the application configuration
 object, remove railtie_name and engine_name and allow to set the
 configuration object.

---
 activerecord/lib/active_record/railtie.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index 60addd46c6..de47461c73 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -10,7 +10,7 @@ require "action_controller/railtie"
 
 module ActiveRecord
   class Railtie < Rails::Railtie
-    railtie_name :active_record
+    config.active_record = ActiveSupport::OrderedOptions.new
 
     config.generators.orm :active_record, :migration => true,
                                           :timestamps => true
@@ -19,9 +19,8 @@ module ActiveRecord
       load "active_record/railties/databases.rake"
     end
 
-    # TODO If we require the wrong file, the error never comes up.
     require "active_record/railties/log_subscriber"
-    log_subscriber ActiveRecord::Railties::LogSubscriber.new
+    log_subscriber :active_record, ActiveRecord::Railties::LogSubscriber.new
 
     initializer "active_record.initialize_timezone" do
       ActiveRecord.base_hook do
-- 
cgit v1.2.3