activerecord 1.10.1 → 1.11.0

data/test/modules_test.rb

@@ -2,22 +2,17 @@ require 'abstract_unit'
 require 'fixtures/company_in_module'
 
 class ModulesTest < Test::Unit::TestCase
-  def setup
-    create_fixtures "accounts"
-    create_fixtures "companies"
-    create_fixtures "projects"
-    create_fixtures "developers"
-  end
+  fixtures :accounts, :companies, :projects, :developers
 
   def test_module_spanning_associations
-    assert MyApplication::Business::Firm.find_first.has_clients?, "Firm should have clients"
-    firm = MyApplication::Business::Firm.find_first
+    assert MyApplication::Business::Firm.find(:first).has_clients?, "Firm should have clients"
+    firm = MyApplication::Business::Firm.find(:first)
     assert_nil firm.class.table_name.match('::'), "Firm shouldn't have the module appear in its table name"
     assert_equal 2, firm.clients_count, "Firm should have two clients"
   end
 
   def test_module_spanning_has_and_belongs_to_many_associations
-    project = MyApplication::Business::Project.find_first
+    project = MyApplication::Business::Project.find(:first)
     project.developers << MyApplication::Business::Developer.create("name" => "John")
     assert "John", project.developers.last.name
   end
@@ -25,4 +20,4 @@ class ModulesTest < Test::Unit::TestCase
   def test_associations_spanning_cross_modules
     assert MyApplication::Billing::Account.find(1).has_firm?, "37signals account should be able to backtrack"
   end
-end
+end

data/test/multiple_db_test.rb

@@ -3,6 +3,8 @@ require 'fixtures/course'
 require 'fixtures/entrant'
 
 class MultipleDbTest < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
+
   def setup
     @courses  = create_fixtures("courses") { Course.retrieve_connection }
     @entrants = create_fixtures("entrants")

data/test/pk_test.rb

@@ -4,17 +4,13 @@ require 'fixtures/subscriber'
 require 'fixtures/movie'
 
 class PrimaryKeysTest < Test::Unit::TestCase
-  def setup
-    @topics      = create_fixtures "topics"
-    @subscribers = create_fixtures "subscribers"
-    @movies      = create_fixtures "movies"
-  end
+  fixtures :topics, :subscribers, :movies
 
   def test_integer_key
     topic = Topic.find(1)
-    assert_equal(@topics["first"]["author_name"], topic.author_name)
+    assert_equal(topics(:first).author_name, topic.author_name)
     topic = Topic.find(2)
-    assert_equal(@topics["second"]["author_name"], topic.author_name)
+    assert_equal(topics(:second).author_name, topic.author_name)
 
     topic = Topic.new
     topic.title = "New Topic"
@@ -27,10 +23,10 @@ class PrimaryKeysTest < Test::Unit::TestCase
   end
 
   def test_string_key
-    subscriber = Subscriber.find(@subscribers["first"]["nick"])
-    assert_equal(@subscribers["first"]["name"], subscriber.name)
-    subscriber = Subscriber.find(@subscribers["second"]["nick"])
-    assert_equal(@subscribers["second"]["name"], subscriber.name)
+    subscriber = Subscriber.find(subscribers(:first).nick)
+    assert_equal(subscribers(:first).name, subscriber.name)
+    subscriber = Subscriber.find(subscribers(:second).nick)
+    assert_equal(subscribers(:second).name, subscriber.name)
 
     subscriber = Subscriber.new
     subscriber.id = "jdoe"
@@ -43,7 +39,7 @@ class PrimaryKeysTest < Test::Unit::TestCase
   end
 
   def test_find_with_more_than_one_string_key
-    assert_equal 2, Subscriber.find(@subscribers["first"]["nick"], @subscribers["second"]["nick"]).length
+    assert_equal 2, Subscriber.find(subscribers(:first).nick, subscribers(:second).nick).length
   end
   
   def test_primary_key_prefix

data/test/reflection_test.rb

@@ -5,10 +5,9 @@ require 'fixtures/company'
 require 'fixtures/company_in_module'
 
 class ReflectionTest < Test::Unit::TestCase
+  fixtures :topics, :customers, :companies
+
   def setup
-    @topics = create_fixtures "topics"
-    @customers = create_fixtures "customers"
-    @companies = create_fixtures "companies"
     @first = Topic.find(1)
   end
 
@@ -23,6 +22,11 @@ class ReflectionTest < Test::Unit::TestCase
     assert_equal 12, Topic.columns.length
   end
 
+  def test_columns_are_returned_in_the_order_they_were_declared
+    column_names = Topic.columns.map { |column| column.name }
+    assert_equal %w(id title author_name author_email_address written_on bonus_time last_read content approved replies_count parent_id type), column_names
+  end
+
   def test_content_columns
     assert_equal 8, Topic.content_columns.length
   end
@@ -78,4 +82,4 @@ class ReflectionTest < Test::Unit::TestCase
     assert_equal MyApplication::Business::Client, MyApplication::Business::Firm.reflect_on_association(:clients_of_firm).klass
     assert_equal MyApplication::Business::Firm, MyApplication::Billing::Account.reflect_on_association(:firm).klass
   end
-end
+end

data/test/schema_test_postgresql.rb

@@ -0,0 +1,63 @@
+require 'abstract_unit'
+
+class SchemaTest < Test::Unit::TestCase
+  SCHEMA_NAME = 'test_schema'
+  TABLE_NAME = 'things'
+  COLUMNS = [
+    'id integer',
+    'name character varying(50)',
+    'moment timestamp without time zone default now()'
+  ]
+
+  def setup
+    @connection = ActiveRecord::Base.connection
+    @connection.execute "CREATE SCHEMA #{SCHEMA_NAME} CREATE TABLE #{TABLE_NAME} (#{COLUMNS.join(',')})"
+  end
+
+  def teardown
+    @connection.execute "DROP TABLE #{SCHEMA_NAME}.#{TABLE_NAME}"
+    @connection.execute "DROP SCHEMA #{SCHEMA_NAME}"
+  end
+
+  def test_with_schema_prefixed_table_name
+    assert_nothing_raised do
+      assert_equal COLUMNS, columns("#{SCHEMA_NAME}.#{TABLE_NAME}")
+    end
+  end
+
+  def test_with_schema_search_path
+    assert_nothing_raised do
+      with_schema_search_path(SCHEMA_NAME) do
+        assert_equal COLUMNS, columns(TABLE_NAME)
+      end
+    end
+  end
+
+  def test_raise_on_unquoted_schema_name
+    assert_raise(ActiveRecord::StatementInvalid) do
+      with_schema_search_path '$user,public'
+    end
+  end
+
+  def test_without_schema_search_path
+    assert_raise(ActiveRecord::StatementInvalid) { columns(TABLE_NAME) }
+  end
+
+  def test_ignore_nil_schema_search_path
+    assert_nothing_raised { with_schema_search_path nil }
+  end
+
+  private
+    def columns(table_name)
+      @connection.send(:column_definitions, table_name).map do |name, type, default|
+        "#{name} #{type}" + (default ? " default #{default}" : '')
+      end
+    end
+
+    def with_schema_search_path(schema_search_path)
+      @connection.schema_search_path = schema_search_path
+      yield if block_given?
+    ensure
+      @connection.schema_search_path = "'$user', public"
+    end
+end

data/test/thread_safety_test.rb

@@ -2,8 +2,11 @@ require 'abstract_unit'
 require 'fixtures/topic'
 
 class ThreadSafetyTest < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
+
+  fixtures :topics
+
   def setup
-    @topics  = create_fixtures "topics"
     @threads = []
   end
   

data/test/transactions_test.rb

@@ -3,9 +3,14 @@ require 'fixtures/topic'
 
 
 class TransactionTest < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
+
+  fixtures :topics
+
   def setup
-    @topics         = create_fixtures "topics"
-    @first, @second = Topic.find(1, 2)
+    # 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
 
   def test_successful
@@ -53,6 +58,8 @@ class TransactionTest < Test::Unit::TestCase
   end
   
   def test_failing_with_object_rollback
+    assert !@first.approved?, "First should be unapproved initially"
+
     begin
       Topic.transaction(@first, @second) do
         @first.approved  = true

data/test/unconnected_test.rb

@@ -4,6 +4,7 @@ class TestRecord < ActiveRecord::Base
 end
 
 class TestUnconnectedAdaptor < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
 
   def setup
     @connection = ActiveRecord::Base.remove_connection

data/test/validations_test.rb

@@ -3,6 +3,17 @@ require 'fixtures/topic'
 require 'fixtures/reply'
 require 'fixtures/developer'
 
+# The following methods in Topic are used in test_conditional_validation_*
+class Topic
+  def condition_is_true
+    return true
+  end
+
+  def condition_is_true_but_its_not
+    return false
+  end
+end
+
 class ValidationsTest < Test::Unit::TestCase
   fixtures :topics, :developers
 
@@ -210,11 +221,16 @@ class ValidationsTest < Test::Unit::TestCase
 
     t = Topic.create
     assert !t.save
-    assert_equal "can't be empty", t.errors.on(:title)
-    assert_equal "can't be empty", t.errors.on(:content)
+    assert_equal "can't be blank", t.errors.on(:title)
+    assert_equal "can't be blank", t.errors.on(:content)
 
     t.title = "something"
-    t.content  = "another"
+    t.content  = "   "
+
+    assert !t.save
+    assert_equal "can't be blank", t.errors.on(:content)
+
+    t.content = "like stuff"
 
     assert t.save
   end
@@ -303,6 +319,20 @@ class ValidationsTest < Test::Unit::TestCase
     assert Topic.create("title" => nil, "content" => "abc").valid?
   end
 
+  def test_numericality_with_allow_nil_and_getter_method
+    Developer.validates_numericality_of( :salary, :allow_nil => true)
+    developer = Developer.new("name" => "michael", "salary" => nil)
+    developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end")
+    assert developer.valid?
+  end
+
+  def test_validates_exclusion_of
+    Topic.validates_exclusion_of( :title, :in => %w( abe monkey ) )
+
+    assert Topic.create("title" => "something", "content" => "abc").valid?
+    assert !Topic.create("title" => "monkey", "content" => "abc").valid?
+  end
+
   def test_validates_length_of_using_minimum
     Topic.validates_length_of :title, :minimum => 5
 
@@ -387,6 +417,48 @@ class ValidationsTest < Test::Unit::TestCase
     assert t.valid?
   end
 
+  def test_optionally_validates_length_of_using_within_on_create
+    Topic.validates_length_of :title, :content, :within => 5..10, :on => :create, :too_long => "my string is too long: %d"
+
+    t = Topic.create("title" => "thisisnotvalid", "content" => "whatever")
+    assert !t.save
+    assert t.errors.on(:title)
+    assert_equal "my string is too long: 10", t.errors[:title]
+
+    t.title = "butthisis"
+    assert t.save
+
+    t.title = "few"
+    assert t.save
+
+    t.content = "andthisislong"
+    assert t.save
+
+    t.content = t.title = "iamfine"
+    assert t.save
+  end
+
+  def test_optionally_validates_length_of_using_within_on_update
+    Topic.validates_length_of :title, :content, :within => 5..10, :on => :update, :too_short => "my string is too short: %d"
+
+    t = Topic.create("title" => "vali", "content" => "whatever")
+    assert !t.save
+    assert t.errors.on(:title)
+
+    t.title = "not"
+    assert !t.save
+    assert t.errors.on(:title)
+    assert_equal "my string is too short: 5", t.errors[:title]
+
+    t.title = "valid"
+    t.content = "andthisistoolong"
+    assert !t.save
+    assert t.errors.on(:content)
+
+    t.content = "iamfine"
+    assert t.save
+  end
+
   def test_validates_length_of_using_is
     Topic.validates_length_of :title, :is => 5
 
@@ -428,6 +500,15 @@ class ValidationsTest < Test::Unit::TestCase
     end
   end
 
+  def test_validates_length_with_globaly_modified_error_message
+    ActiveRecord::Errors.default_error_messages[:too_short] = 'tu est trops petit hombre %d'
+    Topic.validates_length_of :title, :minimum => 10
+    t = Topic.create(:title => 'too short')
+    assert !t.valid?
+
+    assert_equal 'tu est trops petit hombre 10', t.errors['title']
+  end
+
   def test_validates_size_of_association
     assert_nothing_raised { Topic.validates_size_of :replies, :minimum => 1 }
     t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
@@ -633,13 +714,13 @@ class ValidationsTest < Test::Unit::TestCase
   def test_validates_numericality_of
     Topic.validates_numericality_of( :approved, :allow_nil => true )
     ["10", "10.0", "10.5", "-10.5", "-0.0001","0090","-090","-090.1",nil,""].each do |v|
-        t = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => v)
+        t = Topic.new("title" => "numeric test", "content" => "whatever", "approved" => v)
         assert t.valid?, "#{v} not recognized as a number"
         # we cannot check this as approved is actually an integer field
         #assert_in_delta v.to_f, t.approved, 0.0000001
     end
   end
-  
+
   def test_validates_numericality_of_int_with_string
     Topic.validates_numericality_of( :approved, :only_integer => true )
     ["not a number","42 not a number","0xdeadbeef","0-1","--3","+-3","+3-1",nil].each do |v|
@@ -648,14 +729,76 @@ class ValidationsTest < Test::Unit::TestCase
         assert t.errors.on(:approved)
     end
   end
-  
+
   def test_validates_numericality_of_int
     Topic.validates_numericality_of( :approved, :only_integer => true, :allow_nil => true )
     ["42", "+42", "-42", "042", "0042", "-042", 42, nil,""].each do |v|
-        t = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => v)
+        t = Topic.new("title" => "numeric test", "content" => "whatever", "approved" => v)
         assert t.valid?, "#{v} not recognized as integer"
         assert_equal((v.nil? or v == "")? nil : v.to_i, t.approved)
     end
   end
 
-end
+  def test_conditional_validation_using_method_true
+    # When the method returns true
+    Topic.validates_length_of( :title, :maximum=>5, :too_long=>"hoo %d", :if => :condition_is_true )
+    t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
+    assert !t.valid?
+    assert t.errors.on(:title)
+    assert_equal "hoo 5", t.errors["title"]
+  end
+
+  def test_conditional_validation_using_method_false
+    # When the method returns false
+    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)      
+  end
+
+  def test_conditional_validation_using_string_true
+    # When the evaluated string returns true
+    Topic.validates_length_of( :title, :maximum=>5, :too_long=>"hoo %d", :if => "a = 1; a == 1" )
+    t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
+    assert !t.valid?
+    assert t.errors.on(:title)
+    assert_equal "hoo 5", t.errors["title"]
+  end
+
+  def test_conditional_validation_using_string_false
+    # When the evaluated string returns false
+    Topic.validates_length_of( :title, :maximum=>5, :too_long=>"hoo %d", :if => "false")
+    t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
+    assert t.valid?
+    assert !t.errors.on(:title)
+  end
+
+  def test_conditional_validation_using_block_true
+    # When the block returns true
+    Topic.validates_length_of( :title, :maximum=>5, :too_long=>"hoo %d",
+      :if => Proc.new { |r| r.content.size > 4 } )
+    t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
+    assert !t.valid?
+    assert t.errors.on(:title)
+    assert_equal "hoo 5", t.errors["title"]
+  end
+
+  def test_conditional_validation_using_block_false
+    # When the block returns false
+    Topic.validates_length_of( :title, :maximum=>5, :too_long=>"hoo %d",
+      :if => Proc.new { |r| r.title != "uhohuhoh"} )
+    t = Topic.create("title" => "uhohuhoh", "content" => "whatever")
+    assert t.valid?
+    assert !t.errors.on(:title)
+  end
+
+  def test_validates_associated_missing
+    Reply.validates_presence_of(:topic)
+    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
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.8
+rubygems_version: 0.8.10
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.10.1
-date: 2005-04-20
+  version: 1.11.0
+date: 2005-07-06
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
   - lib
@@ -49,6 +49,7 @@ files:
   - lib/active_record/locking.rb
   - lib/active_record/migration.rb
   - lib/active_record/observer.rb
+  - lib/active_record/query_cache.rb
   - lib/active_record/reflection.rb
   - lib/active_record/timestamp.rb
   - lib/active_record/transactions.rb
@@ -82,6 +83,7 @@ files:
   - test/active_schema_mysql.rb
   - test/aggregations_test.rb
   - test/all.sh
+  - test/association_callbacks_test.rb
   - test/association_inheritance_reload.rb
   - test/associations_go_eager_test.rb
   - test/associations_test.rb
@@ -99,13 +101,14 @@ files:
   - test/inheritance_test.rb
   - test/lifecycle_test.rb
   - test/locking_test.rb
-  - test/migration_mysql.rb
+  - test/migration_test.rb
   - test/mixin_nested_set_test.rb
   - test/mixin_test.rb
   - test/modules_test.rb
   - test/multiple_db_test.rb
   - test/pk_test.rb
   - test/reflection_test.rb
+  - test/schema_test_postgresql.rb
   - test/thread_safety_test.rb
   - test/transactions_test.rb
   - test/unconnected_test.rb
@@ -117,6 +120,7 @@ files:
   - test/connections/native_sqlite
   - test/connections/native_sqlite3
   - test/connections/native_sqlserver
+  - test/connections/native_sqlserver_odbc
   - test/connections/native_db2/connection.rb
   - test/connections/native_mysql/connection.rb
   - test/connections/native_oci/connection.rb
@@ -124,6 +128,7 @@ files:
   - test/connections/native_sqlite/connection.rb
   - test/connections/native_sqlite3/connection.rb
   - test/connections/native_sqlserver/connection.rb
+  - test/connections/native_sqlserver_odbc/connection.rb
   - test/fixtures/accounts.yml
   - test/fixtures/associations.png
   - test/fixtures/author.rb
@@ -211,6 +216,7 @@ files:
   - test/fixtures/developers_projects/jamis_active_record
   - test/fixtures/migrations/1_people_have_last_names.rb
   - test/fixtures/migrations/2_we_need_reminders.rb
+  - test/fixtures/migrations/3_innocent_jointable.rb
   - test/fixtures/naked/csv
   - test/fixtures/naked/yml
   - test/fixtures/naked/csv/accounts.csv
@@ -241,5 +247,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.4
+            version: 1.1.0
       version: