activerecord 2.0.2 → 2.0.4

data/test/fixtures/author.rb

@@ -105,5 +105,5 @@ end
 
 class AuthorFavorite < ActiveRecord::Base
   belongs_to :author
-  belongs_to :favorite_author, :class_name => "Author", :foreign_key => 'favorite_author_id'
+  belongs_to :favorite_author, :class_name => "Author"
 end

data/test/fixtures_test.rb

@@ -324,21 +324,29 @@ class MultipleFixturesTest < Test::Unit::TestCase
   end
 end
 
-# This is to reproduce a bug where if a TestCase is loaded
-# twice by Ruby, it loses its fixture setup hook.
-class_def = <<-CODE
-  class DoubleLoadedTestCase < Test::Unit::TestCase
-    fixtures :topics
+class SetupTest < Test::Unit::TestCase
+  # fixtures :topics
+  
+  def setup
+    @first = true
+  end
+  
+  def test_nothing
+  end
+end
 
-    def setup
-    end
+class SetupSubclassTest < SetupTest
+  def setup
+    super
+    @second = true
+  end
   
-    def test_should_properly_setup_fixtures
-      assert_nothing_raised { topics(:first) }
-    end
+  def test_subclassing_should_preserve_setups
+    assert @first
+    assert @second
   end
-CODE
-2.times { eval(class_def) }
+end
+
 
 class OverlappingFixturesTest < Test::Unit::TestCase
   fixtures :topics, :developers

data/test/migration_test.rb

@@ -431,6 +431,44 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
     
+    def test_rename_column_with_an_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+      end
+      Person.connection.add_index :people, :first_name
+      assert_nothing_raised do
+        Person.connection.rename_column "hats", "hat_name", "name"
+      end
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
+    def test_remove_column_with_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+      end
+      ActiveRecord::Base.connection.add_index "hats", "hat_size"
+
+      assert_nothing_raised { Person.connection.remove_column("hats", "hat_size") }
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
+    def test_remove_column_with_multi_column_index
+      ActiveRecord::Base.connection.create_table(:hats) do |table|
+        table.column :hat_name, :string, :limit => 100
+        table.column :hat_size, :integer
+        table.column :hat_style, :string, :limit => 100
+      end
+      ActiveRecord::Base.connection.add_index "hats", ["hat_style", "hat_size"], :unique => true
+
+      assert_nothing_raised { Person.connection.remove_column("hats", "hat_size") }
+    ensure
+      ActiveRecord::Base.connection.drop_table(:hats)
+    end
+
     def test_change_type_of_not_null_column
       assert_nothing_raised do
         Topic.connection.change_column "topics", "written_on", :datetime, :null => false
@@ -887,6 +925,14 @@ if ActiveRecord::Base.connection.supports_migrations?
         end
       end
       
+      def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
+        with_new_table do |t|
+          t.expects(:column).with('taggable_type', :string, {:null => false})
+          t.expects(:column).with('taggable_id', :integer, {:null => false})
+          t.references :taggable, :polymorphic => true, :null => false
+        end
+      end
+
       def test_belongs_to_works_like_references
         with_new_table do |t|
           t.expects(:column).with('customer_id', :integer, {})

data/test/query_cache_test.rb

@@ -3,10 +3,12 @@ require 'fixtures/topic'
 require 'fixtures/reply'
 require 'fixtures/task'
 require 'fixtures/course'
+require 'fixtures/category'
+require 'fixtures/post'
 
 
-class QueryCacheTest < Test::Unit::TestCase
-  fixtures :tasks, :topics
+class QueryCacheTest < ActiveSupport::TestCase
+  fixtures :tasks, :topics, :categories, :posts, :categories_posts
 
   def test_find_queries
     assert_queries(2) { Task.find(1); Task.find(1) }
@@ -99,6 +101,24 @@ class QueryCacheExpiryTest < Test::Unit::TestCase
       Task.create!
     end
   end
+
+  def test_cache_is_expired_by_habtm_update
+    ActiveRecord::Base.connection.expects(:clear_query_cache).times(2)
+    ActiveRecord::Base.cache do
+      c = Category.find(:first)
+      p = Post.find(:first)
+      p.categories << c
+    end
+  end
+
+  def test_cache_is_expired_by_habtm_delete
+    ActiveRecord::Base.connection.expects(:clear_query_cache).times(2)
+    ActiveRecord::Base.cache do
+      c = Category.find(:first)
+      p = Post.find(:first)
+      p.categories.delete_all
+    end
+  end
 end
 
 end

data/test/validations_test.rb

@@ -150,7 +150,7 @@ class ValidationsTest < Test::Unit::TestCase
 
   def test_create_with_exceptions_using_scope_and_empty_attributes
     assert_nothing_raised do
-      ProtectedPerson.with_scope( :create => { :first_name => "Mary" } ) do        
+      ProtectedPerson.with_scope( :create => { :first_name => "Mary" } ) do
         person = ProtectedPerson.create!
         assert_equal person.first_name, "Mary", "should be ok when no attributes are passed to create!"
       end
@@ -301,13 +301,13 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "Dan Brown", reply["author_name"]
   end
 
-  def test_validates_acceptance_of_with_non_existant_table 
-    Object.const_set :IncorporealModel, Class.new(ActiveRecord::Base) 
- 
-    assert_nothing_raised ActiveRecord::StatementInvalid do 
-      IncorporealModel.validates_acceptance_of(:incorporeal_column) 
-    end 
-  end 
+  def test_validates_acceptance_of_with_non_existant_table
+    Object.const_set :IncorporealModel, Class.new(ActiveRecord::Base)
+
+    assert_nothing_raised ActiveRecord::StatementInvalid do
+      IncorporealModel.validates_acceptance_of(:incorporeal_column)
+    end
+  end
 
   def test_validate_presences
     Topic.validates_presence_of(:title, :content)
@@ -384,22 +384,22 @@ class ValidationsTest < Test::Unit::TestCase
     Reply.validates_uniqueness_of(:author_name, :scope => [:author_email_address, :parent_id])
 
     t = Topic.create("title" => "The earth is actually flat!")
- 
+
     r1 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy@rubyonrails.com", "title" => "You're crazy!", "content" => "Crazy reply"
     assert r1.valid?, "Saving r1"
-    
+
     r2 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy@rubyonrails.com", "title" => "You're crazy!", "content" => "Crazy reply again..."
-    assert !r2.valid?, "Saving r2. Double reply by same author." 
-    
+    assert !r2.valid?, "Saving r2. Double reply by same author."
+
     r2.author_email_address = "jeremy_alt_email@rubyonrails.com"
-    assert r2.save, "Saving r2 the second time." 
-    
+    assert r2.save, "Saving r2 the second time."
+
     r3 = t.replies.create "author_name" => "jeremy", "author_email_address" => "jeremy_alt_email@rubyonrails.com", "title" => "You're wrong", "content" => "It's cubic"
     assert !r3.valid?, "Saving r3"
-    
+
     r3.author_name = "jj"
     assert r3.save, "Saving r3 the second time."
-    
+
     r3.author_name = "jeremy"
     assert !r3.save, "Saving r3 the third time."
   end
@@ -480,7 +480,15 @@ class ValidationsTest < Test::Unit::TestCase
 
     assert_raise(ArgumentError) { Topic.validates_format_of(:title, :content) }
   end
-  
+
+  def test_validate_format_with_allow_blank
+	Topic.validates_format_of(:title, :with => /^Validation\smacros \w+!$/, :allow_blank=>true)
+	assert !Topic.create("title" => "Shouldn't be valid").valid?
+	assert Topic.create("title" => "").valid?
+	assert Topic.create("title" => nil).valid?
+	assert Topic.create("title" => "Validation macros rule!").valid?
+	end
+
   # testing ticket #3142
   def test_validate_format_numeric
     Topic.validates_format_of(:title, :content, :with => /^[1-9][0-9]*$/, :message => "is bad data")
@@ -849,18 +857,8 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "hoo 5", t.errors["title"]
   end
 
-  def kcode_scope(kcode)
-    orig_kcode = $KCODE
-    $KCODE = kcode
-    begin
-      yield
-    ensure
-      $KCODE = orig_kcode
-    end
-  end
-
   def test_validates_length_of_using_minimum_utf8
-    kcode_scope('UTF8') do
+    with_kcode('UTF8') do
       Topic.validates_length_of :title, :minimum => 5
 
       t = Topic.create("title" => "一二三四五", "content" => "whatever")
@@ -874,7 +872,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_validates_length_of_using_maximum_utf8
-    kcode_scope('UTF8') do
+    with_kcode('UTF8') do
       Topic.validates_length_of :title, :maximum => 5
 
       t = Topic.create("title" => "一二三四五", "content" => "whatever")
@@ -888,7 +886,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_validates_length_of_using_within_utf8
-    kcode_scope('UTF8') do
+    with_kcode('UTF8') do
       Topic.validates_length_of(:title, :content, :within => 3..5)
 
       t = Topic.new("title" => "一二", "content" => "12三四五六七")
@@ -902,7 +900,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_optionally_validates_length_of_using_within_utf8
-    kcode_scope('UTF8') do
+    with_kcode('UTF8') do
       Topic.validates_length_of :title, :content, :within => 3..5, :allow_nil => true
 
       t = Topic.create('title' => '一二三', 'content' => '一二三四五')
@@ -914,7 +912,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_optionally_validates_length_of_using_within_on_create_utf8
-    kcode_scope('UTF8') do
+    with_kcode('UTF8') do
       Topic.validates_length_of :title, :content, :within => 5..10, :on => :create, :too_long => "長すぎます: %d"
 
       t = Topic.create("title" => "一二三四五六七八九十A", "content" => "whatever")
@@ -937,7 +935,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_optionally_validates_length_of_using_within_on_update_utf8
-    kcode_scope('UTF8') do    
+    with_kcode('UTF8') do
       Topic.validates_length_of :title, :content, :within => 5..10, :on => :update, :too_short => "短すぎます: %d"
 
       t = Topic.create("title" => "一二三4", "content" => "whatever")
@@ -960,7 +958,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_validates_length_of_using_is_utf8
-    kcode_scope('UTF8') do
+    with_kcode('UTF8') do
       Topic.validates_length_of :title, :is => 5
 
       t = Topic.create("title" => "一二345", "content" => "whatever")
@@ -974,7 +972,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   def test_validates_size_of_association_utf8
-    kcode_scope('UTF8') do
+    with_kcode('UTF8') do
       assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
       t = Topic.new('title' => 'あいうえお', 'content' => 'かきくけこ')
       assert !t.save
@@ -1222,7 +1220,7 @@ class ValidationsTest < Test::Unit::TestCase
     r = Reply.create("title" => "A reply", "content" => "with content!")
     assert !r.valid?
     assert r.errors.on(:topic)
-    
+
     r.topic = Topic.find :first
     assert r.valid?
   end
@@ -1245,8 +1243,8 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal "can't be blank", t.errors.on("title").first
  end
 
-  # previous implementation of validates_presence_of eval'd the 
-  # string with the wrong binding, this regression test is to 
+  # previous implementation of validates_presence_of eval'd the
+  # string with the wrong binding, this regression test is to
   # ensure that it works correctly
   def test_validation_with_if_as_string
     Topic.validates_presence_of(:title)
@@ -1266,6 +1264,20 @@ class ValidationsTest < Test::Unit::TestCase
     t.author_name = "Hubert J. Farnsworth"
     assert t.valid?, "A topic with an important title and author should be valid"
   end
+
+  private
+    def with_kcode(kcode)
+      if RUBY_VERSION < '1.9'
+        orig_kcode, $KCODE = $KCODE, kcode
+        begin
+          yield
+        ensure
+          $KCODE = orig_kcode
+        end
+      else
+        yield
+      end
+    end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,17 +9,18 @@ autorequire: active_record
 bindir: bin
 cert_chain: []
 
-date: 2007-12-20 00:00:00 -06:00
+date: 2008-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.4
     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
@@ -139,6 +140,7 @@ files:
 - test/copy_table_test_sqlite.rb
 - test/datatype_test_postgresql.rb
 - test/date_time_test.rb
+- test/debug.log
 - test/default_test_firebird.rb
 - test/defaults_test.rb
 - test/deprecated_finder_test.rb
@@ -235,6 +237,8 @@ files:
 - test/fixtures/entrant.rb
 - test/fixtures/entrants.yml
 - test/fixtures/example.log
+- test/fixtures/fixture_database.sqlite3
+- test/fixtures/fixture_database_2.sqlite3
 - test/fixtures/fk_test_has_fk.yml
 - test/fixtures/fk_test_has_pk.yml
 - test/fixtures/flowers.jpg
@@ -368,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activerecord
-rubygems_version: 1.0.0
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Implements the ActiveRecord pattern for ORM.