activerecord 6.1.7.2 → 7.0.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (243) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1295 -1007
  3. data/README.rdoc +1 -1
  4. data/lib/active_record/aggregations.rb +1 -1
  5. data/lib/active_record/association_relation.rb +0 -10
  6. data/lib/active_record/associations/association.rb +33 -17
  7. data/lib/active_record/associations/association_scope.rb +1 -3
  8. data/lib/active_record/associations/belongs_to_association.rb +15 -4
  9. data/lib/active_record/associations/belongs_to_polymorphic_association.rb +10 -2
  10. data/lib/active_record/associations/builder/association.rb +8 -2
  11. data/lib/active_record/associations/builder/belongs_to.rb +19 -6
  12. data/lib/active_record/associations/builder/collection_association.rb +10 -3
  13. data/lib/active_record/associations/builder/has_many.rb +3 -2
  14. data/lib/active_record/associations/builder/has_one.rb +2 -1
  15. data/lib/active_record/associations/builder/singular_association.rb +2 -2
  16. data/lib/active_record/associations/collection_association.rb +19 -21
  17. data/lib/active_record/associations/collection_proxy.rb +10 -5
  18. data/lib/active_record/associations/disable_joins_association_scope.rb +59 -0
  19. data/lib/active_record/associations/has_many_association.rb +8 -5
  20. data/lib/active_record/associations/has_many_through_association.rb +2 -1
  21. data/lib/active_record/associations/has_one_association.rb +10 -7
  22. data/lib/active_record/associations/has_one_through_association.rb +1 -1
  23. data/lib/active_record/associations/join_dependency.rb +23 -15
  24. data/lib/active_record/associations/preloader/association.rb +186 -52
  25. data/lib/active_record/associations/preloader/batch.rb +48 -0
  26. data/lib/active_record/associations/preloader/branch.rb +147 -0
  27. data/lib/active_record/associations/preloader/through_association.rb +49 -13
  28. data/lib/active_record/associations/preloader.rb +39 -113
  29. data/lib/active_record/associations/singular_association.rb +8 -2
  30. data/lib/active_record/associations/through_association.rb +3 -3
  31. data/lib/active_record/associations.rb +124 -95
  32. data/lib/active_record/asynchronous_queries_tracker.rb +60 -0
  33. data/lib/active_record/attribute_assignment.rb +1 -1
  34. data/lib/active_record/attribute_methods/before_type_cast.rb +7 -2
  35. data/lib/active_record/attribute_methods/dirty.rb +49 -16
  36. data/lib/active_record/attribute_methods/primary_key.rb +2 -2
  37. data/lib/active_record/attribute_methods/query.rb +2 -2
  38. data/lib/active_record/attribute_methods/read.rb +7 -5
  39. data/lib/active_record/attribute_methods/serialization.rb +57 -19
  40. data/lib/active_record/attribute_methods/time_zone_conversion.rb +8 -3
  41. data/lib/active_record/attribute_methods/write.rb +7 -10
  42. data/lib/active_record/attribute_methods.rb +14 -15
  43. data/lib/active_record/attributes.rb +24 -35
  44. data/lib/active_record/autosave_association.rb +8 -23
  45. data/lib/active_record/base.rb +19 -1
  46. data/lib/active_record/callbacks.rb +2 -2
  47. data/lib/active_record/coders/yaml_column.rb +4 -8
  48. data/lib/active_record/connection_adapters/abstract/connection_handler.rb +292 -0
  49. data/lib/active_record/connection_adapters/abstract/connection_pool/queue.rb +209 -0
  50. data/lib/active_record/connection_adapters/abstract/connection_pool/reaper.rb +76 -0
  51. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +47 -561
  52. data/lib/active_record/connection_adapters/abstract/database_limits.rb +0 -17
  53. data/lib/active_record/connection_adapters/abstract/database_statements.rb +46 -22
  54. data/lib/active_record/connection_adapters/abstract/query_cache.rb +24 -12
  55. data/lib/active_record/connection_adapters/abstract/quoting.rb +42 -72
  56. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +4 -17
  57. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +38 -13
  58. data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +14 -1
  59. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +80 -24
  60. data/lib/active_record/connection_adapters/abstract/transaction.rb +15 -22
  61. data/lib/active_record/connection_adapters/abstract_adapter.rb +149 -74
  62. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +105 -81
  63. data/lib/active_record/connection_adapters/column.rb +4 -0
  64. data/lib/active_record/connection_adapters/mysql/database_statements.rb +36 -24
  65. data/lib/active_record/connection_adapters/mysql/quoting.rb +37 -21
  66. data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +7 -1
  67. data/lib/active_record/connection_adapters/mysql/schema_statements.rb +20 -1
  68. data/lib/active_record/connection_adapters/mysql2_adapter.rb +12 -6
  69. data/lib/active_record/connection_adapters/pool_config.rb +7 -7
  70. data/lib/active_record/connection_adapters/postgresql/column.rb +17 -1
  71. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +19 -12
  72. data/lib/active_record/connection_adapters/postgresql/oid/date.rb +8 -0
  73. data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +5 -0
  74. data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +53 -14
  75. data/lib/active_record/connection_adapters/postgresql/oid/range.rb +1 -1
  76. data/lib/active_record/connection_adapters/postgresql/oid/timestamp.rb +15 -0
  77. data/lib/active_record/connection_adapters/postgresql/oid/timestamp_with_time_zone.rb +30 -0
  78. data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +18 -6
  79. data/lib/active_record/connection_adapters/postgresql/oid.rb +2 -0
  80. data/lib/active_record/connection_adapters/postgresql/quoting.rb +71 -71
  81. data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +34 -0
  82. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +21 -1
  83. data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +22 -1
  84. data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +25 -0
  85. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +37 -19
  86. data/lib/active_record/connection_adapters/postgresql_adapter.rb +206 -105
  87. data/lib/active_record/connection_adapters/schema_cache.rb +39 -38
  88. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +25 -19
  89. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +28 -16
  90. data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +17 -15
  91. data/lib/active_record/connection_adapters/sqlite3_adapter.rb +96 -32
  92. data/lib/active_record/connection_adapters.rb +6 -5
  93. data/lib/active_record/connection_handling.rb +49 -55
  94. data/lib/active_record/core.rb +123 -148
  95. data/lib/active_record/database_configurations/connection_url_resolver.rb +2 -1
  96. data/lib/active_record/database_configurations/database_config.rb +12 -9
  97. data/lib/active_record/database_configurations/hash_config.rb +63 -5
  98. data/lib/active_record/database_configurations/url_config.rb +2 -2
  99. data/lib/active_record/database_configurations.rb +15 -32
  100. data/lib/active_record/delegated_type.rb +53 -12
  101. data/lib/active_record/destroy_association_async_job.rb +1 -1
  102. data/lib/active_record/disable_joins_association_relation.rb +39 -0
  103. data/lib/active_record/dynamic_matchers.rb +1 -1
  104. data/lib/active_record/encryption/cipher/aes256_gcm.rb +98 -0
  105. data/lib/active_record/encryption/cipher.rb +53 -0
  106. data/lib/active_record/encryption/config.rb +44 -0
  107. data/lib/active_record/encryption/configurable.rb +67 -0
  108. data/lib/active_record/encryption/context.rb +35 -0
  109. data/lib/active_record/encryption/contexts.rb +72 -0
  110. data/lib/active_record/encryption/derived_secret_key_provider.rb +12 -0
  111. data/lib/active_record/encryption/deterministic_key_provider.rb +14 -0
  112. data/lib/active_record/encryption/encryptable_record.rb +206 -0
  113. data/lib/active_record/encryption/encrypted_attribute_type.rb +140 -0
  114. data/lib/active_record/encryption/encrypted_fixtures.rb +38 -0
  115. data/lib/active_record/encryption/encrypting_only_encryptor.rb +12 -0
  116. data/lib/active_record/encryption/encryptor.rb +155 -0
  117. data/lib/active_record/encryption/envelope_encryption_key_provider.rb +55 -0
  118. data/lib/active_record/encryption/errors.rb +15 -0
  119. data/lib/active_record/encryption/extended_deterministic_queries.rb +160 -0
  120. data/lib/active_record/encryption/extended_deterministic_uniqueness_validator.rb +28 -0
  121. data/lib/active_record/encryption/key.rb +28 -0
  122. data/lib/active_record/encryption/key_generator.rb +42 -0
  123. data/lib/active_record/encryption/key_provider.rb +46 -0
  124. data/lib/active_record/encryption/message.rb +33 -0
  125. data/lib/active_record/encryption/message_serializer.rb +90 -0
  126. data/lib/active_record/encryption/null_encryptor.rb +21 -0
  127. data/lib/active_record/encryption/properties.rb +76 -0
  128. data/lib/active_record/encryption/read_only_null_encryptor.rb +24 -0
  129. data/lib/active_record/encryption/scheme.rb +99 -0
  130. data/lib/active_record/encryption.rb +55 -0
  131. data/lib/active_record/enum.rb +50 -43
  132. data/lib/active_record/errors.rb +67 -4
  133. data/lib/active_record/explain_registry.rb +11 -6
  134. data/lib/active_record/fixture_set/file.rb +15 -1
  135. data/lib/active_record/fixture_set/table_row.rb +41 -6
  136. data/lib/active_record/fixture_set/table_rows.rb +4 -4
  137. data/lib/active_record/fixtures.rb +20 -23
  138. data/lib/active_record/future_result.rb +139 -0
  139. data/lib/active_record/gem_version.rb +4 -4
  140. data/lib/active_record/inheritance.rb +55 -17
  141. data/lib/active_record/insert_all.rb +80 -14
  142. data/lib/active_record/integration.rb +4 -3
  143. data/lib/active_record/internal_metadata.rb +1 -5
  144. data/lib/active_record/legacy_yaml_adapter.rb +2 -39
  145. data/lib/active_record/locking/optimistic.rb +10 -9
  146. data/lib/active_record/locking/pessimistic.rb +10 -4
  147. data/lib/active_record/log_subscriber.rb +23 -7
  148. data/lib/active_record/middleware/database_selector/resolver.rb +6 -10
  149. data/lib/active_record/middleware/database_selector.rb +18 -6
  150. data/lib/active_record/middleware/shard_selector.rb +60 -0
  151. data/lib/active_record/migration/command_recorder.rb +7 -7
  152. data/lib/active_record/migration/compatibility.rb +84 -2
  153. data/lib/active_record/migration/join_table.rb +1 -1
  154. data/lib/active_record/migration.rb +114 -83
  155. data/lib/active_record/model_schema.rb +58 -59
  156. data/lib/active_record/nested_attributes.rb +13 -12
  157. data/lib/active_record/no_touching.rb +3 -3
  158. data/lib/active_record/null_relation.rb +2 -6
  159. data/lib/active_record/persistence.rb +228 -60
  160. data/lib/active_record/query_cache.rb +2 -2
  161. data/lib/active_record/query_logs.rb +149 -0
  162. data/lib/active_record/querying.rb +16 -6
  163. data/lib/active_record/railtie.rb +136 -22
  164. data/lib/active_record/railties/controller_runtime.rb +1 -1
  165. data/lib/active_record/railties/databases.rake +78 -136
  166. data/lib/active_record/readonly_attributes.rb +11 -0
  167. data/lib/active_record/reflection.rb +73 -50
  168. data/lib/active_record/relation/batches/batch_enumerator.rb +19 -5
  169. data/lib/active_record/relation/batches.rb +6 -6
  170. data/lib/active_record/relation/calculations.rb +43 -38
  171. data/lib/active_record/relation/delegation.rb +7 -7
  172. data/lib/active_record/relation/finder_methods.rb +31 -35
  173. data/lib/active_record/relation/merger.rb +20 -13
  174. data/lib/active_record/relation/predicate_builder.rb +1 -6
  175. data/lib/active_record/relation/query_attribute.rb +5 -11
  176. data/lib/active_record/relation/query_methods.rb +276 -67
  177. data/lib/active_record/relation/record_fetch_warning.rb +7 -9
  178. data/lib/active_record/relation/spawn_methods.rb +2 -2
  179. data/lib/active_record/relation/where_clause.rb +10 -19
  180. data/lib/active_record/relation.rb +189 -88
  181. data/lib/active_record/result.rb +17 -7
  182. data/lib/active_record/runtime_registry.rb +9 -13
  183. data/lib/active_record/sanitization.rb +17 -12
  184. data/lib/active_record/schema.rb +38 -23
  185. data/lib/active_record/schema_dumper.rb +25 -19
  186. data/lib/active_record/schema_migration.rb +4 -4
  187. data/lib/active_record/scoping/default.rb +60 -13
  188. data/lib/active_record/scoping/named.rb +3 -11
  189. data/lib/active_record/scoping.rb +64 -34
  190. data/lib/active_record/serialization.rb +6 -1
  191. data/lib/active_record/signed_id.rb +3 -3
  192. data/lib/active_record/store.rb +1 -1
  193. data/lib/active_record/suppressor.rb +11 -15
  194. data/lib/active_record/tasks/database_tasks.rb +127 -60
  195. data/lib/active_record/tasks/mysql_database_tasks.rb +1 -1
  196. data/lib/active_record/tasks/postgresql_database_tasks.rb +19 -13
  197. data/lib/active_record/test_databases.rb +1 -1
  198. data/lib/active_record/test_fixtures.rb +9 -6
  199. data/lib/active_record/timestamp.rb +3 -4
  200. data/lib/active_record/transactions.rb +9 -14
  201. data/lib/active_record/translation.rb +3 -3
  202. data/lib/active_record/type/adapter_specific_registry.rb +32 -7
  203. data/lib/active_record/type/hash_lookup_type_map.rb +34 -1
  204. data/lib/active_record/type/internal/timezone.rb +2 -2
  205. data/lib/active_record/type/serialized.rb +1 -1
  206. data/lib/active_record/type/type_map.rb +17 -20
  207. data/lib/active_record/type.rb +1 -2
  208. data/lib/active_record/validations/associated.rb +4 -4
  209. data/lib/active_record/validations/presence.rb +2 -2
  210. data/lib/active_record/validations/uniqueness.rb +4 -4
  211. data/lib/active_record/version.rb +1 -1
  212. data/lib/active_record.rb +225 -27
  213. data/lib/arel/attributes/attribute.rb +0 -8
  214. data/lib/arel/crud.rb +28 -22
  215. data/lib/arel/delete_manager.rb +18 -4
  216. data/lib/arel/filter_predications.rb +9 -0
  217. data/lib/arel/insert_manager.rb +2 -3
  218. data/lib/arel/nodes/casted.rb +1 -1
  219. data/lib/arel/nodes/delete_statement.rb +12 -13
  220. data/lib/arel/nodes/filter.rb +10 -0
  221. data/lib/arel/nodes/function.rb +1 -0
  222. data/lib/arel/nodes/insert_statement.rb +2 -2
  223. data/lib/arel/nodes/select_core.rb +2 -2
  224. data/lib/arel/nodes/select_statement.rb +2 -2
  225. data/lib/arel/nodes/update_statement.rb +8 -3
  226. data/lib/arel/nodes.rb +1 -0
  227. data/lib/arel/predications.rb +11 -3
  228. data/lib/arel/select_manager.rb +10 -4
  229. data/lib/arel/table.rb +0 -1
  230. data/lib/arel/tree_manager.rb +0 -12
  231. data/lib/arel/update_manager.rb +18 -4
  232. data/lib/arel/visitors/dot.rb +80 -90
  233. data/lib/arel/visitors/mysql.rb +8 -2
  234. data/lib/arel/visitors/postgresql.rb +0 -10
  235. data/lib/arel/visitors/to_sql.rb +58 -2
  236. data/lib/arel.rb +2 -1
  237. data/lib/rails/generators/active_record/application_record/templates/application_record.rb.tt +1 -1
  238. data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +1 -1
  239. data/lib/rails/generators/active_record/model/templates/model.rb.tt +1 -1
  240. data/lib/rails/generators/active_record/model/templates/module.rb.tt +2 -2
  241. data/lib/rails/generators/active_record/multi_db/multi_db_generator.rb +16 -0
  242. data/lib/rails/generators/active_record/multi_db/templates/multi_db.rb.tt +44 -0
  243. metadata +53 -9
@@ -5,15 +5,40 @@ require "active_model/type/registry"
5
5
  module ActiveRecord
6
6
  # :stopdoc:
7
7
  module Type
8
- class AdapterSpecificRegistry < ActiveModel::Type::Registry
8
+ class AdapterSpecificRegistry # :nodoc:
9
+ def initialize
10
+ @registrations = []
11
+ end
12
+
13
+ def initialize_copy(other)
14
+ @registrations = @registrations.dup
15
+ super
16
+ end
17
+
9
18
  def add_modifier(options, klass, **args)
10
19
  registrations << DecorationRegistration.new(options, klass, **args)
11
20
  end
12
21
 
13
- private
14
- def registration_klass
15
- Registration
22
+ def register(type_name, klass = nil, **options, &block)
23
+ unless block_given?
24
+ block = proc { |_, *args| klass.new(*args) }
25
+ block.ruby2_keywords if block.respond_to?(:ruby2_keywords)
16
26
  end
27
+ registrations << Registration.new(type_name, block, **options)
28
+ end
29
+
30
+ def lookup(symbol, *args, **kwargs)
31
+ registration = find_registration(symbol, *args, **kwargs)
32
+
33
+ if registration
34
+ registration.call(self, symbol, *args, **kwargs)
35
+ else
36
+ raise ArgumentError, "Unknown type #{symbol.inspect}"
37
+ end
38
+ end
39
+
40
+ private
41
+ attr_reader :registrations
17
42
 
18
43
  def find_registration(symbol, *args, **kwargs)
19
44
  registrations
@@ -22,7 +47,7 @@ module ActiveRecord
22
47
  end
23
48
  end
24
49
 
25
- class Registration
50
+ class Registration # :nodoc:
26
51
  def initialize(name, block, adapter: nil, override: nil)
27
52
  @name = name
28
53
  @block = block
@@ -89,7 +114,7 @@ module ActiveRecord
89
114
  end
90
115
  end
91
116
 
92
- class DecorationRegistration < Registration
117
+ class DecorationRegistration < Registration # :nodoc:
93
118
  def initialize(options, klass, adapter: nil)
94
119
  @options = options
95
120
  @klass = klass
@@ -120,7 +145,7 @@ module ActiveRecord
120
145
  end
121
146
  end
122
147
 
123
- class TypeConflictError < StandardError
148
+ class TypeConflictError < StandardError # :nodoc:
124
149
  end
125
150
  # :startdoc:
126
151
  end
@@ -2,7 +2,40 @@
2
2
 
3
3
  module ActiveRecord
4
4
  module Type
5
- class HashLookupTypeMap < TypeMap # :nodoc:
5
+ class HashLookupTypeMap # :nodoc:
6
+ def initialize(parent = nil)
7
+ @mapping = {}
8
+ @cache = Concurrent::Map.new do |h, key|
9
+ h.fetch_or_store(key, Concurrent::Map.new)
10
+ end
11
+ end
12
+
13
+ def lookup(lookup_key, *args)
14
+ fetch(lookup_key, *args) { Type.default_value }
15
+ end
16
+
17
+ def fetch(lookup_key, *args, &block)
18
+ @cache[lookup_key].fetch_or_store(args) do
19
+ perform_fetch(lookup_key, *args, &block)
20
+ end
21
+ end
22
+
23
+ def register_type(key, value = nil, &block)
24
+ raise ::ArgumentError unless value || block
25
+
26
+ if block
27
+ @mapping[key] = block
28
+ else
29
+ @mapping[key] = proc { value }
30
+ end
31
+ @cache.clear
32
+ end
33
+
34
+ def clear
35
+ @mapping.clear
36
+ @cache.clear
37
+ end
38
+
6
39
  def alias_type(type, alias_type)
7
40
  register_type(type) { |_, *args| lookup(alias_type, *args) }
8
41
  end
@@ -5,11 +5,11 @@ module ActiveRecord
5
5
  module Internal
6
6
  module Timezone
7
7
  def is_utc?
8
- ActiveRecord::Base.default_timezone == :utc
8
+ ActiveRecord.default_timezone == :utc
9
9
  end
10
10
 
11
11
  def default_timezone
12
- ActiveRecord::Base.default_timezone
12
+ ActiveRecord.default_timezone
13
13
  end
14
14
  end
15
15
  end
@@ -31,7 +31,7 @@ module ActiveRecord
31
31
  end
32
32
 
33
33
  def inspect
34
- Kernel.instance_method(:inspect).bind(self).call
34
+ Kernel.instance_method(:inspect).bind_call(self)
35
35
  end
36
36
 
37
37
  def changed_in_place?(raw_old_value, value)
@@ -5,55 +5,52 @@ require "concurrent/map"
5
5
  module ActiveRecord
6
6
  module Type
7
7
  class TypeMap # :nodoc:
8
- def initialize
8
+ def initialize(parent = nil)
9
9
  @mapping = {}
10
- @cache = Concurrent::Map.new do |h, key|
11
- h.fetch_or_store(key, Concurrent::Map.new)
12
- end
10
+ @parent = parent
11
+ @cache = Concurrent::Map.new
13
12
  end
14
13
 
15
- def lookup(lookup_key, *args)
16
- fetch(lookup_key, *args) { Type.default_value }
14
+ def lookup(lookup_key)
15
+ fetch(lookup_key) { Type.default_value }
17
16
  end
18
17
 
19
- def fetch(lookup_key, *args, &block)
20
- @cache[lookup_key].fetch_or_store(args) do
21
- perform_fetch(lookup_key, *args, &block)
18
+ def fetch(lookup_key, &block)
19
+ @cache.fetch_or_store(lookup_key) do
20
+ perform_fetch(lookup_key, &block)
22
21
  end
23
22
  end
24
23
 
25
24
  def register_type(key, value = nil, &block)
26
25
  raise ::ArgumentError unless value || block
27
- @cache.clear
28
26
 
29
27
  if block
30
28
  @mapping[key] = block
31
29
  else
32
30
  @mapping[key] = proc { value }
33
31
  end
32
+ @cache.clear
34
33
  end
35
34
 
36
35
  def alias_type(key, target_key)
37
- register_type(key) do |sql_type, *args|
36
+ register_type(key) do |sql_type|
38
37
  metadata = sql_type[/\(.*\)/, 0]
39
- lookup("#{target_key}#{metadata}", *args)
38
+ lookup("#{target_key}#{metadata}")
40
39
  end
41
40
  end
42
41
 
43
- def clear
44
- @mapping.clear
45
- end
46
-
47
- private
48
- def perform_fetch(lookup_key, *args)
42
+ protected
43
+ def perform_fetch(lookup_key, &block)
49
44
  matching_pair = @mapping.reverse_each.detect do |key, _|
50
45
  key === lookup_key
51
46
  end
52
47
 
53
48
  if matching_pair
54
- matching_pair.last.call(lookup_key, *args)
49
+ matching_pair.last.call(lookup_key)
50
+ elsif @parent
51
+ @parent.perform_fetch(lookup_key, &block)
55
52
  else
56
- yield lookup_key, *args
53
+ yield lookup_key
57
54
  end
58
55
  end
59
56
  end
@@ -47,8 +47,7 @@ module ActiveRecord
47
47
  end
48
48
 
49
49
  def adapter_name_from(model) # :nodoc:
50
- # TODO: this shouldn't depend on a connection to the database
51
- model.connection.adapter_name.downcase.to_sym
50
+ model.connection_db_config.adapter.to_sym
52
51
  end
53
52
 
54
53
  private
@@ -2,7 +2,7 @@
2
2
 
3
3
  module ActiveRecord
4
4
  module Validations
5
- class AssociatedValidator < ActiveModel::EachValidator #:nodoc:
5
+ class AssociatedValidator < ActiveModel::EachValidator # :nodoc:
6
6
  def validate_each(record, attribute, value)
7
7
  if Array(value).reject { |r| valid_object?(r) }.any?
8
8
  record.errors.add(attribute, :invalid, **options.merge(value: value))
@@ -42,14 +42,14 @@ module ActiveRecord
42
42
  # or an array of symbols. (e.g. <tt>on: :create</tt> or
43
43
  # <tt>on: :custom_validation_context</tt> or
44
44
  # <tt>on: [:create, :custom_validation_context]</tt>)
45
- # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
45
+ # * <tt>:if</tt> - Specifies a method, proc, or string to call to determine
46
46
  # if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
47
47
  # or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
48
48
  # proc or string should return or evaluate to a +true+ or +false+ value.
49
- # * <tt>:unless</tt> - Specifies a method, proc or string to call to
49
+ # * <tt>:unless</tt> - Specifies a method, proc, or string to call to
50
50
  # determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
51
51
  # or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
52
- # method, proc or string should return or evaluate to a +true+ or +false+
52
+ # method, proc, or string should return or evaluate to a +true+ or +false+
53
53
  # value.
54
54
  def validates_associated(*attr_names)
55
55
  validates_with AssociatedValidator, _merge_attributes(attr_names)
@@ -50,11 +50,11 @@ module ActiveRecord
50
50
  # or an array of symbols. (e.g. <tt>on: :create</tt> or
51
51
  # <tt>on: :custom_validation_context</tt> or
52
52
  # <tt>on: [:create, :custom_validation_context]</tt>)
53
- # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if
53
+ # * <tt>:if</tt> - Specifies a method, proc, or string to call to determine if
54
54
  # the validation should occur (e.g. <tt>if: :allow_validation</tt>, or
55
55
  # <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method, proc
56
56
  # or string should return or evaluate to a +true+ or +false+ value.
57
- # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine
57
+ # * <tt>:unless</tt> - Specifies a method, proc, or string to call to determine
58
58
  # if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
59
59
  # or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The method,
60
60
  # proc or string should return or evaluate to a +true+ or +false+ value.
@@ -161,19 +161,19 @@ module ActiveRecord
161
161
  # <tt>WHERE</tt> SQL fragment to limit the uniqueness constraint lookup
162
162
  # (e.g. <tt>conditions: -> { where(status: 'active') }</tt>).
163
163
  # * <tt>:case_sensitive</tt> - Looks for an exact match. Ignored by
164
- # non-text columns (+true+ by default).
164
+ # non-text columns. The default behavior respects the default database collation.
165
165
  # * <tt>:allow_nil</tt> - If set to +true+, skips this validation if the
166
166
  # attribute is +nil+ (default is +false+).
167
167
  # * <tt>:allow_blank</tt> - If set to +true+, skips this validation if the
168
168
  # attribute is blank (default is +false+).
169
- # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
169
+ # * <tt>:if</tt> - Specifies a method, proc, or string to call to determine
170
170
  # if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
171
171
  # or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
172
172
  # proc or string should return or evaluate to a +true+ or +false+ value.
173
- # * <tt>:unless</tt> - Specifies a method, proc or string to call to
173
+ # * <tt>:unless</tt> - Specifies a method, proc, or string to call to
174
174
  # determine if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
175
175
  # or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The
176
- # method, proc or string should return or evaluate to a +true+ or +false+
176
+ # method, proc, or string should return or evaluate to a +true+ or +false+
177
177
  # value.
178
178
  #
179
179
  # === Concurrency and integrity
@@ -3,7 +3,7 @@
3
3
  require_relative "gem_version"
4
4
 
5
5
  module ActiveRecord
6
- # Returns the version of the currently loaded ActiveRecord as a <tt>Gem::Version</tt>
6
+ # Returns the currently loaded version of Active Record as a <tt>Gem::Version</tt>.
7
7
  def self.version
8
8
  gem_version
9
9
  end
data/lib/active_record.rb CHANGED
@@ -38,25 +38,27 @@ module ActiveRecord
38
38
 
39
39
  autoload :Base
40
40
  autoload :Callbacks
41
- autoload :Core
42
41
  autoload :ConnectionHandling
42
+ autoload :Core
43
43
  autoload :CounterCache
44
- autoload :DynamicMatchers
45
44
  autoload :DelegatedType
45
+ autoload :DestroyAssociationAsyncJob
46
+ autoload :DynamicMatchers
47
+ autoload :Encryption
46
48
  autoload :Enum
47
- autoload :InternalMetadata
48
49
  autoload :Explain
49
50
  autoload :Inheritance
50
51
  autoload :Integration
52
+ autoload :InternalMetadata
51
53
  autoload :Migration
52
54
  autoload :Migrator, "active_record/migration"
53
55
  autoload :ModelSchema
54
56
  autoload :NestedAttributes
55
57
  autoload :NoTouching
56
- autoload :TouchLater
57
58
  autoload :Persistence
58
59
  autoload :QueryCache
59
60
  autoload :Querying
61
+ autoload :QueryLogs
60
62
  autoload :ReadonlyAttributes
61
63
  autoload :RecordInvalid, "active_record/validations"
62
64
  autoload :Reflection
@@ -66,32 +68,37 @@ module ActiveRecord
66
68
  autoload :SchemaDumper
67
69
  autoload :SchemaMigration
68
70
  autoload :Scoping
71
+ autoload :SecureToken
69
72
  autoload :Serialization
70
- autoload :StatementCache
71
- autoload :Store
72
73
  autoload :SignedId
74
+ autoload :Store
73
75
  autoload :Suppressor
76
+ autoload :TestDatabases
77
+ autoload :TestFixtures, "active_record/fixtures"
74
78
  autoload :Timestamp
79
+ autoload :TouchLater
75
80
  autoload :Transactions
76
81
  autoload :Translation
77
82
  autoload :Validations
78
- autoload :SecureToken
79
- autoload :DestroyAssociationAsyncJob
80
83
 
81
84
  eager_autoload do
82
- autoload :ConnectionAdapters
83
-
84
85
  autoload :Aggregations
86
+ autoload :AssociationRelation
85
87
  autoload :Associations
88
+ autoload :AsynchronousQueriesTracker
86
89
  autoload :AttributeAssignment
87
90
  autoload :AttributeMethods
88
91
  autoload :AutosaveAssociation
89
-
92
+ autoload :ConnectionAdapters
93
+ autoload :DisableJoinsAssociationRelation
94
+ autoload :FutureResult
90
95
  autoload :LegacyYamlAdapter
91
-
92
- autoload :Relation
93
- autoload :AssociationRelation
94
96
  autoload :NullRelation
97
+ autoload :Relation
98
+ autoload :Result
99
+ autoload :StatementCache
100
+ autoload :TableMetadata
101
+ autoload :Type
95
102
 
96
103
  autoload_under "relation" do
97
104
  autoload :QueryMethods
@@ -102,15 +109,11 @@ module ActiveRecord
102
109
  autoload :Batches
103
110
  autoload :Delegation
104
111
  end
105
-
106
- autoload :Result
107
- autoload :TableMetadata
108
- autoload :Type
109
112
  end
110
113
 
111
114
  module Coders
112
- autoload :YAMLColumn, "active_record/coders/yaml_column"
113
115
  autoload :JSON, "active_record/coders/json"
116
+ autoload :YAMLColumn, "active_record/coders/yaml_column"
114
117
  end
115
118
 
116
119
  module AttributeMethods
@@ -122,9 +125,9 @@ module ActiveRecord
122
125
  autoload :PrimaryKey
123
126
  autoload :Query
124
127
  autoload :Read
128
+ autoload :Serialization
125
129
  autoload :TimeZoneConversion
126
130
  autoload :Write
127
- autoload :Serialization
128
131
  end
129
132
  end
130
133
 
@@ -141,29 +144,223 @@ module ActiveRecord
141
144
  extend ActiveSupport::Autoload
142
145
 
143
146
  eager_autoload do
144
- autoload :Named
145
147
  autoload :Default
148
+ autoload :Named
146
149
  end
147
150
  end
148
151
 
149
152
  module Middleware
150
153
  extend ActiveSupport::Autoload
151
154
 
152
- autoload :DatabaseSelector, "active_record/middleware/database_selector"
155
+ autoload :DatabaseSelector
156
+ autoload :ShardSelector
153
157
  end
154
158
 
155
159
  module Tasks
156
160
  extend ActiveSupport::Autoload
157
161
 
158
162
  autoload :DatabaseTasks
159
- autoload :SQLiteDatabaseTasks, "active_record/tasks/sqlite_database_tasks"
160
163
  autoload :MySQLDatabaseTasks, "active_record/tasks/mysql_database_tasks"
161
- autoload :PostgreSQLDatabaseTasks,
162
- "active_record/tasks/postgresql_database_tasks"
164
+ autoload :PostgreSQLDatabaseTasks, "active_record/tasks/postgresql_database_tasks"
165
+ autoload :SQLiteDatabaseTasks, "active_record/tasks/sqlite_database_tasks"
163
166
  end
164
167
 
165
- autoload :TestDatabases, "active_record/test_databases"
166
- autoload :TestFixtures, "active_record/fixtures"
168
+ # Lazily load the schema cache. This option will load the schema cache
169
+ # when a connection is established rather than on boot. If set,
170
+ # +config.active_record.use_schema_cache_dump+ will be set to false.
171
+ singleton_class.attr_accessor :lazily_load_schema_cache
172
+ self.lazily_load_schema_cache = false
173
+
174
+ # A list of tables or regex's to match tables to ignore when
175
+ # dumping the schema cache. For example if this is set to +[/^_/]+
176
+ # the schema cache will not dump tables named with an underscore.
177
+ singleton_class.attr_accessor :schema_cache_ignored_tables
178
+ self.schema_cache_ignored_tables = []
179
+
180
+ singleton_class.attr_accessor :legacy_connection_handling
181
+ self.legacy_connection_handling = true
182
+
183
+ singleton_class.attr_reader :default_timezone
184
+
185
+ # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling
186
+ # dates and times from the database. This is set to :utc by default.
187
+ def self.default_timezone=(default_timezone)
188
+ unless %i(local utc).include?(default_timezone)
189
+ raise ArgumentError, "default_timezone must be either :utc (default) or :local."
190
+ end
191
+
192
+ @default_timezone = default_timezone
193
+ end
194
+
195
+ self.default_timezone = :utc
196
+
197
+ singleton_class.attr_accessor :writing_role
198
+ self.writing_role = :writing
199
+
200
+ singleton_class.attr_accessor :reading_role
201
+ self.reading_role = :reading
202
+
203
+ # Sets the async_query_executor for an application. By default the thread pool executor
204
+ # set to +nil+ which will not run queries in the background. Applications must configure
205
+ # a thread pool executor to use this feature. Options are:
206
+ #
207
+ # * nil - Does not initialize a thread pool executor. Any async calls will be
208
+ # run in the foreground.
209
+ # * :global_thread_pool - Initializes a single +Concurrent::ThreadPoolExecutor+
210
+ # that uses the +async_query_concurrency+ for the +max_threads+ value.
211
+ # * :multi_thread_pool - Initializes a +Concurrent::ThreadPoolExecutor+ for each
212
+ # database connection. The initializer values are defined in the configuration hash.
213
+ singleton_class.attr_accessor :async_query_executor
214
+ self.async_query_executor = nil
215
+
216
+ def self.global_thread_pool_async_query_executor # :nodoc:
217
+ concurrency = global_executor_concurrency || 4
218
+ @global_thread_pool_async_query_executor ||= Concurrent::ThreadPoolExecutor.new(
219
+ min_threads: 0,
220
+ max_threads: concurrency,
221
+ max_queue: concurrency * 4,
222
+ fallback_policy: :caller_runs
223
+ )
224
+ end
225
+
226
+ # Set the +global_executor_concurrency+. This configuration value can only be used
227
+ # with the global thread pool async query executor.
228
+ def self.global_executor_concurrency=(global_executor_concurrency)
229
+ if self.async_query_executor.nil? || self.async_query_executor == :multi_thread_pool
230
+ raise ArgumentError, "`global_executor_concurrency` cannot be set when using the executor is nil or set to multi_thead_pool. For multiple thread pools, please set the concurrency in your database configuration."
231
+ end
232
+
233
+ @global_executor_concurrency = global_executor_concurrency
234
+ end
235
+
236
+ def self.global_executor_concurrency # :nodoc:
237
+ @global_executor_concurrency ||= nil
238
+ end
239
+
240
+ singleton_class.attr_accessor :index_nested_attribute_errors
241
+ self.index_nested_attribute_errors = false
242
+
243
+ ##
244
+ # :singleton-method:
245
+ #
246
+ # Specifies if the methods calling database queries should be logged below
247
+ # their relevant queries. Defaults to false.
248
+ singleton_class.attr_accessor :verbose_query_logs
249
+ self.verbose_query_logs = false
250
+
251
+ ##
252
+ # :singleton-method:
253
+ #
254
+ # Specifies the names of the queues used by background jobs.
255
+ singleton_class.attr_accessor :queues
256
+ self.queues = {}
257
+
258
+ singleton_class.attr_accessor :maintain_test_schema
259
+ self.maintain_test_schema = nil
260
+
261
+ ##
262
+ # :singleton-method:
263
+ # Specify a threshold for the size of query result sets. If the number of
264
+ # records in the set exceeds the threshold, a warning is logged. This can
265
+ # be used to identify queries which load thousands of records and
266
+ # potentially cause memory bloat.
267
+ singleton_class.attr_accessor :warn_on_records_fetched_greater_than
268
+ self.warn_on_records_fetched_greater_than = false
269
+
270
+ singleton_class.attr_accessor :application_record_class
271
+ self.application_record_class = nil
272
+
273
+ ##
274
+ # :singleton-method:
275
+ # Set the application to log or raise when an association violates strict loading.
276
+ # Defaults to :raise.
277
+ singleton_class.attr_accessor :action_on_strict_loading_violation
278
+ self.action_on_strict_loading_violation = :raise
279
+
280
+ ##
281
+ # :singleton-method:
282
+ # Specifies the format to use when dumping the database schema with Rails'
283
+ # Rakefile. If :sql, the schema is dumped as (potentially database-
284
+ # specific) SQL statements. If :ruby, the schema is dumped as an
285
+ # ActiveRecord::Schema file which can be loaded into any database that
286
+ # supports migrations. Use :ruby if you want to have different database
287
+ # adapters for, e.g., your development and test environments.
288
+ singleton_class.attr_accessor :schema_format
289
+ self.schema_format = :ruby
290
+
291
+ ##
292
+ # :singleton-method:
293
+ # Specifies if an error should be raised if the query has an order being
294
+ # ignored when doing batch queries. Useful in applications where the
295
+ # scope being ignored is error-worthy, rather than a warning.
296
+ singleton_class.attr_accessor :error_on_ignored_order
297
+ self.error_on_ignored_order = false
298
+
299
+ ##
300
+ # :singleton-method:
301
+ # Specify whether or not to use timestamps for migration versions
302
+ singleton_class.attr_accessor :timestamped_migrations
303
+ self.timestamped_migrations = true
304
+
305
+ ##
306
+ # :singleton-method:
307
+ # Specify whether schema dump should happen at the end of the
308
+ # bin/rails db:migrate command. This is true by default, which is useful for the
309
+ # development environment. This should ideally be false in the production
310
+ # environment where dumping schema is rarely needed.
311
+ singleton_class.attr_accessor :dump_schema_after_migration
312
+ self.dump_schema_after_migration = true
313
+
314
+ ##
315
+ # :singleton-method:
316
+ # Specifies which database schemas to dump when calling db:schema:dump.
317
+ # If the value is :schema_search_path (the default), any schemas listed in
318
+ # schema_search_path are dumped. Use :all to dump all schemas regardless
319
+ # of schema_search_path, or a string of comma separated schemas for a
320
+ # custom list.
321
+ singleton_class.attr_accessor :dump_schemas
322
+ self.dump_schemas = :schema_search_path
323
+
324
+ ##
325
+ # :singleton-method:
326
+ # Show a warning when Rails couldn't parse your database.yml
327
+ # for multiple databases.
328
+ singleton_class.attr_accessor :suppress_multiple_database_warning
329
+ self.suppress_multiple_database_warning = false
330
+
331
+ ##
332
+ # :singleton-method:
333
+ # If true, Rails will verify all foreign keys in the database after loading fixtures.
334
+ # An error will be raised if there are any foreign key violations, indicating incorrectly
335
+ # written fixtures.
336
+ # Supported by PostgreSQL and SQLite.
337
+ singleton_class.attr_accessor :verify_foreign_keys_for_fixtures
338
+ self.verify_foreign_keys_for_fixtures = false
339
+
340
+ singleton_class.attr_accessor :query_transformers
341
+ self.query_transformers = []
342
+
343
+ ##
344
+ # :singleton-method:
345
+ # Application configurable boolean that instructs the YAML Coder to use
346
+ # an unsafe load if set to true.
347
+ singleton_class.attr_accessor :use_yaml_unsafe_load
348
+ self.use_yaml_unsafe_load = false
349
+
350
+ ##
351
+ # :singleton-method:
352
+ # Application configurable boolean that denotes whether or not to raise
353
+ # an exception when the PostgreSQLAdapter is provided with an integer that
354
+ # is wider than signed 64bit representation
355
+ singleton_class.attr_accessor :raise_int_wider_than_64bit
356
+ self.raise_int_wider_than_64bit = true
357
+
358
+ ##
359
+ # :singleton-method:
360
+ # Application configurable array that provides additional permitted classes
361
+ # to Psych safe_load in the YAML Coder
362
+ singleton_class.attr_accessor :yaml_column_permitted_classes
363
+ self.yaml_column_permitted_classes = [Symbol]
167
364
 
168
365
  def self.eager_load!
169
366
  super
@@ -172,6 +369,7 @@ module ActiveRecord
172
369
  ActiveRecord::Associations.eager_load!
173
370
  ActiveRecord::AttributeMethods.eager_load!
174
371
  ActiveRecord::ConnectionAdapters.eager_load!
372
+ ActiveRecord::Encryption.eager_load!
175
373
  end
176
374
  end
177
375
 
@@ -27,14 +27,6 @@ module Arel # :nodoc: all
27
27
  relation.able_to_type_cast?
28
28
  end
29
29
  end
30
-
31
- class String < Attribute; end
32
- class Time < Attribute; end
33
- class Boolean < Attribute; end
34
- class Decimal < Attribute; end
35
- class Float < Attribute; end
36
- class Integer < Attribute; end
37
- class Undefined < Attribute; end
38
30
  end
39
31
 
40
32
  Attribute = Attributes::Attribute