activerecord 4.2.0 → 6.1.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of activerecord might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/CHANGELOG.md +1221 -796
- data/MIT-LICENSE +4 -2
- data/README.rdoc +15 -14
- data/examples/performance.rb +33 -32
- data/examples/simple.rb +5 -4
- data/lib/active_record/aggregations.rb +267 -249
- data/lib/active_record/association_relation.rb +45 -7
- data/lib/active_record/associations/alias_tracker.rb +40 -43
- data/lib/active_record/associations/association.rb +172 -67
- data/lib/active_record/associations/association_scope.rb +105 -129
- data/lib/active_record/associations/belongs_to_association.rb +85 -59
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +13 -12
- data/lib/active_record/associations/builder/association.rb +57 -43
- data/lib/active_record/associations/builder/belongs_to.rb +74 -57
- data/lib/active_record/associations/builder/collection_association.rb +15 -33
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +57 -70
- data/lib/active_record/associations/builder/has_many.rb +13 -5
- data/lib/active_record/associations/builder/has_one.rb +44 -6
- data/lib/active_record/associations/builder/singular_association.rb +16 -10
- data/lib/active_record/associations/collection_association.rb +168 -279
- data/lib/active_record/associations/collection_proxy.rb +263 -155
- data/lib/active_record/associations/foreign_association.rb +33 -0
- data/lib/active_record/associations/has_many_association.rb +57 -84
- data/lib/active_record/associations/has_many_through_association.rb +70 -82
- data/lib/active_record/associations/has_one_association.rb +74 -47
- data/lib/active_record/associations/has_one_through_association.rb +20 -11
- data/lib/active_record/associations/join_dependency/join_association.rb +54 -73
- data/lib/active_record/associations/join_dependency/join_base.rb +10 -9
- data/lib/active_record/associations/join_dependency/join_part.rb +14 -14
- data/lib/active_record/associations/join_dependency.rb +175 -164
- data/lib/active_record/associations/preloader/association.rb +107 -112
- data/lib/active_record/associations/preloader/through_association.rb +85 -65
- data/lib/active_record/associations/preloader.rb +99 -96
- data/lib/active_record/associations/singular_association.rb +18 -45
- data/lib/active_record/associations/through_association.rb +49 -24
- data/lib/active_record/associations.rb +1845 -1597
- data/lib/active_record/attribute_assignment.rb +59 -185
- data/lib/active_record/attribute_methods/before_type_cast.rb +20 -7
- data/lib/active_record/attribute_methods/dirty.rb +168 -138
- data/lib/active_record/attribute_methods/primary_key.rb +93 -83
- data/lib/active_record/attribute_methods/query.rb +8 -10
- data/lib/active_record/attribute_methods/read.rb +19 -79
- data/lib/active_record/attribute_methods/serialization.rb +49 -24
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +59 -36
- data/lib/active_record/attribute_methods/write.rb +25 -56
- data/lib/active_record/attribute_methods.rb +153 -162
- data/lib/active_record/attributes.rb +234 -70
- data/lib/active_record/autosave_association.rb +157 -69
- data/lib/active_record/base.rb +49 -50
- data/lib/active_record/callbacks.rb +234 -79
- data/lib/active_record/coders/json.rb +3 -1
- data/lib/active_record/coders/yaml_column.rb +46 -13
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +887 -317
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +17 -41
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +301 -113
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +78 -24
- data/lib/active_record/connection_adapters/abstract/quoting.rb +187 -60
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +9 -7
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +157 -93
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +485 -253
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +79 -36
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +909 -263
- data/lib/active_record/connection_adapters/abstract/transaction.rb +254 -92
- data/lib/active_record/connection_adapters/abstract_adapter.rb +492 -221
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +580 -608
- data/lib/active_record/connection_adapters/column.rb +67 -40
- data/lib/active_record/connection_adapters/deduplicable.rb +29 -0
- data/lib/active_record/connection_adapters/legacy_pool_manager.rb +35 -0
- data/lib/active_record/connection_adapters/mysql/column.rb +27 -0
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +196 -0
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +71 -0
- data/lib/active_record/connection_adapters/mysql/quoting.rb +96 -0
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +97 -0
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +103 -0
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +91 -0
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +271 -0
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +40 -0
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +81 -199
- data/lib/active_record/connection_adapters/pool_config.rb +73 -0
- data/lib/active_record/connection_adapters/pool_manager.rb +47 -0
- data/lib/active_record/connection_adapters/postgresql/column.rb +44 -11
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +78 -161
- data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +44 -0
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +49 -57
- data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +9 -8
- data/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/oid/bytea.rb +5 -2
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +8 -6
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +13 -1
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +17 -13
- data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +3 -1
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +6 -3
- data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +31 -20
- data/lib/active_record/connection_adapters/postgresql/oid/inet.rb +2 -0
- data/lib/active_record/connection_adapters/postgresql/oid/interval.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +3 -11
- data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb +44 -0
- data/lib/active_record/connection_adapters/postgresql/oid/macaddr.rb +25 -0
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +7 -9
- data/lib/active_record/connection_adapters/postgresql/oid/{infinity.rb → oid.rb} +5 -3
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +32 -11
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +70 -34
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +4 -1
- data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +67 -51
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +18 -4
- data/lib/active_record/connection_adapters/postgresql/oid/vector.rb +3 -1
- data/lib/active_record/connection_adapters/postgresql/oid/xml.rb +3 -1
- data/lib/active_record/connection_adapters/postgresql/oid.rb +25 -25
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +171 -48
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +27 -14
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +80 -0
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +178 -108
- data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +499 -293
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +44 -0
- data/lib/active_record/connection_adapters/postgresql/utils.rb +11 -8
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +595 -382
- data/lib/active_record/connection_adapters/schema_cache.rb +191 -29
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +45 -0
- data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +146 -0
- data/lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb +21 -0
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +102 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +21 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_definitions.rb +19 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb +18 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_statements.rb +170 -0
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +322 -389
- data/lib/active_record/connection_adapters/statement_pool.rb +33 -13
- data/lib/active_record/connection_adapters.rb +52 -0
- data/lib/active_record/connection_handling.rb +314 -41
- data/lib/active_record/core.rb +488 -243
- data/lib/active_record/counter_cache.rb +71 -50
- data/lib/active_record/database_configurations/connection_url_resolver.rb +99 -0
- data/lib/active_record/database_configurations/database_config.rb +80 -0
- data/lib/active_record/database_configurations/hash_config.rb +96 -0
- data/lib/active_record/database_configurations/url_config.rb +53 -0
- data/lib/active_record/database_configurations.rb +273 -0
- data/lib/active_record/delegated_type.rb +209 -0
- data/lib/active_record/destroy_association_async_job.rb +36 -0
- data/lib/active_record/dynamic_matchers.rb +87 -106
- data/lib/active_record/enum.rb +212 -94
- data/lib/active_record/errors.rb +225 -54
- data/lib/active_record/explain.rb +27 -11
- data/lib/active_record/explain_registry.rb +4 -2
- data/lib/active_record/explain_subscriber.rb +11 -6
- data/lib/active_record/fixture_set/file.rb +33 -14
- data/lib/active_record/fixture_set/model_metadata.rb +32 -0
- data/lib/active_record/fixture_set/render_context.rb +17 -0
- data/lib/active_record/fixture_set/table_row.rb +152 -0
- data/lib/active_record/fixture_set/table_rows.rb +46 -0
- data/lib/active_record/fixtures.rb +273 -496
- data/lib/active_record/gem_version.rb +6 -4
- data/lib/active_record/inheritance.rb +175 -110
- data/lib/active_record/insert_all.rb +212 -0
- data/lib/active_record/integration.rb +121 -29
- data/lib/active_record/internal_metadata.rb +64 -0
- data/lib/active_record/legacy_yaml_adapter.rb +52 -0
- data/lib/active_record/locale/en.yml +3 -2
- data/lib/active_record/locking/optimistic.rb +103 -95
- data/lib/active_record/locking/pessimistic.rb +22 -6
- data/lib/active_record/log_subscriber.rb +93 -31
- data/lib/active_record/middleware/database_selector/resolver/session.rb +48 -0
- data/lib/active_record/middleware/database_selector/resolver.rb +92 -0
- data/lib/active_record/middleware/database_selector.rb +77 -0
- data/lib/active_record/migration/command_recorder.rb +185 -90
- data/lib/active_record/migration/compatibility.rb +298 -0
- data/lib/active_record/migration/join_table.rb +8 -7
- data/lib/active_record/migration.rb +685 -309
- data/lib/active_record/model_schema.rb +420 -113
- data/lib/active_record/nested_attributes.rb +265 -216
- data/lib/active_record/no_touching.rb +15 -2
- data/lib/active_record/null_relation.rb +24 -38
- data/lib/active_record/persistence.rb +574 -135
- data/lib/active_record/query_cache.rb +29 -23
- data/lib/active_record/querying.rb +50 -31
- data/lib/active_record/railtie.rb +175 -54
- data/lib/active_record/railties/console_sandbox.rb +3 -3
- data/lib/active_record/railties/controller_runtime.rb +34 -33
- data/lib/active_record/railties/databases.rake +533 -216
- data/lib/active_record/readonly_attributes.rb +9 -4
- data/lib/active_record/reflection.rb +485 -310
- data/lib/active_record/relation/batches/batch_enumerator.rb +85 -0
- data/lib/active_record/relation/batches.rb +217 -59
- data/lib/active_record/relation/calculations.rb +326 -244
- data/lib/active_record/relation/delegation.rb +76 -84
- data/lib/active_record/relation/finder_methods.rb +318 -256
- data/lib/active_record/relation/from_clause.rb +30 -0
- data/lib/active_record/relation/merger.rb +99 -84
- data/lib/active_record/relation/predicate_builder/array_handler.rb +26 -25
- data/lib/active_record/relation/predicate_builder/association_query_value.rb +42 -0
- data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +19 -0
- data/lib/active_record/relation/predicate_builder/polymorphic_array_value.rb +57 -0
- data/lib/active_record/relation/predicate_builder/range_handler.rb +22 -0
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +7 -1
- data/lib/active_record/relation/predicate_builder.rb +139 -96
- data/lib/active_record/relation/query_attribute.rb +50 -0
- data/lib/active_record/relation/query_methods.rb +757 -409
- data/lib/active_record/relation/record_fetch_warning.rb +51 -0
- data/lib/active_record/relation/spawn_methods.rb +23 -21
- data/lib/active_record/relation/where_clause.rb +239 -0
- data/lib/active_record/relation.rb +554 -342
- data/lib/active_record/result.rb +91 -47
- data/lib/active_record/runtime_registry.rb +6 -4
- data/lib/active_record/sanitization.rb +134 -122
- data/lib/active_record/schema.rb +21 -24
- data/lib/active_record/schema_dumper.rb +141 -92
- data/lib/active_record/schema_migration.rb +24 -26
- data/lib/active_record/scoping/default.rb +96 -82
- data/lib/active_record/scoping/named.rb +78 -36
- data/lib/active_record/scoping.rb +45 -27
- data/lib/active_record/secure_token.rb +48 -0
- data/lib/active_record/serialization.rb +8 -6
- data/lib/active_record/signed_id.rb +116 -0
- data/lib/active_record/statement_cache.rb +89 -36
- data/lib/active_record/store.rb +133 -43
- data/lib/active_record/suppressor.rb +61 -0
- data/lib/active_record/table_metadata.rb +81 -0
- data/lib/active_record/tasks/database_tasks.rb +366 -129
- data/lib/active_record/tasks/mysql_database_tasks.rb +68 -100
- data/lib/active_record/tasks/postgresql_database_tasks.rb +87 -39
- data/lib/active_record/tasks/sqlite_database_tasks.rb +44 -19
- data/lib/active_record/test_databases.rb +24 -0
- data/lib/active_record/test_fixtures.rb +291 -0
- data/lib/active_record/timestamp.rb +86 -43
- data/lib/active_record/touch_later.rb +65 -0
- data/lib/active_record/transactions.rb +181 -152
- data/lib/active_record/translation.rb +3 -1
- data/lib/active_record/type/adapter_specific_registry.rb +126 -0
- data/lib/active_record/type/date.rb +4 -41
- data/lib/active_record/type/date_time.rb +4 -38
- data/lib/active_record/type/decimal_without_scale.rb +6 -2
- data/lib/active_record/type/hash_lookup_type_map.rb +12 -5
- data/lib/active_record/type/internal/timezone.rb +17 -0
- data/lib/active_record/type/json.rb +30 -0
- data/lib/active_record/type/serialized.rb +33 -15
- data/lib/active_record/type/text.rb +2 -2
- data/lib/active_record/type/time.rb +21 -16
- data/lib/active_record/type/type_map.rb +16 -19
- data/lib/active_record/type/unsigned_integer.rb +9 -8
- data/lib/active_record/type.rb +84 -23
- data/lib/active_record/type_caster/connection.rb +33 -0
- data/lib/active_record/type_caster/map.rb +23 -0
- data/lib/active_record/type_caster.rb +9 -0
- data/lib/active_record/validations/absence.rb +25 -0
- data/lib/active_record/validations/associated.rb +12 -4
- data/lib/active_record/validations/length.rb +26 -0
- data/lib/active_record/validations/numericality.rb +35 -0
- data/lib/active_record/validations/presence.rb +14 -13
- data/lib/active_record/validations/uniqueness.rb +65 -48
- data/lib/active_record/validations.rb +39 -35
- data/lib/active_record/version.rb +3 -1
- data/lib/active_record.rb +44 -28
- data/lib/arel/alias_predication.rb +9 -0
- data/lib/arel/attributes/attribute.rb +41 -0
- data/lib/arel/collectors/bind.rb +29 -0
- data/lib/arel/collectors/composite.rb +39 -0
- data/lib/arel/collectors/plain_string.rb +20 -0
- data/lib/arel/collectors/sql_string.rb +27 -0
- data/lib/arel/collectors/substitute_binds.rb +35 -0
- data/lib/arel/crud.rb +42 -0
- data/lib/arel/delete_manager.rb +18 -0
- data/lib/arel/errors.rb +9 -0
- data/lib/arel/expressions.rb +29 -0
- data/lib/arel/factory_methods.rb +49 -0
- data/lib/arel/insert_manager.rb +49 -0
- data/lib/arel/math.rb +45 -0
- data/lib/arel/nodes/and.rb +32 -0
- data/lib/arel/nodes/ascending.rb +23 -0
- data/lib/arel/nodes/binary.rb +126 -0
- data/lib/arel/nodes/bind_param.rb +44 -0
- data/lib/arel/nodes/case.rb +55 -0
- data/lib/arel/nodes/casted.rb +62 -0
- data/lib/arel/nodes/comment.rb +29 -0
- data/lib/arel/nodes/count.rb +12 -0
- data/lib/arel/nodes/delete_statement.rb +45 -0
- data/lib/arel/nodes/descending.rb +23 -0
- data/lib/arel/nodes/equality.rb +15 -0
- data/lib/arel/nodes/extract.rb +24 -0
- data/lib/arel/nodes/false.rb +16 -0
- data/lib/arel/nodes/full_outer_join.rb +8 -0
- data/lib/arel/nodes/function.rb +44 -0
- data/lib/arel/nodes/grouping.rb +11 -0
- data/lib/arel/nodes/homogeneous_in.rb +76 -0
- data/lib/arel/nodes/in.rb +15 -0
- data/lib/arel/nodes/infix_operation.rb +92 -0
- data/lib/arel/nodes/inner_join.rb +8 -0
- data/lib/arel/nodes/insert_statement.rb +37 -0
- data/lib/arel/nodes/join_source.rb +20 -0
- data/lib/arel/nodes/matches.rb +18 -0
- data/lib/arel/nodes/named_function.rb +23 -0
- data/lib/arel/nodes/node.rb +51 -0
- data/lib/arel/nodes/node_expression.rb +13 -0
- data/lib/arel/nodes/ordering.rb +27 -0
- data/lib/arel/nodes/outer_join.rb +8 -0
- data/lib/arel/nodes/over.rb +15 -0
- data/lib/arel/nodes/regexp.rb +16 -0
- data/lib/arel/nodes/right_outer_join.rb +8 -0
- data/lib/arel/nodes/select_core.rb +67 -0
- data/lib/arel/nodes/select_statement.rb +41 -0
- data/lib/arel/nodes/sql_literal.rb +19 -0
- data/lib/arel/nodes/string_join.rb +11 -0
- data/lib/arel/nodes/table_alias.rb +31 -0
- data/lib/arel/nodes/terminal.rb +16 -0
- data/lib/arel/nodes/true.rb +16 -0
- data/lib/arel/nodes/unary.rb +44 -0
- data/lib/arel/nodes/unary_operation.rb +20 -0
- data/lib/arel/nodes/unqualified_column.rb +22 -0
- data/lib/arel/nodes/update_statement.rb +41 -0
- data/lib/arel/nodes/values_list.rb +9 -0
- data/lib/arel/nodes/window.rb +126 -0
- data/lib/arel/nodes/with.rb +11 -0
- data/lib/arel/nodes.rb +70 -0
- data/lib/arel/order_predications.rb +13 -0
- data/lib/arel/predications.rb +250 -0
- data/lib/arel/select_manager.rb +270 -0
- data/lib/arel/table.rb +118 -0
- data/lib/arel/tree_manager.rb +72 -0
- data/lib/arel/update_manager.rb +34 -0
- data/lib/arel/visitors/dot.rb +308 -0
- data/lib/arel/visitors/mysql.rb +93 -0
- data/lib/arel/visitors/postgresql.rb +120 -0
- data/lib/arel/visitors/sqlite.rb +38 -0
- data/lib/arel/visitors/to_sql.rb +899 -0
- data/lib/arel/visitors/visitor.rb +45 -0
- data/lib/arel/visitors.rb +13 -0
- data/lib/arel/window_predications.rb +9 -0
- data/lib/arel.rb +54 -0
- data/lib/rails/generators/active_record/application_record/application_record_generator.rb +26 -0
- data/lib/rails/generators/active_record/application_record/templates/application_record.rb.tt +5 -0
- data/lib/rails/generators/active_record/migration/migration_generator.rb +43 -37
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +26 -0
- data/lib/rails/generators/active_record/migration/templates/{migration.rb → migration.rb.tt} +13 -10
- data/lib/rails/generators/active_record/migration.rb +35 -1
- data/lib/rails/generators/active_record/model/model_generator.rb +55 -22
- data/lib/rails/generators/active_record/model/templates/abstract_base_class.rb.tt +7 -0
- data/lib/rails/generators/active_record/model/templates/model.rb.tt +22 -0
- data/lib/rails/generators/active_record.rb +7 -5
- metadata +175 -65
- data/lib/active_record/associations/preloader/belongs_to.rb +0 -17
- data/lib/active_record/associations/preloader/collection_association.rb +0 -24
- data/lib/active_record/associations/preloader/has_many.rb +0 -17
- data/lib/active_record/associations/preloader/has_many_through.rb +0 -19
- data/lib/active_record/associations/preloader/has_one.rb +0 -23
- data/lib/active_record/associations/preloader/has_one_through.rb +0 -9
- data/lib/active_record/associations/preloader/singular_association.rb +0 -21
- data/lib/active_record/attribute.rb +0 -149
- data/lib/active_record/attribute_decorators.rb +0 -66
- data/lib/active_record/attribute_set/builder.rb +0 -86
- data/lib/active_record/attribute_set.rb +0 -77
- data/lib/active_record/connection_adapters/connection_specification.rb +0 -275
- data/lib/active_record/connection_adapters/mysql_adapter.rb +0 -491
- data/lib/active_record/connection_adapters/postgresql/array_parser.rb +0 -93
- data/lib/active_record/connection_adapters/postgresql/oid/float.rb +0 -21
- data/lib/active_record/connection_adapters/postgresql/oid/integer.rb +0 -11
- data/lib/active_record/connection_adapters/postgresql/oid/json.rb +0 -35
- data/lib/active_record/connection_adapters/postgresql/oid/time.rb +0 -11
- data/lib/active_record/railties/jdbcmysql_error.rb +0 -16
- data/lib/active_record/serializers/xml_serializer.rb +0 -193
- data/lib/active_record/type/big_integer.rb +0 -13
- data/lib/active_record/type/binary.rb +0 -50
- data/lib/active_record/type/boolean.rb +0 -30
- data/lib/active_record/type/decimal.rb +0 -40
- data/lib/active_record/type/decorator.rb +0 -14
- data/lib/active_record/type/float.rb +0 -19
- data/lib/active_record/type/integer.rb +0 -55
- data/lib/active_record/type/mutable.rb +0 -16
- data/lib/active_record/type/numeric.rb +0 -36
- data/lib/active_record/type/string.rb +0 -36
- data/lib/active_record/type/time_value.rb +0 -38
- data/lib/active_record/type/value.rb +0 -101
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb +0 -22
- data/lib/rails/generators/active_record/model/templates/model.rb +0 -10
- /data/lib/rails/generators/active_record/model/templates/{module.rb → module.rb.tt} +0 -0
| @@ -1,161 +1,156 @@ | |
| 1 | 
            +
            # frozen_string_literal: true
         | 
| 2 | 
            +
             | 
| 1 3 | 
             
            module ActiveRecord
         | 
| 2 4 | 
             
              module Associations
         | 
| 3 5 | 
             
                class Preloader
         | 
| 4 6 | 
             
                  class Association #:nodoc:
         | 
| 5 | 
            -
                     | 
| 6 | 
            -
                    attr_reader :preloaded_records
         | 
| 7 | 
            -
             | 
| 8 | 
            -
                    def initialize(klass, owners, reflection, preload_scope)
         | 
| 7 | 
            +
                    def initialize(klass, owners, reflection, preload_scope, associate_by_default = true)
         | 
| 9 8 | 
             
                      @klass         = klass
         | 
| 10 | 
            -
                      @owners        = owners
         | 
| 9 | 
            +
                      @owners        = owners.uniq(&:__id__)
         | 
| 11 10 | 
             
                      @reflection    = reflection
         | 
| 12 11 | 
             
                      @preload_scope = preload_scope
         | 
| 12 | 
            +
                      @associate     = associate_by_default || !preload_scope || preload_scope.empty_scope?
         | 
| 13 13 | 
             
                      @model         = owners.first && owners.first.class
         | 
| 14 | 
            -
                      @scope         = nil
         | 
| 15 | 
            -
                      @owners_by_key = nil
         | 
| 16 | 
            -
                      @preloaded_records = []
         | 
| 17 14 | 
             
                    end
         | 
| 18 15 |  | 
| 19 | 
            -
                    def run | 
| 20 | 
            -
                       | 
| 21 | 
            -
                    end
         | 
| 16 | 
            +
                    def run
         | 
| 17 | 
            +
                      records = records_by_owner
         | 
| 22 18 |  | 
| 23 | 
            -
             | 
| 24 | 
            -
             | 
| 25 | 
            -
             | 
| 19 | 
            +
                      owners.each do |owner|
         | 
| 20 | 
            +
                        associate_records_to_owner(owner, records[owner] || [])
         | 
| 21 | 
            +
                      end if @associate
         | 
| 26 22 |  | 
| 27 | 
            -
             | 
| 28 | 
            -
                      @scope ||= build_scope
         | 
| 23 | 
            +
                      self
         | 
| 29 24 | 
             
                    end
         | 
| 30 25 |  | 
| 31 | 
            -
                    def  | 
| 32 | 
            -
                       | 
| 33 | 
            -
                    end
         | 
| 26 | 
            +
                    def records_by_owner
         | 
| 27 | 
            +
                      load_records unless defined?(@records_by_owner)
         | 
| 34 28 |  | 
| 35 | 
            -
             | 
| 36 | 
            -
                      scope.where(association_key.in(ids))
         | 
| 29 | 
            +
                      @records_by_owner
         | 
| 37 30 | 
             
                    end
         | 
| 38 31 |  | 
| 39 | 
            -
                    def  | 
| 40 | 
            -
                       | 
| 41 | 
            -
                    end
         | 
| 32 | 
            +
                    def preloaded_records
         | 
| 33 | 
            +
                      load_records unless defined?(@preloaded_records)
         | 
| 42 34 |  | 
| 43 | 
            -
             | 
| 44 | 
            -
                    def association_key_name
         | 
| 45 | 
            -
                      raise NotImplementedError
         | 
| 35 | 
            +
                      @preloaded_records
         | 
| 46 36 | 
             
                    end
         | 
| 47 37 |  | 
| 48 | 
            -
                     | 
| 49 | 
            -
             | 
| 50 | 
            -
                    def association_key
         | 
| 51 | 
            -
                      table[association_key_name]
         | 
| 52 | 
            -
                    end
         | 
| 38 | 
            +
                    private
         | 
| 39 | 
            +
                      attr_reader :owners, :reflection, :preload_scope, :model, :klass
         | 
| 53 40 |  | 
| 54 | 
            -
             | 
| 55 | 
            -
             | 
| 56 | 
            -
             | 
| 57 | 
            -
             | 
| 41 | 
            +
                      def load_records
         | 
| 42 | 
            +
                        # owners can be duplicated when a relation has a collection association join
         | 
| 43 | 
            +
                        # #compare_by_identity makes such owners different hash keys
         | 
| 44 | 
            +
                        @records_by_owner = {}.compare_by_identity
         | 
| 45 | 
            +
                        raw_records = owner_keys.empty? ? [] : records_for(owner_keys)
         | 
| 58 46 |  | 
| 59 | 
            -
             | 
| 60 | 
            -
             | 
| 61 | 
            -
                                           owners.group_by do |owner|
         | 
| 62 | 
            -
                                             owner[owner_key_name].to_s
         | 
| 63 | 
            -
                                           end
         | 
| 64 | 
            -
                                         else
         | 
| 65 | 
            -
                                           owners.group_by do |owner|
         | 
| 66 | 
            -
                                             owner[owner_key_name]
         | 
| 67 | 
            -
                                           end
         | 
| 68 | 
            -
                                         end
         | 
| 69 | 
            -
                    end
         | 
| 47 | 
            +
                        @preloaded_records = raw_records.select do |record|
         | 
| 48 | 
            +
                          assignments = false
         | 
| 70 49 |  | 
| 71 | 
            -
             | 
| 72 | 
            -
             | 
| 73 | 
            -
                    end
         | 
| 50 | 
            +
                          owners_by_key[convert_key(record[association_key_name])].each do |owner|
         | 
| 51 | 
            +
                            entries = (@records_by_owner[owner] ||= [])
         | 
| 74 52 |  | 
| 75 | 
            -
             | 
| 53 | 
            +
                            if reflection.collection? || entries.empty?
         | 
| 54 | 
            +
                              entries << record
         | 
| 55 | 
            +
                              assignments = true
         | 
| 56 | 
            +
                            end
         | 
| 57 | 
            +
                          end
         | 
| 76 58 |  | 
| 77 | 
            -
             | 
| 78 | 
            -
             | 
| 79 | 
            -
                       | 
| 59 | 
            +
                          assignments
         | 
| 60 | 
            +
                        end
         | 
| 61 | 
            +
                      end
         | 
| 80 62 |  | 
| 81 | 
            -
                      #  | 
| 82 | 
            -
                       | 
| 83 | 
            -
                         | 
| 63 | 
            +
                      # The name of the key on the associated records
         | 
| 64 | 
            +
                      def association_key_name
         | 
| 65 | 
            +
                        reflection.join_primary_key(klass)
         | 
| 84 66 | 
             
                      end
         | 
| 85 67 |  | 
| 86 | 
            -
                       | 
| 87 | 
            -
             | 
| 88 | 
            -
                         | 
| 89 | 
            -
             | 
| 68 | 
            +
                      # The name of the key on the model which declares the association
         | 
| 69 | 
            +
                      def owner_key_name
         | 
| 70 | 
            +
                        reflection.join_foreign_key
         | 
| 71 | 
            +
                      end
         | 
| 90 72 |  | 
| 91 | 
            -
             | 
| 92 | 
            -
                         | 
| 93 | 
            -
             | 
| 94 | 
            -
             | 
| 95 | 
            -
             | 
| 73 | 
            +
                      def associate_records_to_owner(owner, records)
         | 
| 74 | 
            +
                        association = owner.association(reflection.name)
         | 
| 75 | 
            +
                        if reflection.collection?
         | 
| 76 | 
            +
                          association.target = records
         | 
| 77 | 
            +
                        else
         | 
| 78 | 
            +
                          association.target = records.first
         | 
| 96 79 | 
             
                        end
         | 
| 97 80 | 
             
                      end
         | 
| 98 81 |  | 
| 99 | 
            -
                       | 
| 100 | 
            -
             | 
| 82 | 
            +
                      def owner_keys
         | 
| 83 | 
            +
                        @owner_keys ||= owners_by_key.keys
         | 
| 84 | 
            +
                      end
         | 
| 101 85 |  | 
| 102 | 
            -
             | 
| 103 | 
            -
             | 
| 104 | 
            -
             | 
| 86 | 
            +
                      def owners_by_key
         | 
| 87 | 
            +
                        @owners_by_key ||= owners.each_with_object({}) do |owner, result|
         | 
| 88 | 
            +
                          key = convert_key(owner[owner_key_name])
         | 
| 89 | 
            +
                          (result[key] ||= []) << owner if key
         | 
| 90 | 
            +
                        end
         | 
| 91 | 
            +
                      end
         | 
| 105 92 |  | 
| 106 | 
            -
             | 
| 107 | 
            -
             | 
| 108 | 
            -
             | 
| 93 | 
            +
                      def key_conversion_required?
         | 
| 94 | 
            +
                        unless defined?(@key_conversion_required)
         | 
| 95 | 
            +
                          @key_conversion_required = (association_key_type != owner_key_type)
         | 
| 96 | 
            +
                        end
         | 
| 109 97 |  | 
| 110 | 
            -
             | 
| 111 | 
            -
                       | 
| 112 | 
            -
                    end
         | 
| 98 | 
            +
                        @key_conversion_required
         | 
| 99 | 
            +
                      end
         | 
| 113 100 |  | 
| 114 | 
            -
             | 
| 115 | 
            -
             | 
| 116 | 
            -
             | 
| 117 | 
            -
             | 
| 101 | 
            +
                      def convert_key(key)
         | 
| 102 | 
            +
                        if key_conversion_required?
         | 
| 103 | 
            +
                          key.to_s
         | 
| 104 | 
            +
                        else
         | 
| 105 | 
            +
                          key
         | 
| 106 | 
            +
                        end
         | 
| 107 | 
            +
                      end
         | 
| 118 108 |  | 
| 119 | 
            -
                       | 
| 120 | 
            -
                         | 
| 121 | 
            -
             | 
| 109 | 
            +
                      def association_key_type
         | 
| 110 | 
            +
                        @klass.type_for_attribute(association_key_name).type
         | 
| 111 | 
            +
                      end
         | 
| 122 112 |  | 
| 123 | 
            -
             | 
| 124 | 
            -
             | 
| 125 | 
            -
             | 
| 113 | 
            +
                      def owner_key_type
         | 
| 114 | 
            +
                        @model.type_for_attribute(owner_key_name).type
         | 
| 115 | 
            +
                      end
         | 
| 126 116 |  | 
| 127 | 
            -
             | 
| 128 | 
            -
             | 
| 129 | 
            -
             | 
| 117 | 
            +
                      def records_for(ids)
         | 
| 118 | 
            +
                        scope.where(association_key_name => ids).load do |record|
         | 
| 119 | 
            +
                          # Processing only the first owner
         | 
| 120 | 
            +
                          # because the record is modified but not an owner
         | 
| 121 | 
            +
                          owner = owners_by_key[convert_key(record[association_key_name])].first
         | 
| 122 | 
            +
                          association = owner.association(reflection.name)
         | 
| 123 | 
            +
                          association.set_inverse_instance(record)
         | 
| 124 | 
            +
                        end
         | 
| 125 | 
            +
                      end
         | 
| 130 126 |  | 
| 131 | 
            -
             | 
| 132 | 
            -
             | 
| 127 | 
            +
                      def scope
         | 
| 128 | 
            +
                        @scope ||= build_scope
         | 
| 129 | 
            +
                      end
         | 
| 133 130 |  | 
| 134 | 
            -
                       | 
| 135 | 
            -
             | 
| 136 | 
            -
                       | 
| 137 | 
            -
                      preload_binds  = preload_scope.bind_values
         | 
| 131 | 
            +
                      def reflection_scope
         | 
| 132 | 
            +
                        @reflection_scope ||= reflection.join_scopes(klass.arel_table, klass.predicate_builder, klass).inject(klass.unscoped, &:merge!)
         | 
| 133 | 
            +
                      end
         | 
| 138 134 |  | 
| 139 | 
            -
                       | 
| 140 | 
            -
             | 
| 141 | 
            -
                      scope.bind_values       = (reflection_binds + preload_binds)
         | 
| 135 | 
            +
                      def build_scope
         | 
| 136 | 
            +
                        scope = klass.scope_for_association
         | 
| 142 137 |  | 
| 143 | 
            -
             | 
| 144 | 
            -
             | 
| 145 | 
            -
             | 
| 146 | 
            -
                      scope.order! preload_values[:order] || values[:order]
         | 
| 138 | 
            +
                        if reflection.type && !reflection.through_reflection?
         | 
| 139 | 
            +
                          scope.where!(reflection.type => model.polymorphic_name)
         | 
| 140 | 
            +
                        end
         | 
| 147 141 |  | 
| 148 | 
            -
             | 
| 149 | 
            -
                        scope.readonly!
         | 
| 150 | 
            -
                      end
         | 
| 142 | 
            +
                        scope.merge!(reflection_scope) unless reflection_scope.empty_scope?
         | 
| 151 143 |  | 
| 152 | 
            -
             | 
| 153 | 
            -
             | 
| 154 | 
            -
             | 
| 144 | 
            +
                        if preload_scope && !preload_scope.empty_scope?
         | 
| 145 | 
            +
                          scope.merge!(preload_scope)
         | 
| 146 | 
            +
                        end
         | 
| 155 147 |  | 
| 156 | 
            -
             | 
| 157 | 
            -
             | 
| 158 | 
            -
             | 
| 148 | 
            +
                        if preload_scope && preload_scope.strict_loading_value
         | 
| 149 | 
            +
                          scope.strict_loading
         | 
| 150 | 
            +
                        else
         | 
| 151 | 
            +
                          scope
         | 
| 152 | 
            +
                        end
         | 
| 153 | 
            +
                      end
         | 
| 159 154 | 
             
                  end
         | 
| 160 155 | 
             
                end
         | 
| 161 156 | 
             
              end
         | 
| @@ -1,95 +1,115 @@ | |
| 1 | 
            +
            # frozen_string_literal: true
         | 
| 2 | 
            +
             | 
| 1 3 | 
             
            module ActiveRecord
         | 
| 2 4 | 
             
              module Associations
         | 
| 3 5 | 
             
                class Preloader
         | 
| 4 | 
            -
                   | 
| 5 | 
            -
                     | 
| 6 | 
            -
                      reflection.through_reflection
         | 
| 7 | 
            -
                    end
         | 
| 6 | 
            +
                  class ThroughAssociation < Association # :nodoc:
         | 
| 7 | 
            +
                    PRELOADER = ActiveRecord::Associations::Preloader.new(associate_by_default: false)
         | 
| 8 8 |  | 
| 9 | 
            -
                    def  | 
| 10 | 
            -
                       | 
| 9 | 
            +
                    def initialize(*)
         | 
| 10 | 
            +
                      super
         | 
| 11 | 
            +
                      @already_loaded = owners.first.association(through_reflection.name).loaded?
         | 
| 11 12 | 
             
                    end
         | 
| 12 13 |  | 
| 13 | 
            -
                    def  | 
| 14 | 
            -
                       | 
| 15 | 
            -
             | 
| 16 | 
            -
                                        through_scope)
         | 
| 17 | 
            -
             | 
| 18 | 
            -
                      through_records = owners.map do |owner|
         | 
| 19 | 
            -
                        association = owner.association through_reflection.name
         | 
| 14 | 
            +
                    def preloaded_records
         | 
| 15 | 
            +
                      @preloaded_records ||= source_preloaders.flat_map(&:preloaded_records)
         | 
| 16 | 
            +
                    end
         | 
| 20 17 |  | 
| 21 | 
            -
             | 
| 22 | 
            -
                       | 
| 18 | 
            +
                    def records_by_owner
         | 
| 19 | 
            +
                      return @records_by_owner if defined?(@records_by_owner)
         | 
| 20 | 
            +
                      source_records_by_owner = source_preloaders.map(&:records_by_owner).reduce(:merge)
         | 
| 21 | 
            +
                      through_records_by_owner = through_preloaders.map(&:records_by_owner).reduce(:merge)
         | 
| 23 22 |  | 
| 24 | 
            -
                       | 
| 23 | 
            +
                      @records_by_owner = owners.each_with_object({}) do |owner, result|
         | 
| 24 | 
            +
                        through_records = through_records_by_owner[owner] || []
         | 
| 25 25 |  | 
| 26 | 
            -
             | 
| 26 | 
            +
                        if @already_loaded
         | 
| 27 | 
            +
                          if source_type = reflection.options[:source_type]
         | 
| 28 | 
            +
                            through_records = through_records.select do |record|
         | 
| 29 | 
            +
                              record[reflection.foreign_type] == source_type
         | 
| 30 | 
            +
                            end
         | 
| 31 | 
            +
                          end
         | 
| 32 | 
            +
                        end
         | 
| 27 33 |  | 
| 28 | 
            -
             | 
| 29 | 
            -
             | 
| 30 | 
            -
             | 
| 34 | 
            +
                        records = through_records.flat_map do |record|
         | 
| 35 | 
            +
                          source_records_by_owner[record]
         | 
| 36 | 
            +
                        end
         | 
| 31 37 |  | 
| 32 | 
            -
             | 
| 38 | 
            +
                        records.compact!
         | 
| 39 | 
            +
                        records.sort_by! { |rhs| preload_index[rhs] } if scope.order_values.any?
         | 
| 40 | 
            +
                        records.uniq! if scope.distinct_value
         | 
| 41 | 
            +
                        result[owner] = records
         | 
| 42 | 
            +
                      end
         | 
| 43 | 
            +
                    end
         | 
| 33 44 |  | 
| 34 | 
            -
             | 
| 35 | 
            -
             | 
| 36 | 
            -
             | 
| 37 | 
            -
                        }
         | 
| 45 | 
            +
                    private
         | 
| 46 | 
            +
                      def source_preloaders
         | 
| 47 | 
            +
                        @source_preloaders ||= PRELOADER.preload(middle_records, source_reflection.name, scope)
         | 
| 38 48 | 
             
                      end
         | 
| 39 49 |  | 
| 40 | 
            -
                       | 
| 41 | 
            -
             | 
| 42 | 
            -
                        record_offset[record] = i
         | 
| 50 | 
            +
                      def middle_records
         | 
| 51 | 
            +
                        through_preloaders.flat_map(&:preloaded_records)
         | 
| 43 52 | 
             
                      end
         | 
| 44 53 |  | 
| 45 | 
            -
                       | 
| 46 | 
            -
                         | 
| 54 | 
            +
                      def through_preloaders
         | 
| 55 | 
            +
                        @through_preloaders ||= PRELOADER.preload(owners, through_reflection.name, through_scope)
         | 
| 56 | 
            +
                      end
         | 
| 47 57 |  | 
| 48 | 
            -
             | 
| 49 | 
            -
             | 
| 50 | 
            -
             | 
| 58 | 
            +
                      def through_reflection
         | 
| 59 | 
            +
                        reflection.through_reflection
         | 
| 60 | 
            +
                      end
         | 
| 51 61 |  | 
| 52 | 
            -
             | 
| 53 | 
            -
             | 
| 62 | 
            +
                      def source_reflection
         | 
| 63 | 
            +
                        reflection.source_reflection
         | 
| 64 | 
            +
                      end
         | 
| 54 65 |  | 
| 55 | 
            -
             | 
| 66 | 
            +
                      def preload_index
         | 
| 67 | 
            +
                        @preload_index ||= preloaded_records.each_with_object({}).with_index do |(record, result), index|
         | 
| 68 | 
            +
                          result[record] = index
         | 
| 56 69 | 
             
                        end
         | 
| 57 | 
            -
                      }
         | 
| 58 | 
            -
                    end
         | 
| 59 | 
            -
             | 
| 60 | 
            -
                    private
         | 
| 61 | 
            -
             | 
| 62 | 
            -
                    def reset_association(owners, association_name)
         | 
| 63 | 
            -
                      should_reset = (through_scope != through_reflection.klass.unscoped) ||
         | 
| 64 | 
            -
                         (reflection.options[:source_type] && through_reflection.collection?)
         | 
| 65 | 
            -
             | 
| 66 | 
            -
                      # Don't cache the association - we would only be caching a subset
         | 
| 67 | 
            -
                      if should_reset
         | 
| 68 | 
            -
                        owners.each { |owner|
         | 
| 69 | 
            -
                          owner.association(association_name).reset
         | 
| 70 | 
            -
                        }
         | 
| 71 70 | 
             
                      end
         | 
| 72 | 
            -
                    end
         | 
| 73 71 |  | 
| 72 | 
            +
                      def through_scope
         | 
| 73 | 
            +
                        scope = through_reflection.klass.unscoped
         | 
| 74 | 
            +
                        options = reflection.options
         | 
| 74 75 |  | 
| 75 | 
            -
             | 
| 76 | 
            -
             | 
| 76 | 
            +
                        values = reflection_scope.values
         | 
| 77 | 
            +
                        if annotations = values[:annotate]
         | 
| 78 | 
            +
                          scope.annotate!(*annotations)
         | 
| 79 | 
            +
                        end
         | 
| 77 80 |  | 
| 78 | 
            -
             | 
| 79 | 
            -
             | 
| 80 | 
            -
             | 
| 81 | 
            -
             | 
| 82 | 
            -
             | 
| 83 | 
            -
                           | 
| 84 | 
            -
             | 
| 81 | 
            +
                        if options[:source_type]
         | 
| 82 | 
            +
                          scope.where! reflection.foreign_type => options[:source_type]
         | 
| 83 | 
            +
                        elsif !reflection_scope.where_clause.empty?
         | 
| 84 | 
            +
                          scope.where_clause = reflection_scope.where_clause
         | 
| 85 | 
            +
             | 
| 86 | 
            +
                          if includes = values[:includes]
         | 
| 87 | 
            +
                            scope.includes!(source_reflection.name => includes)
         | 
| 88 | 
            +
                          else
         | 
| 89 | 
            +
                            scope.includes!(source_reflection.name)
         | 
| 90 | 
            +
                          end
         | 
| 91 | 
            +
             | 
| 92 | 
            +
                          if values[:references] && !values[:references].empty?
         | 
| 93 | 
            +
                            scope.references_values |= values[:references]
         | 
| 94 | 
            +
                          else
         | 
| 95 | 
            +
                            scope.references!(source_reflection.table_name)
         | 
| 96 | 
            +
                          end
         | 
| 97 | 
            +
             | 
| 98 | 
            +
                          if joins = values[:joins]
         | 
| 99 | 
            +
                            scope.joins!(source_reflection.name => joins)
         | 
| 100 | 
            +
                          end
         | 
| 101 | 
            +
             | 
| 102 | 
            +
                          if left_outer_joins = values[:left_outer_joins]
         | 
| 103 | 
            +
                            scope.left_outer_joins!(source_reflection.name => left_outer_joins)
         | 
| 104 | 
            +
                          end
         | 
| 105 | 
            +
             | 
| 106 | 
            +
                          if scope.eager_loading? && order_values = values[:order]
         | 
| 107 | 
            +
                            scope = scope.order(order_values)
         | 
| 108 | 
            +
                          end
         | 
| 85 109 | 
             
                        end
         | 
| 86 110 |  | 
| 87 | 
            -
                        scope | 
| 88 | 
            -
                        scope = scope.order reflection_scope.values[:order] if scope.eager_loading?
         | 
| 111 | 
            +
                        scope
         | 
| 89 112 | 
             
                      end
         | 
| 90 | 
            -
             | 
| 91 | 
            -
                      scope
         | 
| 92 | 
            -
                    end
         | 
| 93 113 | 
             
                  end
         | 
| 94 114 | 
             
                end
         | 
| 95 115 | 
             
              end
         |