composite_primary_keys 12.0.9 → 14.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/History.rdoc +894 -877
- data/README.rdoc +182 -180
- data/Rakefile +37 -37
- data/lib/composite_primary_keys/active_model/attribute_assignment.rb +19 -19
- 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/association_scope.rb +66 -68
- 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 +137 -103
- data/lib/composite_primary_keys/associations/preloader/association.rb +68 -53
- data/lib/composite_primary_keys/associations/through_association.rb +25 -25
- data/lib/composite_primary_keys/attribute_methods/primary_key.rb +0 -2
- data/lib/composite_primary_keys/attribute_methods/read.rb +30 -30
- data/lib/composite_primary_keys/attribute_methods/write.rb +35 -35
- data/lib/composite_primary_keys/attribute_methods.rb +21 -9
- data/lib/composite_primary_keys/autosave_association.rb +60 -60
- data/lib/composite_primary_keys/base.rb +141 -141
- data/lib/composite_primary_keys/composite_arrays.rb +86 -86
- data/lib/composite_primary_keys/composite_predicates.rb +71 -69
- data/lib/composite_primary_keys/composite_relation.rb +29 -29
- data/lib/composite_primary_keys/connection_adapters/abstract/database_statements.rb +37 -37
- 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/connection_adapters/sqlserver/database_statements.rb +44 -44
- data/lib/composite_primary_keys/core.rb +48 -48
- data/lib/composite_primary_keys/counter_cache.rb +15 -15
- data/lib/composite_primary_keys/fixtures.rb +21 -21
- data/lib/composite_primary_keys/nested_attributes.rb +1 -1
- data/lib/composite_primary_keys/persistence.rb +96 -81
- data/lib/composite_primary_keys/reflection.rb +91 -29
- data/lib/composite_primary_keys/relation/batches.rb +15 -7
- data/lib/composite_primary_keys/relation/calculations.rb +110 -81
- data/lib/composite_primary_keys/relation/finder_methods.rb +235 -235
- data/lib/composite_primary_keys/relation/predicate_builder/association_query_value.rb +39 -20
- data/lib/composite_primary_keys/relation/query_methods.rb +42 -42
- data/lib/composite_primary_keys/relation/where_clause.rb +18 -23
- data/lib/composite_primary_keys/relation.rb +197 -193
- data/lib/composite_primary_keys/sanitization.rb +42 -42
- data/lib/composite_primary_keys/table_metadata.rb +11 -0
- 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 +119 -117
- 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.ci.yml +22 -22
- 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/db_definitions/db2-create-tables.sql +112 -112
- data/test/fixtures/db_definitions/db2-drop-tables.sql +16 -16
- data/test/fixtures/db_definitions/mysql.sql +180 -180
- data/test/fixtures/db_definitions/oracle.drop.sql +41 -41
- data/test/fixtures/db_definitions/oracle.sql +199 -199
- data/test/fixtures/db_definitions/postgresql.sql +182 -182
- data/test/fixtures/db_definitions/sqlite.sql +169 -169
- data/test/fixtures/db_definitions/sqlserver.sql +176 -176
- data/test/fixtures/department.rb +16 -16
- data/test/fixtures/departments.yml +19 -15
- data/test/fixtures/dorm.rb +2 -2
- data/test/fixtures/dorms.yml +4 -4
- data/test/fixtures/employee.rb +5 -5
- data/test/fixtures/employees.yml +33 -28
- data/test/fixtures/group.rb +2 -2
- data/test/fixtures/groups.yml +6 -6
- data/test/fixtures/membership.rb +8 -6
- 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/restaurants_suburbs.yml +10 -10
- 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/streets.yml +16 -16
- data/test/fixtures/student.rb +3 -3
- data/test/fixtures/students.yml +15 -15
- data/test/fixtures/suburb.rb +5 -5
- data/test/fixtures/suburbs.yml +14 -14
- 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/user.rb +11 -11
- 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 -358
- data/test/test_attribute_methods.rb +63 -63
- data/test/test_attributes.rb +75 -60
- data/test/test_calculations.rb +49 -42
- 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_create.rb +218 -206
- data/test/test_delete.rb +188 -179
- data/test/test_dumpable.rb +15 -15
- data/test/test_dup.rb +37 -37
- data/test/test_equal.rb +26 -26
- data/test/test_exists.rb +39 -39
- data/test/test_find.rb +170 -164
- data/test/test_habtm.rb +141 -141
- data/test/test_ids.rb +112 -112
- data/test/test_miscellaneous.rb +32 -32
- data/test/test_nested_attributes.rb +67 -67
- 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 +102 -96
- data/test/test_validations.rb +13 -13
- metadata +7 -6
@@ -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/streets.yml
CHANGED
@@ -1,17 +1,17 @@
|
|
1
|
-
first:
|
2
|
-
id: 1
|
3
|
-
city_id: 1
|
4
|
-
suburb_id: 1
|
5
|
-
name: First Street
|
6
|
-
|
7
|
-
second1:
|
8
|
-
id: 2
|
9
|
-
city_id: 2
|
10
|
-
suburb_id: 2
|
11
|
-
name: First Street
|
12
|
-
|
13
|
-
second2:
|
14
|
-
id: 3
|
15
|
-
city_id: 2
|
16
|
-
suburb_id: 2
|
1
|
+
first:
|
2
|
+
id: 1
|
3
|
+
city_id: 1
|
4
|
+
suburb_id: 1
|
5
|
+
name: First Street
|
6
|
+
|
7
|
+
second1:
|
8
|
+
id: 2
|
9
|
+
city_id: 2
|
10
|
+
suburb_id: 2
|
11
|
+
name: First Street
|
12
|
+
|
13
|
+
second2:
|
14
|
+
id: 3
|
15
|
+
city_id: 2
|
16
|
+
suburb_id: 2
|
17
17
|
name: Second Street
|
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/suburbs.yml
CHANGED
@@ -1,14 +1,14 @@
|
|
1
|
-
first:
|
2
|
-
city_id: 1
|
3
|
-
suburb_id: 1
|
4
|
-
name: First Suburb
|
5
|
-
|
6
|
-
second:
|
7
|
-
city_id: 2
|
8
|
-
suburb_id: 2
|
9
|
-
name: Second Suburb
|
10
|
-
|
11
|
-
no_mcdonalds:
|
12
|
-
city_id: 1
|
13
|
-
suburb_id: 3
|
14
|
-
name: Third Suburb
|
1
|
+
first:
|
2
|
+
city_id: 1
|
3
|
+
suburb_id: 1
|
4
|
+
name: First Suburb
|
5
|
+
|
6
|
+
second:
|
7
|
+
city_id: 2
|
8
|
+
suburb_id: 2
|
9
|
+
name: Second Suburb
|
10
|
+
|
11
|
+
no_mcdonalds:
|
12
|
+
city_id: 1
|
13
|
+
suburb_id: 3
|
14
|
+
name: Third Suburb
|
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
|
data/test/fixtures/user.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
class User < ActiveRecord::Base
|
2
|
-
has_many :readings
|
3
|
-
has_many :articles, :through => :readings
|
4
|
-
|
5
|
-
has_many :comments, :as => :person
|
6
|
-
has_one :first_comment, :as => :person, :class_name => "Comment"
|
7
|
-
|
8
|
-
def find_custom_articles
|
9
|
-
articles.where("name = ?", "Article One")
|
10
|
-
end
|
11
|
-
end
|
1
|
+
class User < ActiveRecord::Base
|
2
|
+
has_many :readings
|
3
|
+
has_many :articles, :through => :readings
|
4
|
+
|
5
|
+
has_many :comments, :as => :person
|
6
|
+
has_one :first_comment, :as => :person, :class_name => "Comment"
|
7
|
+
|
8
|
+
def find_custom_articles
|
9
|
+
articles.where("name = ?", "Article One")
|
10
|
+
end
|
11
|
+
end
|
data/test/fixtures/users.yml
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
santiago:
|
2
|
-
id: 1
|
3
|
-
name: Santiago
|
4
|
-
|
5
|
-
drnic:
|
6
|
-
id: 2
|
7
|
-
name: Dr Nic
|
8
|
-
|
9
|
-
cfis:
|
10
|
-
id: 3
|
1
|
+
santiago:
|
2
|
+
id: 1
|
3
|
+
name: Santiago
|
4
|
+
|
5
|
+
drnic:
|
6
|
+
id: 2
|
7
|
+
name: Dr Nic
|
8
|
+
|
9
|
+
cfis:
|
10
|
+
id: 3
|
11
11
|
name: cfis
|