activerecord 4.2.11.3 → 6.0.0

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 (372) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +613 -1643
  3. data/MIT-LICENSE +4 -2
  4. data/README.rdoc +13 -12
  5. data/examples/performance.rb +33 -32
  6. data/examples/simple.rb +5 -4
  7. data/lib/active_record.rb +41 -22
  8. data/lib/active_record/aggregations.rb +267 -251
  9. data/lib/active_record/association_relation.rb +11 -6
  10. data/lib/active_record/associations.rb +1737 -1597
  11. data/lib/active_record/associations/alias_tracker.rb +29 -35
  12. data/lib/active_record/associations/association.rb +125 -58
  13. data/lib/active_record/associations/association_scope.rb +103 -132
  14. data/lib/active_record/associations/belongs_to_association.rb +65 -60
  15. data/lib/active_record/associations/belongs_to_polymorphic_association.rb +8 -12
  16. data/lib/active_record/associations/builder/association.rb +27 -40
  17. data/lib/active_record/associations/builder/belongs_to.rb +69 -55
  18. data/lib/active_record/associations/builder/collection_association.rb +10 -33
  19. data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +52 -66
  20. data/lib/active_record/associations/builder/has_many.rb +8 -4
  21. data/lib/active_record/associations/builder/has_one.rb +46 -5
  22. data/lib/active_record/associations/builder/singular_association.rb +16 -10
  23. data/lib/active_record/associations/collection_association.rb +131 -287
  24. data/lib/active_record/associations/collection_proxy.rb +241 -146
  25. data/lib/active_record/associations/foreign_association.rb +10 -1
  26. data/lib/active_record/associations/has_many_association.rb +34 -97
  27. data/lib/active_record/associations/has_many_through_association.rb +60 -87
  28. data/lib/active_record/associations/has_one_association.rb +61 -49
  29. data/lib/active_record/associations/has_one_through_association.rb +20 -11
  30. data/lib/active_record/associations/join_dependency.rb +137 -167
  31. data/lib/active_record/associations/join_dependency/join_association.rb +38 -86
  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 +90 -92
  35. data/lib/active_record/associations/preloader/association.rb +90 -123
  36. data/lib/active_record/associations/preloader/through_association.rb +85 -65
  37. data/lib/active_record/associations/singular_association.rb +18 -39
  38. data/lib/active_record/associations/through_association.rb +38 -18
  39. data/lib/active_record/attribute_assignment.rb +56 -183
  40. data/lib/active_record/attribute_decorators.rb +39 -15
  41. data/lib/active_record/attribute_methods.rb +120 -135
  42. data/lib/active_record/attribute_methods/before_type_cast.rb +13 -8
  43. data/lib/active_record/attribute_methods/dirty.rb +174 -144
  44. data/lib/active_record/attribute_methods/primary_key.rb +91 -83
  45. data/lib/active_record/attribute_methods/query.rb +6 -5
  46. data/lib/active_record/attribute_methods/read.rb +20 -76
  47. data/lib/active_record/attribute_methods/serialization.rb +40 -20
  48. data/lib/active_record/attribute_methods/time_zone_conversion.rb +58 -36
  49. data/lib/active_record/attribute_methods/write.rb +32 -54
  50. data/lib/active_record/attributes.rb +214 -82
  51. data/lib/active_record/autosave_association.rb +91 -37
  52. data/lib/active_record/base.rb +57 -45
  53. data/lib/active_record/callbacks.rb +100 -74
  54. data/lib/active_record/coders/json.rb +3 -1
  55. data/lib/active_record/coders/yaml_column.rb +24 -12
  56. data/lib/active_record/connection_adapters/abstract/connection_pool.rb +796 -296
  57. data/lib/active_record/connection_adapters/abstract/database_limits.rb +26 -8
  58. data/lib/active_record/connection_adapters/abstract/database_statements.rb +234 -115
  59. data/lib/active_record/connection_adapters/abstract/query_cache.rb +82 -23
  60. data/lib/active_record/connection_adapters/abstract/quoting.rb +170 -53
  61. data/lib/active_record/connection_adapters/abstract/savepoints.rb +5 -3
  62. data/lib/active_record/connection_adapters/abstract/schema_creation.rb +74 -46
  63. data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +356 -227
  64. data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +79 -36
  65. data/lib/active_record/connection_adapters/abstract/schema_statements.rb +664 -243
  66. data/lib/active_record/connection_adapters/abstract/transaction.rb +191 -83
  67. data/lib/active_record/connection_adapters/abstract_adapter.rb +460 -204
  68. data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +510 -635
  69. data/lib/active_record/connection_adapters/column.rb +56 -43
  70. data/lib/active_record/connection_adapters/connection_specification.rb +174 -152
  71. data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +29 -0
  72. data/lib/active_record/connection_adapters/mysql/column.rb +27 -0
  73. data/lib/active_record/connection_adapters/mysql/database_statements.rb +200 -0
  74. data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +72 -0
  75. data/lib/active_record/connection_adapters/mysql/quoting.rb +81 -0
  76. data/lib/active_record/connection_adapters/mysql/schema_creation.rb +72 -0
  77. data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +95 -0
  78. data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +88 -0
  79. data/lib/active_record/connection_adapters/mysql/schema_statements.rb +264 -0
  80. data/lib/active_record/connection_adapters/mysql/type_metadata.rb +31 -0
  81. data/lib/active_record/connection_adapters/mysql2_adapter.rb +58 -180
  82. data/lib/active_record/connection_adapters/postgresql/column.rb +21 -11
  83. data/lib/active_record/connection_adapters/postgresql/database_statements.rb +64 -114
  84. data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +44 -0
  85. data/lib/active_record/connection_adapters/postgresql/oid.rb +23 -25
  86. data/lib/active_record/connection_adapters/postgresql/oid/array.rb +50 -58
  87. data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +9 -8
  88. data/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb +2 -0
  89. data/lib/active_record/connection_adapters/postgresql/oid/bytea.rb +4 -2
  90. data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +5 -1
  91. data/lib/active_record/connection_adapters/postgresql/oid/date.rb +13 -1
  92. data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +9 -22
  93. data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +3 -1
  94. data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +5 -3
  95. data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +31 -19
  96. data/lib/active_record/connection_adapters/postgresql/oid/inet.rb +2 -0
  97. data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +3 -11
  98. data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +45 -0
  99. data/lib/active_record/connection_adapters/postgresql/oid/money.rb +7 -9
  100. data/lib/active_record/connection_adapters/postgresql/oid/{integer.rb → oid.rb} +6 -2
  101. data/lib/active_record/connection_adapters/postgresql/oid/point.rb +33 -11
  102. data/lib/active_record/connection_adapters/postgresql/oid/range.rb +52 -34
  103. data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +4 -5
  104. data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +58 -54
  105. data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +10 -5
  106. data/lib/active_record/connection_adapters/postgresql/oid/vector.rb +3 -1
  107. data/lib/active_record/connection_adapters/postgresql/oid/xml.rb +3 -1
  108. data/lib/active_record/connection_adapters/postgresql/quoting.rb +144 -47
  109. data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +27 -14
  110. data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +76 -0
  111. data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +178 -108
  112. data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +50 -0
  113. data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +470 -290
  114. data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +36 -0
  115. data/lib/active_record/connection_adapters/postgresql/utils.rb +12 -8
  116. data/lib/active_record/connection_adapters/postgresql_adapter.rb +551 -356
  117. data/lib/active_record/connection_adapters/schema_cache.rb +72 -25
  118. data/lib/active_record/connection_adapters/sql_type_metadata.rb +37 -0
  119. data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +118 -0
  120. data/lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb +21 -0
  121. data/lib/active_record/connection_adapters/sqlite3/quoting.rb +103 -0
  122. data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +17 -0
  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 +290 -345
  127. data/lib/active_record/connection_adapters/statement_pool.rb +34 -13
  128. data/lib/active_record/connection_handling.rb +176 -41
  129. data/lib/active_record/core.rb +251 -231
  130. data/lib/active_record/counter_cache.rb +67 -49
  131. data/lib/active_record/database_configurations.rb +233 -0
  132. data/lib/active_record/database_configurations/database_config.rb +37 -0
  133. data/lib/active_record/database_configurations/hash_config.rb +50 -0
  134. data/lib/active_record/database_configurations/url_config.rb +79 -0
  135. data/lib/active_record/define_callbacks.rb +22 -0
  136. data/lib/active_record/dynamic_matchers.rb +87 -105
  137. data/lib/active_record/enum.rb +163 -86
  138. data/lib/active_record/errors.rb +188 -53
  139. data/lib/active_record/explain.rb +23 -11
  140. data/lib/active_record/explain_registry.rb +4 -2
  141. data/lib/active_record/explain_subscriber.rb +10 -5
  142. data/lib/active_record/fixture_set/file.rb +35 -9
  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 +153 -0
  146. data/lib/active_record/fixture_set/table_rows.rb +47 -0
  147. data/lib/active_record/fixtures.rb +228 -499
  148. data/lib/active_record/gem_version.rb +6 -4
  149. data/lib/active_record/inheritance.rb +158 -112
  150. data/lib/active_record/insert_all.rb +179 -0
  151. data/lib/active_record/integration.rb +123 -29
  152. data/lib/active_record/internal_metadata.rb +53 -0
  153. data/lib/active_record/legacy_yaml_adapter.rb +21 -3
  154. data/lib/active_record/locale/en.yml +3 -2
  155. data/lib/active_record/locking/optimistic.rb +87 -96
  156. data/lib/active_record/locking/pessimistic.rb +18 -6
  157. data/lib/active_record/log_subscriber.rb +76 -33
  158. data/lib/active_record/middleware/database_selector.rb +75 -0
  159. data/lib/active_record/middleware/database_selector/resolver.rb +92 -0
  160. data/lib/active_record/middleware/database_selector/resolver/session.rb +45 -0
  161. data/lib/active_record/migration.rb +621 -303
  162. data/lib/active_record/migration/command_recorder.rb +177 -90
  163. data/lib/active_record/migration/compatibility.rb +244 -0
  164. data/lib/active_record/migration/join_table.rb +8 -6
  165. data/lib/active_record/model_schema.rb +312 -112
  166. data/lib/active_record/nested_attributes.rb +264 -222
  167. data/lib/active_record/no_touching.rb +14 -1
  168. data/lib/active_record/null_relation.rb +24 -37
  169. data/lib/active_record/persistence.rb +557 -125
  170. data/lib/active_record/query_cache.rb +19 -23
  171. data/lib/active_record/querying.rb +43 -29
  172. data/lib/active_record/railtie.rb +143 -44
  173. data/lib/active_record/railties/collection_cache_association_loading.rb +34 -0
  174. data/lib/active_record/railties/console_sandbox.rb +2 -0
  175. data/lib/active_record/railties/controller_runtime.rb +34 -33
  176. data/lib/active_record/railties/databases.rake +328 -185
  177. data/lib/active_record/readonly_attributes.rb +5 -4
  178. data/lib/active_record/reflection.rb +428 -279
  179. data/lib/active_record/relation.rb +518 -341
  180. data/lib/active_record/relation/batches.rb +207 -55
  181. data/lib/active_record/relation/batches/batch_enumerator.rb +69 -0
  182. data/lib/active_record/relation/calculations.rb +267 -253
  183. data/lib/active_record/relation/delegation.rb +70 -80
  184. data/lib/active_record/relation/finder_methods.rb +277 -241
  185. data/lib/active_record/relation/from_clause.rb +26 -0
  186. data/lib/active_record/relation/merger.rb +78 -87
  187. data/lib/active_record/relation/predicate_builder.rb +114 -119
  188. data/lib/active_record/relation/predicate_builder/array_handler.rb +27 -26
  189. data/lib/active_record/relation/predicate_builder/association_query_value.rb +43 -0
  190. data/lib/active_record/relation/predicate_builder/base_handler.rb +18 -0
  191. data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +19 -0
  192. data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +53 -0
  193. data/lib/active_record/relation/predicate_builder/range_handler.rb +22 -0
  194. data/lib/active_record/relation/predicate_builder/relation_handler.rb +7 -1
  195. data/lib/active_record/relation/query_attribute.rb +50 -0
  196. data/lib/active_record/relation/query_methods.rb +575 -394
  197. data/lib/active_record/relation/record_fetch_warning.rb +51 -0
  198. data/lib/active_record/relation/spawn_methods.rb +11 -13
  199. data/lib/active_record/relation/where_clause.rb +190 -0
  200. data/lib/active_record/relation/where_clause_factory.rb +33 -0
  201. data/lib/active_record/result.rb +79 -42
  202. data/lib/active_record/runtime_registry.rb +6 -4
  203. data/lib/active_record/sanitization.rb +144 -121
  204. data/lib/active_record/schema.rb +21 -24
  205. data/lib/active_record/schema_dumper.rb +112 -93
  206. data/lib/active_record/schema_migration.rb +24 -17
  207. data/lib/active_record/scoping.rb +45 -26
  208. data/lib/active_record/scoping/default.rb +101 -85
  209. data/lib/active_record/scoping/named.rb +86 -33
  210. data/lib/active_record/secure_token.rb +40 -0
  211. data/lib/active_record/serialization.rb +5 -5
  212. data/lib/active_record/statement_cache.rb +73 -36
  213. data/lib/active_record/store.rb +127 -42
  214. data/lib/active_record/suppressor.rb +61 -0
  215. data/lib/active_record/table_metadata.rb +75 -0
  216. data/lib/active_record/tasks/database_tasks.rb +307 -100
  217. data/lib/active_record/tasks/mysql_database_tasks.rb +55 -99
  218. data/lib/active_record/tasks/postgresql_database_tasks.rb +81 -41
  219. data/lib/active_record/tasks/sqlite_database_tasks.rb +38 -16
  220. data/lib/active_record/test_databases.rb +23 -0
  221. data/lib/active_record/test_fixtures.rb +224 -0
  222. data/lib/active_record/timestamp.rb +86 -40
  223. data/lib/active_record/touch_later.rb +66 -0
  224. data/lib/active_record/transactions.rb +216 -150
  225. data/lib/active_record/translation.rb +3 -1
  226. data/lib/active_record/type.rb +78 -23
  227. data/lib/active_record/type/adapter_specific_registry.rb +129 -0
  228. data/lib/active_record/type/date.rb +4 -45
  229. data/lib/active_record/type/date_time.rb +4 -49
  230. data/lib/active_record/type/decimal_without_scale.rb +6 -2
  231. data/lib/active_record/type/hash_lookup_type_map.rb +5 -3
  232. data/lib/active_record/type/internal/timezone.rb +17 -0
  233. data/lib/active_record/type/json.rb +30 -0
  234. data/lib/active_record/type/serialized.rb +24 -15
  235. data/lib/active_record/type/text.rb +2 -2
  236. data/lib/active_record/type/time.rb +11 -16
  237. data/lib/active_record/type/type_map.rb +15 -17
  238. data/lib/active_record/type/unsigned_integer.rb +9 -7
  239. data/lib/active_record/type_caster.rb +9 -0
  240. data/lib/active_record/type_caster/connection.rb +34 -0
  241. data/lib/active_record/type_caster/map.rb +20 -0
  242. data/lib/active_record/validations.rb +39 -35
  243. data/lib/active_record/validations/absence.rb +25 -0
  244. data/lib/active_record/validations/associated.rb +13 -4
  245. data/lib/active_record/validations/length.rb +26 -0
  246. data/lib/active_record/validations/presence.rb +14 -13
  247. data/lib/active_record/validations/uniqueness.rb +42 -55
  248. data/lib/active_record/version.rb +3 -1
  249. data/lib/arel.rb +51 -0
  250. data/lib/arel/alias_predication.rb +9 -0
  251. data/lib/arel/attributes.rb +22 -0
  252. data/lib/arel/attributes/attribute.rb +37 -0
  253. data/lib/arel/collectors/bind.rb +24 -0
  254. data/lib/arel/collectors/composite.rb +31 -0
  255. data/lib/arel/collectors/plain_string.rb +20 -0
  256. data/lib/arel/collectors/sql_string.rb +20 -0
  257. data/lib/arel/collectors/substitute_binds.rb +28 -0
  258. data/lib/arel/crud.rb +42 -0
  259. data/lib/arel/delete_manager.rb +18 -0
  260. data/lib/arel/errors.rb +9 -0
  261. data/lib/arel/expressions.rb +29 -0
  262. data/lib/arel/factory_methods.rb +49 -0
  263. data/lib/arel/insert_manager.rb +49 -0
  264. data/lib/arel/math.rb +45 -0
  265. data/lib/arel/nodes.rb +68 -0
  266. data/lib/arel/nodes/and.rb +32 -0
  267. data/lib/arel/nodes/ascending.rb +23 -0
  268. data/lib/arel/nodes/binary.rb +52 -0
  269. data/lib/arel/nodes/bind_param.rb +36 -0
  270. data/lib/arel/nodes/case.rb +55 -0
  271. data/lib/arel/nodes/casted.rb +50 -0
  272. data/lib/arel/nodes/comment.rb +29 -0
  273. data/lib/arel/nodes/count.rb +12 -0
  274. data/lib/arel/nodes/delete_statement.rb +45 -0
  275. data/lib/arel/nodes/descending.rb +23 -0
  276. data/lib/arel/nodes/equality.rb +18 -0
  277. data/lib/arel/nodes/extract.rb +24 -0
  278. data/lib/arel/nodes/false.rb +16 -0
  279. data/lib/arel/nodes/full_outer_join.rb +8 -0
  280. data/lib/arel/nodes/function.rb +44 -0
  281. data/lib/arel/nodes/grouping.rb +8 -0
  282. data/lib/arel/nodes/in.rb +8 -0
  283. data/lib/arel/nodes/infix_operation.rb +80 -0
  284. data/lib/arel/nodes/inner_join.rb +8 -0
  285. data/lib/arel/nodes/insert_statement.rb +37 -0
  286. data/lib/arel/nodes/join_source.rb +20 -0
  287. data/lib/arel/nodes/matches.rb +18 -0
  288. data/lib/arel/nodes/named_function.rb +23 -0
  289. data/lib/arel/nodes/node.rb +50 -0
  290. data/lib/arel/nodes/node_expression.rb +13 -0
  291. data/lib/arel/nodes/outer_join.rb +8 -0
  292. data/lib/arel/nodes/over.rb +15 -0
  293. data/lib/arel/nodes/regexp.rb +16 -0
  294. data/lib/arel/nodes/right_outer_join.rb +8 -0
  295. data/lib/arel/nodes/select_core.rb +67 -0
  296. data/lib/arel/nodes/select_statement.rb +41 -0
  297. data/lib/arel/nodes/sql_literal.rb +16 -0
  298. data/lib/arel/nodes/string_join.rb +11 -0
  299. data/lib/arel/nodes/table_alias.rb +27 -0
  300. data/lib/arel/nodes/terminal.rb +16 -0
  301. data/lib/arel/nodes/true.rb +16 -0
  302. data/lib/arel/nodes/unary.rb +45 -0
  303. data/lib/arel/nodes/unary_operation.rb +20 -0
  304. data/lib/arel/nodes/unqualified_column.rb +22 -0
  305. data/lib/arel/nodes/update_statement.rb +41 -0
  306. data/lib/arel/nodes/values_list.rb +9 -0
  307. data/lib/arel/nodes/window.rb +126 -0
  308. data/lib/arel/nodes/with.rb +11 -0
  309. data/lib/arel/order_predications.rb +13 -0
  310. data/lib/arel/predications.rb +257 -0
  311. data/lib/arel/select_manager.rb +271 -0
  312. data/lib/arel/table.rb +110 -0
  313. data/lib/arel/tree_manager.rb +72 -0
  314. data/lib/arel/update_manager.rb +34 -0
  315. data/lib/arel/visitors.rb +20 -0
  316. data/lib/arel/visitors/depth_first.rb +204 -0
  317. data/lib/arel/visitors/dot.rb +297 -0
  318. data/lib/arel/visitors/ibm_db.rb +34 -0
  319. data/lib/arel/visitors/informix.rb +62 -0
  320. data/lib/arel/visitors/mssql.rb +157 -0
  321. data/lib/arel/visitors/mysql.rb +83 -0
  322. data/lib/arel/visitors/oracle.rb +159 -0
  323. data/lib/arel/visitors/oracle12.rb +66 -0
  324. data/lib/arel/visitors/postgresql.rb +110 -0
  325. data/lib/arel/visitors/sqlite.rb +39 -0
  326. data/lib/arel/visitors/to_sql.rb +889 -0
  327. data/lib/arel/visitors/visitor.rb +46 -0
  328. data/lib/arel/visitors/where_sql.rb +23 -0
  329. data/lib/arel/window_predications.rb +9 -0
  330. data/lib/rails/generators/active_record.rb +7 -5
  331. data/lib/rails/generators/active_record/application_record/application_record_generator.rb +27 -0
  332. data/lib/rails/generators/active_record/application_record/templates/application_record.rb.tt +5 -0
  333. data/lib/rails/generators/active_record/migration.rb +31 -1
  334. data/lib/rails/generators/active_record/migration/migration_generator.rb +42 -37
  335. data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +24 -0
  336. data/lib/rails/generators/active_record/migration/templates/{migration.rb → migration.rb.tt} +11 -2
  337. data/lib/rails/generators/active_record/model/model_generator.rb +19 -22
  338. data/lib/rails/generators/active_record/model/templates/model.rb.tt +22 -0
  339. data/lib/rails/generators/active_record/model/templates/{module.rb → module.rb.tt} +0 -0
  340. metadata +164 -59
  341. data/lib/active_record/associations/preloader/belongs_to.rb +0 -17
  342. data/lib/active_record/associations/preloader/collection_association.rb +0 -24
  343. data/lib/active_record/associations/preloader/has_many.rb +0 -17
  344. data/lib/active_record/associations/preloader/has_many_through.rb +0 -19
  345. data/lib/active_record/associations/preloader/has_one.rb +0 -23
  346. data/lib/active_record/associations/preloader/has_one_through.rb +0 -9
  347. data/lib/active_record/associations/preloader/singular_association.rb +0 -21
  348. data/lib/active_record/attribute.rb +0 -163
  349. data/lib/active_record/attribute_set.rb +0 -81
  350. data/lib/active_record/attribute_set/builder.rb +0 -106
  351. data/lib/active_record/connection_adapters/mysql_adapter.rb +0 -498
  352. data/lib/active_record/connection_adapters/postgresql/array_parser.rb +0 -93
  353. data/lib/active_record/connection_adapters/postgresql/oid/float.rb +0 -21
  354. data/lib/active_record/connection_adapters/postgresql/oid/infinity.rb +0 -13
  355. data/lib/active_record/connection_adapters/postgresql/oid/json.rb +0 -35
  356. data/lib/active_record/connection_adapters/postgresql/oid/time.rb +0 -11
  357. data/lib/active_record/railties/jdbcmysql_error.rb +0 -16
  358. data/lib/active_record/serializers/xml_serializer.rb +0 -193
  359. data/lib/active_record/type/big_integer.rb +0 -13
  360. data/lib/active_record/type/binary.rb +0 -50
  361. data/lib/active_record/type/boolean.rb +0 -31
  362. data/lib/active_record/type/decimal.rb +0 -64
  363. data/lib/active_record/type/decorator.rb +0 -14
  364. data/lib/active_record/type/float.rb +0 -19
  365. data/lib/active_record/type/integer.rb +0 -59
  366. data/lib/active_record/type/mutable.rb +0 -16
  367. data/lib/active_record/type/numeric.rb +0 -36
  368. data/lib/active_record/type/string.rb +0 -40
  369. data/lib/active_record/type/time_value.rb +0 -38
  370. data/lib/active_record/type/value.rb +0 -110
  371. data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb +0 -19
  372. data/lib/rails/generators/active_record/model/templates/model.rb +0 -10
@@ -0,0 +1,26 @@
1
+ # frozen_string_literal: true
2
+
3
+ module ActiveRecord
4
+ class Relation
5
+ class FromClause # :nodoc:
6
+ attr_reader :value, :name
7
+
8
+ def initialize(value, name)
9
+ @value = value
10
+ @name = name
11
+ end
12
+
13
+ def merge(other)
14
+ self
15
+ end
16
+
17
+ def empty?
18
+ value.nil?
19
+ end
20
+
21
+ def self.empty
22
+ @empty ||= new(nil, nil)
23
+ end
24
+ end
25
+ end
26
+ end
@@ -1,5 +1,6 @@
1
- require 'active_support/core_ext/hash/keys'
2
- require "set"
1
+ # frozen_string_literal: true
2
+
3
+ require "active_support/core_ext/hash/keys"
3
4
 
4
5
  module ActiveRecord
5
6
  class Relation
@@ -22,7 +23,11 @@ module ActiveRecord
22
23
  # build a relation to merge in rather than directly merging
23
24
  # the values.
24
25
  def other
25
- other = Relation.create(relation.klass, relation.table)
26
+ other = Relation.create(
27
+ relation.klass,
28
+ table: relation.table,
29
+ predicate_builder: relation.predicate_builder
30
+ )
26
31
  hash.each { |k, v|
27
32
  if k == :joins
28
33
  if Hash === v
@@ -49,10 +54,9 @@ module ActiveRecord
49
54
  @other = other
50
55
  end
51
56
 
52
- NORMAL_VALUES = Relation::SINGLE_VALUE_METHODS +
53
- Relation::MULTI_VALUE_METHODS -
54
- [:includes, :preload, :joins, :where, :order, :bind, :reverse_order, :lock, :create_with, :reordering, :from] # :nodoc:
55
-
57
+ NORMAL_VALUES = Relation::VALUE_METHODS -
58
+ Relation::CLAUSE_METHODS -
59
+ [:includes, :preload, :joins, :left_outer_joins, :order, :reverse_order, :lock, :create_with, :reordering] # :nodoc:
56
60
 
57
61
  def normal_values
58
62
  NORMAL_VALUES
@@ -76,118 +80,105 @@ module ActiveRecord
76
80
 
77
81
  merge_multi_values
78
82
  merge_single_values
83
+ merge_clauses
79
84
  merge_preloads
80
85
  merge_joins
86
+ merge_outer_joins
81
87
 
82
88
  relation
83
89
  end
84
90
 
85
91
  private
86
92
 
87
- def merge_preloads
88
- return if other.preload_values.empty? && other.includes_values.empty?
93
+ def merge_preloads
94
+ return if other.preload_values.empty? && other.includes_values.empty?
89
95
 
90
- if other.klass == relation.klass
91
- relation.preload!(*other.preload_values) unless other.preload_values.empty?
92
- relation.includes!(other.includes_values) unless other.includes_values.empty?
93
- else
94
- reflection = relation.klass.reflect_on_all_associations.find do |r|
95
- r.class_name == other.klass.name
96
- end || return
96
+ if other.klass == relation.klass
97
+ relation.preload!(*other.preload_values) unless other.preload_values.empty?
98
+ relation.includes!(other.includes_values) unless other.includes_values.empty?
99
+ else
100
+ reflection = relation.klass.reflect_on_all_associations.find do |r|
101
+ r.class_name == other.klass.name
102
+ end || return
97
103
 
98
- unless other.preload_values.empty?
99
- relation.preload! reflection.name => other.preload_values
100
- end
104
+ unless other.preload_values.empty?
105
+ relation.preload! reflection.name => other.preload_values
106
+ end
101
107
 
102
- unless other.includes_values.empty?
103
- relation.includes! reflection.name => other.includes_values
108
+ unless other.includes_values.empty?
109
+ relation.includes! reflection.name => other.includes_values
110
+ end
104
111
  end
105
112
  end
106
- end
107
113
 
108
- def merge_joins
109
- return if other.joins_values.blank?
114
+ def merge_joins
115
+ return if other.joins_values.blank?
110
116
 
111
- if other.klass == relation.klass
112
- relation.joins!(*other.joins_values)
113
- else
114
- joins_dependency, rest = other.joins_values.partition do |join|
115
- case join
116
- when Hash, Symbol, Array
117
- true
118
- else
119
- false
117
+ if other.klass == relation.klass
118
+ relation.joins!(*other.joins_values)
119
+ else
120
+ associations, others = other.joins_values.partition do |join|
121
+ case join
122
+ when Hash, Symbol, Array; true
123
+ end
120
124
  end
121
- end
122
-
123
- join_dependency = ActiveRecord::Associations::JoinDependency.new(other.klass,
124
- joins_dependency,
125
- [])
126
- relation.joins! rest
127
125
 
128
- @relation = relation.joins join_dependency
126
+ join_dependency = other.construct_join_dependency(
127
+ associations, Arel::Nodes::InnerJoin
128
+ )
129
+ relation.joins!(join_dependency, *others)
130
+ end
129
131
  end
130
- end
131
-
132
- def merge_multi_values
133
- lhs_wheres = relation.where_values
134
- rhs_wheres = other.where_values
135
132
 
136
- lhs_binds = relation.bind_values
137
- rhs_binds = other.bind_values
133
+ def merge_outer_joins
134
+ return if other.left_outer_joins_values.blank?
138
135
 
139
- removed, kept = partition_overwrites(lhs_wheres, rhs_wheres)
140
-
141
- where_values = kept + rhs_wheres
142
- bind_values = filter_binds(lhs_binds, removed) + rhs_binds
136
+ if other.klass == relation.klass
137
+ relation.left_outer_joins!(*other.left_outer_joins_values)
138
+ else
139
+ associations = other.left_outer_joins_values
140
+ join_dependency = other.construct_join_dependency(
141
+ associations, Arel::Nodes::OuterJoin
142
+ )
143
+ relation.joins!(join_dependency)
144
+ end
145
+ end
143
146
 
144
- relation.where_values = where_values
145
- relation.bind_values = bind_values
147
+ def merge_multi_values
148
+ if other.reordering_value
149
+ # override any order specified in the original relation
150
+ relation.reorder!(*other.order_values)
151
+ elsif other.order_values.any?
152
+ # merge in order_values from relation
153
+ relation.order!(*other.order_values)
154
+ end
146
155
 
147
- if other.reordering_value
148
- # override any order specified in the original relation
149
- relation.reorder! other.order_values
150
- elsif other.order_values
151
- # merge in order_values from relation
152
- relation.order! other.order_values
156
+ extensions = other.extensions - relation.extensions
157
+ relation.extending!(*extensions) if extensions.any?
153
158
  end
154
159
 
155
- relation.extend(*other.extending_values) unless other.extending_values.blank?
156
- end
157
-
158
- def merge_single_values
159
- relation.from_value = other.from_value unless relation.from_value
160
- relation.lock_value = other.lock_value unless relation.lock_value
160
+ def merge_single_values
161
+ relation.lock_value ||= other.lock_value if other.lock_value
161
162
 
162
- unless other.create_with_value.blank?
163
- relation.create_with_value = (relation.create_with_value || {}).merge(other.create_with_value)
163
+ unless other.create_with_value.blank?
164
+ relation.create_with_value = (relation.create_with_value || {}).merge(other.create_with_value)
165
+ end
164
166
  end
165
- end
166
-
167
- def filter_binds(lhs_binds, removed_wheres)
168
- return lhs_binds if removed_wheres.empty?
169
167
 
170
- set = Set.new removed_wheres.map { |x| x.left.name.to_s }
171
- lhs_binds.dup.delete_if { |col,_| set.include? col.name }
172
- end
168
+ def merge_clauses
169
+ relation.from_clause = other.from_clause if replace_from_clause?
173
170
 
174
- # Remove equalities from the existing relation with a LHS which is
175
- # present in the relation being merged in.
176
- # returns [things_to_remove, things_to_keep]
177
- def partition_overwrites(lhs_wheres, rhs_wheres)
178
- if lhs_wheres.empty? || rhs_wheres.empty?
179
- return [[], lhs_wheres]
180
- end
171
+ where_clause = relation.where_clause.merge(other.where_clause)
172
+ relation.where_clause = where_clause unless where_clause.empty?
181
173
 
182
- nodes = rhs_wheres.find_all do |w|
183
- w.respond_to?(:operator) && w.operator == :==
174
+ having_clause = relation.having_clause.merge(other.having_clause)
175
+ relation.having_clause = having_clause unless having_clause.empty?
184
176
  end
185
- seen = Set.new(nodes) { |node| node.left }
186
177
 
187
- lhs_wheres.partition do |w|
188
- w.respond_to?(:operator) && w.operator == :== && seen.include?(w.left)
178
+ def replace_from_clause?
179
+ relation.from_clause.empty? && !other.from_clause.empty? &&
180
+ relation.klass.base_class == other.klass.base_class
189
181
  end
190
- end
191
182
  end
192
183
  end
193
184
  end
@@ -1,91 +1,24 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module ActiveRecord
2
4
  class PredicateBuilder # :nodoc:
3
- @handlers = []
4
-
5
- autoload :RelationHandler, 'active_record/relation/predicate_builder/relation_handler'
6
- autoload :ArrayHandler, 'active_record/relation/predicate_builder/array_handler'
7
-
8
- def self.resolve_column_aliases(klass, hash)
9
- # This method is a hot spot, so for now, use Hash[] to dup the hash.
10
- # https://bugs.ruby-lang.org/issues/7166
11
- hash = Hash[hash]
12
- hash.keys.grep(Symbol) do |key|
13
- if klass.attribute_alias? key
14
- hash[klass.attribute_alias(key)] = hash.delete key
15
- end
16
- end
17
- hash
18
- end
19
-
20
- def self.build_from_hash(klass, attributes, default_table)
21
- queries = []
22
-
23
- attributes.each do |column, value|
24
- table = default_table
25
-
26
- if value.is_a?(Hash)
27
- if value.empty?
28
- queries << '1=0'
29
- else
30
- table = Arel::Table.new(column, default_table.engine)
31
- association = klass._reflect_on_association(column)
32
-
33
- value.each do |k, v|
34
- queries.concat expand(association && association.klass, table, k, v)
35
- end
36
- end
37
- else
38
- column = column.to_s
39
-
40
- if column.include?('.')
41
- table_name, column = column.split('.', 2)
42
- table = Arel::Table.new(table_name, default_table.engine)
43
- end
44
-
45
- queries.concat expand(klass, table, column, value)
46
- end
47
- end
48
-
49
- queries
50
- end
51
-
52
- def self.expand(klass, table, column, value)
53
- queries = []
54
-
55
- # Find the foreign key when using queries such as:
56
- # Post.where(author: author)
57
- #
58
- # For polymorphic relationships, find the foreign key and type:
59
- # PriceEstimate.where(estimate_of: treasure)
60
- if klass && reflection = klass._reflect_on_association(column)
61
- base_class = polymorphic_base_class_from_value(value)
62
-
63
- if reflection.polymorphic? && base_class
64
- queries << build(table[reflection.foreign_type], base_class)
65
- end
66
-
67
- column = reflection.foreign_key
68
-
69
- if base_class
70
- primary_key = reflection.association_primary_key(base_class)
71
- value = convert_value_to_association_ids(value, primary_key)
72
- end
73
- end
74
-
75
- queries << build(table[column], value)
76
- queries
5
+ delegate :resolve_column_aliases, to: :table
6
+
7
+ def initialize(table)
8
+ @table = table
9
+ @handlers = []
10
+
11
+ register_handler(BasicObject, BasicObjectHandler.new(self))
12
+ register_handler(Base, BaseHandler.new(self))
13
+ register_handler(Range, RangeHandler.new(self))
14
+ register_handler(Relation, RelationHandler.new)
15
+ register_handler(Array, ArrayHandler.new(self))
16
+ register_handler(Set, ArrayHandler.new(self))
77
17
  end
78
18
 
79
- def self.polymorphic_base_class_from_value(value)
80
- case value
81
- when Relation
82
- value.klass.base_class
83
- when Array
84
- val = value.compact.first
85
- val.class.base_class if val.is_a?(Base)
86
- when Base
87
- value.class.base_class
88
- end
19
+ def build_from_hash(attributes)
20
+ attributes = convert_dot_notation_to_hash(attributes)
21
+ expand_from_hash(attributes)
89
22
  end
90
23
 
91
24
  def self.references(attributes)
@@ -94,7 +27,7 @@ module ActiveRecord
94
27
  key
95
28
  else
96
29
  key = key.to_s
97
- key.split('.').first if key.include?('.')
30
+ key.split(".").first if key.include?(".")
98
31
  end
99
32
  end.compact
100
33
  end
@@ -109,47 +42,109 @@ module ActiveRecord
109
42
  # Arel::Nodes::And.new([range.start, range.end])
110
43
  # )
111
44
  # end
112
- # ActiveRecord::PredicateBuilder.register_handler(MyCustomDateRange, handler)
113
- def self.register_handler(klass, handler)
45
+ # ActiveRecord::PredicateBuilder.new("users").register_handler(MyCustomDateRange, handler)
46
+ def register_handler(klass, handler)
114
47
  @handlers.unshift([klass, handler])
115
48
  end
116
49
 
117
- BASIC_OBJECT_HANDLER = ->(attribute, value) { attribute.eq(value) } # :nodoc:
118
- register_handler(BasicObject, BASIC_OBJECT_HANDLER)
119
- # FIXME: I think we need to deprecate this behavior
120
- register_handler(Class, ->(attribute, value) { attribute.eq(value.name) })
121
- register_handler(Base, ->(attribute, value) { attribute.eq(value.id) })
122
- register_handler(Range, ->(attribute, value) { attribute.between(value) })
123
- register_handler(Relation, RelationHandler.new)
124
- register_handler(Array, ArrayHandler.new)
125
-
126
- def self.build(attribute, value)
127
- handler_for(value).call(attribute, value)
128
- end
129
- private_class_method :build
130
-
131
- def self.handler_for(object)
132
- @handlers.detect { |klass, _| klass === object }.last
133
- end
134
- private_class_method :handler_for
135
-
136
- def self.convert_value_to_association_ids(value, primary_key)
137
- case value
138
- when Relation
139
- value.select(primary_key)
140
- when Array
141
- value.map { |v| convert_value_to_association_ids(v, primary_key) }
142
- when Base
143
- value._read_attribute(primary_key)
50
+ def build(attribute, value)
51
+ if table.type(attribute.name).force_equality?(value)
52
+ bind = build_bind_attribute(attribute.name, value)
53
+ attribute.eq(bind)
144
54
  else
145
- value
55
+ handler_for(value).call(attribute, value)
146
56
  end
147
57
  end
148
58
 
149
- def self.can_be_bound?(value) # :nodoc:
150
- !value.nil? &&
151
- !value.is_a?(Hash) &&
152
- handler_for(value) == BASIC_OBJECT_HANDLER
59
+ def build_bind_attribute(column_name, value)
60
+ attr = Relation::QueryAttribute.new(column_name.to_s, value, table.type(column_name))
61
+ Arel::Nodes::BindParam.new(attr)
153
62
  end
63
+
64
+ protected
65
+ def expand_from_hash(attributes)
66
+ return ["1=0"] if attributes.empty?
67
+
68
+ attributes.flat_map do |key, value|
69
+ if value.is_a?(Hash) && !table.has_column?(key)
70
+ associated_predicate_builder(key).expand_from_hash(value)
71
+ elsif table.associated_with?(key)
72
+ # Find the foreign key when using queries such as:
73
+ # Post.where(author: author)
74
+ #
75
+ # For polymorphic relationships, find the foreign key and type:
76
+ # PriceEstimate.where(estimate_of: treasure)
77
+ associated_table = table.associated_table(key)
78
+ if associated_table.polymorphic_association?
79
+ case value.is_a?(Array) ? value.first : value
80
+ when Base, Relation
81
+ value = [value] unless value.is_a?(Array)
82
+ klass = PolymorphicArrayValue
83
+ end
84
+ end
85
+
86
+ klass ||= AssociationQueryValue
87
+ queries = klass.new(associated_table, value).queries.map do |query|
88
+ expand_from_hash(query).reduce(&:and)
89
+ end
90
+ queries.reduce(&:or)
91
+ elsif table.aggregated_with?(key)
92
+ mapping = table.reflect_on_aggregation(key).mapping
93
+ values = value.nil? ? [nil] : Array.wrap(value)
94
+ if mapping.length == 1 || values.empty?
95
+ column_name, aggr_attr = mapping.first
96
+ values = values.map do |object|
97
+ object.respond_to?(aggr_attr) ? object.public_send(aggr_attr) : object
98
+ end
99
+ build(table.arel_attribute(column_name), values)
100
+ else
101
+ queries = values.map do |object|
102
+ mapping.map do |field_attr, aggregate_attr|
103
+ build(table.arel_attribute(field_attr), object.try!(aggregate_attr))
104
+ end.reduce(&:and)
105
+ end
106
+ queries.reduce(&:or)
107
+ end
108
+ else
109
+ build(table.arel_attribute(key), value)
110
+ end
111
+ end
112
+ end
113
+
114
+ private
115
+ attr_reader :table
116
+
117
+ def associated_predicate_builder(association_name)
118
+ self.class.new(table.associated_table(association_name))
119
+ end
120
+
121
+ def convert_dot_notation_to_hash(attributes)
122
+ dot_notation = attributes.select do |k, v|
123
+ k.include?(".") && !v.is_a?(Hash)
124
+ end
125
+
126
+ dot_notation.each_key do |key|
127
+ table_name, column_name = key.split(".")
128
+ value = attributes.delete(key)
129
+ attributes[table_name] ||= {}
130
+
131
+ attributes[table_name] = attributes[table_name].merge(column_name => value)
132
+ end
133
+
134
+ attributes
135
+ end
136
+
137
+ def handler_for(object)
138
+ @handlers.detect { |klass, _| klass === object }.last
139
+ end
154
140
  end
155
141
  end
142
+
143
+ require "active_record/relation/predicate_builder/array_handler"
144
+ require "active_record/relation/predicate_builder/base_handler"
145
+ require "active_record/relation/predicate_builder/basic_object_handler"
146
+ require "active_record/relation/predicate_builder/range_handler"
147
+ require "active_record/relation/predicate_builder/relation_handler"
148
+
149
+ require "active_record/relation/predicate_builder/association_query_value"
150
+ require "active_record/relation/predicate_builder/polymorphic_array_value"