activerecord 3.0.20 → 3.1.0.beta1

data/lib/active_record/validations.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
-  # = Active Record Validations
+  # = Active Record RecordInvalid
   #
   # Raised by <tt>save!</tt> and <tt>create!</tt> when the record is invalid.  Use the
   # +record+ method to retrieve the record which did not validate.
@@ -18,12 +18,19 @@ module ActiveRecord
     end
   end
 
+  # = Active Record Validations
+  #
+  # Active Record includes the majority of its validations from <tt>ActiveModel::Validations</tt>
+  # all of which accept the <tt>:on</tt> argument to define the context where the
+  # validations are active. Active Record will always supply either the context of
+  # <tt>:create</tt> or <tt>:update</tt> dependent on whether the model is a
+  # <tt>new_record?</tt>.
   module Validations
     extend ActiveSupport::Concern
     include ActiveModel::Validations
 
     module ClassMethods
-      # Creates an object just like Base.create but calls save! instead of save
+      # Creates an object just like Base.create but calls <tt>save!</tt> instead of +save+
       # so an exception is raised if the record is invalid.
       def create!(attributes = nil, &block)
         if attributes.is_a?(Array)
@@ -37,45 +44,37 @@ module ActiveRecord
       end
     end
 
-    # The validation process on save can be skipped by passing false. The regular Base#save method is
+    # The validation process on save can be skipped by passing <tt>:validate => false</tt>. The regular Base#save method is
     # replaced with this when the validations module is mixed in, which it is by default.
     def save(options={})
       perform_validations(options) ? super : false
     end
 
-    # Attempts to save the record just like Base#save but will raise a RecordInvalid exception instead of returning false
+    # Attempts to save the record just like Base#save but will raise a +RecordInvalid+ exception instead of returning false
     # if the record is not valid.
     def save!(options={})
       perform_validations(options) ? super : raise(RecordInvalid.new(self))
     end
 
-    # Runs all the specified validations and returns true if no errors were added otherwise false.
+    # Runs all the validations within the specified context. Returns true if no errors are found,
+    # false otherwise.
+    #
+    # If the argument is false (default is +nil+), the context is set to <tt>:create</tt> if
+    # <tt>new_record?</tt> is true, and to <tt>:update</tt> if it is not.
+    #
+    # Validations with no <tt>:on</tt> option will run no matter the context. Validations with
+    # some <tt>:on</tt> option will only run in the specified context.
     def valid?(context = nil)
       context ||= (new_record? ? :create : :update)
       output = super(context)
-
-      deprecated_callback_method(:validate)
-      deprecated_callback_method(:"validate_on_#{context}")
-
       errors.empty? && output
     end
 
   protected
 
     def perform_validations(options={})
-      perform_validation = case options
-      when Hash
-        options[:validate] != false
-      else
-        ActiveSupport::Deprecation.warn "save(#{options}) is deprecated, please give save(:validate => #{options}) instead", caller
-        options
-      end
-
-      if perform_validation
-        valid?(options.is_a?(Hash) ? options[:context] : nil)
-      else
-        true
-      end
+      perform_validation = options[:validate] != false
+      perform_validation ? valid?(options[:context]) : true
     end
   end
 end

data/lib/active_record/validations/associated.rb

@@ -33,7 +33,9 @@ module ActiveRecord
       #
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "is invalid")
-      # * <tt>:on</tt> - Specifies when this validation is active (default is <tt>:save</tt>, other options <tt>:create</tt>, <tt>:update</tt>).
+      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
+      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+      #   and <tt>:update</tt>.
       # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
       #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).  The
       #   method, proc or string should return or evaluate to a true or false value.

data/lib/active_record/validations/uniqueness.rb

@@ -14,29 +14,23 @@ module ActiveRecord
 
       def validate_each(record, attribute, value)
         finder_class = find_finder_class_for(record)
-        table = finder_class.unscoped
+        table = finder_class.arel_table
 
-        table_name   = record.class.quoted_table_name
+        coder = record.class.serialized_attributes[attribute.to_s]
 
-        if value && record.class.serialized_attributes.key?(attribute.to_s)
-          value = YAML.dump value
+        if value && coder
+          value = coder.dump value
         end
 
-        sql, params  = mount_sql_and_params(finder_class, table_name, attribute, value)
-
-        relation = table.where(sql, *params)
+        relation = build_relation(finder_class, table, attribute, value)
+        relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.send(:id))) if record.persisted?
 
         Array.wrap(options[:scope]).each do |scope_item|
           scope_value = record.send(scope_item)
-          relation = relation.where(scope_item => scope_value)
-        end
-
-        unless record.new_record?
-          # TODO : This should be in Arel
-          relation = relation.where("#{record.class.quoted_table_name}.#{record.class.primary_key} <> ?", record.send(:id))
+          relation = relation.and(table[scope_item].eq(scope_value))
         end
 
-        if relation.exists?
+        if finder_class.unscoped.where(relation).exists?
           record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
         end
       end
@@ -58,27 +52,19 @@ module ActiveRecord
         class_hierarchy.detect { |klass| !klass.abstract_class? }
       end
 
-      def mount_sql_and_params(klass, table_name, attribute, value) #:nodoc:
+      def build_relation(klass, table, attribute, value) #:nodoc:
         column = klass.columns_hash[attribute.to_s]
+        value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s if column.text?
 
-        operator = if value.nil?
-          "IS ?"
-        elsif column.text?
-          value = column.limit ? value.to_s.mb_chars[0, column.limit] : value.to_s
-          "#{klass.connection.case_sensitive_equality_operator} ?"
-        else
-          "= ?"
-        end
-
-        sql_attribute = "#{table_name}.#{klass.connection.quote_column_name(attribute)}"
-
-        if value.nil? || (options[:case_sensitive] || !column.text?)
-          sql = "#{sql_attribute} #{operator}"
+        if !options[:case_sensitive] && value && column.text?
+          # will use SQL LOWER function before comparison
+          relation = table[attribute].lower.eq(table.lower(value))
         else
-          sql = "LOWER(#{sql_attribute}) = LOWER(?)"
+          value    = klass.connection.case_sensitive_modifier(value)
+          relation = table[attribute].eq(value)
         end
 
-        [sql, [value]]
+        relation
       end
     end
 
@@ -88,11 +74,16 @@ module ActiveRecord
       # can be named "davidhh".
       #
       #   class Person < ActiveRecord::Base
-      #     validates_uniqueness_of :user_name, :scope => :account_id
+      #     validates_uniqueness_of :user_name
       #   end
       #
-      # It can also validate whether the value of the specified attributes are unique based on multiple
-      # scope parameters.  For example, making sure that a teacher can only be on the schedule once
+      # It can also validate whether the value of the specified attributes are unique based on a scope parameter:
+      #
+      #   class Person < ActiveRecord::Base
+      #     validates_uniqueness_of :user_name, :scope => :account_id
+      #   end 
+      #
+      # Or even multiple scope parameters.  For example, making sure that a teacher can only be on the schedule once
       # per semester for a particular class.
       #
       #   class TeacherSchedule < ActiveRecord::Base
@@ -154,33 +145,32 @@ module ActiveRecord
       #                                      | # title!
       #
       # This could even happen if you use transactions with the 'serializable'
-      # isolation level. There are several ways to get around this problem:
-      #
-      # - By locking the database table before validating, and unlocking it after
-      #   saving. However, table locking is very expensive, and thus not
-      #   recommended.
-      # - By locking a lock file before validating, and unlocking it after saving.
-      #   This does not work if you've scaled your Rails application across
-      #   multiple web servers (because they cannot share lock files, or cannot
-      #   do that efficiently), and thus not recommended.
-      # - Creating a unique index on the field, by using
-      #   ActiveRecord::ConnectionAdapters::SchemaStatements#add_index. In the
-      #   rare case that a race condition occurs, the database will guarantee
-      #   the field's uniqueness.
+      # isolation level. The best way to work around this problem is to add a unique
+      # index to the database table using
+      # ActiveRecord::ConnectionAdapters::SchemaStatements#add_index. In the
+      # rare case that a race condition occurs, the database will guarantee
+      # the field's uniqueness.
       #
-      #   When the database catches such a duplicate insertion,
-      #   ActiveRecord::Base#save will raise an ActiveRecord::StatementInvalid
-      #   exception. You can either choose to let this error propagate (which
-      #   will result in the default Rails exception page being shown), or you
-      #   can catch it and restart the transaction (e.g. by telling the user
-      #   that the title already exists, and asking him to re-enter the title).
-      #   This technique is also known as optimistic concurrency control:
-      #   http://en.wikipedia.org/wiki/Optimistic_concurrency_control
+      # When the database catches such a duplicate insertion,
+      # ActiveRecord::Base#save will raise an ActiveRecord::StatementInvalid
+      # exception. You can either choose to let this error propagate (which
+      # will result in the default Rails exception page being shown), or you
+      # can catch it and restart the transaction (e.g. by telling the user
+      # that the title already exists, and asking him to re-enter the title).
+      # This technique is also known as optimistic concurrency control:
+      # http://en.wikipedia.org/wiki/Optimistic_concurrency_control
       #
-      #   Active Record currently provides no way to distinguish unique
-      #   index constraint errors from other types of database errors, so you
-      #   will have to parse the (database-specific) exception message to detect
-      #   such a case.
+      # The bundled ActiveRecord::ConnectionAdapters distinguish unique index
+      # constraint errors from other types of database errors by throwing an
+      # ActiveRecord::RecordNotUnique exception.
+      # For other adapters you will have to parse the (database-specific) exception
+      # message to detect such a case.
+      # The following bundled adapters throw the ActiveRecord::RecordNotUnique exception:
+      # * ActiveRecord::ConnectionAdapters::MysqlAdapter
+      # * ActiveRecord::ConnectionAdapters::Mysql2Adapter
+      # * ActiveRecord::ConnectionAdapters::SQLiteAdapter
+      # * ActiveRecord::ConnectionAdapters::SQLite3Adapter
+      # * ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
       #
       def validates_uniqueness_of(*attr_names)
         validates_with UniquenessValidator, _merge_attributes(attr_names)

data/lib/active_record/version.rb

@@ -1,9 +1,9 @@
 module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 0
-    TINY  = 20
-    PRE   = nil
+    MINOR = 1
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/rails/generators/active_record.rb

@@ -14,6 +14,12 @@ module ActiveRecord
       def self.base_root
         File.dirname(__FILE__)
       end
+
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname) #:nodoc:
+        next_migration_number = current_migration_number(dirname) + 1
+        ActiveRecord::Migration.next_migration_number(next_migration_number)
+      end
     end
   end
 end

data/lib/rails/generators/active_record/migration/templates/migration.rb

@@ -1,5 +1,12 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
-  def self.up
+<%- if migration_action == 'add' -%>
+  def change
+<% attributes.each do |attribute| -%>
+    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %>
+<%- end -%>
+  end
+<%- else -%>
+  def up
 <% attributes.each do |attribute| -%>
   <%- if migration_action -%>
     <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end %>
@@ -7,11 +14,12 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <%- end -%>
   end
 
-  def self.down
+  def down
 <% attributes.reverse.each do |attribute| -%>
   <%- if migration_action -%>
     <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end %>
   <%- end -%>
 <%- end -%>
   end
+<%- end -%>
 end

data/lib/rails/generators/active_record/model/model_generator.rb

@@ -10,6 +10,7 @@ module ActiveRecord
       class_option :migration,  :type => :boolean
       class_option :timestamps, :type => :boolean
       class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
+      class_option :indexes,    :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns"
 
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
@@ -21,7 +22,7 @@ module ActiveRecord
       end
 
       def create_module_file
-        return if class_path.empty?
+        return if regular_class_path.empty?
         template 'module.rb', File.join('app/models', "#{class_path.join('/')}.rb") if behavior == :invoke
       end
 

data/lib/rails/generators/active_record/model/templates/migration.rb

@@ -1,5 +1,5 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :<%= table_name %> do |t|
 <% for attribute in attributes -%>
       t.<%= attribute.type %> :<%= attribute.name %>
@@ -8,9 +8,10 @@ class <%= migration_class_name %> < ActiveRecord::Migration
       t.timestamps
 <% end -%>
     end
-  end
-
-  def self.down
-    drop_table :<%= table_name %>
+<% if options[:indexes] -%>
+<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.name %>_id
+<% end -%>
+<% end -%>
   end
 end

data/lib/rails/generators/active_record/model/templates/model.rb

@@ -1,5 +1,7 @@
+<% module_namespacing do -%>
 class <%= class_name %> < <%= parent_class_name.classify %>
 <% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
   belongs_to :<%= attribute.name %>
 <% end -%>
 end
+<% end -%>

data/lib/rails/generators/active_record/model/templates/module.rb

@@ -1,5 +1,7 @@
+<% module_namespacing do -%>
 module <%= class_path.map(&:camelize).join('::') %>
   def self.table_name_prefix
     '<%= class_path.join('_') %>_'
   end
 end
+<% end -%>

data/lib/rails/generators/active_record/observer/templates/observer.rb

@@ -1,2 +1,4 @@
+<% module_namespacing do -%>
 class <%= class_name %>Observer < ActiveRecord::Observer
 end
+<% end -%>

data/lib/rails/generators/active_record/session_migration/session_migration_generator.rb

@@ -1,4 +1,5 @@
 require 'rails/generators/active_record'
+require 'active_support/core_ext/object/inclusion'
 
 module ActiveRecord
   module Generators
@@ -13,7 +14,7 @@ module ActiveRecord
 
         def session_table_name
           current_table_name = ActiveRecord::SessionStore::Session.table_name
-          if ["sessions", "session"].include?(current_table_name)
+          if current_table_name.in?(["sessions", "session"])
             current_table_name = (ActiveRecord::Base.pluralize_table_names ? 'session'.pluralize : 'session')
           end
           current_table_name

data/lib/rails/generators/active_record/session_migration/templates/migration.rb

@@ -1,5 +1,5 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
-  def self.up
+  def up
     create_table :<%= session_table_name %> do |t|
       t.string :session_id, :null => false
       t.text :data
@@ -10,7 +10,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     add_index :<%= session_table_name %>, :updated_at
   end
 
-  def self.down
+  def down
     drop_table :<%= session_table_name %>
   end
 end

metadata

@@ -1,97 +1,114 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: activerecord
-version: !ruby/object:Gem::Version
-  version: 3.0.20
+version: !ruby/object:Gem::Version 
+  prerelease: 6
+  version: 3.1.0.beta1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-05-04 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activemodel
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-- !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.10
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: arel
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.10
-- !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.23
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.23
-description: Databases on Rails. Build a persistent domain model by mapping database
-  tables to Ruby classes. Strong conventions for associations, validations, aggregations,
-  migrations, and testing come baked-in.
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.3.27
+  type: :runtime
+  version_requirements: *id004
+description: Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.
 email: david@loudthinking.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - CHANGELOG
 - README.rdoc
 - examples/associations.png
 - examples/performance.rb
 - examples/simple.rb
 - lib/active_record/aggregations.rb
-- lib/active_record/association_preload.rb
-- lib/active_record/associations/association_collection.rb
-- lib/active_record/associations/association_proxy.rb
+- lib/active_record/associations/alias_tracker.rb
+- lib/active_record/associations/association.rb
+- lib/active_record/associations/association_scope.rb
 - lib/active_record/associations/belongs_to_association.rb
 - lib/active_record/associations/belongs_to_polymorphic_association.rb
+- lib/active_record/associations/builder/association.rb
+- lib/active_record/associations/builder/belongs_to.rb
+- lib/active_record/associations/builder/collection_association.rb
+- lib/active_record/associations/builder/has_and_belongs_to_many.rb
+- lib/active_record/associations/builder/has_many.rb
+- lib/active_record/associations/builder/has_one.rb
+- lib/active_record/associations/builder/singular_association.rb
+- lib/active_record/associations/collection_association.rb
+- lib/active_record/associations/collection_proxy.rb
 - lib/active_record/associations/has_and_belongs_to_many_association.rb
 - lib/active_record/associations/has_many_association.rb
 - lib/active_record/associations/has_many_through_association.rb
 - lib/active_record/associations/has_one_association.rb
 - lib/active_record/associations/has_one_through_association.rb
-- lib/active_record/associations/through_association_scope.rb
+- lib/active_record/associations/join_dependency/join_association.rb
+- lib/active_record/associations/join_dependency/join_base.rb
+- lib/active_record/associations/join_dependency/join_part.rb
+- lib/active_record/associations/join_dependency.rb
+- lib/active_record/associations/join_helper.rb
+- lib/active_record/associations/preloader/association.rb
+- lib/active_record/associations/preloader/belongs_to.rb
+- lib/active_record/associations/preloader/collection_association.rb
+- lib/active_record/associations/preloader/has_and_belongs_to_many.rb
+- lib/active_record/associations/preloader/has_many.rb
+- lib/active_record/associations/preloader/has_many_through.rb
+- lib/active_record/associations/preloader/has_one.rb
+- lib/active_record/associations/preloader/has_one_through.rb
+- lib/active_record/associations/preloader/singular_association.rb
+- lib/active_record/associations/preloader/through_association.rb
+- lib/active_record/associations/preloader.rb
+- lib/active_record/associations/singular_association.rb
+- lib/active_record/associations/through_association.rb
 - lib/active_record/associations.rb
 - lib/active_record/attribute_methods/before_type_cast.rb
 - lib/active_record/attribute_methods/dirty.rb
@@ -104,6 +121,7 @@ files:
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
 - lib/active_record/callbacks.rb
+- lib/active_record/coders/yaml_column.rb
 - lib/active_record/connection_adapters/abstract/connection_pool.rb
 - lib/active_record/connection_adapters/abstract/connection_specification.rb
 - lib/active_record/connection_adapters/abstract/database_limits.rb
@@ -113,6 +131,8 @@ files:
 - lib/active_record/connection_adapters/abstract/schema_definitions.rb
 - lib/active_record/connection_adapters/abstract/schema_statements.rb
 - lib/active_record/connection_adapters/abstract_adapter.rb
+- lib/active_record/connection_adapters/column.rb
+- lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
 - lib/active_record/connection_adapters/postgresql_adapter.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -122,10 +142,12 @@ files:
 - lib/active_record/dynamic_scope_match.rb
 - lib/active_record/errors.rb
 - lib/active_record/fixtures.rb
+- lib/active_record/identity_map.rb
 - lib/active_record/locale/en.yml
 - lib/active_record/locking/optimistic.rb
 - lib/active_record/locking/pessimistic.rb
 - lib/active_record/log_subscriber.rb
+- lib/active_record/migration/command_recorder.rb
 - lib/active_record/migration.rb
 - lib/active_record/named_scope.rb
 - lib/active_record/nested_attributes.rb
@@ -133,6 +155,7 @@ files:
 - lib/active_record/persistence.rb
 - lib/active_record/query_cache.rb
 - lib/active_record/railtie.rb
+- lib/active_record/railties/console_sandbox.rb
 - lib/active_record/railties/controller_runtime.rb
 - lib/active_record/railties/databases.rake
 - lib/active_record/railties/jdbcmysql_error.rb
@@ -144,6 +167,7 @@ files:
 - lib/active_record/relation/query_methods.rb
 - lib/active_record/relation/spawn_methods.rb
 - lib/active_record/relation.rb
+- lib/active_record/result.rb
 - lib/active_record/schema.rb
 - lib/active_record/schema_dumper.rb
 - lib/active_record/serialization.rb
@@ -169,29 +193,34 @@ 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: []
-metadata: {}
+
 post_install_message: 
-rdoc_options:
-- "--main"
+rdoc_options: 
+- --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: activerecord
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
+