composite_primary_keys 12.0.8 → 13.0.1

data/test/fixtures/department.rb

@@ -1,16 +1,16 @@
-class Department < ActiveRecord::Base
-  self.primary_keys = :id, :location_id
-
-  has_many :employees,
-           # We intentionally redefine primary key for test purposes. #455
-           :primary_key =>  [:id, :location_id],
-           :foreign_key => [:department_id, :location_id]
-
-  has_many :comments, :through => :employees
-
-  has_one :head, :class_name => 'Employee',  :autosave => true, :dependent => :delete,
-                 # We intentionally redefine primary key for test purposes. #455
-                 :primary_key =>  [:id, :location_id],
-                 :foreign_key => [:department_id, :location_id]
-
-end
+class Department < ActiveRecord::Base
+  self.primary_keys = :id, :location_id
+
+  has_many :employees,
+           # We intentionally redefine primary key for test purposes. #455
+           :primary_key =>  [:id, :location_id],
+           :foreign_key => [:department_id, :location_id]
+
+  has_many :comments, :through => :employees
+
+  has_one :head, :class_name => 'Employee',  :autosave => true, :dependent => :delete,
+                 # We intentionally redefine primary key for test purposes. #455
+                 :primary_key =>  [:id, :location_id],
+                 :foreign_key => [:department_id, :location_id]
+
+end

data/test/fixtures/departments.yml

@@ -1,15 +1,19 @@
-accounting:
-  id: 1
-  location_id: 1
-
-engineering:
-  id: 2
-  location_id: 1
-
-human_resources:
-  id: 3
-  location_id: 2
-
-offsite_accounting:
-  id: 1
-  location_id: 2
+accounting:
+  id: 1
+  location_id: 1
+
+engineering:
+  id: 2
+  location_id: 1
+
+human_resources:
+  id: 3
+  location_id: 2
+
+offsite_accounting:
+  id: 1
+  location_id: 2
+
+offsite_engineering:
+  id: 2
+  location_id: 2

data/test/fixtures/employees.yml

@@ -1,28 +1,33 @@
-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
-
-mindy:
-  department_id: 3
-  location_id: 2
-  name: Mindy
+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
+
+mindy:
+  department_id: 3
+  location_id: 2
+  name: Mindy
+
+casey:
+  department_id: 2
+  location_id: 2
+  name: Casey

data/test/fixtures/membership.rb

@@ -1,7 +1,9 @@
-class Membership < ActiveRecord::Base
-  self.primary_keys = :user_id, :group_id
-  belongs_to :user
-	belongs_to :group
-	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
-  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
+class Membership < ActiveRecord::Base
+  self.primary_keys = :user_id, :group_id
+  belongs_to :user
+	belongs_to :group
+	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+  has_many :active_statuses, -> { where('membership_statuses.status = ?', 'Active') },
+           :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+  has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
 end

data/test/fixtures/restaurants_suburbs.yml

@@ -1,11 +1,11 @@
-a:
-  franchise_id: 1
-  store_id: 1
-  city_id: 1
-  suburb_id: 1
-  
-b:
-  franchise_id: 1
-  store_id: 1
-  city_id: 2
+a:
+  franchise_id: 1
+  store_id: 1
+  city_id: 1
+  suburb_id: 1
+  
+b:
+  franchise_id: 1
+  store_id: 1
+  city_id: 2
   suburb_id: 2

data/test/fixtures/streets.yml

@@ -1,17 +1,17 @@
-first:
-  id: 1
-  city_id: 1
-  suburb_id: 1
-  name: First Street
-
-second1:
-  id: 2
-  city_id: 2
-  suburb_id: 2
-  name: First Street
-
-second2:
-  id: 3
-  city_id: 2
-  suburb_id: 2
+first:
+  id: 1
+  city_id: 1
+  suburb_id: 1
+  name: First Street
+
+second1:
+  id: 2
+  city_id: 2
+  suburb_id: 2
+  name: First Street
+
+second2:
+  id: 3
+  city_id: 2
+  suburb_id: 2
   name: Second Street

data/test/fixtures/suburbs.yml

@@ -1,14 +1,14 @@
-first:
-  city_id: 1
-  suburb_id: 1
-  name: First Suburb
-
-second:
-  city_id: 2
-  suburb_id: 2
-  name: Second Suburb
-
-no_mcdonalds:
-  city_id: 1
-  suburb_id: 3
-  name: Third Suburb  
+first:
+  city_id: 1
+  suburb_id: 1
+  name: First Suburb
+
+second:
+  city_id: 2
+  suburb_id: 2
+  name: Second Suburb
+
+no_mcdonalds:
+  city_id: 1
+  suburb_id: 3
+  name: Third Suburb  

data/test/fixtures/user.rb

@@ -1,11 +1,11 @@
-class User < ActiveRecord::Base
-  has_many :readings
-  has_many :articles, :through => :readings
-
-  has_many :comments, :as => :person
-  has_one :first_comment, :as => :person, :class_name => "Comment"
-
-  def find_custom_articles
-    articles.where("name = ?", "Article One")
-  end
-end
+class User < ActiveRecord::Base
+  has_many :readings
+  has_many :articles, :through => :readings
+
+  has_many :comments, :as => :person
+  has_one :first_comment, :as => :person, :class_name => "Comment"
+
+  def find_custom_articles
+    articles.where("name = ?", "Article One")
+  end
+end