diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-03 08:52:59 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-03 08:52:59 +0000 |
commit | df95128e9402feb1fc08b4ac45db73daa2edade3 (patch) | |
tree | c73ba67b0097bc9383b9454e016a78da506a7a7b /activerecord/test/fixtures | |
parent | 38e0862c816f45292ca1b78011588e1f56b95850 (diff) | |
download | rails-df95128e9402feb1fc08b4ac45db73daa2edade3.tar.gz rails-df95128e9402feb1fc08b4ac45db73daa2edade3.tar.bz2 rails-df95128e9402feb1fc08b4ac45db73daa2edade3.zip |
Fixed that has_and_belongs_to_many didn't respect single table inheritance types #1081 [Florian Weber]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1641 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/fixtures')
8 files changed, 13 insertions, 3 deletions
diff --git a/activerecord/test/fixtures/db_definitions/db2.sql b/activerecord/test/fixtures/db_definitions/db2.sql index 40faf53269..90f57a0c08 100644 --- a/activerecord/test/fixtures/db_definitions/db2.sql +++ b/activerecord/test/fixtures/db_definitions/db2.sql @@ -44,6 +44,7 @@ CREATE TABLE developers ( CREATE TABLE projects ( id int generated by default as identity (start with +10000), name varchar(100) default NULL, + type varchar(255) default NULL, PRIMARY KEY (id) ); diff --git a/activerecord/test/fixtures/db_definitions/mysql.sql b/activerecord/test/fixtures/db_definitions/mysql.sql index cb589bec6f..d1d65194cb 100755 --- a/activerecord/test/fixtures/db_definitions/mysql.sql +++ b/activerecord/test/fixtures/db_definitions/mysql.sql @@ -45,6 +45,7 @@ CREATE TABLE `developers` ( CREATE TABLE `projects` ( `id` int(11) NOT NULL auto_increment, `name` varchar(100) default NULL, + `type` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`) ) TYPE=InnoDB; diff --git a/activerecord/test/fixtures/db_definitions/oci.sql b/activerecord/test/fixtures/db_definitions/oci.sql index 0170215c41..43a54df604 100644 --- a/activerecord/test/fixtures/db_definitions/oci.sql +++ b/activerecord/test/fixtures/db_definitions/oci.sql @@ -63,6 +63,7 @@ create table developers ( create table projects ( id integer not null, name varchar(100) default null, + type varchar(255) default null, primary key (id) ); diff --git a/activerecord/test/fixtures/db_definitions/postgresql.sql b/activerecord/test/fixtures/db_definitions/postgresql.sql index aec5bd64c3..37f3ae5f29 100644 --- a/activerecord/test/fixtures/db_definitions/postgresql.sql +++ b/activerecord/test/fixtures/db_definitions/postgresql.sql @@ -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); diff --git a/activerecord/test/fixtures/db_definitions/sqlite.sql b/activerecord/test/fixtures/db_definitions/sqlite.sql index 1e3b4769f2..ab06d4a4d7 100644 --- a/activerecord/test/fixtures/db_definitions/sqlite.sql +++ b/activerecord/test/fixtures/db_definitions/sqlite.sql @@ -40,7 +40,8 @@ CREATE TABLE 'developers' ( 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' ( diff --git a/activerecord/test/fixtures/db_definitions/sqlserver.sql b/activerecord/test/fixtures/db_definitions/sqlserver.sql index 2280bc80ea..6a15c0cbfd 100644 --- a/activerecord/test/fixtures/db_definitions/sqlserver.sql +++ b/activerecord/test/fixtures/db_definitions/sqlserver.sql @@ -39,7 +39,8 @@ CREATE TABLE developers ( 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 ( diff --git a/activerecord/test/fixtures/developer.rb b/activerecord/test/fixtures/developer.rb index 6d01490844..17d0746cfa 100644 --- a/activerecord/test/fixtures/developer.rb +++ b/activerecord/test/fixtures/developer.rb @@ -1,6 +1,7 @@ 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 diff --git a/activerecord/test/fixtures/subscriber.rb b/activerecord/test/fixtures/subscriber.rb index 3f1ade0d83..e5e11724fd 100644 --- a/activerecord/test/fixtures/subscriber.rb +++ b/activerecord/test/fixtures/subscriber.rb @@ -3,3 +3,6 @@ class Subscriber < ActiveRecord::Base "nick" end end + +class SpecialSubscriber < Subscriber +end
\ No newline at end of file |