activerecord 3.1.0.rc4 → 3.1.0.rc5

data/lib/active_record/relation.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/module/delegation'
 
 module ActiveRecord
   # = Active Record Relation
@@ -6,7 +7,7 @@ module ActiveRecord
     JoinOperation = Struct.new(:relation, :join_class, :on)
     ASSOCIATION_METHODS = [:includes, :eager_load, :preload]
     MULTI_VALUE_METHODS = [:select, :group, :order, :joins, :where, :having, :bind]
-    SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :create_with, :from, :reorder, :reverse_order]
+    SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :from, :reorder, :reverse_order]
 
     include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches
 
@@ -29,6 +30,7 @@ module ActiveRecord
       SINGLE_VALUE_METHODS.each {|v| instance_variable_set(:"@#{v}_value", nil)}
       (ASSOCIATION_METHODS + MULTI_VALUE_METHODS).each {|v| instance_variable_set(:"@#{v}_values", [])}
       @extensions = []
+      @create_with_value = {}
     end
 
     def insert(values)
@@ -214,17 +216,13 @@ module ActiveRecord
       if conditions || options.present?
         where(conditions).apply_finder_options(options.slice(:limit, :order)).update_all(updates)
       else
-        limit = nil
-        order = []
-        # Apply limit and order only if they're both present
-        if @limit_value.present? == @order_values.present?
-          limit = arel.limit
-          order = arel.orders
+        stmt = arel.compile_update(Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates)))
+
+        if limit = arel.limit
+          stmt.take limit
         end
 
-        stmt = arel.compile_update(Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates)))
-        stmt.take limit if limit
-        stmt.order(*order)
+        stmt.order(*arel.orders)
         stmt.key = table[primary_key]
         @klass.connection.update stmt.to_sql, 'SQL', bind_values
       end
@@ -403,11 +401,21 @@ module ActiveRecord
     end
 
     def scope_for_create
-      @scope_for_create ||= where_values_hash.merge(@create_with_value || {})
+      @scope_for_create ||= where_values_hash.merge(create_with_value)
     end
 
     def eager_loading?
-      @should_eager_load ||= (@eager_load_values.any? || (@includes_values.any? && references_eager_loaded_tables?))
+      @should_eager_load ||=
+        @eager_load_values.any? ||
+        @includes_values.any? && (joined_includes_values.any? || references_eager_loaded_tables?)
+    end
+
+    # Joins that are also marked for preloading. In which case we should just eager load them.
+    # Note that this is a naive implementation because we could have strings and symbols which
+    # represent the same association, but that aren't matched by this. Also, we could have
+    # nested hashes which partially match, e.g. { :a => :b } & { :a => [:b, :c] }
+    def joined_includes_values
+      @includes_values & @joins_values
     end
 
     def ==(other)

data/lib/active_record/relation/batches.rb

@@ -20,8 +20,6 @@ module ActiveRecord
       find_in_batches(options) do |records|
         records.each { |record| yield record }
       end
-
-      self
     end
 
     # Yields each batch of records that was found by the find +options+ as

data/lib/active_record/relation/calculations.rb

@@ -146,10 +146,16 @@ module ActiveRecord
       if options.except(:distinct).present?
         apply_finder_options(options.except(:distinct)).calculate(operation, column_name, :distinct => options[:distinct])
       else
-        if eager_loading? || (includes_values.present? && references_eager_loaded_tables?)
-          construct_relation_for_association_calculations.calculate(operation, column_name, options)
+        relation = with_default_scope
+
+        if relation.equal?(self)
+          if eager_loading? || (includes_values.present? && references_eager_loaded_tables?)
+            construct_relation_for_association_calculations.calculate(operation, column_name, options)
+          else
+            perform_calculation(operation, column_name, options)
+          end
         else
-          perform_calculation(operation, column_name, options)
+          relation.calculate(operation, column_name, options)
         end
       end
     rescue ThrowResult
@@ -196,7 +202,7 @@ module ActiveRecord
 
     def execute_simple_calculation(operation, column_name, distinct) #:nodoc:
       # Postgresql doesn't like ORDER BY when there are no GROUP BY
-      relation = with_default_scope.reorder(nil)
+      relation = reorder(nil)
 
       if operation == "count" && (relation.limit_value || relation.offset_value)
         # Shortcut when limit is zero.
@@ -245,7 +251,7 @@ module ActiveRecord
         "#{field} AS #{aliaz}"
       }
 
-      relation = with_default_scope.except(:group).group(group.join(','))
+      relation = except(:group).group(group.join(','))
       relation.select_values = select_values
 
       calculated_data = @klass.connection.select_all(relation.to_sql)

data/lib/active_record/relation/finder_methods.rb

@@ -243,7 +243,7 @@ module ActiveRecord
     end
 
     def construct_limited_ids_condition(relation)
-      orders = relation.order_values
+      orders = relation.order_values.map { |val| val.presence }.compact
       values = @klass.connection.distinct("#{@klass.connection.quote_table_name table_name}.#{primary_key}", orders)
 
       relation = relation.dup

data/lib/active_record/relation/query_methods.rb

@@ -96,11 +96,11 @@ module ActiveRecord
       relation
     end
 
-    def having(*args)
-      return self if args.blank?
+    def having(opts, *rest)
+      return self if opts.blank?
 
       relation = clone
-      relation.having_values += build_where(*args)
+      relation.having_values += build_where(opts, rest)
       relation
     end
 
@@ -137,7 +137,7 @@ module ActiveRecord
 
     def create_with(value)
       relation = clone
-      relation.create_with_value = value && (@create_with_value || {}).merge(value)
+      relation.create_with_value = value ? create_with_value.merge(value) : {}
       relation
     end
 
@@ -305,9 +305,18 @@ module ActiveRecord
     def reverse_sql_order(order_query)
       order_query = ["#{quoted_table_name}.#{quoted_primary_key} ASC"] if order_query.empty?
 
-      order_query.join(', ').split(',').collect do |s|
-        s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
-      end
+      order_query.map do |o|
+        case o
+        when Arel::Nodes::Ascending, Arel::Nodes::Descending
+          o.reverse
+        when String, Symbol
+          o.to_s.split(',').collect do |s|
+            s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
+          end
+        else
+          o
+        end
+      end.flatten
     end
 
     def array_of_strings?(o)

data/lib/active_record/relation/spawn_methods.rb

@@ -55,7 +55,7 @@ module ActiveRecord
 
       merged_relation.lock_value = r.lock_value unless merged_relation.lock_value
 
-      merged_relation = merged_relation.create_with(r.create_with_value) if r.create_with_value
+      merged_relation = merged_relation.create_with(r.create_with_value) unless r.create_with_value.empty?
 
       # Apply scope extension modules
       merged_relation.send :apply_modules, r.extensions

data/lib/active_record/session_store.rb

@@ -181,11 +181,6 @@ module ActiveRecord
     class SqlBypass
       extend ClassMethods
 
-      ##
-      # :singleton-method:
-      # Use the ActiveRecord::Base.connection by default.
-      cattr_accessor :connection
-
       ##
       # :singleton-method:
       # The table name defaults to 'sessions'.
@@ -206,10 +201,19 @@ module ActiveRecord
 
       class << self
         alias :data_column_name :data_column
+        
+        # Use the ActiveRecord::Base.connection by default.
+        attr_writer :connection
+        
+        # Use the ActiveRecord::Base.connection_pool by default.
+        attr_writer :connection_pool
 
-        remove_method :connection
         def connection
-          @@connection ||= ActiveRecord::Base.connection
+          @connection ||= ActiveRecord::Base.connection
+        end
+
+        def connection_pool
+          @connection_pool ||= ActiveRecord::Base.connection_pool
         end
 
         # Look up a session by id and unmarshal its data if found.
@@ -219,6 +223,8 @@ module ActiveRecord
           end
         end
       end
+      
+      delegate :connection, :connection=, :connection_pool, :connection_pool=, :to => self
 
       attr_reader :session_id, :new_record
       alias :new_record? :new_record
@@ -297,8 +303,12 @@ module ActiveRecord
     private
       def get_session(env, sid)
         Base.silence do
-          sid ||= generate_sid
-          session = find_session(sid)
+          unless sid and session = @@session_class.find_by_session_id(sid)
+            # If the sid was nil or if there is no pre-existing session under the sid,
+            # force the generation of a new sid and associate a new session associated with the new sid
+            sid = generate_sid
+            session = @@session_class.new(:session_id => sid, :data => {})
+          end
           env[SESSION_RECORD_KEY] = session
           [sid, session.data]
         end

data/lib/active_record/test_case.rb

@@ -46,7 +46,6 @@ module ActiveRecord
       $queries_executed = []
       yield
     ensure
-      %w{ BEGIN COMMIT }.each { |x| $queries_executed.delete(x) }
       assert_equal num, $queries_executed.size, "#{$queries_executed.size} instead of #{num} queries were executed.#{$queries_executed.size == 0 ? '' : "\nQueries:\n#{$queries_executed.join("\n")}"}"
     end
 

data/lib/active_record/version.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    PRE   = "rc4"
+    PRE   = "rc5"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  hash: 15424109
-  prerelease: 6
+  prerelease: true
   segments: 
   - 3
   - 1
   - 0
-  - rc
-  - 4
-  version: 3.1.0.rc4
+  - rc5
+  version: 3.1.0.rc5
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -17,74 +15,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-07-25 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424109
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 4
-        version: 3.1.0.rc4
+        - rc5
+        version: 3.1.0.rc5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424109
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        - 4
-        version: 3.1.0.rc4
+        - rc5
+        version: 3.1.0.rc5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: arel
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 1
-        - 1
-        version: 2.1.1
+        - 4
+        version: 2.1.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: tzinfo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
         segments: 
         - 0
         - 3
-        - 27
-        version: 0.3.27
+        - 29
+        version: 0.3.29
   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.
@@ -223,6 +212,7 @@ files:
 - 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
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -233,22 +223,18 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -257,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).