activerecord 3.0.10 → 3.0.11

data/CHANGELOG

@@ -1,4 +1,16 @@
-* Rails 3.0.10 (unreleased)
+* Rails 3.0.11 (unreleased)
+
+* Exceptions from database adapters should not lose their backtrace.
+
+* Backport "ActiveRecord::Persistence#touch should not use default_scope" (GH #1519)
+
+* Psych errors with poor yaml formatting are proxied. Fixes GH #2645 and
+  GH #2731
+
+* Fix ActiveRecord#exists? when passsed a nil value
+
+
+* Rails 3.0.10  (August 16, 2011)
 
 * Magic encoding comment added to schema.rb files
 
@@ -16,8 +28,12 @@ GH #402.
 * Update `table_exists?` in PG to to always use current search_path or schema
 if explictly set.
 
+
 *Rails 3.0.9 (June 16, 2011)*
 
+*No changes.
+
+
 *Rails 3.0.8 (June 7, 2011)*
 
 * Fix various problems with using :primary_key and :foreign_key options in conjunction with

data/lib/active_record/associations.rb

@@ -1439,7 +1439,7 @@ module ActiveRecord
 
             if association.nil? || force_reload
               association = association_proxy_class.new(self, reflection)
-              retval = force_reload ? reflection.klass.uncached { association.reload } : association.reload
+              retval = force_reload ? reflection.klass.uncached { association.reload } : association.load
               if retval.nil? and association_proxy_class == BelongsToAssociation
                 association_instance_set(reflection.name, nil)
                 return nil

data/lib/active_record/associations/association_proxy.rb

@@ -112,11 +112,16 @@ module ActiveRecord
         @target = nil
       end
 
+      # Loads the \target if not already loaded. Returns +self+ if the \target is present.
+      def load
+        load_target unless loaded?
+        self unless @target.nil?
+      end
+
       # Reloads the \target and returns +self+ on success.
       def reload
         reset
-        load_target
-        self unless @target.nil?
+        load
       end
 
       # Has the \target been already \loaded?

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -204,7 +204,9 @@ module ActiveRecord
         rescue Exception => e
           message = "#{e.class.name}: #{e.message}: #{sql}"
           @logger.debug message if @logger
-          raise translate_exception(e, message)
+          ex = translate_exception(e, message)
+          ex.set_backtrace e.backtrace
+          raise ex
         end
 
         def translate_exception(e, message)

data/lib/active_record/fixtures.rb

@@ -759,10 +759,16 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
       File.basename(@fixture_path).split(".").first
     end
 
+    RESCUE_ERRORS = [ ArgumentError ]
+
+    if defined?(Psych) && defined?(Psych::SyntaxError)
+      RESCUE_ERRORS << Psych::SyntaxError
+    end
+
     def parse_yaml_string(fixture_content)
       YAML::load(erb_render(fixture_content))
-    rescue => error
-      raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{error.class}: #{error}"
+    rescue *RESCUE_ERRORS => error
+      raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{error.class}: #{error}", error.backtrace
     end
 
     def erb_render(fixture_content)

data/lib/active_record/persistence.rb

@@ -242,7 +242,7 @@ module ActiveRecord
 
         @changed_attributes.except!(*changes.keys)
         primary_key = self.class.primary_key
-        self.class.update_all(changes, { primary_key => self[primary_key] }) == 1
+        self.class.unscoped.update_all(changes, { primary_key => self[primary_key] }) == 1
       end
     end
 

data/lib/active_record/railties/databases.rake

@@ -85,7 +85,7 @@ namespace :db do
               "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
             ActiveRecord::Base.establish_connection(config.merge(
                 'database' => nil, 'username' => 'root', 'password' => root_password))
-            ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+            ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
             ActiveRecord::Base.connection.execute grant_statement
             ActiveRecord::Base.establish_connection(config)
           else

data/lib/active_record/relation/finder_methods.rb

@@ -168,7 +168,9 @@ module ActiveRecord
     #   Person.exists?(:name => "David")
     #   Person.exists?(['name LIKE ?', "%#{query}%"])
     #   Person.exists?
-    def exists?(id = nil)
+    def exists?(id = false)
+      return false if id.nil?
+
       id = id.id if ActiveRecord::Base === id
 
       join_dependency = construct_join_dependency_for_association_find

data/lib/active_record/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 3
   - 0
-  - 10
-  version: 3.0.10
+  - 11
+  version: 3.0.11
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,44 +15,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 Z
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 3
         - 0
-        - 10
-        version: 3.0.10
-  type: :runtime
-  version_requirements: *id001
+        - 11
+        version: 3.0.11
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 3
         - 0
-        - 10
-        version: 3.0.10
-  type: :runtime
-  version_requirements: *id002
+        - 11
+        version: 3.0.11
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: arel
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +64,12 @@ dependencies:
         - 0
         - 10
         version: 2.0.10
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: tzinfo
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,8 +80,7 @@ dependencies:
         - 3
         - 23
         version: 0.3.23
-  type: :runtime
-  version_requirements: *id004
+  requirement: *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: []
@@ -92,98 +92,98 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - README.rdoc
-- examples/associations.png
 - examples/performance.rb
 - examples/simple.rb
-- lib/active_record/aggregations.rb
-- lib/active_record/association_preload.rb
-- lib/active_record/associations/association_collection.rb
-- lib/active_record/associations/association_proxy.rb
-- lib/active_record/associations/belongs_to_association.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/has_many_association.rb
-- lib/active_record/associations/has_many_through_association.rb
-- lib/active_record/associations/has_one_association.rb
-- lib/active_record/associations/has_one_through_association.rb
-- lib/active_record/associations/through_association_scope.rb
+- examples/associations.png
+- lib/active_record/locale/en.yml
 - lib/active_record/associations.rb
-- lib/active_record/attribute_methods/before_type_cast.rb
+- lib/active_record/relation.rb
+- lib/active_record/migration.rb
+- lib/active_record/railties/jdbcmysql_error.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/errors.rb
+- lib/active_record/test_case.rb
+- lib/active_record/fixtures.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/time_zone_conversion.rb
+- lib/active_record/attribute_methods/query.rb
 - lib/active_record/attribute_methods/write.rb
-- lib/active_record/attribute_methods.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/validations.rb
+- lib/active_record/callbacks.rb
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
-- lib/active_record/callbacks.rb
-- lib/active_record/connection_adapters/abstract/connection_pool.rb
-- lib/active_record/connection_adapters/abstract/connection_specification.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/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/mysql_adapter.rb
-- lib/active_record/connection_adapters/postgresql_adapter.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/active_record/connection_adapters/mysql_adapter.rb
 - lib/active_record/connection_adapters/sqlite_adapter.rb
-- lib/active_record/counter_cache.rb
-- lib/active_record/dynamic_finder_match.rb
+- lib/active_record/association_preload.rb
 - lib/active_record/dynamic_scope_match.rb
-- lib/active_record/errors.rb
-- lib/active_record/fixtures.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.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/validations/uniqueness.rb
+- lib/active_record/validations/associated.rb
 - lib/active_record/query_cache.rb
-- lib/active_record/railtie.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/schema.rb
-- lib/active_record/schema_dumper.rb
-- lib/active_record/serialization.rb
 - lib/active_record/serializers/xml_serializer.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/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/association_proxy.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/through_association_scope.rb
+- lib/active_record/associations/association_collection.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/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/observer/observer_generator.rb
+- lib/rails/generators/active_record/model/templates/model.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/observer/observer_generator.rb
 - lib/rails/generators/active_record.rb
+- lib/active_record.rb
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activerecord
-rubygems_version: 1.8.8
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).