activerecord 5.0.7.2 → 6.0.6.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activerecord might be problematic. Click here for more details.

Files changed (359) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +844 -1944
  3. data/MIT-LICENSE +3 -1
  4. data/README.rdoc +9 -7
  5. data/examples/performance.rb +31 -29
  6. data/examples/simple.rb +5 -3
  7. data/lib/active_record/advisory_lock_base.rb +18 -0
  8. data/lib/active_record/aggregations.rb +249 -247
  9. data/lib/active_record/association_relation.rb +18 -14
  10. data/lib/active_record/associations/alias_tracker.rb +24 -34
  11. data/lib/active_record/associations/association.rb +113 -55
  12. data/lib/active_record/associations/association_scope.rb +102 -96
  13. data/lib/active_record/associations/belongs_to_association.rb +58 -42
  14. data/lib/active_record/associations/belongs_to_polymorphic_association.rb +8 -12
  15. data/lib/active_record/associations/builder/association.rb +18 -25
  16. data/lib/active_record/associations/builder/belongs_to.rb +43 -54
  17. data/lib/active_record/associations/builder/collection_association.rb +7 -18
  18. data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +41 -62
  19. data/lib/active_record/associations/builder/has_many.rb +4 -0
  20. data/lib/active_record/associations/builder/has_one.rb +37 -1
  21. data/lib/active_record/associations/builder/singular_association.rb +4 -0
  22. data/lib/active_record/associations/collection_association.rb +93 -254
  23. data/lib/active_record/associations/collection_proxy.rb +159 -122
  24. data/lib/active_record/associations/foreign_association.rb +9 -0
  25. data/lib/active_record/associations/has_many_association.rb +23 -30
  26. data/lib/active_record/associations/has_many_through_association.rb +58 -44
  27. data/lib/active_record/associations/has_one_association.rb +59 -54
  28. data/lib/active_record/associations/has_one_through_association.rb +20 -11
  29. data/lib/active_record/associations/join_dependency/join_association.rb +43 -85
  30. data/lib/active_record/associations/join_dependency/join_base.rb +10 -9
  31. data/lib/active_record/associations/join_dependency/join_part.rb +14 -14
  32. data/lib/active_record/associations/join_dependency.rb +152 -177
  33. data/lib/active_record/associations/preloader/association.rb +101 -97
  34. data/lib/active_record/associations/preloader/through_association.rb +77 -76
  35. data/lib/active_record/associations/preloader.rb +94 -103
  36. data/lib/active_record/associations/singular_association.rb +12 -45
  37. data/lib/active_record/associations/through_association.rb +27 -15
  38. data/lib/active_record/associations.rb +1603 -1592
  39. data/lib/active_record/attribute_assignment.rb +54 -61
  40. data/lib/active_record/attribute_decorators.rb +38 -17
  41. data/lib/active_record/attribute_methods/before_type_cast.rb +12 -8
  42. data/lib/active_record/attribute_methods/dirty.rb +179 -109
  43. data/lib/active_record/attribute_methods/primary_key.rb +85 -92
  44. data/lib/active_record/attribute_methods/query.rb +4 -3
  45. data/lib/active_record/attribute_methods/read.rb +20 -49
  46. data/lib/active_record/attribute_methods/serialization.rb +29 -7
  47. data/lib/active_record/attribute_methods/time_zone_conversion.rb +39 -66
  48. data/lib/active_record/attribute_methods/write.rb +34 -33
  49. data/lib/active_record/attribute_methods.rb +66 -106
  50. data/lib/active_record/attributes.rb +38 -25
  51. data/lib/active_record/autosave_association.rb +58 -39
  52. data/lib/active_record/base.rb +27 -24
  53. data/lib/active_record/callbacks.rb +64 -35
  54. data/lib/active_record/coders/json.rb +2 -0
  55. data/lib/active_record/coders/yaml_column.rb +34 -13
  56. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +558 -323
  57. data/lib/active_record/connection_adapters/abstract/database_limits.rb +23 -5
  58. data/lib/active_record/connection_adapters/abstract/database_statements.rb +215 -94
  59. data/lib/active_record/connection_adapters/abstract/query_cache.rb +59 -35
  60. data/lib/active_record/connection_adapters/abstract/quoting.rb +128 -75
  61. data/lib/active_record/connection_adapters/abstract/savepoints.rb +2 -0
  62. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +33 -28
  63. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +233 -147
  64. data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +68 -80
  65. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +400 -213
  66. data/lib/active_record/connection_adapters/abstract/transaction.rb +169 -79
  67. data/lib/active_record/connection_adapters/abstract_adapter.rb +373 -202
  68. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +401 -562
  69. data/lib/active_record/connection_adapters/column.rb +41 -13
  70. data/lib/active_record/connection_adapters/connection_specification.rb +172 -139
  71. data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +11 -4
  72. data/lib/active_record/connection_adapters/mysql/column.rb +8 -31
  73. data/lib/active_record/connection_adapters/mysql/database_statements.rb +137 -49
  74. data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +24 -23
  75. data/lib/active_record/connection_adapters/mysql/quoting.rb +50 -20
  76. data/lib/active_record/connection_adapters/mysql/schema_creation.rb +49 -45
  77. data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +58 -56
  78. data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +70 -36
  79. data/lib/active_record/connection_adapters/mysql/schema_statements.rb +268 -0
  80. data/lib/active_record/connection_adapters/mysql/type_metadata.rb +12 -13
  81. data/lib/active_record/connection_adapters/mysql2_adapter.rb +48 -30
  82. data/lib/active_record/connection_adapters/postgresql/column.rb +19 -31
  83. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +64 -54
  84. data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +5 -3
  85. data/lib/active_record/connection_adapters/postgresql/oid/array.rb +22 -11
  86. data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +6 -5
  87. data/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb +2 -0
  88. data/lib/active_record/connection_adapters/postgresql/oid/bytea.rb +2 -0
  89. data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +3 -1
  90. data/lib/active_record/connection_adapters/postgresql/oid/date.rb +23 -0
  91. data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +12 -2
  92. data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +3 -1
  93. data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +5 -4
  94. data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +19 -18
  95. data/lib/active_record/connection_adapters/postgresql/oid/inet.rb +2 -0
  96. data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +3 -11
  97. data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +44 -0
  98. data/lib/active_record/connection_adapters/postgresql/oid/money.rb +7 -5
  99. data/lib/active_record/connection_adapters/postgresql/oid/{json.rb → oid.rb} +6 -1
  100. data/lib/active_record/connection_adapters/postgresql/oid/point.rb +30 -9
  101. data/lib/active_record/connection_adapters/postgresql/oid/range.rb +52 -30
  102. data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +4 -1
  103. data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +58 -54
  104. data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +8 -4
  105. data/lib/active_record/connection_adapters/postgresql/oid/vector.rb +2 -0
  106. data/lib/active_record/connection_adapters/postgresql/oid/xml.rb +2 -0
  107. data/lib/active_record/connection_adapters/postgresql/oid.rb +24 -21
  108. data/lib/active_record/connection_adapters/postgresql/quoting.rb +95 -35
  109. data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +20 -26
  110. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +76 -0
  111. data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +147 -105
  112. data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +34 -32
  113. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +378 -308
  114. data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +26 -25
  115. data/lib/active_record/connection_adapters/postgresql/utils.rb +9 -6
  116. data/lib/active_record/connection_adapters/postgresql_adapter.rb +383 -275
  117. data/lib/active_record/connection_adapters/schema_cache.rb +46 -12
  118. data/lib/active_record/connection_adapters/sql_type_metadata.rb +13 -8
  119. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +119 -0
  120. data/lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb +3 -1
  121. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +72 -18
  122. data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +3 -8
  123. data/lib/active_record/connection_adapters/sqlite3/schema_definitions.rb +19 -0
  124. data/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb +18 -0
  125. data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +137 -0
  126. data/lib/active_record/connection_adapters/sqlite3_adapter.rb +261 -267
  127. data/lib/active_record/connection_adapters/statement_pool.rb +9 -8
  128. data/lib/active_record/connection_handling.rb +143 -40
  129. data/lib/active_record/core.rb +207 -160
  130. data/lib/active_record/counter_cache.rb +60 -28
  131. data/lib/active_record/database_configurations/database_config.rb +37 -0
  132. data/lib/active_record/database_configurations/hash_config.rb +50 -0
  133. data/lib/active_record/database_configurations/url_config.rb +78 -0
  134. data/lib/active_record/database_configurations.rb +233 -0
  135. data/lib/active_record/define_callbacks.rb +22 -0
  136. data/lib/active_record/dynamic_matchers.rb +87 -87
  137. data/lib/active_record/enum.rb +67 -23
  138. data/lib/active_record/errors.rb +114 -18
  139. data/lib/active_record/explain.rb +4 -4
  140. data/lib/active_record/explain_registry.rb +3 -1
  141. data/lib/active_record/explain_subscriber.rb +9 -4
  142. data/lib/active_record/fixture_set/file.rb +13 -8
  143. data/lib/active_record/fixture_set/model_metadata.rb +33 -0
  144. data/lib/active_record/fixture_set/render_context.rb +17 -0
  145. data/lib/active_record/fixture_set/table_row.rb +152 -0
  146. data/lib/active_record/fixture_set/table_rows.rb +46 -0
  147. data/lib/active_record/fixtures.rb +194 -504
  148. data/lib/active_record/gem_version.rb +5 -3
  149. data/lib/active_record/inheritance.rb +150 -99
  150. data/lib/active_record/insert_all.rb +179 -0
  151. data/lib/active_record/integration.rb +116 -25
  152. data/lib/active_record/internal_metadata.rb +16 -19
  153. data/lib/active_record/legacy_yaml_adapter.rb +4 -2
  154. data/lib/active_record/locking/optimistic.rb +85 -86
  155. data/lib/active_record/locking/pessimistic.rb +18 -6
  156. data/lib/active_record/log_subscriber.rb +48 -29
  157. data/lib/active_record/middleware/database_selector/resolver/session.rb +45 -0
  158. data/lib/active_record/middleware/database_selector/resolver.rb +87 -0
  159. data/lib/active_record/middleware/database_selector.rb +74 -0
  160. data/lib/active_record/migration/command_recorder.rb +134 -100
  161. data/lib/active_record/migration/compatibility.rb +174 -56
  162. data/lib/active_record/migration/join_table.rb +8 -7
  163. data/lib/active_record/migration.rb +369 -302
  164. data/lib/active_record/model_schema.rb +160 -127
  165. data/lib/active_record/nested_attributes.rb +213 -202
  166. data/lib/active_record/no_touching.rb +12 -3
  167. data/lib/active_record/null_relation.rb +12 -34
  168. data/lib/active_record/persistence.rb +446 -77
  169. data/lib/active_record/query_cache.rb +13 -12
  170. data/lib/active_record/querying.rb +37 -24
  171. data/lib/active_record/railtie.rb +128 -36
  172. data/lib/active_record/railties/collection_cache_association_loading.rb +34 -0
  173. data/lib/active_record/railties/console_sandbox.rb +2 -0
  174. data/lib/active_record/railties/controller_runtime.rb +34 -33
  175. data/lib/active_record/railties/databases.rake +312 -177
  176. data/lib/active_record/readonly_attributes.rb +5 -4
  177. data/lib/active_record/reflection.rb +214 -254
  178. data/lib/active_record/relation/batches/batch_enumerator.rb +3 -1
  179. data/lib/active_record/relation/batches.rb +98 -52
  180. data/lib/active_record/relation/calculations.rb +212 -173
  181. data/lib/active_record/relation/delegation.rb +73 -69
  182. data/lib/active_record/relation/finder_methods.rb +207 -247
  183. data/lib/active_record/relation/from_clause.rb +6 -8
  184. data/lib/active_record/relation/merger.rb +82 -61
  185. data/lib/active_record/relation/predicate_builder/array_handler.rb +20 -14
  186. data/lib/active_record/relation/predicate_builder/association_query_value.rb +43 -0
  187. data/lib/active_record/relation/predicate_builder/base_handler.rb +4 -3
  188. data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +6 -4
  189. data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +53 -0
  190. data/lib/active_record/relation/predicate_builder/range_handler.rb +7 -18
  191. data/lib/active_record/relation/predicate_builder/relation_handler.rb +6 -0
  192. data/lib/active_record/relation/predicate_builder.rb +83 -105
  193. data/lib/active_record/relation/query_attribute.rb +33 -2
  194. data/lib/active_record/relation/query_methods.rb +488 -332
  195. data/lib/active_record/relation/record_fetch_warning.rb +5 -3
  196. data/lib/active_record/relation/spawn_methods.rb +8 -8
  197. data/lib/active_record/relation/where_clause.rb +111 -96
  198. data/lib/active_record/relation/where_clause_factory.rb +6 -11
  199. data/lib/active_record/relation.rb +443 -318
  200. data/lib/active_record/result.rb +69 -40
  201. data/lib/active_record/runtime_registry.rb +5 -3
  202. data/lib/active_record/sanitization.rb +83 -99
  203. data/lib/active_record/schema.rb +7 -14
  204. data/lib/active_record/schema_dumper.rb +71 -69
  205. data/lib/active_record/schema_migration.rb +16 -6
  206. data/lib/active_record/scoping/default.rb +92 -95
  207. data/lib/active_record/scoping/named.rb +51 -26
  208. data/lib/active_record/scoping.rb +20 -20
  209. data/lib/active_record/secure_token.rb +4 -2
  210. data/lib/active_record/serialization.rb +2 -0
  211. data/lib/active_record/statement_cache.rb +63 -28
  212. data/lib/active_record/store.rb +121 -41
  213. data/lib/active_record/suppressor.rb +6 -3
  214. data/lib/active_record/table_metadata.rb +39 -18
  215. data/lib/active_record/tasks/database_tasks.rb +271 -81
  216. data/lib/active_record/tasks/mysql_database_tasks.rb +54 -91
  217. data/lib/active_record/tasks/postgresql_database_tasks.rb +77 -47
  218. data/lib/active_record/tasks/sqlite_database_tasks.rb +33 -16
  219. data/lib/active_record/test_databases.rb +23 -0
  220. data/lib/active_record/test_fixtures.rb +243 -0
  221. data/lib/active_record/timestamp.rb +70 -36
  222. data/lib/active_record/touch_later.rb +8 -6
  223. data/lib/active_record/transactions.rb +141 -157
  224. data/lib/active_record/translation.rb +3 -1
  225. data/lib/active_record/type/adapter_specific_registry.rb +44 -48
  226. data/lib/active_record/type/date.rb +2 -0
  227. data/lib/active_record/type/date_time.rb +2 -0
  228. data/lib/active_record/type/decimal_without_scale.rb +15 -0
  229. data/lib/active_record/type/hash_lookup_type_map.rb +5 -4
  230. data/lib/active_record/type/internal/timezone.rb +2 -0
  231. data/lib/active_record/type/json.rb +30 -0
  232. data/lib/active_record/type/serialized.rb +16 -9
  233. data/lib/active_record/type/text.rb +11 -0
  234. data/lib/active_record/type/time.rb +12 -1
  235. data/lib/active_record/type/type_map.rb +14 -17
  236. data/lib/active_record/type/unsigned_integer.rb +16 -0
  237. data/lib/active_record/type.rb +23 -18
  238. data/lib/active_record/type_caster/connection.rb +17 -12
  239. data/lib/active_record/type_caster/map.rb +5 -4
  240. data/lib/active_record/type_caster.rb +4 -2
  241. data/lib/active_record/validations/absence.rb +2 -0
  242. data/lib/active_record/validations/associated.rb +3 -2
  243. data/lib/active_record/validations/length.rb +2 -0
  244. data/lib/active_record/validations/presence.rb +4 -2
  245. data/lib/active_record/validations/uniqueness.rb +29 -42
  246. data/lib/active_record/validations.rb +7 -5
  247. data/lib/active_record/version.rb +3 -1
  248. data/lib/active_record.rb +37 -22
  249. data/lib/arel/alias_predication.rb +9 -0
  250. data/lib/arel/attributes/attribute.rb +37 -0
  251. data/lib/arel/attributes.rb +22 -0
  252. data/lib/arel/collectors/bind.rb +24 -0
  253. data/lib/arel/collectors/composite.rb +31 -0
  254. data/lib/arel/collectors/plain_string.rb +20 -0
  255. data/lib/arel/collectors/sql_string.rb +20 -0
  256. data/lib/arel/collectors/substitute_binds.rb +28 -0
  257. data/lib/arel/crud.rb +42 -0
  258. data/lib/arel/delete_manager.rb +18 -0
  259. data/lib/arel/errors.rb +9 -0
  260. data/lib/arel/expressions.rb +29 -0
  261. data/lib/arel/factory_methods.rb +49 -0
  262. data/lib/arel/insert_manager.rb +49 -0
  263. data/lib/arel/math.rb +45 -0
  264. data/lib/arel/nodes/and.rb +32 -0
  265. data/lib/arel/nodes/ascending.rb +23 -0
  266. data/lib/arel/nodes/binary.rb +52 -0
  267. data/lib/arel/nodes/bind_param.rb +36 -0
  268. data/lib/arel/nodes/case.rb +55 -0
  269. data/lib/arel/nodes/casted.rb +50 -0
  270. data/lib/arel/nodes/comment.rb +29 -0
  271. data/lib/arel/nodes/count.rb +12 -0
  272. data/lib/arel/nodes/delete_statement.rb +45 -0
  273. data/lib/arel/nodes/descending.rb +23 -0
  274. data/lib/arel/nodes/equality.rb +18 -0
  275. data/lib/arel/nodes/extract.rb +24 -0
  276. data/lib/arel/nodes/false.rb +16 -0
  277. data/lib/arel/nodes/full_outer_join.rb +8 -0
  278. data/lib/arel/nodes/function.rb +44 -0
  279. data/lib/arel/nodes/grouping.rb +8 -0
  280. data/lib/arel/nodes/in.rb +8 -0
  281. data/lib/arel/nodes/infix_operation.rb +80 -0
  282. data/lib/arel/nodes/inner_join.rb +8 -0
  283. data/lib/arel/nodes/insert_statement.rb +37 -0
  284. data/lib/arel/nodes/join_source.rb +20 -0
  285. data/lib/arel/nodes/matches.rb +18 -0
  286. data/lib/arel/nodes/named_function.rb +23 -0
  287. data/lib/arel/nodes/node.rb +50 -0
  288. data/lib/arel/nodes/node_expression.rb +13 -0
  289. data/lib/arel/nodes/outer_join.rb +8 -0
  290. data/lib/arel/nodes/over.rb +15 -0
  291. data/lib/arel/nodes/regexp.rb +16 -0
  292. data/lib/arel/nodes/right_outer_join.rb +8 -0
  293. data/lib/arel/nodes/select_core.rb +67 -0
  294. data/lib/arel/nodes/select_statement.rb +41 -0
  295. data/lib/arel/nodes/sql_literal.rb +16 -0
  296. data/lib/arel/nodes/string_join.rb +11 -0
  297. data/lib/arel/nodes/table_alias.rb +27 -0
  298. data/lib/arel/nodes/terminal.rb +16 -0
  299. data/lib/arel/nodes/true.rb +16 -0
  300. data/lib/arel/nodes/unary.rb +45 -0
  301. data/lib/arel/nodes/unary_operation.rb +20 -0
  302. data/lib/arel/nodes/unqualified_column.rb +22 -0
  303. data/lib/arel/nodes/update_statement.rb +41 -0
  304. data/lib/arel/nodes/values_list.rb +9 -0
  305. data/lib/arel/nodes/window.rb +126 -0
  306. data/lib/arel/nodes/with.rb +11 -0
  307. data/lib/arel/nodes.rb +68 -0
  308. data/lib/arel/order_predications.rb +13 -0
  309. data/lib/arel/predications.rb +256 -0
  310. data/lib/arel/select_manager.rb +271 -0
  311. data/lib/arel/table.rb +110 -0
  312. data/lib/arel/tree_manager.rb +72 -0
  313. data/lib/arel/update_manager.rb +34 -0
  314. data/lib/arel/visitors/depth_first.rb +203 -0
  315. data/lib/arel/visitors/dot.rb +296 -0
  316. data/lib/arel/visitors/ibm_db.rb +34 -0
  317. data/lib/arel/visitors/informix.rb +62 -0
  318. data/lib/arel/visitors/mssql.rb +156 -0
  319. data/lib/arel/visitors/mysql.rb +83 -0
  320. data/lib/arel/visitors/oracle.rb +158 -0
  321. data/lib/arel/visitors/oracle12.rb +65 -0
  322. data/lib/arel/visitors/postgresql.rb +109 -0
  323. data/lib/arel/visitors/sqlite.rb +38 -0
  324. data/lib/arel/visitors/to_sql.rb +888 -0
  325. data/lib/arel/visitors/visitor.rb +45 -0
  326. data/lib/arel/visitors/where_sql.rb +22 -0
  327. data/lib/arel/visitors.rb +20 -0
  328. data/lib/arel/window_predications.rb +9 -0
  329. data/lib/arel.rb +62 -0
  330. data/lib/rails/generators/active_record/application_record/application_record_generator.rb +26 -0
  331. data/lib/rails/generators/active_record/migration/migration_generator.rb +37 -35
  332. data/lib/rails/generators/active_record/migration/templates/{create_table_migration.rb → create_table_migration.rb.tt} +1 -1
  333. data/lib/rails/generators/active_record/migration/templates/{migration.rb → migration.rb.tt} +4 -2
  334. data/lib/rails/generators/active_record/migration.rb +17 -3
  335. data/lib/rails/generators/active_record/model/model_generator.rb +9 -30
  336. data/lib/rails/generators/active_record/model/templates/{model.rb → model.rb.tt} +10 -1
  337. data/lib/rails/generators/active_record.rb +7 -5
  338. metadata +138 -52
  339. data/lib/active_record/associations/preloader/belongs_to.rb +0 -17
  340. data/lib/active_record/associations/preloader/collection_association.rb +0 -17
  341. data/lib/active_record/associations/preloader/has_many.rb +0 -17
  342. data/lib/active_record/associations/preloader/has_many_through.rb +0 -19
  343. data/lib/active_record/associations/preloader/has_one.rb +0 -15
  344. data/lib/active_record/associations/preloader/has_one_through.rb +0 -9
  345. data/lib/active_record/associations/preloader/singular_association.rb +0 -20
  346. data/lib/active_record/attribute/user_provided_default.rb +0 -28
  347. data/lib/active_record/attribute.rb +0 -213
  348. data/lib/active_record/attribute_mutation_tracker.rb +0 -70
  349. data/lib/active_record/attribute_set/builder.rb +0 -132
  350. data/lib/active_record/attribute_set.rb +0 -110
  351. data/lib/active_record/collection_cache_key.rb +0 -50
  352. data/lib/active_record/connection_adapters/postgresql/oid/rails_5_1_point.rb +0 -50
  353. data/lib/active_record/railties/jdbcmysql_error.rb +0 -16
  354. data/lib/active_record/relation/predicate_builder/association_query_handler.rb +0 -88
  355. data/lib/active_record/relation/predicate_builder/class_handler.rb +0 -27
  356. data/lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb +0 -57
  357. data/lib/active_record/type/internal/abstract_json.rb +0 -33
  358. /data/lib/rails/generators/active_record/{model/templates/application_record.rb → application_record/templates/application_record.rb.tt} +0 -0
  359. /data/lib/rails/generators/active_record/model/templates/{module.rb → module.rb.tt} +0 -0
@@ -1,8 +1,8 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module ActiveRecord
2
4
  # See ActiveRecord::Aggregations::ClassMethods for documentation
3
5
  module Aggregations
4
- extend ActiveSupport::Concern
5
-
6
6
  def initialize_dup(*) # :nodoc:
7
7
  @aggregation_cache = {}
8
8
  super
@@ -14,269 +14,271 @@ module ActiveRecord
14
14
  end
15
15
 
16
16
  private
17
-
18
- def clear_aggregation_cache # :nodoc:
17
+ def clear_aggregation_cache
19
18
  @aggregation_cache.clear if persisted?
20
19
  end
21
20
 
22
- def init_internals # :nodoc:
21
+ def init_internals
23
22
  @aggregation_cache = {}
24
23
  super
25
24
  end
26
25
 
27
- # Active Record implements aggregation through a macro-like class method called #composed_of
28
- # for representing attributes as value objects. It expresses relationships like "Account [is]
29
- # composed of Money [among other things]" or "Person [is] composed of [an] address". Each call
30
- # to the macro adds a description of how the value objects are created from the attributes of
31
- # the entity object (when the entity is initialized either as a new object or from finding an
32
- # existing object) and how it can be turned back into attributes (when the entity is saved to
33
- # the database).
34
- #
35
- # class Customer < ActiveRecord::Base
36
- # composed_of :balance, class_name: "Money", mapping: %w(amount currency)
37
- # composed_of :address, mapping: [ %w(address_street street), %w(address_city city) ]
38
- # end
39
- #
40
- # The customer class now has the following methods to manipulate the value objects:
41
- # * <tt>Customer#balance, Customer#balance=(money)</tt>
42
- # * <tt>Customer#address, Customer#address=(address)</tt>
43
- #
44
- # These methods will operate with value objects like the ones described below:
45
- #
46
- # class Money
47
- # include Comparable
48
- # attr_reader :amount, :currency
49
- # EXCHANGE_RATES = { "USD_TO_DKK" => 6 }
50
- #
51
- # def initialize(amount, currency = "USD")
52
- # @amount, @currency = amount, currency
53
- # end
54
- #
55
- # def exchange_to(other_currency)
56
- # exchanged_amount = (amount * EXCHANGE_RATES["#{currency}_TO_#{other_currency}"]).floor
57
- # Money.new(exchanged_amount, other_currency)
58
- # end
59
- #
60
- # def ==(other_money)
61
- # amount == other_money.amount && currency == other_money.currency
62
- # end
63
- #
64
- # def <=>(other_money)
65
- # if currency == other_money.currency
66
- # amount <=> other_money.amount
67
- # else
68
- # amount <=> other_money.exchange_to(currency).amount
69
- # end
70
- # end
71
- # end
72
- #
73
- # class Address
74
- # attr_reader :street, :city
75
- # def initialize(street, city)
76
- # @street, @city = street, city
77
- # end
78
- #
79
- # def close_to?(other_address)
80
- # city == other_address.city
81
- # end
82
- #
83
- # def ==(other_address)
84
- # city == other_address.city && street == other_address.street
85
- # end
86
- # end
87
- #
88
- # Now it's possible to access attributes from the database through the value objects instead. If
89
- # you choose to name the composition the same as the attribute's name, it will be the only way to
90
- # access that attribute. That's the case with our +balance+ attribute. You interact with the value
91
- # objects just like you would with any other attribute:
92
- #
93
- # customer.balance = Money.new(20) # sets the Money value object and the attribute
94
- # customer.balance # => Money value object
95
- # customer.balance.exchange_to("DKK") # => Money.new(120, "DKK")
96
- # customer.balance > Money.new(10) # => true
97
- # customer.balance == Money.new(20) # => true
98
- # customer.balance < Money.new(5) # => false
99
- #
100
- # Value objects can also be composed of multiple attributes, such as the case of Address. The order
101
- # of the mappings will determine the order of the parameters.
102
- #
103
- # customer.address_street = "Hyancintvej"
104
- # customer.address_city = "Copenhagen"
105
- # customer.address # => Address.new("Hyancintvej", "Copenhagen")
106
- #
107
- # customer.address = Address.new("May Street", "Chicago")
108
- # customer.address_street # => "May Street"
109
- # customer.address_city # => "Chicago"
110
- #
111
- # == Writing value objects
112
- #
113
- # Value objects are immutable and interchangeable objects that represent a given value, such as
114
- # a Money object representing $5. Two Money objects both representing $5 should be equal (through
115
- # methods such as <tt>==</tt> and <tt><=></tt> from Comparable if ranking makes sense). This is
116
- # unlike entity objects where equality is determined by identity. An entity class such as Customer can
117
- # easily have two different objects that both have an address on Hyancintvej. Entity identity is
118
- # determined by object or relational unique identifiers (such as primary keys). Normal
119
- # ActiveRecord::Base classes are entity objects.
120
- #
121
- # It's also important to treat the value objects as immutable. Don't allow the Money object to have
122
- # its amount changed after creation. Create a new Money object with the new value instead. The
123
- # <tt>Money#exchange_to</tt> method is an example of this. It returns a new value object instead of changing
124
- # its own values. Active Record won't persist value objects that have been changed through means
125
- # other than the writer method.
126
- #
127
- # The immutable requirement is enforced by Active Record by freezing any object assigned as a value
128
- # object. Attempting to change it afterwards will result in a +RuntimeError+.
129
- #
130
- # Read more about value objects on http://c2.com/cgi/wiki?ValueObject and on the dangers of not
131
- # keeping value objects immutable on http://c2.com/cgi/wiki?ValueObjectsShouldBeImmutable
132
- #
133
- # == Custom constructors and converters
134
- #
135
- # By default value objects are initialized by calling the <tt>new</tt> constructor of the value
136
- # class passing each of the mapped attributes, in the order specified by the <tt>:mapping</tt>
137
- # option, as arguments. If the value class doesn't support this convention then #composed_of allows
138
- # a custom constructor to be specified.
139
- #
140
- # When a new value is assigned to the value object, the default assumption is that the new value
141
- # is an instance of the value class. Specifying a custom converter allows the new value to be automatically
142
- # converted to an instance of value class if necessary.
143
- #
144
- # For example, the +NetworkResource+ model has +network_address+ and +cidr_range+ attributes that should be
145
- # aggregated using the +NetAddr::CIDR+ value class (http://www.rubydoc.info/gems/netaddr/1.5.0/NetAddr/CIDR).
146
- # The constructor for the value class is called +create+ and it expects a CIDR address string as a parameter.
147
- # New values can be assigned to the value object using either another +NetAddr::CIDR+ object, a string
148
- # or an array. The <tt>:constructor</tt> and <tt>:converter</tt> options can be used to meet
149
- # these requirements:
150
- #
151
- # class NetworkResource < ActiveRecord::Base
152
- # composed_of :cidr,
153
- # class_name: 'NetAddr::CIDR',
154
- # mapping: [ %w(network_address network), %w(cidr_range bits) ],
155
- # allow_nil: true,
156
- # constructor: Proc.new { |network_address, cidr_range| NetAddr::CIDR.create("#{network_address}/#{cidr_range}") },
157
- # converter: Proc.new { |value| NetAddr::CIDR.create(value.is_a?(Array) ? value.join('/') : value) }
158
- # end
159
- #
160
- # # This calls the :constructor
161
- # network_resource = NetworkResource.new(network_address: '192.168.0.1', cidr_range: 24)
162
- #
163
- # # These assignments will both use the :converter
164
- # network_resource.cidr = [ '192.168.2.1', 8 ]
165
- # network_resource.cidr = '192.168.0.1/24'
166
- #
167
- # # This assignment won't use the :converter as the value is already an instance of the value class
168
- # network_resource.cidr = NetAddr::CIDR.create('192.168.2.1/8')
169
- #
170
- # # Saving and then reloading will use the :constructor on reload
171
- # network_resource.save
172
- # network_resource.reload
173
- #
174
- # == Finding records by a value object
175
- #
176
- # Once a #composed_of relationship is specified for a model, records can be loaded from the database
177
- # by specifying an instance of the value object in the conditions hash. The following example
178
- # finds all customers with +balance_amount+ equal to 20 and +balance_currency+ equal to "USD":
179
- #
180
- # Customer.where(balance: Money.new(20, "USD"))
181
- #
182
- module ClassMethods
183
- # Adds reader and writer methods for manipulating a value object:
184
- # <tt>composed_of :address</tt> adds <tt>address</tt> and <tt>address=(new_address)</tt> methods.
185
- #
186
- # Options are:
187
- # * <tt>:class_name</tt> - Specifies the class name of the association. Use it only if that name
188
- # can't be inferred from the part id. So <tt>composed_of :address</tt> will by default be linked
189
- # to the Address class, but if the real class name is +CompanyAddress+, you'll have to specify it
190
- # with this option.
191
- # * <tt>:mapping</tt> - Specifies the mapping of entity attributes to attributes of the value
192
- # object. Each mapping is represented as an array where the first item is the name of the
193
- # entity attribute and the second item is the name of the attribute in the value object. The
194
- # order in which mappings are defined determines the order in which attributes are sent to the
195
- # value class constructor.
196
- # * <tt>:allow_nil</tt> - Specifies that the value object will not be instantiated when all mapped
197
- # attributes are +nil+. Setting the value object to +nil+ has the effect of writing +nil+ to all
198
- # mapped attributes.
199
- # This defaults to +false+.
200
- # * <tt>:constructor</tt> - A symbol specifying the name of the constructor method or a Proc that
201
- # is called to initialize the value object. The constructor is passed all of the mapped attributes,
202
- # in the order that they are defined in the <tt>:mapping option</tt>, as arguments and uses them
203
- # to instantiate a <tt>:class_name</tt> object.
204
- # The default is <tt>:new</tt>.
205
- # * <tt>:converter</tt> - A symbol specifying the name of a class method of <tt>:class_name</tt>
206
- # or a Proc that is called when a new value is assigned to the value object. The converter is
207
- # passed the single value that is used in the assignment and is only called if the new value is
208
- # not an instance of <tt>:class_name</tt>. If <tt>:allow_nil</tt> is set to true, the converter
209
- # can return nil to skip the assignment.
210
- #
211
- # Option examples:
212
- # composed_of :temperature, mapping: %w(reading celsius)
213
- # composed_of :balance, class_name: "Money", mapping: %w(balance amount),
214
- # converter: Proc.new { |balance| balance.to_money }
215
- # composed_of :address, mapping: [ %w(address_street street), %w(address_city city) ]
216
- # composed_of :gps_location
217
- # composed_of :gps_location, allow_nil: true
218
- # composed_of :ip_address,
219
- # class_name: 'IPAddr',
220
- # mapping: %w(ip to_i),
221
- # constructor: Proc.new { |ip| IPAddr.new(ip, Socket::AF_INET) },
222
- # converter: Proc.new { |ip| ip.is_a?(Integer) ? IPAddr.new(ip, Socket::AF_INET) : IPAddr.new(ip.to_s) }
223
- #
224
- def composed_of(part_id, options = {})
225
- options.assert_valid_keys(:class_name, :mapping, :allow_nil, :constructor, :converter)
26
+ # Active Record implements aggregation through a macro-like class method called #composed_of
27
+ # for representing attributes as value objects. It expresses relationships like "Account [is]
28
+ # composed of Money [among other things]" or "Person [is] composed of [an] address". Each call
29
+ # to the macro adds a description of how the value objects are created from the attributes of
30
+ # the entity object (when the entity is initialized either as a new object or from finding an
31
+ # existing object) and how it can be turned back into attributes (when the entity is saved to
32
+ # the database).
33
+ #
34
+ # class Customer < ActiveRecord::Base
35
+ # composed_of :balance, class_name: "Money", mapping: %w(balance amount)
36
+ # composed_of :address, mapping: [ %w(address_street street), %w(address_city city) ]
37
+ # end
38
+ #
39
+ # The customer class now has the following methods to manipulate the value objects:
40
+ # * <tt>Customer#balance, Customer#balance=(money)</tt>
41
+ # * <tt>Customer#address, Customer#address=(address)</tt>
42
+ #
43
+ # These methods will operate with value objects like the ones described below:
44
+ #
45
+ # class Money
46
+ # include Comparable
47
+ # attr_reader :amount, :currency
48
+ # EXCHANGE_RATES = { "USD_TO_DKK" => 6 }
49
+ #
50
+ # def initialize(amount, currency = "USD")
51
+ # @amount, @currency = amount, currency
52
+ # end
53
+ #
54
+ # def exchange_to(other_currency)
55
+ # exchanged_amount = (amount * EXCHANGE_RATES["#{currency}_TO_#{other_currency}"]).floor
56
+ # Money.new(exchanged_amount, other_currency)
57
+ # end
58
+ #
59
+ # def ==(other_money)
60
+ # amount == other_money.amount && currency == other_money.currency
61
+ # end
62
+ #
63
+ # def <=>(other_money)
64
+ # if currency == other_money.currency
65
+ # amount <=> other_money.amount
66
+ # else
67
+ # amount <=> other_money.exchange_to(currency).amount
68
+ # end
69
+ # end
70
+ # end
71
+ #
72
+ # class Address
73
+ # attr_reader :street, :city
74
+ # def initialize(street, city)
75
+ # @street, @city = street, city
76
+ # end
77
+ #
78
+ # def close_to?(other_address)
79
+ # city == other_address.city
80
+ # end
81
+ #
82
+ # def ==(other_address)
83
+ # city == other_address.city && street == other_address.street
84
+ # end
85
+ # end
86
+ #
87
+ # Now it's possible to access attributes from the database through the value objects instead. If
88
+ # you choose to name the composition the same as the attribute's name, it will be the only way to
89
+ # access that attribute. That's the case with our +balance+ attribute. You interact with the value
90
+ # objects just like you would with any other attribute:
91
+ #
92
+ # customer.balance = Money.new(20) # sets the Money value object and the attribute
93
+ # customer.balance # => Money value object
94
+ # customer.balance.exchange_to("DKK") # => Money.new(120, "DKK")
95
+ # customer.balance > Money.new(10) # => true
96
+ # customer.balance == Money.new(20) # => true
97
+ # customer.balance < Money.new(5) # => false
98
+ #
99
+ # Value objects can also be composed of multiple attributes, such as the case of Address. The order
100
+ # of the mappings will determine the order of the parameters.
101
+ #
102
+ # customer.address_street = "Hyancintvej"
103
+ # customer.address_city = "Copenhagen"
104
+ # customer.address # => Address.new("Hyancintvej", "Copenhagen")
105
+ #
106
+ # customer.address = Address.new("May Street", "Chicago")
107
+ # customer.address_street # => "May Street"
108
+ # customer.address_city # => "Chicago"
109
+ #
110
+ # == Writing value objects
111
+ #
112
+ # Value objects are immutable and interchangeable objects that represent a given value, such as
113
+ # a Money object representing $5. Two Money objects both representing $5 should be equal (through
114
+ # methods such as <tt>==</tt> and <tt><=></tt> from Comparable if ranking makes sense). This is
115
+ # unlike entity objects where equality is determined by identity. An entity class such as Customer can
116
+ # easily have two different objects that both have an address on Hyancintvej. Entity identity is
117
+ # determined by object or relational unique identifiers (such as primary keys). Normal
118
+ # ActiveRecord::Base classes are entity objects.
119
+ #
120
+ # It's also important to treat the value objects as immutable. Don't allow the Money object to have
121
+ # its amount changed after creation. Create a new Money object with the new value instead. The
122
+ # <tt>Money#exchange_to</tt> method is an example of this. It returns a new value object instead of changing
123
+ # its own values. Active Record won't persist value objects that have been changed through means
124
+ # other than the writer method.
125
+ #
126
+ # The immutable requirement is enforced by Active Record by freezing any object assigned as a value
127
+ # object. Attempting to change it afterwards will result in a +RuntimeError+.
128
+ #
129
+ # Read more about value objects on http://c2.com/cgi/wiki?ValueObject and on the dangers of not
130
+ # keeping value objects immutable on http://c2.com/cgi/wiki?ValueObjectsShouldBeImmutable
131
+ #
132
+ # == Custom constructors and converters
133
+ #
134
+ # By default value objects are initialized by calling the <tt>new</tt> constructor of the value
135
+ # class passing each of the mapped attributes, in the order specified by the <tt>:mapping</tt>
136
+ # option, as arguments. If the value class doesn't support this convention then #composed_of allows
137
+ # a custom constructor to be specified.
138
+ #
139
+ # When a new value is assigned to the value object, the default assumption is that the new value
140
+ # is an instance of the value class. Specifying a custom converter allows the new value to be automatically
141
+ # converted to an instance of value class if necessary.
142
+ #
143
+ # For example, the +NetworkResource+ model has +network_address+ and +cidr_range+ attributes that should be
144
+ # aggregated using the +NetAddr::CIDR+ value class (http://www.rubydoc.info/gems/netaddr/1.5.0/NetAddr/CIDR).
145
+ # The constructor for the value class is called +create+ and it expects a CIDR address string as a parameter.
146
+ # New values can be assigned to the value object using either another +NetAddr::CIDR+ object, a string
147
+ # or an array. The <tt>:constructor</tt> and <tt>:converter</tt> options can be used to meet
148
+ # these requirements:
149
+ #
150
+ # class NetworkResource < ActiveRecord::Base
151
+ # composed_of :cidr,
152
+ # class_name: 'NetAddr::CIDR',
153
+ # mapping: [ %w(network_address network), %w(cidr_range bits) ],
154
+ # allow_nil: true,
155
+ # constructor: Proc.new { |network_address, cidr_range| NetAddr::CIDR.create("#{network_address}/#{cidr_range}") },
156
+ # converter: Proc.new { |value| NetAddr::CIDR.create(value.is_a?(Array) ? value.join('/') : value) }
157
+ # end
158
+ #
159
+ # # This calls the :constructor
160
+ # network_resource = NetworkResource.new(network_address: '192.168.0.1', cidr_range: 24)
161
+ #
162
+ # # These assignments will both use the :converter
163
+ # network_resource.cidr = [ '192.168.2.1', 8 ]
164
+ # network_resource.cidr = '192.168.0.1/24'
165
+ #
166
+ # # This assignment won't use the :converter as the value is already an instance of the value class
167
+ # network_resource.cidr = NetAddr::CIDR.create('192.168.2.1/8')
168
+ #
169
+ # # Saving and then reloading will use the :constructor on reload
170
+ # network_resource.save
171
+ # network_resource.reload
172
+ #
173
+ # == Finding records by a value object
174
+ #
175
+ # Once a #composed_of relationship is specified for a model, records can be loaded from the database
176
+ # by specifying an instance of the value object in the conditions hash. The following example
177
+ # finds all customers with +address_street+ equal to "May Street" and +address_city+ equal to "Chicago":
178
+ #
179
+ # Customer.where(address: Address.new("May Street", "Chicago"))
180
+ #
181
+ module ClassMethods
182
+ # Adds reader and writer methods for manipulating a value object:
183
+ # <tt>composed_of :address</tt> adds <tt>address</tt> and <tt>address=(new_address)</tt> methods.
184
+ #
185
+ # Options are:
186
+ # * <tt>:class_name</tt> - Specifies the class name of the association. Use it only if that name
187
+ # can't be inferred from the part id. So <tt>composed_of :address</tt> will by default be linked
188
+ # to the Address class, but if the real class name is +CompanyAddress+, you'll have to specify it
189
+ # with this option.
190
+ # * <tt>:mapping</tt> - Specifies the mapping of entity attributes to attributes of the value
191
+ # object. Each mapping is represented as an array where the first item is the name of the
192
+ # entity attribute and the second item is the name of the attribute in the value object. The
193
+ # order in which mappings are defined determines the order in which attributes are sent to the
194
+ # value class constructor.
195
+ # * <tt>:allow_nil</tt> - Specifies that the value object will not be instantiated when all mapped
196
+ # attributes are +nil+. Setting the value object to +nil+ has the effect of writing +nil+ to all
197
+ # mapped attributes.
198
+ # This defaults to +false+.
199
+ # * <tt>:constructor</tt> - A symbol specifying the name of the constructor method or a Proc that
200
+ # is called to initialize the value object. The constructor is passed all of the mapped attributes,
201
+ # in the order that they are defined in the <tt>:mapping option</tt>, as arguments and uses them
202
+ # to instantiate a <tt>:class_name</tt> object.
203
+ # The default is <tt>:new</tt>.
204
+ # * <tt>:converter</tt> - A symbol specifying the name of a class method of <tt>:class_name</tt>
205
+ # or a Proc that is called when a new value is assigned to the value object. The converter is
206
+ # passed the single value that is used in the assignment and is only called if the new value is
207
+ # not an instance of <tt>:class_name</tt>. If <tt>:allow_nil</tt> is set to true, the converter
208
+ # can return +nil+ to skip the assignment.
209
+ #
210
+ # Option examples:
211
+ # composed_of :temperature, mapping: %w(reading celsius)
212
+ # composed_of :balance, class_name: "Money", mapping: %w(balance amount)
213
+ # composed_of :address, mapping: [ %w(address_street street), %w(address_city city) ]
214
+ # composed_of :gps_location
215
+ # composed_of :gps_location, allow_nil: true
216
+ # composed_of :ip_address,
217
+ # class_name: 'IPAddr',
218
+ # mapping: %w(ip to_i),
219
+ # constructor: Proc.new { |ip| IPAddr.new(ip, Socket::AF_INET) },
220
+ # converter: Proc.new { |ip| ip.is_a?(Integer) ? IPAddr.new(ip, Socket::AF_INET) : IPAddr.new(ip.to_s) }
221
+ #
222
+ def composed_of(part_id, options = {})
223
+ options.assert_valid_keys(:class_name, :mapping, :allow_nil, :constructor, :converter)
226
224
 
227
- name = part_id.id2name
228
- class_name = options[:class_name] || name.camelize
229
- mapping = options[:mapping] || [ name, name ]
230
- mapping = [ mapping ] unless mapping.first.is_a?(Array)
231
- allow_nil = options[:allow_nil] || false
232
- constructor = options[:constructor] || :new
233
- converter = options[:converter]
225
+ unless self < Aggregations
226
+ include Aggregations
227
+ end
234
228
 
235
- reader_method(name, class_name, mapping, allow_nil, constructor)
236
- writer_method(name, class_name, mapping, allow_nil, converter)
229
+ name = part_id.id2name
230
+ class_name = options[:class_name] || name.camelize
231
+ mapping = options[:mapping] || [ name, name ]
232
+ mapping = [ mapping ] unless mapping.first.is_a?(Array)
233
+ allow_nil = options[:allow_nil] || false
234
+ constructor = options[:constructor] || :new
235
+ converter = options[:converter]
237
236
 
238
- reflection = ActiveRecord::Reflection.create(:composed_of, part_id, nil, options, self)
239
- Reflection.add_aggregate_reflection self, part_id, reflection
240
- end
237
+ reader_method(name, class_name, mapping, allow_nil, constructor)
238
+ writer_method(name, class_name, mapping, allow_nil, converter)
241
239
 
242
- private
243
- def reader_method(name, class_name, mapping, allow_nil, constructor)
244
- define_method(name) do
245
- if @aggregation_cache[name].nil? && (!allow_nil || mapping.any? {|key, _| !_read_attribute(key).nil? })
246
- attrs = mapping.collect {|key, _| _read_attribute(key)}
247
- object = constructor.respond_to?(:call) ?
248
- constructor.call(*attrs) :
249
- class_name.constantize.send(constructor, *attrs)
250
- @aggregation_cache[name] = object
240
+ reflection = ActiveRecord::Reflection.create(:composed_of, part_id, nil, options, self)
241
+ Reflection.add_aggregate_reflection self, part_id, reflection
242
+ end
243
+
244
+ private
245
+ def reader_method(name, class_name, mapping, allow_nil, constructor)
246
+ define_method(name) do
247
+ if @aggregation_cache[name].nil? && (!allow_nil || mapping.any? { |key, _| !_read_attribute(key).nil? })
248
+ attrs = mapping.collect { |key, _| _read_attribute(key) }
249
+ object = constructor.respond_to?(:call) ?
250
+ constructor.call(*attrs) :
251
+ class_name.constantize.send(constructor, *attrs)
252
+ @aggregation_cache[name] = object
253
+ end
254
+ @aggregation_cache[name]
251
255
  end
252
- @aggregation_cache[name]
253
256
  end
254
- end
255
257
 
256
- def writer_method(name, class_name, mapping, allow_nil, converter)
257
- define_method("#{name}=") do |part|
258
- klass = class_name.constantize
258
+ def writer_method(name, class_name, mapping, allow_nil, converter)
259
+ define_method("#{name}=") do |part|
260
+ klass = class_name.constantize
259
261
 
260
- unless part.is_a?(klass) || converter.nil? || part.nil?
261
- part = converter.respond_to?(:call) ? converter.call(part) : klass.send(converter, part)
262
- end
262
+ unless part.is_a?(klass) || converter.nil? || part.nil?
263
+ part = converter.respond_to?(:call) ? converter.call(part) : klass.send(converter, part)
264
+ end
263
265
 
264
- hash_from_multiparameter_assignment = part.is_a?(Hash) &&
265
- part.each_key.all? { |k| k.is_a?(Integer) }
266
- if hash_from_multiparameter_assignment
267
- raise ArgumentError unless part.size == part.each_key.max
268
- part = klass.new(*part.sort.map(&:last))
269
- end
266
+ hash_from_multiparameter_assignment = part.is_a?(Hash) &&
267
+ part.each_key.all? { |k| k.is_a?(Integer) }
268
+ if hash_from_multiparameter_assignment
269
+ raise ArgumentError unless part.size == part.each_key.max
270
+ part = klass.new(*part.sort.map(&:last))
271
+ end
270
272
 
271
- if part.nil? && allow_nil
272
- mapping.each { |key, _| self[key] = nil }
273
- @aggregation_cache[name] = nil
274
- else
275
- mapping.each { |key, value| self[key] = part.send(value) }
276
- @aggregation_cache[name] = part.freeze
273
+ if part.nil? && allow_nil
274
+ mapping.each { |key, _| self[key] = nil }
275
+ @aggregation_cache[name] = nil
276
+ else
277
+ mapping.each { |key, value| self[key] = part.send(value) }
278
+ @aggregation_cache[name] = part.freeze
279
+ end
277
280
  end
278
281
  end
279
- end
280
- end
282
+ end
281
283
  end
282
284
  end
@@ -1,7 +1,9 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module ActiveRecord
2
4
  class AssociationRelation < Relation
3
- def initialize(klass, table, predicate_builder, association)
4
- super(klass, table, predicate_builder)
5
+ def initialize(klass, association, **)
6
+ super(klass)
5
7
  @association = association
6
8
  end
7
9
 
@@ -13,26 +15,28 @@ module ActiveRecord
13
15
  other == records
14
16
  end
15
17
 
16
- def build(*args, &block)
17
- scoping { @association.build(*args, &block) }
18
+ def build(attributes = nil, &block)
19
+ block = _deprecated_scope_block("new", &block)
20
+ scoping { @association.build(attributes, &block) }
18
21
  end
19
22
  alias new build
20
23
 
21
- def create(*args, &block)
22
- scoping { @association.create(*args, &block) }
24
+ def create(attributes = nil, &block)
25
+ block = _deprecated_scope_block("create", &block)
26
+ scoping { @association.create(attributes, &block) }
23
27
  end
24
28
 
25
- def create!(*args, &block)
26
- scoping { @association.create!(*args, &block) }
29
+ def create!(attributes = nil, &block)
30
+ block = _deprecated_scope_block("create!", &block)
31
+ scoping { @association.create!(attributes, &block) }
27
32
  end
28
33
 
29
34
  private
30
-
31
- def exec_queries
32
- super do |r|
33
- @association.set_inverse_instance r
34
- yield r if block_given?
35
+ def exec_queries
36
+ super do |record|
37
+ @association.set_inverse_instance_from_queries(record)
38
+ yield record if block_given?
39
+ end
35
40
  end
36
- end
37
41
  end
38
42
  end