activerecord 3.1.0.rc1 → 3.1.0.rc2

data/CHANGELOG

@@ -1,5 +1,13 @@
 *Rails 3.1.0 (unreleased)*
 
+* AR#pluralize_table_names can be used to singularize/pluralize table name of an individual model:
+
+    class User < ActiveRecord::Base
+      self.pluralize_table_names = false
+    end
+
+  Previously this could only be set globally for all models through ActiveRecord::Base.pluralize_table_names. [Guillermo Iguaran]
+
 * Add block setting of attributes to singular associations:
 
     class User < ActiveRecord::Base
@@ -229,19 +237,13 @@
   rails g model post user:belongs_to will generate the following:
 
     class CreatePosts < ActiveRecord::Migration
-      def up
+      def change
         create_table :posts do |t|
           t.belongs_to :user
-
           t.timestamps
         end
-
         add_index :posts, :user_id
       end
-
-      def down
-        drop_table :posts
-      end
     end
 
   [Santiago Pastorino]

data/README.rdoc

@@ -3,7 +3,7 @@
 Active Record connects classes to relational database tables to establish an
 almost zero-configuration persistence layer for applications. The library
 provides a base class that, when subclassed, sets up a mapping between the new
-class and an existing table in the database. In context of an application,
+class and an existing table in the database. In the context of an application,
 these classes are commonly referred to as *models*. Models can also be
 connected to other models; this is done by defining *associations*.
 
@@ -70,7 +70,7 @@ A short rundown of some of the major features:
   {Learn more}[link:classes/ActiveRecord/Validations.html]
 
 
-* Callbacks available for the entire life cycle (instantiation, saving, destroying, validating, etc.)
+* Callbacks available for the entire life cycle (instantiation, saving, destroying, validating, etc.).
 
    class Person < ActiveRecord::Base
      before_destroy :invalidate_payment_plan
@@ -80,7 +80,7 @@ A short rundown of some of the major features:
   {Learn more}[link:classes/ActiveRecord/Callbacks.html]
 
 
-* Observers that react to changes in a model
+* Observers that react to changes in a model.
 
    class CommentObserver < ActiveRecord::Observer
      def after_create(comment) # is called just after Comment#save
@@ -91,7 +91,7 @@ A short rundown of some of the major features:
   {Learn more}[link:classes/ActiveRecord/Observer.html]
 
 
-* Inheritance hierarchies
+* Inheritance hierarchies.
 
    class Company < ActiveRecord::Base; end
    class Firm < Company; end
@@ -101,7 +101,7 @@ A short rundown of some of the major features:
   {Learn more}[link:classes/ActiveRecord/Base.html]
 
 
-* Transactions
+* Transactions.
 
     # Database transaction
     Account.transaction do
@@ -112,7 +112,7 @@ A short rundown of some of the major features:
   {Learn more}[link:classes/ActiveRecord/Transactions/ClassMethods.html]
 
 
-* Reflections on columns, associations, and aggregations
+* Reflections on columns, associations, and aggregations.
 
     reflection = Firm.reflect_on_association(:clients)
     reflection.klass # => Client (class)
@@ -121,7 +121,7 @@ A short rundown of some of the major features:
   {Learn more}[link:classes/ActiveRecord/Reflection/ClassMethods.html]
 
 
-* Database abstraction through simple adapters
+* Database abstraction through simple adapters.
 
     # connect to SQLite3
     ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => "dbfile.sqlite3")
@@ -141,13 +141,13 @@ A short rundown of some of the major features:
   SQLite3[link:classes/ActiveRecord/ConnectionAdapters/SQLite3Adapter.html].
 
 
-* Logging support for Log4r[http://log4r.sourceforge.net] and Logger[http://www.ruby-doc.org/stdlib/libdoc/logger/rdoc]
+* Logging support for Log4r[http://log4r.sourceforge.net] and Logger[http://www.ruby-doc.org/stdlib/libdoc/logger/rdoc].
 
     ActiveRecord::Base.logger = Logger.new(STDOUT)
     ActiveRecord::Base.logger = Log4r::Logger.new("Application Log")
 
 
-* Database agnostic schema management with Migrations
+* Database agnostic schema management with Migrations.
 
     class AddSystemSettings < ActiveRecord::Migration
       def self.up

data/lib/active_record/associations.rb

@@ -458,12 +458,12 @@ module ActiveRecord
     #   end
     #
     # Some extensions can only be made to work with knowledge of the association's internals.
-    # Extensions can access relevant state using the following methods (where 'items' is the
+    # Extensions can access relevant state using the following methods (where +items+ is the
     # name of the association):
     #
-    # * +record.association(:items).owner+ - Returns the object the association is part of.
-    # * +record.association(:items).reflection+ - Returns the reflection object that describes the association.
-    # * +record.association(:items).target+ - Returns the associated object for +belongs_to+ and +has_one+, or
+    # * <tt>record.association(:items).owner</tt> - Returns the object the association is part of.
+    # * <tt>record.association(:items).reflection</tt> - Returns the reflection object that describes the association.
+    # * <tt>record.association(:items).target</tt> - Returns the associated object for +belongs_to+ and +has_one+, or
     #   the collection of associated objects for +has_many+ and +has_and_belongs_to_many+.
     #
     # === Association Join Models

data/lib/active_record/associations/association_scope.rb

@@ -75,10 +75,16 @@ module ActiveRecord
             foreign_key = reflection.active_record_primary_key
           end
 
+          conditions = self.conditions[i]
+
           if reflection == chain.last
             scope = scope.where(table[key].eq(owner[foreign_key]))
 
-            conditions[i].each do |condition|
+            if reflection.type
+              scope = scope.where(table[reflection.type].eq(owner.class.base_class.name))
+            end
+
+            conditions.each do |condition|
               if options[:through] && condition.is_a?(Hash)
                 condition = { table.name => condition }
               end
@@ -87,12 +93,16 @@ module ActiveRecord
             end
           else
             constraint = table[key].eq(foreign_table[foreign_key])
-            join       = join(foreign_table, constraint)
 
-            scope = scope.joins(join)
+            if reflection.type
+              type = chain[i + 1].klass.base_class.name
+              constraint = constraint.and(table[reflection.type].eq(type))
+            end
+
+            scope = scope.joins(join(foreign_table, constraint))
 
-            unless conditions[i].empty?
-              scope = scope.where(sanitize(conditions[i], table))
+            unless conditions.empty?
+              scope = scope.where(sanitize(conditions, table))
             end
           end
         end

data/lib/active_record/associations/collection_association.rb

@@ -104,26 +104,11 @@ module ActiveRecord
       end
 
       def create(attributes = {}, options = {}, &block)
-        unless owner.persisted?
-          raise ActiveRecord::RecordNotSaved, "You cannot call create unless the parent is saved"
-        end
-
-        if attributes.is_a?(Array)
-          attributes.collect { |attr| create(attr, options, &block) }
-        else
-          transaction do
-            add_to_target(build_record(attributes, options)) do |record|
-              yield(record) if block_given?
-              insert_record(record)
-            end
-          end
-        end
+        create_record(attributes, options, &block)
       end
 
-      def create!(attrs = {}, options = {}, &block)
-        record = create(attrs, options, &block)
-        Array.wrap(record).each(&:save!)
-        record
+      def create!(attributes = {}, options = {}, &block)
+        create_record(attributes, options, true, &block)
       end
 
       # Add +records+ to this association.  Returns +self+ so method calls may be chained.
@@ -402,9 +387,13 @@ module ActiveRecord
           return memory    if persisted.empty?
 
           persisted.map! do |record|
-            mem_record = memory.delete(record)
+            # Unfortunately we cannot simply do memory.delete(record) since on 1.8 this returns
+            # record rather than memory.at(memory.index(record)). The behaviour is fixed in 1.9.
+            mem_index = memory.index(record)
+
+            if mem_index
+              mem_record = memory.delete_at(mem_index)
 
-            if mem_record
               (record.attribute_names - mem_record.changes.keys).each do |name|
                 mem_record[name] = record[name]
               end
@@ -418,8 +407,25 @@ module ActiveRecord
           persisted + memory
         end
 
+        def create_record(attributes, options, raise = false, &block)
+          unless owner.persisted?
+            raise ActiveRecord::RecordNotSaved, "You cannot call create unless the parent is saved"
+          end
+
+          if attributes.is_a?(Array)
+            attributes.collect { |attr| create_record(attr, options, raise, &block) }
+          else
+            transaction do
+              add_to_target(build_record(attributes, options)) do |record|
+                yield(record) if block_given?
+                insert_record(record, true, raise)
+              end
+            end
+          end
+        end
+
         # Do the relevant stuff to insert the given record into the association collection.
-        def insert_record(record, validate = true)
+        def insert_record(record, validate = true, raise = false)
           raise NotImplementedError
         end
 
@@ -430,7 +436,6 @@ module ActiveRecord
         def build_record(attributes, options)
           record = reflection.build_association(attributes, options)
           record.assign_attributes(create_scope.except(*record.changed), :without_protection => true)
-          record.assign_attributes(attributes, options)
           record
         end
 

data/lib/active_record/associations/collection_proxy.rb

@@ -56,6 +56,8 @@ module ActiveRecord
         Array.wrap(association.options[:extend]).each { |ext| proxy_extend(ext) }
       end
 
+      alias_method :new, :build
+
       def respond_to?(*args)
         super ||
         (load_target && target.respond_to?(*args)) ||
@@ -116,14 +118,6 @@ module ActiveRecord
         self
       end
 
-      def new(*args, &block)
-        if @association.is_a?(HasManyThroughAssociation)
-          @association.build(*args, &block)
-        else
-          method_missing(:new, *args, &block)
-        end
-      end
-
       def proxy_owner
         ActiveSupport::Deprecation.warn(
           "Calling record.#{@association.reflection.name}.proxy_owner is deprecated. Please use " \

data/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -9,8 +9,14 @@ module ActiveRecord
         super
       end
 
-      def insert_record(record, validate = true)
-        return if record.new_record? && !record.save(:validate => validate)
+      def insert_record(record, validate = true, raise = false)
+        if record.new_record?
+          if raise
+            record.save!(:validate => validate)
+          else
+            return unless record.save(:validate => validate)
+          end
+        end
 
         if options[:insert_sql]
           owner.connection.insert(interpolate(options[:insert_sql], record))

data/lib/active_record/associations/has_many_association.rb

@@ -7,9 +7,14 @@ module ActiveRecord
     # is provided by its child HasManyThroughAssociation.
     class HasManyAssociation < CollectionAssociation #:nodoc:
 
-      def insert_record(record, validate = true)
+      def insert_record(record, validate = true, raise = false)
         set_owner_attributes(record)
-        record.save(:validate => validate)
+
+        if raise
+          record.save!(:validate => validate)
+        else
+          record.save(:validate => validate)
+        end
       end
 
       private

data/lib/active_record/associations/has_many_through_association.rb

@@ -6,8 +6,6 @@ module ActiveRecord
     class HasManyThroughAssociation < HasManyAssociation #:nodoc:
       include ThroughAssociation
 
-      alias_method :new, :build
-
       # Returns the size of the collection by executing a SELECT COUNT(*) query if the collection hasn't been
       # loaded and calling collection.size if it has. If it's more likely than not that the collection does
       # have a size larger than zero, and you need to fetch that collection afterwards, it'll take one fewer
@@ -33,9 +31,16 @@ module ActiveRecord
         super
       end
 
-      def insert_record(record, validate = true)
+      def insert_record(record, validate = true, raise = false)
         ensure_not_nested
-        return if record.new_record? && !record.save(:validate => validate)
+
+        if record.new_record?
+          if raise
+            record.save!(:validate => validate)
+          else
+            return unless record.save(:validate => validate)
+          end
+        end
 
         through_record(record).save!
         update_counter(1)

data/lib/active_record/associations/join_dependency/join_association.rb

@@ -62,6 +62,7 @@ module ActiveRecord
         def join_to(relation)
           tables        = @tables.dup
           foreign_table = parent_table
+          foreign_klass = parent.active_record
 
           # The chain starts with the target table, but we want to end with it here (makes
           # more sense in this context), so we reverse
@@ -91,14 +92,17 @@ module ActiveRecord
 
             constraint = build_constraint(reflection, table, key, foreign_table, foreign_key)
 
-            unless conditions[i].empty?
-              constraint = constraint.and(sanitize(conditions[i], table))
+            conditions = self.conditions[i].dup
+            conditions << { reflection.type => foreign_klass.base_class.name } if reflection.type
+
+            unless conditions.empty?
+              constraint = constraint.and(sanitize(conditions, table))
             end
 
             relation.from(join(table, constraint))
 
             # The current table in this iteration becomes the foreign table in the next
-            foreign_table = table
+            foreign_table, foreign_klass = table, reflection.klass
           end
 
           relation

data/lib/active_record/associations/through_association.rb

@@ -16,7 +16,7 @@ module ActiveRecord
           chain[1..-1].each do |reflection|
             scope = scope.merge(
               reflection.klass.scoped.with_default_scope.
-                except(:select, :create_with)
+                except(:select, :create_with, :includes)
             )
           end
           scope

data/lib/active_record/attribute_methods/primary_key.rb

@@ -48,7 +48,7 @@ module ActiveRecord
         end
 
         attr_accessor :original_primary_key
-        
+
         # Attribute writer for the primary key column
         def primary_key=(value)
           @quoted_primary_key = nil

data/lib/active_record/base.rb

@@ -428,6 +428,10 @@ module ActiveRecord #:nodoc:
     class_attribute :default_scopes, :instance_writer => false
     self.default_scopes = []
 
+    # Boolean flag to prevent infinite recursion when evaluating default scopes
+    class_attribute :apply_default_scope, :instance_writer => false
+    self.apply_default_scope = true
+
     # Returns a hash of all the attributes that have been specified for serialization as
     # keys and their class restriction as values.
     class_attribute :serialized_attributes
@@ -1261,11 +1265,14 @@ MSG
           self.default_scopes = default_scopes + [scope]
         end
 
+        # The apply_default_scope flag is used to prevent an infinite recursion situation where
+        # a default scope references a scope which has a default scope which references a scope...
         def build_default_scope #:nodoc:
+          return unless apply_default_scope
+          self.apply_default_scope = false
+
           if method(:default_scope).owner != Base.singleton_class
-            # Use relation.scoping to ensure we ignore whatever the current value of
-            # self.current_scope may be.
-            relation.scoping { default_scope }
+            default_scope
           elsif default_scopes.any?
             default_scopes.inject(relation) do |default_scope, scope|
               if scope.is_a?(Hash)
@@ -1277,6 +1284,8 @@ MSG
               end
             end
           end
+        ensure
+          self.apply_default_scope = true
         end
 
         # Returns the class type of the record using the current module as a prefix. So descendants of
@@ -1299,7 +1308,6 @@ MSG
               rescue NameError => e
                 # We don't want to swallow NoMethodError < NameError errors
                 raise e unless e.instance_of?(NameError)
-              rescue ArgumentError
               end
             end
 
@@ -1666,7 +1674,7 @@ MSG
       #   user.is_admin?  # => false
       def attributes=(new_attributes, guard_protected_attributes = nil)
         unless guard_protected_attributes.nil?
-          message = "the use of 'guard_protected_attributes' will be removed from the next major release of rails, " +
+          message = "the use of 'guard_protected_attributes' will be removed from the next minor release of rails, " +
                     "if you want to bypass mass-assignment security then look into using assign_attributes"
           ActiveSupport::Deprecation.warn(message)
         end

data/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -103,6 +103,7 @@ module ActiveRecord
 
       # Clears the prepared statements cache.
       def clear_cache!
+        @statements.values.each { |hash| hash[:stmt].close }
         @statements.clear
       end
 

data/lib/active_record/migration.rb

@@ -53,7 +53,7 @@ module ActiveRecord
   #
   # This migration will add a boolean flag to the accounts table and remove it
   # if you're backing out of the migration. It shows how all migrations have
-  # two class methods +up+ and +down+ that describes the transformations
+  # two methods +up+ and +down+ that describes the transformations
   # required to implement or remove the migration. These methods can consist
   # of both the migration specific methods like add_column and remove_column,
   # but may also contain regular Ruby code for generating data needed for the

data/lib/active_record/migration/command_recorder.rb

@@ -50,9 +50,9 @@ module ActiveRecord
 
       [:create_table, :rename_table, :add_column, :remove_column, :rename_index, :rename_column, :add_index, :remove_index, :add_timestamps, :remove_timestamps, :change_column, :change_column_default].each do |method|
         class_eval <<-EOV, __FILE__, __LINE__ + 1
-          def #{method}(*args)
-            record(:"#{method}", args)
-          end
+          def #{method}(*args)          # def create_table(*args)
+            record(:"#{method}", args)  #   record(:create_table, args)
+          end                           # end
         EOV
       end
 

data/lib/active_record/persistence.rb

@@ -33,7 +33,11 @@ module ActiveRecord
     # +save+ returns +false+. See ActiveRecord::Callbacks for further
     # details.
     def save(*)
-      create_or_update
+      begin
+        create_or_update
+      rescue ActiveRecord::RecordInvalid
+        false
+      end
     end
 
     # Saves the model.
@@ -273,7 +277,7 @@ module ActiveRecord
 
         @changed_attributes.except!(*changes.keys)
         primary_key = self.class.primary_key
-        self.class.update_all(changes, { primary_key => self[primary_key] }) == 1
+        self.class.unscoped.update_all(changes, { primary_key => self[primary_key] }) == 1
       end
     end
 

data/lib/active_record/railtie.rb

@@ -29,8 +29,8 @@ module ActiveRecord
     # When loading console, force ActiveRecord::Base to be loaded
     # to avoid cross references when loading a constant for the
     # first time. Also, make it output to STDERR.
-    console do |sandbox|
-      require "active_record/railties/console_sandbox" if sandbox
+    console do |app|
+      require "active_record/railties/console_sandbox" if app.sandbox?
       ActiveRecord::Base.logger = Logger.new(STDERR)
     end
 

data/lib/active_record/reflection.rb

@@ -212,7 +212,7 @@ module ActiveRecord
       end
 
       def type
-        @type ||= "#{options[:as]}_type"
+        @type ||= options[:as] && "#{options[:as]}_type"
       end
 
       def primary_key_column
@@ -280,9 +280,7 @@ module ActiveRecord
       # in the #chain. The inside arrays are simply conditions (and each condition may itself be
       # a hash, array, arel predicate, etc...)
       def conditions
-        conditions = [options[:conditions]].compact
-        conditions << { type => active_record.base_class.name } if options[:as]
-        [conditions]
+        [[options[:conditions]].compact]
       end
 
       alias :source_macro :macro
@@ -378,7 +376,8 @@ module ActiveRecord
     # Holds all the meta-data about a :through association as it was specified
     # in the Active Record class.
     class ThroughReflection < AssociationReflection #:nodoc:
-      delegate :foreign_key, :foreign_type, :association_foreign_key, :active_record_primary_key, :to => :source_reflection
+      delegate :foreign_key, :foreign_type, :association_foreign_key,
+               :active_record_primary_key, :type, :to => :source_reflection
 
       # Gets the source of the through reflection.  It checks both a singularized
       # and pluralized form for <tt>:belongs_to</tt> or <tt>:has_many</tt>.

data/lib/active_record/relation.rb

@@ -6,7 +6,7 @@ module ActiveRecord
     JoinOperation = Struct.new(:relation, :join_class, :on)
     ASSOCIATION_METHODS = [:includes, :eager_load, :preload]
     MULTI_VALUE_METHODS = [:select, :group, :order, :joins, :where, :having, :bind]
-    SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :create_with, :from, :reorder]
+    SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :create_with, :from, :reorder, :reverse_order]
 
     include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches
 
@@ -102,24 +102,30 @@ module ActiveRecord
     def to_a
       return @records if loaded?
 
-      @records = if @readonly_value.nil? && !@klass.locking_enabled?
-        eager_loading? ? find_with_associations : @klass.find_by_sql(arel.to_sql, @bind_values)
-      else
-        IdentityMap.without do
+      default_scoped = with_default_scope
+
+      if default_scoped.equal?(self)
+        @records = if @readonly_value.nil? && !@klass.locking_enabled?
           eager_loading? ? find_with_associations : @klass.find_by_sql(arel.to_sql, @bind_values)
+        else
+          IdentityMap.without do
+            eager_loading? ? find_with_associations : @klass.find_by_sql(arel.to_sql, @bind_values)
+          end
         end
-      end
 
-      preload = @preload_values
-      preload +=  @includes_values unless eager_loading?
-      preload.each do |associations|
-        ActiveRecord::Associations::Preloader.new(@records, associations).run
-      end
+        preload = @preload_values
+        preload +=  @includes_values unless eager_loading?
+        preload.each do |associations|
+          ActiveRecord::Associations::Preloader.new(@records, associations).run
+        end
 
-      # @readonly_value is true only if set explicitly. @implicit_readonly is true if there
-      # are JOINS and no explicit SELECT.
-      readonly = @readonly_value.nil? ? @implicit_readonly : @readonly_value
-      @records.each { |record| record.readonly! } if readonly
+        # @readonly_value is true only if set explicitly. @implicit_readonly is true if there
+        # are JOINS and no explicit SELECT.
+        readonly = @readonly_value.nil? ? @implicit_readonly : @readonly_value
+        @records.each { |record| record.readonly! } if readonly
+      else
+        @records = default_scoped.to_a
+      end
 
       @loaded = true
       @records
@@ -418,9 +424,10 @@ module ActiveRecord
     end
 
     def with_default_scope #:nodoc:
-      if default_scoped?
-        default_scope = @klass.send(:build_default_scope)
-        default_scope ? default_scope.merge(self) : self
+      if default_scoped? && default_scope = klass.send(:build_default_scope)
+        default_scope = default_scope.merge(self)
+        default_scope.default_scoped = false
+        default_scope
       else
         self
       end

data/lib/active_record/relation/calculations.rb

@@ -196,7 +196,7 @@ module ActiveRecord
 
     def execute_simple_calculation(operation, column_name, distinct) #:nodoc:
       # Postgresql doesn't like ORDER BY when there are no GROUP BY
-      relation = reorder(nil)
+      relation = with_default_scope.reorder(nil)
 
       if operation == "count" && (relation.limit_value || relation.offset_value)
         # Shortcut when limit is zero.
@@ -245,7 +245,7 @@ module ActiveRecord
         "#{field} AS #{aliaz}"
       }
 
-      relation = except(:group).group(group.join(','))
+      relation = with_default_scope.except(:group).group(group.join(','))
       relation.select_values = select_values
 
       calculated_data = @klass.connection.select_all(relation.to_sql)

data/lib/active_record/relation/query_methods.rb

@@ -9,7 +9,7 @@ module ActiveRecord
                   :select_values, :group_values, :order_values, :joins_values,
                   :where_values, :having_values, :bind_values,
                   :limit_value, :offset_value, :lock_value, :readonly_value, :create_with_value,
-                  :from_value, :reorder_value
+                  :from_value, :reorder_value, :reverse_order_value
 
     def includes(*args)
       args.reject! {|a| a.blank? }
@@ -158,13 +158,9 @@ module ActiveRecord
     end
 
     def reverse_order
-      order_clause = arel.order_clauses
-
-      order = order_clause.empty? ?
-        "#{table_name}.#{primary_key} DESC" :
-        reverse_sql_order(order_clause).join(', ')
-
-      except(:order).order(Arel.sql(order))
+      relation = clone
+      relation.reverse_order_value = !relation.reverse_order_value
+      relation
     end
 
     def arel
@@ -186,6 +182,7 @@ module ActiveRecord
       arel.group(*@group_values.uniq.reject{|g| g.blank?}) unless @group_values.empty?
 
       order = @reorder_value ? @reorder_value : @order_values
+      order = reverse_sql_order(order) if @reverse_order_value
       arel.order(*order.uniq.reject{|o| o.blank?}) unless order.empty?
 
       build_select(arel, @select_values.uniq)
@@ -306,6 +303,8 @@ module ActiveRecord
     end
 
     def reverse_sql_order(order_query)
+      order_query = ["#{quoted_table_name}.#{quoted_primary_key} ASC"] if order_query.empty?
+
       order_query.join(', ').split(',').collect do |s|
         s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
       end

data/lib/active_record/transactions.rb

@@ -165,7 +165,7 @@ module ActiveRecord
     # writing, the only database that we're aware of that supports true nested
     # transactions, is MS-SQL. Because of this, Active Record emulates nested
     # transactions by using savepoints on MySQL and PostgreSQL. See
-    # http://dev.mysql.com/doc/refman/5.0/en/savepoints.html
+    # http://dev.mysql.com/doc/refman/5.0/en/savepoint.html
     # for more information about savepoints.
     #
     # === Callbacks

data/lib/active_record/version.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
+  hash: 15424097
   prerelease: 6
-  version: 3.1.0.rc1
+  segments: 
+  - 3
+  - 1
+  - 0
+  - rc
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -10,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 -05:00
-default_executable: 
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -21,7 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        hash: 15424097
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 2
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +45,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        hash: 15424097
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 2
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,6 +63,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
   type: :runtime
   version_requirements: *id003
@@ -54,6 +79,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 0
+        - 3
+        - 27
         version: 0.3.27
   type: :runtime
   version_requirements: *id004
@@ -193,7 +223,6 @@ files:
 - lib/rails/generators/active_record/session_migration/session_migration_generator.rb
 - lib/rails/generators/active_record/session_migration/templates/migration.rb
 - lib/rails/generators/active_record.rb
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -208,17 +237,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).