activerecord 1.14.4 → 1.15.0

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

@@ -0,0 +1 @@
+DROP TABLE courses CASCADE;

data/test/fixtures/db_definitions/frontbase2.sql

@@ -0,0 +1,4 @@
+CREATE TABLE courses (
+  id integer DEFAULT unique,
+  name varchar(100)
+);

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

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

data/test/fixtures/db_definitions/mysql.sql

@@ -37,7 +37,7 @@ CREATE TABLE `topics` (
   `parent_id` int(11) default NULL,
   `type` varchar(50) default NULL,
   PRIMARY KEY  (`id`)
-) TYPE=InnoDB;
+) TYPE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `developers` (
   `id` int(11) NOT NULL auto_increment,
@@ -51,7 +51,7 @@ CREATE TABLE `developers` (
 CREATE TABLE `projects` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(100) default NULL,
-  `type` VARCHAR(255) NOT NULL,
+  `type` VARCHAR(255) default NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
@@ -106,7 +106,7 @@ CREATE TABLE `auto_id_tests` (
 ) TYPE=InnoDB;
 
 CREATE TABLE `entrants` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `name` VARCHAR(255) NOT NULL,
   `course_id` INTEGER NOT NULL
 );
@@ -131,13 +131,13 @@ CREATE TABLE `mixins` (
 ) TYPE=InnoDB;
 
 CREATE TABLE `people` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `first_name` VARCHAR(40) NOT NULL,
   `lock_version` INTEGER NOT NULL DEFAULT 0
 ) TYPE=InnoDB;
 
 CREATE TABLE `readers` (
-    `id` int(11) NOT NULL PRIMARY KEY,
+    `id` int(11) NOT NULL auto_increment PRIMARY KEY,
     `post_id` INTEGER NOT NULL,
     `person_id` INTEGER NOT NULL
 ) TYPE=InnoDB;
@@ -149,28 +149,28 @@ CREATE TABLE `binaries` (
 ) TYPE=InnoDB;
 
 CREATE TABLE `computers` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `developer` INTEGER NOT NULL,
   `extendedWarranty` INTEGER NOT NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `posts` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `author_id` INTEGER,
   `title` VARCHAR(255) NOT NULL,
   `body` TEXT NOT NULL,
-  `type` VARCHAR(255) NOT NULL
+  `type` VARCHAR(255) default NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `comments` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `post_id` INTEGER NOT NULL,
   `body` TEXT NOT NULL,
-  `type` VARCHAR(255) NOT NULL
+  `type` VARCHAR(255) default NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `authors` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `name` VARCHAR(255) NOT NULL
 ) TYPE=InnoDB;
 
@@ -184,7 +184,7 @@ CREATE TABLE `tasks` (
 CREATE TABLE `categories` (
   `id` int(11) NOT NULL auto_increment,
   `name` VARCHAR(255) NOT NULL,
-  `type` VARCHAR(255) NOT NULL,
+  `type` VARCHAR(255) default NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
@@ -194,11 +194,11 @@ CREATE TABLE `categories_posts` (
 ) TYPE=InnoDB;
 
 CREATE TABLE `fk_test_has_pk` (
-  `id` INTEGER NOT NULL PRIMARY KEY
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY
 ) TYPE=InnoDB;
 
 CREATE TABLE `fk_test_has_fk` (
-  `id`    INTEGER NOT NULL PRIMARY KEY,
+  `id`    INTEGER NOT NULL auto_increment PRIMARY KEY,
   `fk_id` INTEGER NOT NULL,
 
   FOREIGN KEY (`fk_id`) REFERENCES `fk_test_has_pk`(`id`)
@@ -217,3 +217,12 @@ CREATE TABLE `legacy_things` (
   `version` int(11) NOT NULL default 0,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
+
+CREATE TABLE `numeric_data` (
+  `id` INTEGER NOT NULL auto_increment 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
+) TYPE=InnoDB;

data/test/fixtures/db_definitions/openbase.sql

@@ -279,4 +279,16 @@ CREATE TABLE legacy_things (
 )
 go
 CREATE PRIMARY KEY legacy_things (id)
-go
+go
+
+CREATE TABLE numeric_data (
+  id INTEGER NOT NULL DEFAULT _rowid,
+  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
+);
+go
+CREATE PRIMARY KEY numeric_data (id)
+go

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

@@ -29,6 +29,7 @@ drop table fk_test_has_pk;
 drop table fk_test_has_fk;
 drop table keyboards;
 drop table legacy_things;
+drop table numeric_data;
 
 drop sequence accounts_seq;
 drop sequence funny_jokes_seq;
@@ -59,3 +60,4 @@ drop sequence fk_test_has_pk_seq;
 drop sequence fk_test_has_fk_seq;
 drop sequence keyboards_seq;
 drop sequence legacy_things_seq;
+drop sequence numeric_data_seq;

data/test/fixtures/db_definitions/oracle.sql

@@ -37,7 +37,7 @@ create table topics (
     bonus_time timestamp default null,
     last_read timestamp default null,
     content varchar(4000),
-    approved integer default 1,
+    approved number(1) default 1,
     replies_count integer default 0,
     parent_id integer references topics initially deferred disable,
     type varchar(50) default null,
@@ -53,7 +53,7 @@ create table topics (
     bonus_time date default null,
     last_read date default null,
     content varchar(4000),
-    approved integer default 1,
+    approved number(1) default 1,
     replies_count integer default 0,
     parent_id integer references topics initially deferred disable,
     type varchar(50) default null,
@@ -137,6 +137,23 @@ create table booleantests (
 );
 create sequence booleantests_seq minvalue 10000;
 
+CREATE TABLE defaults (
+    id integer not null,
+    modified_date date default sysdate,
+    modified_date_function date default sysdate,
+    fixed_date date default to_date('2004-01-01', 'YYYY-MM-DD'),
+    modified_time date default sysdate,
+    modified_time_function date default sysdate,
+    fixed_time date default TO_DATE('2004-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+    char1 varchar2(1) default 'Y',
+    char2 varchar2(50) default 'a varchar field',
+    char3 clob default 'a text field',
+    positive_integer integer default 1,
+    negative_integer integer default -1,
+    decimal_number number(3,2) default 2.78
+);
+create sequence defaults_seq minvalue 10000;
+
 create table auto_id_tests (
     auto_id integer not null,
     value integer default null,
@@ -290,3 +307,13 @@ create table legacy_things (
     version integer default 0
 );
 create sequence legacy_things_seq minvalue 10000;
+
+CREATE TABLE numeric_data (
+  id integer 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
+);
+create sequence numeric_data_seq minvalue 10000;

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

@@ -1,5 +1,5 @@
-DROP SEQUENCE accounts_id_seq;
 DROP TABLE accounts;
+DROP SEQUENCE accounts_id_seq;
 DROP TABLE funny_jokes;
 DROP TABLE companies;
 DROP SEQUENCE companies_nonstd_seq;
@@ -32,3 +32,5 @@ DROP TABLE fk_test_has_pk;
 DROP TABLE geometrics;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;
+DROP TABLE column_data;

data/test/fixtures/db_definitions/postgresql.sql

@@ -118,7 +118,8 @@ CREATE TABLE defaults (
     char2 character varying(50) default 'a varchar field',
     char3 text default 'a text field',
     positive_integer integer default 1,
-    negative_integer integer default -1
+    negative_integer integer default -1,
+    decimal_number decimal(3,2) default 2.78
 );
 
 CREATE TABLE auto_id_tests (
@@ -129,8 +130,8 @@ CREATE TABLE auto_id_tests (
 
 CREATE TABLE entrants (
   id serial,
-  name text,
-  course_id integer
+  name text not null,
+  course_id integer not null
 );
 
 CREATE TABLE colnametests (
@@ -246,3 +247,12 @@ CREATE TABLE legacy_things (
   tps_report_number integer,
   version integer default 0
 );
+
+CREATE TABLE numeric_data (
+  id serial 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/schema.rb

@@ -1,5 +1,15 @@
 ActiveRecord::Schema.define do
 
+  # For Firebird, set the sequence values 10000 when create_table is called;
+  # this prevents primary key collisions between "normally" created records
+  # and fixture-based (YAML) records.
+  if adapter_name == "Firebird"
+    def create_table(*args, &block)
+      ActiveRecord::Base.connection.create_table(*args, &block)
+      ActiveRecord::Base.connection.execute "SET GENERATOR #{args.first}_seq TO 10000"
+    end
+  end
+
   create_table :taggings, :force => true do |t|
     t.column :tag_id, :integer
     t.column :super_tag_id, :integer
@@ -29,4 +39,22 @@ ActiveRecord::Schema.define do
     t.column :author_id, :integer
     t.column :favorite_author_id, :integer
   end
-end
+
+  create_table :vertices, :force => true do |t|
+    t.column :label, :string
+  end
+
+  create_table :edges, :force => true do |t|
+    t.column :source_id, :integer, :null => false
+    t.column :sink_id,   :integer, :null => false
+  end
+  add_index :edges, [:source_id, :sink_id], :unique => true, :name => 'unique_edge_index'
+
+  create_table :lock_without_defaults, :force => true do |t|
+    t.column :lock_version, :integer
+  end
+  
+  create_table :lock_without_defaults_cust, :force => true do |t|
+    t.column :custom_lock_version, :integer
+  end
+end

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

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

data/test/fixtures/db_definitions/sqlite.sql

@@ -144,14 +144,14 @@ CREATE TABLE 'posts' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'author_id' INTEGER,
   'title' VARCHAR(255) NOT NULL,
-  'type' VARCHAR(255) NOT NULL,
+  'type' VARCHAR(255) DEFAULT NULL,
   'body' TEXT NOT NULL
 );
 
 CREATE TABLE 'comments' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'post_id' INTEGER NOT NULL,
-  'type' VARCHAR(255) NOT NULL,
+  'type' VARCHAR(255) DEFAULT NULL,
   'body' TEXT NOT NULL
 );
 
@@ -198,4 +198,13 @@ CREATE TABLE 'legacy_things' (
   'id' INTEGER NOT NULL PRIMARY KEY,
   'tps_report_number' INTEGER DEFAULT NULL,
   'version' INTEGER NOT NULL DEFAULT 0
-)
+);
+
+CREATE TABLE 'numeric_data' (
+  'id' INTEGER 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/sqlserver.drop.sql

@@ -10,6 +10,7 @@ DROP TABLE orders;
 DROP TABLE movies;
 DROP TABLE subscribers;
 DROP TABLE booleantests;
+DROP TABLE defaults;
 DROP TABLE auto_id_tests;
 DROP TABLE entrants;
 DROP TABLE colnametests;
@@ -28,3 +29,5 @@ DROP TABLE fk_test_has_fk;
 DROP TABLE fk_test_has_pk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;
+DROP TABLE [order];

data/test/fixtures/db_definitions/sqlserver.sql

@@ -88,6 +88,24 @@ CREATE TABLE booleantests (
   value bit default NULL
 );
 
+CREATE TABLE defaults (
+    id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
+-- these brought from the PostgreSQL defaults_test.rb but
+-- tests only exist for integers and decimals, currently
+--    modified_date date default CURRENT_DATE,
+--    modified_date_function date default now(),
+--    fixed_date date default '2004-01-01',
+--    modified_time timestamp default CURRENT_TIMESTAMP,
+--    modified_time_function timestamp default now(),
+--    fixed_time timestamp default '2004-01-01 00:00:00.000000-00',
+--    char1 char(1) default 'Y',
+--    char2 character varying(50) default 'a varchar field',
+--    char3 text default 'a text field',
+    positive_integer integer default 1,
+    negative_integer integer default -1,
+    decimal_number decimal(3,2) default 2.78
+);
+
 CREATE TABLE auto_id_tests (
   auto_id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
   value int default NULL
@@ -201,3 +219,20 @@ CREATE TABLE legacy_things (
   version int default 0,
   PRIMARY KEY (id)
 );
+
+CREATE TABLE numeric_data (
+  id int NOT NULL IDENTITY(1, 1),
+  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
+);
+
+CREATE TABLE [order] (
+  id int NOT NULL IDENTITY(1, 1) PRIMARY KEY,
+  color varchar(255),
+  fruit_size varchar(255),
+  texture varchar(255),
+  flavor varchar(255)
+);

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

@@ -28,4 +28,6 @@ DROP TABLE fk_test_has_fk
 DROP TABLE fk_test_has_pk
 DROP TABLE keyboards
 DROP TABLE legacy_things
+DROP TABLE numeric_data
+DROP TABLE schema_info
 go

data/test/fixtures/db_definitions/sybase.sql

@@ -26,7 +26,7 @@ CREATE TABLE topics (
   author_name varchar(255) NULL,
   author_email_address varchar(255) NULL,
   written_on datetime NULL,
-  bonus_time time NULL,
+  bonus_time datetime NULL,
   last_read datetime NULL,
   content varchar(255) NULL,
   approved bit default 1,
@@ -118,7 +118,7 @@ CREATE TABLE mixins (
 
 CREATE TABLE people (
   id numeric(9,0) IDENTITY PRIMARY KEY,
-  first_name varchar(40) NOT NULL,
+  first_name varchar(40) NULL,
   lock_version int DEFAULT 0
 )
 
@@ -197,8 +197,17 @@ CREATE TABLE keyboards (
 CREATE TABLE legacy_things (
   id numeric(9,0) IDENTITY PRIMARY KEY,
   tps_report_number int default NULL,
-  version int default 0,
+  version int default 0
 )
 
-go
 
+CREATE TABLE numeric_data (
+  id numeric(9,0) IDENTITY PRIMARY KEY,
+  bank_balance numeric(10,2),
+  big_bank_balance numeric(15,2),
+  world_population numeric(10),
+  my_house_population numeric(2),
+  decimal_number_with_default numeric(3,2) DEFAULT 2.78
+)
+
+go

data/test/fixtures/developer.rb

@@ -4,6 +4,12 @@ module DeveloperProjectsAssociationExtension
   end
 end
 
+module DeveloperProjectsAssociationExtension2
+  def find_least_recent
+    find(:first, :order => "id ASC")
+  end
+end
+
 class Developer < ActiveRecord::Base
   has_and_belongs_to_many :projects do
     def find_most_recent
@@ -17,6 +23,12 @@ class Developer < ActiveRecord::Base
       :association_foreign_key => "project_id",
       :extend => DeveloperProjectsAssociationExtension
 
+  has_and_belongs_to_many :projects_extended_by_name_twice, 
+      :class_name => "Project", 
+      :join_table => "developers_projects", 
+      :association_foreign_key => "project_id",
+      :extend => [DeveloperProjectsAssociationExtension, DeveloperProjectsAssociationExtension2]
+
   has_and_belongs_to_many :special_projects, :join_table => 'developers_projects', :association_foreign_key => 'project_id'
 
   validates_inclusion_of :salary, :in => 50000..200000