activerecord 3.0.7 → 3.0.8.rc1

data/CHANGELOG

@@ -1,3 +1,15 @@
+*Rails 3.0.8 (unreleased)*
+
+* Fix various problems with using :primary_key and :foreign_key options in conjunction with
+  :through associations. [Jon Leighton]
+
+* Correctly handle inner joins on polymorphic relationships.
+
+* Fixed infinity and negative infinity cases in PG date columns.
+
+* Creating records with invalid associations via `create` or `save` will no
+  longer raise exceptions.
+
 *Rails 3.0.7 (April 18, 2011)*
 
 * Destroying records via nested attributes works independent of reject_if LH #6006 [Durran Jordan]
@@ -14,6 +26,10 @@
   cache type-casted values when the column returned from the db contains non-standard chars.
   [Jon Leighton]
 
+* Fix performance bug with attribute accessors which only occurred on Ruby 1.8.7, and ensure we
+  cache type-casted values when the column returned from the db contains non-standard chars.
+  [Jon Leighton]
+
 * Fix a performance regression introduced here 86acbf1cc050c8fa8c74a10c735e467fb6fd7df8
   related to read_attribute method [Stian Grytøyr]
 

data/lib/active_record/association_preload.rb

@@ -85,7 +85,7 @@ module ActiveRecord
       # only one level deep in the +associations+ argument, i.e. it's not passed
       # to the child associations when +associations+ is a Hash.
       def preload_associations(records, associations, preload_options={})
-        records = Array.wrap(records).compact.uniq
+        records = Array.wrap(records).compact
         return if records.empty?
         case associations
         when Array then associations.each {|association| preload_associations(records, association, preload_options)}
@@ -97,6 +97,7 @@ module ActiveRecord
             reflection = reflections[parent]
             parents = records.sum { |record| Array.wrap(record.send(reflection.name)) }
             unless parents.empty?
+              parents = parents.uniq if reflection.macro == :belongs_to
               parents.first.class.preload_associations(parents, child)
             end
           end

data/lib/active_record/associations.rb

@@ -2174,7 +2174,7 @@ module ActiveRecord
                   end
 
                   case source_reflection.macro
-                  when :has_many
+                  when :has_many, :has_one
                     if source_reflection.options[:as]
                       first_key   = "#{source_reflection.options[:as]}_id"
                       second_key  = options[:foreign_key] || primary_key
@@ -2199,7 +2199,7 @@ module ActiveRecord
 
                   [
                     [parent_table[jt_primary_key].eq(join_table[jt_foreign_key]), jt_as_extra, jt_source_extra, jt_sti_extra].reject{|x| x.blank? },
-                    aliased_table[first_key].eq(join_table[second_key])
+                    [aliased_table[first_key].eq(join_table[second_key]), as_extra].reject{ |x| x.blank? }
                   ]
                 elsif reflection.options[:as]
                   id_rel = aliased_table["#{reflection.options[:as]}_id"].eq(parent_table[parent.primary_key])

data/lib/active_record/associations/through_association_scope.rb

@@ -30,14 +30,14 @@ module ActiveRecord
       # Associate attributes pointing to owner, quoted.
       def construct_quoted_owner_attributes(reflection)
         if as = reflection.options[:as]
-          { "#{as}_id" => owner_quoted_id,
+          { "#{as}_id"   => @owner[reflection.active_record_primary_key],
             "#{as}_type" => reflection.klass.quote_value(
               @owner.class.base_class.name.to_s,
               reflection.klass.columns_hash["#{as}_type"]) }
         elsif reflection.macro == :belongs_to
           { reflection.klass.primary_key => @owner.class.quote_value(@owner[reflection.primary_key_name]) }
         else
-          { reflection.primary_key_name => owner_quoted_id }
+          { reflection.primary_key_name => @owner[reflection.active_record_primary_key] }
         end
       end
 
@@ -53,7 +53,8 @@ module ActiveRecord
       def construct_joins(custom_joins = nil)
         polymorphic_join = nil
         if @reflection.source_reflection.macro == :belongs_to
-          reflection_primary_key = @reflection.klass.primary_key
+          reflection_primary_key = @reflection.source_reflection.options[:primary_key] ||
+                                   @reflection.klass.primary_key
           source_primary_key     = @reflection.source_reflection.primary_key_name
           if @reflection.options[:source_type]
             polymorphic_join = "AND %s.%s = %s" % [
@@ -63,7 +64,8 @@ module ActiveRecord
           end
         else
           reflection_primary_key = @reflection.source_reflection.primary_key_name
-          source_primary_key     = @reflection.through_reflection.klass.primary_key
+          source_primary_key     = @reflection.source_reflection.options[:primary_key] ||
+                                   @reflection.through_reflection.klass.primary_key
           if @reflection.source_reflection.options[:as]
             polymorphic_join = "AND %s.%s = %s" % [
               @reflection.quoted_table_name, "#{@reflection.source_reflection.options[:as]}_type",

data/lib/active_record/base.rb

@@ -1,3 +1,8 @@
+begin
+  require 'psych'
+rescue LoadError
+end
+
 require 'yaml'
 require 'set'
 require 'active_support/benchmarkable'

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -43,6 +43,16 @@ module ActiveRecord
       # :stopdoc:
       class << self
         attr_accessor :money_precision
+        def string_to_time(string)
+          return string unless String === string
+
+          case string
+          when 'infinity'  then 1.0 / 0.0
+          when '-infinity' then -1.0 / 0.0
+          else
+            super
+          end
+        end
       end
       # :startdoc:
 
@@ -123,6 +133,14 @@ module ActiveRecord
         # Extracts the value from a PostgreSQL column default definition.
         def self.extract_value_from_default(default)
           case default
+            # This is a performance optimization for Ruby 1.9.2 in development.
+            # If the value is nil, we return nil straight away without checking
+            # the regular expressions. If we check each regular expression,
+            # Regexp#=== will call NilClass#to_str, which will trigger
+            # method_missing (defined by whiny nil in ActiveSupport) which
+            # makes this method very very slow.
+            when NilClass
+              nil
             # Numeric types
             when /\A\(?(-?\d+(\.\d*)?\)?)\z/
               $1
@@ -319,6 +337,9 @@ module ActiveRecord
 
         if value.kind_of?(String) && column.type == :binary
           "'#{escape_bytea(value)}'"
+        elsif Float === value && column.type == :datetime
+          return super unless value.infinite?
+          "'#{value.to_s.downcase}'"
         elsif value.kind_of?(String) && column.sql_type == 'xml'
           "xml '#{quote_string(value)}'"
         elsif value.kind_of?(Numeric) && column.sql_type == 'money'
@@ -975,7 +996,7 @@ module ActiveRecord
         def select(sql, name = nil)
           fields, rows = select_raw(sql, name)
           rows.map do |row|
-            Hash[*fields.zip(row).flatten]
+            Hash[fields.zip(row)]
           end
         end
 

data/lib/active_record/fixtures.rb

@@ -1,4 +1,10 @@
 require 'erb'
+
+begin
+  require 'psych'
+rescue LoadError
+end
+
 require 'yaml'
 require 'csv'
 require 'zlib'

data/lib/active_record/migration.rb

@@ -1,5 +1,7 @@
 require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/class/attribute_accessors'
 
 module ActiveRecord
   # Exception that can be raised to stop migrations from going backwards.

data/lib/active_record/persistence.rb

@@ -36,7 +36,11 @@ module ActiveRecord
     # +save+ returns +false+. See ActiveRecord::Callbacks for further
     # details.
     def save(*)
-      create_or_update
+      begin
+        create_or_update
+      rescue ActiveRecord::RecordInvalid
+        false
+      end
     end
 
     # Saves the model.

data/lib/active_record/test_case.rb

@@ -3,6 +3,13 @@ module ActiveRecord
   #
   # Defines some test assertions to test against SQL queries.
   class TestCase < ActiveSupport::TestCase #:nodoc:
+    # Backport skip to Ruby 1.8.  test/unit doesn't support it, so just
+    # make it a noop.
+    unless instance_methods.map(&:to_s).include?("skip")
+      def skip(message)
+      end
+    end
+
     def assert_date_from_db(expected, actual, message = nil)
       # SybaseAdapter doesn't have a separate column type just for dates,
       # so the time is in the string and incorrectly formatted

data/lib/active_record/version.rb

@@ -2,8 +2,8 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 7
-    PRE   = nil
+    TINY  = 8
+    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: 9
-  prerelease: 
+  hash: 15424055
+  prerelease: 6
   segments: 
   - 3
   - 0
-  - 7
-  version: 3.0.7
+  - 8
+  - rc
+  - 1
+  version: 3.0.8.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-05-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15424055
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        - 8
+        - rc
+        - 1
+        version: 3.0.8.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +45,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15424055
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        - 8
+        - rc
+        - 1
+        version: 3.0.8.rc1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,12 +63,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 27
         segments: 
         - 2
         - 0
-        - 2
-        version: 2.0.2
+        - 10
+        version: 2.0.10
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -206,16 +212,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: activerecord
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).