activerecord 1.10.1 → 1.11.0

data/test/fixtures/db_definitions/oci.sql

@@ -55,12 +55,15 @@ create table developers (
     id integer not null,
     name varchar(100) default null,
     salary integer default 70000,
+    created_at timestamp default null,
+    updated_at timestamp default null,
     primary key (id)
 );
 
 create table projects (
     id integer not null,
     name varchar(100) default null,
+    type varchar(255) default null,
     primary key (id)
 );
 
@@ -164,7 +167,8 @@ create table binaries (
 
 create table computers (
   id integer not null primary key,
-  developer integer not null references developers initially deferred disable
+  developer integer not null references developers initially deferred disable,
+  extendedWarranty integer not null
 );
 
 create table posts (
@@ -195,7 +199,8 @@ create table tasks (
 
 create table categories (
   id integer not null primary key,
-  name varchar(255) default null
+  name varchar(255) default null,
+  type varchar(255) default null
 );
 
 create table categories_posts (

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

@@ -21,4 +21,6 @@ DROP TABLE authors;
 DROP TABLE tasks;
 DROP TABLE categories;
 DROP TABLE categories_posts;
-
+DROP TABLE defaults;
+DROP TABLE fk_test_has_fk;
+DROP TABLE fk_test_has_pk;

data/test/fixtures/db_definitions/postgresql.sql

@@ -1,5 +1,3 @@
-SET search_path = public, pg_catalog;
-
 CREATE TABLE accounts (
     id serial,
     firm_id integer,
@@ -30,6 +28,8 @@ CREATE TABLE developers (
     id serial,
     name character varying(100),
     salary integer DEFAULT 70000,
+    created_at timestamp,
+    updated_at timestamp,
     PRIMARY KEY (id)
 );
 SELECT setval('developers_id_seq', 100);
@@ -37,6 +37,7 @@ SELECT setval('developers_id_seq', 100);
 CREATE TABLE projects (
     id serial,
     name character varying(100),
+    type varchar(255),
     PRIMARY KEY (id)
 );
 SELECT setval('projects_id_seq', 100);
@@ -50,10 +51,10 @@ CREATE TABLE topics (
     bonus_time time,
     last_read date,
     content text,
+    approved smallint DEFAULT 1,
     replies_count integer default 0,
     parent_id integer,
     "type" character varying(50),
-    approved smallint DEFAULT 1,
     PRIMARY KEY (id)
 );
 SELECT setval('topics_id_seq', 100);
@@ -144,7 +145,8 @@ CREATE TABLE binaries (
 
 CREATE TABLE computers (
   id serial,
-  developer integer NOT NULL
+  developer integer NOT NULL,
+  "extendedWarranty" integer NOT NULL
 );
 
 CREATE TABLE posts (
@@ -176,7 +178,8 @@ CREATE TABLE tasks (
 
 CREATE TABLE categories (
   id serial,
-  name varchar(255)
+  name varchar(255),
+  type varchar(255)
 );
 
 CREATE TABLE categories_posts (

data/test/fixtures/db_definitions/sqlite.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/sqlite.sql

@@ -33,12 +33,15 @@ CREATE TABLE 'topics' (
 CREATE TABLE 'developers' (
   'id' INTEGER PRIMARY KEY NOT NULL,
   'name' TEXT DEFAULT NULL,
-  'salary' INTEGER DEFAULT 70000
+  'salary' INTEGER DEFAULT 70000,
+  'created_at' DATETIME DEFAULT NULL,
+  'updated_at' DATETIME DEFAULT NULL
 );
 
 CREATE TABLE 'projects' (
   'id' INTEGER PRIMARY KEY NOT NULL,
-  'name' TEXT DEFAULT NULL
+  'name' TEXT DEFAULT NULL,
+  'type' VARCHAR(255) DEFAULT NULL
 );
 
 CREATE TABLE 'developers_projects' (
@@ -113,7 +116,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
 );
 
 CREATE TABLE 'posts' (
@@ -144,7 +148,8 @@ CREATE TABLE 'tasks' (
 
 CREATE TABLE 'categories' (
   'id' INTEGER NOT NULL PRIMARY KEY,
-  'name' VARCHAR(255) NOT NULL
+  'name' VARCHAR(255) NOT NULL,
+  'type' VARCHAR(255) DEFAULT NULL
 );
 
 CREATE TABLE 'categories_posts' (

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

@@ -21,3 +21,5 @@ DROP TABLE authors;
 DROP TABLE tasks;
 DROP TABLE categories;
 DROP TABLE categories_posts;
+DROP TABLE fk_test_has_pd;
+DROP TABLE fk_test_has_fk;

data/test/fixtures/db_definitions/sqlserver.sql

@@ -2,7 +2,7 @@ CREATE TABLE accounts (
   id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
   firm_id int default NULL,
   credit_limit int default NULL
-)
+);
 
 CREATE TABLE companies (
   id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
@@ -12,7 +12,7 @@ CREATE TABLE companies (
   name varchar(50) default NULL,
   client_of int default NULL,
   rating int default 1
-)
+);
 
 CREATE TABLE topics (
   id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
@@ -27,17 +27,20 @@ CREATE TABLE topics (
   replies_count int default 0,
   parent_id int default NULL,
   type varchar(50) default NULL
-)
+);
 
 CREATE TABLE developers (
   id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
   name varchar(100) default NULL,
-  salary int default 70000
+  salary int default 70000,
+  created_at datetime default NULL,
+  updated_at datetime default NULL
 );
 
 CREATE TABLE projects (
   id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
-  name varchar(100) default NULL
+  name varchar(100) default NULL,
+  type varchar(255) default NULL
 );
 
 CREATE TABLE developers_projects (
@@ -113,7 +116,8 @@ CREATE TABLE binaries (
 
 CREATE TABLE computers (
   id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
-  developer int NOT NULL
+  developer int NOT NULL,
+  extendedWarranty int NOT NULL
 );
 
 CREATE TABLE posts (
@@ -144,7 +148,8 @@ CREATE TABLE tasks (
 
 CREATE TABLE categories (
   id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
-  name varchar(255)
+  name varchar(255),
+  type varchar(255) default NULL
 );
 
 CREATE TABLE categories_posts (

data/test/fixtures/developer.rb

@@ -1,6 +1,13 @@
 class Developer < ActiveRecord::Base
   has_and_belongs_to_many :projects
-
+  has_and_belongs_to_many :special_projects, :join_table => 'developers_projects', :association_foreign_key => 'project_id'
+	
   validates_inclusion_of :salary, :in => 50000..200000
   validates_length_of    :name, :within => 3..20
 end
+
+DeveloperSalary = Struct.new(:amount)
+class DeveloperWithAggregate < ActiveRecord::Base
+  self.table_name = 'developers'
+  composed_of :salary, :class_name => 'DeveloperSalary', :mapping => [%w(salary amount)]
+end

data/test/fixtures/migrations/3_innocent_jointable.rb

@@ -0,0 +1,12 @@
+class InnocentJointable < ActiveRecord::Migration
+  def self.up
+    create_table("people_reminders", :id => false) do |t|
+      t.column :reminder_id, :integer
+      t.column :person_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table "people_reminders"
+  end
+end

data/test/fixtures/post.rb

@@ -1,8 +1,14 @@
 class Post < ActiveRecord::Base
   belongs_to :author
   has_many   :comments, :order => "body"
+  has_one    :very_special_comment, :class_name => "VerySpecialComment"
+  has_many   :special_comments, :class_name => "SpecialComment"
   has_and_belongs_to_many :categories
+  has_and_belongs_to_many :special_categories, :join_table => "categories_posts"
 end
 
-class SpecialPost < Post
-end
+class SpecialPost < Post; end;
+
+class StiPost < Post
+  has_one :special_comment, :class_name => "SpecialComment"
+end

data/test/fixtures/posts.yml

@@ -18,3 +18,24 @@ authorless:
   title: I don't have any comments
   body: I just don't want to
   type: Post
+
+sti_comments:
+  id: 4
+  author_id: 1
+  title: sti comments
+  body: hello
+  type: Post
+
+sti_post_and_comments:
+  id: 5
+  author_id: 1
+  title: sti me
+  body: hello
+  type: StiPost
+
+sti_habtm:
+  id: 6
+  author_id: 1
+  title: habtm sti test
+  body: hello
+  type: Post

data/test/fixtures/project.rb

@@ -1,10 +1,23 @@
 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
+  has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
+  has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => "DELETE FROM developers_projects WHERE project_id = \#{id} AND developer_id = \#{record.id}"
+  has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id}"},
+                            :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id}"}, 
+                            :before_remove => Proc.new {|o, r| o.developers_log << "before_removing#{r.id}"},
+                            :after_remove => Proc.new {|o, r| o.developers_log << "after_removing#{r.id}"}
+
+  attr_accessor :developers_log
+
+  def after_initialize
+    @developers_log = []
+  end
+
 end
 
 class SpecialProject < Project
   def hello_world
     "hello there!"
   end
-end
+end

data/test/fixtures/subscriber.rb

@@ -3,3 +3,6 @@ class Subscriber < ActiveRecord::Base
     "nick"
   end
 end
+
+class SpecialSubscriber < Subscriber
+end

data/test/fixtures_test.rb

@@ -3,8 +3,12 @@ require 'fixtures/topic'
 require 'fixtures/developer'
 require 'fixtures/company'
 require 'fixtures/task'
+require 'fixtures/reply'
 
 class FixturesTest < Test::Unit::TestCase
+  self.use_instantiated_fixtures = true
+  self.use_transactional_fixtures = false
+
   fixtures :topics, :developers, :accounts, :tasks
 
   FIXTURES = %w( accounts companies customers
@@ -130,11 +134,19 @@ class FixturesWithoutInstantiationTest < Test::Unit::TestCase
   def test_fixtures_from_root_yml_without_instantiation
     assert_nil @unknown
   end
+
+  def test_accessor_methods
+    assert_equal "The First Topic", topics(:first).title
+    assert_equal "Jamis", developers(:jamis).name
+    assert_equal 50, accounts(:signals37).credit_limit
+  end
 end
 
 
 class FixturesWithoutInstanceInstantiationTest < Test::Unit::TestCase
+  self.use_instantiated_fixtures = true
   self.use_instantiated_fixtures = :no_instances
+
   fixtures :topics, :developers, :accounts
 
   def test_without_instance_instantiation
@@ -147,7 +159,9 @@ end
 
 
 class TransactionalFixturesTest < Test::Unit::TestCase
+  self.use_instantiated_fixtures = true
   self.use_transactional_fixtures = true
+
   fixtures :topics
 
   def test_destroy

data/test/inheritance_test.rb

@@ -1,12 +1,21 @@
 require 'abstract_unit'
 require 'fixtures/company'
 require 'fixtures/project'
+require 'fixtures/subscriber'
 
 class InheritanceTest < Test::Unit::TestCase
-  fixtures :companies, :projects
+  fixtures :companies, :projects, :subscribers
 
   def test_a_bad_type_column
+    #SQLServer need to turn Identity Insert On before manually inserting into the Identity column
+    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter and ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
+      Company.connection.execute "SET IDENTITY_INSERT companies ON"
+    end
     Company.connection.insert "INSERT INTO companies (id, type, name) VALUES(100, 'bad_class!', 'Not happening')"
+    #We then need to turn it back Off before continuing.
+    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter and ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
+      Company.connection.execute "SET IDENTITY_INSERT companies OFF"
+    end
     assert_raises(ActiveRecord::SubclassNotFound) { Company.find(100) }
   end
 
@@ -23,7 +32,7 @@ class InheritanceTest < Test::Unit::TestCase
   end
 
   def test_inheritance_find_all
-    companies = Company.find_all(nil, "id")
+    companies = Company.find(:all, :order => 'id')
     assert companies[0].kind_of?(Firm), "37signals should be a firm"
     assert companies[1].kind_of?(Client), "Summit should be a client"
   end
@@ -48,9 +57,9 @@ class InheritanceTest < Test::Unit::TestCase
   end
 
   def test_inheritance_condition
-    assert_equal 3, Company.find_all.length
-    assert_equal 1, Firm.find_all.length
-    assert_equal 2, Client.find_all.length
+    assert_equal 5, Company.count
+    assert_equal 2, Firm.count
+    assert_equal 3, Client.count
   end
   
   def test_alt_inheritance_condition
@@ -70,8 +79,8 @@ class InheritanceTest < Test::Unit::TestCase
 
   def test_update_all_within_inheritance
     Client.update_all "name = 'I am a client'"
-    assert_equal "I am a client", Client.find_all.first.name
-    assert_equal "37signals", Firm.find_all.first.name
+    assert_equal "I am a client", Client.find(:all).first.name
+    assert_equal "37signals", Firm.find(:all).first.name
   end
   
   def test_alt_update_all_within_inheritance
@@ -81,8 +90,8 @@ class InheritanceTest < Test::Unit::TestCase
 
   def test_destroy_all_within_inheritance
     Client.destroy_all
-    assert_equal 0, Client.find_all.length
-    assert_equal 1, Firm.find_all.length
+    assert_equal 0, Client.count
+    assert_equal 2, Firm.count
   end
   
   def test_alt_destroy_all_within_inheritance
@@ -91,9 +100,9 @@ class InheritanceTest < Test::Unit::TestCase
   end
 
   def test_find_first_within_inheritance
-    assert_kind_of Firm, Company.find_first("name = '37signals'")
-    assert_kind_of Firm, Firm.find_first("name = '37signals'")
-    assert_nil Client.find_first("name = '37signals'")
+    assert_kind_of Firm, Company.find(:first, :conditions => "name = '37signals'")
+    assert_kind_of Firm, Firm.find(:first, :conditions => "name = '37signals'")
+    assert_nil Client.find(:first, :conditions => "name = '37signals'")
   end
   
   def test_alt_find_first_within_inheritance
@@ -103,11 +112,11 @@ class InheritanceTest < Test::Unit::TestCase
 
   def test_complex_inheritance
     very_special_client = VerySpecialClient.create("name" => "veryspecial")
-    assert_equal very_special_client, VerySpecialClient.find_first("name = 'veryspecial'")
-    assert_equal very_special_client, SpecialClient.find_first("name = 'veryspecial'")
-    assert_equal very_special_client, Company.find_first("name = 'veryspecial'")
-    assert_equal very_special_client, Client.find_first("name = 'veryspecial'")
-    assert_equal 1, Client.find_all("name = 'Summit'").size
+    assert_equal very_special_client, VerySpecialClient.find(:first, :conditions => "name = 'veryspecial'")
+    assert_equal very_special_client, SpecialClient.find(:first, :conditions => "name = 'veryspecial'")
+    assert_equal very_special_client, Company.find(:first, :conditions => "name = 'veryspecial'")
+    assert_equal very_special_client, Client.find(:first, :conditions => "name = 'veryspecial'")
+    assert_equal 1, Client.find(:all, :conditions => "name = 'Summit'").size
     assert_equal very_special_client, Client.find(very_special_client.id)
   end
 
@@ -117,19 +126,18 @@ class InheritanceTest < Test::Unit::TestCase
   end
 
   def test_inheritance_without_mapping
-    assert_kind_of SpecialProject, SpecialProject.find(1)
-    assert_nothing_raised { SpecialProject.create("name" => "And breaaaaathe!") }
-    
+    assert_kind_of SpecialSubscriber, SpecialSubscriber.find("webster132")
+    assert_nothing_raised { SpecialSubscriber.create("name" => "And breaaaaathe!", "id" => "smartass") }
   end
 
   private
     def switch_to_alt_inheritance_column
       # we don't want misleading test results, so get rid of the values in the type column
-      Company.find_all(nil, "id").each do |c|
+      Company.find(:all, :order => 'id').each do |c|
         c['type'] = nil
         c.save
       end
     
       def Company.inheritance_column() "ruby_type" end
     end
-end
+end