activerecord 1.14.4 → 1.15.0

data/test/deprecated_finder_test.rb

@@ -1,6 +1,7 @@
 require 'abstract_unit'
 require 'fixtures/company'
 require 'fixtures/topic'
+require 'fixtures/reply'
 require 'fixtures/entrant'
 require 'fixtures/developer'
 
@@ -8,78 +9,88 @@ class DeprecatedFinderTest < Test::Unit::TestCase
   fixtures :companies, :topics, :entrants, :developers
 
   def test_find_all_with_limit
-    entrants = Entrant.find_all nil, "id ASC", 2
-    
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:first).name, entrants.first.name)
+    entrants = assert_deprecated { Entrant.find_all nil, "id ASC", 2 }
+    assert_equal 2, entrants.size
+    assert_equal entrants(:first), entrants.first
   end
 
   def test_find_all_with_prepared_limit_and_offset
-    entrants = Entrant.find_all nil, "id ASC", [2, 1]
-
-    assert_equal(2, entrants.size)
-    assert_equal(entrants(:second).name, entrants.first.name)
+    entrants = assert_deprecated { Entrant.find_all nil, "id ASC", [2, 1] }
+    assert_equal 2, entrants.size
+    assert_equal entrants(:second), entrants.first
   end
 
   def test_find_first
-    first = Topic.find_first "title = 'The First Topic'"
-    assert_equal(topics(:first).title, first.title)
+    first = assert_deprecated { Topic.find_first "title = 'The First Topic'" }
+    assert_equal topics(:first), first
   end
-  
+
   def test_find_first_failing
-    first = Topic.find_first "title = 'The First Topic!'"
-    assert_nil(first)
+    first = assert_deprecated { Topic.find_first "title = 'The First Topic!'" }
+    assert_nil first
   end
-  
+
   def test_deprecated_find_on_conditions
-    assert Topic.find_on_conditions(1, ["approved = ?", false])
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find_on_conditions(1, ["approved = ?", true]) }
+    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_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
+    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_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])
-    }
+    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 Company.find_first(["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 Company.find_first(["name = :name", {: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_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
+
+    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
   end
 
   def test_count
-    assert_equal(0, Entrant.count("id > 3"))
-    assert_equal(1, Entrant.count(["id > ?", 2]))
-    assert_equal(2, Entrant.count(["id > ?", 1]))
+    assert_equal(0, Entrant.count(:conditions => "id > 3"))
+    assert_equal(1, Entrant.count(:conditions => ["id > ?", 2]))
+    assert_equal(2, Entrant.count(:conditions => ["id > ?", 1]))
   end
 
   def test_count_by_sql
@@ -89,38 +100,44 @@ class DeprecatedFinderTest < Test::Unit::TestCase
   end
 
   def test_find_all_with_limit
-    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])
+    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
-    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
+    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
-    topics = Topic.find_all_by_content("Have a nice day", "id DESC")
-    assert topics(:first), topics.last
+    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
+      topics = Topic.find_all_by_content("Have a nice day", "id DESC")
+      assert topics(:first), topics.first
+    end
   end
 
   protected

data/test/empty_date_time_test.rb

@@ -0,0 +1,25 @@
+require 'abstract_unit'
+require 'fixtures/topic'
+require 'fixtures/task'
+
+class EmptyDateTimeTest < Test::Unit::TestCase
+  def test_assign_empty_date_time
+    task = Task.new
+    task.starting = ''
+    task.ending = nil
+    assert_nil task.starting
+    assert_nil task.ending
+  end
+
+  def test_assign_empty_date
+    topic = Topic.new
+    topic.last_read = ''
+    assert_nil topic.last_read
+  end
+
+  def test_assign_empty_time
+    topic = Topic.new
+    topic.bonus_time = ''
+    assert_nil topic.bonus_time
+  end
+end

data/test/finder_test.rb

@@ -13,11 +13,21 @@ class FinderTest < Test::Unit::TestCase
     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?(45))
-    assert !(Topic.exists?("foo"))
-    assert !(Topic.exists?([1,2]))
+    assert Topic.exists?(1)
+    assert Topic.exists?("1")
+    assert Topic.exists?(:author_name => "David")
+    assert Topic.exists?(:author_name => "Mary", :approved => true)
+    assert Topic.exists?(["parent_id = ?", 1])
+    assert !Topic.exists?(45)
+    assert !Topic.exists?("foo")
+    assert_raise(NoMethodError) { Topic.exists?([1,2]) }
   end
   
   def test_find_by_array_of_one_id
@@ -83,6 +93,11 @@ class FinderTest < Test::Unit::TestCase
     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)
@@ -111,17 +126,58 @@ class FinderTest < Test::Unit::TestCase
     assert topic.respond_to?("author_name")
   end
 
-  def test_find_on_conditions
+  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_condition_interpolation
+  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_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_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 })
+    }
+  end
+
+  def test_hash_condition_find_with_escaped_characters
+    Company.create("name" => "Ain't noth'n like' \#stuff")
+    assert Company.find(:first, :conditions => { :name => "Ain't noth'n like' \#stuff" })
+  end
+
+  def test_hash_condition_find_with_array
+    p1, p2 = Post.find(:all, :limit => 2, :order => 'id asc')
+    assert_equal [p1, p2], Post.find(:all, :conditions => { :id => [p1, p2] }, :order => 'id asc')
+    assert_equal [p1, p2], Post.find(:all, :conditions => { :id => [p1, p2.id] }, :order => 'id asc')
+  end
+
+  def test_hash_condition_find_with_nil
+    topic = Topic.find(:first, :conditions => { :last_read => nil } )
+    assert_not_nil topic
+    assert_nil topic.last_read
+  end
 
   def test_bind_variables
     assert_kind_of Firm, Company.find(:first, :conditions => ["name = ?", "37signals"])
@@ -180,19 +236,34 @@ class FinderTest < Test::Unit::TestCase
     assert_equal %('a','b','c'), bind(':a', :a => Set.new(%w(a b c))) # '
   end
 
+  def test_bind_empty_enumerable
+    quoted_nil = ActiveRecord::Base.connection.quote(nil)
+    assert_equal quoted_nil, bind('?', [])
+    assert_equal " in (#{quoted_nil})", bind(' in (?)', [])
+    assert_equal "foo in (#{quoted_nil})", bind('foo in (?)', [])
+  end
+
   def test_bind_string
     assert_equal "''", bind('?', '')
   end
 
+  def test_bind_record
+    o = Struct.new(:quoted_id).new(1)
+    assert_equal '1', bind('?', o)
+
+    os = [o] * 3
+    assert_equal '1,1,1', bind('?', os)
+  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")
   end
 
   def test_count
-    assert_equal(0, Entrant.count("id > 3"))
-    assert_equal(1, Entrant.count(["id > ?", 2]))
-    assert_equal(2, Entrant.count(["id > ?", 1]))
+    assert_equal(0, Entrant.count(:conditions => "id > 3"))
+    assert_equal(1, Entrant.count(:conditions => ["id > ?", 2]))
+    assert_equal(2, Entrant.count(:conditions => ["id > ?", 1]))
   end
 
   def test_count_by_sql
@@ -222,6 +293,13 @@ class FinderTest < Test::Unit::TestCase
   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") }
+    assert_raises(NoMethodError) { Topic.fail_to_find_or_create_by_title("Nonexistent Title") }
+    assert_raises(NoMethodError) { Topic.find_or_create_by_title?("Nonexistent Title") }
+  end
 
   def test_find_by_two_attributes
     assert_equal topics(:first), Topic.find_by_title_and_author_name("The First Topic", "David")
@@ -286,6 +364,7 @@ class FinderTest < Test::Unit::TestCase
     sig38 = Company.find_or_create_by_name("38signals")
     assert_equal number_of_companies + 1, Company.count
     assert_equal sig38, Company.find_or_create_by_name("38signals")
+    assert !sig38.new_record?
   end
 
   def test_find_or_create_from_two_attributes
@@ -293,6 +372,20 @@ class FinderTest < Test::Unit::TestCase
     another = Topic.find_or_create_by_title_and_author_name("Another topic","John")
     assert_equal number_of_topics + 1, Topic.count
     assert_equal another, Topic.find_or_create_by_title_and_author_name("Another topic", "John")
+    assert !another.new_record?
+  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_two_attributes
+    another = Topic.find_or_initialize_by_title_and_author_name("Another topic","John")
+    assert_equal "Another topic", another.title
+    assert_equal "John", another.author_name
+    assert another.new_record?
   end
 
   def test_find_with_bad_sql
@@ -357,6 +450,20 @@ class FinderTest < Test::Unit::TestCase
     end
   end
 
+  def test_find_by_empty_ids
+    assert_equal [], Post.find([])
+  end
+
+  def test_find_by_empty_in_condition
+    assert_equal [], Post.find(:all, :conditions => ['id in (?)', []])
+  end
+
+  def test_find_by_records
+    p1, p2 = Post.find(:all, :limit => 2, :order => 'id asc')
+    assert_equal [p1, p2], Post.find(:all, :conditions => ['id in (?)', [p1, p2]], :order => 'id asc')
+    assert_equal [p1, p2], Post.find(:all, :conditions => ['id in (?)', [p1, p2.id]], :order => 'id asc')
+  end
+
   def test_select_value
     assert_equal "37signals", Company.connection.select_value("SELECT name FROM companies WHERE id = 1")
     assert_nil Company.connection.select_value("SELECT name FROM companies WHERE id = -1")
@@ -366,8 +473,8 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_select_values
-    assert_equal ["1","2","3","4","5","6","7","8"], Company.connection.select_values("SELECT id FROM companies ORDER BY id").map! { |i| i.to_s }
-    assert_equal ["37signals","Summit","Microsoft", "Flamboyant Software", "Ex Nihilo", "RailsCore", "Leetsoft", "Jadedpixel"], Company.connection.select_values("SELECT name FROM companies ORDER BY id")
+    assert_equal ["1","2","3","4","5","6","7","8","9"], Company.connection.select_values("SELECT id FROM companies ORDER BY id").map! { |i| i.to_s }
+    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
 
   protected

data/test/fixtures/accounts.yml

@@ -20,4 +20,9 @@ last_account:
 rails_core_account_2:
   id: 5
   firm_id: 6
-  credit_limit: 55
+  credit_limit: 55
+
+odegy_account:
+  id: 6
+  firm_id: 9
+  credit_limit: 53