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,52 +1,45 @@ 
     | 
|
| 
      
 1 
     | 
    
         
            +
            # frozen_string_literal: true
         
     | 
| 
      
 2 
     | 
    
         
            +
             
     | 
| 
       1 
3 
     | 
    
         
             
            module ActiveRecord
         
     | 
| 
       2 
4 
     | 
    
         
             
              module Associations
         
     | 
| 
       3 
5 
     | 
    
         
             
                class JoinDependency # :nodoc:
         
     | 
| 
       4 
     | 
    
         
            -
                  autoload :JoinBase,         
     | 
| 
       5 
     | 
    
         
            -
                  autoload :JoinAssociation,  
     | 
| 
      
 6 
     | 
    
         
            +
                  autoload :JoinBase,        "active_record/associations/join_dependency/join_base"
         
     | 
| 
      
 7 
     | 
    
         
            +
                  autoload :JoinAssociation, "active_record/associations/join_dependency/join_association"
         
     | 
| 
       6 
8 
     | 
    
         | 
| 
       7 
9 
     | 
    
         
             
                  class Aliases # :nodoc:
         
     | 
| 
       8 
10 
     | 
    
         
             
                    def initialize(tables)
         
     | 
| 
       9 
11 
     | 
    
         
             
                      @tables = tables
         
     | 
| 
       10 
     | 
    
         
            -
                      @alias_cache = tables.each_with_object({}) { |table,h|
         
     | 
| 
       11 
     | 
    
         
            -
                        h[table.node] = table.columns.each_with_object({}) { |column,i|
         
     | 
| 
      
 12 
     | 
    
         
            +
                      @alias_cache = tables.each_with_object({}) { |table, h|
         
     | 
| 
      
 13 
     | 
    
         
            +
                        h[table.node] = table.columns.each_with_object({}) { |column, i|
         
     | 
| 
       12 
14 
     | 
    
         
             
                          i[column.name] = column.alias
         
     | 
| 
       13 
15 
     | 
    
         
             
                        }
         
     | 
| 
       14 
16 
     | 
    
         
             
                      }
         
     | 
| 
       15 
     | 
    
         
            -
                      @ 
     | 
| 
       16 
     | 
    
         
            -
                        h[table.node] = table.columns 
     | 
| 
       17 
     | 
    
         
            -
                          [column.name, column.alias]
         
     | 
| 
       18 
     | 
    
         
            -
                        }
         
     | 
| 
      
 17 
     | 
    
         
            +
                      @columns_cache = tables.each_with_object({}) { |table, h|
         
     | 
| 
      
 18 
     | 
    
         
            +
                        h[table.node] = table.columns
         
     | 
| 
       19 
19 
     | 
    
         
             
                      }
         
     | 
| 
       20 
20 
     | 
    
         
             
                    end
         
     | 
| 
       21 
21 
     | 
    
         | 
| 
       22 
22 
     | 
    
         
             
                    def columns
         
     | 
| 
       23 
     | 
    
         
            -
                      @tables.flat_map 
     | 
| 
      
 23 
     | 
    
         
            +
                      @tables.flat_map(&:column_aliases)
         
     | 
| 
       24 
24 
     | 
    
         
             
                    end
         
     | 
| 
       25 
25 
     | 
    
         | 
| 
       26 
     | 
    
         
            -
                    # An array of [column_name, alias] pairs for the table
         
     | 
| 
       27 
26 
     | 
    
         
             
                    def column_aliases(node)
         
     | 
| 
       28 
     | 
    
         
            -
                      @ 
     | 
| 
      
 27 
     | 
    
         
            +
                      @columns_cache[node]
         
     | 
| 
       29 
28 
     | 
    
         
             
                    end
         
     | 
| 
       30 
29 
     | 
    
         | 
| 
       31 
30 
     | 
    
         
             
                    def column_alias(node, column)
         
     | 
| 
       32 
31 
     | 
    
         
             
                      @alias_cache[node][column]
         
     | 
| 
       33 
32 
     | 
    
         
             
                    end
         
     | 
| 
       34 
33 
     | 
    
         | 
| 
       35 
     | 
    
         
            -
                     
     | 
| 
       36 
     | 
    
         
            -
                      def table
         
     | 
| 
       37 
     | 
    
         
            -
                        Arel::Nodes::TableAlias.new node.table, node.aliased_table_name
         
     | 
| 
       38 
     | 
    
         
            -
                      end
         
     | 
| 
       39 
     | 
    
         
            -
             
     | 
| 
      
 34 
     | 
    
         
            +
                    Table = Struct.new(:node, :columns) do # :nodoc:
         
     | 
| 
       40 
35 
     | 
    
         
             
                      def column_aliases
         
     | 
| 
       41 
     | 
    
         
            -
                        t = table
         
     | 
| 
       42 
     | 
    
         
            -
                        columns.map { |column| t[column.name].as 
     | 
| 
      
 36 
     | 
    
         
            +
                        t = node.table
         
     | 
| 
      
 37 
     | 
    
         
            +
                        columns.map { |column| t[column.name].as(column.alias) }
         
     | 
| 
       43 
38 
     | 
    
         
             
                      end
         
     | 
| 
       44 
39 
     | 
    
         
             
                    end
         
     | 
| 
       45 
40 
     | 
    
         
             
                    Column = Struct.new(:name, :alias)
         
     | 
| 
       46 
41 
     | 
    
         
             
                  end
         
     | 
| 
       47 
42 
     | 
    
         | 
| 
       48 
     | 
    
         
            -
                  attr_reader :alias_tracker, :base_klass, :join_root
         
     | 
| 
       49 
     | 
    
         
            -
             
     | 
| 
       50 
43 
     | 
    
         
             
                  def self.make_tree(associations)
         
     | 
| 
       51 
44 
     | 
    
         
             
                    hash = {}
         
     | 
| 
       52 
45 
     | 
    
         
             
                    walk_tree associations, hash
         
     | 
| 
         @@ -62,7 +55,7 @@ module ActiveRecord 
     | 
|
| 
       62 
55 
     | 
    
         
             
                        walk_tree assoc, hash
         
     | 
| 
       63 
56 
     | 
    
         
             
                      end
         
     | 
| 
       64 
57 
     | 
    
         
             
                    when Hash
         
     | 
| 
       65 
     | 
    
         
            -
                      associations.each do |k,v|
         
     | 
| 
      
 58 
     | 
    
         
            +
                      associations.each do |k, v|
         
     | 
| 
       66 
59 
     | 
    
         
             
                        cache = hash[k] ||= {}
         
     | 
| 
       67 
60 
     | 
    
         
             
                        walk_tree v, cache
         
     | 
| 
       68 
61 
     | 
    
         
             
                      end
         
     | 
| 
         @@ -71,76 +64,69 @@ module ActiveRecord 
     | 
|
| 
       71 
64 
     | 
    
         
             
                    end
         
     | 
| 
       72 
65 
     | 
    
         
             
                  end
         
     | 
| 
       73 
66 
     | 
    
         | 
| 
       74 
     | 
    
         
            -
                   
     | 
| 
       75 
     | 
    
         
            -
                  # associations is the list of associations which are joined using hash, symbol or array.
         
     | 
| 
       76 
     | 
    
         
            -
                  # joins is the list of all string join commands and arel nodes.
         
     | 
| 
       77 
     | 
    
         
            -
                  #
         
     | 
| 
       78 
     | 
    
         
            -
                  #  Example :
         
     | 
| 
       79 
     | 
    
         
            -
                  #
         
     | 
| 
       80 
     | 
    
         
            -
                  #  class Physician < ActiveRecord::Base
         
     | 
| 
       81 
     | 
    
         
            -
                  #    has_many :appointments
         
     | 
| 
       82 
     | 
    
         
            -
                  #    has_many :patients, through: :appointments
         
     | 
| 
       83 
     | 
    
         
            -
                  #  end
         
     | 
| 
       84 
     | 
    
         
            -
                  #
         
     | 
| 
       85 
     | 
    
         
            -
                  #  If I execute `@physician.patients.to_a` then
         
     | 
| 
       86 
     | 
    
         
            -
                  #    base # => Physician
         
     | 
| 
       87 
     | 
    
         
            -
                  #    associations # => []
         
     | 
| 
       88 
     | 
    
         
            -
                  #    joins # =>  [#<Arel::Nodes::InnerJoin: ...]
         
     | 
| 
       89 
     | 
    
         
            -
                  #
         
     | 
| 
       90 
     | 
    
         
            -
                  #  However if I execute `Physician.joins(:appointments).to_a` then
         
     | 
| 
       91 
     | 
    
         
            -
                  #    base # => Physician
         
     | 
| 
       92 
     | 
    
         
            -
                  #    associations # => [:appointments]
         
     | 
| 
       93 
     | 
    
         
            -
                  #    joins # =>  []
         
     | 
| 
       94 
     | 
    
         
            -
                  #
         
     | 
| 
       95 
     | 
    
         
            -
                  def initialize(base, associations, joins)
         
     | 
| 
       96 
     | 
    
         
            -
                    @alias_tracker = AliasTracker.create(base.connection, joins)
         
     | 
| 
       97 
     | 
    
         
            -
                    @alias_tracker.aliased_table_for(base.table_name, base.table_name) # Updates the count for base.table_name to 1
         
     | 
| 
      
 67 
     | 
    
         
            +
                  def initialize(base, table, associations, join_type)
         
     | 
| 
       98 
68 
     | 
    
         
             
                    tree = self.class.make_tree associations
         
     | 
| 
       99 
     | 
    
         
            -
                    @join_root = JoinBase.new 
     | 
| 
       100 
     | 
    
         
            -
                    @ 
     | 
| 
      
 69 
     | 
    
         
            +
                    @join_root = JoinBase.new(base, table, build(tree, base))
         
     | 
| 
      
 70 
     | 
    
         
            +
                    @join_type = join_type
         
     | 
| 
      
 71 
     | 
    
         
            +
                  end
         
     | 
| 
      
 72 
     | 
    
         
            +
             
     | 
| 
      
 73 
     | 
    
         
            +
                  def base_klass
         
     | 
| 
      
 74 
     | 
    
         
            +
                    join_root.base_klass
         
     | 
| 
       101 
75 
     | 
    
         
             
                  end
         
     | 
| 
       102 
76 
     | 
    
         | 
| 
       103 
77 
     | 
    
         
             
                  def reflections
         
     | 
| 
       104 
78 
     | 
    
         
             
                    join_root.drop(1).map!(&:reflection)
         
     | 
| 
       105 
79 
     | 
    
         
             
                  end
         
     | 
| 
       106 
80 
     | 
    
         | 
| 
       107 
     | 
    
         
            -
                  def join_constraints( 
     | 
| 
       108 
     | 
    
         
            -
                     
     | 
| 
       109 
     | 
    
         
            -
             
     | 
| 
       110 
     | 
    
         
            -
                    }
         
     | 
| 
      
 81 
     | 
    
         
            +
                  def join_constraints(joins_to_add, alias_tracker, references)
         
     | 
| 
      
 82 
     | 
    
         
            +
                    @alias_tracker = alias_tracker
         
     | 
| 
      
 83 
     | 
    
         
            +
                    @joined_tables = {}
         
     | 
| 
      
 84 
     | 
    
         
            +
                    @references = {}
         
     | 
| 
      
 85 
     | 
    
         
            +
             
     | 
| 
      
 86 
     | 
    
         
            +
                    references.each do |table_name|
         
     | 
| 
      
 87 
     | 
    
         
            +
                      @references[table_name.to_sym] = table_name if table_name.is_a?(Arel::Nodes::SqlLiteral)
         
     | 
| 
      
 88 
     | 
    
         
            +
                    end unless references.empty?
         
     | 
| 
       111 
89 
     | 
    
         | 
| 
       112 
     | 
    
         
            -
                    joins 
     | 
| 
      
 90 
     | 
    
         
            +
                    joins = make_join_constraints(join_root, join_type)
         
     | 
| 
      
 91 
     | 
    
         
            +
             
     | 
| 
      
 92 
     | 
    
         
            +
                    joins.concat joins_to_add.flat_map { |oj|
         
     | 
| 
       113 
93 
     | 
    
         
             
                      if join_root.match? oj.join_root
         
     | 
| 
       114 
     | 
    
         
            -
                        walk join_root, oj. 
     | 
| 
      
 94 
     | 
    
         
            +
                        walk(join_root, oj.join_root, oj.join_type)
         
     | 
| 
       115 
95 
     | 
    
         
             
                      else
         
     | 
| 
       116 
     | 
    
         
            -
                        oj.join_root. 
     | 
| 
       117 
     | 
    
         
            -
                          make_outer_joins oj.join_root, child
         
     | 
| 
       118 
     | 
    
         
            -
                        }
         
     | 
| 
      
 96 
     | 
    
         
            +
                        make_join_constraints(oj.join_root, oj.join_type)
         
     | 
| 
       119 
97 
     | 
    
         
             
                      end
         
     | 
| 
       120 
98 
     | 
    
         
             
                    }
         
     | 
| 
       121 
99 
     | 
    
         
             
                  end
         
     | 
| 
       122 
100 
     | 
    
         | 
| 
       123 
     | 
    
         
            -
                  def  
     | 
| 
       124 
     | 
    
         
            -
                    Aliases.new join_root.each_with_index.map { |join_part,i|
         
     | 
| 
       125 
     | 
    
         
            -
                      columns = join_part.column_names.each_with_index.map { |column_name,j|
         
     | 
| 
       126 
     | 
    
         
            -
                        Aliases::Column.new column_name, "t#{i}_r#{j}"
         
     | 
| 
       127 
     | 
    
         
            -
                      }
         
     | 
| 
       128 
     | 
    
         
            -
                      Aliases::Table.new(join_part, columns)
         
     | 
| 
       129 
     | 
    
         
            -
                    }
         
     | 
| 
       130 
     | 
    
         
            -
                  end
         
     | 
| 
       131 
     | 
    
         
            -
             
     | 
| 
       132 
     | 
    
         
            -
                  def instantiate(result_set, aliases)
         
     | 
| 
      
 101 
     | 
    
         
            +
                  def instantiate(result_set, strict_loading_value, &block)
         
     | 
| 
       133 
102 
     | 
    
         
             
                    primary_key = aliases.column_alias(join_root, join_root.primary_key)
         
     | 
| 
       134 
103 
     | 
    
         | 
| 
       135 
     | 
    
         
            -
                    seen = Hash.new { | 
     | 
| 
       136 
     | 
    
         
            -
                       
     | 
| 
       137 
     | 
    
         
            -
                         
     | 
| 
      
 104 
     | 
    
         
            +
                    seen = Hash.new { |i, parent|
         
     | 
| 
      
 105 
     | 
    
         
            +
                      i[parent] = Hash.new { |j, child_class|
         
     | 
| 
      
 106 
     | 
    
         
            +
                        j[child_class] = {}
         
     | 
| 
       138 
107 
     | 
    
         
             
                      }
         
     | 
| 
       139 
     | 
    
         
            -
                    }
         
     | 
| 
      
 108 
     | 
    
         
            +
                    }.compare_by_identity
         
     | 
| 
       140 
109 
     | 
    
         | 
| 
       141 
     | 
    
         
            -
                    model_cache = Hash.new { |h,klass| h[klass] = {} }
         
     | 
| 
      
 110 
     | 
    
         
            +
                    model_cache = Hash.new { |h, klass| h[klass] = {} }
         
     | 
| 
       142 
111 
     | 
    
         
             
                    parents = model_cache[join_root]
         
     | 
| 
       143 
     | 
    
         
            -
             
     | 
| 
      
 112 
     | 
    
         
            +
             
     | 
| 
      
 113 
     | 
    
         
            +
                    column_aliases = aliases.column_aliases(join_root)
         
     | 
| 
      
 114 
     | 
    
         
            +
                    column_names = []
         
     | 
| 
      
 115 
     | 
    
         
            +
             
     | 
| 
      
 116 
     | 
    
         
            +
                    result_set.columns.each do |name|
         
     | 
| 
      
 117 
     | 
    
         
            +
                      column_names << name unless /\At\d+_r\d+\z/.match?(name)
         
     | 
| 
      
 118 
     | 
    
         
            +
                    end
         
     | 
| 
      
 119 
     | 
    
         
            +
             
     | 
| 
      
 120 
     | 
    
         
            +
                    if column_names.empty?
         
     | 
| 
      
 121 
     | 
    
         
            +
                      column_types = {}
         
     | 
| 
      
 122 
     | 
    
         
            +
                    else
         
     | 
| 
      
 123 
     | 
    
         
            +
                      column_types = result_set.column_types
         
     | 
| 
      
 124 
     | 
    
         
            +
                      unless column_types.empty?
         
     | 
| 
      
 125 
     | 
    
         
            +
                        attribute_types = join_root.attribute_types
         
     | 
| 
      
 126 
     | 
    
         
            +
                        column_types = column_types.slice(*column_names).delete_if { |k, _| attribute_types.key?(k) }
         
     | 
| 
      
 127 
     | 
    
         
            +
                      end
         
     | 
| 
      
 128 
     | 
    
         
            +
                      column_aliases += column_names.map! { |name| Aliases::Column.new(name, name) }
         
     | 
| 
      
 129 
     | 
    
         
            +
                    end
         
     | 
| 
       144 
130 
     | 
    
         | 
| 
       145 
131 
     | 
    
         
             
                    message_bus = ActiveSupport::Notifications.instrumenter
         
     | 
| 
       146 
132 
     | 
    
         | 
| 
         @@ -149,134 +135,159 @@ module ActiveRecord 
     | 
|
| 
       149 
135 
     | 
    
         
             
                      class_name: join_root.base_klass.name
         
     | 
| 
       150 
136 
     | 
    
         
             
                    }
         
     | 
| 
       151 
137 
     | 
    
         | 
| 
       152 
     | 
    
         
            -
                    message_bus.instrument( 
     | 
| 
      
 138 
     | 
    
         
            +
                    message_bus.instrument("instantiation.active_record", payload) do
         
     | 
| 
       153 
139 
     | 
    
         
             
                      result_set.each { |row_hash|
         
     | 
| 
       154 
     | 
    
         
            -
                         
     | 
| 
       155 
     | 
    
         
            -
                         
     | 
| 
      
 140 
     | 
    
         
            +
                        parent_key = primary_key ? row_hash[primary_key] : row_hash
         
     | 
| 
      
 141 
     | 
    
         
            +
                        parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, column_types, &block)
         
     | 
| 
      
 142 
     | 
    
         
            +
                        construct(parent, join_root, row_hash, seen, model_cache, strict_loading_value)
         
     | 
| 
       156 
143 
     | 
    
         
             
                      }
         
     | 
| 
       157 
144 
     | 
    
         
             
                    end
         
     | 
| 
       158 
145 
     | 
    
         | 
| 
       159 
146 
     | 
    
         
             
                    parents.values
         
     | 
| 
       160 
147 
     | 
    
         
             
                  end
         
     | 
| 
       161 
148 
     | 
    
         | 
| 
       162 
     | 
    
         
            -
                   
     | 
| 
      
 149 
     | 
    
         
            +
                  def apply_column_aliases(relation)
         
     | 
| 
      
 150 
     | 
    
         
            +
                    @join_root_alias = relation.select_values.empty?
         
     | 
| 
      
 151 
     | 
    
         
            +
                    relation._select!(-> { aliases.columns })
         
     | 
| 
      
 152 
     | 
    
         
            +
                  end
         
     | 
| 
       163 
153 
     | 
    
         | 
| 
       164 
     | 
    
         
            -
                  def  
     | 
| 
       165 
     | 
    
         
            -
                     
     | 
| 
       166 
     | 
    
         
            -
                    foreign_table = parent.table
         
     | 
| 
       167 
     | 
    
         
            -
                    foreign_klass = parent.base_klass
         
     | 
| 
       168 
     | 
    
         
            -
                    child.join_constraints(foreign_table, foreign_klass, child, join_type, tables, child.reflection.scope_chain, chain)
         
     | 
| 
      
 154 
     | 
    
         
            +
                  def each(&block)
         
     | 
| 
      
 155 
     | 
    
         
            +
                    join_root.each(&block)
         
     | 
| 
       169 
156 
     | 
    
         
             
                  end
         
     | 
| 
       170 
157 
     | 
    
         | 
| 
       171 
     | 
    
         
            -
                   
     | 
| 
       172 
     | 
    
         
            -
                     
     | 
| 
       173 
     | 
    
         
            -
                    join_type = Arel::Nodes::OuterJoin
         
     | 
| 
       174 
     | 
    
         
            -
                    info      = make_constraints parent, child, tables, join_type
         
     | 
| 
      
 158 
     | 
    
         
            +
                  protected
         
     | 
| 
      
 159 
     | 
    
         
            +
                    attr_reader :join_root, :join_type
         
     | 
| 
       175 
160 
     | 
    
         | 
| 
       176 
     | 
    
         
            -
             
     | 
| 
       177 
     | 
    
         
            -
             
     | 
| 
      
 161 
     | 
    
         
            +
                  private
         
     | 
| 
      
 162 
     | 
    
         
            +
                    attr_reader :alias_tracker, :join_root_alias
         
     | 
| 
      
 163 
     | 
    
         
            +
             
     | 
| 
      
 164 
     | 
    
         
            +
                    def aliases
         
     | 
| 
      
 165 
     | 
    
         
            +
                      @aliases ||= Aliases.new join_root.each_with_index.map { |join_part, i|
         
     | 
| 
      
 166 
     | 
    
         
            +
                        column_names = if join_part == join_root && !join_root_alias
         
     | 
| 
      
 167 
     | 
    
         
            +
                          primary_key = join_root.primary_key
         
     | 
| 
      
 168 
     | 
    
         
            +
                          primary_key ? [primary_key] : []
         
     | 
| 
      
 169 
     | 
    
         
            +
                        else
         
     | 
| 
      
 170 
     | 
    
         
            +
                          join_part.column_names
         
     | 
| 
      
 171 
     | 
    
         
            +
                        end
         
     | 
| 
       178 
172 
     | 
    
         | 
| 
       179 
     | 
    
         
            -
             
     | 
| 
       180 
     | 
    
         
            -
             
     | 
| 
       181 
     | 
    
         
            -
             
     | 
| 
       182 
     | 
    
         
            -
             
     | 
| 
      
 173 
     | 
    
         
            +
                        columns = column_names.each_with_index.map { |column_name, j|
         
     | 
| 
      
 174 
     | 
    
         
            +
                          Aliases::Column.new column_name, "t#{i}_r#{j}"
         
     | 
| 
      
 175 
     | 
    
         
            +
                        }
         
     | 
| 
      
 176 
     | 
    
         
            +
                        Aliases::Table.new(join_part, columns)
         
     | 
| 
      
 177 
     | 
    
         
            +
                      }
         
     | 
| 
      
 178 
     | 
    
         
            +
                    end
         
     | 
| 
       183 
179 
     | 
    
         | 
| 
       184 
     | 
    
         
            -
                     
     | 
| 
       185 
     | 
    
         
            -
             
     | 
| 
      
 180 
     | 
    
         
            +
                    def make_join_constraints(join_root, join_type)
         
     | 
| 
      
 181 
     | 
    
         
            +
                      join_root.children.flat_map do |child|
         
     | 
| 
      
 182 
     | 
    
         
            +
                        make_constraints(join_root, child, join_type)
         
     | 
| 
      
 183 
     | 
    
         
            +
                      end
         
     | 
| 
      
 184 
     | 
    
         
            +
                    end
         
     | 
| 
       186 
185 
     | 
    
         | 
| 
       187 
     | 
    
         
            -
             
     | 
| 
       188 
     | 
    
         
            -
             
     | 
| 
       189 
     | 
    
         
            -
                       
     | 
| 
       190 
     | 
    
         
            -
             
     | 
| 
       191 
     | 
    
         
            -
                         
     | 
| 
       192 
     | 
    
         
            -
             
     | 
| 
       193 
     | 
    
         
            -
                    }
         
     | 
| 
       194 
     | 
    
         
            -
                  end
         
     | 
| 
      
 186 
     | 
    
         
            +
                    def make_constraints(parent, child, join_type)
         
     | 
| 
      
 187 
     | 
    
         
            +
                      foreign_table = parent.table
         
     | 
| 
      
 188 
     | 
    
         
            +
                      foreign_klass = parent.base_klass
         
     | 
| 
      
 189 
     | 
    
         
            +
                      child.join_constraints(foreign_table, foreign_klass, join_type, alias_tracker) do |reflection|
         
     | 
| 
      
 190 
     | 
    
         
            +
                        table, terminated = @joined_tables[reflection]
         
     | 
| 
      
 191 
     | 
    
         
            +
                        root = reflection == child.reflection
         
     | 
| 
       195 
192 
     | 
    
         | 
| 
       196 
     | 
    
         
            -
             
     | 
| 
       197 
     | 
    
         
            -
             
     | 
| 
       198 
     | 
    
         
            -
             
     | 
| 
       199 
     | 
    
         
            -
             
     | 
| 
      
 193 
     | 
    
         
            +
                        if table && (!root || !terminated)
         
     | 
| 
      
 194 
     | 
    
         
            +
                          @joined_tables[reflection] = [table, root] if root
         
     | 
| 
      
 195 
     | 
    
         
            +
                          next table, true
         
     | 
| 
      
 196 
     | 
    
         
            +
                        end
         
     | 
| 
       200 
197 
     | 
    
         | 
| 
       201 
     | 
    
         
            -
             
     | 
| 
       202 
     | 
    
         
            -
                    name = "#{reflection.plural_name}_#{parent.table_name}"
         
     | 
| 
       203 
     | 
    
         
            -
                    name << "_join" if join
         
     | 
| 
       204 
     | 
    
         
            -
                    name
         
     | 
| 
       205 
     | 
    
         
            -
                  end
         
     | 
| 
      
 198 
     | 
    
         
            +
                        table_name = @references[reflection.name.to_sym]&.to_s
         
     | 
| 
       206 
199 
     | 
    
         | 
| 
       207 
     | 
    
         
            -
             
     | 
| 
       208 
     | 
    
         
            -
             
     | 
| 
       209 
     | 
    
         
            -
             
     | 
| 
       210 
     | 
    
         
            -
             
     | 
| 
      
 200 
     | 
    
         
            +
                        table = alias_tracker.aliased_table_for(reflection.klass.arel_table, table_name) do
         
     | 
| 
      
 201 
     | 
    
         
            +
                          name = reflection.alias_candidate(parent.table_name)
         
     | 
| 
      
 202 
     | 
    
         
            +
                          root ? name : "#{name}_join"
         
     | 
| 
      
 203 
     | 
    
         
            +
                        end
         
     | 
| 
       211 
204 
     | 
    
         | 
| 
       212 
     | 
    
         
            -
             
     | 
| 
       213 
     | 
    
         
            -
             
     | 
| 
       214 
     | 
    
         
            -
             
     | 
| 
      
 205 
     | 
    
         
            +
                        @joined_tables[reflection] ||= [table, root] if join_type == Arel::Nodes::OuterJoin
         
     | 
| 
      
 206 
     | 
    
         
            +
                        table
         
     | 
| 
      
 207 
     | 
    
         
            +
                      end.concat child.children.flat_map { |c| make_constraints(child, c, join_type) }
         
     | 
| 
      
 208 
     | 
    
         
            +
                    end
         
     | 
| 
       215 
209 
     | 
    
         | 
| 
       216 
     | 
    
         
            -
             
     | 
| 
       217 
     | 
    
         
            -
             
     | 
| 
       218 
     | 
    
         
            -
             
     | 
| 
       219 
     | 
    
         
            -
             
     | 
| 
      
 210 
     | 
    
         
            +
                    def walk(left, right, join_type)
         
     | 
| 
      
 211 
     | 
    
         
            +
                      intersection, missing = right.children.map { |node1|
         
     | 
| 
      
 212 
     | 
    
         
            +
                        [left.children.find { |node2| node1.match? node2 }, node1]
         
     | 
| 
      
 213 
     | 
    
         
            +
                      }.partition(&:first)
         
     | 
| 
       220 
214 
     | 
    
         | 
| 
       221 
     | 
    
         
            -
             
     | 
| 
       222 
     | 
    
         
            -
             
     | 
| 
       223 
     | 
    
         
            -
             
     | 
| 
       224 
     | 
    
         
            -
                      reflection.check_validity!
         
     | 
| 
       225 
     | 
    
         
            -
                      reflection.check_eager_loadable!
         
     | 
| 
      
 215 
     | 
    
         
            +
                      joins = intersection.flat_map { |l, r| r.table = l.table; walk(l, r, join_type) }
         
     | 
| 
      
 216 
     | 
    
         
            +
                      joins.concat missing.flat_map { |_, n| make_constraints(left, n, join_type) }
         
     | 
| 
      
 217 
     | 
    
         
            +
                    end
         
     | 
| 
       226 
218 
     | 
    
         | 
| 
       227 
     | 
    
         
            -
             
     | 
| 
       228 
     | 
    
         
            -
             
     | 
| 
       229 
     | 
    
         
            -
             
     | 
| 
      
 219 
     | 
    
         
            +
                    def find_reflection(klass, name)
         
     | 
| 
      
 220 
     | 
    
         
            +
                      klass._reflect_on_association(name) ||
         
     | 
| 
      
 221 
     | 
    
         
            +
                        raise(ConfigurationError, "Can't join '#{klass.name}' to association named '#{name}'; perhaps you misspelled it?")
         
     | 
| 
      
 222 
     | 
    
         
            +
                    end
         
     | 
| 
      
 223 
     | 
    
         
            +
             
     | 
| 
      
 224 
     | 
    
         
            +
                    def build(associations, base_klass)
         
     | 
| 
      
 225 
     | 
    
         
            +
                      associations.map do |name, right|
         
     | 
| 
      
 226 
     | 
    
         
            +
                        reflection = find_reflection base_klass, name
         
     | 
| 
      
 227 
     | 
    
         
            +
                        reflection.check_validity!
         
     | 
| 
      
 228 
     | 
    
         
            +
                        reflection.check_eager_loadable!
         
     | 
| 
      
 229 
     | 
    
         
            +
             
     | 
| 
      
 230 
     | 
    
         
            +
                        if reflection.polymorphic?
         
     | 
| 
      
 231 
     | 
    
         
            +
                          raise EagerLoadPolymorphicError.new(reflection)
         
     | 
| 
      
 232 
     | 
    
         
            +
                        end
         
     | 
| 
       230 
233 
     | 
    
         | 
| 
       231 
     | 
    
         
            -
             
     | 
| 
      
 234 
     | 
    
         
            +
                        JoinAssociation.new(reflection, build(right, reflection.klass))
         
     | 
| 
      
 235 
     | 
    
         
            +
                      end
         
     | 
| 
       232 
236 
     | 
    
         
             
                    end
         
     | 
| 
       233 
     | 
    
         
            -
                  end
         
     | 
| 
       234 
237 
     | 
    
         | 
| 
       235 
     | 
    
         
            -
             
     | 
| 
       236 
     | 
    
         
            -
             
     | 
| 
      
 238 
     | 
    
         
            +
                    def construct(ar_parent, parent, row, seen, model_cache, strict_loading_value)
         
     | 
| 
      
 239 
     | 
    
         
            +
                      return if ar_parent.nil?
         
     | 
| 
       237 
240 
     | 
    
         | 
| 
       238 
     | 
    
         
            -
             
     | 
| 
       239 
     | 
    
         
            -
             
     | 
| 
       240 
     | 
    
         
            -
             
     | 
| 
       241 
     | 
    
         
            -
             
     | 
| 
       242 
     | 
    
         
            -
             
     | 
| 
       243 
     | 
    
         
            -
                        if ar_parent.association_cache.key?(node.reflection.name)
         
     | 
| 
      
 241 
     | 
    
         
            +
                      parent.children.each do |node|
         
     | 
| 
      
 242 
     | 
    
         
            +
                        if node.reflection.collection?
         
     | 
| 
      
 243 
     | 
    
         
            +
                          other = ar_parent.association(node.reflection.name)
         
     | 
| 
      
 244 
     | 
    
         
            +
                          other.loaded!
         
     | 
| 
      
 245 
     | 
    
         
            +
                        elsif ar_parent.association_cached?(node.reflection.name)
         
     | 
| 
       244 
246 
     | 
    
         
             
                          model = ar_parent.association(node.reflection.name).target
         
     | 
| 
       245 
     | 
    
         
            -
                          construct(model, node, row,  
     | 
| 
      
 247 
     | 
    
         
            +
                          construct(model, node, row, seen, model_cache, strict_loading_value)
         
     | 
| 
       246 
248 
     | 
    
         
             
                          next
         
     | 
| 
       247 
249 
     | 
    
         
             
                        end
         
     | 
| 
       248 
     | 
    
         
            -
                      end
         
     | 
| 
       249 
250 
     | 
    
         | 
| 
       250 
     | 
    
         
            -
             
     | 
| 
       251 
     | 
    
         
            -
             
     | 
| 
       252 
     | 
    
         
            -
             
     | 
| 
      
 251 
     | 
    
         
            +
                        key = aliases.column_alias(node, node.primary_key)
         
     | 
| 
      
 252 
     | 
    
         
            +
                        id = row[key]
         
     | 
| 
      
 253 
     | 
    
         
            +
                        if id.nil?
         
     | 
| 
      
 254 
     | 
    
         
            +
                          nil_association = ar_parent.association(node.reflection.name)
         
     | 
| 
      
 255 
     | 
    
         
            +
                          nil_association.loaded!
         
     | 
| 
      
 256 
     | 
    
         
            +
                          next
         
     | 
| 
      
 257 
     | 
    
         
            +
                        end
         
     | 
| 
       253 
258 
     | 
    
         | 
| 
       254 
     | 
    
         
            -
             
     | 
| 
      
 259 
     | 
    
         
            +
                        model = seen[ar_parent][node][id]
         
     | 
| 
       255 
260 
     | 
    
         | 
| 
       256 
     | 
    
         
            -
             
     | 
| 
       257 
     | 
    
         
            -
             
     | 
| 
       258 
     | 
    
         
            -
             
     | 
| 
       259 
     | 
    
         
            -
             
     | 
| 
       260 
     | 
    
         
            -
             
     | 
| 
       261 
     | 
    
         
            -
             
     | 
| 
      
 261 
     | 
    
         
            +
                        if model
         
     | 
| 
      
 262 
     | 
    
         
            +
                          construct(model, node, row, seen, model_cache, strict_loading_value)
         
     | 
| 
      
 263 
     | 
    
         
            +
                        else
         
     | 
| 
      
 264 
     | 
    
         
            +
                          model = construct_model(ar_parent, node, row, model_cache, id, strict_loading_value)
         
     | 
| 
      
 265 
     | 
    
         
            +
             
     | 
| 
      
 266 
     | 
    
         
            +
                          seen[ar_parent][node][id] = model
         
     | 
| 
      
 267 
     | 
    
         
            +
                          construct(model, node, row, seen, model_cache, strict_loading_value)
         
     | 
| 
      
 268 
     | 
    
         
            +
                        end
         
     | 
| 
       262 
269 
     | 
    
         
             
                      end
         
     | 
| 
       263 
270 
     | 
    
         
             
                    end
         
     | 
| 
       264 
     | 
    
         
            -
                  end
         
     | 
| 
       265 
271 
     | 
    
         | 
| 
       266 
     | 
    
         
            -
             
     | 
| 
       267 
     | 
    
         
            -
             
     | 
| 
       268 
     | 
    
         
            -
                                                                       aliases.column_aliases(node))
         
     | 
| 
       269 
     | 
    
         
            -
                    other = record.association(node.reflection.name)
         
     | 
| 
      
 272 
     | 
    
         
            +
                    def construct_model(record, node, row, model_cache, id, strict_loading_value)
         
     | 
| 
      
 273 
     | 
    
         
            +
                      other = record.association(node.reflection.name)
         
     | 
| 
       270 
274 
     | 
    
         | 
| 
       271 
     | 
    
         
            -
             
     | 
| 
       272 
     | 
    
         
            -
             
     | 
| 
       273 
     | 
    
         
            -
             
     | 
| 
       274 
     | 
    
         
            -
             
     | 
| 
       275 
     | 
    
         
            -
             
     | 
| 
      
 275 
     | 
    
         
            +
                      model = model_cache[node][id] ||=
         
     | 
| 
      
 276 
     | 
    
         
            +
                        node.instantiate(row, aliases.column_aliases(node)) do |m|
         
     | 
| 
      
 277 
     | 
    
         
            +
                          m.strict_loading! if strict_loading_value
         
     | 
| 
      
 278 
     | 
    
         
            +
                          other.set_inverse_instance(m)
         
     | 
| 
      
 279 
     | 
    
         
            +
                        end
         
     | 
| 
       276 
280 
     | 
    
         | 
| 
       277 
     | 
    
         
            -
             
     | 
| 
       278 
     | 
    
         
            -
             
     | 
| 
       279 
     | 
    
         
            -
             
     | 
| 
      
 281 
     | 
    
         
            +
                      if node.reflection.collection?
         
     | 
| 
      
 282 
     | 
    
         
            +
                        other.target.push(model)
         
     | 
| 
      
 283 
     | 
    
         
            +
                      else
         
     | 
| 
      
 284 
     | 
    
         
            +
                        other.target = model
         
     | 
| 
      
 285 
     | 
    
         
            +
                      end
         
     | 
| 
      
 286 
     | 
    
         
            +
             
     | 
| 
      
 287 
     | 
    
         
            +
                      model.readonly! if node.readonly?
         
     | 
| 
      
 288 
     | 
    
         
            +
                      model.strict_loading! if node.strict_loading?
         
     | 
| 
      
 289 
     | 
    
         
            +
                      model
         
     | 
| 
      
 290 
     | 
    
         
            +
                    end
         
     | 
| 
       280 
291 
     | 
    
         
             
                end
         
     | 
| 
       281 
292 
     | 
    
         
             
              end
         
     | 
| 
       282 
293 
     | 
    
         
             
            end
         
     |