composite_primary_keys 13.0.7 → 14.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/History.rdoc +894 -910
  3. data/README.rdoc +182 -181
  4. data/lib/composite_primary_keys/associations/collection_association.rb +31 -31
  5. data/lib/composite_primary_keys/associations/{join_association.rb → join_dependency.rb} +137 -137
  6. data/lib/composite_primary_keys/associations/preloader/association.rb +68 -61
  7. data/lib/composite_primary_keys/associations/through_association.rb +25 -24
  8. data/lib/composite_primary_keys/autosave_association.rb +60 -60
  9. data/lib/composite_primary_keys/base.rb +141 -137
  10. data/lib/composite_primary_keys/composite_arrays.rb +86 -86
  11. data/lib/composite_primary_keys/composite_predicates.rb +71 -120
  12. data/lib/composite_primary_keys/persistence.rb +96 -83
  13. data/lib/composite_primary_keys/relation/calculations.rb +110 -104
  14. data/lib/composite_primary_keys/relation.rb +2 -2
  15. data/lib/composite_primary_keys/validations/uniqueness.rb +31 -31
  16. data/lib/composite_primary_keys/version.rb +8 -8
  17. data/lib/composite_primary_keys.rb +118 -118
  18. data/test/abstract_unit.rb +118 -114
  19. data/test/fixtures/department.rb +16 -16
  20. data/test/fixtures/membership.rb +8 -8
  21. data/test/fixtures/room_assignment.rb +13 -13
  22. data/test/test_associations.rb +372 -372
  23. data/test/test_composite_arrays.rb +38 -38
  24. data/test/test_create.rb +218 -219
  25. data/test/test_predicates.rb +60 -130
  26. metadata +7 -7
data/test/test_predicates.rb CHANGED
@@ -1,130 +1,60 @@
1
- require File.expand_path('../abstract_unit', __FILE__)
2
-
3
- class TestPredicates < ActiveSupport::TestCase
4
- fixtures :departments
5
-
6
- include CompositePrimaryKeys::Predicates
7
-
8
- def test_or
9
- dep = Department.arel_table
10
-
11
- predicates = Array.new
12
-
13
- 3.times do |i|
14
- predicates << dep[:id].eq(i)
15
- end
16
-
17
- connection = ActiveRecord::Base.connection
18
- quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
19
- expected = "(#{quoted} = 0 OR #{quoted} = 1 OR #{quoted} = 2)"
20
-
21
- pred = cpk_or_predicate(predicates)
22
- assert_equal(with_quoted_identifiers(expected), pred.to_sql)
23
- end
24
-
25
- def test_or_with_many_values
26
- dep = Arel::Table.new(:departments)
27
-
28
- predicates = Array.new
29
-
30
- number_of_predicates = 3000 # This should really be big
31
- number_of_predicates.times do |i|
32
- predicates << dep[:id].eq(i)
33
- end
34
-
35
- connection = ActiveRecord::Base.connection
36
- quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
37
- expected_ungrouped = ((0...number_of_predicates).map { |i| "#{quoted} = #{i}" }).join(' OR ')
38
- expected = "(#{expected_ungrouped})"
39
-
40
- pred = cpk_or_predicate(predicates)
41
- assert_equal(with_quoted_identifiers(expected), pred.to_sql)
42
- end
43
-
44
- def test_and
45
- dep = Department.arel_table
46
-
47
- predicates = Array.new
48
-
49
- 3.times do |i|
50
- predicates << dep[:id].eq(i)
51
- end
52
-
53
- connection = ActiveRecord::Base.connection
54
- quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
55
- expected = "#{quoted} = 0 AND #{quoted} = 1 AND #{quoted} = 2"
56
-
57
- pred = cpk_and_predicate(predicates)
58
- assert_equal(with_quoted_identifiers(expected), pred.to_sql)
59
- end
60
-
61
- def test_in
62
- dep = Department.arel_table
63
-
64
- primary_keys = [[1, 1], [1, 2]]
65
-
66
- connection = ActiveRecord::Base.connection
67
- quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
68
- quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
69
- expected = "#{quoted_id_column} = 1 AND #{quoted_location_id_column} IN (1, 2)"
70
-
71
- pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
72
- assert_equal(with_quoted_identifiers(expected), pred.to_sql)
73
- end
74
-
75
- def test_in_with_low_cardinality_second_key_part
76
- dep = Department.arel_table
77
-
78
- primary_keys = [[1, 1], [2, 1]]
79
-
80
- connection = ActiveRecord::Base.connection
81
- quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
82
- quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
83
- expected = "#{quoted_location_id_column} = 1 AND #{quoted_id_column} IN (1, 2)"
84
-
85
- pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
86
- assert_equal(with_quoted_identifiers(expected), pred.to_sql)
87
- end
88
-
89
- def test_in_with_nil_primary_key_part
90
- dep = Department.arel_table
91
-
92
- primary_keys = [[nil, 1], [nil, 2]]
93
-
94
- connection = ActiveRecord::Base.connection
95
- quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
96
- quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
97
- expected = "#{quoted_id_column} IS NULL AND #{quoted_location_id_column} IN (1, 2)"
98
-
99
- pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
100
- assert_equal(with_quoted_identifiers(expected), pred.to_sql)
101
- end
102
-
103
- def test_in_with_nil_secondary_key_part
104
- dep = Department.arel_table
105
-
106
- primary_keys = [[1, 1], [1, nil]]
107
-
108
- connection = ActiveRecord::Base.connection
109
- quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
110
- quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
111
- expected = "#{quoted_id_column} = 1 AND (#{quoted_location_id_column} IN (1) OR #{quoted_location_id_column} IS NULL)"
112
-
113
- pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
114
- assert_equal(with_quoted_identifiers(expected), pred.to_sql)
115
- end
116
-
117
- def test_in_with_multiple_primary_key_parts
118
- dep = Department.arel_table
119
-
120
- primary_keys = [[1, 1], [1, 2], [2, 3], [2, 4]]
121
-
122
- connection = ActiveRecord::Base.connection
123
- quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
124
- quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
125
- expected = "(#{quoted_id_column} = 1 AND #{quoted_location_id_column} IN (1, 2) OR #{quoted_id_column} = 2 AND #{quoted_location_id_column} IN (3, 4))"
126
-
127
- pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
128
- assert_equal(with_quoted_identifiers(expected), pred.to_sql)
129
- end
130
- end
1
+ require File.expand_path('../abstract_unit', __FILE__)
2
+
3
+ class TestPredicates < ActiveSupport::TestCase
4
+ fixtures :departments
5
+
6
+ include CompositePrimaryKeys::Predicates
7
+
8
+ def test_or
9
+ dep = Department.arel_table
10
+
11
+ predicates = Array.new
12
+
13
+ 3.times do |i|
14
+ predicates << dep[:id].eq(i)
15
+ end
16
+
17
+ connection = ActiveRecord::Base.connection
18
+ quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
19
+ expected = "(#{quoted} = 0 OR #{quoted} = 1 OR #{quoted} = 2)"
20
+
21
+ pred = cpk_or_predicate(predicates)
22
+ assert_equal(with_quoted_identifiers(expected), pred.to_sql)
23
+ end
24
+
25
+ def test_or_with_many_values
26
+ dep = Arel::Table.new(:departments)
27
+
28
+ predicates = Array.new
29
+
30
+ number_of_predicates = 3000 # This should really be big
31
+ number_of_predicates.times do |i|
32
+ predicates << dep[:id].eq(i)
33
+ end
34
+
35
+ connection = ActiveRecord::Base.connection
36
+ quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
37
+ expected_ungrouped = ((0...number_of_predicates).map { |i| "#{quoted} = #{i}" }).join(' OR ')
38
+ expected = "(#{expected_ungrouped})"
39
+
40
+ pred = cpk_or_predicate(predicates)
41
+ assert_equal(with_quoted_identifiers(expected), pred.to_sql)
42
+ end
43
+
44
+ def test_and
45
+ dep = Department.arel_table
46
+
47
+ predicates = Array.new
48
+
49
+ 3.times do |i|
50
+ predicates << dep[:id].eq(i)
51
+ end
52
+
53
+ connection = ActiveRecord::Base.connection
54
+ quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
55
+ expected = "#{quoted} = 0 AND #{quoted} = 1 AND #{quoted} = 2"
56
+
57
+ pred = cpk_and_predicate(predicates)
58
+ assert_equal(with_quoted_identifiers(expected), pred.to_sql)
59
+ end
60
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: composite_primary_keys
3
3
  version: !ruby/object:Gem::Version
4
- version: 13.0.7
4
+ version: 14.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Charlie Savage
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-02-04 00:00:00.000000000 Z
11
+ date: 2022-01-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 6.1.0
19
+ version: 7.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 6.1.0
26
+ version: 7.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ files:
57
57
  - lib/composite_primary_keys/associations/foreign_association.rb
58
58
  - lib/composite_primary_keys/associations/has_many_association.rb
59
59
  - lib/composite_primary_keys/associations/has_many_through_association.rb
60
- - lib/composite_primary_keys/associations/join_association.rb
60
+ - lib/composite_primary_keys/associations/join_dependency.rb
61
61
  - lib/composite_primary_keys/associations/preloader/association.rb
62
62
  - lib/composite_primary_keys/associations/through_association.rb
63
63
  - lib/composite_primary_keys/attribute_methods.rb
@@ -209,14 +209,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
209
209
  requirements:
210
210
  - - ">="
211
211
  - !ruby/object:Gem::Version
212
- version: 2.5.0
212
+ version: 2.7.0
213
213
  required_rubygems_version: !ruby/object:Gem::Requirement
214
214
  requirements:
215
215
  - - ">="
216
216
  - !ruby/object:Gem::Version
217
217
  version: '0'
218
218
  requirements: []
219
- rubygems_version: 3.4.6
219
+ rubygems_version: 3.3.4
220
220
  signing_key:
221
221
  specification_version: 4
222
222
  summary: Composite key support for ActiveRecord