activerecord 3.1.3 → 3.1.4.rc1

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## Rails 3.1.4 (unreleased) ##
+
+*   Fix a custom primary key regression *GH 3987*
+
+    *Jon Leighton*
+
+*   Perf fix (second try): don't load records for `has many :dependent =>
+    :delete_all` *GH 3672*
+
+    *Jon Leighton*
+
+*   Fix accessing `proxy_association` method from an association extension
+    where the calls are chained. *GH #3890*
+
+    (E.g. `post.comments.where(bla).my_proxy_method`)
+
+    *Jon Leighton*
+
+*   Perf fix: MySQL primary key lookup was still slow for very large
+    tables. *GH 3678*
+
+    *Kenny J*
+
+*   Perf fix: If a table has no primary key, don't repeatedly ask the database for it.
+
+    *Julius de Bruijn*
+
 ## Rails 3.1.3 (unreleased) ##
 
 *   Perf fix: If we're deleting all records in an association, don't add a IN(..) clause

data/lib/active_record/associations/builder/has_and_belongs_to_many.rb

@@ -18,7 +18,7 @@ module ActiveRecord::Associations::Builder
         model.send(:include, Module.new {
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def destroy_associations
-              association(#{name.to_sym.inspect}).delete_all
+              association(#{name.to_sym.inspect}).delete_all_on_destroy
               super
             end
           RUBY

data/lib/active_record/associations/builder/has_many.rb

@@ -44,12 +44,18 @@ module ActiveRecord::Associations::Builder
       end
 
       def define_delete_all_dependency_method
+        name = self.name
+        model.send(:define_method, dependency_method_name) do
+          association(name).delete_all_on_destroy
+        end
+      end
+
+      def define_nullify_dependency_method
         name = self.name
         model.send(:define_method, dependency_method_name) do
           send(name).delete_all
         end
       end
-      alias :define_nullify_dependency_method :define_delete_all_dependency_method
 
       def define_restrict_dependency_method
         name = self.name

data/lib/active_record/associations/collection_association.rb

@@ -158,6 +158,13 @@ module ActiveRecord
         end
       end
 
+      # Called when the association is declared as :dependent => :delete_all. This is
+      # an optimised version which avoids loading the records into memory. Not really
+      # for public consumption.
+      def delete_all_on_destroy
+        scoped.delete_all
+      end
+
       # Destroy all the records from this association.
       #
       # See destroy for more info.

data/lib/active_record/associations/collection_proxy.rb

@@ -48,8 +48,7 @@ module ActiveRecord
       delegate :group, :order, :limit, :joins, :where, :preload, :eager_load, :includes, :from,
                :lock, :readonly, :having, :to => :scoped
 
-      delegate :target, :load_target, :loaded?, :scoped,
-               :to => :@association
+      delegate :target, :load_target, :loaded?, :to => :@association
 
       delegate :select, :find, :first, :last,
                :build, :create, :create!,
@@ -69,6 +68,13 @@ module ActiveRecord
         @association
       end
 
+      def scoped
+        association = @association
+        association.scoped.extending do
+          define_method(:proxy_association) { association }
+        end
+      end
+
       def respond_to?(name, include_private = false)
         super ||
         (load_target && target.respond_to?(name, include_private)) ||

data/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -32,6 +32,10 @@ module ActiveRecord
         record
       end
 
+      # ActiveRecord::Relation#delete_all needs to support joins before we can use a
+      # SQL-only implementation.
+      alias delete_all_on_destroy delete_all
+
       private
 
         def count_records

data/lib/active_record/associations/has_many_association.rb

@@ -89,12 +89,8 @@ module ActiveRecord
             records.each { |r| r.destroy }
             update_counter(-records.length) unless inverse_updates_counter_cache?
           else
-            scope = scoped
-
-            unless records == load_target
-              keys  = records.map { |r| r[reflection.association_primary_key] }
-              scope = scoped.where(reflection.association_primary_key => keys)
-            end
+            keys  = records.map { |r| r[reflection.association_primary_key] }
+            scope = scoped.where(reflection.association_primary_key => keys)
 
             if method == :delete_all
               update_counter(-scope.delete_all)

data/lib/active_record/associations/has_many_through_association.rb

@@ -52,6 +52,10 @@ module ActiveRecord
         record
       end
 
+      # ActiveRecord::Relation#delete_all needs to support joins before we can use a
+      # SQL-only implementation.
+      alias delete_all_on_destroy delete_all
+
       private
 
         def through_association

data/lib/active_record/attribute_methods/primary_key.rb

@@ -13,7 +13,8 @@ module ActiveRecord
         # Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the
         # primary_key_prefix_type setting, though.
         def primary_key
-          @primary_key ||= reset_primary_key
+          @primary_key = reset_primary_key unless defined? @primary_key
+          @primary_key
         end
 
         # Returns a quoted version of the primary key name, used to construct SQL statements.
@@ -52,6 +53,8 @@ module ActiveRecord
         def primary_key=(value)
           @quoted_primary_key = nil
           @primary_key = value
+
+          connection_pool.primary_keys[table_name] = @primary_key if connected?
         end
 
         # Sets the name of the primary key column to use to the given value,

data/lib/active_record/base.rb

@@ -2170,18 +2170,18 @@ MSG
     include AutosaveAssociation, NestedAttributes
     include Aggregations, Transactions, Reflection, Serialization
 
-    NilClass.add_whiner(self) if NilClass.respond_to?(:add_whiner)
-
     # Returns the value of the attribute identified by <tt>attr_name</tt> after it has been typecast (for example,
     # "2004-12-12" in a data column is cast to a date object, like Date.new(2004, 12, 12)).
     # (Alias for the protected read_attribute method).
-    alias [] read_attribute
+    def [](attr_name)
+      read_attribute(attr_name)
+    end
 
     # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+.
     # (Alias for the protected write_attribute method).
-    alias []= write_attribute
-
-    public :[], :[]=
+    def []=(attr_name, value)
+      write_attribute(attr_name, value)
+    end
   end
 end
 

data/lib/active_record/connection_adapters/abstract/database_statements.rb

@@ -4,9 +4,11 @@ module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module DatabaseStatements
       # Converts an arel AST to SQL
-      def to_sql(arel)
+      def to_sql(arel, binds = [])
         if arel.respond_to?(:ast)
-          visitor.accept(arel.ast)
+          visitor.accept(arel.ast) do
+            quote(*binds.shift.reverse)
+          end
         else
           arel
         end
@@ -15,7 +17,7 @@ module ActiveRecord
       # Returns an array of record hashes with the column names as keys and
       # column values as values.
       def select_all(arel, name = nil, binds = [])
-        select(to_sql(arel), name, binds)
+        select(to_sql(arel, binds), name, binds)
       end
 
       # Returns a record hash with the column names as keys and column values
@@ -35,7 +37,7 @@ module ActiveRecord
       # Returns an array of the values of the first column in a select:
       #   select_values("SELECT id FROM companies LIMIT 3") => [1,2,3]
       def select_values(arel, name = nil)
-        result = select_rows(to_sql(arel), name)
+        result = select_rows(to_sql(arel, []), name)
         result.map { |v| v[0] }
       end
 
@@ -86,19 +88,19 @@ module ActiveRecord
       # If the next id was calculated in advance (as in Oracle), it should be
       # passed in as +id_value+.
       def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
-        sql, binds = sql_for_insert(to_sql(arel), pk, id_value, sequence_name, binds)
+        sql, binds = sql_for_insert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
         value      = exec_insert(sql, name, binds)
         id_value || last_inserted_id(value)
       end
 
       # Executes the update statement and returns the number of rows affected.
       def update(arel, name = nil, binds = [])
-        exec_update(to_sql(arel), name, binds)
+        exec_update(to_sql(arel, binds), name, binds)
       end
 
       # Executes the delete statement and returns the number of rows affected.
       def delete(arel, name = nil, binds = [])
-        exec_delete(to_sql(arel), name, binds)
+        exec_delete(to_sql(arel, binds), name, binds)
       end
 
       # Checks whether there is currently no transaction active. This is done
@@ -132,7 +134,7 @@ module ActiveRecord
       #
       # In order to get around this problem, #transaction will emulate the effect
       # of nested transactions, by using savepoints:
-      # http://dev.mysql.com/doc/refman/5.0/en/savepoints.html
+      # http://dev.mysql.com/doc/refman/5.0/en/savepoint.html
       # Savepoints are supported by MySQL and PostgreSQL, but not SQLite3.
       #
       # It is safe to call this method if a database transaction is already open,

data/lib/active_record/connection_adapters/abstract/query_cache.rb

@@ -57,7 +57,7 @@ module ActiveRecord
 
       def select_all(arel, name = nil, binds = [])
         if @query_cache_enabled
-          sql = to_sql(arel)
+          sql = to_sql(arel, binds)
           cache_sql(sql, binds) { super(sql, name, binds) }
         else
           super

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -128,7 +128,7 @@ module ActiveRecord
       # Returns a bind substitution value given a +column+ and list of current
       # +binds+
       def substitute_at(column, index)
-        Arel.sql '?'
+        Arel::Nodes::BindParam.new '?'
       end
 
       # REFERENTIAL INTEGRITY ====================================

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
+require 'arel/visitors/bind_visitor'
 
-gem 'mysql2', '~> 0.3.6'
+gem 'mysql2', '~> 0.3.10'
 require 'mysql2'
 
 module ActiveRecord
@@ -129,8 +130,12 @@ module ActiveRecord
         configure_connection
       end
 
+      class BindSubstitution < Arel::Visitors::MySQL # :nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
       def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::MySQL.new(pool)
+        BindSubstitution.new pool
       end
 
       def adapter_name
@@ -189,7 +194,7 @@ module ActiveRecord
       end
 
       def substitute_at(column, index)
-        Arel.sql "\0"
+        Arel::Nodes::BindParam.new "\0"
       end
 
       # REFERENTIAL INTEGRITY ====================================
@@ -297,17 +302,11 @@ module ActiveRecord
       alias :create :insert_sql
 
       def exec_insert(sql, name, binds)
-        binds = binds.dup
-
-        # Pretend to support bind parameters
-        execute sql.gsub("\0") { quote(*binds.shift.reverse) }, name
+        execute to_sql(sql, binds), name
       end
 
       def exec_delete(sql, name, binds)
-        binds = binds.dup
-
-        # Pretend to support bind parameters
-        execute sql.gsub("\0") { quote(*binds.shift.reverse) }, name
+        execute to_sql(sql, binds), name
         @connection.affected_rows
       end
       alias :exec_update :exec_delete
@@ -572,12 +571,15 @@ module ActiveRecord
 
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table)
-        keys = []
-        result = execute("SHOW INDEX FROM #{quote_table_name(table)} WHERE Key_name = 'PRIMARY'", 'SCHEMA')
-        result.each(:symbolize_keys => true, :as => :hash) do |row|
-          keys << row[:Column_name]
+        result = execute("SHOW CREATE TABLE #{quote_table_name(table)}", 'SCHEMA')
+        create_table = result.first[1]
+
+        if create_table.to_s =~ /PRIMARY KEY\s+\((.+)\)/
+          keys = $1.split(",").map { |key| key.gsub(/[`"]/, "") }
+          keys.length == 1 ? [keys.first, nil] : nil
+        else
+          nil
         end
-        keys.length == 1 ? [keys.first, nil] : nil
       end
 
       # Returns just a table's primary key
@@ -675,8 +677,7 @@ module ActiveRecord
         # Returns an array of record hashes with the column names as keys and
         # column values as values.
         def select(sql, name = nil, binds = [])
-          binds = binds.dup
-          exec_query(sql.gsub("\0") { quote(*binds.shift.reverse) }, name).to_a
+          exec_query(sql, name).to_a
         end
 
         def exec_query(sql, name = 'SQL', binds = [])

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/object/blank'
 require 'set'
 require 'active_record/connection_adapters/statement_pool'
+require 'arel/visitors/bind_visitor'
 
 gem 'mysql', '~> 2.8.1'
 require 'mysql'
@@ -228,8 +229,18 @@ module ActiveRecord
         connect
       end
 
+      class BindSubstitution < Arel::Visitors::MySQL # :nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
       def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::MySQL.new(pool)
+        config = pool.spec.config
+
+        if config.fetch(:prepared_statements) { true }
+          Arel::Visitors::MySQL.new pool
+        else
+          BindSubstitution.new pool
+        end
       end
 
       def adapter_name #:nodoc:
@@ -688,7 +699,7 @@ module ActiveRecord
           table, arguments = args.shift, args
           method = :"#{command}_sql"
 
-          if respond_to?(method)
+          if respond_to?(method, true)
             send(method, table, *arguments)
           else
             raise "Unknown method called : #{method}(#{arguments.inspect})"
@@ -755,13 +766,16 @@ module ActiveRecord
 
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table) #:nodoc:
-        keys = []
-        result = execute("SHOW INDEX FROM #{quote_table_name(table)} WHERE Key_name = 'PRIMARY'", 'SCHEMA')
-        result.each_hash do |h|
-          keys << h["Column_name"]
-        end
+        result = execute("SHOW CREATE TABLE #{quote_table_name(table)}", 'SCHEMA')
+        create_table = result.fetch_hash["Create Table"]
         result.free
-        keys.length == 1 ? [keys.first, nil] : nil
+
+        if create_table.to_s =~ /PRIMARY KEY\s+\((.+)\)/
+          keys = $1.split(",").map { |key| key.gsub(/[`"]/, "") }
+          keys.length == 1 ? [keys.first, nil] : nil
+        else
+          nil
+        end
       end
 
       # Returns just a table's primary key

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -2,6 +2,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/object/blank'
 require 'active_record/connection_adapters/statement_pool'
+require 'arel/visitors/bind_visitor'
 
 # Make sure we're using pg high enough for PGResult#values
 gem 'pg', '~> 0.11'
@@ -300,9 +301,16 @@ module ActiveRecord
         end
       end
 
+      class BindSubstitution < Arel::Visitors::PostgreSQL # :nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
       # Initializes and connects a PostgreSQL adapter.
       def initialize(connection, logger, connection_parameters, config)
         super(connection, logger)
+
+        connection_parameters.delete :prepared_statements
+
         @connection_parameters, @config = connection_parameters, config
 
         # @local_tz is initialized as nil to avoid warnings when connect tries to use it
@@ -321,7 +329,12 @@ module ActiveRecord
       end
 
       def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::PostgreSQL.new(pool)
+        config = pool.spec.config
+        if config.fetch(:prepared_statements) { true }
+          Arel::Visitors::PostgreSQL.new pool
+        else
+          BindSubstitution.new pool
+        end
       end
 
       # Clears the prepared statements cache.
@@ -594,7 +607,7 @@ module ActiveRecord
       end
 
       def substitute_at(column, index)
-        Arel.sql("$#{index + 1}")
+        Arel::Nodes::BindParam.new "$#{index + 1}"
       end
 
       def exec_query(sql, name = 'SQL', binds = [])
@@ -873,18 +886,45 @@ module ActiveRecord
       def pk_and_sequence_for(table) #:nodoc:
         # First try looking for a sequence with a dependency on the
         # given table's primary key.
-        result = exec_query(<<-end_sql, 'SCHEMA').rows.first
+        result = query(<<-end_sql, 'PK and serial sequence')[0]
           SELECT attr.attname, seq.relname
-          FROM pg_class seq
-          INNER JOIN pg_depend dep ON seq.oid = dep.objid
-          INNER JOIN pg_attribute attr ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
-          INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
-          WHERE seq.relkind  = 'S'
-            AND cons.contype = 'p'
-            AND dep.refobjid = '#{quote_table_name(table)}'::regclass
+          FROM pg_class      seq,
+               pg_attribute  attr,
+               pg_depend     dep,
+               pg_namespace  name,
+               pg_constraint cons
+          WHERE seq.oid           = dep.objid
+            AND seq.relkind       = 'S'
+            AND attr.attrelid     = dep.refobjid
+            AND attr.attnum       = dep.refobjsubid
+            AND attr.attrelid     = cons.conrelid
+            AND attr.attnum       = cons.conkey[1]
+            AND cons.contype      = 'p'
+            AND dep.refobjid      = '#{quote_table_name(table)}'::regclass
         end_sql
 
-        # [primary_key, sequence]
+        if result.nil? or result.empty?
+          # If that fails, try parsing the primary key's default value.
+          # Support the 7.x and 8.0 nextval('foo'::text) as well as
+          # the 8.1+ nextval('foo'::regclass).
+          result = query(<<-end_sql, 'PK and custom sequence')[0]
+            SELECT attr.attname,
+              CASE
+                WHEN split_part(def.adsrc, '''', 2) ~ '.' THEN
+                  substr(split_part(def.adsrc, '''', 2),
+                         strpos(split_part(def.adsrc, '''', 2), '.')+1)
+                ELSE split_part(def.adsrc, '''', 2)
+              END
+            FROM pg_class       t
+            JOIN pg_attribute   attr ON (t.oid = attrelid)
+            JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
+            JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
+            WHERE t.oid = '#{quote_table_name(table)}'::regclass
+              AND cons.contype = 'p'
+              AND def.adsrc ~* 'nextval'
+          end_sql
+        end
+
         [result.first, result.last]
       rescue
         nil

data/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -2,6 +2,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_support/core_ext/kernel/requires'
 require 'active_record/connection_adapters/statement_pool'
 require 'active_support/core_ext/string/encoding'
+require 'arel/visitors/bind_visitor'
 
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
@@ -85,6 +86,10 @@ module ActiveRecord
         end
       end
 
+      class BindSubstitution < Arel::Visitors::SQLite # :nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
       def initialize(connection, logger, config)
         super(connection, logger)
         @statements = StatementPool.new(@connection,
@@ -93,7 +98,13 @@ module ActiveRecord
       end
 
       def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::SQLite.new(pool)
+        config = pool.spec.config
+
+        if config.fetch(:prepared_statements) { true }
+          Arel::Visitors::SQLite.new pool
+        else
+          BindSubstitution.new pool
+        end
       end
 
       def adapter_name #:nodoc:

data/lib/active_record/named_scope.rb

@@ -176,7 +176,7 @@ module ActiveRecord
         extension = Module.new(&Proc.new) if block_given?
 
         scope_proc = lambda do |*args|
-          options = scope_options.respond_to?(:call) ? scope_options.call(*args) : scope_options
+          options = scope_options.respond_to?(:call) ? unscoped { scope_options.call(*args) } : scope_options
           options = scoped.apply_finder_options(options) if options.is_a?(Hash)
 
           relation = scoped.merge(options)

data/lib/active_record/relation.rb

@@ -81,6 +81,7 @@ module ActiveRecord
     end
 
     def initialize_copy(other)
+      @bind_values = @bind_values.dup
       reset
     end
 
@@ -394,7 +395,7 @@ module ActiveRecord
     end
 
     def to_sql
-      @to_sql ||= klass.connection.to_sql(arel)
+      @to_sql ||= klass.connection.to_sql(arel, @bind_values.dup)
     end
 
     def where_values_hash

data/lib/active_record/relation/finder_methods.rb

@@ -208,7 +208,7 @@ module ActiveRecord
     def find_with_associations
       join_dependency = construct_join_dependency_for_association_find
       relation = construct_relation_for_association_find(join_dependency)
-      rows = connection.select_all(relation, 'SQL', relation.bind_values)
+      rows = connection.select_all(relation, 'SQL', relation.bind_values.dup)
       join_dependency.instantiate(rows)
     rescue ThrowResult
       []

data/lib/active_record/version.rb

@@ -2,8 +2,8 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 3
-    PRE   = nil
+    TINY  = 4
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 15424071
+  prerelease: 6
   segments: 
   - 3
   - 1
-  - 3
-  version: 3.1.3
+  - 4
+  - rc
+  - 1
+  version: 3.1.4.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,61 +17,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-20 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15424071
         segments: 
         - 3
         - 1
-        - 3
-        version: 3.1.3
-  requirement: *id001
+        - 4
+        - rc
+        - 1
+        version: 3.1.4.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15424071
         segments: 
         - 3
         - 1
-        - 3
-        version: 3.1.3
-  requirement: *id002
+        - 4
+        - rc
+        - 1
+        version: 3.1.4.rc1
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: arel
-  type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 1
         segments: 
         - 2
         - 2
-        - 1
-        version: 2.2.1
-  requirement: *id003
+        - 3
+        version: 2.2.3
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,7 +85,8 @@ dependencies:
         - 3
         - 29
         version: 0.3.29
-  requirement: *id004
+  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: []
@@ -93,132 +99,132 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
+- examples/associations.png
 - examples/performance.rb
 - examples/simple.rb
-- examples/associations.png
-- lib/active_record/locale/en.yml
+- lib/active_record/aggregations.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/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/coders/yaml_column.rb
-- lib/active_record/relation.rb
-- lib/active_record/migration.rb
-- lib/active_record/railties/jdbcmysql_error.rb
-- lib/active_record/railties/console_sandbox.rb
-- lib/active_record/railties/databases.rake
-- lib/active_record/railties/controller_runtime.rb
-- lib/active_record/nested_attributes.rb
-- lib/active_record/dynamic_finder_match.rb
-- lib/active_record/attribute_methods.rb
-- lib/active_record/relation/spawn_methods.rb
-- lib/active_record/relation/predicate_builder.rb
-- lib/active_record/relation/batches.rb
-- lib/active_record/relation/calculations.rb
-- lib/active_record/relation/finder_methods.rb
-- lib/active_record/relation/query_methods.rb
-- lib/active_record/schema.rb
-- lib/active_record/named_scope.rb
-- lib/active_record/schema_dumper.rb
-- lib/active_record/migration/command_recorder.rb
-- lib/active_record/errors.rb
-- lib/active_record/test_case.rb
-- lib/active_record/fixtures.rb
+- lib/active_record/attribute_methods/before_type_cast.rb
 - lib/active_record/attribute_methods/dirty.rb
 - lib/active_record/attribute_methods/primary_key.rb
-- lib/active_record/attribute_methods/time_zone_conversion.rb
 - lib/active_record/attribute_methods/query.rb
-- lib/active_record/attribute_methods/write.rb
 - lib/active_record/attribute_methods/read.rb
-- lib/active_record/attribute_methods/before_type_cast.rb
-- lib/active_record/aggregations.rb
-- lib/active_record/locking/pessimistic.rb
-- lib/active_record/locking/optimistic.rb
-- lib/active_record/observer.rb
-- lib/active_record/log_subscriber.rb
-- lib/active_record/reflection.rb
-- lib/active_record/counter_cache.rb
-- lib/active_record/version.rb
-- lib/active_record/transactions.rb
-- lib/active_record/serialization.rb
-- lib/active_record/timestamp.rb
-- lib/active_record/railtie.rb
-- lib/active_record/session_store.rb
-- lib/active_record/persistence.rb
-- lib/active_record/result.rb
-- lib/active_record/validations.rb
-- lib/active_record/callbacks.rb
+- lib/active_record/attribute_methods/time_zone_conversion.rb
+- lib/active_record/attribute_methods/write.rb
+- lib/active_record/attribute_methods.rb
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
-- lib/active_record/connection_adapters/statement_pool.rb
-- lib/active_record/connection_adapters/postgresql_adapter.rb
-- lib/active_record/connection_adapters/abstract/quoting.rb
-- lib/active_record/connection_adapters/abstract/schema_statements.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
-- lib/active_record/connection_adapters/abstract/schema_definitions.rb
 - lib/active_record/connection_adapters/abstract/database_statements.rb
-- lib/active_record/connection_adapters/abstract/connection_specification.rb
-- lib/active_record/connection_adapters/abstract/connection_pool.rb
 - lib/active_record/connection_adapters/abstract/query_cache.rb
+- lib/active_record/connection_adapters/abstract/quoting.rb
+- 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/sqlite3_adapter.rb
-- lib/active_record/connection_adapters/mysql_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
 - lib/active_record/connection_adapters/sqlite_adapter.rb
-- lib/active_record/identity_map.rb
+- lib/active_record/connection_adapters/statement_pool.rb
+- lib/active_record/counter_cache.rb
+- lib/active_record/dynamic_finder_match.rb
 - lib/active_record/dynamic_scope_match.rb
-- lib/active_record/validations/uniqueness.rb
-- lib/active_record/validations/associated.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
+- lib/active_record/observer.rb
+- 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
+- lib/active_record/reflection.rb
+- lib/active_record/relation/batches.rb
+- lib/active_record/relation/calculations.rb
+- lib/active_record/relation/finder_methods.rb
+- lib/active_record/relation/predicate_builder.rb
+- 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
 - lib/active_record/serializers/xml_serializer.rb
-- lib/active_record/associations/association_scope.rb
-- lib/active_record/associations/has_many_through_association.rb
-- lib/active_record/associations/belongs_to_polymorphic_association.rb
-- lib/active_record/associations/belongs_to_association.rb
-- lib/active_record/associations/has_one_through_association.rb
-- lib/active_record/associations/singular_association.rb
-- lib/active_record/associations/preloader/has_one.rb
-- lib/active_record/associations/preloader/has_many_through.rb
-- lib/active_record/associations/preloader/has_many.rb
-- lib/active_record/associations/preloader/singular_association.rb
-- lib/active_record/associations/preloader/collection_association.rb
-- lib/active_record/associations/preloader/through_association.rb
-- lib/active_record/associations/preloader/association.rb
-- lib/active_record/associations/preloader/belongs_to.rb
-- lib/active_record/associations/preloader/has_and_belongs_to_many.rb
-- lib/active_record/associations/preloader/has_one_through.rb
-- lib/active_record/associations/preloader.rb
-- lib/active_record/associations/join_helper.rb
-- lib/active_record/associations/has_many_association.rb
-- lib/active_record/associations/has_and_belongs_to_many_association.rb
-- lib/active_record/associations/has_one_association.rb
-- lib/active_record/associations/collection_association.rb
-- lib/active_record/associations/join_dependency.rb
-- lib/active_record/associations/alias_tracker.rb
-- lib/active_record/associations/through_association.rb
-- lib/active_record/associations/association.rb
-- lib/active_record/associations/join_dependency/join_association.rb
-- lib/active_record/associations/join_dependency/join_part.rb
-- lib/active_record/associations/join_dependency/join_base.rb
-- lib/active_record/associations/collection_proxy.rb
-- lib/active_record/associations/builder/has_one.rb
-- lib/active_record/associations/builder/has_many.rb
-- lib/active_record/associations/builder/singular_association.rb
-- lib/active_record/associations/builder/collection_association.rb
-- lib/active_record/associations/builder/association.rb
-- lib/active_record/associations/builder/belongs_to.rb
-- lib/active_record/associations/builder/has_and_belongs_to_many.rb
-- lib/rails/generators/active_record/migration.rb
-- lib/rails/generators/active_record/session_migration/session_migration_generator.rb
-- lib/rails/generators/active_record/session_migration/templates/migration.rb
+- lib/active_record/session_store.rb
+- lib/active_record/test_case.rb
+- lib/active_record/timestamp.rb
+- lib/active_record/transactions.rb
+- lib/active_record/validations/associated.rb
+- lib/active_record/validations/uniqueness.rb
+- lib/active_record/validations.rb
+- lib/active_record/version.rb
+- lib/active_record.rb
 - lib/rails/generators/active_record/migration/migration_generator.rb
 - lib/rails/generators/active_record/migration/templates/migration.rb
+- lib/rails/generators/active_record/migration.rb
 - lib/rails/generators/active_record/model/model_generator.rb
 - lib/rails/generators/active_record/model/templates/migration.rb
-- lib/rails/generators/active_record/model/templates/module.rb
 - lib/rails/generators/active_record/model/templates/model.rb
-- lib/rails/generators/active_record/observer/templates/observer.rb
+- lib/rails/generators/active_record/model/templates/module.rb
 - lib/rails/generators/active_record/observer/observer_generator.rb
+- lib/rails/generators/active_record/observer/templates/observer.rb
+- 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
-- lib/active_record.rb
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -242,16 +248,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).