activerecord 1.15.6 → 2.0.0

data/test/{empty_date_time_test.rb → date_time_test.rb}

@@ -2,7 +2,19 @@ require 'abstract_unit'
 require 'fixtures/topic'
 require 'fixtures/task'
 
-class EmptyDateTimeTest < Test::Unit::TestCase
+class DateTimeTest < Test::Unit::TestCase
+  def test_saves_both_date_and_time
+    time_values = [1807, 2, 10, 15, 30, 45]
+    now = DateTime.civil(*time_values)
+
+    task = Task.new
+    task.starting = now
+    task.save!
+    
+    # check against Time.local_time, since some platforms will return a Time instead of a DateTime
+    assert_equal Time.local_time(*time_values), Task.find(task.id).starting
+  end
+
   def test_assign_empty_date_time
     task = Task.new
     task.starting = ''

data/test/defaults_test.rb

@@ -31,7 +31,8 @@ class DefaultTest < Test::Unit::TestCase
 
       assert_equal 0, klass.columns_hash['zero'].default
       assert !klass.columns_hash['zero'].null
-      assert_equal nil, klass.columns_hash['omit'].default
+      # 0 in MySQL 4, nil in 5.
+      assert [0, nil].include?(klass.columns_hash['omit'].default)
       assert !klass.columns_hash['omit'].null
 
       assert_raise(ActiveRecord::StatementInvalid) { klass.create! }
@@ -57,4 +58,10 @@ class DefaultTest < Test::Unit::TestCase
       assert_equal BigDecimal.new("2.78"), default.decimal_number
     end
   end
+
+  if current_adapter?(:PostgreSQLAdapter)
+    def test_multiline_default_text
+      assert_equal "--- []\n\n", Default.columns_hash['multiline_default'].default
+    end
+  end
 end

data/test/deprecated_finder_test.rb

@@ -1,90 +1,19 @@
 require 'abstract_unit'
-require 'fixtures/company'
-require 'fixtures/topic'
-require 'fixtures/reply'
 require 'fixtures/entrant'
-require 'fixtures/developer'
 
 class DeprecatedFinderTest < Test::Unit::TestCase
-  fixtures :companies, :topics, :entrants, :developers
+  fixtures :entrants
 
-  def test_find_all_with_limit
-    entrants = assert_deprecated { Entrant.find_all nil, "id ASC", 2 }
-    assert_equal 2, entrants.size
-    assert_equal entrants(:first), entrants.first
+  def test_deprecated_find_all_was_removed
+    assert_raise(NoMethodError) { Entrant.find_all }
   end
 
-  def test_find_all_with_prepared_limit_and_offset
-    entrants = assert_deprecated { Entrant.find_all nil, "id ASC", [2, 1] }
-    assert_equal 2, entrants.size
-    assert_equal entrants(:second), entrants.first
+  def test_deprecated_find_first_was_removed
+    assert_raise(NoMethodError) { Entrant.find_first }
   end
 
-  def test_find_first
-    first = assert_deprecated { Topic.find_first "title = 'The First Topic'" }
-    assert_equal topics(:first), first
-  end
-
-  def test_find_first_failing
-    first = assert_deprecated { Topic.find_first "title = 'The First Topic!'" }
-    assert_nil first
-  end
-
-  def test_deprecated_find_on_conditions
-    assert_deprecated 'find_on_conditions' do
-      assert Topic.find_on_conditions(1, ["approved = ?", false])
-      assert_raises(ActiveRecord::RecordNotFound) { Topic.find_on_conditions(1, ["approved = ?", true]) }
-    end
-  end
-
-  def test_condition_interpolation
-    assert_deprecated do
-      assert_kind_of Firm, Company.find_first(["name = '%s'", "37signals"])
-      assert_nil Company.find_first(["name = '%s'", "37signals!"])
-      assert_nil Company.find_first(["name = '%s'", "37signals!' OR 1=1"])
-      assert_kind_of Time, Topic.find_first(["id = %d", 1]).written_on
-    end
-  end
-
-  def test_bind_variables
-    assert_deprecated do
-      assert_kind_of Firm, Company.find_first(["name = ?", "37signals"])
-      assert_nil Company.find_first(["name = ?", "37signals!"])
-      assert_nil Company.find_first(["name = ?", "37signals!' OR 1=1"])
-      assert_kind_of Time, Topic.find_first(["id = ?", 1]).written_on
-      assert_raises(ActiveRecord::PreparedStatementInvalid) {
-        Company.find_first(["id=? AND name = ?", 2])
-      }
-      assert_raises(ActiveRecord::PreparedStatementInvalid) {
-             Company.find_first(["id=?", 2, 3, 4])
-      }
-    end
-  end
-  
-  def test_bind_variables_with_quotes
-    Company.create("name" => "37signals' go'es agains")
-    assert_deprecated do
-      assert_not_nil Company.find_first(["name = ?", "37signals' go'es agains"])
-    end
-  end
-
-  def test_named_bind_variables_with_quotes
-    Company.create("name" => "37signals' go'es agains")
-    assert_deprecated do
-      assert_not_nil Company.find_first(["name = :name", {:name => "37signals' go'es agains"}])
-    end
-  end
-
-  def test_named_bind_variables
-    assert_equal '1', bind(':a', :a => 1) # ' ruby-mode
-    assert_equal '1 1', bind(':a :a', :a => 1)  # ' ruby-mode
-
-    assert_deprecated do
-      assert_kind_of Firm, Company.find_first(["name = :name", { :name => "37signals" }])
-      assert_nil Company.find_first(["name = :name", { :name => "37signals!" }])
-      assert_nil Company.find_first(["name = :name", { :name => "37signals!' OR 1=1" }])
-      assert_kind_of Time, Topic.find_first(["id = :id", { :id => 1 }]).written_on
-    end
+  def test_deprecated_find_on_conditions_was_removed
+    assert_raise(NoMethodError) { Entrant.find_on_conditions }
   end
 
   def test_count
@@ -98,54 +27,4 @@ class DeprecatedFinderTest < Test::Unit::TestCase
     assert_equal(1, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 2]))
     assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1]))
   end
-
-  def test_find_all_with_limit
-    assert_deprecated do
-      first_five_developers = Developer.find_all nil, 'id ASC', 5
-      assert_equal 5, first_five_developers.length
-      assert_equal 'David', first_five_developers.first.name
-      assert_equal 'fixture_5', first_five_developers.last.name
-
-      no_developers = Developer.find_all nil, 'id ASC', 0
-      assert_equal 0, no_developers.length
-
-      assert_equal first_five_developers, Developer.find_all(nil, 'id ASC', [5])
-      assert_equal no_developers, Developer.find_all(nil, 'id ASC', [0])
-    end
-  end
-
-  def test_find_all_with_limit_and_offset
-    assert_deprecated do
-      first_three_developers = Developer.find_all nil, 'id ASC', [3, 0]
-      second_three_developers = Developer.find_all nil, 'id ASC', [3, 3]
-      last_two_developers = Developer.find_all nil, 'id ASC', [2, 8]
-
-      assert_equal 3, first_three_developers.length
-      assert_equal 3, second_three_developers.length
-      assert_equal 2, last_two_developers.length
-
-      assert_equal 'David', first_three_developers.first.name
-      assert_equal 'fixture_4', second_three_developers.first.name
-      assert_equal 'fixture_9', last_two_developers.first.name
-    end
-  end
-
-  def test_find_all_by_one_attribute_with_options
-    assert_not_deprecated do
-      topics = Topic.find_all_by_content("Have a nice day", "id DESC")
-      assert topics(:first), topics.last
-
-      topics = Topic.find_all_by_content("Have a nice day", "id DESC")
-      assert topics(:first), topics.first
-    end
-  end
-
-  protected
-    def bind(statement, *vars)
-      if vars.first.is_a?(Hash)
-        ActiveRecord::Base.send(:replace_named_bind_variables, statement, vars.first)
-      else
-        ActiveRecord::Base.send(:replace_bind_variables, statement, vars)
-      end
-    end
 end

data/test/finder_test.rb

@@ -1,4 +1,6 @@
 require 'abstract_unit'
+require 'fixtures/author'
+require 'fixtures/comment'
 require 'fixtures/company'
 require 'fixtures/topic'
 require 'fixtures/reply'
@@ -7,18 +9,18 @@ require 'fixtures/developer'
 require 'fixtures/post'
 
 class FinderTest < Test::Unit::TestCase
-  fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :accounts
+  fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors
 
   def test_find
     assert_equal(topics(:first).title, Topic.find(1).title)
   end
-  
+
   # find should handle strings that come from URLs
   # (example: Category.find(params[:id]))
   def test_find_with_string
     assert_equal(Topic.find(1).title,Topic.find("1").title)
   end
-  
+
   def test_exists
     assert Topic.exists?(1)
     assert Topic.exists?("1")
@@ -29,15 +31,27 @@ class FinderTest < Test::Unit::TestCase
     assert !Topic.exists?("foo")
     assert_raise(NoMethodError) { Topic.exists?([1,2]) }
   end
-  
+
   def test_find_by_array_of_one_id
     assert_kind_of(Array, Topic.find([ 1 ]))
     assert_equal(1, Topic.find([ 1 ]).length)
   end
-  
+
   def test_find_by_ids
-    assert_equal(2, Topic.find(1, 2).length)
-    assert_equal(topics(:second).title, Topic.find([ 2 ]).first.title)
+    assert_equal 2, Topic.find(1, 2).size
+    assert_equal topics(:second).title, Topic.find([2]).first.title
+  end
+
+  def test_find_by_ids_with_limit_and_offset
+    assert_equal 2, Entrant.find([1,3,2], :limit => 2).size
+    assert_equal 1, Entrant.find([1,3,2], :limit => 3, :offset => 2).size
+
+    # Also test an edge case: If you have 11 results, and you set a
+    #   limit of 3 and offset of 9, then you should find that there
+    #   will be only 2 results, regardless of the limit.
+    devs = Developer.find :all
+    last_devs = Developer.find devs.map(&:id), :limit => 3, :offset => 9
+    assert_equal 2, last_devs.size
   end
 
   def test_find_an_empty_array
@@ -45,14 +59,12 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_find_by_ids_missing_one
-    assert_raises(ActiveRecord::RecordNotFound) {
-      Topic.find(1, 2, 45)
-    }
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, 2, 45) }
   end
-  
+
   def test_find_all_with_limit
     entrants = Entrant.find(:all, :order => "id ASC", :limit => 2)
-    
+
     assert_equal(2, entrants.size)
     assert_equal(entrants(:first).name, entrants.first.name)
   end
@@ -67,12 +79,12 @@ class FinderTest < Test::Unit::TestCase
     assert_equal(1, entrants.size)
     assert_equal(entrants(:third).name, entrants.first.name)
   end
-  
+
   def test_find_all_with_limit_and_offset_and_multiple_orderings
     developers = Developer.find(:all, :order => "salary ASC, id DESC", :limit => 3, :offset => 1)
     assert_equal ["David", "fixture_10", "fixture_9"], developers.collect {|d| d.name}
   end
-  
+
   def test_find_with_limit_and_condition
     developers = Developer.find(:all, :order => "id DESC", :conditions => "salary = 100000", :limit => 3, :offset =>7)
     assert_equal(1, developers.size)
@@ -81,28 +93,28 @@ class FinderTest < Test::Unit::TestCase
 
   def test_find_with_entire_select_statement
     topics = Topic.find_by_sql "SELECT * FROM topics WHERE author_name = 'Mary'"
-    
+
     assert_equal(1, topics.size)
     assert_equal(topics(:second).title, topics.first.title)
   end
-  
+
   def test_find_with_prepared_select_statement
     topics = Topic.find_by_sql ["SELECT * FROM topics WHERE author_name = ?", "Mary"]
-    
+
     assert_equal(1, topics.size)
     assert_equal(topics(:second).title, topics.first.title)
   end
-  
+
   def test_find_by_sql_with_sti_on_joined_table
     accounts = Account.find_by_sql("SELECT * FROM accounts INNER JOIN companies ON companies.id = accounts.firm_id")
     assert_equal [Account], accounts.collect(&:class).uniq
   end
-  
+
   def test_find_first
     first = Topic.find(:first, :conditions => "title = 'The First Topic'")
     assert_equal(topics(:first).title, first.title)
   end
-  
+
   def test_find_first_failing
     first = Topic.find(:first, :conditions => "title = 'The First Topic!'")
     assert_nil(first)
@@ -112,60 +124,89 @@ class FinderTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::RecordNotFound) {
       Topic.find(1).parent
     }
-    
+
     Topic.find(2).topic
   end
-  
+
   def test_find_only_some_columns
     topic = Topic.find(1, :select => "author_name")
-    assert_raises(NoMethodError) { topic.title }
+    assert_raises(ActiveRecord::MissingAttributeError) {topic.title}
     assert_equal "David", topic.author_name
     assert !topic.attribute_present?("title")
-    assert !topic.respond_to?("title")
+    #assert !topic.respond_to?("title")
     assert topic.attribute_present?("author_name")
     assert topic.respond_to?("author_name")
   end
+  
+  def test_find_on_blank_conditions
+    [nil, " ", [], {}].each do |blank|
+      assert_nothing_raised { Topic.find(:first, :conditions => blank) }
+    end
+  end
+  
+  def test_find_on_blank_bind_conditions
+    [ [""], ["",{}] ].each do |blank|
+      assert_nothing_raised { Topic.find(:first, :conditions => blank) }
+    end
+  end
 
   def test_find_on_array_conditions
     assert Topic.find(1, :conditions => ["approved = ?", false])
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => ["approved = ?", true]) }
   end
-  
+
   def test_find_on_hash_conditions
     assert Topic.find(1, :conditions => { :approved => false })
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :approved => true }) }
   end
-  
+
+  def test_find_on_hash_conditions_with_explicit_table_name
+    assert Topic.find(1, :conditions => { 'topics.approved' => false })
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { 'topics.approved' => true }) }
+  end
+
+  def test_find_on_association_proxy_conditions
+    assert_equal [1, 2, 3, 5, 6, 7, 8, 9, 10], Comment.find_all_by_post_id(authors(:david).posts).map(&:id).sort
+  end
+
   def test_find_on_hash_conditions_with_range
     assert_equal [1,2], Topic.find(:all, :conditions => { :id => 1..2 }).map(&:id).sort
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :id => 2..3 }) }
   end
-  
+
   def test_find_on_hash_conditions_with_multiple_ranges
     assert_equal [1,2,3], Comment.find(:all, :conditions => { :id => 1..3, :post_id => 1..2 }).map(&:id).sort
     assert_equal [1], Comment.find(:all, :conditions => { :id => 1..1, :post_id => 1..10 }).map(&:id).sort
   end
-  
+
   def test_find_on_multiple_hash_conditions
     assert Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => false })
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "HHC", :replies_count => 1, :approved => false }) }
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
   end
-  
+
+
+  def test_condition_interpolation
+    assert_kind_of Firm, Company.find(:first, :conditions => ["name = '%s'", "37signals"])
+    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!"])
+    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!' OR 1=1"])
+    assert_kind_of Time, Topic.find(:first, :conditions => ["id = %d", 1]).written_on
+  end
+
   def test_condition_array_interpolation
     assert_kind_of Firm, Company.find(:first, :conditions => ["name = '%s'", "37signals"])
     assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!"])
     assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!' OR 1=1"])
     assert_kind_of Time, Topic.find(:first, :conditions => ["id = %d", 1]).written_on
   end
-  
+
   def test_condition_hash_interpolation
     assert_kind_of Firm, Company.find(:first, :conditions => { :name => "37signals"})
     assert_nil Company.find(:first, :conditions => { :name => "37signals!"})
     assert_kind_of Time, Topic.find(:first, :conditions => {:id => 1}).written_on
   end
-  
+
   def test_hash_condition_find_malformed
     assert_raises(ActiveRecord::StatementInvalid) {
       Company.find(:first, :conditions => { :id => 2, :dhh => true })
@@ -201,7 +242,7 @@ class FinderTest < Test::Unit::TestCase
 	   Company.find(:first, :conditions => ["id=?", 2, 3, 4])
     }
   end
-  
+
   def test_bind_variables_with_quotes
     Company.create("name" => "37signals' go'es agains")
     assert Company.find(:first, :conditions => ["name = ?", "37signals' go'es agains"])
@@ -215,16 +256,16 @@ class FinderTest < Test::Unit::TestCase
   def test_bind_arity
     assert_nothing_raised                                 { bind '' }
     assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '', 1 }
-  
+
     assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '?' }
     assert_nothing_raised                                 { bind '?', 1 }
     assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '?', 1, 1  }
   end
-  
+
   def test_named_bind_variables
     assert_equal '1', bind(':a', :a => 1) # ' ruby-mode
     assert_equal '1 1', bind(':a :a', :a => 1)  # ' ruby-mode
-  
+
     assert_kind_of Firm, Company.find(:first, :conditions => ["name = :name", { :name => "37signals" }])
     assert_nil Company.find(:first, :conditions => ["name = :name", { :name => "37signals!" }])
     assert_nil Company.find(:first, :conditions => ["name = :name", { :name => "37signals!' OR 1=1" }])
@@ -232,18 +273,20 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_bind_enumerable
+    quoted_abc = %(#{ActiveRecord::Base.connection.quote('a')},#{ActiveRecord::Base.connection.quote('b')},#{ActiveRecord::Base.connection.quote('c')})
+
     assert_equal '1,2,3', bind('?', [1, 2, 3])
-    assert_equal %('a','b','c'), bind('?', %w(a b c))
+    assert_equal quoted_abc, bind('?', %w(a b c))
 
     assert_equal '1,2,3', bind(':a', :a => [1, 2, 3])
-    assert_equal %('a','b','c'), bind(':a', :a => %w(a b c)) # '
+    assert_equal quoted_abc, bind(':a', :a => %w(a b c)) # '
 
     require 'set'
     assert_equal '1,2,3', bind('?', Set.new([1, 2, 3]))
-    assert_equal %('a','b','c'), bind('?', Set.new(%w(a b c)))
+    assert_equal quoted_abc, bind('?', Set.new(%w(a b c)))
 
     assert_equal '1,2,3', bind(':a', :a => Set.new([1, 2, 3]))
-    assert_equal %('a','b','c'), bind(':a', :a => Set.new(%w(a b c))) # '
+    assert_equal quoted_abc, bind(':a', :a => Set.new(%w(a b c))) # '
   end
 
   def test_bind_empty_enumerable
@@ -254,7 +297,7 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_bind_string
-    assert_equal "''", bind('?', '')
+    assert_equal ActiveRecord::Base.connection.quote(''), bind('?', '')
   end
 
   def test_bind_record
@@ -266,8 +309,8 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_string_sanitation
-    assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
-    assert_equal "'something; select table'", ActiveRecord::Base.sanitize("something; select table")
+    assert_not_equal "#{ActiveRecord::Base.connection.quoted_string_prefix}'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
+    assert_equal "#{ActiveRecord::Base.connection.quoted_string_prefix}'something; select table'", ActiveRecord::Base.sanitize("something; select table")
   end
 
   def test_count
@@ -286,6 +329,21 @@ class FinderTest < Test::Unit::TestCase
     assert_equal topics(:first), Topic.find_by_title("The First Topic")
     assert_nil Topic.find_by_title("The First Topic!")
   end
+  
+  def test_find_by_one_attribute_caches_dynamic_finder
+    # ensure this test can run independently of order
+    class << Topic; self; end.send(:remove_method, :find_by_title) if Topic.respond_to?(:find_by_title)
+    assert !Topic.respond_to?(:find_by_title)
+    t = Topic.find_by_title("The First Topic")
+    assert Topic.respond_to?(:find_by_title)
+  end
+
+  def test_dynamic_finder_returns_same_results_after_caching
+    # ensure this test can run independently of order
+    class << Topic; self; end.send(:remove_method, :find_by_title) if Topic.respond_to?(:find_by_title)
+    t = Topic.find_by_title("The First Topic")
+    assert_equal t, Topic.find_by_title("The First Topic") # find_by_title has been cached
+  end
 
   def test_find_by_one_attribute_with_order_option
     assert_equal accounts(:signals37), Account.find_by_credit_limit(50, :order => 'id')
@@ -296,14 +354,29 @@ class FinderTest < Test::Unit::TestCase
     assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6])
   end
 
+  def test_dynamic_finder_on_one_attribute_with_conditions_caches_method
+    # ensure this test can run independently of order
+    class << Account; self; end.send(:remove_method, :find_by_credit_limit) if Account.respond_to?(:find_by_credit_limit)
+    assert !Account.respond_to?(:find_by_credit_limit)
+    a = Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6])
+    assert Account.respond_to?(:find_by_credit_limit)
+  end
+
+  def test_dynamic_finder_on_one_attribute_with_conditions_returns_same_results_after_caching
+    # ensure this test can run independently of order
+    class << Account; self; end.send(:remove_method, :find_by_credit_limit) if Account.respond_to?(:find_by_credit_limit)
+    a = Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6])
+    assert_equal a, Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6]) # find_by_credit_limit has been cached
+  end
+
   def test_find_by_one_attribute_with_several_options
     assert_equal accounts(:unknown), Account.find_by_credit_limit(50, :order => 'id DESC', :conditions => ['id != ?', 3])
   end
-  
+
   def test_find_by_one_missing_attribute
     assert_raises(NoMethodError) { Topic.find_by_undertitle("The First Topic!") }
   end
-  
+
   def test_find_by_invalid_method_syntax
     assert_raises(NoMethodError) { Topic.fail_to_find_by_title("The First Topic") }
     assert_raises(NoMethodError) { Topic.find_by_title?("The First Topic") }
@@ -323,7 +396,7 @@ class FinderTest < Test::Unit::TestCase
 
     assert_equal [], Topic.find_all_by_title("The First Topic!!")
   end
-  
+
   def test_find_all_by_one_attribute_with_options
     topics = Topic.find_all_by_content("Have a nice day", :order => "id DESC")
     assert topics(:first), topics.last
@@ -345,19 +418,19 @@ class FinderTest < Test::Unit::TestCase
     assert_equal 1, topics.size
     assert topics.include?(topics(:second))
   end
-  
+
   def test_find_by_nil_attribute
     topic = Topic.find_by_last_read nil
     assert_not_nil topic
     assert_nil topic.last_read
   end
-  
+
   def test_find_all_by_nil_attribute
     topics = Topic.find_all_by_last_read nil
     assert_equal 1, topics.size
     assert_nil topics[0].last_read
   end
-  
+
   def test_find_by_nil_and_not_nil_attributes
     topic = Topic.find_by_last_read_and_author_name nil, "Mary"
     assert_equal "Mary", topic.author_name
@@ -384,13 +457,47 @@ class FinderTest < Test::Unit::TestCase
     assert_equal another, Topic.find_or_create_by_title_and_author_name("Another topic", "John")
     assert !another.new_record?
   end
-  
+
+  def test_find_or_create_from_one_attribute_and_hash
+    number_of_companies = Company.count
+    sig38 = Company.find_or_create_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
+    assert_equal number_of_companies + 1, Company.count
+    assert_equal sig38, Company.find_or_create_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
+    assert !sig38.new_record?
+    assert_equal "38signals", sig38.name
+    assert_equal 17, sig38.firm_id
+    assert_equal 23, sig38.client_of
+  end
+
   def test_find_or_initialize_from_one_attribute
     sig38 = Company.find_or_initialize_by_name("38signals")
     assert_equal "38signals", sig38.name
     assert sig38.new_record?
   end
   
+  def test_find_or_initialize_from_one_attribute_should_set_attribute_even_when_protected
+    c = Company.find_or_initialize_by_name_and_rating("Fortune 1000", 1000)
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000, c.rating
+    assert c.valid?
+    assert c.new_record?    
+  end
+
+  def test_find_or_create_from_one_attribute_should_set_attribute_even_when_protected
+    c = Company.find_or_create_by_name_and_rating("Fortune 1000", 1000)
+    assert_equal "Fortune 1000", c.name
+    assert_equal 1000, c.rating
+    assert c.valid?
+    assert !c.new_record?    
+  end
+
+  def test_dynamic_find_or_initialize_from_one_attribute_caches_method
+    class << Company; self; end.send(:remove_method, :find_or_initialize_by_name) if Company.respond_to?(:find_or_initialize_by_name)    
+    assert !Company.respond_to?(:find_or_initialize_by_name)
+    sig38 = Company.find_or_initialize_by_name("38signals")
+    assert Company.respond_to?(:find_or_initialize_by_name)
+  end
+
   def test_find_or_initialize_from_two_attributes
     another = Topic.find_or_initialize_by_title_and_author_name("Another topic","John")
     assert_equal "Another topic", another.title
@@ -398,6 +505,14 @@ class FinderTest < Test::Unit::TestCase
     assert another.new_record?
   end
 
+  def test_find_or_initialize_from_one_attribute_and_hash
+    sig38 = Company.find_or_initialize_by_name({:name => "38signals", :firm_id => 17, :client_of => 23})
+    assert_equal "38signals", sig38.name
+    assert_equal 17, sig38.firm_id
+    assert_equal 23, sig38.client_of
+    assert sig38.new_record?
+  end
+
   def test_find_with_bad_sql
     assert_raises(ActiveRecord::StatementInvalid) { Topic.find_by_sql "select 1 from badtable" }
   end
@@ -407,12 +522,16 @@ class FinderTest < Test::Unit::TestCase
     assert_raises(ArgumentError) { Topic.find :first, :conditions => '1 = 1', :join => "It should be `joins'" }
   end
 
+  def test_dynamic_finder_with_invalid_params
+    assert_raises(ArgumentError) { Topic.find_by_title 'No Title', :join => "It should be `joins'" }
+  end
+
   def test_find_all_with_limit
     first_five_developers = Developer.find :all, :order => 'id ASC', :limit =>  5
     assert_equal 5, first_five_developers.length
     assert_equal 'David', first_five_developers.first.name
     assert_equal 'fixture_5', first_five_developers.last.name
-    
+
     no_developers = Developer.find :all, :order => 'id ASC', :limit => 0
     assert_equal 0, no_developers.length
   end
@@ -421,11 +540,11 @@ class FinderTest < Test::Unit::TestCase
     first_three_developers = Developer.find :all, :order => 'id ASC', :limit => 3, :offset => 0
     second_three_developers = Developer.find :all, :order => 'id ASC', :limit => 3, :offset => 3
     last_two_developers = Developer.find :all, :order => 'id ASC', :limit => 2, :offset => 8
-    
+
     assert_equal 3, first_three_developers.length
     assert_equal 3, second_three_developers.length
     assert_equal 2, last_two_developers.length
-    
+
     assert_equal 'David', first_three_developers.first.name
     assert_equal 'fixture_4', second_three_developers.first.name
     assert_equal 'fixture_9', last_two_developers.first.name
@@ -443,8 +562,8 @@ class FinderTest < Test::Unit::TestCase
 
   def test_find_all_with_join
     developers_on_project_one = Developer.find(
-      :all, 
-      :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id', 
+      :all,
+      :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
       :conditions => 'project_id=1'
     )
     assert_equal 3, developers_on_project_one.length
@@ -453,6 +572,15 @@ class FinderTest < Test::Unit::TestCase
     assert developer_names.include?('Jamis')
   end
 
+  def test_joins_dont_clobber_id
+    first = Firm.find(
+      :first,
+      :joins => 'INNER JOIN companies AS clients ON clients.firm_id = companies.id',
+      :conditions => 'companies.id = 1'
+    )
+    assert_equal 1, first.id
+  end
+
   def test_find_by_id_with_conditions_with_or
     assert_nothing_raised do
       Post.find([1,2,3],
@@ -493,6 +621,16 @@ class FinderTest < Test::Unit::TestCase
     assert_equal ["37signals","Summit","Microsoft", "Flamboyant Software", "Ex Nihilo", "RailsCore", "Leetsoft", "Jadedpixel", "Odegy"], Company.connection.select_values("SELECT name FROM companies ORDER BY id")
   end
 
+  def test_select_rows
+    assert_equal(
+      [["1", nil, nil, "37signals"],
+       ["2", "1", "2", "Summit"],
+       ["3", "1", "1", "Microsoft"]],
+      Company.connection.select_rows("SELECT id, firm_id, client_of, name FROM companies WHERE id IN (1,2,3) ORDER BY id").map! {|i| i.map! {|j| j.to_s unless j.nil?}})
+    assert_equal [["1", "37signals"], ["2", "Summit"], ["3", "Microsoft"]],
+      Company.connection.select_rows("SELECT id, name FROM companies WHERE id IN (1,2,3) ORDER BY id").map! {|i| i.map! {|j| j.to_s unless j.nil?}}
+  end
+
   protected
     def bind(statement, *vars)
       if vars.first.is_a?(Hash)