activerecord 2.2.2 → 2.2.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+*2.2.3 (September 4th, 2009)*
+
+Version bump.
+
 *2.2 (November 21st, 2008)*
 
 * Ensure indices don't flip order in schema.rb #1266 [Jordi Bunster]

data/Rakefile

@@ -32,9 +32,13 @@ task :default => :test
 desc 'Run mysql, sqlite, and postgresql tests'
 task :test => %w(test_mysql test_sqlite3 test_postgresql)
 
-for adapter in %w( mysql postgresql sqlite sqlite3 firebird db2 oracle sybase openbase frontbase )
+for adapter in %w( mysql postgresql sqlite sqlite3 firebird db2 oracle sybase openbase frontbase jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb )
   Rake::TestTask.new("test_#{adapter}") { |t|
-    t.libs << "test" << "test/connections/native_#{adapter}"
+    if adapter =~ /jdbc/
+      t.libs << "test" << "test/connections/jdbc_#{adapter}"
+    else
+      t.libs << "test" << "test/connections/native_#{adapter}"
+    end
     adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z]+/]
     t.test_files=Dir.glob( "test/cases/**/*_test{,_#{adapter_short}}.rb" ).sort
     t.verbose = true
@@ -171,7 +175,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
 
-  s.add_dependency('activesupport', '= 2.2.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 2.2.3' + PKG_BUILD)
 
   s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite"
   s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite"

data/lib/active_record/associations.rb

@@ -2159,7 +2159,7 @@ module ActiveRecord
                 klass.send(:type_condition, aliased_table_name)] unless klass.descends_from_active_record?
 
               [through_reflection, reflection].each do |ref|
-                join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions]))} " if ref && ref.options[:conditions]
+                join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions], aliased_table_name))} " if ref && ref.options[:conditions]
               end
 
               join

data/lib/active_record/associations/association_proxy.rb

@@ -169,8 +169,8 @@ module ActiveRecord
         end
 
         # Forwards the call to the reflection class.
-        def sanitize_sql(sql)
-          @reflection.klass.send(:sanitize_sql, sql)
+        def sanitize_sql(sql, table_name = @reflection.klass.quoted_table_name)
+          @reflection.klass.send(:sanitize_sql, sql, table_name)
         end
 
         # Assigns the ID of the owner to the corresponding foreign key in +record+.

data/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -9,6 +9,14 @@ module ActiveRecord
         create_record(attributes) { |record| insert_record(record, true) }
       end
 
+      def columns
+        @reflection.columns(@reflection.options[:join_table], "#{@reflection.options[:join_table]} Columns")
+      end
+
+      def reset_column_information
+        @reflection.reset_column_information
+      end
+
       protected
         def construct_find_options!(options)
           options[:joins]      = @join_sql
@@ -32,8 +40,6 @@ module ActiveRecord
           if @reflection.options[:insert_sql]
             @owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record))
           else
-            columns = @owner.connection.columns(@reflection.options[:join_table], "#{@reflection.options[:join_table]} Columns")
-
             attributes = columns.inject({}) do |attrs, column|
               case column.name.to_s
                 when @reflection.primary_key_name.to_s
@@ -103,7 +109,7 @@ module ActiveRecord
         # clause has been explicitly defined. Otherwise you can get broken records back, if, for example, the join column also has
         # an id column. This will then overwrite the id column of the records coming back.
         def finding_with_ambiguous_select?(select_clause)
-          !select_clause && @owner.connection.columns(@reflection.options[:join_table], "Join Table Columns").size != 2
+          !select_clause && columns.size != 2
         end
 
       private

data/lib/active_record/base.rb

@@ -1678,7 +1678,9 @@ module ActiveRecord #:nodoc:
           scoped_order = scope[:order] if scope
           if order
             sql << " ORDER BY #{order}"
-            sql << ", #{scoped_order}" if scoped_order
+            if scoped_order && scoped_order != order
+              sql << ", #{scoped_order}"
+            end
           else
             sql << " ORDER BY #{scoped_order}" if scoped_order
           end
@@ -2072,12 +2074,12 @@ module ActiveRecord #:nodoc:
         #   ["name='%s' and group_id='%s'", "foo'bar", 4]  returns  "name='foo''bar' and group_id='4'"
         #   { :name => "foo'bar", :group_id => 4 }  returns "name='foo''bar' and group_id='4'"
         #   "name='foo''bar' and group_id='4'" returns "name='foo''bar' and group_id='4'"
-        def sanitize_sql_for_conditions(condition)
+        def sanitize_sql_for_conditions(condition, table_name = quoted_table_name)
           return nil if condition.blank?
 
           case condition
             when Array; sanitize_sql_array(condition)
-            when Hash;  sanitize_sql_hash_for_conditions(condition)
+            when Hash;  sanitize_sql_hash_for_conditions(condition, table_name)
             else        condition
           end
         end

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -150,6 +150,7 @@ module ActiveRecord
     # * <tt>:password</tt> - Defaults to nothing.
     # * <tt>:database</tt> - The name of the database. No default, must be provided.
     # * <tt>:encoding</tt> - (Optional) Sets the client encoding by executing "SET NAMES <encoding>" after connection.
+    # * <tt>:reconnect</tt> - Defaults to false (See MySQL documentation: http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html).
     # * <tt>:sslca</tt> - Necessary to use MySQL with an SSL connection.
     # * <tt>:sslkey</tt> - Necessary to use MySQL with an SSL connection.
     # * <tt>:sslcert</tt> - Necessary to use MySQL with an SSL connection.
@@ -534,8 +535,6 @@ module ActiveRecord
 
       private
         def connect
-          @connection.reconnect = true if @connection.respond_to?(:reconnect=)
-
           encoding = @config[:encoding]
           if encoding
             @connection.options(Mysql::SET_CHARSET_NAME, encoding) rescue nil
@@ -546,6 +545,10 @@ module ActiveRecord
           end
 
           @connection.real_connect(*@connection_options)
+
+          # reconnect must be set after real_connect is called, because real_connect sets it to false internally
+          @connection.reconnect = !!@config[:reconnect] if @connection.respond_to?(:reconnect=)
+
           configure_connection
         end
 

data/lib/active_record/dirty.rb

@@ -151,12 +151,12 @@ module ActiveRecord
 
       def field_changed?(attr, old, value)
         if column = column_for_attribute(attr)
-          if column.type == :integer && column.null && (old.nil? || old == 0)
-            # For nullable integer columns, NULL gets stored in database for blank (i.e. '') values.
+          if column.number? && column.null && (old.nil? || old == 0) && value.blank?
+            # For nullable numeric columns, NULL gets stored in database for blank (i.e. '') values.
             # Hence we don't record it as a change if the value changes from nil to ''.
             # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll
             # be typecast back to 0 (''.to_i => 0)
-            value = nil if value.blank?
+            value = nil
           else
             value = column.type_cast(value)
           end

data/lib/active_record/named_scope.rb

@@ -100,7 +100,7 @@ module ActiveRecord
     end
     
     class Scope
-      attr_reader :proxy_scope, :proxy_options
+      attr_reader :proxy_scope, :proxy_options, :current_scoped_methods_when_defined
       NON_DELEGATE_METHODS = %w(nil? send object_id class extend find size count sum average maximum minimum paginate first last empty? any? respond_to?).to_set
       [].methods.each do |m|
         unless m =~ /^__/ || NON_DELEGATE_METHODS.include?(m.to_s)
@@ -113,6 +113,9 @@ module ActiveRecord
       def initialize(proxy_scope, options, &block)
         [options[:extend]].flatten.each { |extension| extend extension } if options[:extend]
         extend Module.new(&block) if block_given?
+        unless Scope === proxy_scope
+          @current_scoped_methods_when_defined = proxy_scope.send(:current_scoped_methods)
+        end
         @proxy_scope, @proxy_options = proxy_scope, options.except(:extend)
       end
 
@@ -168,7 +171,13 @@ module ActiveRecord
         else
           with_scope :find => proxy_options, :create => proxy_options[:conditions].is_a?(Hash) ?  proxy_options[:conditions] : {} do
             method = :new if method == :build
-            proxy_scope.send(method, *args, &block)
+            if current_scoped_methods_when_defined
+              with_scope current_scoped_methods_when_defined do
+                proxy_scope.send(method, *args, &block)
+              end
+            else
+              proxy_scope.send(method, *args, &block)
+            end
           end
         end
       end

data/lib/active_record/reflection.rb

@@ -198,6 +198,14 @@ module ActiveRecord
         end
       end
 
+      def columns(tbl_name, log_msg)
+        @columns ||= klass.connection.columns(tbl_name, log_msg)
+      end
+
+      def reset_column_information
+        @columns = nil
+      end
+
       def check_validity!
       end
 

data/lib/active_record/transactions.rb

@@ -147,7 +147,7 @@ module ActiveRecord
     end
 
     def save_with_transactions! #:nodoc:
-      rollback_active_record_state! { transaction { save_without_transactions! } }
+      rollback_active_record_state! { self.class.transaction { save_without_transactions! } }
     end
 
     # Reset id and @new_record if the transaction rolls back.
@@ -175,7 +175,7 @@ module ActiveRecord
     # instance.
     def with_transaction_returning_status(method, *args)
       status = nil
-      transaction do
+      self.class.transaction do
         status = send(method, *args)
         raise ActiveRecord::Rollback unless status
       end

data/lib/active_record/version.rb

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

data/test/cases/associations/has_and_belongs_to_many_associations_test.rb

@@ -770,4 +770,15 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
       end
     end
   end
+
+  def test_caching_of_columns
+    david = Developer.find(1)
+    # clear cache possibly created by other tests
+    david.projects.reset_column_information
+    assert_queries(0) { david.projects.columns; david.projects.columns }
+    # and again to verify that reset_column_information clears the cache correctly
+    david.projects.reset_column_information
+    assert_queries(0) { david.projects.columns; david.projects.columns }
+  end
+
 end

data/test/cases/associations/inner_join_association_test.rb

@@ -29,6 +29,11 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase
     assert_match /INNER JOIN .?categories.? ON.*AND.*.?General.?.*TERMINATING_MARKER/, sql
   end
 
+  def test_construct_finder_sql_applies_aliases_tables_on_association_conditions
+    result = Author.find(:all, :joins => [:thinking_posts, :welcome_posts])
+    assert_equal authors(:david), result.first
+  end
+
   def test_construct_finder_sql_unpacks_nested_joins
     sql = Author.send(:construct_finder_sql, :joins => {:posts => [[:comments]]})
     assert_no_match /inner join.*inner join.*inner join/i, sql, "only two join clauses should be present"

data/test/cases/connection_test_mysql.rb

@@ -2,9 +2,24 @@ require "cases/helper"
 
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
+    super
     @connection = ActiveRecord::Base.connection
   end
 
+  def test_mysql_reconnect_attribute_after_connection_with_reconnect_true
+    run_without_connection do |orig_connection|
+      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => true}))
+      assert ActiveRecord::Base.connection.raw_connection.reconnect
+    end
+  end
+
+  def test_mysql_reconnect_attribute_after_connection_with_reconnect_false
+    run_without_connection do |orig_connection|
+      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => false}))
+      assert !ActiveRecord::Base.connection.raw_connection.reconnect
+    end
+  end
+
   def test_no_automatic_reconnection_after_timeout
     assert @connection.active?
     @connection.update('set @@wait_timeout=1')
@@ -27,4 +42,15 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     @connection.verify!
     assert @connection.active?
   end
+
+  private
+
+  def run_without_connection
+    original_connection = ActiveRecord::Base.remove_connection
+    begin
+      yield original_connection
+    ensure
+      ActiveRecord::Base.establish_connection(original_connection)
+    end
+  end
 end

data/test/cases/dirty_test.rb

@@ -58,7 +58,7 @@ class DirtyTest < ActiveRecord::TestCase
     assert_equal parrot.name_change, parrot.title_change
   end
 
-  def test_nullable_integer_not_marked_as_changed_if_new_value_is_blank
+  def test_nullable_number_not_marked_as_changed_if_new_value_is_blank
     pirate = Pirate.new
 
     ["", nil].each do |value|
@@ -68,6 +68,18 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
+  def test_nullable_integer_zero_to_string_zero_not_marked_as_changed
+    pirate = Pirate.new
+    pirate.parrot_id = 0
+    pirate.catchphrase = 'arrr'
+    assert pirate.save!
+
+    assert !pirate.changed?
+
+    pirate.parrot_id = '0'
+    assert !pirate.changed?
+  end
+
   def test_zero_to_blank_marked_as_changed
     pirate = Pirate.new
     pirate.catchphrase = "Yarrrr, me hearties"

data/test/cases/helper.rb

@@ -31,7 +31,7 @@ rescue LoadError
 end
 
 ActiveRecord::Base.connection.class.class_eval do
-  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
+  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /SHOW FIELDS/]
 
   def execute_with_query_record(sql, name = nil, &block)
     $queries_executed ||= []
@@ -59,4 +59,4 @@ unless ENV['FIXTURE_DEBUG']
       end
     end
   end
-end
+end

data/test/cases/method_scoping_test.rb

@@ -341,8 +341,10 @@ class NestedScopingTest < ActiveRecord::TestCase
   def test_merged_scoped_find
     poor_jamis = developers(:poor_jamis)
     Developer.with_scope(:find => { :conditions => "salary < 100000" }) do
-      Developer.with_scope(:find => { :offset => 1 }) do
-        assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
+      Developer.with_scope(:find => { :offset => 1, :order => 'id asc' }) do
+        assert_sql /ORDER BY id asc / do
+          assert_equal(poor_jamis, Developer.find(:first, :order => 'id asc'))
+        end
       end
     end
   end

data/test/cases/named_scope_test.rb

@@ -142,6 +142,15 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal authors(:david).comments & Comment.containing_the_letter_e, authors(:david).comments.containing_the_letter_e
   end
 
+  def test_named_scopes_honor_current_scopes_from_when_defined
+    assert !Post.ranked_by_comments.limit(5).empty?
+    assert !authors(:david).posts.ranked_by_comments.limit(5).empty?
+    assert_not_equal Post.ranked_by_comments.limit(5), authors(:david).posts.ranked_by_comments.limit(5)
+    assert_not_equal Post.top(5), authors(:david).posts.top(5)
+    assert_equal authors(:david).posts.ranked_by_comments.limit(5), authors(:david).posts.top(5)
+    assert_equal Post.ranked_by_comments.limit(5), Post.top(5)
+  end
+
   def test_active_records_have_scope_named__all__
     assert !Topic.find(:all).empty?
 

data/test/cases/validations_i18n_test.rb

@@ -506,7 +506,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
 
   # validates_length_of :is w/o mocha
 
-  def test_validates_length_of_within_finds_custom_model_key_translation
+  def test_validates_length_of_is_finds_custom_model_key_translation
     I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
     I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
 
@@ -515,7 +515,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'custom message', @topic.errors.on(:title)
   end
 
-  def test_validates_length_of_within_finds_global_default_translation
+  def test_validates_length_of_is_finds_global_default_translation
     I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
 
     Topic.validates_length_of :title, :is => 5
@@ -525,7 +525,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
 
   # validates_uniqueness_of w/o mocha
 
-  def test_validates_length_of_within_finds_custom_model_key_translation
+  def test_validates_length_of_is_finds_custom_model_key_translation
     I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:wrong_length => 'custom message'}}}}}}
     I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
 
@@ -534,7 +534,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
     assert_equal 'custom message', @topic.errors.on(:title)
   end
 
-  def test_validates_length_of_within_finds_global_default_translation
+  def test_validates_length_of_is_finds_global_default_translation
     I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:wrong_length => 'global message'}}}
 
     Topic.validates_length_of :title, :is => 5

data/test/connections/jdbc_jdbcderby/connection.rb

@@ -0,0 +1,18 @@
+print "Using Derby via JRuby, activerecord-jdbc-adapter and activerecord-jdbcderby-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbcderby',
+    :database => 'activerecord_unittest'
+  },
+  'arunit2' => {
+    :adapter  => 'jdbcderby',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'

data/test/connections/jdbc_jdbch2/connection.rb

@@ -0,0 +1,18 @@
+print "Using H2 via JRuby, activerecord-jdbc-adapter and activerecord-jdbch2-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbch2',
+    :database => 'activerecord_unittest'
+  },
+  'arunit2' => {
+    :adapter  => 'jdbch2',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'

data/test/connections/jdbc_jdbchsqldb/connection.rb

@@ -0,0 +1,18 @@
+print "Using HSQLDB via JRuby, activerecord-jdbc-adapter and activerecord-jdbchsqldb-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbchsqldb',
+    :database => 'activerecord_unittest'
+  },
+  'arunit2' => {
+    :adapter  => 'jdbchsqldb',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'

data/test/connections/jdbc_jdbcmysql/connection.rb

@@ -0,0 +1,26 @@
+print "Using MySQL via JRuby, activerecord-jdbc-adapter and activerecord-jdbcmysql-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+# GRANT ALL PRIVILEGES ON activerecord_unittest.* to 'rails'@'localhost';
+# GRANT ALL PRIVILEGES ON activerecord_unittest2.* to 'rails'@'localhost';
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbcmysql',
+    :username => 'rails',
+    :encoding => 'utf8',
+    :database => 'activerecord_unittest',
+  },
+  'arunit2' => {
+    :adapter  => 'jdbcmysql',
+    :username => 'rails',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
+

data/test/connections/jdbc_jdbcpostgresql/connection.rb

@@ -0,0 +1,26 @@
+print "Using Postgrsql via JRuby, activerecord-jdbc-adapter and activerecord-postgresql-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+# createuser rails --createdb --no-superuser --no-createrole
+# createdb -O rails activerecord_unittest
+# createdb -O rails activerecord_unittest2
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'jdbcpostgresql',
+    :username => ENV['USER'] || 'rails',
+    :database => 'activerecord_unittest'
+  },
+  'arunit2' => {
+    :adapter  => 'jdbcpostgresql',
+    :username => ENV['USER'] || 'rails',
+    :database => 'activerecord_unittest2'
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
+

data/test/connections/jdbc_jdbcsqlite3/connection.rb

@@ -0,0 +1,25 @@
+print "Using SQLite3 via JRuby, activerecord-jdbc-adapter and activerecord-jdbcsqlite3-adapter\n"
+require_dependency 'models/course'
+require 'logger'
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+class SqliteError < StandardError
+end
+
+BASE_DIR = FIXTURES_ROOT
+sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite3"
+sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite3"
+
+def make_connection(clazz, db_file)
+  ActiveRecord::Base.configurations = { clazz.name => { :adapter => 'jdbcsqlite3', :database => db_file, :timeout => 5000 } }
+  unless File.exist?(db_file)
+    puts "SQLite3 database not found at #{db_file}. Rebuilding it."
+    sqlite_command = %Q{sqlite3 "#{db_file}" "create table a (a integer); drop table a;"}
+    puts "Executing '#{sqlite_command}'"
+    raise SqliteError.new("Seems that there is no sqlite3 executable available") unless system(sqlite_command)
+  end
+  clazz.establish_connection(clazz.name)
+end
+
+make_connection(ActiveRecord::Base, sqlite_test_db)
+make_connection(Course, sqlite_test_db2)

data/test/models/author.rb

@@ -24,6 +24,8 @@ class Author < ActiveRecord::Base
   has_many :comments_with_order_and_conditions, :through => :posts, :source => :comments, :order => 'comments.body', :conditions => "comments.body like 'Thank%'"
   has_many :comments_with_include, :through => :posts, :source => :comments, :include => :post
 
+  has_many :thinking_posts, :class_name => 'Post', :conditions => { :title => 'So I was thinking' }
+  has_many :welcome_posts,  :class_name => 'Post', :conditions => { :title => 'Welcome to the weblog' }
 
   has_many :comments_desc, :through => :posts, :source => :comments, :order => 'comments.id DESC'
   has_many :limited_comments, :through => :posts, :source => :comments, :limit => 1

data/test/models/post.rb

@@ -1,5 +1,7 @@
 class Post < ActiveRecord::Base
   named_scope :containing_the_letter_a, :conditions => "body LIKE '%a%'"
+  named_scope :ranked_by_comments, :order => "comments_count DESC"
+  named_scope :limit, lambda {|limit| {:limit => limit} }
   named_scope :with_authors_at_address, lambda { |address| {
       :conditions => [ 'authors.author_address_id = ?', address.id ],
       :joins => 'JOIN authors ON authors.id = posts.author_id'
@@ -62,6 +64,10 @@ class Post < ActiveRecord::Base
               :before_remove => lambda {|owner, reader| log(:removed, :before, reader.first_name) },
               :after_remove  => lambda {|owner, reader| log(:removed, :after,  reader.first_name) }
 
+  def self.top(limit)
+    ranked_by_comments.limit(limit)
+  end
+
   def self.reset_log
     @log = []
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire: active_record
 bindir: bin
 cert_chain: []
 
-date: 2008-11-21 00:00:00 +01:00
+date: 2009-09-28 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: 2.2.3
     version: 
 description: Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like Customer or Subscription, that can find, save, and destroy themselves without resorting to manual SQL.
 email: david@loudthinking.com
@@ -36,10 +36,8 @@ files:
 - README
 - RUNNING_UNIT_TESTS
 - CHANGELOG
-- lib/active_record
 - lib/active_record/aggregations.rb
 - lib/active_record/association_preload.rb
-- lib/active_record/associations
 - lib/active_record/associations/association_collection.rb
 - lib/active_record/associations/association_proxy.rb
 - lib/active_record/associations/belongs_to_association.rb
@@ -54,8 +52,6 @@ files:
 - lib/active_record/base.rb
 - lib/active_record/calculations.rb
 - lib/active_record/callbacks.rb
-- lib/active_record/connection_adapters
-- lib/active_record/connection_adapters/abstract
 - lib/active_record/connection_adapters/abstract/connection_pool.rb
 - lib/active_record/connection_adapters/abstract/connection_specification.rb
 - lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -72,9 +68,7 @@ files:
 - lib/active_record/dynamic_finder_match.rb
 - lib/active_record/fixtures.rb
 - lib/active_record/i18n_interpolation_deprecation.rb
-- lib/active_record/locale
 - lib/active_record/locale/en.yml
-- lib/active_record/locking
 - lib/active_record/locking/optimistic.rb
 - lib/active_record/locking/pessimistic.rb
 - lib/active_record/migration.rb
@@ -85,7 +79,6 @@ files:
 - lib/active_record/schema.rb
 - lib/active_record/schema_dumper.rb
 - lib/active_record/serialization.rb
-- lib/active_record/serializers
 - lib/active_record/serializers/json_serializer.rb
 - lib/active_record/serializers/xml_serializer.rb
 - lib/active_record/test_case.rb
@@ -95,17 +88,14 @@ files:
 - lib/active_record/version.rb
 - lib/active_record.rb
 - lib/activerecord.rb
-- test/assets
 - test/assets/example.log
 - test/assets/flowers.jpg
-- test/cases
 - test/cases/aaa_create_tables_test.rb
 - test/cases/active_schema_test_mysql.rb
 - test/cases/active_schema_test_postgresql.rb
 - test/cases/adapter_test.rb
 - test/cases/aggregations_test.rb
 - test/cases/ar_schema_test.rb
-- test/cases/associations
 - test/cases/associations/belongs_to_associations_test.rb
 - test/cases/associations/callbacks_test.rb
 - test/cases/associations/cascaded_eager_loading_test.rb
@@ -177,31 +167,24 @@ files:
 - test/cases/validations_test.rb
 - test/cases/xml_serialization_test.rb
 - test/config.rb
-- test/connections
-- test/connections/native_db2
+- test/connections/jdbc_jdbcderby/connection.rb
+- test/connections/jdbc_jdbch2/connection.rb
+- test/connections/jdbc_jdbchsqldb/connection.rb
+- test/connections/jdbc_jdbcmysql/connection.rb
+- test/connections/jdbc_jdbcpostgresql/connection.rb
+- test/connections/jdbc_jdbcsqlite3/connection.rb
 - test/connections/native_db2/connection.rb
-- test/connections/native_firebird
 - test/connections/native_firebird/connection.rb
-- test/connections/native_frontbase
 - test/connections/native_frontbase/connection.rb
-- test/connections/native_mysql
 - test/connections/native_mysql/connection.rb
-- test/connections/native_openbase
 - test/connections/native_openbase/connection.rb
-- test/connections/native_oracle
 - test/connections/native_oracle/connection.rb
-- test/connections/native_postgresql
 - test/connections/native_postgresql/connection.rb
-- test/connections/native_sqlite
 - test/connections/native_sqlite/connection.rb
-- test/connections/native_sqlite3
 - test/connections/native_sqlite3/connection.rb
 - test/connections/native_sqlite3/in_memory_connection.rb
-- test/connections/native_sybase
 - test/connections/native_sybase/connection.rb
-- test/fixtures
 - test/fixtures/accounts.yml
-- test/fixtures/all
 - test/fixtures/all/developers.yml
 - test/fixtures/all/people.csv
 - test/fixtures/all/tasks.yml
@@ -210,9 +193,7 @@ files:
 - test/fixtures/authors.yml
 - test/fixtures/binaries.yml
 - test/fixtures/books.yml
-- test/fixtures/categories
 - test/fixtures/categories/special_categories.yml
-- test/fixtures/categories/subsubdir
 - test/fixtures/categories/subsubdir/arbitrary_filename.yml
 - test/fixtures/categories.yml
 - test/fixtures/categories_ordered.yml
@@ -228,7 +209,9 @@ files:
 - test/fixtures/developers_projects.yml
 - test/fixtures/edges.yml
 - test/fixtures/entrants.yml
+- test/fixtures/fixture_database.sqlite
 - test/fixtures/fixture_database.sqlite3
+- test/fixtures/fixture_database_2.sqlite
 - test/fixtures/fixture_database_2.sqlite3
 - test/fixtures/fk_test_has_fk.yml
 - test/fixtures/fk_test_has_pk.yml
@@ -243,10 +226,7 @@ files:
 - test/fixtures/mixed_case_monkeys.yml
 - test/fixtures/mixins.yml
 - test/fixtures/movies.yml
-- test/fixtures/naked
-- test/fixtures/naked/csv
 - test/fixtures/naked/csv/accounts.csv
-- test/fixtures/naked/yml
 - test/fixtures/naked/yml/accounts.yml
 - test/fixtures/naked/yml/companies.yml
 - test/fixtures/naked/yml/courses.yml
@@ -262,7 +242,6 @@ files:
 - test/fixtures/projects.yml
 - test/fixtures/readers.yml
 - test/fixtures/references.yml
-- test/fixtures/reserved_words
 - test/fixtures/reserved_words/distinct.yml
 - test/fixtures/reserved_words/distincts_selects.yml
 - test/fixtures/reserved_words/group.yml
@@ -279,39 +258,27 @@ files:
 - test/fixtures/treasures.yml
 - test/fixtures/vertices.yml
 - test/fixtures/warehouse-things.yml
-- test/migrations
-- test/migrations/broken
 - test/migrations/broken/100_migration_that_raises_exception.rb
-- test/migrations/decimal
 - test/migrations/decimal/1_give_me_big_numbers.rb
-- test/migrations/duplicate
 - test/migrations/duplicate/1_people_have_last_names.rb
 - test/migrations/duplicate/2_we_need_reminders.rb
 - test/migrations/duplicate/3_foo.rb
 - test/migrations/duplicate/3_innocent_jointable.rb
-- test/migrations/duplicate_names
 - test/migrations/duplicate_names/20080507052938_chunky.rb
 - test/migrations/duplicate_names/20080507053028_chunky.rb
-- test/migrations/interleaved
-- test/migrations/interleaved/pass_1
 - test/migrations/interleaved/pass_1/3_innocent_jointable.rb
-- test/migrations/interleaved/pass_2
 - test/migrations/interleaved/pass_2/1_people_have_last_names.rb
 - test/migrations/interleaved/pass_2/3_innocent_jointable.rb
-- test/migrations/interleaved/pass_3
 - test/migrations/interleaved/pass_3/1_people_have_last_names.rb
 - test/migrations/interleaved/pass_3/2_i_raise_on_down.rb
 - test/migrations/interleaved/pass_3/3_innocent_jointable.rb
-- test/migrations/missing
 - test/migrations/missing/1000_people_have_middle_names.rb
 - test/migrations/missing/1_people_have_last_names.rb
 - test/migrations/missing/3_we_need_reminders.rb
 - test/migrations/missing/4_innocent_jointable.rb
-- test/migrations/valid
 - test/migrations/valid/1_people_have_last_names.rb
 - test/migrations/valid/2_we_need_reminders.rb
 - test/migrations/valid/3_innocent_jointable.rb
-- test/models
 - test/models/author.rb
 - test/models/auto_id.rb
 - test/models/binary.rb
@@ -370,7 +337,6 @@ files:
 - test/models/treasure.rb
 - test/models/vertex.rb
 - test/models/warehouse_thing.rb
-- test/schema
 - test/schema/mysql_specific_schema.rb
 - test/schema/postgresql_specific_schema.rb
 - test/schema/schema.rb
@@ -379,6 +345,8 @@ files:
 - examples/associations.png
 has_rdoc: true
 homepage: http://www.rubyonrails.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -400,9 +368,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activerecord
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Implements the ActiveRecord pattern for ORM.
 test_files: []