activerecord 1.14.2 → 1.14.3

data/CHANGELOG

@@ -1,9 +1,18 @@
-*1.14.2* (April 9th, 2005)
+*1.14.3* (June 27th, 2006)
+
+* Properly quote index names in migrations (closes #4764) [John Long]
+
+* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick]
+
+* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick]
+
+
+*1.14.2* (April 9th, 2006)
 
 * Fixed calculations for the Oracle Adapter (closes #4626) [Michael Schoen]
 
 
-*1.14.1* (April 6th, 2005)
+*1.14.1* (April 6th, 2006)
 
 * Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. [Nicholas Seckar]
 
@@ -58,7 +67,7 @@
 * Fixed broken OCIAdapter #4457 [schoenm@earthlink.net]
 
 
-*1.14.0* (March 27th, 2005)
+*1.14.0* (March 27th, 2006)
 
 * Replace 'rescue Object' with a finer grained rescue. Closes #4431. [Nicholas Seckar]
 
@@ -478,6 +487,7 @@
 
 * Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Luetke] 
 
+
 *1.13.2* (December 13th, 2005)
 
 * Become part of Rails 1.0

data/Rakefile

@@ -173,8 +173,8 @@ desc "Publish the release files to RubyForge."
 task :release => [ :package ] do
   `rubyforge login`
 
-  for ext in %w( gem )
-    release_command = "rubyforge add_release activerecord activerecord 'REL #{PKG_VERSION}' pkg/activerecord-#{PKG_VERSION}.#{ext}"
+  for ext in %w( gem tgz zip )
+    release_command = "rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}"
     puts release_command
     system(release_command)
   end

data/lib/active_record/associations.rb

@@ -1163,18 +1163,19 @@ module ActiveRecord
         end
  
         def select_limited_ids_list(options, join_dependency)
-          connection.select_values(
+          connection.select_all(
             construct_finder_sql_for_association_limiting(options, join_dependency),
             "#{name} Load IDs For Limited Eager Loading"
-          ).collect { |id| connection.quote(id) }.join(", ")
+          ).collect { |row| connection.quote(row[primary_key]) }.join(", ")
         end
  
         def construct_finder_sql_for_association_limiting(options, join_dependency)
           scope = scope(:find)
-          #sql = "SELECT DISTINCT #{table_name}.#{primary_key} FROM #{table_name} "
           sql = "SELECT "
           sql << "DISTINCT #{table_name}." if include_eager_conditions?(options) || include_eager_order?(options)
-          sql << "#{primary_key} FROM #{table_name} "
+          sql << primary_key
+          sql << ", #{options[:order].split(',').collect { |s| s.split.first } * ', '}" if options[:order] && (include_eager_conditions?(options) || include_eager_order?(options))
+          sql << " FROM #{table_name} "
           
           if include_eager_conditions?(options) || include_eager_order?(options)
             sql << join_dependency.join_associations.collect{|join| join.association_join }.join
@@ -1186,16 +1187,24 @@ module ActiveRecord
           add_limit!(sql, options, scope)
           return sanitize_sql(sql)
         end
-
+        
+        # Checks if the conditions reference a table other than the current model table
         def include_eager_conditions?(options)
-          conditions = scope(:find, :conditions) || options[:conditions]
-          return false unless conditions
-          conditions = conditions.first if conditions.is_a?(Array)
-          conditions.scan(/(\w+)\.\w+/).flatten.any? do |condition_table_name|
+          # look in both sets of conditions
+          conditions = [scope(:find, :conditions), options[:conditions]].inject([]) do |all, cond|
+            case cond
+              when nil   then all
+              when Array then all << cond.first
+              else            all << cond
+            end
+          end
+          return false unless conditions.any?
+          conditions.join(' ').scan(/(\w+)\.\w+/).flatten.any? do |condition_table_name|
             condition_table_name != table_name
           end
         end
         
+        # Checks if the query order references a table other than the current model's table.
         def include_eager_order?(options)
           order = options[:order]
           return false unless order

data/lib/active_record/calculations.rb

@@ -42,26 +42,29 @@ module ActiveRecord
       #
       # Note: Person.count(:all) will not work because it will use :all as the condition.  Use Person.count instead.
       def count(*args)
-        options    = {}
-        
-        #For backwards compatibility, we need to handle both count(conditions=nil, joins=nil) or count(options={}).
-        if args.size >= 0 and args.size <= 2
+        options     = {}
+        column_name = :all
+        # For backwards compatibility, we need to handle both count(conditions=nil, joins=nil) or count(options={}) or count(column_name=:all, options={}).
+        if args.size >= 0 && args.size <= 2
           if args.first.is_a?(Hash)
-            options = args.first
-            #should we verify the options hash???
+            options     = args.first
           elsif args[1].is_a?(Hash)
+            options     = args[1]
             column_name = args.first
-            options    = args[1]
           else
-            # Handle legacy paramter options: def count(conditions=nil, joins=nil) 
+            # Handle legacy paramter options: def count(conditions=nil, joins=nil)
             options.merge!(:conditions => args[0]) if args.length > 0
-            options.merge!(:joins => args[1]) if args.length > 1
+            options.merge!(:joins => args[1])      if args.length > 1
           end
         else
           raise(ArgumentError, "Unexpected parameters passed to count(*args): expected either count(conditions=nil, joins=nil) or count(options={})")
         end
 
-        (scope(:find, :include) || options[:include]) ? count_with_associations(options) : calculate(:count, :all, options)
+        if options[:include] || scope(:find, :include)
+          count_with_associations(options)
+        else
+          calculate(:count, column_name, options)
+        end
       end
 
       # Calculates average value on a given column.  The value is returned as a float.  See #calculate for examples with options.

data/lib/active_record/connection_adapters/abstract/schema_statements.rb

@@ -119,7 +119,7 @@ module ActiveRecord
       # Adds a new column to the named table.
       # See TableDefinition#column for details of the options you can use.
       def add_column(table_name, column_name, type, options = {})
-        add_column_sql = "ALTER TABLE #{table_name} ADD #{column_name} #{type_to_sql(type, options[:limit])}"
+        add_column_sql = "ALTER TABLE #{table_name} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit])}"
         add_column_options!(add_column_sql, options)
         execute(add_column_sql)
       end
@@ -128,7 +128,7 @@ module ActiveRecord
       # ===== Examples
       #  remove_column(:suppliers, :qualification)
       def remove_column(table_name, column_name)
-        execute "ALTER TABLE #{table_name} DROP #{column_name}"
+        execute "ALTER TABLE #{table_name} DROP #{quote_column_name(column_name)}"
       end
 
       # Changes the column's definition according to the new options.
@@ -184,7 +184,8 @@ module ActiveRecord
       # generates
       #  CREATE UNIQUE INDEX by_branch_party ON accounts(branch_id, party_id)
       def add_index(table_name, column_name, options = {})
-        index_name = "#{table_name}_#{Array(column_name).first}_index"
+        column_names = Array(column_name)
+        index_name   = index_name(table_name, :column => column_names.first)
 
         if Hash === options # legacy support, since this param was a string
           index_type = options[:unique] ? "UNIQUE" : ""
@@ -192,8 +193,8 @@ module ActiveRecord
         else
           index_type = options
         end
-
-        execute "CREATE #{index_type} INDEX #{index_name} ON #{table_name} (#{Array(column_name).join(", ")})"
+        quoted_column_names = column_names.map { |e| quote_column_name(e) }.join(", ")
+        execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{table_name} (#{quoted_column_names})"
       end
 
       # Remove the given index from the table.
@@ -209,7 +210,7 @@ module ActiveRecord
       #   add_index :accounts, [:username, :password]
       #   remove_index :accounts, :username
       def remove_index(table_name, options = {})
-        execute "DROP INDEX #{index_name(table_name, options)} ON #{table_name}"
+        execute "DROP INDEX #{quote_column_name(index_name(table_name, options))} ON #{table_name}"
       end
 
       def index_name(table_name, options) #:nodoc:

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -18,7 +18,6 @@ module ActiveRecord
         end
       end
 
-
       config = config.symbolize_keys
       host     = config[:host]
       port     = config[:port]

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -337,8 +337,7 @@ module ActiveRecord
 
       def remove_index(table_name, options) #:nodoc:
         execute "DROP INDEX #{index_name(table_name, options)}"
-      end      
-
+      end
 
       private
         BYTEA_COLUMN_TYPE_OID = 17

data/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -213,13 +213,7 @@ module ActiveRecord
       end
 
       def remove_index(table_name, options={}) #:nodoc:
-        if Hash === options
-          index_name = options[:name]
-        else
-          index_name = "#{table_name}_#{options}_index"
-        end
-
-        execute "DROP INDEX #{index_name}"
+        execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
       end
       
       def rename_table(name, new_name)

data/lib/active_record/version.rb

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

data/test/associations_go_eager_test.rb

@@ -179,6 +179,42 @@ class EagerAssociationTest < Test::Unit::TestCase
     assert_equal count, posts.size
   end
 
+  def test_eager_with_has_many_and_limit_and_scoped_conditions_on_the_eagers
+    posts = nil
+    Post.with_scope(:find => {
+      :include    => :comments, 
+      :conditions => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment'"
+    }) do
+      posts = authors(:david).posts.find(:all, :limit => 2)
+      assert_equal 2, posts.size
+    end
+    
+    Post.with_scope(:find => {
+      :include    => [ :comments, :author ], 
+      :conditions => "authors.name = 'David' AND (comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment')"
+    }) do
+      count = Post.count(:limit => 2)
+      assert_equal count, posts.size
+    end
+  end
+
+  def test_eager_with_has_many_and_limit_and_scoped_and_explicit_conditions_on_the_eagers
+    Post.with_scope(:find => { :conditions => "1=1" }) do
+      posts = authors(:david).posts.find(:all, 
+        :include    => :comments, 
+        :conditions => "comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment'",
+        :limit      => 2
+      )
+      assert_equal 2, posts.size
+      
+      count = Post.count(
+        :include    => [ :comments, :author ], 
+        :conditions => "authors.name = 'David' AND (comments.body like 'Normal%' OR comments.#{QUOTED_TYPE}= 'SpecialComment')",
+        :limit      => 2
+      )
+      assert_equal count, posts.size
+    end
+  end
   def test_eager_association_loading_with_habtm
     posts = Post.find(:all, :include => :categories, :order => "posts.id")
     assert_equal 2, posts[0].categories.size

data/test/migration_test.rb

@@ -34,6 +34,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       Reminder.reset_column_information
 
       Person.connection.remove_column("people", "last_name") rescue nil
+      Person.connection.remove_column("people", "key") rescue nil
       Person.connection.remove_column("people", "bio") rescue nil
       Person.connection.remove_column("people", "age") rescue nil
       Person.connection.remove_column("people", "height") rescue nil
@@ -47,12 +48,17 @@ if ActiveRecord::Base.connection.supports_migrations?
     def test_add_index
       Person.connection.add_column "people", "last_name", :string        
       Person.connection.add_column "people", "administrator", :boolean
+      Person.connection.add_column "people", "key", :string
       
       assert_nothing_raised { Person.connection.add_index("people", "last_name") }
       assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
 
       assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
       assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
+      
+      # quoting
+      assert_nothing_raised { Person.connection.add_index("people", ["key"], :name => "key", :unique => true) }
+      assert_nothing_raised { Person.connection.remove_index("people", :name => "key") }
 
       # Sybase adapter does not support indexes on :boolean columns
       unless current_adapter?(:SybaseAdapter)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.14.2
-date: 2006-04-09 00:00:00 -05:00
+  version: 1.14.3
+date: 2006-06-27 00:00:00 -05:00
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
 - lib