composite_primary_keys 8.1.8 → 9.0.0.beta1

data/test/fixtures/db_definitions/mysql.sql

@@ -116,7 +116,6 @@ create table employees (
     id int not null auto_increment,
     department_id int default null,
     location_id int default null,
-    name varchar(100) not null default 'anonymous',
     primary key (id)
 );
 
@@ -202,8 +201,8 @@ create table seats (
 );
 
 create table capitols (
-  country varchar(100) not null,
-  city varchar(100) not null,
+  country varchar(100) default null,
+  city varchar(100) default null,
   primary key (country, city)
 );
 
@@ -217,12 +216,3 @@ create table employees_groups (
   employee_id int not null,
   group_id int not null
 );
-
-create table pk_called_ids (
-    id serial not null,
-    reference_code    int         not null,
-    code_label        varchar(50) default null,
-    abbreviation      varchar(50) default null,
-    description       varchar(50) default null,
-    primary key (id, reference_code)
-);

data/test/fixtures/db_definitions/oracle.sql

@@ -124,8 +124,7 @@ create sequence employees_seq start with 1000;
 create table employees (
     id            number(11) not null primary key,
     department_id number(11) default null,
-    location_id   number(11) default null,
-    name          varchar2(100) default 'anonymous'
+    location_id   number(11) default null
 );
 
 create sequence salaries_seq start with 1000;

data/test/fixtures/db_definitions/postgresql.sql

@@ -118,7 +118,6 @@ create table employees (
     id            serial not null,
     department_id int default null,
     location_id   int default null,
-    name          text not null default 'anonymous',
     primary key (id)
 );
 
@@ -219,12 +218,3 @@ create table employees_groups (
   employee_id int not null,
   group_id int not null
 );
-
-create table pk_called_ids (
-    id serial not null,
-    reference_code    int         not null,
-    code_label        varchar(50) default null,
-    abbreviation      varchar(50) default null,
-    description       varchar(50) default null,
-    primary key (id, reference_code)
-);

data/test/fixtures/db_definitions/sqlite.sql

@@ -109,7 +109,6 @@ create table departments (
 create table employees (
     id integer not null primary key autoincrement,
     department_id integer null,
-    name text not null default 'anonymous',
     location_id integer null
 );
 
@@ -205,11 +204,3 @@ create table employees_groups (
   group_id integer not null
 );
 
-create table pk_called_ids (
-    id integer not null,
-    reference_code    int         not null,
-    code_label        varchar(50) default null,
-    abbreviation      varchar(50) default null,
-    description       varchar(50) default null,
-    primary key (id, reference_code)
-);

data/test/fixtures/db_definitions/sqlserver.sql

@@ -126,8 +126,7 @@ go
 CREATE TABLE employees (
     id            [int] IDENTITY(1000,1) NOT NULL,
     department_id [int] NULL,
-    location_id   [int] NULL,
-    name          varchar(100) NOT NULL
+    location_id   [int] NULL
 );
 go
 

data/test/fixtures/department.rb

@@ -1,5 +1,5 @@
-class Department < ActiveRecord::Base
-  self.primary_keys = :department_id, :location_id
-  has_many :employees, :foreign_key => [:department_id, :location_id]
-  has_one :head, :class_name => 'Employee', :foreign_key => [:department_id, :location_id], :dependent => :delete
-end
+class Department < ActiveRecord::Base
+  self.primary_keys = :department_id, :location_id
+  has_many :employees, :foreign_key => [:department_id, :location_id]
+  has_one :head, :class_name => 'Employee', :foreign_key => [:department_id, :location_id], :dependent => :delete
+end

data/test/fixtures/departments.yml

@@ -1,15 +1,15 @@
-accounting:
-  department_id: 1
-  location_id: 1
-
-engineering:
-  department_id: 2
-  location_id: 1
-
-human_resources:
-  department_id: 3
-  location_id: 2
-
-offsite_accounting:
-  department_id: 1
-  location_id: 2
+accounting:
+  department_id: 1
+  location_id: 1
+
+engineering:
+  department_id: 2
+  location_id: 1
+
+human_resources:
+  department_id: 3
+  location_id: 2
+
+offsite_accounting:
+  department_id: 1
+  location_id: 2

data/test/fixtures/dorms.yml

@@ -1,5 +1,5 @@
-branner:
-    id: 1
-
-toyon:
+branner:
+    id: 1
+
+toyon:
     id: 2

data/test/fixtures/employee.rb

@@ -7,6 +7,5 @@ class Employee < ActiveRecord::Base
           :foreign_key => [:employee_id, :location_id]
         has_one :one_salary, :class_name => "Salary",
           :primary_key => [:id, :location_id],
-          :foreign_key => [:employee_id, :location_id],
-          :inverse_of => :employee
+          :foreign_key => [:employee_id, :location_id]
 end

data/test/fixtures/employees.yml

@@ -1,23 +1,19 @@
-steve:
-  id: 1
-  department_id: 1
-  location_id: 1
-  name: steve
-
-jill:
-  id: 2
-  department_id: 1
-  location_id: 1
-  name: jill
-
-sarah:
-  id: 3
-  department_id: 2
-  location_id: 1
-  name: sarah
-
-robert:
-  id: 4
-  department_id: 2
-  location_id: 1
-  name: robert
+steve:
+  id: 1
+  department_id: 1
+  location_id: 1
+
+jill:
+  id: 2
+  department_id: 1
+  location_id: 1
+
+sarah:
+  id: 3
+  department_id: 2
+  location_id: 1
+
+robert:
+  id: 4
+  department_id: 2
+  location_id: 1

data/test/fixtures/group.rb

@@ -1,3 +1,3 @@
-class Group < ActiveRecord::Base
-  has_many :memberships
+class Group < ActiveRecord::Base
+  has_many :memberships
 end

data/test/fixtures/groups.yml

@@ -1,7 +1,7 @@
-cpk:
-  id: 1
-  name: Composite Primary Keys
-
-group2: 
-  id: 2
+cpk:
+  id: 1
+  name: Composite Primary Keys
+
+group2: 
+  id: 2
   name: Grupo Dos

data/test/fixtures/hack.rb

@@ -1,5 +1,5 @@
-class Hack < ActiveRecord::Base
-  has_many :comments, :as => :person
-  
-  has_one :first_comment, :as => :person, :class_name => "Comment"
+class Hack < ActiveRecord::Base
+  has_many :comments, :as => :person
+  
+  has_one :first_comment, :as => :person, :class_name => "Comment"
 end

data/test/fixtures/hacks.yml

@@ -1,3 +1,3 @@
-andrew:
-  id: 7
+andrew:
+  id: 7
   name: andrew

data/test/fixtures/membership_status.rb

@@ -1,3 +1,3 @@
-class MembershipStatus < ActiveRecord::Base
-	belongs_to :membership, :foreign_key => [:user_id, :group_id]
+class MembershipStatus < ActiveRecord::Base
+	belongs_to :membership, :foreign_key => [:user_id, :group_id]
 end

data/test/fixtures/product.rb

@@ -1,9 +1,9 @@
-class Product < ActiveRecord::Base
-	self.primary_keys = :id  # redundant
-	has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
-	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
-
-  has_and_belongs_to_many :restaurants,
-    :foreign_key => :product_id,
-    :association_foreign_key => [:franchise_id, :store_id]
-end
+class Product < ActiveRecord::Base
+	self.primary_keys = :id  # redundant
+	has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
+	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+
+  has_and_belongs_to_many :restaurants,
+    :foreign_key => :product_id,
+    :association_foreign_key => [:franchise_id, :store_id]
+end

data/test/fixtures/product_tariff.rb

@@ -1,5 +1,5 @@
-class ProductTariff < ActiveRecord::Base
-	self.primary_keys = :product_id, :tariff_id, :tariff_start_date
-	belongs_to :product, :foreign_key => :product_id
-	belongs_to :tariff,  :foreign_key => [:tariff_id, :tariff_start_date]
-end
+class ProductTariff < ActiveRecord::Base
+	self.primary_keys = :product_id, :tariff_id, :tariff_start_date
+	belongs_to :product, :foreign_key => :product_id
+	belongs_to :tariff,  :foreign_key => [:tariff_id, :tariff_start_date]
+end

data/test/fixtures/products.yml

@@ -1,11 +1,11 @@
-first_product:
-  id: 1
-  name: Product One
-
-second_product:
-  id: 2
-  name: Product Two
-
-third_product:
-  id: 3
-  name: Product Three
+first_product:
+  id: 1
+  name: Product One
+
+second_product:
+  id: 2
+  name: Product Two
+
+third_product:
+  id: 3
+  name: Product Three

data/test/fixtures/reading.rb

@@ -1,4 +1,4 @@
-class Reading < ActiveRecord::Base
-  belongs_to :article
-  belongs_to :user
-end 
+class Reading < ActiveRecord::Base
+  belongs_to :article
+  belongs_to :user
+end 

data/test/fixtures/readings.yml

@@ -1,11 +1,11 @@
-santiago_first:
-  id: 1
-  user_id: 1
-  article_id: 1
-  rating: 4
-  
-santiago_second:
-  id: 2
-  user_id: 1
-  article_id: 2
+santiago_first:
+  id: 1
+  user_id: 1
+  article_id: 1
+  rating: 4
+  
+santiago_second:
+  id: 2
+  user_id: 1
+  article_id: 2
   rating: 5

data/test/fixtures/reference_code_using_composite_key_alias.rb

@@ -1,8 +1,8 @@
-class ReferenceCodeUsingCompositeKeyAlias < ActiveRecord::Base
-  self.table_name = 'reference_codes'
-  self.primary_key = [:reference_type_id, :reference_code]
-  
-  belongs_to :reference_type, :foreign_key => "reference_type_id"
-  
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end
+class ReferenceCodeUsingCompositeKeyAlias < ActiveRecord::Base
+  self.table_name = 'reference_codes'
+  self.primary_key = [:reference_type_id, :reference_code]
+  
+  belongs_to :reference_type, :foreign_key => "reference_type_id"
+  
+  validates_presence_of :reference_code, :code_label, :abbreviation
+end

data/test/fixtures/reference_code_using_simple_key_alias.rb

@@ -1,8 +1,8 @@
-class ReferenceCodeUsingSimpleKeyAlias < ActiveRecord::Base
-  self.table_name = 'reference_codes'
-  self.primary_key = :code_label
-  
-  belongs_to :reference_type, :foreign_key => "reference_type_id"
-  
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end
+class ReferenceCodeUsingSimpleKeyAlias < ActiveRecord::Base
+  self.table_name = 'reference_codes'
+  self.primary_key = :code_label
+  
+  belongs_to :reference_type, :foreign_key => "reference_type_id"
+  
+  validates_presence_of :reference_code, :code_label, :abbreviation
+end

data/test/fixtures/reference_codes.yml

@@ -1,29 +1,29 @@
-name_prefix_mr:
-  reference_type_id: 1
-  reference_code: 1
-  code_label: MR
-  abbreviation: Mr
-
-name_prefix_mrs:
-  reference_type_id: 1
-  reference_code: 2
-  code_label: MRS
-  abbreviation: Mrs
-  
-name_prefix_ms:
-  reference_type_id: 1
-  reference_code: 3
-  code_label: MS
-  abbreviation: Ms
-  
-gender_male:
-  reference_type_id: 2
-  reference_code: 1
-  code_label: MALE
-  abbreviation: Male
-  
-gender_female:
-  reference_type_id: 2
-  reference_code: 2
-  code_label: FEMALE
+name_prefix_mr:
+  reference_type_id: 1
+  reference_code: 1
+  code_label: MR
+  abbreviation: Mr
+
+name_prefix_mrs:
+  reference_type_id: 1
+  reference_code: 2
+  code_label: MRS
+  abbreviation: Mrs
+  
+name_prefix_ms:
+  reference_type_id: 1
+  reference_code: 3
+  code_label: MS
+  abbreviation: Ms
+  
+gender_male:
+  reference_type_id: 2
+  reference_code: 1
+  code_label: MALE
+  abbreviation: Male
+  
+gender_female:
+  reference_type_id: 2
+  reference_code: 2
+  code_label: FEMALE
   abbreviation: Female  

data/test/fixtures/reference_type.rb

@@ -7,6 +7,6 @@ class ReferenceType < ActiveRecord::Base
   validates_uniqueness_of :type_label
 
   before_destroy do |record|
-    a = record
+    record
   end
 end

data/test/fixtures/reference_types.yml

@@ -1,9 +1,9 @@
-name_prefix:
-  reference_type_id: 1
-  type_label: NAME_PREFIX
-  abbreviation: Name Prefix
-
-gender:
-  reference_type_id: 2
-  type_label: GENDER
-  abbreviation: Gender
+name_prefix:
+  reference_type_id: 1
+  type_label: NAME_PREFIX
+  abbreviation: Name Prefix
+
+gender:
+  reference_type_id: 2
+  type_label: GENDER
+  abbreviation: Gender