activerecord 3.2.0 → 3.2.1

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   The threshold for auto EXPLAIN is ignored if there's no logger. *fxn*
+
+*   Call `to_s` on the value passed to `table_name=`, in particular symbols
+    are supported (regression). *Sergey Nartimov*
+
+*   Fix possible race condition when two threads try to define attribute
+    methods for the same class. *Jon Leighton*
+
+
 ## Rails 3.2.0 (January 20, 2012) ##
 
 *   Added a `with_lock` method to ActiveRecord objects, which starts
@@ -60,7 +71,7 @@
 *   Implemented ActiveRecord::Relation#pluck method
 
     Method returns Array of column value from table under ActiveRecord model
-        
+
         Client.pluck(:id)
 
     *Bogdan Gusiev*
@@ -77,7 +88,7 @@
       Post.find(1)
       Post.connection.close
     }.join
-    
+
     Only people who spawn threads in their application code need to worry
     about this change.
 
@@ -176,7 +187,7 @@
     during :reject_if => :all_blank (fixes #2937)
 
     *Aaron Christy*
-    
+
 *   Add ActiveSupport::Cache::NullStore for use in development and testing.
 
     *Brian Durand*

data/lib/active_record/attribute_methods.rb

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/enumerable'
 require 'active_support/deprecation'
-require 'thread'
 
 module ActiveRecord
   # = Active Record Attribute Methods
@@ -39,8 +38,6 @@ module ActiveRecord
       def define_attribute_methods
         # Use a mutex; we don't want two thread simaltaneously trying to define
         # attribute methods.
-        @attribute_methods_mutex ||= Mutex.new
-
         @attribute_methods_mutex.synchronize do
           return if attribute_methods_generated?
           superclass.define_attribute_methods unless self == base_class

data/lib/active_record/base.rb

@@ -5,6 +5,7 @@ end
 
 require 'yaml'
 require 'set'
+require 'thread'
 require 'active_support/benchmarkable'
 require 'active_support/dependencies'
 require 'active_support/descendants_tracker'
@@ -390,12 +391,18 @@ module ActiveRecord #:nodoc:
 
     class << self # Class methods
       def inherited(child_class) #:nodoc:
-        # force attribute methods to be higher in inheritance hierarchy than other generated methods
-        child_class.generated_attribute_methods
-        child_class.generated_feature_methods
+        child_class.initialize_generated_modules
         super
       end
 
+      def initialize_generated_modules #:nodoc:
+        @attribute_methods_mutex = Mutex.new
+
+        # force attribute methods to be higher in inheritance hierarchy than other generated methods
+        generated_attribute_methods
+        generated_feature_methods
+      end
+
       def generated_feature_methods
         @generated_feature_methods ||= begin
           mod = const_set(:GeneratedFeatureMethods, Module.new)

data/lib/active_record/explain.rb

@@ -22,6 +22,8 @@ module ActiveRecord
     # currently collected. A false value indicates collecting is turned
     # off. Otherwise it is an array of queries.
     def logging_query_plan # :nodoc:
+      return yield unless logger
+
       threshold = auto_explain_threshold_in_seconds
       current   = Thread.current
       if threshold && current[:available_queries_for_explain].nil?

data/lib/active_record/model_schema.rb

@@ -119,7 +119,7 @@ module ActiveRecord
       # the documentation for ActiveRecord::Base#table_name.
       def table_name=(value)
         @original_table_name = @table_name if defined?(@table_name)
-        @table_name          = value
+        @table_name          = value && value.to_s
         @quoted_table_name   = nil
         @arel_table          = nil
         @relation            = Relation.new(self, arel_table)

data/lib/active_record/version.rb

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

metadata

@@ -1,242 +1,281 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: activerecord
-version: !ruby/object:Gem::Version
-  version: 3.2.0
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 3
+  - 2
+  - 1
+  version: 3.2.1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-26 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70230647834700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 2
+        - 1
+        version: 3.2.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70230647834700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &70230647834260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 2
+        - 1
+        version: 3.2.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70230647834260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: arel
-  requirement: &70230647833760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70230647833760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: tzinfo
-  requirement: &70230647833280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 3
+        - 29
         version: 0.3.29
   type: :runtime
-  prerelease: false
-  version_requirements: *70230647833280
-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.
+  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.md
 - MIT-LICENSE
 - README.rdoc
 - examples/associations.png
-- examples/performance.rb
 - 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
 - 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/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/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/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/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_helper.rb
+- lib/active_record/associations/join_dependency/join_part.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/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/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/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_through.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/preloader/has_many.rb
+- lib/active_record/associations/has_one_through_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/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/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
-- 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/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/errors.rb
+- lib/active_record/explain.rb
+- lib/active_record/coders/yaml_column.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/callbacks.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/fixtures/file.rb
 - lib/active_record/log_subscriber.rb
 - lib/active_record/migration/command_recorder.rb
-- lib/active_record/migration.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/dynamic_matchers.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/active_record/serializers/xml_serializer.rb
-- lib/active_record/session_store.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/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/active_record/readonly_attributes.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/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/observer/observer_generator.rb
-- lib/rails/generators/active_record/observer/templates/observer.rb
+- lib/rails/generators/active_record/model/templates/migration.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/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
 homepage: http://www.rubyonrails.org
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
+