composite_primary_keys 8.1.6 → 9.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/History.rdoc +59 -7
- data/README.rdoc +62 -1
- data/Rakefile +4 -1
- data/lib/composite_primary_keys/arel/in.rb +6 -0
- data/lib/composite_primary_keys/arel/sqlserver.rb +36 -0
- data/lib/composite_primary_keys/arel/to_sql.rb +26 -0
- data/lib/composite_primary_keys/associations/association.rb +14 -12
- data/lib/composite_primary_keys/associations/association_scope.rb +22 -27
- data/lib/composite_primary_keys/associations/collection_association.rb +39 -8
- data/lib/composite_primary_keys/associations/has_many_association.rb +17 -40
- data/lib/composite_primary_keys/associations/has_many_through_association.rb +58 -58
- data/lib/composite_primary_keys/associations/join_dependency/join_association.rb +13 -11
- data/lib/composite_primary_keys/associations/join_dependency.rb +73 -56
- data/lib/composite_primary_keys/associations/preloader/association.rb +75 -73
- data/lib/composite_primary_keys/attribute_methods/primary_key.rb +13 -11
- data/lib/composite_primary_keys/attribute_methods/read.rb +18 -15
- data/lib/composite_primary_keys/attribute_methods/write.rb +21 -19
- data/lib/composite_primary_keys/attribute_methods.rb +6 -4
- data/lib/composite_primary_keys/autosave_association.rb +19 -54
- data/lib/composite_primary_keys/base.rb +18 -82
- data/lib/composite_primary_keys/composite_arrays.rb +9 -1
- data/lib/composite_primary_keys/composite_predicates.rb +1 -0
- data/lib/composite_primary_keys/connection_adapters/abstract_adapter.rb +10 -10
- data/lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb +5 -6
- data/lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb +23 -0
- data/lib/composite_primary_keys/core.rb +46 -45
- data/lib/composite_primary_keys/fixtures.rb +19 -17
- data/lib/composite_primary_keys/locking/optimistic.rb +53 -49
- data/lib/composite_primary_keys/nested_attributes.rb +60 -53
- data/lib/composite_primary_keys/persistence.rb +49 -41
- data/lib/composite_primary_keys/relation/batches.rb +35 -32
- data/lib/composite_primary_keys/relation/calculations.rb +3 -7
- data/lib/composite_primary_keys/relation/finder_methods.rb +122 -55
- data/lib/composite_primary_keys/relation/predicate_builder.rb +18 -29
- data/lib/composite_primary_keys/relation/query_methods.rb +25 -36
- data/lib/composite_primary_keys/relation/where_clause.rb +33 -0
- data/lib/composite_primary_keys/relation.rb +96 -43
- data/lib/composite_primary_keys/sanitization.rb +6 -15
- data/lib/composite_primary_keys/version.rb +3 -3
- data/lib/composite_primary_keys.rb +10 -19
- data/scripts/console.rb +48 -48
- data/scripts/txt2html +76 -76
- data/scripts/txt2js +65 -65
- data/tasks/databases/mysql.rake +17 -19
- data/tasks/databases/oracle.rake +29 -15
- data/tasks/databases/postgresql.rake +20 -29
- data/tasks/databases/sqlite.rake +25 -0
- data/tasks/databases/sqlserver.rake +32 -16
- data/tasks/website.rake +18 -18
- data/test/README_tests.rdoc +56 -56
- data/test/abstract_unit.rb +24 -18
- data/test/connections/connection_spec.rb +11 -2
- data/test/connections/databases.ci.yml +5 -4
- data/test/connections/databases.example.yml +19 -4
- data/test/connections/databases.yml +40 -30
- data/test/db_test.rb +52 -52
- data/test/fixtures/article.rb +1 -0
- data/test/fixtures/articles.yml +6 -6
- data/test/fixtures/capitol.rb +3 -3
- data/test/fixtures/capitols.yml +16 -16
- data/test/fixtures/comments.yml +15 -15
- data/test/fixtures/db_definitions/mysql.sql +16 -17
- data/test/fixtures/db_definitions/oracle.drop.sql +2 -0
- data/test/fixtures/db_definitions/oracle.sql +26 -17
- data/test/fixtures/db_definitions/postgresql.sql +2 -3
- data/test/fixtures/db_definitions/sqlite.sql +0 -1
- data/test/fixtures/db_definitions/sqlserver.sql +20 -35
- data/test/fixtures/department.rb +5 -5
- data/test/fixtures/departments.yml +15 -15
- data/test/fixtures/dorms.yml +4 -4
- data/test/fixtures/employee.rb +5 -7
- data/test/fixtures/employees.yml +1 -5
- data/test/fixtures/group.rb +2 -2
- data/test/fixtures/groups.yml +6 -6
- data/test/fixtures/hack.rb +4 -4
- data/test/fixtures/hacks.yml +2 -2
- data/test/fixtures/membership_status.rb +2 -2
- data/test/fixtures/product.rb +9 -9
- data/test/fixtures/product_tariff.rb +5 -5
- 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_using_composite_key_alias.rb +8 -8
- data/test/fixtures/reference_code_using_simple_key_alias.rb +8 -8
- data/test/fixtures/reference_codes.yml +28 -28
- data/test/fixtures/reference_type.rb +1 -1
- 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_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/seat.rb +5 -5
- data/test/fixtures/seats.yml +8 -8
- 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/suburbs.yml +14 -14
- data/test/fixtures/tariff.rb +1 -1
- data/test/fixtures/tariffs.yml +14 -14
- data/test/fixtures/user.rb +0 -1
- data/test/plugins/pagination.rb +405 -405
- data/test/plugins/pagination_helper.rb +135 -135
- data/test/setup.rb +50 -50
- data/test/test_aliases.rb +18 -18
- data/test/test_associations.rb +18 -17
- data/test/test_composite_arrays.rb +24 -24
- data/test/test_counter_cache.rb +30 -30
- data/test/test_create.rb +14 -6
- data/test/test_delete.rb +36 -34
- data/test/test_dup.rb +37 -37
- data/test/test_exists.rb +39 -39
- data/test/test_find.rb +16 -4
- data/test/test_habtm.rb +27 -3
- data/test/test_miscellaneous.rb +32 -32
- data/test/test_nested_attributes.rb +6 -6
- data/test/test_pagination.rb +35 -35
- data/test/test_polymorphic.rb +0 -7
- data/test/test_predicates.rb +20 -20
- data/test/test_preload.rb +94 -0
- data/test/test_suite.rb +1 -1
- data/test/test_update.rb +10 -7
- data/test/test_validations.rb +13 -13
- metadata +30 -39
- data/README_DB2.rdoc +0 -33
- data/lib/composite_primary_keys/arel/visitors/to_sql.rb +0 -36
- data/lib/composite_primary_keys/associations/singular_association.rb +0 -18
- data/lib/composite_primary_keys/attribute_methods/dirty.rb +0 -29
- data/lib/composite_primary_keys/attribute_set/builder.rb +0 -20
- data/lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb +0 -70
- data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb +0 -19
- data/lib/composite_primary_keys/dirty.rb +0 -19
- data/lib/composite_primary_keys/validations/uniqueness.rb +0 -41
- data/tasks/databases/oracle_enhanced.rake +0 -27
- data/tasks/databases/sqlite3.rake +0 -27
- data/test/connections/native_ibm_db/connection.rb +0 -19
- data/test/connections/native_mysql/connection.rb +0 -17
- data/test/connections/native_oracle/connection.rb +0 -11
- data/test/connections/native_oracle_enhanced/connection.rb +0 -16
- data/test/connections/native_postgresql/connection.rb +0 -13
- data/test/connections/native_sqlite3/connection.rb +0 -9
- data/test/connections/native_sqlserver/connection.rb +0 -11
- data/test/fixtures/db_definitions/sqlserver.drop.sql +0 -92
- data/test/test_delete_all.rb +0 -35
- data/test/test_find_in_batches.rb +0 -30
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/seat.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
class Seat < ActiveRecord::Base
|
2
|
-
self.primary_keys = [:flight_number, :seat]
|
3
|
-
|
4
|
-
validates_uniqueness_of :customer
|
5
|
-
end
|
1
|
+
class Seat < ActiveRecord::Base
|
2
|
+
self.primary_keys = [:flight_number, :seat]
|
3
|
+
|
4
|
+
validates_uniqueness_of :customer
|
5
|
+
end
|
data/test/fixtures/seats.yml
CHANGED
@@ -1,9 +1,9 @@
|
|
1
|
-
seat1:
|
2
|
-
flight_number: 1
|
3
|
-
seat: 1
|
4
|
-
customer: 1
|
5
|
-
|
6
|
-
seat2:
|
7
|
-
flight_number: 1
|
8
|
-
seat: 2
|
1
|
+
seat1:
|
2
|
+
flight_number: 1
|
3
|
+
seat: 1
|
4
|
+
customer: 1
|
5
|
+
|
6
|
+
seat2:
|
7
|
+
flight_number: 1
|
8
|
+
seat: 2
|
9
9
|
customer: 2
|
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: 1
|
11
|
-
name: First Street
|
12
|
-
|
13
|
-
second2:
|
14
|
-
id: 3
|
15
|
-
city_id: 2
|
16
|
-
suburb_id: 1
|
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: 1
|
11
|
+
name: First Street
|
12
|
+
|
13
|
+
second2:
|
14
|
+
id: 3
|
15
|
+
city_id: 2
|
16
|
+
suburb_id: 1
|
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/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: 1
|
9
|
-
name: Second Suburb
|
10
|
-
|
11
|
-
no_mcdonalds:
|
12
|
-
city_id: 1
|
13
|
-
suburb_id: 2
|
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: 1
|
9
|
+
name: Second Suburb
|
10
|
+
|
11
|
+
no_mcdonalds:
|
12
|
+
city_id: 1
|
13
|
+
suburb_id: 2
|
14
|
+
name: Third Suburb
|
data/test/fixtures/tariff.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
class Tariff < ActiveRecord::Base
|
2
2
|
self.primary_keys = [:tariff_id, :start_date]
|
3
|
-
has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
|
3
|
+
has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date], :dependent => :delete_all
|
4
4
|
has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
|
5
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: 1
|
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: 1
|
13
|
+
start_date: <%= Date.today.next.to_s(:db) %>
|
14
|
+
amount: 100
|
15
15
|
|
data/test/fixtures/user.rb
CHANGED
@@ -3,7 +3,6 @@ class User < ActiveRecord::Base
|
|
3
3
|
has_many :articles, :through => :readings
|
4
4
|
has_many :comments, :as => :person
|
5
5
|
has_many :hacks, :through => :comments, :source => :hack
|
6
|
-
has_many :persons, :through => :comments, :source_type => 'User'
|
7
6
|
|
8
7
|
def find_custom_articles
|
9
8
|
articles.where("name = ?", "Article One")
|