activerecord 1.10.1 → 1.11.0

data/test/deprecated_finder_test.rb

@@ -11,7 +11,7 @@ class FinderTest < Test::Unit::TestCase
     entrants = Entrant.find_all nil, "id ASC", 2
     
     assert_equal(2, entrants.size)
-    assert_equal(@entrants["first"]["name"], entrants.first.name)
+    assert_equal(entrants(:first).name, entrants.first.name)
   end
 
   def test_find_all_with_prepared_limit_and_offset
@@ -23,13 +23,13 @@ class FinderTest < Test::Unit::TestCase
       entrants = Entrant.find_all nil, "id ASC", [2, 1]
 
       assert_equal(2, entrants.size)
-      assert_equal(@entrants["second"]["name"], entrants.first.name)
+      assert_equal(entrants(:second).name, entrants.first.name)
     end
   end
 
   def test_find_first
     first = Topic.find_first "title = 'The First Topic'"
-    assert_equal(@topics["first"]["title"], first.title)
+    assert_equal(topics(:first).title, first.title)
   end
   
   def test_find_first_failing
@@ -112,7 +112,7 @@ class FinderTest < Test::Unit::TestCase
     assert_equal first_five_developers, Developer.find_all(nil, 'id ASC', [5])
     assert_equal no_developers, Developer.find_all(nil, 'id ASC', [0])
   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]
@@ -128,14 +128,13 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_find_all_by_one_attribute_with_options
-    topics = Topic.find_all_by_content("Have a nice day", nil, "id DESC")
-    assert @topics["first"].find, topics.last
+    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", nil, "id DESC")
-    assert @topics["first"].find, topics.first
+    topics = Topic.find_all_by_content("Have a nice day", "id DESC")
+    assert topics(:first), topics.first
   end
 
-
   protected
     def bind(statement, *vars)
       if vars.first.is_a?(Hash)

data/test/finder_test.rb

@@ -8,7 +8,7 @@ class FinderTest < Test::Unit::TestCase
   fixtures :companies, :topics, :entrants, :developers
 
   def test_find
-    assert_equal(@topics["first"]["title"], Topic.find(1).title)
+    assert_equal(topics(:first).title, Topic.find(1).title)
   end
   
   def test_exists
@@ -25,7 +25,11 @@ class FinderTest < Test::Unit::TestCase
   
   def test_find_by_ids
     assert_equal(2, Topic.find(1, 2).length)
-    assert_equal(@topics["second"]["title"], Topic.find([ 2 ]).first.title)
+    assert_equal(topics(:second).title, Topic.find([ 2 ]).first.title)
+  end
+
+  def test_find_an_empty_array
+    assert_equal [], Topic.find([])
   end
 
   def test_find_by_ids_missing_one
@@ -38,19 +42,23 @@ class FinderTest < Test::Unit::TestCase
     entrants = Entrant.find(:all, :order => "id ASC", :limit => 2)
     
     assert_equal(2, entrants.size)
-    assert_equal(@entrants["first"]["name"], entrants.first.name)
+    assert_equal(entrants(:first).name, entrants.first.name)
   end
 
   def test_find_all_with_prepared_limit_and_offset
     if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
       if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
-        assert_raises(ArgumentError) { Entrant.find_all nil, "id ASC", [2, 1] }
+        assert_raises(ArgumentError) { Entrant.find(:all, :order => 'id ASC', :limit => 2, :offset => 1) }
       end
     else
       entrants = Entrant.find(:all, :order => "id ASC", :limit => 2, :offset => 1)
 
       assert_equal(2, entrants.size)
-      assert_equal(@entrants["second"]["name"], entrants.first.name)
+      assert_equal(entrants(:second).name, entrants.first.name)
+
+      entrants = Entrant.find(:all, :order => "id ASC", :limit => 2, :offset => 2)
+      assert_equal(1, entrants.size)
+      assert_equal(entrants(:third).name, entrants.first.name)
     end
   end
 
@@ -58,19 +66,19 @@ class FinderTest < Test::Unit::TestCase
     topics = Topic.find_by_sql "SELECT * FROM topics WHERE author_name = 'Mary'"
     
     assert_equal(1, topics.size)
-    assert_equal(@topics["second"]["title"], topics.first.title)
+    assert_equal(topics(:second).title, topics.first.title)
   end
   
   def test_find_with_prepared_select_statement
     topics = Topic.find_by_sql ["SELECT * FROM topics WHERE author_name = ?", "Mary"]
     
     assert_equal(1, topics.size)
-    assert_equal(@topics["second"]["title"], topics.first.title)
+    assert_equal(topics(:second).title, topics.first.title)
   end
   
   def test_find_first
     first = Topic.find(:first, :conditions => "title = 'The First Topic'")
-    assert_equal(@topics["first"]["title"], first.title)
+    assert_equal(topics(:first).title, first.title)
   end
   
   def test_find_first_failing
@@ -156,12 +164,23 @@ class FinderTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a :a', :a => 1, :b => 2 } # ' ruby-mode
   end
 
-  def test_bind_array
+  def test_bind_enumerable
     assert_equal '1,2,3', bind('?', [1, 2, 3])
     assert_equal %('a','b','c'), bind('?', %w(a b c))
 
     assert_equal '1,2,3', bind(':a', :a => [1, 2, 3])
     assert_equal %('a','b','c'), bind(':a', :a => %w(a b c)) # '
+
+    require 'set'
+    assert_equal '1,2,3', bind('?', Set.new([1, 2, 3]))
+    assert_equal %('a','b','c'), bind('?', Set.new(%w(a b c)))
+
+    assert_equal '1,2,3', bind(':a', :a => Set.new([1, 2, 3]))
+    assert_equal %('a','b','c'), bind(':a', :a => Set.new(%w(a b c))) # '
+  end
+
+  def test_bind_string
+    assert_equal "''", bind('?', '')
   end
 
   def test_string_sanitation
@@ -182,7 +201,7 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_find_by_one_attribute
-    assert_equal @topics["first"].find, Topic.find_by_title("The First Topic")
+    assert_equal topics(:first), Topic.find_by_title("The First Topic")
     assert_nil Topic.find_by_title("The First Topic!")
   end
 
@@ -191,34 +210,38 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_find_by_two_attributes
-    assert_equal @topics["first"].find, Topic.find_by_title_and_author_name("The First Topic", "David")
+    assert_equal topics(:first), Topic.find_by_title_and_author_name("The First Topic", "David")
     assert_nil Topic.find_by_title_and_author_name("The First Topic", "Mary")
   end
 
   def test_find_all_by_one_attribute
     topics = Topic.find_all_by_content("Have a nice day")
     assert_equal 2, topics.size
-    assert topics.include?(@topics["first"].find)
+    assert topics.include?(topics(:first))
 
     assert_equal [], Topic.find_all_by_title("The First Topic!!")
   end
   
   def test_find_all_by_one_attribute_with_options
     topics = Topic.find_all_by_content("Have a nice day", :order => "id DESC")
-    assert @topics["first"].find, topics.last
+    assert topics(:first), topics.last
 
     topics = Topic.find_all_by_content("Have a nice day", :order => "id")
-    assert @topics["first"].find, topics.first
+    assert topics(:first), topics.first
+  end
+
+  def test_find_all_by_array_attribute
+    assert_equal 2, Topic.find_all_by_title(["The First Topic", "The Second Topic's of the day"]).size
   end
 
   def test_find_all_by_boolean_attribute
     topics = Topic.find_all_by_approved(false)
     assert_equal 1, topics.size
-    assert topics.include?(@topics["first"].find)
+    assert topics.include?(topics(:first))
 
     topics = Topic.find_all_by_approved(true)
     assert_equal 1, topics.size
-    assert topics.include?(@topics["second"].find)
+    assert topics.include?(topics(:second))
   end
   
   def test_find_by_nil_attribute
@@ -257,7 +280,7 @@ class FinderTest < Test::Unit::TestCase
     no_developers = Developer.find :all, :order => 'id ASC', :limit => 0
     assert_equal 0, no_developers.length
   end
- 
+
   def test_find_all_with_limit_and_offset
     first_three_developers = Developer.find :all, :order => 'id ASC', :limit => 3, :offset => 0
     second_three_developers = Developer.find :all, :order => 'id ASC', :limit => 3, :offset => 3
@@ -272,6 +295,18 @@ class FinderTest < Test::Unit::TestCase
     assert_equal 'fixture_9', last_two_developers.first.name
   end
 
+  def test_find_all_with_join
+    developers_on_project_one = Developer.find(
+      :all, 
+      :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id', 
+      :conditions => 'project_id=1'
+    )
+    assert_equal 2, 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')
+  end
+
   protected
     def bind(statement, *vars)
       if vars.first.is_a?(Hash)

data/test/fixtures/author.rb

@@ -1,3 +1,42 @@
 class Author < ActiveRecord::Base
   has_many :posts
+  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
+  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_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}"}
+  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}"}]
+  has_many :unchangable_posts, :class_name => "Post", :before_add => :raise_exception, :after_add => :log_after_adding
+
+  attr_accessor :post_log
+
+  def after_initialize
+  	@post_log = []
+  end
+
+  private
+  	def log_before_adding(object)
+  		@post_log << "before_adding#{object.id}"
+  	end
+
+  	def log_after_adding(object)
+  		@post_log << "after_adding#{object.id}"
+  	end
+
+  	def log_before_removing(object)
+  		@post_log << "before_removing#{object.id}"
+  	end
+
+  	def log_after_removing(object)
+  		@post_log << "after_removing#{object.id}"
+  	end
+
+  	def raise_exception(object)
+  		raise Exception.new("You can't add a post")
+  	end
 end

data/test/fixtures/categories.yml

@@ -1,7 +1,14 @@
 general:
   id: 1
   name: General
+  type: Category
 
 technology:
   id: 2
   name: Technology
+  type: Category
+
+sti_test:
+  id: 3
+  name: Special category
+  type: SpecialCategory

data/test/fixtures/categories_posts.yml

@@ -9,3 +9,11 @@ technology_welcome:
 general_thinking:
   category_id: 1
   post_id: 2
+
+general_sti_habtm:
+  category_id: 1
+  post_id: 6
+
+sti_test_sti_habtm:
+  category_id: 3
+  post_id: 6

data/test/fixtures/category.rb

@@ -1,3 +1,5 @@
 class Category < ActiveRecord::Base
   has_and_belongs_to_many :posts
 end
+
+class SpecialCategory < Category; end;

data/test/fixtures/comment.rb

@@ -2,4 +2,6 @@ class Comment < ActiveRecord::Base
   belongs_to :post
 end
 
-class SpecialComment < Comment; end;
+class SpecialComment < Comment; end;
+
+class VerySpecialComment < Comment; end;

data/test/fixtures/comments.yml

@@ -14,4 +14,46 @@ does_it_hurt:
   id: 3
   post_id: 2
   body: Don't think too hard
-  type: SpecialComment
+  type: SpecialComment
+
+eager_sti_on_associations_comment:
+  id: 4
+  post_id: 4
+  body: Normal type
+  type: Comment
+
+eager_sti_on_associations_vs_comment:
+  id: 5
+  post_id: 4
+  body: Very Special type
+  type: VerySpecialComment
+
+eager_sti_on_associations_s_comment1:
+  id: 6
+  post_id: 4
+  body: Special type
+  type: SpecialComment
+
+eager_sti_on_associations_s_comment2:
+  id: 7
+  post_id: 4
+  body: Special type 2
+  type: SpecialComment
+
+eager_sti_on_associations_comment:
+  id: 8
+  post_id: 4
+  body: Normal type 
+  type: Comment
+
+check_eager_sti_on_associations:
+  id: 9
+  post_id: 5
+  body: Normal type
+  type: Comment
+
+check_eager_sti_on_associations2:
+  id: 10
+  post_id: 5
+  body: Special Type
+  type: SpecialComment

data/test/fixtures/companies.yml

@@ -19,3 +19,17 @@ second_client:
   client_of: 1
   name: Microsoft
   ruby_type: Client
+
+another_firm:
+  id: 4
+  type: Firm
+  name: Flamboyant Software
+  ruby_type: Firm
+
+another_client:
+  id: 5
+  type: Client
+  firm_id: 4
+  client_of: 4
+  name: Ex Nihilo
+  ruby_type: Client

data/test/fixtures/company.rb

@@ -21,7 +21,7 @@ class Firm < Company
            :finder_sql  => 'SELECT * FROM companies WHERE client_of = 1000',
            :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'
 
-  has_one :account, :dependent => true
+  has_one :account, :foreign_key => "firm_id", :dependent => true
 end
 
 class Client < Company

data/test/fixtures/computers.yml

@@ -1,3 +1,4 @@
 workstation:
   id: 1
-  developer: 1
+  developer: 1
+  extendedWarranty: 1

data/test/fixtures/db_definitions/db2.sql

@@ -36,12 +36,15 @@ CREATE TABLE developers (
   id int generated by default as identity (start with +10000),
   name varchar(100) default NULL,
   salary int default 70000,
+  created_at timestamp default NULL,
+  updated_at timestamp default NULL,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE projects (
   id int generated by default as identity (start with +10000),
   name varchar(100) default NULL,
+  type varchar(255) default NULL,
   PRIMARY KEY (id)
 );
 
@@ -126,7 +129,8 @@ CREATE TABLE binaries (
 
 CREATE TABLE computers (
   id int generated by default as identity (start with +10000),
-  developer int NOT NULL
+  developer int NOT NULL,
+  extendedWarranty int NOT NULL
 );
 
 CREATE TABLE posts (
@@ -157,7 +161,8 @@ CREATE TABLE tasks (
 
 CREATE TABLE categories (
   id int generated by default as identity (start with +10000),
-  name varchar(255) NOT NULL
+  name varchar(255) NOT NULL,
+  type varchar(40) default NULL
 );
 
 CREATE TABLE categories_posts (

data/test/fixtures/db_definitions/mysql.drop.sql

@@ -21,3 +21,5 @@ DROP TABLE comments;
 DROP TABLE authors;
 DROP TABLE categories;
 DROP TABLE categories_posts;
+DROP TABLE fk_test_has_fk;
+DROP TABLE fk_test_has_pk;

data/test/fixtures/db_definitions/mysql.sql

@@ -37,12 +37,15 @@ CREATE TABLE `developers` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(100) default NULL,
   `salary` int(11) default 70000,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
 CREATE TABLE `projects` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(100) default NULL,
+  `type` VARCHAR(255) NOT NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
@@ -126,7 +129,8 @@ CREATE TABLE `binaries` (
 
 CREATE TABLE `computers` (
   `id` INTEGER NOT NULL PRIMARY KEY,
-  `developer` INTEGER NOT NULL
+  `developer` INTEGER NOT NULL,
+  `extendedWarranty` INTEGER NOT NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `posts` (
@@ -154,26 +158,27 @@ CREATE TABLE `tasks` (
   `starting` datetime NOT NULL default '0000-00-00 00:00:00',
   `ending` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `categories` (
   `id` int(11) NOT NULL auto_increment,
   `name` VARCHAR(255) NOT NULL,
+  `type` VARCHAR(255) NOT NULL,
   PRIMARY KEY  (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `categories_posts` (
   `category_id` int(11) NOT NULL,
   `post_id` int(11) NOT NULL
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `fk_test_has_pk` (
   `id` INTEGER NOT NULL PRIMARY KEY
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `fk_test_has_fk` (
   `id`    INTEGER NOT NULL PRIMARY KEY,
   `fk_id` INTEGER NOT NULL,
 
   FOREIGN KEY (`fk_id`) REFERENCES `fk_test_has_pk`(`id`)
-);
+) TYPE=InnoDB;