activerecord 1.14.4 → 1.15.0

data/test/table_name_test_sqlserver.rb

@@ -0,0 +1,23 @@
+require 'abstract_unit'
+require "#{File.dirname(__FILE__)}/../lib/active_record/schema"
+
+if ActiveRecord::Base.connection.supports_migrations?
+  class Order < ActiveRecord::Base
+    self.table_name = '[order]'
+  end
+
+  class TableNameTest < Test::Unit::TestCase
+    self.use_transactional_fixtures = false
+
+    # Ensures Model.columns works when using SQLServer escape characters.
+    # Enables legacy schemas using SQL reserved words as table names.
+    # Should work with table names with spaces as well ('table name').
+    def test_escaped_table_name
+      assert_nothing_raised do
+        ActiveRecord::Base.connection.select_all 'SELECT * FROM [order]'
+      end
+      assert_equal '[order]', Order.table_name
+      assert_equal 5, Order.columns.length
+    end
+  end
+end

data/test/threaded_connections_test.rb

@@ -1,10 +1,12 @@
 require 'abstract_unit'
 require 'fixtures/topic'
+require 'fixtures/reply'
 
-class ThreadedConnectionsTest < Test::Unit::TestCase
-  self.use_transactional_fixtures = false
+unless %w(FrontBase).include? ActiveRecord::Base.connection.adapter_name
+  class ThreadedConnectionsTest < Test::Unit::TestCase
+    self.use_transactional_fixtures = false
 
-  fixtures :topics
+    fixtures :topics
 
   def setup
     @connection = ActiveRecord::Base.remove_connection
@@ -25,21 +27,22 @@ class ThreadedConnectionsTest < Test::Unit::TestCase
     ActiveRecord::Base.allow_concurrency = use_threaded_connections
     ActiveRecord::Base.establish_connection(@connection)
     
-    5.times do
-      Thread.new do
-        Topic.find :first
-        @connections << ActiveRecord::Base.active_connections.values.first
-      end.join
+      5.times do
+        Thread.new do
+          Topic.find :first
+          @connections << ActiveRecord::Base.active_connections.values.first
+        end.join
+      end
     end
-  end
 
-  def test_threaded_connections
-    gather_connections(true)
-    assert_equal @connections.uniq.length, 5
-  end
+    def test_threaded_connections
+      gather_connections(true)
+      assert_equal @connections.uniq.length, 5
+    end
 
-  def test_unthreaded_connections
-    gather_connections(false)
-    assert_equal @connections.uniq.length, 1
+    def test_unthreaded_connections
+      gather_connections(false)
+      assert_equal @connections.uniq.length, 1
+    end
   end
 end

data/test/transactions_test.rb

@@ -1,15 +1,13 @@
 require 'abstract_unit'
 require 'fixtures/topic'
+require 'fixtures/reply'
 require 'fixtures/developer'
 
 class TransactionTest < Test::Unit::TestCase
   self.use_transactional_fixtures = false
-
   fixtures :topics, :developers
 
   def setup
-    # sqlite does not seem to return these in the right order, so we sort them
-    # explicitly for sqlite's sake. sqlite3 does fine.
     @first, @second = Topic.find(1, 2).sort_by { |t| t.id }
   end
 
@@ -92,12 +90,14 @@ class TransactionTest < Test::Unit::TestCase
     assert !@first.approved?, "First should be unapproved initially"
 
     begin
-      Topic.transaction(@first, @second) do
-        @first.approved  = true
-        @second.approved = false
-        @first.save
-        @second.save
-        raise "Bad things!"
+      assert_deprecated /Object transactions/ do
+        Topic.transaction(@first, @second) do
+          @first.approved  = true
+          @second.approved = false
+          @first.save
+          @second.save
+          raise "Bad things!"
+        end
       end
     rescue
       # caught it
@@ -136,81 +136,95 @@ class TransactionTest < Test::Unit::TestCase
     assert !Topic.find(2).approved?, "Second should have been unapproved"
   end
 
-  # This will cause transactions to overlap and fail unless they are
-  # performed on separate database connections.
-  def test_transaction_per_thread
-    assert_nothing_raised do
-      threads = (1..20).map do
-        Thread.new do
-          Topic.transaction do
-            topic = Topic.find(:first)
-            topic.approved = !topic.approved?
-            topic.save!
-            topic.approved = !topic.approved?
-            topic.save!
+  private
+    def add_exception_raising_after_save_callback_to_topic
+      Topic.class_eval { def after_save() raise "Make the transaction rollback" end }
+    end
+    
+    def remove_exception_raising_after_save_callback_to_topic
+      Topic.class_eval { remove_method :after_save }
+    end
+end
+
+if current_adapter?(:PostgreSQLAdapter)
+  class ConcurrentTransactionTest < TransactionTest
+    def setup
+      @allow_concurrency = ActiveRecord::Base.allow_concurrency
+      ActiveRecord::Base.allow_concurrency = true
+      super
+    end
+
+    def teardown
+      super
+      ActiveRecord::Base.allow_concurrency = @allow_concurrency
+    end
+
+    # This will cause transactions to overlap and fail unless they are performed on
+    # separate database connections.
+    def test_transaction_per_thread
+      assert_nothing_raised do
+        threads = (1..3).map do
+          Thread.new do
+            Topic.transaction do
+              topic = Topic.find(1)
+              topic.approved = !topic.approved?
+              topic.save!
+              topic.approved = !topic.approved?
+              topic.save!
+            end
           end
         end
-      end
 
-      threads.each { |t| t.join }
+        threads.each { |t| t.join }
+      end
     end
-  end
 
-  # Test for dirty reads among simultaneous transactions.
-  def test_transaction_isolation__read_committed
-    # Should be invariant.
-    original_salary = Developer.find(1).salary
-    temporary_salary = 200000
-
-    assert_nothing_raised do
-      threads = (1..20).map do
-        Thread.new do
-          Developer.transaction do
-            # Expect original salary.
-            dev = Developer.find(1)
-            assert_equal original_salary, dev.salary
-
-            dev.salary = temporary_salary
-            dev.save!
-
-            # Expect temporary salary.
-            dev = Developer.find(1)
-            assert_equal temporary_salary, dev.salary
-
-            dev.salary = original_salary
-            dev.save!
-
-            # Expect original salary.
-            dev = Developer.find(1)
-            assert_equal original_salary, dev.salary
+    # Test for dirty reads among simultaneous transactions.
+    def test_transaction_isolation__read_committed
+      # Should be invariant.
+      original_salary = Developer.find(1).salary
+      temporary_salary = 200000
+
+      assert_nothing_raised do
+        threads = (1..3).map do
+          Thread.new do
+            Developer.transaction do
+              # Expect original salary.
+              dev = Developer.find(1)
+              assert_equal original_salary, dev.salary
+
+              dev.salary = temporary_salary
+              dev.save!
+
+              # Expect temporary salary.
+              dev = Developer.find(1)
+              assert_equal temporary_salary, dev.salary
+
+              dev.salary = original_salary
+              dev.save!
+
+              # Expect original salary.
+              dev = Developer.find(1)
+              assert_equal original_salary, dev.salary
+            end
           end
         end
-      end
 
-      # Keep our eyes peeled.
-      threads << Thread.new do
-        10.times do
-          sleep 0.05
-          Developer.transaction do
-            # Always expect original salary.
-            assert_equal original_salary, Developer.find(1).salary
+        # Keep our eyes peeled.
+        threads << Thread.new do
+          10.times do
+            sleep 0.05
+            Developer.transaction do
+              # Always expect original salary.
+              assert_equal original_salary, Developer.find(1).salary
+            end
           end
         end
+
+        threads.each { |t| t.join }
       end
 
-      threads.each { |t| t.join }
+      assert_equal original_salary, Developer.find(1).salary
     end
-
-    assert_equal original_salary, Developer.find(1).salary
   end
-
-
-  private
-    def add_exception_raising_after_save_callback_to_topic
-      Topic.class_eval { def after_save() raise "Make the transaction rollback" end }
-    end
-    
-    def remove_exception_raising_after_save_callback_to_topic
-      Topic.class_eval { remove_method :after_save }
-    end
 end

data/test/validations_test.rb

@@ -26,16 +26,16 @@ class ValidationsTest < Test::Unit::TestCase
   def test_single_field_validation
     r = Reply.new
     r.title = "There's no content!"
-    assert !r.save, "A reply without content shouldn't be saveable"
+    assert !r.valid?, "A reply without content shouldn't be saveable"
 
     r.content = "Messa content!"
-    assert r.save, "A reply with content should be saveable"
+    assert r.valid?, "A reply with content should be saveable"
   end
 
   def test_single_attr_validation_and_error_msg
     r = Reply.new
     r.title = "There's no content!"
-    r.save
+    assert !r.valid?
     assert r.errors.invalid?("content"), "A reply without content should mark that attribute as invalid"
     assert_equal "Empty", r.errors.on("content"), "A reply without content should contain an error"
     assert_equal 1, r.errors.count
@@ -43,7 +43,7 @@ class ValidationsTest < Test::Unit::TestCase
 
   def test_double_attr_validation_and_error_msg
     r = Reply.new
-    assert !r.save
+    assert !r.valid?
 
     assert r.errors.invalid?("title"), "A reply without title should mark that attribute as invalid"
     assert_equal "Empty", r.errors.on("title"), "A reply without title should contain an error"
@@ -57,7 +57,7 @@ class ValidationsTest < Test::Unit::TestCase
   def test_error_on_create
     r = Reply.new
     r.title = "Wrong Create"
-    assert !r.save
+    assert !r.valid?
     assert r.errors.invalid?("title"), "A reply with a bad title should mark that attribute as invalid"
     assert_equal "is Wrong Create", r.errors.on("title"), "A reply with a bad content should contain an error"
   end
@@ -88,6 +88,12 @@ class ValidationsTest < Test::Unit::TestCase
     end
   end
 
+  def test_scoped_create_without_attributes
+    Reply.with_scope(:create => {}) do
+      assert_raises(ActiveRecord::RecordInvalid) { Reply.create! }
+    end
+  end
+
   def test_single_error_per_attr_iteration
     r = Reply.new
     r.save
@@ -135,6 +141,12 @@ class ValidationsTest < Test::Unit::TestCase
     assert reply.save(false)
   end
 
+  def test_create_without_validation_bang
+    count = Reply.count
+    assert_nothing_raised { Reply.new.save_without_validation! }
+    assert count+1, Reply.count
+  end
+
   def test_validates_each
     perform = true
     hits = 0
@@ -153,24 +165,21 @@ class ValidationsTest < Test::Unit::TestCase
     perform = false
   end
 
-  def test_errors_on_boundary_breaking
-    developer = Developer.new("name" => "xs")
-    assert !developer.save
-    assert_equal "is too short (minimum is 3 characters)", developer.errors.on("name")
+  def test_no_title_confirmation
+    Topic.validates_confirmation_of(:title)
 
-    developer.name = "All too very long for this boundary, it really is"
-    assert !developer.save
-    assert_equal "is too long (maximum is 20 characters)", developer.errors.on("name")
+    t = Topic.new(:author_name => "Plutarch")
+    assert t.valid?
 
-    developer.name = "Just right"
-    assert developer.save
-  end
+    t.title_confirmation = "Parallel Lives"
+    assert !t.valid?
 
-  def test_title_confirmation_no_confirm
-    Topic.validates_confirmation_of(:title)
+    t.title_confirmation = nil
+    t.title = "Parallel Lives"
+    assert t.valid?
 
-    t = Topic.create("title" => "We should not be confirmed")
-    assert t.save
+    t.title_confirmation = "Parallel Lives"
+    assert t.valid?
   end
 
   def test_title_confirmation
@@ -304,6 +313,37 @@ class ValidationsTest < Test::Unit::TestCase
     assert !r3.save, "Saving r3 the third time."
   end
 
+  def test_validate_case_insensitive_uniqueness
+    Topic.validates_uniqueness_of(:title, :parent_id, :case_sensitive => false, :allow_nil => true)
+
+    t = Topic.new("title" => "I'm unique!", :parent_id => 2)
+    assert t.save, "Should save t as unique"
+
+    t.content = "Remaining unique"
+    assert t.save, "Should still save t as unique"
+
+    t2 = Topic.new("title" => "I'm UNIQUE!", :parent_id => 1)
+    assert !t2.valid?, "Shouldn't be valid"
+    assert !t2.save, "Shouldn't save t2 as unique"
+    assert t2.errors.on(:title)
+    assert t2.errors.on(:parent_id)
+    assert_equal "has already been taken", t2.errors.on(:title)
+
+    t2.title = "I'm truly UNIQUE!"
+    assert !t2.valid?, "Shouldn't be valid"
+    assert !t2.save, "Shouldn't save t2 as unique"
+    assert_nil t2.errors.on(:title)
+    assert t2.errors.on(:parent_id)
+
+    t2.parent_id = 3
+    assert t2.save, "Should now save t2 as unique"
+
+    t2.parent_id = nil
+    t2.title = nil
+    assert t2.valid?, "should validate with nil"
+    assert t2.save, "should save with nil"
+  end
+
   def test_validate_format
     Topic.validates_format_of(:title, :content, :with => /^Validation\smacros \w+!$/, :message => "is bad data")
 
@@ -573,6 +613,18 @@ class ValidationsTest < Test::Unit::TestCase
 
     assert_equal 'tu est trops petit hombre 10', t.errors['title']
   end
+  
+  def test_add_on_boundary_breaking_is_deprecated
+    t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
+    class << t
+      def validate
+        errors.add_on_boundary_breaking('title', 1..6)
+      end
+    end
+    assert_deprecated 'add_on_boundary_breaking' do
+      assert !t.valid?
+    end
+  end
 
   def test_validates_size_of_association
     assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
@@ -672,7 +724,7 @@ class ValidationsTest < Test::Unit::TestCase
 
       t = Topic.create("title" => "一二三四五", "content" => "whatever")
       assert t.valid?
-      
+
       t.title = "一二34五六"
       assert !t.valid?
       assert t.errors.on(:title)
@@ -714,16 +766,16 @@ class ValidationsTest < Test::Unit::TestCase
       assert !t.save
       assert t.errors.on(:title)
       assert_equal "長すぎます: 10", t.errors[:title]
-      
+
       t.title = "一二三四五六七八九"
       assert t.save
-      
+
       t.title = "一二3"
       assert t.save
-      
+
       t.content = "一二三四五六七八九十"
       assert t.save
-      
+
       t.content = t.title = "一二三四五六"
       assert t.save
     end
@@ -736,17 +788,17 @@ class ValidationsTest < Test::Unit::TestCase
       t = Topic.create("title" => "一二三4", "content" => "whatever")
       assert !t.save
       assert t.errors.on(:title)
-      
+
       t.title = "1二三4"
       assert !t.save
       assert t.errors.on(:title)
       assert_equal "短すぎます: 5", t.errors[:title]
-      
+
       t.title = "valid"
       t.content = "一二三四五六七八九十A"
       assert !t.save
       assert t.errors.on(:content)
-      
+
       t.content = "一二345"
       assert t.save
     end
@@ -814,7 +866,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_throw_away_typing
-    d = Developer.create "name" => "David", "salary" => "100,000"
+    d = Developer.new("name" => "David", "salary" => "100,000")
     assert !d.valid?
     assert_equal 100, d.salary
     assert_equal "100,000", d.salary_before_type_cast
@@ -829,20 +881,20 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_validates_confirmation_of_with_custom_error_using_quotes
-    Developer.validates_confirmation_of :name, :message=> "This string contains 'single' and \"double\" quotes"
+    Developer.validates_confirmation_of :name, :message=> "confirm 'single' and \"double\" quotes"
     d = Developer.new
     d.name = "John"
     d.name_confirmation = "Johnny"
     assert !d.valid?
-    assert_equal d.errors.on(:name), "This string contains 'single' and \"double\" quotes"
+    assert_equal "confirm 'single' and \"double\" quotes", d.errors.on(:name)
   end
 
   def test_validates_format_of_with_custom_error_using_quotes
-    Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "This string contains 'single' and \"double\" quotes"
+    Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "format 'single' and \"double\" quotes"
     d = Developer.new
-    d.name = "John 32"
+    d.name = d.name_confirmation = "John 32"
     assert !d.valid?
-    assert_equal d.errors.on(:name), "This string contains 'single' and \"double\" quotes"
+    assert_equal "format 'single' and \"double\" quotes", d.errors.on(:name)
   end
 
   def test_validates_inclusion_of_with_custom_error_using_quotes
@@ -850,7 +902,7 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.salary = "90,000"
     assert !d.valid?
-    assert_equal d.errors.on(:salary).first, "This string contains 'single' and \"double\" quotes"
+    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:salary).first
   end
 
   def test_validates_length_of_with_custom_too_long_using_quotes
@@ -858,7 +910,7 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Jeffrey"
     assert !d.valid?
-    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).first
   end
 
   def test_validates_length_of_with_custom_too_short_using_quotes
@@ -866,7 +918,7 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).first
   end
 
   def test_validates_length_of_with_custom_message_using_quotes
@@ -874,7 +926,7 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).first
   end
 
   def test_validates_presence_of_with_custom_message_using_quotes
@@ -882,7 +934,7 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "Joe"
     assert !d.valid?
-    assert_equal d.errors.on(:non_existent), "This string contains 'single' and \"double\" quotes"
+    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:non_existent)
   end
 
   def test_validates_uniqueness_of_with_custom_message_using_quotes
@@ -890,7 +942,7 @@ class ValidationsTest < Test::Unit::TestCase
     d = Developer.new
     d.name = "David"
     assert !d.valid?
-    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+    assert_equal "This string contains 'single' and \"double\" quotes", d.errors.on(:name).first
   end
 
   def test_validates_associated_with_custom_message_using_quotes
@@ -899,7 +951,7 @@ class ValidationsTest < Test::Unit::TestCase
     r = Reply.create("title" => "A reply", "content" => "with content!")
     r.topic = Topic.create("title" => "uhohuhoh")
     assert !r.valid?
-    assert_equal r.errors.on(:topic).first, "This string contains 'single' and \"double\" quotes"
+    assert_equal "This string contains 'single' and \"double\" quotes", r.errors.on(:topic).first
   end
 
   def test_conditional_validation_using_method_true
@@ -916,7 +968,7 @@ class ValidationsTest < Test::Unit::TestCase
     Topic.validates_length_of( :title, :maximum=>5, :too_long=>"hoo %d", :if => :condition_is_true_but_its_not )
     t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
     assert t.valid?
-    assert !t.errors.on(:title)      
+    assert !t.errors.on(:title)
   end
 
   def test_conditional_validation_using_string_true
@@ -964,16 +1016,28 @@ class ValidationsTest < Test::Unit::TestCase
     r.topic = Topic.find :first
     assert r.valid?
   end
+
+  def test_errors_to_xml
+    r = Reply.new :title => "Wrong Create"
+    assert !r.valid?
+    xml = r.errors.to_xml(:skip_instruct => true)
+    assert_equal "<errors>", xml.first(8)
+    assert xml.include?("<error>Title is Wrong Create</error>")
+    assert xml.include?("<error>Content Empty</error>")
+  end
 end
 
 
-class ValidatesNumericalityTest
-  NIL = [nil, "", " ", " \t \r \n"]
-  FLOAT_STRINGS = %w(0.0 +0.0 -0.0 10.0 10.5 -10.5 -0.0001 -090.1)
+class ValidatesNumericalityTest < Test::Unit::TestCase
+  NIL = [nil]
+  BLANK = ["", " ", " \t \r \n"]
+  BIGDECIMAL_STRINGS = %w(12345678901234567890.1234567890) # 30 significent digits
+  FLOAT_STRINGS = %w(0.0 +0.0 -0.0 10.0 10.5 -10.5 -0.0001 -090.1 90.1e1 -90.1e5 -90.1e-5 90e-5)
   INTEGER_STRINGS = %w(0 +0 -0 10 +10 -10 0090 -090)
   FLOATS = [0.0, 10.0, 10.5, -10.5, -0.0001] + FLOAT_STRINGS
   INTEGERS = [0, 10, -10] + INTEGER_STRINGS
-  JUNK = ["not a number", "42 not a number", "0xdeadbeef", "00-1", "--3", "+-3", "+3-1", "-+019.0", "12.12.13.12"]
+  BIGDECIMAL = BIGDECIMAL_STRINGS.collect! { |bd| BigDecimal.new(bd) }
+  JUNK = ["not a number", "42 not a number", "0xdeadbeef", "00-1", "--3", "+-3", "+3-1", "-+019.0", "12.12.13.12", "123\nnot a number"]
 
   def setup
     Topic.write_inheritable_attribute(:validate, nil)
@@ -984,44 +1048,50 @@ class ValidatesNumericalityTest
   def test_default_validates_numericality_of
     Topic.validates_numericality_of :approved
 
-    invalid!(NIL + JUNK)
-    valid!(FLOATS + INTEGERS)
+    invalid!(NIL + BLANK + JUNK)
+    valid!(FLOATS + INTEGERS + BIGDECIMAL)
   end
 
   def test_validates_numericality_of_with_nil_allowed
     Topic.validates_numericality_of :approved, :allow_nil => true
 
-    invalid!(JUNK)
-    valid!(NIL + FLOATS + INTEGERS)
+    invalid!(BLANK + JUNK)
+    valid!(NIL + FLOATS + INTEGERS + BIGDECIMAL)
   end
 
   def test_validates_numericality_of_with_integer_only
     Topic.validates_numericality_of :approved, :only_integer => true
 
-    invalid!(NIL + JUNK + FLOATS)
+    invalid!(NIL + BLANK + JUNK + FLOATS + BIGDECIMAL)
     valid!(INTEGERS)
   end
 
   def test_validates_numericality_of_with_integer_only_and_nil_allowed
     Topic.validates_numericality_of :approved, :only_integer => true, :allow_nil => true
 
-    invalid!(JUNK + FLOATS)
+    invalid!(BLANK + JUNK + FLOATS + BIGDECIMAL)
     valid!(NIL + INTEGERS)
   end
 
   private
     def invalid!(values)
-      values.each do |value|
-        topic = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => value)
-        assert !topic.valid?, "#{value} not rejected as a number"
+      with_each_topic_approved_value(values) do |topic, value|
+        assert !topic.valid?, "#{value.inspect} not rejected as a number"
         assert topic.errors.on(:approved)
       end
     end
 
     def valid!(values)
+      with_each_topic_approved_value(values) do |topic, value|
+        assert topic.valid?, "#{value.inspect} not accepted as a number"
+      end
+    end
+
+    def with_each_topic_approved_value(values)
+      topic = Topic.new("title" => "numeric test", "content" => "whatever")
       values.each do |value|
-        topic = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => value)
-        assert topic.valid?, "#{value} not accepted as a number"
+        topic.approved = value
+        yield topic, value
       end
     end
 end