composite_primary_keys 13.0.0 → 14.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/History.rdoc +900 -883
- data/README.rdoc +182 -181
- data/Rakefile +37 -37
- data/lib/composite_primary_keys/arel/sqlserver.rb +37 -37
- data/lib/composite_primary_keys/arel/to_sql.rb +18 -18
- data/lib/composite_primary_keys/associations/association.rb +23 -23
- data/lib/composite_primary_keys/associations/collection_association.rb +31 -31
- data/lib/composite_primary_keys/associations/foreign_association.rb +15 -15
- data/lib/composite_primary_keys/associations/has_many_association.rb +35 -35
- data/lib/composite_primary_keys/associations/{join_dependency.rb → join_association.rb} +137 -118
- data/lib/composite_primary_keys/associations/preloader/association.rb +15 -0
- data/lib/composite_primary_keys/associations/through_association.rb +25 -25
- data/lib/composite_primary_keys/autosave_association.rb +60 -60
- data/lib/composite_primary_keys/composite_arrays.rb +86 -86
- data/lib/composite_primary_keys/composite_predicates.rb +3 -1
- data/lib/composite_primary_keys/composite_relation.rb +29 -29
- data/lib/composite_primary_keys/connection_adapters/abstract_adapter.rb +10 -10
- data/lib/composite_primary_keys/connection_adapters/postgresql/database_statements.rb +26 -26
- data/lib/composite_primary_keys/counter_cache.rb +15 -15
- data/lib/composite_primary_keys/fixtures.rb +21 -21
- data/lib/composite_primary_keys/persistence.rb +96 -82
- data/lib/composite_primary_keys/relation/calculations.rb +110 -104
- data/lib/composite_primary_keys/relation.rb +2 -2
- data/lib/composite_primary_keys/sanitization.rb +42 -42
- data/lib/composite_primary_keys/transactions.rb +34 -34
- data/lib/composite_primary_keys/validations/uniqueness.rb +31 -31
- data/lib/composite_primary_keys/version.rb +8 -8
- data/lib/composite_primary_keys.rb +118 -118
- data/scripts/console.rb +48 -48
- data/scripts/txt2html +76 -76
- data/scripts/txt2js +65 -65
- data/tasks/databases/mysql.rake +40 -40
- data/tasks/databases/oracle.rake +41 -41
- data/tasks/databases/postgresql.rake +38 -38
- data/tasks/databases/sqlite.rake +25 -25
- data/tasks/databases/sqlserver.rake +43 -43
- data/tasks/website.rake +18 -18
- data/test/README_tests.rdoc +56 -56
- data/test/abstract_unit.rb +118 -114
- data/test/connections/connection_spec.rb +27 -27
- data/test/connections/databases.example.yml +40 -40
- data/test/connections/databases.yml +40 -39
- data/test/fixtures/article.rb +10 -10
- data/test/fixtures/articles.yml +7 -7
- data/test/fixtures/capitol.rb +3 -3
- data/test/fixtures/capitols.yml +16 -16
- data/test/fixtures/comment.rb +5 -5
- data/test/fixtures/comments.yml +17 -17
- data/test/fixtures/department.rb +16 -16
- data/test/fixtures/dorm.rb +2 -2
- data/test/fixtures/dorms.yml +4 -4
- data/test/fixtures/employee.rb +5 -5
- data/test/fixtures/group.rb +2 -2
- data/test/fixtures/groups.yml +6 -6
- data/test/fixtures/membership.rb +2 -0
- data/test/fixtures/membership_status.rb +2 -2
- data/test/fixtures/membership_statuses.yml +16 -16
- data/test/fixtures/memberships.yml +10 -10
- data/test/fixtures/product.rb +9 -9
- data/test/fixtures/product_tariff.rb +5 -5
- data/test/fixtures/product_tariffs.yml +14 -14
- data/test/fixtures/products.yml +11 -11
- data/test/fixtures/reading.rb +4 -4
- data/test/fixtures/readings.yml +10 -10
- data/test/fixtures/reference_code.rb +7 -7
- data/test/fixtures/reference_codes.yml +28 -28
- data/test/fixtures/reference_type.rb +12 -12
- data/test/fixtures/reference_types.yml +9 -9
- data/test/fixtures/restaurant.rb +9 -9
- data/test/fixtures/restaurants.yml +14 -14
- data/test/fixtures/restaurants_suburb.rb +2 -2
- data/test/fixtures/room.rb +11 -11
- data/test/fixtures/room_assignment.rb +13 -13
- data/test/fixtures/room_assignments.yml +24 -24
- data/test/fixtures/room_attribute.rb +2 -2
- data/test/fixtures/room_attribute_assignment.rb +4 -4
- data/test/fixtures/room_attribute_assignments.yml +4 -4
- data/test/fixtures/room_attributes.yml +2 -2
- data/test/fixtures/rooms.yml +12 -12
- data/test/fixtures/street.rb +2 -2
- data/test/fixtures/student.rb +3 -3
- data/test/fixtures/students.yml +15 -15
- data/test/fixtures/suburb.rb +5 -5
- data/test/fixtures/tariff.rb +5 -5
- data/test/fixtures/tariffs.yml +14 -14
- data/test/fixtures/topic_sources.yml +3 -3
- data/test/fixtures/topics.yml +8 -8
- data/test/fixtures/users.yml +10 -10
- data/test/plugins/pagination.rb +405 -405
- data/test/plugins/pagination_helper.rb +135 -135
- data/test/test_associations.rb +372 -364
- data/test/test_attribute_methods.rb +63 -63
- data/test/test_callbacks.rb +99 -99
- data/test/test_composite_arrays.rb +38 -38
- data/test/test_counter_cache.rb +30 -30
- data/test/test_delete.rb +6 -0
- data/test/test_dumpable.rb +15 -15
- data/test/test_dup.rb +37 -37
- data/test/test_equal.rb +26 -26
- data/test/test_habtm.rb +141 -141
- data/test/test_miscellaneous.rb +32 -32
- data/test/test_optimistic.rb +18 -18
- data/test/test_pagination.rb +35 -35
- data/test/test_polymorphic.rb +43 -43
- data/test/test_predicates.rb +59 -59
- data/test/test_preload.rb +102 -102
- data/test/test_santiago.rb +23 -23
- data/test/test_touch.rb +23 -23
- data/test/test_tutorial_example.rb +25 -25
- data/test/test_update.rb +6 -0
- data/test/test_validations.rb +13 -13
- metadata +13 -13
data/test/fixtures/membership.rb
CHANGED
@@ -3,5 +3,7 @@ class Membership < ActiveRecord::Base
|
|
3
3
|
belongs_to :user
|
4
4
|
belongs_to :group
|
5
5
|
has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
|
6
|
+
has_many :active_statuses, -> { where('membership_statuses.status = ?', 'Active') },
|
7
|
+
:class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
|
6
8
|
has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
|
7
9
|
end
|
@@ -1,3 +1,3 @@
|
|
1
|
-
class MembershipStatus < ActiveRecord::Base
|
2
|
-
belongs_to :membership, :foreign_key => [:user_id, :group_id]
|
1
|
+
class MembershipStatus < ActiveRecord::Base
|
2
|
+
belongs_to :membership, :foreign_key => [:user_id, :group_id]
|
3
3
|
end
|
@@ -1,17 +1,17 @@
|
|
1
|
-
santiago-cpk:
|
2
|
-
id: 1
|
3
|
-
user_id: 1
|
4
|
-
group_id: 1
|
5
|
-
status: Active
|
6
|
-
|
7
|
-
drnic-cpk:
|
8
|
-
id: 2
|
9
|
-
user_id: 2
|
10
|
-
group_id: 1
|
11
|
-
status: Owner
|
12
|
-
|
13
|
-
cfis-cpk:
|
14
|
-
id: 3
|
15
|
-
user_id: 3
|
16
|
-
group_id: 2
|
1
|
+
santiago-cpk:
|
2
|
+
id: 1
|
3
|
+
user_id: 1
|
4
|
+
group_id: 1
|
5
|
+
status: Active
|
6
|
+
|
7
|
+
drnic-cpk:
|
8
|
+
id: 2
|
9
|
+
user_id: 2
|
10
|
+
group_id: 1
|
11
|
+
status: Owner
|
12
|
+
|
13
|
+
cfis-cpk:
|
14
|
+
id: 3
|
15
|
+
user_id: 3
|
16
|
+
group_id: 2
|
17
17
|
status: Active
|
@@ -1,11 +1,11 @@
|
|
1
|
-
santiago-cpk:
|
2
|
-
user_id: 1
|
3
|
-
group_id: 1
|
4
|
-
|
5
|
-
drnic-cpk:
|
6
|
-
user_id: 2
|
7
|
-
group_id: 1
|
8
|
-
|
9
|
-
cfis-cpk:
|
10
|
-
user_id: 3
|
1
|
+
santiago-cpk:
|
2
|
+
user_id: 1
|
3
|
+
group_id: 1
|
4
|
+
|
5
|
+
drnic-cpk:
|
6
|
+
user_id: 2
|
7
|
+
group_id: 1
|
8
|
+
|
9
|
+
cfis-cpk:
|
10
|
+
user_id: 3
|
11
11
|
group_id: 2
|
data/test/fixtures/product.rb
CHANGED
@@ -1,9 +1,9 @@
|
|
1
|
-
class Product < ActiveRecord::Base
|
2
|
-
self.primary_keys = :id # redundant
|
3
|
-
has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
|
4
|
-
has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
-
|
6
|
-
has_and_belongs_to_many :restaurants,
|
7
|
-
:foreign_key => :product_id,
|
8
|
-
:association_foreign_key => [:franchise_id, :store_id]
|
9
|
-
end
|
1
|
+
class Product < ActiveRecord::Base
|
2
|
+
self.primary_keys = :id # redundant
|
3
|
+
has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
|
4
|
+
has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
+
|
6
|
+
has_and_belongs_to_many :restaurants,
|
7
|
+
:foreign_key => :product_id,
|
8
|
+
:association_foreign_key => [:franchise_id, :store_id]
|
9
|
+
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
class ProductTariff < ActiveRecord::Base
|
2
|
-
self.primary_keys = :product_id, :tariff_id, :tariff_start_date
|
3
|
-
belongs_to :product, :foreign_key => :product_id
|
4
|
-
belongs_to :tariff, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
-
end
|
1
|
+
class ProductTariff < ActiveRecord::Base
|
2
|
+
self.primary_keys = :product_id, :tariff_id, :tariff_start_date
|
3
|
+
belongs_to :product, :foreign_key => :product_id
|
4
|
+
belongs_to :tariff, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
+
end
|
@@ -1,14 +1,14 @@
|
|
1
|
-
first_flat:
|
2
|
-
product_id: 1
|
3
|
-
tariff_id: 1
|
4
|
-
tariff_start_date: <%= Date.today.to_s(:db) %>
|
5
|
-
|
6
|
-
first_free:
|
7
|
-
product_id: 1
|
8
|
-
tariff_id: 2
|
9
|
-
tariff_start_date: <%= Date.today.to_s(:db) %>
|
10
|
-
|
11
|
-
second_free:
|
12
|
-
product_id: 2
|
13
|
-
tariff_id: 2
|
14
|
-
tariff_start_date: <%= Date.today.to_s(:db) %>
|
1
|
+
first_flat:
|
2
|
+
product_id: 1
|
3
|
+
tariff_id: 1
|
4
|
+
tariff_start_date: <%= Date.today.to_s(:db) %>
|
5
|
+
|
6
|
+
first_free:
|
7
|
+
product_id: 1
|
8
|
+
tariff_id: 2
|
9
|
+
tariff_start_date: <%= Date.today.to_s(:db) %>
|
10
|
+
|
11
|
+
second_free:
|
12
|
+
product_id: 2
|
13
|
+
tariff_id: 2
|
14
|
+
tariff_start_date: <%= Date.today.to_s(:db) %>
|
data/test/fixtures/products.yml
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
first_product:
|
2
|
-
id: 1
|
3
|
-
name: Product One
|
4
|
-
|
5
|
-
second_product:
|
6
|
-
id: 2
|
7
|
-
name: Product Two
|
8
|
-
|
9
|
-
third_product:
|
10
|
-
id: 3
|
11
|
-
name: Product Three
|
1
|
+
first_product:
|
2
|
+
id: 1
|
3
|
+
name: Product One
|
4
|
+
|
5
|
+
second_product:
|
6
|
+
id: 2
|
7
|
+
name: Product Two
|
8
|
+
|
9
|
+
third_product:
|
10
|
+
id: 3
|
11
|
+
name: Product Three
|
data/test/fixtures/reading.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
class Reading < ActiveRecord::Base
|
2
|
-
belongs_to :article
|
3
|
-
belongs_to :user
|
4
|
-
end
|
1
|
+
class Reading < ActiveRecord::Base
|
2
|
+
belongs_to :article
|
3
|
+
belongs_to :user
|
4
|
+
end
|
data/test/fixtures/readings.yml
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
santiago_first:
|
2
|
-
id: 1
|
3
|
-
user_id: 1
|
4
|
-
article: first
|
5
|
-
rating: 4
|
6
|
-
|
7
|
-
santiago_second:
|
8
|
-
id: 2
|
9
|
-
user_id: 1
|
10
|
-
article: second
|
1
|
+
santiago_first:
|
2
|
+
id: 1
|
3
|
+
user_id: 1
|
4
|
+
article: first
|
5
|
+
rating: 4
|
6
|
+
|
7
|
+
santiago_second:
|
8
|
+
id: 2
|
9
|
+
user_id: 1
|
10
|
+
article: second
|
11
11
|
rating: 5
|
@@ -1,7 +1,7 @@
|
|
1
|
-
class ReferenceCode < ActiveRecord::Base
|
2
|
-
self.primary_keys = :reference_type_id, :reference_code
|
3
|
-
|
4
|
-
belongs_to :reference_type, :foreign_key => "reference_type_id"
|
5
|
-
|
6
|
-
validates_presence_of :reference_code, :code_label, :abbreviation
|
7
|
-
end
|
1
|
+
class ReferenceCode < ActiveRecord::Base
|
2
|
+
self.primary_keys = :reference_type_id, :reference_code
|
3
|
+
|
4
|
+
belongs_to :reference_type, :foreign_key => "reference_type_id"
|
5
|
+
|
6
|
+
validates_presence_of :reference_code, :code_label, :abbreviation
|
7
|
+
end
|
@@ -1,29 +1,29 @@
|
|
1
|
-
name_prefix_mr:
|
2
|
-
reference_type_id: 1
|
3
|
-
reference_code: 1
|
4
|
-
code_label: MR
|
5
|
-
abbreviation: Mr
|
6
|
-
|
7
|
-
name_prefix_mrs:
|
8
|
-
reference_type_id: 1
|
9
|
-
reference_code: 2
|
10
|
-
code_label: MRS
|
11
|
-
abbreviation: Mrs
|
12
|
-
|
13
|
-
name_prefix_ms:
|
14
|
-
reference_type_id: 1
|
15
|
-
reference_code: 3
|
16
|
-
code_label: MS
|
17
|
-
abbreviation: Ms
|
18
|
-
|
19
|
-
gender_male:
|
20
|
-
reference_type_id: 2
|
21
|
-
reference_code: 1
|
22
|
-
code_label: MALE
|
23
|
-
abbreviation: Male
|
24
|
-
|
25
|
-
gender_female:
|
26
|
-
reference_type_id: 2
|
27
|
-
reference_code: 2
|
28
|
-
code_label: FEMALE
|
1
|
+
name_prefix_mr:
|
2
|
+
reference_type_id: 1
|
3
|
+
reference_code: 1
|
4
|
+
code_label: MR
|
5
|
+
abbreviation: Mr
|
6
|
+
|
7
|
+
name_prefix_mrs:
|
8
|
+
reference_type_id: 1
|
9
|
+
reference_code: 2
|
10
|
+
code_label: MRS
|
11
|
+
abbreviation: Mrs
|
12
|
+
|
13
|
+
name_prefix_ms:
|
14
|
+
reference_type_id: 1
|
15
|
+
reference_code: 3
|
16
|
+
code_label: MS
|
17
|
+
abbreviation: Ms
|
18
|
+
|
19
|
+
gender_male:
|
20
|
+
reference_type_id: 2
|
21
|
+
reference_code: 1
|
22
|
+
code_label: MALE
|
23
|
+
abbreviation: Male
|
24
|
+
|
25
|
+
gender_female:
|
26
|
+
reference_type_id: 2
|
27
|
+
reference_code: 2
|
28
|
+
code_label: FEMALE
|
29
29
|
abbreviation: Female
|
@@ -1,12 +1,12 @@
|
|
1
|
-
class ReferenceType < ActiveRecord::Base
|
2
|
-
self.primary_key = :reference_type_id
|
3
|
-
has_many :reference_codes, :foreign_key => "reference_type_id", :dependent => :destroy
|
4
|
-
accepts_nested_attributes_for :reference_codes
|
5
|
-
|
6
|
-
validates_presence_of :type_label, :abbreviation
|
7
|
-
validates_uniqueness_of :type_label
|
8
|
-
|
9
|
-
before_destroy do |record|
|
10
|
-
record
|
11
|
-
end
|
12
|
-
end
|
1
|
+
class ReferenceType < ActiveRecord::Base
|
2
|
+
self.primary_key = :reference_type_id
|
3
|
+
has_many :reference_codes, :foreign_key => "reference_type_id", :dependent => :destroy
|
4
|
+
accepts_nested_attributes_for :reference_codes
|
5
|
+
|
6
|
+
validates_presence_of :type_label, :abbreviation
|
7
|
+
validates_uniqueness_of :type_label
|
8
|
+
|
9
|
+
before_destroy do |record|
|
10
|
+
record
|
11
|
+
end
|
12
|
+
end
|
@@ -1,9 +1,9 @@
|
|
1
|
-
name_prefix:
|
2
|
-
reference_type_id: 1
|
3
|
-
type_label: NAME_PREFIX
|
4
|
-
abbreviation: Name Prefix
|
5
|
-
|
6
|
-
gender:
|
7
|
-
reference_type_id: 2
|
8
|
-
type_label: GENDER
|
9
|
-
abbreviation: Gender
|
1
|
+
name_prefix:
|
2
|
+
reference_type_id: 1
|
3
|
+
type_label: NAME_PREFIX
|
4
|
+
abbreviation: Name Prefix
|
5
|
+
|
6
|
+
gender:
|
7
|
+
reference_type_id: 2
|
8
|
+
type_label: GENDER
|
9
|
+
abbreviation: Gender
|
data/test/fixtures/restaurant.rb
CHANGED
@@ -1,9 +1,9 @@
|
|
1
|
-
class Restaurant < ActiveRecord::Base
|
2
|
-
self.primary_keys = :franchise_id, :store_id
|
3
|
-
has_and_belongs_to_many :suburbs,
|
4
|
-
:foreign_key => [:franchise_id, :store_id],
|
5
|
-
:association_foreign_key => [:city_id, :suburb_id]
|
6
|
-
has_and_belongs_to_many :products,
|
7
|
-
:foreign_key => [:franchise_id, :store_id],
|
8
|
-
:association_foreign_key => :product_id
|
9
|
-
end
|
1
|
+
class Restaurant < ActiveRecord::Base
|
2
|
+
self.primary_keys = :franchise_id, :store_id
|
3
|
+
has_and_belongs_to_many :suburbs,
|
4
|
+
:foreign_key => [:franchise_id, :store_id],
|
5
|
+
:association_foreign_key => [:city_id, :suburb_id]
|
6
|
+
has_and_belongs_to_many :products,
|
7
|
+
:foreign_key => [:franchise_id, :store_id],
|
8
|
+
:association_foreign_key => :product_id
|
9
|
+
end
|
@@ -1,14 +1,14 @@
|
|
1
|
-
mcdonalds:
|
2
|
-
franchise_id: 1
|
3
|
-
store_id: 1
|
4
|
-
name: McDonalds
|
5
|
-
|
6
|
-
subway_one:
|
7
|
-
franchise_id: 2
|
8
|
-
store_id: 1
|
9
|
-
name: Subway 1
|
10
|
-
|
11
|
-
subway_two:
|
12
|
-
franchise_id: 2
|
13
|
-
store_id: 2
|
14
|
-
name: Subway 2
|
1
|
+
mcdonalds:
|
2
|
+
franchise_id: 1
|
3
|
+
store_id: 1
|
4
|
+
name: McDonalds
|
5
|
+
|
6
|
+
subway_one:
|
7
|
+
franchise_id: 2
|
8
|
+
store_id: 1
|
9
|
+
name: Subway 1
|
10
|
+
|
11
|
+
subway_two:
|
12
|
+
franchise_id: 2
|
13
|
+
store_id: 2
|
14
|
+
name: Subway 2
|
@@ -1,3 +1,3 @@
|
|
1
|
-
class RestaurantsSuburb < ActiveRecord::Base
|
2
|
-
|
1
|
+
class RestaurantsSuburb < ActiveRecord::Base
|
2
|
+
|
3
3
|
end
|
data/test/fixtures/room.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
class Room < ActiveRecord::Base
|
2
|
-
self.primary_keys = :dorm_id, :room_id
|
3
|
-
belongs_to :dorm
|
4
|
-
has_many :room_assignments, :foreign_key => [:dorm_id, :room_id]
|
5
|
-
has_many :room_attribute_assignments, :foreign_key => [:dorm_id, :room_id]
|
6
|
-
has_many :room_attributes, :through => :room_attribute_assignments
|
7
|
-
|
8
|
-
def find_custom_room_attributes
|
9
|
-
room_attributes.where("room_attributes.name != ?", "type")
|
10
|
-
end
|
11
|
-
end
|
1
|
+
class Room < ActiveRecord::Base
|
2
|
+
self.primary_keys = :dorm_id, :room_id
|
3
|
+
belongs_to :dorm
|
4
|
+
has_many :room_assignments, :foreign_key => [:dorm_id, :room_id]
|
5
|
+
has_many :room_attribute_assignments, :foreign_key => [:dorm_id, :room_id]
|
6
|
+
has_many :room_attributes, :through => :room_attribute_assignments
|
7
|
+
|
8
|
+
def find_custom_room_attributes
|
9
|
+
room_attributes.where("room_attributes.name != ?", "type")
|
10
|
+
end
|
11
|
+
end
|
@@ -1,14 +1,14 @@
|
|
1
|
-
class RoomAssignment < ActiveRecord::Base
|
2
|
-
self.primary_keys = :student_id, :dorm_id, :room_id
|
3
|
-
belongs_to :student
|
4
|
-
belongs_to :room, :foreign_key => [:dorm_id, :room_id], :primary_key => [:dorm_id, :room_id]
|
5
|
-
validates_uniqueness_of :student_id
|
6
|
-
|
7
|
-
before_destroy do |record|
|
8
|
-
puts record
|
9
|
-
end
|
10
|
-
|
11
|
-
after_destroy do |record|
|
12
|
-
puts record
|
13
|
-
end
|
1
|
+
class RoomAssignment < ActiveRecord::Base
|
2
|
+
self.primary_keys = :student_id, :dorm_id, :room_id
|
3
|
+
belongs_to :student
|
4
|
+
belongs_to :room, :foreign_key => [:dorm_id, :room_id], :primary_key => [:dorm_id, :room_id]
|
5
|
+
validates_uniqueness_of :student_id
|
6
|
+
|
7
|
+
before_destroy do |record|
|
8
|
+
puts record
|
9
|
+
end
|
10
|
+
|
11
|
+
after_destroy do |record|
|
12
|
+
puts record
|
13
|
+
end
|
14
14
|
end
|
@@ -1,24 +1,24 @@
|
|
1
|
-
jacksons_room:
|
2
|
-
student_id: 1
|
3
|
-
dorm_id: 1
|
4
|
-
room_id: 1
|
5
|
-
|
6
|
-
bobs_room:
|
7
|
-
student_id: 2
|
8
|
-
dorm_id: 1
|
9
|
-
room_id: 1
|
10
|
-
|
11
|
-
kellys_room:
|
12
|
-
student_id: 3
|
13
|
-
dorm_id: 1
|
14
|
-
room_id: 2
|
15
|
-
|
16
|
-
jordans_room:
|
17
|
-
student_id: 4
|
18
|
-
dorm_id: 1
|
19
|
-
room_id: 2
|
20
|
-
|
21
|
-
brads_room:
|
22
|
-
student_id: 5
|
23
|
-
dorm_id: 1
|
24
|
-
room_id: 3
|
1
|
+
jacksons_room:
|
2
|
+
student_id: 1
|
3
|
+
dorm_id: 1
|
4
|
+
room_id: 1
|
5
|
+
|
6
|
+
bobs_room:
|
7
|
+
student_id: 2
|
8
|
+
dorm_id: 1
|
9
|
+
room_id: 1
|
10
|
+
|
11
|
+
kellys_room:
|
12
|
+
student_id: 3
|
13
|
+
dorm_id: 1
|
14
|
+
room_id: 2
|
15
|
+
|
16
|
+
jordans_room:
|
17
|
+
student_id: 4
|
18
|
+
dorm_id: 1
|
19
|
+
room_id: 2
|
20
|
+
|
21
|
+
brads_room:
|
22
|
+
student_id: 5
|
23
|
+
dorm_id: 1
|
24
|
+
room_id: 3
|
@@ -1,3 +1,3 @@
|
|
1
|
-
class RoomAttribute < ActiveRecord::Base
|
2
|
-
has_many :rooms, :through => :room_attribute_assignments, :foreign_key => [:dorm_id, :room_id]
|
1
|
+
class RoomAttribute < ActiveRecord::Base
|
2
|
+
has_many :rooms, :through => :room_attribute_assignments, :foreign_key => [:dorm_id, :room_id]
|
3
3
|
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
class RoomAttributeAssignment < ActiveRecord::Base
|
2
|
-
self.primary_keys = :dorm_id, :room_id, :room_attribute_id
|
3
|
-
belongs_to :room, :foreign_key => [:dorm_id, :room_id]
|
4
|
-
belongs_to :room_attribute
|
1
|
+
class RoomAttributeAssignment < ActiveRecord::Base
|
2
|
+
self.primary_keys = :dorm_id, :room_id, :room_attribute_id
|
3
|
+
belongs_to :room, :foreign_key => [:dorm_id, :room_id]
|
4
|
+
belongs_to :room_attribute
|
5
5
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
assignment:
|
2
|
-
dorm_id: 1
|
3
|
-
room_id: 1
|
4
|
-
room_attribute_id: 1
|
1
|
+
assignment:
|
2
|
+
dorm_id: 1
|
3
|
+
room_id: 1
|
4
|
+
room_attribute_id: 1
|
@@ -1,3 +1,3 @@
|
|
1
|
-
attribute_1:
|
2
|
-
id: 1
|
1
|
+
attribute_1:
|
2
|
+
id: 1
|
3
3
|
name: 'type'
|
data/test/fixtures/rooms.yml
CHANGED
@@ -1,12 +1,12 @@
|
|
1
|
-
branner_room_1:
|
2
|
-
dorm_id: 1
|
3
|
-
room_id: 1
|
4
|
-
|
5
|
-
branner_room_2:
|
6
|
-
dorm_id: 1
|
7
|
-
room_id: 2
|
8
|
-
|
9
|
-
branner_room_3:
|
10
|
-
dorm_id: 1
|
11
|
-
room_id: 3
|
12
|
-
|
1
|
+
branner_room_1:
|
2
|
+
dorm_id: 1
|
3
|
+
room_id: 1
|
4
|
+
|
5
|
+
branner_room_2:
|
6
|
+
dorm_id: 1
|
7
|
+
room_id: 2
|
8
|
+
|
9
|
+
branner_room_3:
|
10
|
+
dorm_id: 1
|
11
|
+
room_id: 3
|
12
|
+
|
data/test/fixtures/street.rb
CHANGED
@@ -1,3 +1,3 @@
|
|
1
|
-
class Street < ActiveRecord::Base
|
2
|
-
belongs_to :suburb, :foreign_key => [:city_id, :suburb_id]
|
1
|
+
class Street < ActiveRecord::Base
|
2
|
+
belongs_to :suburb, :foreign_key => [:city_id, :suburb_id]
|
3
3
|
end
|
data/test/fixtures/student.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
class Student < ActiveRecord::Base
|
2
|
-
has_many :room_assignments, :dependent => :destroy
|
3
|
-
has_many :rooms, :through => :room_assignments, :foreign_key => [:building_code, :room_number]
|
1
|
+
class Student < ActiveRecord::Base
|
2
|
+
has_many :room_assignments, :dependent => :destroy
|
3
|
+
has_many :rooms, :through => :room_assignments, :foreign_key => [:building_code, :room_number]
|
4
4
|
end
|
data/test/fixtures/students.yml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
|
-
jackson:
|
2
|
-
id: 1
|
3
|
-
|
4
|
-
bob:
|
5
|
-
id: 2
|
6
|
-
|
7
|
-
kelly:
|
8
|
-
id: 3
|
9
|
-
|
10
|
-
jordan:
|
11
|
-
id: 4
|
12
|
-
|
13
|
-
brad:
|
14
|
-
id: 5
|
15
|
-
|
1
|
+
jackson:
|
2
|
+
id: 1
|
3
|
+
|
4
|
+
bob:
|
5
|
+
id: 2
|
6
|
+
|
7
|
+
kelly:
|
8
|
+
id: 3
|
9
|
+
|
10
|
+
jordan:
|
11
|
+
id: 4
|
12
|
+
|
13
|
+
brad:
|
14
|
+
id: 5
|
15
|
+
|
data/test/fixtures/suburb.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
class Suburb < ActiveRecord::Base
|
2
|
-
self.primary_keys = :city_id, :suburb_id
|
3
|
-
has_many :streets, :foreign_key => [:city_id, :suburb_id]
|
4
|
-
has_many :first_streets, -> {where("streets.name = 'First Street'")},
|
5
|
-
:foreign_key => [:city_id, :suburb_id], :class_name => 'Street'
|
1
|
+
class Suburb < ActiveRecord::Base
|
2
|
+
self.primary_keys = :city_id, :suburb_id
|
3
|
+
has_many :streets, :foreign_key => [:city_id, :suburb_id]
|
4
|
+
has_many :first_streets, -> {where("streets.name = 'First Street'")},
|
5
|
+
:foreign_key => [:city_id, :suburb_id], :class_name => 'Street'
|
6
6
|
end
|
data/test/fixtures/tariff.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
class Tariff < ActiveRecord::Base
|
2
|
-
self.primary_keys = [:tariff_id, :start_date]
|
3
|
-
has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date], :dependent => :delete_all
|
4
|
-
has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
-
end
|
1
|
+
class Tariff < ActiveRecord::Base
|
2
|
+
self.primary_keys = [:tariff_id, :start_date]
|
3
|
+
has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date], :dependent => :delete_all
|
4
|
+
has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
|
+
end
|
data/test/fixtures/tariffs.yml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
|
-
flat:
|
2
|
-
tariff_id: 1
|
3
|
-
start_date: <%= Date.today.to_s(:db) %>
|
4
|
-
amount: 50
|
5
|
-
|
6
|
-
free:
|
7
|
-
tariff_id: 2
|
8
|
-
start_date: <%= Date.today.to_s(:db) %>
|
9
|
-
amount: 0
|
10
|
-
|
11
|
-
flat_future:
|
12
|
-
tariff_id: 3
|
13
|
-
start_date: <%= Date.today.next.to_s(:db) %>
|
14
|
-
amount: 100
|
1
|
+
flat:
|
2
|
+
tariff_id: 1
|
3
|
+
start_date: <%= Date.today.to_s(:db) %>
|
4
|
+
amount: 50
|
5
|
+
|
6
|
+
free:
|
7
|
+
tariff_id: 2
|
8
|
+
start_date: <%= Date.today.to_s(:db) %>
|
9
|
+
amount: 0
|
10
|
+
|
11
|
+
flat_future:
|
12
|
+
tariff_id: 3
|
13
|
+
start_date: <%= Date.today.next.to_s(:db) %>
|
14
|
+
amount: 100
|
15
15
|
|
@@ -1,4 +1,4 @@
|
|
1
|
-
music_source:
|
2
|
-
topic_id: 1
|
3
|
-
platform: 'twitter'
|
1
|
+
music_source:
|
2
|
+
topic_id: 1
|
3
|
+
platform: 'twitter'
|
4
4
|
keywords: 'classical'
|
data/test/fixtures/topics.yml
CHANGED
@@ -1,9 +1,9 @@
|
|
1
|
-
music:
|
2
|
-
id: 1
|
3
|
-
name: Guitar
|
4
|
-
feed_size: 500
|
5
|
-
|
6
|
-
iphone:
|
7
|
-
id: 2
|
8
|
-
name: iPhone
|
1
|
+
music:
|
2
|
+
id: 1
|
3
|
+
name: Guitar
|
4
|
+
feed_size: 500
|
5
|
+
|
6
|
+
iphone:
|
7
|
+
id: 2
|
8
|
+
name: iPhone
|
9
9
|
feed_size: 500
|