activerecord 5.0.7.2 → 6.1.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 (363) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +829 -2015
  3. data/MIT-LICENSE +3 -1
  4. data/README.rdoc +11 -9
  5. data/examples/performance.rb +31 -29
  6. data/examples/simple.rb +5 -3
  7. data/lib/active_record.rb +37 -29
  8. data/lib/active_record/aggregations.rb +249 -247
  9. data/lib/active_record/association_relation.rb +30 -18
  10. data/lib/active_record/associations.rb +1714 -1596
  11. data/lib/active_record/associations/alias_tracker.rb +36 -42
  12. data/lib/active_record/associations/association.rb +143 -68
  13. data/lib/active_record/associations/association_scope.rb +98 -94
  14. data/lib/active_record/associations/belongs_to_association.rb +76 -46
  15. data/lib/active_record/associations/belongs_to_polymorphic_association.rb +13 -12
  16. data/lib/active_record/associations/builder/association.rb +27 -28
  17. data/lib/active_record/associations/builder/belongs_to.rb +52 -60
  18. data/lib/active_record/associations/builder/collection_association.rb +12 -22
  19. data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +40 -62
  20. data/lib/active_record/associations/builder/has_many.rb +10 -2
  21. data/lib/active_record/associations/builder/has_one.rb +35 -2
  22. data/lib/active_record/associations/builder/singular_association.rb +5 -1
  23. data/lib/active_record/associations/collection_association.rb +104 -259
  24. data/lib/active_record/associations/collection_proxy.rb +169 -125
  25. data/lib/active_record/associations/foreign_association.rb +22 -0
  26. data/lib/active_record/associations/has_many_association.rb +46 -31
  27. data/lib/active_record/associations/has_many_through_association.rb +66 -46
  28. data/lib/active_record/associations/has_one_association.rb +71 -52
  29. data/lib/active_record/associations/has_one_through_association.rb +20 -11
  30. data/lib/active_record/associations/join_dependency.rb +169 -180
  31. data/lib/active_record/associations/join_dependency/join_association.rb +53 -79
  32. data/lib/active_record/associations/join_dependency/join_base.rb +10 -9
  33. data/lib/active_record/associations/join_dependency/join_part.rb +14 -14
  34. data/lib/active_record/associations/preloader.rb +97 -104
  35. data/lib/active_record/associations/preloader/association.rb +109 -97
  36. data/lib/active_record/associations/preloader/through_association.rb +77 -76
  37. data/lib/active_record/associations/singular_association.rb +12 -45
  38. data/lib/active_record/associations/through_association.rb +27 -15
  39. data/lib/active_record/attribute_assignment.rb +55 -60
  40. data/lib/active_record/attribute_methods.rb +111 -141
  41. data/lib/active_record/attribute_methods/before_type_cast.rb +17 -9
  42. data/lib/active_record/attribute_methods/dirty.rb +172 -112
  43. data/lib/active_record/attribute_methods/primary_key.rb +88 -91
  44. data/lib/active_record/attribute_methods/query.rb +6 -8
  45. data/lib/active_record/attribute_methods/read.rb +18 -50
  46. data/lib/active_record/attribute_methods/serialization.rb +38 -10
  47. data/lib/active_record/attribute_methods/time_zone_conversion.rb +38 -66
  48. data/lib/active_record/attribute_methods/write.rb +25 -32
  49. data/lib/active_record/attributes.rb +69 -31
  50. data/lib/active_record/autosave_association.rb +102 -66
  51. data/lib/active_record/base.rb +16 -25
  52. data/lib/active_record/callbacks.rb +202 -43
  53. data/lib/active_record/coders/json.rb +2 -0
  54. data/lib/active_record/coders/yaml_column.rb +11 -12
  55. data/lib/active_record/connection_adapters.rb +50 -0
  56. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +661 -375
  57. data/lib/active_record/connection_adapters/abstract/database_limits.rb +14 -38
  58. data/lib/active_record/connection_adapters/abstract/database_statements.rb +269 -105
  59. data/lib/active_record/connection_adapters/abstract/query_cache.rb +54 -35
  60. data/lib/active_record/connection_adapters/abstract/quoting.rb +137 -93
  61. data/lib/active_record/connection_adapters/abstract/savepoints.rb +5 -3
  62. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +155 -113
  63. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +328 -162
  64. data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +68 -80
  65. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +591 -259
  66. data/lib/active_record/connection_adapters/abstract/transaction.rb +229 -91
  67. data/lib/active_record/connection_adapters/abstract_adapter.rb +392 -244
  68. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +457 -582
  69. data/lib/active_record/connection_adapters/column.rb +55 -13
  70. data/lib/active_record/connection_adapters/deduplicable.rb +29 -0
  71. data/lib/active_record/connection_adapters/legacy_pool_manager.rb +31 -0
  72. data/lib/active_record/connection_adapters/mysql/column.rb +8 -31
  73. data/lib/active_record/connection_adapters/mysql/database_statements.rb +135 -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 +79 -49
  77. data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +66 -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 +20 -12
  81. data/lib/active_record/connection_adapters/mysql2_adapter.rb +74 -37
  82. data/lib/active_record/connection_adapters/pool_config.rb +63 -0
  83. data/lib/active_record/connection_adapters/pool_manager.rb +43 -0
  84. data/lib/active_record/connection_adapters/postgresql/column.rb +39 -28
  85. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +70 -101
  86. data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +5 -3
  87. data/lib/active_record/connection_adapters/postgresql/oid.rb +26 -21
  88. data/lib/active_record/connection_adapters/postgresql/oid/array.rb +22 -11
  89. data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +6 -5
  90. data/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb +2 -0
  91. data/lib/active_record/connection_adapters/postgresql/oid/bytea.rb +2 -0
  92. data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +6 -6
  93. data/lib/active_record/connection_adapters/postgresql/oid/date.rb +23 -0
  94. data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +14 -4
  95. data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +3 -1
  96. data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +5 -4
  97. data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +19 -18
  98. data/lib/active_record/connection_adapters/postgresql/oid/inet.rb +2 -0
  99. data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
  100. data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +3 -11
  101. data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +44 -0
  102. data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
  103. data/lib/active_record/connection_adapters/postgresql/oid/money.rb +7 -5
  104. data/lib/active_record/connection_adapters/postgresql/oid/{json.rb → oid.rb} +6 -1
  105. data/lib/active_record/connection_adapters/postgresql/oid/point.rb +30 -9
  106. data/lib/active_record/connection_adapters/postgresql/oid/range.rb +52 -30
  107. data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +4 -1
  108. data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +58 -54
  109. data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +18 -4
  110. data/lib/active_record/connection_adapters/postgresql/oid/vector.rb +2 -0
  111. data/lib/active_record/connection_adapters/postgresql/oid/xml.rb +2 -0
  112. data/lib/active_record/connection_adapters/postgresql/quoting.rb +98 -38
  113. data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +21 -27
  114. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +80 -0
  115. data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +147 -105
  116. data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +34 -32
  117. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +426 -324
  118. data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +32 -23
  119. data/lib/active_record/connection_adapters/postgresql/utils.rb +9 -6
  120. data/lib/active_record/connection_adapters/postgresql_adapter.rb +418 -293
  121. data/lib/active_record/connection_adapters/schema_cache.rb +135 -18
  122. data/lib/active_record/connection_adapters/sql_type_metadata.rb +22 -7
  123. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +144 -0
  124. data/lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb +3 -1
  125. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +72 -18
  126. data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +5 -6
  127. data/lib/active_record/connection_adapters/sqlite3/schema_definitions.rb +19 -0
  128. data/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb +18 -0
  129. data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +170 -0
  130. data/lib/active_record/connection_adapters/sqlite3_adapter.rb +282 -290
  131. data/lib/active_record/connection_adapters/statement_pool.rb +9 -8
  132. data/lib/active_record/connection_handling.rb +287 -45
  133. data/lib/active_record/core.rb +385 -181
  134. data/lib/active_record/counter_cache.rb +60 -28
  135. data/lib/active_record/database_configurations.rb +272 -0
  136. data/lib/active_record/database_configurations/connection_url_resolver.rb +98 -0
  137. data/lib/active_record/database_configurations/database_config.rb +80 -0
  138. data/lib/active_record/database_configurations/hash_config.rb +96 -0
  139. data/lib/active_record/database_configurations/url_config.rb +53 -0
  140. data/lib/active_record/delegated_type.rb +209 -0
  141. data/lib/active_record/destroy_association_async_job.rb +36 -0
  142. data/lib/active_record/dynamic_matchers.rb +87 -87
  143. data/lib/active_record/enum.rb +122 -47
  144. data/lib/active_record/errors.rb +153 -22
  145. data/lib/active_record/explain.rb +13 -8
  146. data/lib/active_record/explain_registry.rb +3 -1
  147. data/lib/active_record/explain_subscriber.rb +9 -4
  148. data/lib/active_record/fixture_set/file.rb +20 -22
  149. data/lib/active_record/fixture_set/model_metadata.rb +32 -0
  150. data/lib/active_record/fixture_set/render_context.rb +17 -0
  151. data/lib/active_record/fixture_set/table_row.rb +152 -0
  152. data/lib/active_record/fixture_set/table_rows.rb +46 -0
  153. data/lib/active_record/fixtures.rb +246 -507
  154. data/lib/active_record/gem_version.rb +6 -4
  155. data/lib/active_record/inheritance.rb +168 -95
  156. data/lib/active_record/insert_all.rb +208 -0
  157. data/lib/active_record/integration.rb +114 -25
  158. data/lib/active_record/internal_metadata.rb +30 -24
  159. data/lib/active_record/legacy_yaml_adapter.rb +11 -5
  160. data/lib/active_record/locking/optimistic.rb +81 -85
  161. data/lib/active_record/locking/pessimistic.rb +22 -6
  162. data/lib/active_record/log_subscriber.rb +68 -31
  163. data/lib/active_record/middleware/database_selector.rb +77 -0
  164. data/lib/active_record/middleware/database_selector/resolver.rb +92 -0
  165. data/lib/active_record/middleware/database_selector/resolver/session.rb +48 -0
  166. data/lib/active_record/migration.rb +439 -342
  167. data/lib/active_record/migration/command_recorder.rb +152 -98
  168. data/lib/active_record/migration/compatibility.rb +229 -60
  169. data/lib/active_record/migration/join_table.rb +8 -7
  170. data/lib/active_record/model_schema.rb +230 -122
  171. data/lib/active_record/nested_attributes.rb +213 -203
  172. data/lib/active_record/no_touching.rb +11 -2
  173. data/lib/active_record/null_relation.rb +12 -34
  174. data/lib/active_record/persistence.rb +471 -97
  175. data/lib/active_record/query_cache.rb +23 -12
  176. data/lib/active_record/querying.rb +43 -25
  177. data/lib/active_record/railtie.rb +155 -43
  178. data/lib/active_record/railties/console_sandbox.rb +2 -0
  179. data/lib/active_record/railties/controller_runtime.rb +34 -33
  180. data/lib/active_record/railties/databases.rake +507 -195
  181. data/lib/active_record/readonly_attributes.rb +9 -4
  182. data/lib/active_record/reflection.rb +245 -269
  183. data/lib/active_record/relation.rb +475 -324
  184. data/lib/active_record/relation/batches.rb +125 -72
  185. data/lib/active_record/relation/batches/batch_enumerator.rb +28 -10
  186. data/lib/active_record/relation/calculations.rb +267 -171
  187. data/lib/active_record/relation/delegation.rb +73 -69
  188. data/lib/active_record/relation/finder_methods.rb +238 -248
  189. data/lib/active_record/relation/from_clause.rb +7 -9
  190. data/lib/active_record/relation/merger.rb +95 -77
  191. data/lib/active_record/relation/predicate_builder.rb +109 -110
  192. data/lib/active_record/relation/predicate_builder/array_handler.rb +22 -17
  193. data/lib/active_record/relation/predicate_builder/association_query_value.rb +42 -0
  194. data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +6 -4
  195. data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +55 -0
  196. data/lib/active_record/relation/predicate_builder/range_handler.rb +7 -18
  197. data/lib/active_record/relation/predicate_builder/relation_handler.rb +7 -1
  198. data/lib/active_record/relation/query_attribute.rb +33 -2
  199. data/lib/active_record/relation/query_methods.rb +654 -374
  200. data/lib/active_record/relation/record_fetch_warning.rb +8 -6
  201. data/lib/active_record/relation/spawn_methods.rb +15 -14
  202. data/lib/active_record/relation/where_clause.rb +171 -109
  203. data/lib/active_record/result.rb +88 -51
  204. data/lib/active_record/runtime_registry.rb +5 -3
  205. data/lib/active_record/sanitization.rb +73 -100
  206. data/lib/active_record/schema.rb +7 -14
  207. data/lib/active_record/schema_dumper.rb +101 -69
  208. data/lib/active_record/schema_migration.rb +16 -12
  209. data/lib/active_record/scoping.rb +20 -20
  210. data/lib/active_record/scoping/default.rb +92 -95
  211. data/lib/active_record/scoping/named.rb +39 -30
  212. data/lib/active_record/secure_token.rb +19 -9
  213. data/lib/active_record/serialization.rb +7 -3
  214. data/lib/active_record/signed_id.rb +116 -0
  215. data/lib/active_record/statement_cache.rb +80 -29
  216. data/lib/active_record/store.rb +122 -42
  217. data/lib/active_record/suppressor.rb +6 -3
  218. data/lib/active_record/table_metadata.rb +51 -39
  219. data/lib/active_record/tasks/database_tasks.rb +332 -115
  220. data/lib/active_record/tasks/mysql_database_tasks.rb +66 -104
  221. data/lib/active_record/tasks/postgresql_database_tasks.rb +84 -56
  222. data/lib/active_record/tasks/sqlite_database_tasks.rb +40 -19
  223. data/lib/active_record/test_databases.rb +24 -0
  224. data/lib/active_record/test_fixtures.rb +246 -0
  225. data/lib/active_record/timestamp.rb +70 -38
  226. data/lib/active_record/touch_later.rb +26 -24
  227. data/lib/active_record/transactions.rb +121 -184
  228. data/lib/active_record/translation.rb +3 -1
  229. data/lib/active_record/type.rb +29 -17
  230. data/lib/active_record/type/adapter_specific_registry.rb +44 -48
  231. data/lib/active_record/type/date.rb +2 -0
  232. data/lib/active_record/type/date_time.rb +2 -0
  233. data/lib/active_record/type/decimal_without_scale.rb +15 -0
  234. data/lib/active_record/type/hash_lookup_type_map.rb +5 -4
  235. data/lib/active_record/type/internal/timezone.rb +2 -0
  236. data/lib/active_record/type/json.rb +30 -0
  237. data/lib/active_record/type/serialized.rb +20 -9
  238. data/lib/active_record/type/text.rb +11 -0
  239. data/lib/active_record/type/time.rb +12 -1
  240. data/lib/active_record/type/type_map.rb +14 -17
  241. data/lib/active_record/type/unsigned_integer.rb +16 -0
  242. data/lib/active_record/type_caster.rb +4 -2
  243. data/lib/active_record/type_caster/connection.rb +17 -13
  244. data/lib/active_record/type_caster/map.rb +10 -6
  245. data/lib/active_record/validations.rb +8 -5
  246. data/lib/active_record/validations/absence.rb +2 -0
  247. data/lib/active_record/validations/associated.rb +4 -3
  248. data/lib/active_record/validations/length.rb +2 -0
  249. data/lib/active_record/validations/numericality.rb +35 -0
  250. data/lib/active_record/validations/presence.rb +4 -2
  251. data/lib/active_record/validations/uniqueness.rb +52 -45
  252. data/lib/active_record/version.rb +3 -1
  253. data/lib/arel.rb +54 -0
  254. data/lib/arel/alias_predication.rb +9 -0
  255. data/lib/arel/attributes/attribute.rb +41 -0
  256. data/lib/arel/collectors/bind.rb +29 -0
  257. data/lib/arel/collectors/composite.rb +39 -0
  258. data/lib/arel/collectors/plain_string.rb +20 -0
  259. data/lib/arel/collectors/sql_string.rb +27 -0
  260. data/lib/arel/collectors/substitute_binds.rb +35 -0
  261. data/lib/arel/crud.rb +42 -0
  262. data/lib/arel/delete_manager.rb +18 -0
  263. data/lib/arel/errors.rb +9 -0
  264. data/lib/arel/expressions.rb +29 -0
  265. data/lib/arel/factory_methods.rb +49 -0
  266. data/lib/arel/insert_manager.rb +49 -0
  267. data/lib/arel/math.rb +45 -0
  268. data/lib/arel/nodes.rb +70 -0
  269. data/lib/arel/nodes/and.rb +32 -0
  270. data/lib/arel/nodes/ascending.rb +23 -0
  271. data/lib/arel/nodes/binary.rb +126 -0
  272. data/lib/arel/nodes/bind_param.rb +44 -0
  273. data/lib/arel/nodes/case.rb +55 -0
  274. data/lib/arel/nodes/casted.rb +62 -0
  275. data/lib/arel/nodes/comment.rb +29 -0
  276. data/lib/arel/nodes/count.rb +12 -0
  277. data/lib/arel/nodes/delete_statement.rb +45 -0
  278. data/lib/arel/nodes/descending.rb +23 -0
  279. data/lib/arel/nodes/equality.rb +15 -0
  280. data/lib/arel/nodes/extract.rb +24 -0
  281. data/lib/arel/nodes/false.rb +16 -0
  282. data/lib/arel/nodes/full_outer_join.rb +8 -0
  283. data/lib/arel/nodes/function.rb +44 -0
  284. data/lib/arel/nodes/grouping.rb +11 -0
  285. data/lib/arel/nodes/homogeneous_in.rb +72 -0
  286. data/lib/arel/nodes/in.rb +15 -0
  287. data/lib/arel/nodes/infix_operation.rb +92 -0
  288. data/lib/arel/nodes/inner_join.rb +8 -0
  289. data/lib/arel/nodes/insert_statement.rb +37 -0
  290. data/lib/arel/nodes/join_source.rb +20 -0
  291. data/lib/arel/nodes/matches.rb +18 -0
  292. data/lib/arel/nodes/named_function.rb +23 -0
  293. data/lib/arel/nodes/node.rb +51 -0
  294. data/lib/arel/nodes/node_expression.rb +13 -0
  295. data/lib/arel/nodes/ordering.rb +27 -0
  296. data/lib/arel/nodes/outer_join.rb +8 -0
  297. data/lib/arel/nodes/over.rb +15 -0
  298. data/lib/arel/nodes/regexp.rb +16 -0
  299. data/lib/arel/nodes/right_outer_join.rb +8 -0
  300. data/lib/arel/nodes/select_core.rb +67 -0
  301. data/lib/arel/nodes/select_statement.rb +41 -0
  302. data/lib/arel/nodes/sql_literal.rb +19 -0
  303. data/lib/arel/nodes/string_join.rb +11 -0
  304. data/lib/arel/nodes/table_alias.rb +31 -0
  305. data/lib/arel/nodes/terminal.rb +16 -0
  306. data/lib/arel/nodes/true.rb +16 -0
  307. data/lib/arel/nodes/unary.rb +44 -0
  308. data/lib/arel/nodes/unary_operation.rb +20 -0
  309. data/lib/arel/nodes/unqualified_column.rb +22 -0
  310. data/lib/arel/nodes/update_statement.rb +41 -0
  311. data/lib/arel/nodes/values_list.rb +9 -0
  312. data/lib/arel/nodes/window.rb +126 -0
  313. data/lib/arel/nodes/with.rb +11 -0
  314. data/lib/arel/order_predications.rb +13 -0
  315. data/lib/arel/predications.rb +250 -0
  316. data/lib/arel/select_manager.rb +270 -0
  317. data/lib/arel/table.rb +118 -0
  318. data/lib/arel/tree_manager.rb +72 -0
  319. data/lib/arel/update_manager.rb +34 -0
  320. data/lib/arel/visitors.rb +13 -0
  321. data/lib/arel/visitors/dot.rb +308 -0
  322. data/lib/arel/visitors/mysql.rb +93 -0
  323. data/lib/arel/visitors/postgresql.rb +120 -0
  324. data/lib/arel/visitors/sqlite.rb +38 -0
  325. data/lib/arel/visitors/to_sql.rb +899 -0
  326. data/lib/arel/visitors/visitor.rb +45 -0
  327. data/lib/arel/window_predications.rb +9 -0
  328. data/lib/rails/generators/active_record.rb +7 -5
  329. data/lib/rails/generators/active_record/application_record/application_record_generator.rb +26 -0
  330. data/lib/rails/generators/active_record/{model/templates/application_record.rb → application_record/templates/application_record.rb.tt} +0 -0
  331. data/lib/rails/generators/active_record/migration.rb +22 -3
  332. data/lib/rails/generators/active_record/migration/migration_generator.rb +38 -35
  333. data/lib/rails/generators/active_record/migration/templates/{create_table_migration.rb → create_table_migration.rb.tt} +3 -1
  334. data/lib/rails/generators/active_record/migration/templates/{migration.rb → migration.rb.tt} +7 -5
  335. data/lib/rails/generators/active_record/model/model_generator.rb +41 -25
  336. data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
  337. data/lib/rails/generators/active_record/model/templates/{model.rb → model.rb.tt} +10 -1
  338. data/lib/rails/generators/active_record/model/templates/{module.rb → module.rb.tt} +0 -0
  339. metadata +141 -57
  340. data/lib/active_record/associations/preloader/belongs_to.rb +0 -17
  341. data/lib/active_record/associations/preloader/collection_association.rb +0 -17
  342. data/lib/active_record/associations/preloader/has_many.rb +0 -17
  343. data/lib/active_record/associations/preloader/has_many_through.rb +0 -19
  344. data/lib/active_record/associations/preloader/has_one.rb +0 -15
  345. data/lib/active_record/associations/preloader/has_one_through.rb +0 -9
  346. data/lib/active_record/associations/preloader/singular_association.rb +0 -20
  347. data/lib/active_record/attribute.rb +0 -213
  348. data/lib/active_record/attribute/user_provided_default.rb +0 -28
  349. data/lib/active_record/attribute_decorators.rb +0 -67
  350. data/lib/active_record/attribute_mutation_tracker.rb +0 -70
  351. data/lib/active_record/attribute_set.rb +0 -110
  352. data/lib/active_record/attribute_set/builder.rb +0 -132
  353. data/lib/active_record/collection_cache_key.rb +0 -50
  354. data/lib/active_record/connection_adapters/connection_specification.rb +0 -263
  355. data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +0 -22
  356. data/lib/active_record/connection_adapters/postgresql/oid/rails_5_1_point.rb +0 -50
  357. data/lib/active_record/railties/jdbcmysql_error.rb +0 -16
  358. data/lib/active_record/relation/predicate_builder/association_query_handler.rb +0 -88
  359. data/lib/active_record/relation/predicate_builder/base_handler.rb +0 -17
  360. data/lib/active_record/relation/predicate_builder/class_handler.rb +0 -27
  361. data/lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb +0 -57
  362. data/lib/active_record/relation/where_clause_factory.rb +0 -38
  363. data/lib/active_record/type/internal/abstract_json.rb +0 -33
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activerecord
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.7.2
4
+ version: 6.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Heinemeier Hansson
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-13 00:00:00.000000000 Z
11
+ date: 2021-01-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,42 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 5.0.7.2
19
+ version: 6.1.1
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: 5.0.7.2
26
+ version: 6.1.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activemodel
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 5.0.7.2
33
+ version: 6.1.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 5.0.7.2
41
- - !ruby/object:Gem::Dependency
42
- name: arel
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - "~>"
46
- - !ruby/object:Gem::Version
47
- version: '7.0'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - "~>"
53
- - !ruby/object:Gem::Version
54
- version: '7.0'
40
+ version: 6.1.1
55
41
  description: Databases on Rails. Build a persistent domain model by mapping database
56
42
  tables to Ruby classes. Strong conventions for associations, validations, aggregations,
57
43
  migrations, and testing come baked-in.
@@ -95,20 +81,10 @@ files:
95
81
  - lib/active_record/associations/join_dependency/join_part.rb
96
82
  - lib/active_record/associations/preloader.rb
97
83
  - lib/active_record/associations/preloader/association.rb
98
- - lib/active_record/associations/preloader/belongs_to.rb
99
- - lib/active_record/associations/preloader/collection_association.rb
100
- - lib/active_record/associations/preloader/has_many.rb
101
- - lib/active_record/associations/preloader/has_many_through.rb
102
- - lib/active_record/associations/preloader/has_one.rb
103
- - lib/active_record/associations/preloader/has_one_through.rb
104
- - lib/active_record/associations/preloader/singular_association.rb
105
84
  - lib/active_record/associations/preloader/through_association.rb
106
85
  - lib/active_record/associations/singular_association.rb
107
86
  - lib/active_record/associations/through_association.rb
108
- - lib/active_record/attribute.rb
109
- - lib/active_record/attribute/user_provided_default.rb
110
87
  - lib/active_record/attribute_assignment.rb
111
- - lib/active_record/attribute_decorators.rb
112
88
  - lib/active_record/attribute_methods.rb
113
89
  - lib/active_record/attribute_methods/before_type_cast.rb
114
90
  - lib/active_record/attribute_methods/dirty.rb
@@ -118,16 +94,13 @@ files:
118
94
  - lib/active_record/attribute_methods/serialization.rb
119
95
  - lib/active_record/attribute_methods/time_zone_conversion.rb
120
96
  - lib/active_record/attribute_methods/write.rb
121
- - lib/active_record/attribute_mutation_tracker.rb
122
- - lib/active_record/attribute_set.rb
123
- - lib/active_record/attribute_set/builder.rb
124
97
  - lib/active_record/attributes.rb
125
98
  - lib/active_record/autosave_association.rb
126
99
  - lib/active_record/base.rb
127
100
  - lib/active_record/callbacks.rb
128
101
  - lib/active_record/coders/json.rb
129
102
  - lib/active_record/coders/yaml_column.rb
130
- - lib/active_record/collection_cache_key.rb
103
+ - lib/active_record/connection_adapters.rb
131
104
  - lib/active_record/connection_adapters/abstract/connection_pool.rb
132
105
  - lib/active_record/connection_adapters/abstract/database_limits.rb
133
106
  - lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -142,8 +115,8 @@ files:
142
115
  - lib/active_record/connection_adapters/abstract_adapter.rb
143
116
  - lib/active_record/connection_adapters/abstract_mysql_adapter.rb
144
117
  - lib/active_record/connection_adapters/column.rb
145
- - lib/active_record/connection_adapters/connection_specification.rb
146
- - lib/active_record/connection_adapters/determine_if_preparable_visitor.rb
118
+ - lib/active_record/connection_adapters/deduplicable.rb
119
+ - lib/active_record/connection_adapters/legacy_pool_manager.rb
147
120
  - lib/active_record/connection_adapters/mysql/column.rb
148
121
  - lib/active_record/connection_adapters/mysql/database_statements.rb
149
122
  - lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb
@@ -151,8 +124,11 @@ files:
151
124
  - lib/active_record/connection_adapters/mysql/schema_creation.rb
152
125
  - lib/active_record/connection_adapters/mysql/schema_definitions.rb
153
126
  - lib/active_record/connection_adapters/mysql/schema_dumper.rb
127
+ - lib/active_record/connection_adapters/mysql/schema_statements.rb
154
128
  - lib/active_record/connection_adapters/mysql/type_metadata.rb
155
129
  - lib/active_record/connection_adapters/mysql2_adapter.rb
130
+ - lib/active_record/connection_adapters/pool_config.rb
131
+ - lib/active_record/connection_adapters/pool_manager.rb
156
132
  - lib/active_record/connection_adapters/postgresql/column.rb
157
133
  - lib/active_record/connection_adapters/postgresql/database_statements.rb
158
134
  - lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb
@@ -162,16 +138,19 @@ files:
162
138
  - lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb
163
139
  - lib/active_record/connection_adapters/postgresql/oid/bytea.rb
164
140
  - lib/active_record/connection_adapters/postgresql/oid/cidr.rb
141
+ - lib/active_record/connection_adapters/postgresql/oid/date.rb
165
142
  - lib/active_record/connection_adapters/postgresql/oid/date_time.rb
166
143
  - lib/active_record/connection_adapters/postgresql/oid/decimal.rb
167
144
  - lib/active_record/connection_adapters/postgresql/oid/enum.rb
168
145
  - lib/active_record/connection_adapters/postgresql/oid/hstore.rb
169
146
  - lib/active_record/connection_adapters/postgresql/oid/inet.rb
170
- - lib/active_record/connection_adapters/postgresql/oid/json.rb
147
+ - lib/active_record/connection_adapters/postgresql/oid/interval.rb
171
148
  - lib/active_record/connection_adapters/postgresql/oid/jsonb.rb
149
+ - lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb
150
+ - lib/active_record/connection_adapters/postgresql/oid/macaddr.rb
172
151
  - lib/active_record/connection_adapters/postgresql/oid/money.rb
152
+ - lib/active_record/connection_adapters/postgresql/oid/oid.rb
173
153
  - lib/active_record/connection_adapters/postgresql/oid/point.rb
174
- - lib/active_record/connection_adapters/postgresql/oid/rails_5_1_point.rb
175
154
  - lib/active_record/connection_adapters/postgresql/oid/range.rb
176
155
  - lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
177
156
  - lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
@@ -180,6 +159,7 @@ files:
180
159
  - lib/active_record/connection_adapters/postgresql/oid/xml.rb
181
160
  - lib/active_record/connection_adapters/postgresql/quoting.rb
182
161
  - lib/active_record/connection_adapters/postgresql/referential_integrity.rb
162
+ - lib/active_record/connection_adapters/postgresql/schema_creation.rb
183
163
  - lib/active_record/connection_adapters/postgresql/schema_definitions.rb
184
164
  - lib/active_record/connection_adapters/postgresql/schema_dumper.rb
185
165
  - lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -188,14 +168,25 @@ files:
188
168
  - lib/active_record/connection_adapters/postgresql_adapter.rb
189
169
  - lib/active_record/connection_adapters/schema_cache.rb
190
170
  - lib/active_record/connection_adapters/sql_type_metadata.rb
171
+ - lib/active_record/connection_adapters/sqlite3/database_statements.rb
191
172
  - lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb
192
173
  - lib/active_record/connection_adapters/sqlite3/quoting.rb
193
174
  - lib/active_record/connection_adapters/sqlite3/schema_creation.rb
175
+ - lib/active_record/connection_adapters/sqlite3/schema_definitions.rb
176
+ - lib/active_record/connection_adapters/sqlite3/schema_dumper.rb
177
+ - lib/active_record/connection_adapters/sqlite3/schema_statements.rb
194
178
  - lib/active_record/connection_adapters/sqlite3_adapter.rb
195
179
  - lib/active_record/connection_adapters/statement_pool.rb
196
180
  - lib/active_record/connection_handling.rb
197
181
  - lib/active_record/core.rb
198
182
  - lib/active_record/counter_cache.rb
183
+ - lib/active_record/database_configurations.rb
184
+ - lib/active_record/database_configurations/connection_url_resolver.rb
185
+ - lib/active_record/database_configurations/database_config.rb
186
+ - lib/active_record/database_configurations/hash_config.rb
187
+ - lib/active_record/database_configurations/url_config.rb
188
+ - lib/active_record/delegated_type.rb
189
+ - lib/active_record/destroy_association_async_job.rb
199
190
  - lib/active_record/dynamic_matchers.rb
200
191
  - lib/active_record/enum.rb
201
192
  - lib/active_record/errors.rb
@@ -203,9 +194,14 @@ files:
203
194
  - lib/active_record/explain_registry.rb
204
195
  - lib/active_record/explain_subscriber.rb
205
196
  - lib/active_record/fixture_set/file.rb
197
+ - lib/active_record/fixture_set/model_metadata.rb
198
+ - lib/active_record/fixture_set/render_context.rb
199
+ - lib/active_record/fixture_set/table_row.rb
200
+ - lib/active_record/fixture_set/table_rows.rb
206
201
  - lib/active_record/fixtures.rb
207
202
  - lib/active_record/gem_version.rb
208
203
  - lib/active_record/inheritance.rb
204
+ - lib/active_record/insert_all.rb
209
205
  - lib/active_record/integration.rb
210
206
  - lib/active_record/internal_metadata.rb
211
207
  - lib/active_record/legacy_yaml_adapter.rb
@@ -213,6 +209,9 @@ files:
213
209
  - lib/active_record/locking/optimistic.rb
214
210
  - lib/active_record/locking/pessimistic.rb
215
211
  - lib/active_record/log_subscriber.rb
212
+ - lib/active_record/middleware/database_selector.rb
213
+ - lib/active_record/middleware/database_selector/resolver.rb
214
+ - lib/active_record/middleware/database_selector/resolver/session.rb
216
215
  - lib/active_record/migration.rb
217
216
  - lib/active_record/migration/command_recorder.rb
218
217
  - lib/active_record/migration/compatibility.rb
@@ -228,7 +227,6 @@ files:
228
227
  - lib/active_record/railties/console_sandbox.rb
229
228
  - lib/active_record/railties/controller_runtime.rb
230
229
  - lib/active_record/railties/databases.rake
231
- - lib/active_record/railties/jdbcmysql_error.rb
232
230
  - lib/active_record/readonly_attributes.rb
233
231
  - lib/active_record/reflection.rb
234
232
  - lib/active_record/relation.rb
@@ -241,11 +239,9 @@ files:
241
239
  - lib/active_record/relation/merger.rb
242
240
  - lib/active_record/relation/predicate_builder.rb
243
241
  - lib/active_record/relation/predicate_builder/array_handler.rb
244
- - lib/active_record/relation/predicate_builder/association_query_handler.rb
245
- - lib/active_record/relation/predicate_builder/base_handler.rb
242
+ - lib/active_record/relation/predicate_builder/association_query_value.rb
246
243
  - lib/active_record/relation/predicate_builder/basic_object_handler.rb
247
- - lib/active_record/relation/predicate_builder/class_handler.rb
248
- - lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb
244
+ - lib/active_record/relation/predicate_builder/polymorphic_array_value.rb
249
245
  - lib/active_record/relation/predicate_builder/range_handler.rb
250
246
  - lib/active_record/relation/predicate_builder/relation_handler.rb
251
247
  - lib/active_record/relation/query_attribute.rb
@@ -253,7 +249,6 @@ files:
253
249
  - lib/active_record/relation/record_fetch_warning.rb
254
250
  - lib/active_record/relation/spawn_methods.rb
255
251
  - lib/active_record/relation/where_clause.rb
256
- - lib/active_record/relation/where_clause_factory.rb
257
252
  - lib/active_record/result.rb
258
253
  - lib/active_record/runtime_registry.rb
259
254
  - lib/active_record/sanitization.rb
@@ -265,6 +260,7 @@ files:
265
260
  - lib/active_record/scoping/named.rb
266
261
  - lib/active_record/secure_token.rb
267
262
  - lib/active_record/serialization.rb
263
+ - lib/active_record/signed_id.rb
268
264
  - lib/active_record/statement_cache.rb
269
265
  - lib/active_record/store.rb
270
266
  - lib/active_record/suppressor.rb
@@ -273,6 +269,8 @@ files:
273
269
  - lib/active_record/tasks/mysql_database_tasks.rb
274
270
  - lib/active_record/tasks/postgresql_database_tasks.rb
275
271
  - lib/active_record/tasks/sqlite_database_tasks.rb
272
+ - lib/active_record/test_databases.rb
273
+ - lib/active_record/test_fixtures.rb
276
274
  - lib/active_record/timestamp.rb
277
275
  - lib/active_record/touch_later.rb
278
276
  - lib/active_record/transactions.rb
@@ -281,12 +279,15 @@ files:
281
279
  - lib/active_record/type/adapter_specific_registry.rb
282
280
  - lib/active_record/type/date.rb
283
281
  - lib/active_record/type/date_time.rb
282
+ - lib/active_record/type/decimal_without_scale.rb
284
283
  - lib/active_record/type/hash_lookup_type_map.rb
285
- - lib/active_record/type/internal/abstract_json.rb
286
284
  - lib/active_record/type/internal/timezone.rb
285
+ - lib/active_record/type/json.rb
287
286
  - lib/active_record/type/serialized.rb
287
+ - lib/active_record/type/text.rb
288
288
  - lib/active_record/type/time.rb
289
289
  - lib/active_record/type/type_map.rb
290
+ - lib/active_record/type/unsigned_integer.rb
290
291
  - lib/active_record/type_caster.rb
291
292
  - lib/active_record/type_caster/connection.rb
292
293
  - lib/active_record/type_caster/map.rb
@@ -294,23 +295,106 @@ files:
294
295
  - lib/active_record/validations/absence.rb
295
296
  - lib/active_record/validations/associated.rb
296
297
  - lib/active_record/validations/length.rb
298
+ - lib/active_record/validations/numericality.rb
297
299
  - lib/active_record/validations/presence.rb
298
300
  - lib/active_record/validations/uniqueness.rb
299
301
  - lib/active_record/version.rb
302
+ - lib/arel.rb
303
+ - lib/arel/alias_predication.rb
304
+ - lib/arel/attributes/attribute.rb
305
+ - lib/arel/collectors/bind.rb
306
+ - lib/arel/collectors/composite.rb
307
+ - lib/arel/collectors/plain_string.rb
308
+ - lib/arel/collectors/sql_string.rb
309
+ - lib/arel/collectors/substitute_binds.rb
310
+ - lib/arel/crud.rb
311
+ - lib/arel/delete_manager.rb
312
+ - lib/arel/errors.rb
313
+ - lib/arel/expressions.rb
314
+ - lib/arel/factory_methods.rb
315
+ - lib/arel/insert_manager.rb
316
+ - lib/arel/math.rb
317
+ - lib/arel/nodes.rb
318
+ - lib/arel/nodes/and.rb
319
+ - lib/arel/nodes/ascending.rb
320
+ - lib/arel/nodes/binary.rb
321
+ - lib/arel/nodes/bind_param.rb
322
+ - lib/arel/nodes/case.rb
323
+ - lib/arel/nodes/casted.rb
324
+ - lib/arel/nodes/comment.rb
325
+ - lib/arel/nodes/count.rb
326
+ - lib/arel/nodes/delete_statement.rb
327
+ - lib/arel/nodes/descending.rb
328
+ - lib/arel/nodes/equality.rb
329
+ - lib/arel/nodes/extract.rb
330
+ - lib/arel/nodes/false.rb
331
+ - lib/arel/nodes/full_outer_join.rb
332
+ - lib/arel/nodes/function.rb
333
+ - lib/arel/nodes/grouping.rb
334
+ - lib/arel/nodes/homogeneous_in.rb
335
+ - lib/arel/nodes/in.rb
336
+ - lib/arel/nodes/infix_operation.rb
337
+ - lib/arel/nodes/inner_join.rb
338
+ - lib/arel/nodes/insert_statement.rb
339
+ - lib/arel/nodes/join_source.rb
340
+ - lib/arel/nodes/matches.rb
341
+ - lib/arel/nodes/named_function.rb
342
+ - lib/arel/nodes/node.rb
343
+ - lib/arel/nodes/node_expression.rb
344
+ - lib/arel/nodes/ordering.rb
345
+ - lib/arel/nodes/outer_join.rb
346
+ - lib/arel/nodes/over.rb
347
+ - lib/arel/nodes/regexp.rb
348
+ - lib/arel/nodes/right_outer_join.rb
349
+ - lib/arel/nodes/select_core.rb
350
+ - lib/arel/nodes/select_statement.rb
351
+ - lib/arel/nodes/sql_literal.rb
352
+ - lib/arel/nodes/string_join.rb
353
+ - lib/arel/nodes/table_alias.rb
354
+ - lib/arel/nodes/terminal.rb
355
+ - lib/arel/nodes/true.rb
356
+ - lib/arel/nodes/unary.rb
357
+ - lib/arel/nodes/unary_operation.rb
358
+ - lib/arel/nodes/unqualified_column.rb
359
+ - lib/arel/nodes/update_statement.rb
360
+ - lib/arel/nodes/values_list.rb
361
+ - lib/arel/nodes/window.rb
362
+ - lib/arel/nodes/with.rb
363
+ - lib/arel/order_predications.rb
364
+ - lib/arel/predications.rb
365
+ - lib/arel/select_manager.rb
366
+ - lib/arel/table.rb
367
+ - lib/arel/tree_manager.rb
368
+ - lib/arel/update_manager.rb
369
+ - lib/arel/visitors.rb
370
+ - lib/arel/visitors/dot.rb
371
+ - lib/arel/visitors/mysql.rb
372
+ - lib/arel/visitors/postgresql.rb
373
+ - lib/arel/visitors/sqlite.rb
374
+ - lib/arel/visitors/to_sql.rb
375
+ - lib/arel/visitors/visitor.rb
376
+ - lib/arel/window_predications.rb
300
377
  - lib/rails/generators/active_record.rb
378
+ - lib/rails/generators/active_record/application_record/application_record_generator.rb
379
+ - lib/rails/generators/active_record/application_record/templates/application_record.rb.tt
301
380
  - lib/rails/generators/active_record/migration.rb
302
381
  - lib/rails/generators/active_record/migration/migration_generator.rb
303
- - lib/rails/generators/active_record/migration/templates/create_table_migration.rb
304
- - lib/rails/generators/active_record/migration/templates/migration.rb
382
+ - lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt
383
+ - lib/rails/generators/active_record/migration/templates/migration.rb.tt
305
384
  - lib/rails/generators/active_record/model/model_generator.rb
306
- - lib/rails/generators/active_record/model/templates/application_record.rb
307
- - lib/rails/generators/active_record/model/templates/model.rb
308
- - lib/rails/generators/active_record/model/templates/module.rb
309
- homepage: http://rubyonrails.org
385
+ - lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt
386
+ - lib/rails/generators/active_record/model/templates/model.rb.tt
387
+ - lib/rails/generators/active_record/model/templates/module.rb.tt
388
+ homepage: https://rubyonrails.org
310
389
  licenses:
311
390
  - MIT
312
- metadata: {}
313
- post_install_message:
391
+ metadata:
392
+ bug_tracker_uri: https://github.com/rails/rails/issues
393
+ changelog_uri: https://github.com/rails/rails/blob/v6.1.1/activerecord/CHANGELOG.md
394
+ documentation_uri: https://api.rubyonrails.org/v6.1.1/
395
+ mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
396
+ source_code_uri: https://github.com/rails/rails/tree/v6.1.1/activerecord
397
+ post_install_message:
314
398
  rdoc_options:
315
399
  - "--main"
316
400
  - README.rdoc
@@ -320,15 +404,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
320
404
  requirements:
321
405
  - - ">="
322
406
  - !ruby/object:Gem::Version
323
- version: 2.2.2
407
+ version: 2.5.0
324
408
  required_rubygems_version: !ruby/object:Gem::Requirement
325
409
  requirements:
326
410
  - - ">="
327
411
  - !ruby/object:Gem::Version
328
412
  version: '0'
329
413
  requirements: []
330
- rubygems_version: 3.0.1
331
- signing_key:
414
+ rubygems_version: 3.2.3
415
+ signing_key:
332
416
  specification_version: 4
333
417
  summary: Object-relational mapper framework (part of Rails).
334
418
  test_files: []
@@ -1,17 +0,0 @@
1
- module ActiveRecord
2
- module Associations
3
- class Preloader
4
- class BelongsTo < SingularAssociation #:nodoc:
5
-
6
- def association_key_name
7
- reflection.options[:primary_key] || klass && klass.primary_key
8
- end
9
-
10
- def owner_key_name
11
- reflection.foreign_key
12
- end
13
-
14
- end
15
- end
16
- end
17
- end
@@ -1,17 +0,0 @@
1
- module ActiveRecord
2
- module Associations
3
- class Preloader
4
- class CollectionAssociation < Association #:nodoc:
5
- private
6
-
7
- def preload(preloader)
8
- associated_records_by_owner(preloader).each do |owner, records|
9
- association = owner.association(reflection.name)
10
- association.loaded!
11
- association.target.concat(records)
12
- end
13
- end
14
- end
15
- end
16
- end
17
- end
@@ -1,17 +0,0 @@
1
- module ActiveRecord
2
- module Associations
3
- class Preloader
4
- class HasMany < CollectionAssociation #:nodoc:
5
-
6
- def association_key_name
7
- reflection.foreign_key
8
- end
9
-
10
- def owner_key_name
11
- reflection.active_record_primary_key
12
- end
13
-
14
- end
15
- end
16
- end
17
- end