activerecord 1.1.0 → 1.2.0

data/test/finder_test.rb

@@ -1,20 +1,27 @@
 require 'abstract_unit'
 require 'fixtures/company'
 require 'fixtures/topic'
+require 'fixtures/entrant'
 
 class FinderTest < Test::Unit::TestCase
   def setup
     @company_fixtures = create_fixtures("companies")
     @topic_fixtures   = create_fixtures("topics")
+    @entrant_fixtures = create_fixtures("entrants")
   end
   
   def test_find
     assert_equal(@topic_fixtures["first"]["title"], Topic.find(1).title)
   end
   
+  def test_find_by_array_of_one_id
+    assert_kind_of(Array, Topic.find([ 1 ]))
+       assert_equal(1, Topic.find([ 1 ]).length)
+  end
+  
   def test_find_by_ids
     assert_equal(2, Topic.find(1, 2).length)
-    assert_equal(@topic_fixtures["second"]["title"], Topic.find([ 2 ]).title)
+    assert_equal(@topic_fixtures["second"]["title"], Topic.find([ 2 ]).first.title)
   end
 
   def test_find_by_ids_missing_one
@@ -23,6 +30,20 @@ class FinderTest < Test::Unit::TestCase
     }
   end
   
+  def test_find_all_with_limit
+    entrants = Entrant.find_all nil, "id ASC", 2
+    
+    assert_equal(2, entrants.size)
+    assert_equal(@entrant_fixtures["first"]["name"], entrants.first.name)
+  end
+
+  def test_find_all_with_prepared_limit_and_offset
+    entrants = Entrant.find_all nil, "id ASC", ["? OFFSET ?", 2, 1]
+    
+    assert_equal(2, entrants.size)
+    assert_equal(@entrant_fixtures["second"]["name"], entrants.first.name)
+  end
+
   def test_find_with_entire_select_statement
     topics = Topic.find_by_sql "SELECT * FROM topics WHERE author_name = 'Mary'"
     
@@ -30,6 +51,13 @@ class FinderTest < Test::Unit::TestCase
     assert_equal(@topic_fixtures["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(@topic_fixtures["second"]["title"], topics.first.title)
+  end
+  
   def test_find_first
     first = Topic.find_first "title = 'The First Topic'"
     assert_equal(@topic_fixtures["first"]["title"], first.title)
@@ -60,8 +88,58 @@ class FinderTest < Test::Unit::TestCase
     assert_kind_of Time, Topic.find_first(["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_raises(ActiveRecord::PreparedStatementInvalid) {
+      Company.find_first(["id=? AND name = ?", 2])
+    }
+    assert_raises(ActiveRecord::PreparedStatementInvalid) {
+	   Company.find_first(["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"])
+  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"}])
+  end
+
+  def test_named_bind_variables
+    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_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_string_sanitation
-    assert_equal "something '' 1=1", ActiveRecord::Base.sanitize("something ' 1=1")
-    assert_equal "something select table", ActiveRecord::Base.sanitize("something; select table")
+    assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
+    assert_equal "'something; select table'", ActiveRecord::Base.sanitize("something; select table")
+  end
+
+  def test_count
+    assert_equal(0, Entrant.count("id > 3"))
+    assert_equal(1, Entrant.count(["id > ?", 2]))
+    assert_equal(2, Entrant.count(["id > ?", 1]))
+  end
+
+  def test_count_by_sql
+    assert_equal(0, Entrant.count_by_sql("SELECT COUNT(*) FROM entrants WHERE id > 3"))
+    assert_equal(1, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 2]))
+    assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1]))
   end
-end
+end

data/test/fixtures/accounts.yml

@@ -0,0 +1,8 @@
+signals37:
+  id: 1
+  firm_id: 1
+  credit_limit: 50
+
+unknown:
+  id: 2
+  credit_limit: 50

data/test/fixtures/company.rb

@@ -9,6 +9,12 @@ class Firm < Company
   has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
   has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
   has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
+  has_many :clients_using_counter_sql, :class_name => "Client",
+           :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}',
+           :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = #{id}'
+  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_one :account, :dependent => true
 end

data/test/fixtures/company_in_module.rb

@@ -24,7 +24,7 @@ module MyApplication
 
       protected
         def validate
-          errors.add_on_boundry_breaking("name", 3..20)
+          errors.add_on_boundary_breaking("name", 3..20)
       end
     end
     

data/test/fixtures/db_definitions/mysql.sql

@@ -23,6 +23,7 @@ CREATE TABLE `topics` (
   `author_name` varchar(255) default NULL,
   `author_email_address` varchar(255) default NULL,
   `written_on` datetime default NULL,
+  `bonus_time` time default NULL,
   `last_read` date default NULL,
   `content` text,
   `approved` tinyint(1) default 1,
@@ -95,3 +96,15 @@ CREATE TABLE `colnametests` (
   `references` int(11) NOT NULL,
   PRIMARY KEY (`id`)
 );
+
+CREATE TABLE `mixins` (
+  `id` int(11) NOT NULL auto_increment,
+  `parent_id` int(11) default NULL,
+  `pos` int(11) default NULL,
+  `lft` int(11) default NULL,
+  `rgt` int(11) default NULL,
+  `root_id` int(11) default NULL,  
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+);

data/test/fixtures/db_definitions/postgresql.sql

@@ -46,6 +46,7 @@ CREATE TABLE topics (
     author_name character varying(255),
     author_email_address character varying(255),
     written_on timestamp without time zone,
+    bonus_time time,
     last_read date,
     content text,
     replies_count integer default 0,
@@ -112,3 +113,15 @@ CREATE TABLE colnametests (
   id serial,
   "references" integer NOT NULL
 );
+
+CREATE TABLE mixins (
+  id serial,
+  parent_id integer,
+  pos integer,
+  lft integer,
+  rgt integer,
+  root_id integer,  
+  created_at timestamp,
+  updated_at timestamp,
+  PRIMARY KEY  (id)
+);

data/test/fixtures/db_definitions/sqlite.sql

@@ -21,6 +21,7 @@ CREATE TABLE 'topics' (
   'author_name' VARCHAR(255) DEFAULT NULL,
   'author_email_address' VARCHAR(255) DEFAULT NULL,
   'written_on' DATETIME DEFAULT NULL,
+  'bonus_time' TIME DEFAULT NULL,
   'last_read' DATE DEFAULT NULL,
   'content' TEXT,
   'approved' INTEGER DEFAULT 1,
@@ -84,3 +85,16 @@ CREATE TABLE 'colnametests' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'references' INTEGER NOT NULL
 );
+
+CREATE TABLE 'mixins' (
+  'id' INTEGER NOT NULL PRIMARY KEY,
+  'parent_id' INTEGER DEFAULT NULL,
+  'pos' INTEGER DEFAULT NULL,
+  'lft' INTEGER DEFAULT NULL,
+  'rgt' INTEGER DEFAULT NULL,
+  'root_id' INTEGER DEFAULT NULL,    
+  'created_at' DATETIME DEFAULT NULL,
+  'updated_at' DATETIME DEFAULT NULL
+);
+
+

data/test/fixtures/db_definitions/sqlserver.sql

@@ -0,0 +1,110 @@
+CREATE TABLE accounts (
+  id int NOT NULL IDENTITY(1, 1),
+  firm_id int default NULL,
+  credit_limit int default NULL,
+  PRIMARY KEY  (id)
+)
+
+CREATE TABLE companies (
+  id int NOT NULL IDENTITY(1, 1),
+  type varchar(50) default NULL,
+  ruby_type varchar(50) default NULL,
+  firm_id int default NULL,
+  name varchar(50) default NULL,
+  client_of int default NULL,
+  companies_count int default 0,
+  rating int default 1,
+  PRIMARY KEY  (id)
+)
+
+CREATE TABLE topics (
+  id int NOT NULL IDENTITY(1, 1),
+  title varchar(255) default NULL,
+  author_name varchar(255) default NULL,
+  author_email_address varchar(255) default NULL,
+  written_on datetime default NULL,
+  last_read datetime default NULL,
+  content text,
+  approved tinyint default 1,
+  replies_count int default 0,
+  parent_id int default NULL,
+  type varchar(50) default NULL,
+  PRIMARY KEY  (id)
+)
+
+CREATE TABLE developers (
+  id int NOT NULL IDENTITY(1, 1),
+  name varchar(100) default NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE projects (
+  id int NOT NULL IDENTITY(1, 1),
+  name varchar(100) default NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE developers_projects (
+  developer_id int NOT NULL,
+  project_id int NOT NULL
+);
+
+CREATE TABLE customers (
+  id int NOT NULL IDENTITY(1, 1),
+  name varchar(100) default NULL,
+  balance int default 0,
+  address_street varchar(100) default NULL,
+  address_city varchar(100) default NULL,
+  address_country varchar(100) default NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE movies (
+  movieid int NOT NULL IDENTITY(1, 1),
+  name varchar(100) default NULL,
+   PRIMARY KEY  (movieid)
+);
+
+CREATE TABLE subscribers (
+  nick varchar(100) NOT NULL,
+  name varchar(100) default NULL,
+  PRIMARY KEY  (nick)
+);
+
+CREATE TABLE booleantests (
+  id int NOT NULL IDENTITY(1, 1),
+  value integer default NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE auto_id_tests (
+  auto_id int NOT NULL IDENTITY(1, 1),
+  value int default NULL,
+  PRIMARY KEY (auto_id)
+);
+
+CREATE TABLE entrants (
+  id int NOT NULL PRIMARY KEY,
+  name varchar(255) NOT NULL,
+  course_id int NOT NULL
+);
+
+CREATE TABLE colnametests (
+  id int NOT NULL IDENTITY(1, 1),
+  [references] int NOT NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE mixins (
+  id int NOT NULL IDENTITY(1, 1),
+  parent_id int default NULL,
+  pos int default NULL,
+  lft int default NULL,
+  rgt int default NULL,
+  root_id int default NULL,      
+  created_at datetime default NULL,
+  updated_at datetime default NULL,
+  PRIMARY KEY (id)    
+);
+
+

data/test/fixtures/db_definitions/sqlserver2.sql

@@ -0,0 +1,4 @@
+CREATE TABLE courses (
+ id int NOT NULL PRIMARY KEY,
+ name varchar(255) NOT NULL
+);

data/test/fixtures/developer.rb

@@ -3,6 +3,6 @@ class Developer < ActiveRecord::Base
 
   protected
     def validate
-      errors.add_on_boundry_breaking("name", 3..20)
+      errors.add_on_boundary_breaking("name", 3..20)
     end
-end
+end

data/test/fixtures/developers.yml

@@ -0,0 +1,13 @@
+david:
+  id: 1
+  name: David
+
+jamis:
+  id: 2
+  name: Jamis
+
+<% for digit in 3..10 %>
+dev_<%= digit %>:
+  id: <%= digit %>
+  name: fixture_<%= digit %>
+<% end %>

data/test/fixtures/mixin.rb

@@ -0,0 +1,17 @@
+class Mixin < ActiveRecord::Base
+  acts_as_tree :foreign_key => "parent_id", :order => "id"
+
+end
+
+class ListMixin < ActiveRecord::Base
+  acts_as_list :column => "pos", :scope => :parent
+
+  def self.table_name() "mixins" end
+end
+
+
+class ListWithStringScopeMixin < ActiveRecord::Base
+  acts_as_list :column => "pos", :scope => 'parent_id = #{parent_id}'
+
+  def self.table_name() "mixins" end
+end

data/test/fixtures/mixins.yml

@@ -0,0 +1,14 @@
+first:
+  id: 1
+  pos: 1
+  parent_id: 0 
+  
+second:
+  id: 2
+  pos: 1
+  parent_id: 1
+
+third:
+  id: 3
+  pos: 2
+  parent_id: 1

data/test/fixtures/naked/csv/accounts.csv

@@ -0,0 +1 @@
+

data/test/fixtures/naked/yml/accounts.yml

@@ -0,0 +1 @@
+

data/test/fixtures/naked/yml/companies.yml

@@ -0,0 +1 @@
+# i wonder what will happen here

data/test/fixtures/naked/yml/courses.yml

@@ -0,0 +1 @@
+qwerty

data/test/fixtures/project.rb

@@ -1,4 +1,10 @@
 class Project < ActiveRecord::Base
   has_and_belongs_to_many :developers, :uniq => true
   has_and_belongs_to_many :developers_named_david, :class_name => "Developer", :conditions => "name = 'David'", :uniq => true
+end
+
+class SpecialProject < Project
+  def hello_world
+    "hello there!"
+  end
 end

data/test/fixtures/reply.rb

@@ -1,21 +1,34 @@
 class Reply < Topic
   belongs_to :topic, :foreign_key => "parent_id", :counter_cache => true
+  has_many :silly_replies, :dependent => true, :foreign_key => "parent_id"
+
+  validate :errors_on_empty_content
+  validate_on_create :title_is_wrong_create
   
   attr_accessible :title, :author_name, :author_email_address, :written_on, :content, :last_read
 
   def validate
     errors.add("title", "Empty")   unless attribute_present? "title"
+  end
+  
+  def errors_on_empty_content
     errors.add("content", "Empty") unless attribute_present? "content"
   end
   
   def validate_on_create
-    errors.add("title", "is Wrong Create") if attribute_present?("title") && title == "Wrong Create"
     if attribute_present?("title") && attribute_present?("content") && content == "Mismatch"
       errors.add("title", "is Content Mismatch") 
     end
   end
 
+  def title_is_wrong_create
+    errors.add("title", "is Wrong Create") if attribute_present?("title") && title == "Wrong Create"
+  end
+
   def validate_on_update
     errors.add("title", "is Wrong Update") if attribute_present?("title") && title == "Wrong Update"
   end
+end
+
+class SillyReply < Reply
 end