activerecord 1.13.2 → 1.14.0

data/test/callbacks_test.rb

@@ -324,39 +324,21 @@ class CallbacksTest < Test::Unit::TestCase
   def test_before_save_returning_false
     david = ImmutableDeveloper.find(1)
     assert david.valid?
-    assert david.save
-    assert david.cancelled?
-
-    david = ImmutableDeveloper.find(1)
-    david.salary = 10_000_000
-    assert !david.valid?
     assert !david.save
-    assert !david.cancelled?
-
-    david = ImmutableMethodDeveloper.find(1)
-    assert david.valid?
-    assert david.save
-    assert david.cancelled?
+    assert_raises(ActiveRecord::RecordNotSaved) { david.save! }
 
-    david = ImmutableMethodDeveloper.find(1)
+    david = ImmutableDeveloper.find(1)
     david.salary = 10_000_000
     assert !david.valid?
     assert !david.save
-    assert !david.cancelled?
+    assert_raises(ActiveRecord::RecordInvalid) { david.save! }
   end
 
   def test_before_destroy_returning_false
     david = ImmutableDeveloper.find(1)
-    david.destroy
-    assert david.cancelled?
+    assert !david.destroy
     assert_not_nil ImmutableDeveloper.find_by_id(1)
-
-    david = ImmutableMethodDeveloper.find(1)
-    david.destroy
-    assert david.cancelled?
-    assert_not_nil ImmutableMethodDeveloper.find_by_id(1)
-  end
-
+  end  
 
   def test_zzz_callback_returning_false # must be run last since we modify CallbackDeveloper
     david = CallbackDeveloper.find(1)

data/test/class_inheritable_attributes_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'abstract_unit'
-require 'active_support/class_inheritable_attributes'
+require 'active_support/core_ext/class/inheritable_attributes'
 
 class A
   include ClassInheritableAttributes

data/test/column_alias_test.rb

@@ -4,7 +4,7 @@ require 'fixtures/topic'
 class TestColumnAlias < Test::Unit::TestCase
   fixtures :topics
 
-  QUERY = if 'OCI' == ActiveRecord::Base.connection.adapter_name
+  QUERY = if 'Oracle' == ActiveRecord::Base.connection.adapter_name
             'SELECT id AS pk FROM topics WHERE ROWNUM < 2'
           else
             'SELECT id AS pk FROM topics'

data/test/connections/native_mysql/connection.rb

@@ -10,6 +10,7 @@ db2 = 'activerecord_unittest2'
 ActiveRecord::Base.establish_connection(
   :adapter  => "mysql",
   :username => "rails",
+  :encoding => "utf8",
   :database => db1
 )
 

data/test/connections/native_openbase/connection.rb

@@ -0,0 +1,22 @@
+print "Using native OpenBase\n"
+require_dependency 'fixtures/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+db1 = 'activerecord_unittest'
+db2 = 'activerecord_unittest2'
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "openbase",
+  :username => "admin",
+  :password => "", 
+  :database => db1
+)
+
+Course.establish_connection(
+  :adapter  => "openbase",
+  :username => "admin",
+  :password => "", 
+  :database => db2
+)

data/test/connections/{native_oci → native_oracle}/connection.rb

@@ -1,25 +1,23 @@
-print "Using OCI Oracle\n"
+print "Using Oracle\n"
 require_dependency 'fixtures/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new STDOUT
 ActiveRecord::Base.logger.level = Logger::WARN
 
-db1 = 'activerecord_unittest'
-db2 = 'activerecord_unittest2'
+# Set these to your database connection strings
+db = 'activerecord_unit_tests'
 
 ActiveRecord::Base.establish_connection(
-  :adapter  => 'oci',
-  :host     => '',          # can use an oracle SID
+  :adapter  => 'oracle',
   :username => 'arunit',
   :password => 'arunit',
-  :database => db1
+  :database => db
 )
 
 Course.establish_connection(
-  :adapter  => 'oci',
-  :host     => '',          # can use an oracle SID
+  :adapter  => 'oracle',
   :username => 'arunit2',
   :password => 'arunit2',
-  :database => db2
+  :database => db
 )

data/test/connections/native_sqlite/connection.rb

@@ -34,4 +34,4 @@ end
 
 make_connection(ActiveRecord::Base, sqlite_test_db, 'sqlite.sql')
 make_connection(Course, sqlite_test_db2, 'sqlite2.sql')
-
+load(File.join(BASE_DIR, 'db_definitions', 'schema.rb'))

data/test/connections/native_sqlite3/connection.rb

@@ -34,3 +34,4 @@ end
 
 make_connection(ActiveRecord::Base, sqlite_test_db, 'sqlite.sql')
 make_connection(Course, sqlite_test_db2, 'sqlite2.sql')
+load(File.join(BASE_DIR, 'db_definitions', 'schema.rb'))

data/test/connections/native_sqlite3/in_memory_connection.rb

@@ -15,3 +15,4 @@ end
 
 make_connection(ActiveRecord::Base, 'sqlite.sql')
 make_connection(Course, 'sqlite2.sql')
+  load("#{File.dirname(__FILE__)}/../../fixtures/db_definitions/schema.rb"))

data/test/connections/native_sybase/connection.rb

@@ -0,0 +1,24 @@
+print "Using native Sybase Open Client\n"
+require_dependency 'fixtures/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+db1 = 'activerecord_unittest'
+db2 = 'activerecord_unittest2'
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "sybase",
+  :host     => "database_ASE",
+  :username => "sa",
+  :password => "",
+  :database => db1
+)
+
+Course.establish_connection(
+  :adapter  => "sybase",
+  :host     => "database_ASE",
+  :username => "sa",
+  :password => "",
+  :database => db2
+)

data/test/defaults_test.rb

@@ -0,0 +1,18 @@
+require 'abstract_unit'
+require 'fixtures/default'
+
+class DefaultsTest < Test::Unit::TestCase
+  if %w(PostgreSQL).include? ActiveRecord::Base.connection.adapter_name
+    def test_default_integers
+      default = Default.new
+      assert_instance_of(Fixnum, default.positive_integer)
+      assert_equal(default.positive_integer, 1)
+      assert_instance_of(Fixnum, default.negative_integer)
+      assert_equal(default.negative_integer, -1)
+    end
+  else
+    def test_dummy
+      assert true
+    end
+  end
+end

data/test/deprecated_associations_test.rb

@@ -181,7 +181,7 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
 
     active_record = Project.find(1)
     assert active_record.has_developers?
-    assert_equal 2, active_record.developers_count
+    assert_equal 3, active_record.developers_count
     assert active_record.developers.include?(david)
   end
 
@@ -192,7 +192,7 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
     david.remove_projects(active_record)
 
     assert_equal 1, david.projects_count
-    assert_equal 1, active_record.developers_count
+    assert_equal 2, active_record.developers_count
   end
 
   def test_has_and_belongs_to_many_zero

data/test/deprecated_finder_test.rb

@@ -74,12 +74,6 @@ class DeprecatedFinderTest < Test::Unit::TestCase
     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_raises(ActiveRecord::PreparedStatementInvalid) {
-      Company.find_first(["id=:id and name=:name", { :id=>3 }])
-    }
-    assert_raises(ActiveRecord::PreparedStatementInvalid) {
-      Company.find_first(["id=:id", { :id=>3, :name=>"37signals!" }])
-    }
   end
 
   def test_count

data/test/finder_test.rb

@@ -1,12 +1,13 @@
 require 'abstract_unit'
 require 'fixtures/company'
 require 'fixtures/topic'
+require 'fixtures/reply'
 require 'fixtures/entrant'
 require 'fixtures/developer'
 require 'fixtures/post'
 
 class FinderTest < Test::Unit::TestCase
-  fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts
+  fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :accounts
 
   def test_find
     assert_equal(topics(:first).title, Topic.find(1).title)
@@ -57,6 +58,11 @@ class FinderTest < Test::Unit::TestCase
     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)
@@ -92,7 +98,7 @@ class FinderTest < Test::Unit::TestCase
       Topic.find(1).parent
     }
     
-    Topic.find(2).parent
+    Topic.find(2).topic
   end
   
   def test_find_only_some_columns
@@ -157,22 +163,6 @@ class FinderTest < Test::Unit::TestCase
     assert_nil Company.find(:first, :conditions => ["name = :name", { :name => "37signals!" }])
     assert_nil Company.find(:first, :conditions => ["name = :name", { :name => "37signals!' OR 1=1" }])
     assert_kind_of Time, Topic.find(:first, :conditions => ["id = :id", { :id => 1 }]).written_on
-    assert_raises(ActiveRecord::PreparedStatementInvalid) {
-      Company.find(:first, :conditions => ["id=:id and name=:name", { :id=>3 }])
-    }
-    assert_raises(ActiveRecord::PreparedStatementInvalid) {
-      Company.find(:first, :conditions => ["id=:id", { :id=>3, :name=>"37signals!" }])
-    }
-  end
-
-  def test_named_bind_arity
-    assert_nothing_raised { bind '', {} }
-    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '', :a => 1 }
-    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a', {} } # ' ruby-mode
-    assert_nothing_raised { bind ':a', :a => 1 } # ' ruby-mode
-    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a', :a => 1, :b => 2 } # ' ruby-mode
-    assert_nothing_raised { bind ':a :a', :a => 1 } # ' ruby-mode
-    assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a :a', :a => 1, :b => 2 } # ' ruby-mode
   end
 
   def test_bind_enumerable
@@ -216,6 +206,19 @@ class FinderTest < Test::Unit::TestCase
     assert_nil Topic.find_by_title("The First Topic!")
   end
 
+  def test_find_by_one_attribute_with_order_option
+    assert_equal accounts(:signals37), Account.find_by_credit_limit(50, :order => 'id')
+    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :order => 'id DESC')
+  end
+
+  def test_find_by_one_attribute_with_conditions
+    assert_equal accounts(:rails_core_account), Account.find_by_credit_limit(50, :conditions => ['firm_id = ?', 6])
+  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
@@ -286,10 +289,10 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_find_or_create_from_two_attributes
-    number_of_companies = Company.count
-    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")
+    number_of_topics = Topic.count
+    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")
   end
 
   def test_find_with_bad_sql
@@ -341,7 +344,7 @@ class FinderTest < Test::Unit::TestCase
       :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id', 
       :conditions => 'project_id=1'
     )
-    assert_equal 2, developers_on_project_one.length
+    assert_equal 3, developers_on_project_one.length
     developer_names = developers_on_project_one.map { |d| d.name }
     assert developer_names.include?('David')
     assert developer_names.include?('Jamis')

data/test/fixtures/accounts.yml

@@ -11,3 +11,13 @@ rails_core_account:
   id: 3
   firm_id: 6
   credit_limit: 50
+
+last_account:
+  id: 4
+  firm_id: 2
+  credit_limit: 60
+
+rails_core_account_2:
+  id: 5
+  firm_id: 6
+  credit_limit: 55

data/test/fixtures/author.rb

@@ -3,20 +3,36 @@ class Author < ActiveRecord::Base
   has_many :posts_with_comments, :include => :comments, :class_name => "Post"
   has_many :posts_with_categories, :include => :categories, :class_name => "Post"
   has_many :posts_with_comments_and_categories, :include => [ :comments, :categories ], :order => "posts.id", :class_name => "Post"
+  has_many :comments, :through => :posts
+  has_many :funky_comments, :through => :posts, :source => :comments
 
+  has_many :special_posts,        :class_name => "Post"
+  has_many :hello_posts,          :class_name => "Post", :conditions=>"\#{aliased_table_name}.body = 'hello'"
+  has_many :nonexistent_posts,    :class_name => "Post", :conditions=>"\#{aliased_table_name}.body = 'nonexistent'"
   has_many :posts_with_callbacks, :class_name => "Post", :before_add => :log_before_adding,
-           :after_add => :log_after_adding, :before_remove => :log_before_removing,
-           :after_remove => :log_after_removing
+           :after_add     => :log_after_adding, 
+           :before_remove => :log_before_removing,
+           :after_remove  => :log_after_removing
   has_many :posts_with_proc_callbacks, :class_name => "Post",
-           :before_add => Proc.new {|o, r| o.post_log << "before_adding#{r.id}"},
-           :after_add => Proc.new {|o, r| o.post_log << "after_adding#{r.id}"},
+           :before_add    => Proc.new {|o, r| o.post_log << "before_adding#{r.id}"},
+           :after_add     => Proc.new {|o, r| o.post_log << "after_adding#{r.id}"},
            :before_remove => Proc.new {|o, r| o.post_log << "before_removing#{r.id}"},
-           :after_remove => Proc.new {|o, r| o.post_log << "after_removing#{r.id}"}
+           :after_remove  => Proc.new {|o, r| o.post_log << "after_removing#{r.id}"}
   has_many :posts_with_multiple_callbacks, :class_name => "Post",
            :before_add => [:log_before_adding, Proc.new {|o, r| o.post_log << "before_adding_proc#{r.id}"}],
-           :after_add => [:log_after_adding, Proc.new {|o, r| o.post_log << "after_adding_proc#{r.id}"}]
+           :after_add  => [:log_after_adding,  Proc.new {|o, r| o.post_log << "after_adding_proc#{r.id}"}]
   has_many :unchangable_posts, :class_name => "Post", :before_add => :raise_exception, :after_add => :log_after_adding
 
+  has_many :categorizations
+  has_many :categories, :through => :categorizations
+
+  has_many :nothings, :through => :kateggorisatons, :class_name => 'Category'
+
+  has_many :author_favorites
+  has_many :favorite_authors, :through => :author_favorites, :order => 'name'
+
+  belongs_to :author_address
+
   attr_accessor :post_log
 
   def after_initialize
@@ -44,3 +60,12 @@ class Author < ActiveRecord::Base
       raise Exception.new("You can't add a post")
     end
 end
+
+class AuthorAddress < ActiveRecord::Base
+  has_one :author
+end
+
+class AuthorFavorite < ActiveRecord::Base
+  belongs_to :author
+  belongs_to :favorite_author, :class_name => "Author", :foreign_key => 'favorite_author_id'
+end

data/test/fixtures/author_favorites.yml

@@ -0,0 +1,4 @@
+david_mary:
+  id: 1
+  author_id: 1
+  favorite_author_id: 2

data/test/fixtures/categories/special_categories.yml

@@ -0,0 +1,9 @@
+sub_special_1:
+  id: 100
+  name: A special category in a subdir file
+  type: SpecialCategory
+
+sub_special_2:
+  id: 101
+  name: Another special category
+  type: SpecialCategory

data/test/fixtures/categories/subsubdir/arbitrary_filename.yml

@@ -0,0 +1,4 @@
+sub_special_3:
+  id: 102
+  name: A special category in an arbitrarily named subsubdir file
+  type: SpecialCategory

data/test/fixtures/categories_posts.yml

@@ -17,3 +17,7 @@ general_sti_habtm:
 sti_test_sti_habtm:
   category_id: 3
   post_id: 6
+
+general_hello:
+  category_id: 1
+  post_id: 4

data/test/fixtures/categorization.rb

@@ -0,0 +1,5 @@
+class Categorization < ActiveRecord::Base
+  belongs_to :post
+  belongs_to :category
+  belongs_to :author
+end

data/test/fixtures/categorizations.yml

@@ -0,0 +1,11 @@
+david_welcome_general:
+  id: 1
+  author_id: 1
+  post_id: 1
+  category_id: 1
+  
+mary_thinking_sti:
+  id: 2
+  author_id: 2
+  post_id: 2
+  category_id: 3