activerecord 1.13.2 → 1.14.0

data/test/fixtures/category.rb

@@ -1,9 +1,15 @@
 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'"
   
   def self.what_are_you
     'a category...'
   end
+  
+  has_many :categorizations
+  has_many :authors, :through => :categorizations, :select => 'authors.*, categorizations.post_id'
 end
 
 class SpecialCategory < Category

data/test/fixtures/company.rb

@@ -3,17 +3,20 @@ class Company < ActiveRecord::Base
   set_sequence_name :companies_nonstd_seq
 
   validates_presence_of :name
+
+  has_one :dummy_account, :foreign_key => "firm_id", :class_name => "Account"
 end
 
 
 class Firm < Company
-  has_many :clients, :order => "id", :dependent => true, :counter_sql =>
+  has_many :clients, :order => "id", :dependent => :destroy, :counter_sql =>
       "SELECT COUNT(*) FROM companies WHERE firm_id = 1 " +
       "AND (#{QUOTED_TYPE} = 'Client' OR #{QUOTED_TYPE} = 'SpecialClient' OR #{QUOTED_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 :dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :destroy
+  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_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
   has_many :clients_using_counter_sql, :class_name => "Client",
@@ -26,7 +29,7 @@ class Firm < Company
            :finder_sql  => 'SELECT * FROM companies WHERE client_of = 1000',
            :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'
 
-  has_one :account, :foreign_key => "firm_id", :dependent => true
+  has_one :account, :foreign_key => "firm_id", :dependent => :destroy
 end
 
 class DependentFirm < Company
@@ -39,7 +42,7 @@ 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"
+  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
@@ -54,6 +57,15 @@ class Client < Company
     end
     true
   end
+  
+  # Used to test that read and question methods are not generated for these attributes
+  def ruby_type
+    read_attribute :ruby_type
+  end
+  
+  def rating?
+    query_attribute :rating
+  end
 end
 
 

data/test/fixtures/company_in_module.rb

@@ -5,13 +5,13 @@ module MyApplication
     end
     
     class Firm < Company
-      has_many :clients, :order => "id", :dependent => true
+      has_many :clients, :order => "id", :dependent => :destroy
       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 :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_one :account, :dependent => true
+      has_one :account, :dependent => :destroy
     end
 
     class Client < Company
@@ -33,11 +33,25 @@ module MyApplication
     end
 
   end
-  
+
   module Billing
+    class Firm < ActiveRecord::Base
+      self.table_name = 'companies'
+    end
+
+    module Nested
+      class Firm < ActiveRecord::Base
+        self.table_name = 'companies'
+      end
+    end
+
     class Account < ActiveRecord::Base
-      belongs_to :firm, :class_name => "MyApplication::Business::Firm"
-      
+      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'
+
       protected
         def validate
           errors.add_on_empty "credit_limit"

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

@@ -1,4 +1,5 @@
 DROP TABLE accounts;
+DROP TABLE funny_jokes;
 DROP TABLE companies;
 DROP TABLE topics;
 DROP TABLE developers;
@@ -14,6 +15,7 @@ DROP TABLE entrants;
 DROP TABLE colnametests;
 DROP TABLE mixins;
 DROP TABLE people;
+DROP TABLE readers;
 DROP TABLE binaries;
 DROP TABLE computers;
 DROP TABLE posts;
@@ -25,3 +27,4 @@ DROP TABLE categories_posts;
 DROP TABLE fk_test_has_pk;
 DROP TABLE fk_test_has_fk;
 DROP TABLE keyboards;
+DROP TABLE legacy_things;

data/test/fixtures/db_definitions/db2.sql

@@ -1,196 +1,217 @@
 CREATE TABLE accounts (
-  id int generated by default as identity (start with +10000),
-  firm_id int default NULL,
-  credit_limit int default NULL,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  firm_id INT DEFAULT NULL,
+  credit_limit INT DEFAULT NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE funny_jokes (
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  name VARCHAR(50) DEFAULT NULL,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE companies (
-  id int generated by default as identity (start with +10000),
-  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,
-  rating int default 1,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  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,
+  rating INT DEFAULT 1,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE topics (
-  id int generated by default as identity (start with +10000),
-  title varchar(255) default NULL,
-  author_name varchar(255) default NULL,
-  author_email_address varchar(255) default NULL,
-  written_on timestamp default NULL,
-  bonus_time time default NULL,
-  last_read date default NULL,
-  content varchar(3000),
-  approved smallint default 1,
-  replies_count int default 0,
-  parent_id int default NULL,
-  type varchar(50) default NULL,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  title VARCHAR(255) DEFAULT NULL,
+  author_name VARCHAR(255) DEFAULT NULL,
+  author_email_address VARCHAR(255) DEFAULT NULL,
+  written_on TIMESTAMP DEFAULT NULL,
+  bonus_time TIME DEFAULT NULL,
+  last_read DATE DEFAULT NULL,
+  content VARCHAR(3000),
+  approved SMALLINT 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 generated by default as identity (start with +10000),
-  name varchar(100) default NULL,
-  salary int default 70000,
-  created_at timestamp default NULL,
-  updated_at timestamp default NULL,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  name VARCHAR(100) DEFAULT NULL,
+  salary INT DEFAULT 70000,
+  created_at TIMESTAMP DEFAULT NULL,
+  updated_at TIMESTAMP DEFAULT NULL,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE projects (
-  id int generated by default as identity (start with +10000),
-  name varchar(100) default NULL,
-  type varchar(255) default NULL,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  name VARCHAR(100) DEFAULT NULL,
+  type VARCHAR(255) DEFAULT NULL,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE developers_projects (
-  developer_id int NOT NULL,
-  project_id int NOT NULL,
-  joined_on date default NULL,
-  access_level smallint default 1
+  developer_id INT NOT NULL,
+  project_id INT NOT 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,
+  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 (
-  id int generated by default as identity (start with +10000),
-  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,
-  gps_location varchar(100) default NULL,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  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,
+  gps_location VARCHAR(100) DEFAULT NULL,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE movies (
-  movieid int generated by default as identity (start with +10000),
-  name varchar(100) default NULL,
+  movieid INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  name VARCHAR(100) DEFAULT NULL,
   PRIMARY KEY (movieid)
 );
 
 CREATE TABLE subscribers (
-  nick varchar(100) NOT NULL,
-  name varchar(100) default NULL,
+  nick VARCHAR(100) NOT NULL,
+  name VARCHAR(100) DEFAULT NULL,
   PRIMARY KEY (nick)
 );
 
 CREATE TABLE booleantests (
-  id int generated by default as identity (start with +10000),
-  value int default NULL,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  value INT DEFAULT NULL,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE auto_id_tests (
-  auto_id int generated by default as identity (start with +10000),
-  value int default NULL,
+  auto_id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  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
+  id INT NOT NULL PRIMARY KEY,
+  name VARCHAR(255) NOT NULL,
+  course_id INT NOT NULL
 );
 
 CREATE TABLE colnametests (
-  id int generated by default as identity (start with +10000),
-  references int NOT NULL,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  references INT NOT NULL,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE mixins (
-  id int generated by default as identity (start with +10000),
-  parent_id int default NULL,
-  pos int default NULL,
-  created_at timestamp default NULL,
-  updated_at timestamp default NULL,
-  lft int default NULL,
-  rgt int default NULL,
-  root_id int default NULL,
-  type varchar(40) default NULL,
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  parent_id INT DEFAULT NULL,
+  pos INT DEFAULT NULL,
+  created_at TIMESTAMP DEFAULT NULL,
+  updated_at TIMESTAMP DEFAULT NULL,
+  lft INT DEFAULT NULL,
+  rgt INT DEFAULT NULL,
+  root_id INT DEFAULT NULL,
+  type VARCHAR(40) DEFAULT NULL,
   PRIMARY KEY (id)
 );
 
 CREATE TABLE people (
-  id int generated by default as identity (start with +10000),
-  first_name varchar(40) NOT NULL,
-  lock_version int default 0,
-  PRIMARY KEY  (id)
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  first_name VARCHAR(40) NOT NULL,
+  lock_version INT DEFAULT 0,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE readers (
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  post_id INT NOT NULL,
+  person_id INT NOT NULL,
+  PRIMARY KEY (id)
 );
 
 CREATE TABLE binaries (
-  id int generated by default as identity (start with +10000),
-  data blob(50000),
-  PRIMARY KEY  (id)
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  data BLOB(50000),
+  PRIMARY KEY (id)
 );
 
 CREATE TABLE computers (
-  id int generated by default as identity (start with +10000),
-  developer int NOT NULL,
-  extendedWarranty int NOT NULL
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  developer INT NOT NULL,
+  extendedWarranty 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
+  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
+  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
+  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
+  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,
-  type varchar(40) default NULL
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  name VARCHAR(255) NOT NULL,
+  type VARCHAR(40) DEFAULT NULL
 );
 
 CREATE TABLE categories_posts (
-  category_id int NOT NULL,
-  post_id int NOT NULL
+  category_id INT NOT NULL,
+  post_id INT NOT NULL
 );
 
 CREATE TABLE keyboards (
-  key_number int generated by default as identity (start with +10000),
+  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
+  id INT NOT NULL PRIMARY KEY
 );
 
 CREATE TABLE fk_test_has_fk (
-  id    INTEGER NOT NULL PRIMARY KEY,
-  fk_id INTEGER NOT NULL,
+  id    INT NOT NULL PRIMARY KEY,
+  fk_id INT NOT NULL,
 
   FOREIGN KEY (fk_id) REFERENCES fk_test_has_pk(id)
 );
+
+--This table has an altered lock_version column name
+CREATE TABLE legacy_things (
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  tps_report_number INT DEFAULT NULL,
+  version INT DEFAULT 0,
+  PRIMARY KEY (id)
+);