activerecord 1.14.4 → 1.15.0

data/test/fixtures/author.rb

@@ -3,12 +3,30 @@ class Author < ActiveRecord::Base
   has_many :posts_with_comments, :include => :comments, :class_name => "Post"
   has_many :posts_with_categories, :include => :categories, :class_name => "Post"
   has_many :posts_with_comments_and_categories, :include => [ :comments, :categories ], :order => "posts.id", :class_name => "Post"
+  has_many :posts_with_extension, :class_name => "Post" do #, :extend => ProxyTestExtension
+    def testing_proxy_owner
+      proxy_owner
+    end
+    def testing_proxy_reflection
+      proxy_reflection
+    end
+    def testing_proxy_target
+      proxy_target
+    end
+  end
   has_many :comments, :through => :posts
   has_many :funky_comments, :through => :posts, :source => :comments
 
-  has_many :special_posts,        :class_name => "Post"
-  has_many :hello_posts,          :class_name => "Post", :conditions=>"\#{aliased_table_name}.body = 'hello'"
-  has_many :nonexistent_posts,    :class_name => "Post", :conditions=>"\#{aliased_table_name}.body = 'nonexistent'"
+  has_many :special_posts
+  has_many :special_post_comments, :through => :special_posts, :source => :comments
+  
+  has_many :special_nonexistant_posts, :class_name => "SpecialPost", :conditions => "posts.body = 'nonexistant'"
+  has_many :special_nonexistant_post_comments, :through => :special_nonexistant_posts, :source => :comments, :conditions => "comments.post_id = 0"
+
+  has_many :hello_posts, :class_name => "Post", :conditions => "posts.body = 'hello'"
+  has_many :hello_post_comments, :through => :hello_posts, :source => :comments
+
+  has_many :other_posts,          :class_name => "Post"
   has_many :posts_with_callbacks, :class_name => "Post", :before_add => :log_before_adding,
            :after_add     => :log_after_adding, 
            :before_remove => :log_before_removing,
@@ -26,6 +44,11 @@ class Author < ActiveRecord::Base
   has_many :categorizations
   has_many :categories, :through => :categorizations
 
+  has_many :categories_like_general, :through => :categorizations, :source => :category, :class_name => 'Category', :conditions => { :name => 'General' }
+
+  has_many :categorized_posts, :through => :categorizations, :source => :post
+  has_many :unique_categorized_posts, :through => :categorizations, :source => :post, :uniq => true
+
   has_many :nothings, :through => :kateggorisatons, :class_name => 'Category'
 
   has_many :author_favorites
@@ -73,4 +96,4 @@ end
 class AuthorFavorite < ActiveRecord::Base
   belongs_to :author
   belongs_to :favorite_author, :class_name => "Author", :foreign_key => 'favorite_author_id'
-end
+end

data/test/fixtures/categorizations.yml

@@ -3,9 +3,15 @@ david_welcome_general:
   author_id: 1
   post_id: 1
   category_id: 1
-  
+
 mary_thinking_sti:
   id: 2
   author_id: 2
   post_id: 2
-  category_id: 3
+  category_id: 3
+
+mary_thinking_general:
+  id: 3
+  author_id: 2
+  post_id: 2
+  category_id: 1

data/test/fixtures/category.rb

@@ -1,8 +1,7 @@
 class Category < ActiveRecord::Base
   has_and_belongs_to_many :posts
   has_and_belongs_to_many :special_posts, :class_name => "Post"
-  has_and_belongs_to_many :hello_posts, :class_name => "Post", :conditions => "\#{aliased_table_name}.body = 'hello'"
-  has_and_belongs_to_many :nonexistent_posts, :class_name => "Post", :conditions=>"\#{aliased_table_name}.body = 'nonexistent'"
+  has_and_belongs_to_many :other_posts, :class_name => "Post"
   
   def self.what_are_you
     'a category...'

data/test/fixtures/comments.yml

@@ -16,12 +16,6 @@ does_it_hurt:
   body: Don't think too hard
   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

data/test/fixtures/companies.yml

@@ -47,4 +47,9 @@ leetsoft:
 jadedpixel:
   id: 8 
   name: Jadedpixel
-  client_of: 6
+  client_of: 6
+
+odegy:
+  id: 9
+  name: Odegy
+  type: ExclusivelyDependentFirm

data/test/fixtures/company.rb

@@ -5,6 +5,10 @@ class Company < ActiveRecord::Base
   validates_presence_of :name
 
   has_one :dummy_account, :foreign_key => "firm_id", :class_name => "Account"
+  
+  def arbitrary_method
+    "I am Jack's profound disappointment"
+  end
 end
 
 
@@ -18,6 +22,8 @@ class Firm < Company
   has_many :exclusively_dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all
   has_many :limited_clients, :class_name => "Client", :order => "id", :limit => 1
   has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
+  has_many :clients_with_interpolated_conditions, :class_name => "Client", :conditions => 'rating > #{rating}'
+  has_many :clients_like_ms_with_hash_conditions, :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}',
@@ -28,6 +34,7 @@ class Firm < Company
   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_many :plain_clients, :class_name => 'Client'
 
   has_one :account, :foreign_key => "firm_id", :dependent => :destroy
 end
@@ -37,6 +44,9 @@ class DependentFirm < Company
   has_many :companies, :foreign_key => 'client_of', :order => "id", :dependent => :nullify
 end
 
+class ExclusivelyDependentFirm < Company
+  has_one :account, :foreign_key => "firm_id", :dependent => :delete
+end
 
 class Client < Company
   belongs_to :firm, :foreign_key => "client_of"
@@ -78,8 +88,20 @@ end
 class Account < ActiveRecord::Base
   belongs_to :firm
   
+  def self.destroyed_account_ids
+    @destroyed_account_ids ||= Hash.new { |h,k| h[k] = [] }
+  end
+
+  before_destroy do |account|
+    if account.firm
+      Account.destroyed_account_ids[account.firm.id] << account.id
+    end
+    true
+  end
+  
+  
   protected
     def validate
       errors.add_on_empty "credit_limit"
     end
-end
+end

data/test/fixtures/company_in_module.rb

@@ -21,11 +21,7 @@ module MyApplication
     
     class Developer < ActiveRecord::Base
       has_and_belongs_to_many :projects
-
-      protected
-        def validate
-          errors.add_on_boundary_breaking("name", 3..20)
-      end
+      validates_length_of :name, :within => (3..20)
     end
     
     class Project < ActiveRecord::Base
@@ -46,11 +42,13 @@ module MyApplication
     end
 
     class Account < ActiveRecord::Base
-      belongs_to :firm, :class_name => 'MyApplication::Business::Firm'
-      belongs_to :qualified_billing_firm, :class_name => 'MyApplication::Billing::Firm'
-      belongs_to :unqualified_billing_firm, :class_name => 'Firm'
-      belongs_to :nested_qualified_billing_firm, :class_name => 'MyApplication::Billing::Nested::Firm'
-      belongs_to :nested_unqualified_billing_firm, :class_name => 'Nested::Firm'
+      with_options(:foreign_key => :firm_id) do |i|
+        i.belongs_to :firm, :class_name => 'MyApplication::Business::Firm'
+        i.belongs_to :qualified_billing_firm, :class_name => 'MyApplication::Billing::Firm'
+        i.belongs_to :unqualified_billing_firm, :class_name => 'Firm'
+        i.belongs_to :nested_qualified_billing_firm, :class_name => 'MyApplication::Billing::Nested::Firm'
+        i.belongs_to :nested_unqualified_billing_firm, :class_name => 'Nested::Firm'
+      end
 
       protected
         def validate

data/test/fixtures/customer.rb

@@ -1,7 +1,7 @@
 class Customer < ActiveRecord::Base
-  composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ]
+  composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ], :allow_nil => true
   composed_of :balance, :class_name => "Money", :mapping => %w(balance amount)
-  composed_of :gps_location
+  composed_of :gps_location, :allow_nil => true
 end
 
 class Address

data/test/fixtures/customers.yml

@@ -6,3 +6,12 @@ david:
   address_city: Scary Town
   address_country: Loony Land
   gps_location: 35.544623640962634x-105.9309951055148
+  
+zaphod:
+  id: 2
+  name: Zaphod
+  balance: 62
+  address_street: Avenue Road
+  address_city: Hamlet Town
+  address_country: Nation Land
+  gps_location: NULL

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

@@ -28,3 +28,4 @@ DROP TABLE fk_test_has_pk;
 DROP TABLE fk_test_has_fk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;

data/test/fixtures/db_definitions/db2.sql

@@ -215,3 +215,12 @@ CREATE TABLE legacy_things (
   version INT DEFAULT 0,
   PRIMARY KEY (id)
 );
+
+CREATE TABLE numeric_data (
+  id INT NOT NULL PRIMARY KEY,
+  bank_balance DECIMAL(10,2),
+  big_bank_balance DECIMAL(15,2),
+  world_population DECIMAL(10),
+  my_house_population DECIMAL(2),
+  decimal_number_with_default DECIMAL(3,2) DEFAULT 2.78
+);

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

@@ -29,6 +29,7 @@ DROP TABLE fk_test_has_pk;
 DROP TABLE keyboards;
 DROP TABLE defaults;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;
 
 DROP DOMAIN D_BOOLEAN;
 
@@ -56,3 +57,5 @@ DROP GENERATOR tasks_seq;
 DROP GENERATOR categories_seq;
 DROP GENERATOR keyboards_seq;
 DROP GENERATOR defaults_seq;
+DROP GENERATOR legacy_things_seq;
+DROP GENERATOR numeric_data_seq;

data/test/fixtures/db_definitions/firebird.sql

@@ -1,4 +1,4 @@
-CREATE DOMAIN D_BOOLEAN AS SMALLINT CHECK (VALUE IN (0, 1));
+CREATE DOMAIN D_BOOLEAN AS SMALLINT CHECK (VALUE IN (0, 1) OR VALUE IS NULL);
 
 CREATE TABLE accounts (
   id BIGINT NOT NULL,
@@ -283,3 +283,15 @@ CREATE TABLE legacy_things (
 );
 CREATE GENERATOR legacy_things_seq;
 SET GENERATOR legacy_things_seq TO 10000;
+
+CREATE TABLE numeric_data (
+  id BIGINT NOT NULL,
+  bank_balance DECIMAL(10,2),
+  big_bank_balance DECIMAL(15,2),
+  world_population DECIMAL(10),
+  my_house_population DECIMAL(2),
+  decimal_number_with_default DECIMAL(3,2) DEFAULT 2.78,
+  PRIMARY KEY (id)
+);
+CREATE GENERATOR numeric_data_seq;
+SET GENERATOR numeric_data_seq TO 10000;

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

@@ -0,0 +1,31 @@
+DROP TABLE accounts CASCADE;
+DROP TABLE funny_jokes CASCADE;
+DROP TABLE companies CASCADE;
+DROP TABLE topics CASCADE;
+DROP TABLE developers CASCADE;
+DROP TABLE projects CASCADE;
+DROP TABLE developers_projects CASCADE;
+DROP TABLE orders CASCADE;
+DROP TABLE customers CASCADE;
+DROP TABLE movies CASCADE;
+DROP TABLE subscribers CASCADE;
+DROP TABLE booleantests CASCADE;
+DROP TABLE auto_id_tests CASCADE;
+DROP TABLE entrants CASCADE;
+DROP TABLE colnametests CASCADE;
+DROP TABLE mixins CASCADE;
+DROP TABLE people CASCADE;
+DROP TABLE readers CASCADE;
+DROP TABLE binaries CASCADE;
+DROP TABLE computers CASCADE;
+DROP TABLE posts CASCADE;
+DROP TABLE comments CASCADE;
+DROP TABLE authors CASCADE;
+DROP TABLE tasks CASCADE;
+DROP TABLE categories CASCADE;
+DROP TABLE categories_posts CASCADE;
+DROP TABLE fk_test_has_fk CASCADE;
+DROP TABLE fk_test_has_pk CASCADE;
+DROP TABLE keyboards CASCADE;
+DROP TABLE legacy_things CASCADE;
+DROP TABLE numeric_data CASCADE;

data/test/fixtures/db_definitions/frontbase.sql

@@ -0,0 +1,262 @@
+CREATE TABLE accounts (
+    id integer DEFAULT unique,
+    firm_id integer,
+    credit_limit integer,
+    PRIMARY KEY (id)
+);
+SET UNIQUE FOR accounts(id);
+
+CREATE TABLE funny_jokes (
+  id integer DEFAULT unique,
+  firm_id integer default NULL,
+  name character varying(50),
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR funny_jokes(id);
+  
+CREATE TABLE companies (
+  id integer DEFAULT unique,
+    "type" character varying(50),
+    "ruby_type" character varying(50),
+    firm_id integer,
+    name character varying(50),
+    client_of integer,
+    rating integer default 1,
+    PRIMARY KEY (id)
+);
+SET UNIQUE FOR companies(id);
+
+CREATE TABLE topics (
+  id integer DEFAULT unique,
+    title character varying(255),
+    author_name character varying(255),
+    author_email_address character varying(255),
+    written_on timestamp,
+    bonus_time time,
+    last_read date,
+    content varchar(65536),
+    approved boolean default true,
+    replies_count integer default 0,
+    parent_id integer,
+    "type" character varying(50),
+    PRIMARY KEY (id)
+);
+SET UNIQUE FOR topics(id);
+
+CREATE TABLE developers (
+  id integer DEFAULT unique,
+    name character varying(100),
+    salary integer DEFAULT 70000,
+    created_at timestamp,
+    updated_at timestamp,
+    PRIMARY KEY (id)
+);
+SET UNIQUE FOR developers(id);
+
+CREATE TABLE projects (
+  id integer DEFAULT unique,
+    name character varying(100),
+    type varchar(255),
+    PRIMARY KEY (id)
+);
+SET UNIQUE FOR projects(id);
+
+CREATE TABLE developers_projects (
+    developer_id integer NOT NULL,
+    project_id integer NOT NULL,
+    joined_on date,
+    access_level integer default 1
+);
+
+CREATE TABLE orders (
+  id integer DEFAULT unique,
+    name character varying(100),
+    billing_customer_id integer,
+    shipping_customer_id integer,
+    PRIMARY KEY (id)
+);
+SET UNIQUE FOR orders(id);
+
+CREATE TABLE customers (
+  id integer DEFAULT unique,
+    name character varying(100),
+    balance integer default 0,
+    address_street character varying(100),
+    address_city character varying(100),
+    address_country character varying(100),
+    gps_location character varying(100),
+    PRIMARY KEY (id)
+);
+SET UNIQUE FOR customers(id);
+
+CREATE TABLE movies (
+    movieid integer DEFAULT unique,
+    name varchar(65536),
+    PRIMARY KEY (movieid)
+);
+SET UNIQUE FOR movies(movieid);
+
+CREATE TABLE subscribers (
+    nick varchar(65536) NOT NULL,
+    name varchar(65536),
+    PRIMARY KEY (nick)
+);
+
+CREATE TABLE booleantests (
+  id integer DEFAULT unique,
+    value boolean,
+    PRIMARY KEY (id)
+);
+SET UNIQUE FOR booleantests(id);
+
+CREATE TABLE auto_id_tests (
+  auto_id integer DEFAULT unique,
+    value integer,
+    PRIMARY KEY (auto_id)
+);
+SET UNIQUE FOR auto_id_tests(auto_id);
+
+CREATE TABLE entrants (
+  id integer DEFAULT unique,
+  name varchar(65536),
+  course_id integer,
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR entrants(id);
+
+CREATE TABLE colnametests (
+  id integer DEFAULT unique,
+  "references" integer NOT NULL,
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR colnametests(id);
+
+CREATE TABLE mixins (
+  id integer DEFAULT unique,
+  parent_id integer,
+  type character varying(100),  
+  pos integer,
+  lft integer,
+  rgt integer,
+  root_id integer,  
+  created_at timestamp,
+  updated_at timestamp,
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR mixins(id);
+
+CREATE TABLE people (
+  id integer DEFAULT unique,
+  first_name varchar(65536),
+  lock_version integer default 0,
+  PRIMARY KEY  (id)
+);
+SET UNIQUE FOR people(id);
+
+CREATE TABLE readers (
+  id integer DEFAULT unique,
+  post_id INTEGER NOT NULL,
+  person_id INTEGER NOT NULL,
+  PRIMARY KEY  (id)
+);
+SET UNIQUE FOR readers(id);
+
+CREATE TABLE binaries ( 
+  id integer DEFAULT unique,
+  data BLOB,
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR binaries(id);
+
+CREATE TABLE computers (
+  id integer DEFAULT unique,
+  developer integer NOT NULL,
+  "extendedWarranty" integer NOT NULL,
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR computers(id);
+
+CREATE TABLE posts (
+  id integer DEFAULT unique,
+  author_id integer,
+  title varchar(255),
+  type varchar(255),
+  body varchar(65536),
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR posts(id);
+
+CREATE TABLE comments (
+  id integer DEFAULT unique,
+  post_id integer,
+  type varchar(255),
+  body varchar(65536),
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR comments(id);
+
+CREATE TABLE authors (
+  id integer DEFAULT unique,
+  name varchar(255) default NULL,
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR authors(id);
+
+CREATE TABLE tasks (
+  id integer DEFAULT unique,
+  starting timestamp,
+  ending timestamp,
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR tasks(id);
+
+CREATE TABLE categories (
+  id integer DEFAULT unique,
+  name varchar(255),
+  type varchar(255),
+  PRIMARY KEY (id)
+);
+SET UNIQUE FOR categories(id);
+
+CREATE TABLE categories_posts (
+  category_id integer NOT NULL,
+  post_id integer NOT NULL
+);
+
+CREATE TABLE fk_test_has_pk (
+  id INTEGER NOT NULL PRIMARY KEY
+);
+SET UNIQUE FOR fk_test_has_pk(id);
+
+CREATE TABLE fk_test_has_fk (
+  id    INTEGER NOT NULL PRIMARY KEY,
+  fk_id INTEGER NOT NULL REFERENCES fk_test_has_fk(id)
+);
+SET UNIQUE FOR fk_test_has_fk(id);
+
+CREATE TABLE keyboards (
+  key_number integer DEFAULT unique,
+  "name" character varying(50),
+  PRIMARY KEY (key_number)
+);
+SET UNIQUE FOR keyboards(key_number);
+
+create table "legacy_things"
+(
+  "id" int,
+  "tps_report_number" int default NULL,
+  "version" int default 0 not null,
+  primary key ("id")
+);
+SET UNIQUE FOR legacy_things(id);
+
+CREATE TABLE "numeric_data" (
+  "id" integer NOT NULL
+  "bank_balance" DECIMAL(10,2),
+  "big_bank_balance" DECIMAL(15,2),
+  "world_population" DECIMAL(10),
+  "my_house_population" DECIMAL(2),
+  "decimal_number_with_default" DECIMAL(3,2) DEFAULT 2.78,
+  primary key ("id")
+);
+SET UNIQUE FOR numeric_data(id);