activerecord 3.2.1 → 3.2.2.rc1

data/lib/active_record/associations/collection_association.rb

@@ -60,7 +60,7 @@ module ActiveRecord
             end
           end
 
-          relation.uniq.pluck(column)
+          relation.pluck(column)
         end
       end
 

data/lib/active_record/associations/collection_proxy.rb

@@ -82,9 +82,8 @@ module ActiveRecord
             proxy_association.send :add_to_target, r
             yield(r) if block_given?
           end
-        end
 
-        if target.respond_to?(method) || (!proxy_association.klass.respond_to?(method) && Class.respond_to?(method))
+        elsif target.respond_to?(method) || (!proxy_association.klass.respond_to?(method) && Class.respond_to?(method))
           if load_target
             if target.respond_to?(method)
               target.send(method, *args, &block)

data/lib/active_record/attribute_methods.rb

@@ -36,6 +36,28 @@ module ActiveRecord
       # Generates all the attribute related methods for columns in the database
       # accessors, mutators and query methods.
       def define_attribute_methods
+        unless defined?(@attribute_methods_mutex)
+          msg = "It looks like something (probably a gem/plugin) is overriding the " \
+                "ActiveRecord::Base.inherited method. It is important that this hook executes so " \
+                "that your models are set up correctly. A workaround has been added to stop this " \
+                "causing an error in 3.2, but future versions will simply not work if the hook is " \
+                "overridden. If you are using Kaminari, please upgrade as it is known to have had " \
+                "this problem.\n\n"
+          msg << "The following may help track down the problem:"
+
+          meth = method(:inherited)
+          if meth.respond_to?(:source_location)
+            msg << " #{meth.source_location.inspect}"
+          else
+            msg << " #{meth.inspect}"
+          end
+          msg << "\n\n"
+
+          ActiveSupport::Deprecation.warn(msg)
+
+          @attribute_methods_mutex = Mutex.new
+        end
+
         # Use a mutex; we don't want two thread simaltaneously trying to define
         # attribute methods.
         @attribute_methods_mutex.synchronize do

data/lib/active_record/attribute_methods/serialization.rb

@@ -88,6 +88,14 @@ module ActiveRecord
           super
         end
       end
+
+      def read_attribute_before_type_cast(attr_name)
+        if serialized_attributes.include?(attr_name)
+          super.unserialized_value
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/active_record/attribute_methods/write.rb

@@ -28,11 +28,14 @@ module ActiveRecord
         @attributes_cache.delete(attr_name)
         column = column_for_attribute(attr_name)
 
-        if column || @attributes.has_key?(attr_name)
-          @attributes[attr_name] = type_cast_attribute_for_write(column, value)
-        else
-          raise ActiveModel::MissingAttributeError, "can't write unknown attribute `#{attr_name}'"
+        unless column || @attributes.has_key?(attr_name)
+          ActiveSupport::Deprecation.warn(
+            "You're trying to create an attribute `#{attr_name}'. Writing arbitrary " \
+            "attributes on a model is deprecated. Please just use `attr_writer` etc."
+          )
         end
+
+        @attributes[attr_name] = type_cast_attribute_for_write(column, value)
       end
       alias_method :raw_write_attribute, :write_attribute
 

data/lib/active_record/base.rb

@@ -531,6 +531,8 @@ module ActiveRecord #:nodoc:
       # The dup method does not preserve the timestamps (created|updated)_(at|on).
       def initialize_dup(other)
         cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
+        self.class.initialize_attributes(cloned_attributes)
+
         cloned_attributes.delete(self.class.primary_key)
 
         @attributes = cloned_attributes

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

@@ -2,9 +2,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
@@ -13,7 +15,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
@@ -33,7 +35,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
 
@@ -84,19 +86,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

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
@@ -69,7 +69,7 @@ module ActiveRecord
           result =
             if @query_cache[sql].key?(binds)
               ActiveSupport::Notifications.instrument("sql.active_record",
-                :sql => sql, :name => "CACHE", :connection_id => object_id)
+                :sql => sql, :binds => binds, :name => "CACHE", :connection_id => object_id)
               @query_cache[sql][binds]
             else
               @query_cache[sql][binds] = yield

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

@@ -426,7 +426,7 @@ module ActiveRecord
           si_table = Base.table_name_prefix + 'schema_info' + Base.table_name_suffix
 
           if table_exists?(si_table)
-            ActiveRecord::Deprecation.warn "Usage of the schema table `#{si_table}` is deprecated. Please switch to using `schema_migrations` table"
+            ActiveSupport::Deprecation.warn "Usage of the schema table `#{si_table}` is deprecated. Please switch to using `schema_migrations` table"
 
             old_version = select_value("SELECT version FROM #{quote_table_name(si_table)}").to_i
             assume_migrated_upto_version(old_version)

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -158,7 +158,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/abstract_mysql_adapter.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/blank'
+require 'arel/visitors/bind_visitor'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -122,12 +123,21 @@ module ActiveRecord
         :boolean     => { :name => "tinyint", :limit => 1 }
       }
 
+      class BindSubstitution < Arel::Visitors::MySQL # :nodoc:
+        include Arel::Visitors::BindVisitor
+      end
+
       # FIXME: Make the first parameter more similar for the two adapters
       def initialize(connection, logger, connection_options, config)
         super(connection, logger)
         @connection_options, @config = connection_options, config
         @quoted_column_names, @quoted_table_names = {}, {}
-        @visitor = Arel::Visitors::MySQL.new self
+
+        if config.fetch(:prepared_statements) { true }
+          @visitor = Arel::Visitors::MySQL.new self
+        else
+          @visitor = BindSubstitution.new self
+        end
       end
 
       def adapter_name #:nodoc:
@@ -427,7 +437,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})"
@@ -505,7 +515,7 @@ module ActiveRecord
         execute_and_free("SHOW CREATE TABLE #{quote_table_name(table)}", 'SCHEMA') do |result|
           create_table = each_hash(result).first[:"Create Table"]
           if create_table.to_s =~ /PRIMARY KEY\s+\((.+)\)/
-            keys = $1.split(",").map { |key| key.gsub(/`/, "") }
+            keys = $1.split(",").map { |key| key.gsub(/[`"]/, "") }
             keys.length == 1 ? [keys.first, nil] : nil
           else
             nil
@@ -541,7 +551,7 @@ module ActiveRecord
         if options.is_a?(Hash) && length = options[:length]
           case length
           when Hash
-            column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name)}
+            column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name) && length[name].present?}
           when Fixnum
             column_names.each {|name| option_strings[name] += "(#{length})"}
           end

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -32,6 +32,7 @@ module ActiveRecord
 
       def initialize(connection, logger, connection_options, config)
         super
+        @visitor = BindSubstitution.new self
         configure_connection
       end
 
@@ -65,10 +66,6 @@ module ActiveRecord
         @connection.escape(string)
       end
 
-      def substitute_at(column, index)
-        Arel.sql "\0"
-      end
-
       # CONNECTION MANAGEMENT ====================================
 
       def active?
@@ -98,7 +95,7 @@ module ActiveRecord
       # DATABASE STATEMENTS ======================================
 
       def explain(arel, binds = [])
-        sql     = "EXPLAIN #{to_sql(arel)}"
+        sql     = "EXPLAIN #{to_sql(arel, binds.dup)}"
         start   = Time.now
         result  = exec_query(sql, 'EXPLAIN', binds)
         elapsed = Time.now - start
@@ -224,8 +221,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 insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
@@ -235,17 +231,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

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -1,6 +1,7 @@
 require 'active_record/connection_adapters/abstract_adapter'
 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'
@@ -303,11 +304,23 @@ 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)
+
+        if config.fetch(:prepared_statements) { true }
+          @visitor = Arel::Visitors::PostgreSQL.new self
+        else
+          @visitor = BindSubstitution.new self
+        end
+
+        connection_parameters.delete :prepared_statements
+
         @connection_parameters, @config = connection_parameters, config
-        @visitor = Arel::Visitors::PostgreSQL.new self
 
         # @local_tz is initialized as nil to avoid warnings when connect tries to use it
         @local_tz = nil
@@ -520,7 +533,7 @@ module ActiveRecord
       # DATABASE STATEMENTS ======================================
 
       def explain(arel, binds = [])
-        sql = "EXPLAIN #{to_sql(arel)}"
+        sql = "EXPLAIN #{to_sql(arel, binds)}"
         ExplainPrettyPrinter.new.pp(exec_query(sql, 'EXPLAIN', binds))
       end
 
@@ -642,7 +655,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 = [])
@@ -932,26 +945,46 @@ 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
-          SELECT attr.attname, ns.nspname, 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]
-          INNER JOIN pg_namespace ns ON seq.relnamespace = ns.oid
-          WHERE seq.relkind  = 'S'
-            AND cons.contype = 'p'
-            AND dep.refobjid = '#{quote_table_name(table)}'::regclass
+        result = query(<<-end_sql, 'PK and serial sequence')[0]
+          SELECT attr.attname, seq.relname
+          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.second ==  'public' then
-          sequence = result.last
-        else
-          sequence = result.second+'.'+result.last
+        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, sequence]
+        [result.first, result.last]
       rescue
         nil
       end

data/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -1,31 +1,17 @@
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/statement_pool'
 require 'active_support/core_ext/string/encoding'
+require 'arel/visitors/bind_visitor'
 
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
     class SQLiteColumn < Column #:nodoc:
       class <<  self
-        def string_to_binary(value)
-          value.gsub(/\0|\%/n) do |b|
-            case b
-              when "\0" then "%00"
-              when "%"  then "%25"
-            end
-          end
-        end
-
         def binary_to_string(value)
           if value.respond_to?(:force_encoding) && value.encoding != Encoding::ASCII_8BIT
             value = value.force_encoding(Encoding::ASCII_8BIT)
           end
-
-          value.gsub(/%00|%25/n) do |b|
-            case b
-              when "%00" then "\0"
-              when "%25" then "%"
-            end
-          end
+          value
         end
       end
     end
@@ -84,12 +70,21 @@ 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,
                                         config.fetch(:statement_limit) { 1000 })
         @config = config
-        @visitor = Arel::Visitors::SQLite.new self
+
+        if config.fetch(:prepared_statements) { true }
+          @visitor = Arel::Visitors::SQLite.new self
+        else
+          @visitor = BindSubstitution.new self
+        end
       end
 
       def adapter_name #:nodoc:
@@ -225,7 +220,7 @@ module ActiveRecord
       # DATABASE STATEMENTS ======================================
 
       def explain(arel, binds = [])
-        sql = "EXPLAIN QUERY PLAN #{to_sql(arel)}"
+        sql = "EXPLAIN QUERY PLAN #{to_sql(arel, binds)}"
         ExplainPrettyPrinter.new.pp(exec_query(sql, 'EXPLAIN', binds))
       end
 

data/lib/active_record/counter_cache.rb

@@ -19,7 +19,7 @@ module ActiveRecord
       counters.each do |association|
         has_many_association = reflect_on_association(association.to_sym)
 
-        expected_name = if has_many_association.options[:as]
+        if has_many_association.options[:as]
           has_many_association.options[:as].to_s.classify
         else
           self.name

data/lib/active_record/dynamic_matchers.rb

@@ -25,7 +25,7 @@ module ActiveRecord
       if match = (DynamicFinderMatch.match(method_id) || DynamicScopeMatch.match(method_id))
         attribute_names = match.attribute_names
         super unless all_attributes_exists?(attribute_names)
-        if arguments.size < attribute_names.size
+        if !(match.is_a?(DynamicFinderMatch) && match.instantiator? && arguments.first.is_a?(Hash)) && arguments.size < attribute_names.size
           method_trace = "#{__FILE__}:#{__LINE__}:in `#{method_id}'"
           backtrace = [method_trace] + caller
           raise ArgumentError, "wrong number of arguments (#{arguments.size} for #{attribute_names.size})", backtrace

data/lib/active_record/explain_subscriber.rb

@@ -11,7 +11,10 @@ module ActiveRecord
 
     # SCHEMA queries cannot be EXPLAINed, also we do not want to run EXPLAIN on
     # our own EXPLAINs now matter how loopingly beautiful that would be.
-    IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN)
+    #
+    # On the other hand, we want to monitor the performance of our real database
+    # queries, not the performance of the access to the query cache.
+    IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE)
     def ignore_payload?(payload)
       payload[:exception] || IGNORED_PAYLOADS.include?(payload[:name])
     end

data/lib/active_record/railties/databases.rake

@@ -163,6 +163,9 @@ db_namespace = namespace :db do
     else
       raise "unknown schema format #{ActiveRecord::Base.schema_format}"
     end
+    # Allow this task to be called as many times as required. An example is the
+    # migrate:redo task, which calls other two internally that depend on this one.
+    db_namespace['_dump'].reenable
   end
 
   namespace :migrate do
@@ -613,7 +616,7 @@ def firebird_db_string(config)
 end
 
 def set_psql_env(config)
-  ENV['PGHOST']     = config['host']          if config['host'] 
+  ENV['PGHOST']     = config['host']          if config['host']
   ENV['PGPORT']     = config['port'].to_s     if config['port']
   ENV['PGPASSWORD'] = config['password'].to_s if config['password']
   ENV['PGUSER']     = config['username'].to_s if config['username']

data/lib/active_record/relation.rb

@@ -77,6 +77,7 @@ module ActiveRecord
     end
 
     def initialize_copy(other)
+      @bind_values = @bind_values.dup
       reset
     end
 
@@ -453,7 +454,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/serializers/xml_serializer.rb

@@ -163,8 +163,9 @@ module ActiveRecord #:nodoc:
     #
     #   class IHaveMyOwnXML < ActiveRecord::Base
     #     def to_xml(options = {})
+    #       require 'builder'
     #       options[:indent] ||= 2
-    #       xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+    #       xml = options[:builder] ||= ::Builder::XmlMarkup.new(:indent => options[:indent])
     #       xml.instruct! unless options[:skip_instruct]
     #       xml.level_one do
     #         xml.tag!(:second_level, 'content')

data/lib/active_record/version.rb

@@ -2,8 +2,8 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 1
-    PRE   = nil
+    TINY  = 2
+    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: 13
-  prerelease: 
+  hash: 15424071
+  prerelease: 6
   segments: 
   - 3
   - 2
+  - 2
+  - rc
   - 1
-  version: 3.2.1
+  version: 3.2.2.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-26 00:00:00 -08:00
-default_executable: 
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -26,12 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 15424071
         segments: 
         - 3
         - 2
+        - 2
+        - rc
         - 1
-        version: 3.2.1
+        version: 3.2.2.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +45,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 15424071
         segments: 
         - 3
         - 2
+        - 2
+        - rc
         - 1
-        version: 3.2.1
+        version: 3.2.2.rc1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +63,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 2
+        version: 3.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -95,152 +100,151 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - examples/associations.png
-- examples/simple.rb
 - examples/performance.rb
-- lib/active_record.rb
-- lib/active_record/nested_attributes.rb
-- lib/active_record/locale/en.yml
-- lib/active_record/model_schema.rb
-- lib/active_record/relation/delegation.rb
-- lib/active_record/relation/spawn_methods.rb
-- lib/active_record/relation/query_methods.rb
-- lib/active_record/relation/finder_methods.rb
-- lib/active_record/relation/batches.rb
-- lib/active_record/relation/calculations.rb
-- lib/active_record/relation/predicate_builder.rb
-- lib/active_record/railtie.rb
-- lib/active_record/autosave_association.rb
-- lib/active_record/result.rb
+- examples/simple.rb
 - lib/active_record/aggregations.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/explain_subscriber.rb
-- lib/active_record/connection_adapters/mysql_adapter.rb
-- lib/active_record/connection_adapters/mysql2_adapter.rb
-- lib/active_record/connection_adapters/abstract/connection_pool.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/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/database_limits.rb
-- lib/active_record/connection_adapters/abstract/query_cache.rb
-- lib/active_record/connection_adapters/abstract_adapter.rb
-- lib/active_record/connection_adapters/column.rb
-- lib/active_record/connection_adapters/abstract_mysql_adapter.rb
-- lib/active_record/connection_adapters/sqlite_adapter.rb
-- lib/active_record/connection_adapters/postgresql_adapter.rb
-- lib/active_record/connection_adapters/statement_pool.rb
-- lib/active_record/connection_adapters/schema_cache.rb
-- lib/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/active_record/scoping/named.rb
-- lib/active_record/scoping/default.rb
-- lib/active_record/reflection.rb
-- lib/active_record/test_case.rb
-- lib/active_record/translation.rb
-- lib/active_record/associations.rb
-- lib/active_record/session_store.rb
-- lib/active_record/dynamic_scope_match.rb
-- lib/active_record/dynamic_finder_match.rb
-- lib/active_record/scoping.rb
-- lib/active_record/attribute_assignment.rb
-- lib/active_record/querying.rb
-- lib/active_record/attribute_methods/before_type_cast.rb
-- lib/active_record/attribute_methods/read.rb
-- lib/active_record/attribute_methods/primary_key.rb
-- lib/active_record/attribute_methods/query.rb
-- lib/active_record/attribute_methods/write.rb
-- lib/active_record/attribute_methods/time_zone_conversion.rb
-- lib/active_record/attribute_methods/dirty.rb
-- lib/active_record/attribute_methods/deprecated_underscore_read.rb
-- lib/active_record/attribute_methods/serialization.rb
-- lib/active_record/sanitization.rb
-- lib/active_record/associations/has_many_through_association.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_one.rb
 - lib/active_record/associations/builder/has_and_belongs_to_many.rb
-- lib/active_record/associations/builder/belongs_to.rb
-- lib/active_record/associations/builder/singular_association.rb
 - lib/active_record/associations/builder/has_many.rb
-- lib/active_record/associations/alias_tracker.rb
-- lib/active_record/associations/association.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/join_helper.rb
-- lib/active_record/associations/join_dependency/join_part.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/singular_association.rb
-- lib/active_record/associations/has_one_association.rb
-- lib/active_record/associations/belongs_to_association.rb
-- lib/active_record/associations/association_scope.rb
-- lib/active_record/associations/has_many_association.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_one.rb
 - lib/active_record/associations/preloader/has_and_belongs_to_many.rb
-- lib/active_record/associations/preloader/belongs_to.rb
-- lib/active_record/associations/preloader/singular_association.rb
-- lib/active_record/associations/preloader/has_one_through.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/has_many.rb
-- lib/active_record/associations/has_one_through_association.rb
-- lib/active_record/associations/through_association.rb
-- lib/active_record/associations/join_dependency.rb
-- lib/active_record/associations/collection_proxy.rb
-- lib/active_record/associations/belongs_to_polymorphic_association.rb
-- lib/active_record/associations/has_and_belongs_to_many_association.rb
 - lib/active_record/associations/preloader.rb
-- lib/active_record/persistence.rb
-- lib/active_record/locking/optimistic.rb
-- lib/active_record/locking/pessimistic.rb
-- lib/active_record/schema.rb
-- lib/active_record/relation.rb
+- lib/active_record/associations/singular_association.rb
+- lib/active_record/associations/through_association.rb
+- lib/active_record/associations.rb
+- lib/active_record/attribute_assignment.rb
+- lib/active_record/attribute_methods/before_type_cast.rb
+- lib/active_record/attribute_methods/deprecated_underscore_read.rb
+- lib/active_record/attribute_methods/dirty.rb
+- lib/active_record/attribute_methods/primary_key.rb
+- lib/active_record/attribute_methods/query.rb
+- lib/active_record/attribute_methods/read.rb
+- lib/active_record/attribute_methods/serialization.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/identity_map.rb
-- lib/active_record/inheritance.rb
-- lib/active_record/errors.rb
-- lib/active_record/explain.rb
-- lib/active_record/coders/yaml_column.rb
-- lib/active_record/integration.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/database_statements.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/abstract_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/schema_cache.rb
+- lib/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/active_record/connection_adapters/sqlite_adapter.rb
+- lib/active_record/connection_adapters/statement_pool.rb
 - lib/active_record/counter_cache.rb
-- lib/active_record/validations.rb
-- lib/active_record/version.rb
-- lib/active_record/timestamp.rb
-- lib/active_record/observer.rb
-- lib/active_record/serializers/xml_serializer.rb
-- lib/active_record/fixtures.rb
-- lib/active_record/validations/associated.rb
-- lib/active_record/validations/uniqueness.rb
+- lib/active_record/dynamic_finder_match.rb
+- lib/active_record/dynamic_matchers.rb
+- lib/active_record/dynamic_scope_match.rb
+- lib/active_record/errors.rb
+- lib/active_record/explain.rb
+- lib/active_record/explain_subscriber.rb
 - lib/active_record/fixtures/file.rb
+- lib/active_record/fixtures.rb
+- lib/active_record/identity_map.rb
+- lib/active_record/inheritance.rb
+- lib/active_record/integration.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/dynamic_matchers.rb
-- lib/active_record/schema_dumper.rb
-- lib/active_record/query_cache.rb
-- lib/active_record/attribute_methods.rb
 - lib/active_record/migration.rb
-- lib/active_record/store.rb
-- lib/active_record/transactions.rb
+- lib/active_record/model_schema.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/querying.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/readonly_attributes.rb
+- lib/active_record/reflection.rb
+- lib/active_record/relation/batches.rb
+- lib/active_record/relation/calculations.rb
+- lib/active_record/relation/delegation.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/sanitization.rb
+- lib/active_record/schema.rb
+- lib/active_record/schema_dumper.rb
+- lib/active_record/scoping/default.rb
+- lib/active_record/scoping/named.rb
+- lib/active_record/scoping.rb
 - lib/active_record/serialization.rb
-- lib/rails/generators/active_record.rb
-- lib/rails/generators/active_record/observer/observer_generator.rb
-- lib/rails/generators/active_record/observer/templates/observer.rb
+- lib/active_record/serializers/xml_serializer.rb
+- lib/active_record/session_store.rb
+- lib/active_record/store.rb
+- lib/active_record/test_case.rb
+- lib/active_record/timestamp.rb
+- lib/active_record/transactions.rb
+- lib/active_record/translation.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/model.rb
 - lib/rails/generators/active_record/model/templates/module.rb
-- lib/rails/generators/active_record/model/templates/migration.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/migration/migration_generator.rb
-- lib/rails/generators/active_record/migration/templates/migration.rb
-- lib/rails/generators/active_record/migration.rb
-has_rdoc: true
+- lib/rails/generators/active_record.rb
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -264,16 +268,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.6.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).