activerecord 1.11.1 → 1.12.1

data/test/finder_test.rb

@@ -3,9 +3,10 @@ require 'fixtures/company'
 require 'fixtures/topic'
 require 'fixtures/entrant'
 require 'fixtures/developer'
+require 'fixtures/post'
 
 class FinderTest < Test::Unit::TestCase
-  fixtures :companies, :topics, :entrants, :developers
+  fixtures :companies, :topics, :entrants, :developers, :posts
 
   def test_find
     assert_equal(topics(:first).title, Topic.find(1).title)
@@ -93,10 +94,14 @@ class FinderTest < Test::Unit::TestCase
     
     Topic.find(2).parent
   end
+  
+  def test_find_only_some_columns
+    assert_raises(NoMethodError) { Topic.find(1, :select => "author_name").title }
+  end
 
   def test_find_on_conditions
-    assert Topic.find(1, :conditions => "approved = 0")
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => "approved = 1") }
+    assert Topic.find(1, :conditions => ["approved = ?", false])
+    assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => ["approved = ?", true]) }
   end
   
   def test_condition_interpolation
@@ -271,6 +276,11 @@ class FinderTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::StatementInvalid) { Topic.find_by_sql "select 1 from badtable" }
   end
 
+  def test_find_with_invalid_params
+    assert_raises(ArgumentError) { Topic.find :first, :join => "It should be `joins'" }
+    assert_raises(ArgumentError) { Topic.find :first, :conditions => '1 = 1', :join => "It should be `joins'" }
+  end
+
   def test_find_all_with_limit
     first_five_developers = Developer.find :all, :order => 'id ASC', :limit =>  5
     assert_equal 5, first_five_developers.length
@@ -307,6 +317,26 @@ class FinderTest < Test::Unit::TestCase
     assert developer_names.include?('Jamis')
   end
 
+  def test_find_by_id_with_conditions_with_or
+    assert_nothing_raised do
+      Post.find([1,2,3],
+        :conditions => "posts.id <= 3 OR posts.type = 'Post'")
+    end
+  end
+
+  def test_select_value
+    assert_equal "37signals", Company.connection.select_value("SELECT name FROM companies WHERE id = 1")
+    assert_nil Company.connection.select_value("SELECT name FROM companies WHERE id = -1")
+    # make sure we didn't break count...
+    assert_equal 0, Company.count_by_sql("SELECT COUNT(*) FROM companies WHERE name = 'Halliburton'")
+    assert_equal 1, Company.count_by_sql("SELECT COUNT(*) FROM companies WHERE name = '37signals'")
+  end
+
+  def test_select_values
+    assert_equal ["1","2","3","4","5","6","7","8"], Company.connection.select_values("SELECT id FROM companies ORDER BY id")
+    assert_equal ["37signals","Summit","Microsoft", "Flamboyant Software", "Ex Nihilo", "RailsCore", "Leetsoft", "Jadedpixel"], Company.connection.select_values("SELECT name FROM companies ORDER BY id")
+  end
+
   protected
     def bind(statement, *vars)
       if vars.first.is_a?(Hash)

data/test/fixtures/accounts.yml

@@ -6,3 +6,8 @@ signals37:
 unknown:
   id: 2
   credit_limit: 50
+
+rails_core_account:
+  id: 3
+  firm_id: 6
+  credit_limit: 50

data/test/fixtures/categories_ordered.yml

@@ -0,0 +1,7 @@
+--- !omap
+<% 100.times do |i| %>
+- fixture_no_<%= i %>:
+    id: <%= i %>
+    name: <%= "Category #{i}" %>
+    type: Category
+<% end %>

data/test/fixtures/category.rb

@@ -1,5 +1,15 @@
 class Category < ActiveRecord::Base
   has_and_belongs_to_many :posts
+  
+  def self.what_are_you
+    'a category...'
+  end
 end
 
-class SpecialCategory < Category; end;
+class SpecialCategory < Category
+  
+  def self.what_are_you
+    'a special category...'
+  end  
+  
+end

data/test/fixtures/comment.rb

@@ -1,7 +1,27 @@
 class Comment < ActiveRecord::Base
   belongs_to :post
+  
+  def self.what_are_you
+    'a comment...'
+  end
+  
+  def self.search_by_type(q)
+    self.find(:all, :conditions => ['type = ?', q])
+  end
 end
 
-class SpecialComment < Comment; end;
+class SpecialComment < Comment; 
 
-class VerySpecialComment < Comment; end;
+  def self.what_are_you
+    'a special comment...'
+  end
+  
+end;
+
+class VerySpecialComment < Comment; 
+  
+  def self.what_are_you
+    'a very special comment...'
+  end
+  
+end;

data/test/fixtures/comments.yml

@@ -57,3 +57,9 @@ check_eager_sti_on_associations2:
   post_id: 5
   body: Special Type
   type: SpecialComment
+
+eager_other_comment1:
+  id: 11
+  post_id: 7
+  body: go crazy
+  type: SpecialComment

data/test/fixtures/companies.yml

@@ -33,3 +33,18 @@ another_client:
   client_of: 4
   name: Ex Nihilo
   ruby_type: Client
+
+rails_core:
+  id: 6          
+  name: RailsCore
+  type: DependentFirm
+  
+leetsoft:
+  id: 7 
+  name: Leetsoft
+  client_of: 6
+  
+jadedpixel:
+  id: 8 
+  name: Jadedpixel
+  client_of: 6

data/test/fixtures/company.rb

@@ -1,5 +1,6 @@
 class Company < ActiveRecord::Base
   attr_protected :rating
+  set_sequence_name :companies_nonstd_seq
 
   validates_presence_of :name
 end
@@ -9,6 +10,8 @@ class Firm < Company
   has_many :clients, :order => "id", :dependent => true, :counter_sql => "SELECT COUNT(*) FROM companies WHERE firm_id = 1 AND (type = 'Client' OR type = 'SpecialClient' OR type = 'VerySpecialClient' )"
   has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
   has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
+  has_many :dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => true
+  has_many :exclusively_dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :exclusively_dependent => true
   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",
@@ -24,11 +27,31 @@ class Firm < Company
   has_one :account, :foreign_key => "firm_id", :dependent => true
 end
 
+class DependentFirm < Company
+  has_one :account, :foreign_key => "firm_id", :dependent => :nullify
+  has_many :companies, :foreign_key => 'client_of', :order => "id", :dependent => :nullify
+end
+
+
 class Client < Company
   belongs_to :firm, :foreign_key => "client_of"
   belongs_to :firm_with_basic_id, :class_name => "Firm", :foreign_key => "firm_id"
   belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of"
   belongs_to :firm_with_condition, :class_name => "Firm", :foreign_key => "client_of", :conditions => "1 = 1"
+
+  # Record destruction so we can test whether firm.clients.clear has
+  # is calling client.destroy, deleting from the database, or setting
+  # foreign keys to NULL.
+  def self.destroyed_client_ids
+    @destroyed_client_ids ||= Hash.new { |h,k| h[k] = [] }
+  end
+
+  before_destroy do |client|
+    if client.firm
+      Client.destroyed_client_ids[client.firm.id] << client.id
+    end
+    true
+  end
 end
 
 
@@ -45,4 +68,4 @@ class Account < ActiveRecord::Base
     def validate
       errors.add_on_empty "credit_limit"
     end
-end
+end

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

@@ -4,7 +4,9 @@ DROP TABLE topics;
 DROP TABLE developers;
 DROP TABLE projects;
 DROP TABLE developers_projects;
+DROP TABLE orders;
 DROP TABLE customers;
+DROP TABLE orders;
 DROP TABLE movies;
 DROP TABLE subscribers;
 DROP TABLE booleantests;
@@ -21,4 +23,6 @@ DROP TABLE authors;
 DROP TABLE tasks;
 DROP TABLE categories;
 DROP TABLE categories_posts;
-
+DROP TABLE fk_test_has_pk;
+DROP TABLE fk_test_has_fk;
+DROP TABLE keyboards;

data/test/fixtures/db_definitions/db2.sql

@@ -51,7 +51,16 @@ CREATE TABLE projects (
 CREATE TABLE developers_projects (
   developer_id int NOT NULL,
   project_id int NOT NULL,
-  joined_on date default NULL
+  joined_on date default NULL,
+  access_level smallint default 1
+);
+
+CREATE TABLE orders (
+  id int generated by default as identity (start with +10000),
+  name varchar(100) default NULL,
+  billing_customer_id int default NULL,
+  shipping_customer_id int default NULL,
+  PRIMARY KEY (id)
 );
 
 CREATE TABLE customers (
@@ -170,6 +179,11 @@ CREATE TABLE categories_posts (
   post_id int NOT NULL
 );
 
+CREATE TABLE keyboards (
+  key_number int generated by default as identity (start with +10000),
+  name VARCHAR(255)
+);
+
 CREATE TABLE fk_test_has_pk (
   id INTEGER NOT NULL PRIMARY KEY
 );

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

@@ -5,6 +5,7 @@ DROP TABLE developers;
 DROP TABLE projects;
 DROP TABLE developers_projects;
 DROP TABLE customers;
+DROP TABLE orders;
 DROP TABLE movies;
 DROP TABLE subscribers;
 DROP TABLE booleantests;
@@ -23,3 +24,4 @@ DROP TABLE categories;
 DROP TABLE categories_posts;
 DROP TABLE fk_test_has_fk;
 DROP TABLE fk_test_has_pk;
+DROP TABLE keyboards;

data/test/fixtures/db_definitions/mysql.sql

@@ -26,7 +26,7 @@ CREATE TABLE `topics` (
   `bonus_time` time default NULL,
   `last_read` date default NULL,
   `content` text,
-  `approved` tinyint(1) default 1,
+  `approved` tinyint default 1,
   `replies_count` int(11) default 0,
   `parent_id` int(11) default NULL,
   `type` varchar(50) default NULL,
@@ -52,7 +52,16 @@ CREATE TABLE `projects` (
 CREATE TABLE `developers_projects` (
   `developer_id` int(11) NOT NULL,
   `project_id` int(11) NOT NULL,
-  `joined_on` date default NULL
+  `joined_on` date default NULL,
+  `access_level` smallint default 1
+) TYPE=InnoDB;
+
+CREATE TABLE `orders` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(100) default NULL,
+  `billing_customer_id` int(11) default NULL,
+  `shipping_customer_id` int(11) default NULL,
+  PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
 CREATE TABLE `customers` (
@@ -182,3 +191,9 @@ CREATE TABLE `fk_test_has_fk` (
 
   FOREIGN KEY (`fk_id`) REFERENCES `fk_test_has_pk`(`id`)
 ) TYPE=InnoDB;
+
+
+CREATE TABLE `keyboards` (
+  `key_number` int(11) NOT NULL auto_increment primary key,
+  `name` varchar(50) default NULL
+);

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

@@ -1,10 +1,13 @@
 drop table accounts;
 drop table companies;
 drop table topics;
+drop synonym subjects;
+drop table developers_projects;
+drop table computers;
 drop table developers;
 drop table projects;
-drop table developers_projects;
 drop table customers;
+drop table orders;
 drop table movies;
 drop table subscribers;
 drop table booleantests;
@@ -14,10 +17,39 @@ drop table colnametests;
 drop table mixins;
 drop table people;
 drop table binaries;
-drop table posts;
 drop table comments;
 drop table authors;
-drop table computers;
-drop table categories;
+drop table tasks;
 drop table categories_posts;
-drop sequence rails_sequence;
+drop table categories;
+drop table posts;
+drop table fk_test_has_pk;
+drop table fk_test_has_fk;
+drop table keyboards;
+drop sequence accounts_seq;
+drop sequence companies_nonstd_seq;
+drop sequence topics_seq;
+drop sequence developers_seq;
+drop sequence projects_seq;
+drop sequence developers_projects_seq;
+drop sequence customers_seq;
+drop sequence orders_seq;
+drop sequence movies_seq;
+drop sequence subscribers_seq;
+drop sequence booleantests_seq;
+drop sequence auto_id_tests_seq;
+drop sequence entrants_seq;
+drop sequence colnametests_seq;
+drop sequence mixins_seq;
+drop sequence people_seq;
+drop sequence binaries_seq;
+drop sequence posts_seq;
+drop sequence comments_seq;
+drop sequence authors_seq;
+drop sequence tasks_seq;
+drop sequence computers_seq;
+drop sequence categories_seq;
+drop sequence categories_posts_seq;
+drop sequence fk_test_has_pk_seq;
+drop sequence fk_test_has_fk_seq;
+drop sequence keyboards_seq;

data/test/fixtures/db_definitions/oci.sql

@@ -1,5 +1,3 @@
-create sequence rails_sequence minvalue 10000;
-
 create table companies (
     id integer not null,
     type varchar(50) default null,
@@ -12,12 +10,17 @@ create table companies (
     primary key (id)
 );
 
+-- non-standard sequence name used to test set_sequence_name
+--
+create sequence companies_nonstd_seq minvalue 10000;
+
 create table accounts (
     id integer not null,
     firm_id integer default null references companies initially deferred disable,
     credit_limit integer default null,
     primary key (id)
 );
+create sequence accounts_seq minvalue 10000;
 
 create table topics (
     id integer not null,
@@ -50,6 +53,9 @@ create table topics (
     type varchar(50) default null,
     primary key (id)
 );
+create sequence topics_seq minvalue 10000;
+
+create synonym subjects for topics;
 
 create table developers (
     id integer not null,
@@ -59,6 +65,7 @@ create table developers (
     updated_at timestamp default null,
     primary key (id)
 );
+create sequence developers_seq minvalue 10000;
 
 create table projects (
     id integer not null,
@@ -66,11 +73,13 @@ create table projects (
     type varchar(255) default null,
     primary key (id)
 );
+create sequence projects_seq minvalue 10000;
 
 create table developers_projects (
     developer_id integer not null references developers initially deferred disable,
     project_id integer not null references projects initially deferred disable,
-    joined_on timestamp default null
+    joined_on timestamp default null,
+    access_level integer default 1
 );
 -- Try again for 8i
 create table developers_projects (
@@ -78,6 +87,16 @@ create table developers_projects (
     project_id integer not null references projects initially deferred disable,
     joined_on date default null
 );
+create sequence developers_projects_seq minvalue 10000;
+
+create table orders (
+    id integer not null,
+    name varchar(100) default null,
+    billing_customer_id integer default null,
+    shipping_customer_id integer default null,
+    primary key (id)
+);
+create sequence orders_seq minvalue 10000;
 
 create table customers (
     id integer not null,
@@ -89,42 +108,49 @@ create table customers (
     gps_location varchar(100) default null,
     primary key (id)
 );
+create sequence customers_seq minvalue 10000;
 
 create table movies (
     movieid integer not null,
     name varchar(100) default null,
     primary key (movieid)
 );
+create sequence movies_seq minvalue 10000;
 
 create table subscribers (
     nick varchar(100) not null,
     name varchar(100) default null,
     primary key (nick)
 );
+create sequence subscribers_seq minvalue 10000;
 
 create table booleantests (
     id integer not null,
     value integer default null,
     primary key (id)
 );
+create sequence booleantests_seq minvalue 10000;
 
 create table auto_id_tests (
     auto_id integer not null,
     value integer default null,
     primary key (auto_id)
 );
+create sequence auto_id_tests_seq minvalue 10000;
 
 create table entrants (
     id integer not null primary key,
     name varchar(255) not null,
     course_id integer not null
 );
+create sequence entrants_seq minvalue 10000;
 
 create table colnametests (
     id integer not null,
     references integer not null,
     primary key (id)
 );
+create sequence colnametests_seq minvalue 10000;
 
 create table mixins (
     id integer not null,
@@ -151,6 +177,7 @@ create table mixins (
     updated_at date default null,
     primary key (id)
 );
+create sequence mixins_seq minvalue 10000;
 
 create table people (
     id integer not null,
@@ -158,18 +185,21 @@ create table people (
     lock_version integer default 0,
     primary key (id)
 );
+create sequence people_seq minvalue 10000;
 
 create table binaries (
     id integer not null,
     data blob null,
     primary key (id)
 );
+create sequence binaries_seq minvalue 10000;
 
 create table computers (
   id integer not null primary key,
   developer integer not null references developers initially deferred disable,
-  extendedWarranty integer not null
+  "extendedWarranty" integer not null
 );
+create sequence computers_seq minvalue 10000;
 
 create table posts (
   id integer not null primary key,
@@ -178,6 +208,7 @@ create table posts (
   type varchar(255) default null,
   body varchar(3000) default null
 );
+create sequence posts_seq minvalue 10000;
 
 create table comments (
   id integer not null primary key,
@@ -185,34 +216,46 @@ create table comments (
   type varchar(255) default null,
   body varchar(3000) default null
 );
+create sequence comments_seq minvalue 10000;
 
 create table authors (
   id integer not null primary key,
   name varchar(255) default null
 );
+create sequence authors_seq minvalue 10000;
 
 create table tasks (
   id integer not null primary key,
   starting date default null,
   ending date default null
 );
+create sequence tasks_seq minvalue 10000;
 
 create table categories (
   id integer not null primary key,
   name varchar(255) default null,
   type varchar(255) default null
 );
+create sequence categories_seq minvalue 10000;
 
 create table categories_posts (
   category_id integer not null references categories initially deferred disable,
   post_id integer not null references posts initially deferred disable
 );
+create sequence categories_posts_seq minvalue 10000;
 
 create table fk_test_has_pk (
   id integer not null primary key
 );
+create sequence fk_test_has_pk_seq minvalue 10000;
 
 create table fk_test_has_fk (
   id integer not null primary key,
   fk_id integer not null references fk_test_has_fk initially deferred disable
 );
+create sequence fk_test_has_fk_seq minvalue 10000;
+
+create table keyboards (
+  key_number integer not null,
+  name varchar(50) default null
+);