activerecord 1.9.1 → 1.10.0

data/test/finder_test.rb

@@ -20,7 +20,7 @@ class FinderTest < Test::Unit::TestCase
   
   def test_find_by_array_of_one_id
     assert_kind_of(Array, Topic.find([ 1 ]))
-       assert_equal(1, Topic.find([ 1 ]).length)
+    assert_equal(1, Topic.find([ 1 ]).length)
   end
   
   def test_find_by_ids
@@ -35,7 +35,7 @@ class FinderTest < Test::Unit::TestCase
   end
   
   def test_find_all_with_limit
-    entrants = Entrant.find_all nil, "id ASC", 2
+    entrants = Entrant.find(:all, :order => "id ASC", :limit => 2)
     
     assert_equal(2, entrants.size)
     assert_equal(@entrants["first"]["name"], entrants.first.name)
@@ -47,7 +47,7 @@ class FinderTest < Test::Unit::TestCase
         assert_raises(ArgumentError) { Entrant.find_all nil, "id ASC", [2, 1] }
       end
     else
-      entrants = Entrant.find_all nil, "id ASC", [2, 1]
+      entrants = Entrant.find(:all, :order => "id ASC", :limit => 2, :offset => 1)
 
       assert_equal(2, entrants.size)
       assert_equal(@entrants["second"]["name"], entrants.first.name)
@@ -69,12 +69,12 @@ class FinderTest < Test::Unit::TestCase
   end
   
   def test_find_first
-    first = Topic.find_first "title = 'The First Topic'"
+    first = Topic.find(:first, :conditions => "title = 'The First Topic'")
     assert_equal(@topics["first"]["title"], first.title)
   end
   
   def test_find_first_failing
-    first = Topic.find_first "title = 'The First Topic!'"
+    first = Topic.find(:first, :conditions => "title = 'The First Topic!'")
     assert_nil(first)
   end
 
@@ -91,39 +91,34 @@ class FinderTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => "approved = 1") }
   end
   
-  def test_deprecated_find_on_conditions
-    assert Topic.find_on_conditions(1, "approved = 0")
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find_on_conditions(1, "approved = 1") }
-  end
-  
   def test_condition_interpolation
-    assert_kind_of Firm, Company.find_first(["name = '%s'", "37signals"])
-    assert_nil Company.find_first(["name = '%s'", "37signals!"])
-    assert_nil Company.find_first(["name = '%s'", "37signals!' OR 1=1"])
-    assert_kind_of Time, Topic.find_first(["id = %d", 1]).written_on
+    assert_kind_of Firm, Company.find(:first, :conditions => ["name = '%s'", "37signals"])
+    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!"])
+    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!' OR 1=1"])
+    assert_kind_of Time, Topic.find(:first, :conditions => ["id = %d", 1]).written_on
   end
 
   def test_bind_variables
-    assert_kind_of Firm, Company.find_first(["name = ?", "37signals"])
-    assert_nil Company.find_first(["name = ?", "37signals!"])
-    assert_nil Company.find_first(["name = ?", "37signals!' OR 1=1"])
-    assert_kind_of Time, Topic.find_first(["id = ?", 1]).written_on
+    assert_kind_of Firm, Company.find(:first, :conditions => ["name = ?", "37signals"])
+    assert_nil Company.find(:first, :conditions => ["name = ?", "37signals!"])
+    assert_nil Company.find(:first, :conditions => ["name = ?", "37signals!' OR 1=1"])
+    assert_kind_of Time, Topic.find(:first, :conditions => ["id = ?", 1]).written_on
     assert_raises(ActiveRecord::PreparedStatementInvalid) {
-      Company.find_first(["id=? AND name = ?", 2])
+      Company.find(:first, :conditions => ["id=? AND name = ?", 2])
     }
     assert_raises(ActiveRecord::PreparedStatementInvalid) {
-	   Company.find_first(["id=?", 2, 3, 4])
+	   Company.find(:first, :conditions => ["id=?", 2, 3, 4])
     }
   end
   
   def test_bind_variables_with_quotes
     Company.create("name" => "37signals' go'es agains")
-    assert Company.find_first(["name = ?", "37signals' go'es agains"])
+    assert Company.find(:first, :conditions => ["name = ?", "37signals' go'es agains"])
   end
 
   def test_named_bind_variables_with_quotes
     Company.create("name" => "37signals' go'es agains")
-    assert Company.find_first(["name = :name", {:name => "37signals' go'es agains"}])
+    assert Company.find(:first, :conditions => ["name = :name", {:name => "37signals' go'es agains"}])
   end
 
   def test_bind_arity
@@ -139,15 +134,15 @@ class FinderTest < Test::Unit::TestCase
     assert_equal '1', bind(':a', :a => 1) # ' ruby-mode
     assert_equal '1 1', bind(':a :a', :a => 1)  # ' ruby-mode
   
-    assert_kind_of Firm, Company.find_first(["name = :name", { :name => "37signals" }])
-    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_kind_of Firm, Company.find(:first, :conditions => ["name = :name", { :name => "37signals" }])
+    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(["id=:id and name=:name", { :id=>3 }])
+      Company.find(:first, :conditions => ["id=:id and name=:name", { :id=>3 }])
     }
     assert_raises(ActiveRecord::PreparedStatementInvalid) {
-      Company.find_first(["id=:id", { :id=>3, :name=>"37signals!" }])
+      Company.find(:first, :conditions => ["id=:id", { :id=>3, :name=>"37signals!" }])
     }
   end
 
@@ -166,7 +161,7 @@ class FinderTest < Test::Unit::TestCase
     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))
+    assert_equal %('a','b','c'), bind(':a', :a => %w(a b c)) # '
   end
 
   def test_string_sanitation
@@ -207,6 +202,14 @@ class FinderTest < Test::Unit::TestCase
 
     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
+
+    topics = Topic.find_all_by_content("Have a nice day", :order => "id")
+    assert @topics["first"].find, topics.first
+  end
 
   def test_find_all_by_boolean_attribute
     topics = Topic.find_all_by_approved(false)
@@ -246,22 +249,19 @@ class FinderTest < Test::Unit::TestCase
   end
 
   def test_find_all_with_limit
-    first_five_developers = Developer.find_all nil, 'id ASC', 5
+    first_five_developers = Developer.find :all, :order => 'id ASC', :limit =>  5
     assert_equal 5, first_five_developers.length
     assert_equal 'David', first_five_developers.first.name
     assert_equal 'fixture_5', first_five_developers.last.name
     
-    no_developers = Developer.find_all nil, 'id ASC', 0
+    no_developers = Developer.find :all, :order => 'id ASC', :limit => 0
     assert_equal 0, no_developers.length
-    
-    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]
-    last_two_developers = Developer.find_all nil, 'id ASC', [2, 8]
+    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
+    last_two_developers = Developer.find :all, :order => 'id ASC', :limit => 2, :offset => 8
     
     assert_equal 3, first_three_developers.length
     assert_equal 3, second_three_developers.length

data/test/fixtures/author.rb

@@ -0,0 +1,3 @@
+class Author < ActiveRecord::Base
+  has_many :posts
+end

data/test/fixtures/authors.yml

@@ -0,0 +1,7 @@
+david:
+  id: 1
+  name: David
+
+mary:
+  id: 2
+  name: Mary

data/test/fixtures/categories.yml

@@ -0,0 +1,7 @@
+general:
+  id: 1
+  name: General
+
+technology:
+  id: 2
+  name: Technology

data/test/fixtures/categories_posts.yml

@@ -0,0 +1,11 @@
+general_welcome:
+  category_id: 1
+  post_id: 1
+
+technology_welcome:
+  category_id: 2
+  post_id: 1
+
+general_thinking:
+  category_id: 1
+  post_id: 2

data/test/fixtures/category.rb

@@ -0,0 +1,3 @@
+class Category < ActiveRecord::Base
+  has_and_belongs_to_many :posts
+end

data/test/fixtures/comment.rb

@@ -0,0 +1,5 @@
+class Comment < ActiveRecord::Base
+  belongs_to :post
+end
+
+class SpecialComment < Comment; end;

data/test/fixtures/comments.yml

@@ -0,0 +1,17 @@
+greetings:
+  id: 1
+  post_id: 1
+  body: Thank you for the welcome
+  type: Comment
+
+more_greetings:
+  id: 2
+  post_id: 1
+  body: Thank you again for the welcome
+  type: Comment
+  
+does_it_hurt:
+  id: 3
+  post_id: 2
+  body: Don't think too hard
+  type: SpecialComment

data/test/fixtures/company.rb

@@ -17,6 +17,9 @@ class Firm < Company
   has_many :clients_using_zero_counter_sql, :class_name => "Client",
            :finder_sql  => 'SELECT * FROM companies WHERE client_of = #{id}',
            :counter_sql => 'SELECT 0 FROM companies WHERE client_of = #{id}'
+  has_many :no_clients_using_counter_sql, :class_name => "Client",
+           :finder_sql  => 'SELECT * FROM companies WHERE client_of = 1000',
+           :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'
 
   has_one :account, :dependent => true
 end

data/test/fixtures/courses.yml

@@ -1,7 +1,7 @@
-java:
-  id: 2
-  name: Java Development
-
 ruby:
   id: 1
   name: Ruby Development
+
+java:
+  id: 2
+  name: Java Development

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

@@ -15,4 +15,10 @@ DROP TABLE mixins;
 DROP TABLE people;
 DROP TABLE binaries;
 DROP TABLE computers;
+DROP TABLE posts;
+DROP TABLE comments;
+DROP TABLE authors;
+DROP TABLE tasks;
+DROP TABLE categories;
+DROP TABLE categories_posts;
 

data/test/fixtures/db_definitions/db2.sql

@@ -129,3 +129,49 @@ CREATE TABLE computers (
   developer int NOT NULL
 );
 
+CREATE TABLE posts (
+  id int generated by default as identity (start with +10000),
+  author_id int default NULL,
+  title varchar(255) default NULL,
+  type varchar(255) default NULL,
+  body varchar(3000) default NULL
+);
+
+CREATE TABLE comments (
+  id int generated by default as identity (start with +10000),
+  post_id int default NULL,
+  type varchar(255) default NULL,
+  body varchar(3000) default NULL
+);
+
+CREATE TABLE authors (
+  id int generated by default as identity (start with +10000),
+  name varchar(255) default NULL
+);
+
+CREATE TABLE tasks (
+  id int generated by default as identity (start with +10000),
+  starting timestamp default NULL,
+  ending timestamp default NULL
+);
+
+CREATE TABLE categories (
+  id int generated by default as identity (start with +10000),
+  name varchar(255) NOT NULL
+);
+
+CREATE TABLE categories_posts (
+  category_id int NOT NULL,
+  post_id int NOT NULL
+);
+
+CREATE TABLE fk_test_has_pk (
+  id INTEGER NOT NULL PRIMARY KEY
+);
+
+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)
+);

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

@@ -15,4 +15,9 @@ DROP TABLE mixins;
 DROP TABLE people;
 DROP TABLE binaries;
 DROP TABLE computers;
-
+DROP TABLE tasks;
+DROP TABLE posts;
+DROP TABLE comments;
+DROP TABLE authors;
+DROP TABLE categories;
+DROP TABLE categories_posts;

data/test/fixtures/db_definitions/mysql.sql

@@ -38,19 +38,19 @@ CREATE TABLE `developers` (
   `name` varchar(100) default NULL,
   `salary` int(11) default 70000,
   PRIMARY KEY  (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `projects` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(100) default NULL,
   PRIMARY KEY  (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `developers_projects` (
   `developer_id` int(11) NOT NULL,
   `project_id` int(11) NOT NULL,
   `joined_on` date default NULL
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `customers` (
   `id` int(11) NOT NULL auto_increment,
@@ -61,31 +61,31 @@ CREATE TABLE `customers` (
   `address_country` varchar(100) default NULL,
   `gps_location` varchar(100) default NULL,
   PRIMARY KEY  (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `movies` (
   `movieid` int(11) NOT NULL auto_increment,
   `name` varchar(100) default NULL,
    PRIMARY KEY  (`movieid`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `subscribers` (
   `nick` varchar(100) NOT NULL,
   `name` varchar(100) default NULL,
   PRIMARY KEY  (`nick`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `booleantests` (
   `id` int(11) NOT NULL auto_increment,
   `value` integer default NULL,
   PRIMARY KEY (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `auto_id_tests` (
   `auto_id` int(11) NOT NULL auto_increment,
   `value` integer default NULL,
   PRIMARY KEY (`auto_id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `entrants` (
   `id` INTEGER NOT NULL PRIMARY KEY,
@@ -97,7 +97,7 @@ CREATE TABLE `colnametests` (
   `id` int(11) NOT NULL auto_increment,
   `references` int(11) NOT NULL,
   PRIMARY KEY (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `mixins` (
   `id` int(11) NOT NULL auto_increment,
@@ -110,22 +110,70 @@ CREATE TABLE `mixins` (
   `root_id` int(11) default NULL,
   `type` varchar(40) default NULL,
   PRIMARY KEY  (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `people` (
   `id` INTEGER NOT NULL PRIMARY KEY,
   `first_name` VARCHAR(40) NOT NULL,
   `lock_version` INTEGER NOT NULL DEFAULT 0
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `binaries` (
   `id` int(11) NOT NULL auto_increment,
   `data` mediumblob,
   PRIMARY KEY  (`id`)
-);
+) TYPE=InnoDB;
 
 CREATE TABLE `computers` (
   `id` INTEGER NOT NULL PRIMARY KEY,
   `developer` INTEGER NOT NULL
+) TYPE=InnoDB;
+
+CREATE TABLE `posts` (
+  `id` INTEGER NOT NULL PRIMARY KEY,
+  `author_id` INTEGER,
+  `title` VARCHAR(255) NOT NULL,
+  `body` TEXT NOT NULL,
+  `type` VARCHAR(255) NOT NULL
+) TYPE=InnoDB;
+
+CREATE TABLE `comments` (
+  `id` INTEGER NOT NULL PRIMARY KEY,
+  `post_id` INTEGER NOT NULL,
+  `body` TEXT NOT NULL,
+  `type` VARCHAR(255) NOT NULL
+) TYPE=InnoDB;
+
+CREATE TABLE `authors` (
+  `id` INTEGER NOT NULL PRIMARY KEY,
+  `name` VARCHAR(255) NOT NULL
+) TYPE=InnoDB;
+
+CREATE TABLE `tasks` (
+  `id` int(11) NOT NULL auto_increment,
+  `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`)
+);
+
+CREATE TABLE `categories` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` VARCHAR(255) NOT NULL,
+  PRIMARY KEY  (`id`)
 );
 
+CREATE TABLE `categories_posts` (
+  `category_id` int(11) NOT NULL,
+  `post_id` int(11) NOT NULL
+);
+
+CREATE TABLE `fk_test_has_pk` (
+  `id` INTEGER NOT NULL PRIMARY KEY
+);
+
+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`)
+);