activerecord 3.0.0.beta → 3.0.0.beta2

data/lib/active_record/relation/calculations.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module Calculations
     # Count operates using three different approaches.

data/lib/active_record/relation/finder_methods.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module FinderMethods
     # Find operates with four different retrieval approaches:
@@ -175,7 +177,7 @@ module ActiveRecord
     end
 
     def construct_relation_for_association_find(join_dependency)
-      relation = except(:includes, :eager_load, :preload, :select).select(@klass.send(:column_aliases, join_dependency))
+      relation = except(:includes, :eager_load, :preload, :select).select(column_aliases(join_dependency))
       apply_join_dependency(relation, join_dependency)
     end
 
@@ -184,7 +186,7 @@ module ActiveRecord
         relation = association.join_relation(relation)
       end
 
-      limitable_reflections = @klass.send(:using_limitable_reflections?, join_dependency.reflections)
+      limitable_reflections = using_limitable_reflections?(join_dependency.reflections)
 
       if !limitable_reflections && relation.limit_value
         limited_id_condition = construct_limited_ids_condition(relation.except(:select))
@@ -311,5 +313,14 @@ module ActiveRecord
       end
     end
 
+    def column_aliases(join_dependency)
+      join_dependency.joins.collect{|join| join.column_names_with_alias.collect{|column_name, aliased_name|
+          "#{connection.quote_table_name join.aliased_table_name}.#{connection.quote_column_name column_name} AS #{aliased_name}"}}.flatten.join(", ")
+    end
+
+    def using_limitable_reflections?(reflections)
+      reflections.collect(&:collection?).length.zero?
+    end
+
   end
 end

data/lib/active_record/relation/predicate_builder.rb

@@ -20,19 +20,14 @@ module ActiveRecord
             table = Arel::Table.new(table_name, :engine => @engine)
           end
 
-          attribute = table[column] || Arel::Attribute.new(table, column.to_sym)
+          attribute = table[column]
 
           case value
           when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope
             values = value.to_a
             attribute.in(values)
           when Range
-            # TODO : Arel should handle ranges with excluded end.
-            if value.exclude_end?
-              [attribute.gteq(value.begin), attribute.lt(value.end)]
-            else
-              attribute.in(value)
-            end
+            attribute.in(value)
           else
             attribute.eq(value)
           end

data/lib/active_record/relation/query_methods.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module QueryMethods
     extend ActiveSupport::Concern
@@ -6,9 +8,10 @@ module ActiveRecord
       (ActiveRecord::Relation::ASSOCIATION_METHODS + ActiveRecord::Relation::MULTI_VALUE_METHODS).each do |query_method|
         attr_accessor :"#{query_method}_values"
 
+        next if [:where, :having].include?(query_method)
         class_eval <<-CEVAL
           def #{query_method}(*args)
-            new_relation = spawn
+            new_relation = clone
             value = Array.wrap(args.flatten).reject {|x| x.blank? }
             new_relation.#{query_method}_values += value if value.present?
             new_relation
@@ -19,7 +22,7 @@ module ActiveRecord
       [:where, :having].each do |query_method|
         class_eval <<-CEVAL
           def #{query_method}(*args)
-            new_relation = spawn
+            new_relation = clone
             value = build_where(*args)
             new_relation.#{query_method}_values += [*value] if value.present?
             new_relation
@@ -32,7 +35,7 @@ module ActiveRecord
 
         class_eval <<-CEVAL
           def #{query_method}(value = true)
-            new_relation = spawn
+            new_relation = clone
             new_relation.#{query_method}_value = value
             new_relation
           end
@@ -41,12 +44,12 @@ module ActiveRecord
     end
 
     def lock(locks = true)
-      relation = spawn
+      relation = clone
       case locks
       when String, TrueClass, NilClass
-        spawn.tap {|new_relation| new_relation.lock_value = locks || true }
+        clone.tap {|new_relation| new_relation.lock_value = locks || true }
       else
-        spawn.tap {|new_relation| new_relation.lock_value = false }
+        clone.tap {|new_relation| new_relation.lock_value = false }
       end
     end
 
@@ -133,13 +136,8 @@ module ActiveRecord
         arel = h.is_a?(String) ? arel.having(h) : arel.having(*h)
       end
 
-      if defined?(@limit_value) && @limit_value.present?
-        arel = arel.take(@limit_value)
-      end
-
-      if defined?(@offset_value) && @offset_value.present?
-        arel = arel.skip(@offset_value)
-      end
+      arel = arel.take(@limit_value) if @limit_value.present?
+      arel = arel.skip(@offset_value) if @offset_value.present?
 
       @group_values.uniq.each do |g|
         arel = arel.group(g) if g.present?
@@ -162,19 +160,14 @@ module ActiveRecord
         arel = arel.project(quoted_table_name + '.*')
       end
 
-      arel =
-        if defined?(@from_value) && @from_value.present?
-          arel.from(@from_value)
-        else
-          arel.from(quoted_table_name)
-        end
+      arel = @from_value.present? ? arel.from(@from_value) : arel.from(quoted_table_name)
 
       case @lock_value
       when TrueClass
         arel = arel.lock
       when String
         arel = arel.lock(@lock_value)
-      end
+      end if @lock_value.present?
 
       arel
     end
@@ -184,16 +177,16 @@ module ActiveRecord
 
       builder = PredicateBuilder.new(table.engine)
 
-      conditions = if [String, Array].include?(args.first.class)
-        @klass.send(:sanitize_sql, args.size > 1 ? args : args.first)
-      elsif args.first.is_a?(Hash)
-        attributes = @klass.send(:expand_hash_conditions_for_aggregates, args.first)
+      opts = args.first
+      case opts
+      when String, Array
+        @klass.send(:sanitize_sql, args.size > 1 ? args : opts)
+      when Hash
+        attributes = @klass.send(:expand_hash_conditions_for_aggregates, opts)
         builder.build_from_hash(attributes, table)
       else
-        args.first
+        opts
       end
-
-      conditions
     end
 
     private

data/lib/active_record/relation/spawn_methods.rb

@@ -1,37 +1,19 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module SpawnMethods
-    def spawn
-      clone.reset
-    end
-
     def merge(r)
-      merged_relation = spawn
+      merged_relation = clone
       return merged_relation unless r
 
-      merged_relation = merged_relation.eager_load(r.eager_load_values).preload(r.preload_values).includes(r.includes_values)
-
-      merged_relation.readonly_value = r.readonly_value unless r.readonly_value.nil?
-      merged_relation.limit_value = r.limit_value if r.limit_value.present?
-      merged_relation.lock_value = r.lock_value unless merged_relation.lock_value
-      merged_relation.offset_value = r.offset_value if r.offset_value.present?
-
-      merged_relation = merged_relation.
-        joins(r.joins_values).
-        group(r.group_values).
-        select(r.select_values).
-        from(r.from_value).
-        having(r.having_values)
-
-      merged_relation.order_values = r.order_values if r.order_values.present?
-
-      merged_relation.create_with_value = @create_with_value
-
-      if @create_with_value && r.create_with_value
-        merged_relation.create_with_value = @create_with_value.merge(r.create_with_value)
-      else
-        merged_relation.create_with_value = r.create_with_value || @create_with_value
+      (ActiveRecord::Relation::ASSOCIATION_METHODS + ActiveRecord::Relation::MULTI_VALUE_METHODS).reject {|m| [:joins, :where].include?(m)}.each do |method|
+        unless (value = r.send(:"#{method}_values")).blank?
+          merged_relation.send(:"#{method}_values=", value)
+        end
       end
 
+      merged_relation = merged_relation.joins(r.joins_values)
+
       merged_wheres = @where_values
 
       r.where_values.each do |w|
@@ -44,6 +26,14 @@ module ActiveRecord
 
       merged_relation.where_values = merged_wheres
 
+      ActiveRecord::Relation::SINGLE_VALUE_METHODS.reject {|m| m == :lock}.each do |method|
+        unless (value = r.send(:"#{method}_value")).nil?
+          merged_relation.send(:"#{method}_value=", value)
+        end
+      end
+
+      merged_relation.lock_value = r.lock_value unless merged_relation.lock_value
+
       merged_relation
     end
 
@@ -83,7 +73,7 @@ module ActiveRecord
                            :order, :select, :readonly, :group, :having, :from, :lock ]
 
     def apply_finder_options(options)
-      relation = spawn
+      relation = clone
       return relation unless options
 
       options.assert_valid_keys(VALID_FIND_OPTIONS)

data/lib/active_record/schema.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   # Allows programmers to programmatically define a schema in a portable
   # DSL. This means you can define tables, indexes, etc. without using SQL

data/lib/active_record/validations/uniqueness.rb

@@ -67,13 +67,11 @@ module ActiveRecord
 
         if value.nil? || (options[:case_sensitive] || !column.text?)
           sql = "#{sql_attribute} #{operator}"
-          params = [value]
         else
-          sql = "LOWER(#{sql_attribute}) #{operator}"
-          params = [value.mb_chars.downcase]
+          sql = "LOWER(#{sql_attribute}) = LOWER(?)"
         end
 
-        [sql, params]
+        [sql, [value]]
       end
     end
 

data/lib/active_record/version.rb

@@ -2,8 +2,9 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = "0.beta"
+    TINY  = 0
+    BUILD = "beta2"
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end
 end

data/lib/{generators → rails/generators}/active_record/migration/migration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

data/lib/{generators → rails/generators}/active_record/model/model_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

data/lib/{generators → rails/generators}/active_record/observer/observer_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

data/lib/{generators → rails/generators}/active_record/session_migration/session_migration_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/active_record'
+require 'rails/generators/active_record'
 
 module ActiveRecord
   module Generators

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 3.0.0.beta
+  prerelease: true
+  segments: 
+  - 3
+  - 0
+  - 0
+  - beta2
+  version: 3.0.0.beta2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,40 +15,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -08:00
+date: 2010-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.0.beta
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta2
+        version: 3.0.0.beta2
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.0.beta
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta2
+        version: 3.0.0.beta2
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: arel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
-    version: 
-description: Object-relational mapper framework (part of Rails).
+        segments: 
+        - 0
+        - 3
+        - 3
+        version: 0.3.3
+  type: :runtime
+  version_requirements: *id003
+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: []
 
@@ -79,7 +99,6 @@ files:
 - lib/active_record/attribute_methods.rb
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
-- lib/active_record/batches.rb
 - lib/active_record/callbacks.rb
 - lib/active_record/connection_adapters/abstract/connection_pool.rb
 - lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -95,6 +114,7 @@ files:
 - lib/active_record/connection_adapters/sqlite_adapter.rb
 - lib/active_record/dynamic_finder_match.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
@@ -107,8 +127,9 @@ files:
 - lib/active_record/railtie.rb
 - lib/active_record/railties/controller_runtime.rb
 - lib/active_record/railties/databases.rake
-- lib/active_record/railties/subscriber.rb
+- lib/active_record/railties/log_subscriber.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
@@ -128,16 +149,16 @@ files:
 - lib/active_record/validations.rb
 - lib/active_record/version.rb
 - lib/active_record.rb
-- lib/generators/active_record/migration/migration_generator.rb
-- lib/generators/active_record/migration/templates/migration.rb
-- lib/generators/active_record/model/model_generator.rb
-- lib/generators/active_record/model/templates/migration.rb
-- lib/generators/active_record/model/templates/model.rb
-- lib/generators/active_record/observer/observer_generator.rb
-- lib/generators/active_record/observer/templates/observer.rb
-- lib/generators/active_record/session_migration/session_migration_generator.rb
-- lib/generators/active_record/session_migration/templates/migration.rb
-- lib/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/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/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.rb
 has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
@@ -152,18 +173,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: activerecord
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Object-relational mapper framework (part of Rails).