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,46 +1,34 @@ 
     | 
|
| 
      
 1 
     | 
    
         
            +
            # frozen_string_literal: true
         
     | 
| 
      
 2 
     | 
    
         
            +
             
     | 
| 
       1 
3 
     | 
    
         
             
            module ActiveRecord
         
     | 
| 
       2 
4 
     | 
    
         
             
              module Associations
         
     | 
| 
       3 
5 
     | 
    
         
             
                class AssociationScope #:nodoc:
         
     | 
| 
       4 
     | 
    
         
            -
                  def self.scope(association 
     | 
| 
       5 
     | 
    
         
            -
                    INSTANCE.scope 
     | 
| 
       6 
     | 
    
         
            -
                  end
         
     | 
| 
       7 
     | 
    
         
            -
             
     | 
| 
       8 
     | 
    
         
            -
                  class BindSubstitution
         
     | 
| 
       9 
     | 
    
         
            -
                    def initialize(block)
         
     | 
| 
       10 
     | 
    
         
            -
                      @block = block
         
     | 
| 
       11 
     | 
    
         
            -
                    end
         
     | 
| 
       12 
     | 
    
         
            -
             
     | 
| 
       13 
     | 
    
         
            -
                    def bind_value(scope, column, value, alias_tracker)
         
     | 
| 
       14 
     | 
    
         
            -
                      substitute = alias_tracker.connection.substitute_at(column)
         
     | 
| 
       15 
     | 
    
         
            -
                      scope.bind_values += [[column, @block.call(value)]]
         
     | 
| 
       16 
     | 
    
         
            -
                      substitute
         
     | 
| 
       17 
     | 
    
         
            -
                    end
         
     | 
| 
      
 6 
     | 
    
         
            +
                  def self.scope(association)
         
     | 
| 
      
 7 
     | 
    
         
            +
                    INSTANCE.scope(association)
         
     | 
| 
       18 
8 
     | 
    
         
             
                  end
         
     | 
| 
       19 
9 
     | 
    
         | 
| 
       20 
10 
     | 
    
         
             
                  def self.create(&block)
         
     | 
| 
       21 
     | 
    
         
            -
                    block  
     | 
| 
       22 
     | 
    
         
            -
                    new 
     | 
| 
      
 11 
     | 
    
         
            +
                    block ||= lambda { |val| val }
         
     | 
| 
      
 12 
     | 
    
         
            +
                    new(block)
         
     | 
| 
       23 
13 
     | 
    
         
             
                  end
         
     | 
| 
       24 
14 
     | 
    
         | 
| 
       25 
     | 
    
         
            -
                  def initialize( 
     | 
| 
       26 
     | 
    
         
            -
                    @ 
     | 
| 
      
 15 
     | 
    
         
            +
                  def initialize(value_transformation)
         
     | 
| 
      
 16 
     | 
    
         
            +
                    @value_transformation = value_transformation
         
     | 
| 
       27 
17 
     | 
    
         
             
                  end
         
     | 
| 
       28 
18 
     | 
    
         | 
| 
       29 
19 
     | 
    
         
             
                  INSTANCE = create
         
     | 
| 
       30 
20 
     | 
    
         | 
| 
       31 
     | 
    
         
            -
                  def scope(association 
     | 
| 
       32 
     | 
    
         
            -
                    klass 
     | 
| 
       33 
     | 
    
         
            -
                    reflection 
     | 
| 
       34 
     | 
    
         
            -
                    scope 
     | 
| 
       35 
     | 
    
         
            -
                    owner 
     | 
| 
       36 
     | 
    
         
            -
                     
     | 
| 
      
 21 
     | 
    
         
            +
                  def scope(association)
         
     | 
| 
      
 22 
     | 
    
         
            +
                    klass = association.klass
         
     | 
| 
      
 23 
     | 
    
         
            +
                    reflection = association.reflection
         
     | 
| 
      
 24 
     | 
    
         
            +
                    scope = klass.unscoped
         
     | 
| 
      
 25 
     | 
    
         
            +
                    owner = association.owner
         
     | 
| 
      
 26 
     | 
    
         
            +
                    chain = get_chain(reflection, association, scope.alias_tracker)
         
     | 
| 
       37 
27 
     | 
    
         | 
| 
       38 
     | 
    
         
            -
                    scope.extending!  
     | 
| 
       39 
     | 
    
         
            -
                    add_constraints(scope, owner,  
     | 
| 
       40 
     | 
    
         
            -
             
     | 
| 
       41 
     | 
    
         
            -
             
     | 
| 
       42 
     | 
    
         
            -
                  def join_type
         
     | 
| 
       43 
     | 
    
         
            -
                    Arel::Nodes::InnerJoin
         
     | 
| 
      
 28 
     | 
    
         
            +
                    scope.extending! reflection.extensions
         
     | 
| 
      
 29 
     | 
    
         
            +
                    scope = add_constraints(scope, owner, chain)
         
     | 
| 
      
 30 
     | 
    
         
            +
                    scope.limit!(1) unless reflection.collection?
         
     | 
| 
      
 31 
     | 
    
         
            +
                    scope
         
     | 
| 
       44 
32 
     | 
    
         
             
                  end
         
     | 
| 
       45 
33 
     | 
    
         | 
| 
       46 
34 
     | 
    
         
             
                  def self.get_bind_values(owner, chain)
         
     | 
| 
         @@ -49,146 +37,134 @@ module ActiveRecord 
     | 
|
| 
       49 
37 
     | 
    
         | 
| 
       50 
38 
     | 
    
         
             
                    binds << last_reflection.join_id_for(owner)
         
     | 
| 
       51 
39 
     | 
    
         
             
                    if last_reflection.type
         
     | 
| 
       52 
     | 
    
         
            -
                      binds << owner.class. 
     | 
| 
      
 40 
     | 
    
         
            +
                      binds << owner.class.polymorphic_name
         
     | 
| 
       53 
41 
     | 
    
         
             
                    end
         
     | 
| 
       54 
42 
     | 
    
         | 
| 
       55 
43 
     | 
    
         
             
                    chain.each_cons(2).each do |reflection, next_reflection|
         
     | 
| 
       56 
44 
     | 
    
         
             
                      if reflection.type
         
     | 
| 
       57 
     | 
    
         
            -
                        binds << next_reflection.klass. 
     | 
| 
      
 45 
     | 
    
         
            +
                        binds << next_reflection.klass.polymorphic_name
         
     | 
| 
       58 
46 
     | 
    
         
             
                      end
         
     | 
| 
       59 
47 
     | 
    
         
             
                    end
         
     | 
| 
       60 
48 
     | 
    
         
             
                    binds
         
     | 
| 
       61 
49 
     | 
    
         
             
                  end
         
     | 
| 
       62 
50 
     | 
    
         | 
| 
       63 
51 
     | 
    
         
             
                  private
         
     | 
| 
      
 52 
     | 
    
         
            +
                    attr_reader :value_transformation
         
     | 
| 
       64 
53 
     | 
    
         | 
| 
       65 
     | 
    
         
            -
             
     | 
| 
       66 
     | 
    
         
            -
             
     | 
| 
       67 
     | 
    
         
            -
                      alias_tracker.aliased_table_for(
         
     | 
| 
       68 
     | 
    
         
            -
                        table_name_for(reflection, klass, refl),
         
     | 
| 
       69 
     | 
    
         
            -
                        table_alias_for(reflection, refl, reflection != refl)
         
     | 
| 
       70 
     | 
    
         
            -
                      )
         
     | 
| 
      
 54 
     | 
    
         
            +
                    def join(table, constraint)
         
     | 
| 
      
 55 
     | 
    
         
            +
                      Arel::Nodes::LeadingJoin.new(table, Arel::Nodes::On.new(constraint))
         
     | 
| 
       71 
56 
     | 
    
         
             
                    end
         
     | 
| 
       72 
     | 
    
         
            -
                  end
         
     | 
| 
       73 
57 
     | 
    
         | 
| 
       74 
     | 
    
         
            -
             
     | 
| 
       75 
     | 
    
         
            -
             
     | 
| 
       76 
     | 
    
         
            -
             
     | 
| 
       77 
     | 
    
         
            -
                    name
         
     | 
| 
       78 
     | 
    
         
            -
                  end
         
     | 
| 
      
 58 
     | 
    
         
            +
                    def last_chain_scope(scope, reflection, owner)
         
     | 
| 
      
 59 
     | 
    
         
            +
                      primary_key = reflection.join_primary_key
         
     | 
| 
      
 60 
     | 
    
         
            +
                      foreign_key = reflection.join_foreign_key
         
     | 
| 
       79 
61 
     | 
    
         | 
| 
       80 
     | 
    
         
            -
             
     | 
| 
       81 
     | 
    
         
            -
             
     | 
| 
       82 
     | 
    
         
            -
             
     | 
| 
      
 62 
     | 
    
         
            +
                      table = reflection.aliased_table
         
     | 
| 
      
 63 
     | 
    
         
            +
                      value = transform_value(owner[foreign_key])
         
     | 
| 
      
 64 
     | 
    
         
            +
                      scope = apply_scope(scope, table, primary_key, value)
         
     | 
| 
       83 
65 
     | 
    
         | 
| 
       84 
     | 
    
         
            -
             
     | 
| 
       85 
     | 
    
         
            -
             
     | 
| 
       86 
     | 
    
         
            -
             
     | 
| 
       87 
     | 
    
         
            -
             
     | 
| 
      
 66 
     | 
    
         
            +
                      if reflection.type
         
     | 
| 
      
 67 
     | 
    
         
            +
                        polymorphic_type = transform_value(owner.class.polymorphic_name)
         
     | 
| 
      
 68 
     | 
    
         
            +
                        scope = apply_scope(scope, table, reflection.type, polymorphic_type)
         
     | 
| 
      
 69 
     | 
    
         
            +
                      end
         
     | 
| 
       88 
70 
     | 
    
         | 
| 
       89 
     | 
    
         
            -
             
     | 
| 
       90 
     | 
    
         
            -
                     
     | 
| 
       91 
     | 
    
         
            -
                  end
         
     | 
| 
      
 71 
     | 
    
         
            +
                      scope
         
     | 
| 
      
 72 
     | 
    
         
            +
                    end
         
     | 
| 
       92 
73 
     | 
    
         | 
| 
       93 
     | 
    
         
            -
             
     | 
| 
       94 
     | 
    
         
            -
             
     | 
| 
       95 
     | 
    
         
            -
                     
     | 
| 
       96 
     | 
    
         
            -
                  end
         
     | 
| 
      
 74 
     | 
    
         
            +
                    def transform_value(value)
         
     | 
| 
      
 75 
     | 
    
         
            +
                      value_transformation.call(value)
         
     | 
| 
      
 76 
     | 
    
         
            +
                    end
         
     | 
| 
       97 
77 
     | 
    
         | 
| 
       98 
     | 
    
         
            -
             
     | 
| 
       99 
     | 
    
         
            -
             
     | 
| 
       100 
     | 
    
         
            -
             
     | 
| 
       101 
     | 
    
         
            -
                    foreign_key = join_keys.foreign_key
         
     | 
| 
      
 78 
     | 
    
         
            +
                    def next_chain_scope(scope, reflection, next_reflection)
         
     | 
| 
      
 79 
     | 
    
         
            +
                      primary_key = reflection.join_primary_key
         
     | 
| 
      
 80 
     | 
    
         
            +
                      foreign_key = reflection.join_foreign_key
         
     | 
| 
       102 
81 
     | 
    
         | 
| 
       103 
     | 
    
         
            -
             
     | 
| 
       104 
     | 
    
         
            -
             
     | 
| 
      
 82 
     | 
    
         
            +
                      table = reflection.aliased_table
         
     | 
| 
      
 83 
     | 
    
         
            +
                      foreign_table = next_reflection.aliased_table
         
     | 
| 
      
 84 
     | 
    
         
            +
                      constraint = table[primary_key].eq(foreign_table[foreign_key])
         
     | 
| 
       105 
85 
     | 
    
         | 
| 
       106 
     | 
    
         
            -
             
     | 
| 
       107 
     | 
    
         
            -
             
     | 
| 
       108 
     | 
    
         
            -
             
     | 
| 
       109 
     | 
    
         
            -
                       
     | 
| 
       110 
     | 
    
         
            -
             
     | 
| 
       111 
     | 
    
         
            -
                      scope
         
     | 
| 
      
 86 
     | 
    
         
            +
                      if reflection.type
         
     | 
| 
      
 87 
     | 
    
         
            +
                        value = transform_value(next_reflection.klass.polymorphic_name)
         
     | 
| 
      
 88 
     | 
    
         
            +
                        scope = apply_scope(scope, table, reflection.type, value)
         
     | 
| 
      
 89 
     | 
    
         
            +
                      end
         
     | 
| 
      
 90 
     | 
    
         
            +
             
     | 
| 
      
 91 
     | 
    
         
            +
                      scope.joins!(join(foreign_table, constraint))
         
     | 
| 
       112 
92 
     | 
    
         
             
                    end
         
     | 
| 
       113 
     | 
    
         
            -
                  end
         
     | 
| 
       114 
93 
     | 
    
         | 
| 
       115 
     | 
    
         
            -
             
     | 
| 
       116 
     | 
    
         
            -
             
     | 
| 
       117 
     | 
    
         
            -
                    key = join_keys.key
         
     | 
| 
       118 
     | 
    
         
            -
                    foreign_key = join_keys.foreign_key
         
     | 
| 
      
 94 
     | 
    
         
            +
                    class ReflectionProxy < SimpleDelegator # :nodoc:
         
     | 
| 
      
 95 
     | 
    
         
            +
                      attr_reader :aliased_table
         
     | 
| 
       119 
96 
     | 
    
         | 
| 
       120 
     | 
    
         
            -
             
     | 
| 
      
 97 
     | 
    
         
            +
                      def initialize(reflection, aliased_table)
         
     | 
| 
      
 98 
     | 
    
         
            +
                        super(reflection)
         
     | 
| 
      
 99 
     | 
    
         
            +
                        @aliased_table = aliased_table
         
     | 
| 
      
 100 
     | 
    
         
            +
                      end
         
     | 
| 
       121 
101 
     | 
    
         | 
| 
       122 
     | 
    
         
            -
             
     | 
| 
       123 
     | 
    
         
            -
                      value    = next_reflection.klass.base_class.name
         
     | 
| 
       124 
     | 
    
         
            -
                      bind_val = bind scope, table.table_name, reflection.type, value, tracker
         
     | 
| 
       125 
     | 
    
         
            -
                      scope    = scope.where(table[reflection.type].eq(bind_val))
         
     | 
| 
      
 102 
     | 
    
         
            +
                      def all_includes; nil; end
         
     | 
| 
       126 
103 
     | 
    
         
             
                    end
         
     | 
| 
       127 
104 
     | 
    
         | 
| 
       128 
     | 
    
         
            -
                     
     | 
| 
       129 
     | 
    
         
            -
             
     | 
| 
      
 105 
     | 
    
         
            +
                    def get_chain(reflection, association, tracker)
         
     | 
| 
      
 106 
     | 
    
         
            +
                      name = reflection.name
         
     | 
| 
      
 107 
     | 
    
         
            +
                      chain = [Reflection::RuntimeReflection.new(reflection, association)]
         
     | 
| 
      
 108 
     | 
    
         
            +
                      reflection.chain.drop(1).each do |refl|
         
     | 
| 
      
 109 
     | 
    
         
            +
                        aliased_table = tracker.aliased_table_for(refl.klass.arel_table) do
         
     | 
| 
      
 110 
     | 
    
         
            +
                          refl.alias_candidate(name)
         
     | 
| 
      
 111 
     | 
    
         
            +
                        end
         
     | 
| 
      
 112 
     | 
    
         
            +
                        chain << ReflectionProxy.new(refl, aliased_table)
         
     | 
| 
      
 113 
     | 
    
         
            +
                      end
         
     | 
| 
      
 114 
     | 
    
         
            +
                      chain
         
     | 
| 
      
 115 
     | 
    
         
            +
                    end
         
     | 
| 
       130 
116 
     | 
    
         | 
| 
       131 
     | 
    
         
            -
             
     | 
| 
       132 
     | 
    
         
            -
             
     | 
| 
       133 
     | 
    
         
            -
                    scope_chain = refl.scope_chain
         
     | 
| 
      
 117 
     | 
    
         
            +
                    def add_constraints(scope, owner, chain)
         
     | 
| 
      
 118 
     | 
    
         
            +
                      scope = last_chain_scope(scope, chain.last, owner)
         
     | 
| 
       134 
119 
     | 
    
         | 
| 
       135 
     | 
    
         
            -
             
     | 
| 
      
 120 
     | 
    
         
            +
                      chain.each_cons(2) do |reflection, next_reflection|
         
     | 
| 
      
 121 
     | 
    
         
            +
                        scope = next_chain_scope(scope, reflection, next_reflection)
         
     | 
| 
      
 122 
     | 
    
         
            +
                      end
         
     | 
| 
       136 
123 
     | 
    
         | 
| 
       137 
     | 
    
         
            -
             
     | 
| 
       138 
     | 
    
         
            -
             
     | 
| 
       139 
     | 
    
         
            -
             
     | 
| 
      
 124 
     | 
    
         
            +
                      chain_head = chain.first
         
     | 
| 
      
 125 
     | 
    
         
            +
                      chain.reverse_each do |reflection|
         
     | 
| 
      
 126 
     | 
    
         
            +
                        # Exclude the scope of the association itself, because that
         
     | 
| 
      
 127 
     | 
    
         
            +
                        # was already merged in the #scope method.
         
     | 
| 
      
 128 
     | 
    
         
            +
                        reflection.constraints.each do |scope_chain_item|
         
     | 
| 
      
 129 
     | 
    
         
            +
                          item = eval_scope(reflection, scope_chain_item, owner)
         
     | 
| 
       140 
130 
     | 
    
         | 
| 
       141 
     | 
    
         
            -
             
     | 
| 
       142 
     | 
    
         
            -
             
     | 
| 
      
 131 
     | 
    
         
            +
                          if scope_chain_item == chain_head.scope
         
     | 
| 
      
 132 
     | 
    
         
            +
                            scope.merge! item.except(:where, :includes, :unscope, :order)
         
     | 
| 
      
 133 
     | 
    
         
            +
                          elsif !item.references_values.empty?
         
     | 
| 
      
 134 
     | 
    
         
            +
                            scope.merge! item.only(:joins, :left_outer_joins)
         
     | 
| 
       143 
135 
     | 
    
         | 
| 
       144 
     | 
    
         
            -
             
     | 
| 
       145 
     | 
    
         
            -
                        next_reflection = chain[i + 1]
         
     | 
| 
       146 
     | 
    
         
            -
                        scope = next_chain_scope(scope, table, reflection, tracker, assoc_klass, foreign_table, next_reflection)
         
     | 
| 
       147 
     | 
    
         
            -
                      end
         
     | 
| 
      
 136 
     | 
    
         
            +
                            associations = item.eager_load_values | item.includes_values
         
     | 
| 
       148 
137 
     | 
    
         | 
| 
       149 
     | 
    
         
            -
             
     | 
| 
       150 
     | 
    
         
            -
             
     | 
| 
      
 138 
     | 
    
         
            +
                            unless associations.empty?
         
     | 
| 
      
 139 
     | 
    
         
            +
                              scope.joins! item.construct_join_dependency(associations, Arel::Nodes::OuterJoin)
         
     | 
| 
      
 140 
     | 
    
         
            +
                            end
         
     | 
| 
      
 141 
     | 
    
         
            +
                          end
         
     | 
| 
       151 
142 
     | 
    
         | 
| 
       152 
     | 
    
         
            -
             
     | 
| 
       153 
     | 
    
         
            -
             
     | 
| 
       154 
     | 
    
         
            -
             
     | 
| 
       155 
     | 
    
         
            -
                        item  = eval_scope(klass, scope_chain_item, owner)
         
     | 
| 
      
 143 
     | 
    
         
            +
                          reflection.all_includes do
         
     | 
| 
      
 144 
     | 
    
         
            +
                            scope.includes_values |= item.includes_values
         
     | 
| 
      
 145 
     | 
    
         
            +
                          end
         
     | 
| 
       156 
146 
     | 
    
         | 
| 
       157 
     | 
    
         
            -
             
     | 
| 
       158 
     | 
    
         
            -
                          scope. 
     | 
| 
      
 147 
     | 
    
         
            +
                          scope.unscope!(*item.unscope_values)
         
     | 
| 
      
 148 
     | 
    
         
            +
                          scope.where_clause += item.where_clause
         
     | 
| 
      
 149 
     | 
    
         
            +
                          scope.order_values = item.order_values | scope.order_values
         
     | 
| 
       159 
150 
     | 
    
         
             
                        end
         
     | 
| 
      
 151 
     | 
    
         
            +
                      end
         
     | 
| 
       160 
152 
     | 
    
         | 
| 
       161 
     | 
    
         
            -
             
     | 
| 
       162 
     | 
    
         
            -
             
     | 
| 
       163 
     | 
    
         
            -
                        end
         
     | 
| 
      
 153 
     | 
    
         
            +
                      scope
         
     | 
| 
      
 154 
     | 
    
         
            +
                    end
         
     | 
| 
       164 
155 
     | 
    
         | 
| 
       165 
     | 
    
         
            -
             
     | 
| 
       166 
     | 
    
         
            -
             
     | 
| 
       167 
     | 
    
         
            -
                        scope. 
     | 
| 
      
 156 
     | 
    
         
            +
                    def apply_scope(scope, table, key, value)
         
     | 
| 
      
 157 
     | 
    
         
            +
                      if scope.table == table
         
     | 
| 
      
 158 
     | 
    
         
            +
                        scope.where!(key => value)
         
     | 
| 
      
 159 
     | 
    
         
            +
                      else
         
     | 
| 
      
 160 
     | 
    
         
            +
                        scope.where!(table.name => { key => value })
         
     | 
| 
       168 
161 
     | 
    
         
             
                      end
         
     | 
| 
       169 
162 
     | 
    
         
             
                    end
         
     | 
| 
       170 
163 
     | 
    
         | 
| 
       171 
     | 
    
         
            -
                    scope
         
     | 
| 
       172 
     | 
    
         
            -
             
     | 
| 
       173 
     | 
    
         
            -
             
     | 
| 
       174 
     | 
    
         
            -
                  def alias_suffix(refl)
         
     | 
| 
       175 
     | 
    
         
            -
                    refl.name
         
     | 
| 
       176 
     | 
    
         
            -
                  end
         
     | 
| 
       177 
     | 
    
         
            -
             
     | 
| 
       178 
     | 
    
         
            -
                  def table_name_for(reflection, klass, refl)
         
     | 
| 
       179 
     | 
    
         
            -
                    if reflection == refl
         
     | 
| 
       180 
     | 
    
         
            -
                      # If this is a polymorphic belongs_to, we want to get the klass from the
         
     | 
| 
       181 
     | 
    
         
            -
                      # association because it depends on the polymorphic_type attribute of
         
     | 
| 
       182 
     | 
    
         
            -
                      # the owner
         
     | 
| 
       183 
     | 
    
         
            -
                      klass.table_name
         
     | 
| 
       184 
     | 
    
         
            -
                    else
         
     | 
| 
       185 
     | 
    
         
            -
                      reflection.table_name
         
     | 
| 
      
 164 
     | 
    
         
            +
                    def eval_scope(reflection, scope, owner)
         
     | 
| 
      
 165 
     | 
    
         
            +
                      relation = reflection.build_scope(reflection.aliased_table)
         
     | 
| 
      
 166 
     | 
    
         
            +
                      relation.instance_exec(owner, &scope) || relation
         
     | 
| 
       186 
167 
     | 
    
         
             
                    end
         
     | 
| 
       187 
     | 
    
         
            -
                  end
         
     | 
| 
       188 
     | 
    
         
            -
             
     | 
| 
       189 
     | 
    
         
            -
                  def eval_scope(klass, scope, owner)
         
     | 
| 
       190 
     | 
    
         
            -
                    klass.unscoped.instance_exec(owner, &scope)
         
     | 
| 
       191 
     | 
    
         
            -
                  end
         
     | 
| 
       192 
168 
     | 
    
         
             
                end
         
     | 
| 
       193 
169 
     | 
    
         
             
              end
         
     | 
| 
       194 
170 
     | 
    
         
             
            end
         
     | 
| 
         @@ -1,25 +1,39 @@ 
     | 
|
| 
      
 1 
     | 
    
         
            +
            # frozen_string_literal: true
         
     | 
| 
      
 2 
     | 
    
         
            +
             
     | 
| 
       1 
3 
     | 
    
         
             
            module ActiveRecord
         
     | 
| 
       2 
     | 
    
         
            -
              # = Active Record Belongs To Association
         
     | 
| 
       3 
4 
     | 
    
         
             
              module Associations
         
     | 
| 
      
 5 
     | 
    
         
            +
                # = Active Record Belongs To Association
         
     | 
| 
       4 
6 
     | 
    
         
             
                class BelongsToAssociation < SingularAssociation #:nodoc:
         
     | 
| 
       5 
     | 
    
         
            -
             
     | 
| 
       6 
7 
     | 
    
         
             
                  def handle_dependency
         
     | 
| 
       7 
     | 
    
         
            -
                     
     | 
| 
       8 
     | 
    
         
            -
             
     | 
| 
       9 
     | 
    
         
            -
             
     | 
| 
       10 
     | 
    
         
            -
             
     | 
| 
       11 
     | 
    
         
            -
             
     | 
| 
       12 
     | 
    
         
            -
             
     | 
| 
       13 
     | 
    
         
            -
                       
     | 
| 
       14 
     | 
    
         
            -
                       
     | 
| 
       15 
     | 
    
         
            -
             
     | 
| 
       16 
     | 
    
         
            -
                       
     | 
| 
      
 8 
     | 
    
         
            +
                    return unless load_target
         
     | 
| 
      
 9 
     | 
    
         
            +
             
     | 
| 
      
 10 
     | 
    
         
            +
                    case options[:dependent]
         
     | 
| 
      
 11 
     | 
    
         
            +
                    when :destroy
         
     | 
| 
      
 12 
     | 
    
         
            +
                      raise ActiveRecord::Rollback unless target.destroy
         
     | 
| 
      
 13 
     | 
    
         
            +
                    when :destroy_async
         
     | 
| 
      
 14 
     | 
    
         
            +
                      id = owner.public_send(reflection.foreign_key.to_sym)
         
     | 
| 
      
 15 
     | 
    
         
            +
                      primary_key_column = reflection.active_record_primary_key.to_sym
         
     | 
| 
      
 16 
     | 
    
         
            +
             
     | 
| 
      
 17 
     | 
    
         
            +
                      enqueue_destroy_association(
         
     | 
| 
      
 18 
     | 
    
         
            +
                        owner_model_name: owner.class.to_s,
         
     | 
| 
      
 19 
     | 
    
         
            +
                        owner_id: owner.id,
         
     | 
| 
      
 20 
     | 
    
         
            +
                        association_class: reflection.klass.to_s,
         
     | 
| 
      
 21 
     | 
    
         
            +
                        association_ids: [id],
         
     | 
| 
      
 22 
     | 
    
         
            +
                        association_primary_key_column: primary_key_column,
         
     | 
| 
      
 23 
     | 
    
         
            +
                        ensuring_owner_was_method: options.fetch(:ensuring_owner_was, nil)
         
     | 
| 
      
 24 
     | 
    
         
            +
                      )
         
     | 
| 
       17 
25 
     | 
    
         
             
                    else
         
     | 
| 
       18 
     | 
    
         
            -
                       
     | 
| 
       19 
     | 
    
         
            -
                      remove_keys
         
     | 
| 
      
 26 
     | 
    
         
            +
                      target.public_send(options[:dependent])
         
     | 
| 
       20 
27 
     | 
    
         
             
                    end
         
     | 
| 
      
 28 
     | 
    
         
            +
                  end
         
     | 
| 
      
 29 
     | 
    
         
            +
             
     | 
| 
      
 30 
     | 
    
         
            +
                  def inversed_from(record)
         
     | 
| 
      
 31 
     | 
    
         
            +
                    replace_keys(record)
         
     | 
| 
      
 32 
     | 
    
         
            +
                    super
         
     | 
| 
      
 33 
     | 
    
         
            +
                  end
         
     | 
| 
       21 
34 
     | 
    
         | 
| 
       22 
     | 
    
         
            -
             
     | 
| 
      
 35 
     | 
    
         
            +
                  def default(&block)
         
     | 
| 
      
 36 
     | 
    
         
            +
                    writer(owner.instance_exec(&block)) if reader.nil?
         
     | 
| 
       23 
37 
     | 
    
         
             
                  end
         
     | 
| 
       24 
38 
     | 
    
         | 
| 
       25 
39 
     | 
    
         
             
                  def reset
         
     | 
| 
         @@ -31,80 +45,92 @@ module ActiveRecord 
     | 
|
| 
       31 
45 
     | 
    
         
             
                    @updated
         
     | 
| 
       32 
46 
     | 
    
         
             
                  end
         
     | 
| 
       33 
47 
     | 
    
         | 
| 
       34 
     | 
    
         
            -
                  def decrement_counters 
     | 
| 
       35 
     | 
    
         
            -
                     
     | 
| 
      
 48 
     | 
    
         
            +
                  def decrement_counters
         
     | 
| 
      
 49 
     | 
    
         
            +
                    update_counters(-1)
         
     | 
| 
       36 
50 
     | 
    
         
             
                  end
         
     | 
| 
       37 
51 
     | 
    
         | 
| 
       38 
     | 
    
         
            -
                  def increment_counters 
     | 
| 
       39 
     | 
    
         
            -
                     
     | 
| 
      
 52 
     | 
    
         
            +
                  def increment_counters
         
     | 
| 
      
 53 
     | 
    
         
            +
                    update_counters(1)
         
     | 
| 
       40 
54 
     | 
    
         
             
                  end
         
     | 
| 
       41 
55 
     | 
    
         | 
| 
       42 
     | 
    
         
            -
                   
     | 
| 
       43 
     | 
    
         
            -
             
     | 
| 
       44 
     | 
    
         
            -
             
     | 
| 
       45 
     | 
    
         
            -
             
     | 
| 
      
 56 
     | 
    
         
            +
                  def decrement_counters_before_last_save
         
     | 
| 
      
 57 
     | 
    
         
            +
                    if reflection.polymorphic?
         
     | 
| 
      
 58 
     | 
    
         
            +
                      model_was = owner.attribute_before_last_save(reflection.foreign_type)&.constantize
         
     | 
| 
      
 59 
     | 
    
         
            +
                    else
         
     | 
| 
      
 60 
     | 
    
         
            +
                      model_was = klass
         
     | 
| 
       46 
61 
     | 
    
         
             
                    end
         
     | 
| 
       47 
62 
     | 
    
         | 
| 
       48 
     | 
    
         
            -
                     
     | 
| 
       49 
     | 
    
         
            -
             
     | 
| 
       50 
     | 
    
         
            -
             
     | 
| 
       51 
     | 
    
         
            -
                       
     | 
| 
      
 63 
     | 
    
         
            +
                    foreign_key_was = owner.attribute_before_last_save(reflection.foreign_key)
         
     | 
| 
      
 64 
     | 
    
         
            +
             
     | 
| 
      
 65 
     | 
    
         
            +
                    if foreign_key_was && model_was < ActiveRecord::Base
         
     | 
| 
      
 66 
     | 
    
         
            +
                      update_counters_via_scope(model_was, foreign_key_was, -1)
         
     | 
| 
       52 
67 
     | 
    
         
             
                    end
         
     | 
| 
      
 68 
     | 
    
         
            +
                  end
         
     | 
| 
       53 
69 
     | 
    
         | 
| 
       54 
     | 
    
         
            -
             
     | 
| 
       55 
     | 
    
         
            -
             
     | 
| 
       56 
     | 
    
         
            -
             
     | 
| 
       57 
     | 
    
         
            -
             
     | 
| 
       58 
     | 
    
         
            -
             
     | 
| 
      
 70 
     | 
    
         
            +
                  def target_changed?
         
     | 
| 
      
 71 
     | 
    
         
            +
                    owner.saved_change_to_attribute?(reflection.foreign_key)
         
     | 
| 
      
 72 
     | 
    
         
            +
                  end
         
     | 
| 
      
 73 
     | 
    
         
            +
             
     | 
| 
      
 74 
     | 
    
         
            +
                  private
         
     | 
| 
      
 75 
     | 
    
         
            +
                    def replace(record)
         
     | 
| 
      
 76 
     | 
    
         
            +
                      if record
         
     | 
| 
      
 77 
     | 
    
         
            +
                        raise_on_type_mismatch!(record)
         
     | 
| 
      
 78 
     | 
    
         
            +
                        set_inverse_instance(record)
         
     | 
| 
      
 79 
     | 
    
         
            +
                        @updated = true
         
     | 
| 
       59 
80 
     | 
    
         
             
                      end
         
     | 
| 
      
 81 
     | 
    
         
            +
             
     | 
| 
      
 82 
     | 
    
         
            +
                      replace_keys(record, force: true)
         
     | 
| 
      
 83 
     | 
    
         
            +
             
     | 
| 
      
 84 
     | 
    
         
            +
                      self.target = record
         
     | 
| 
       60 
85 
     | 
    
         
             
                    end
         
     | 
| 
       61 
86 
     | 
    
         | 
| 
       62 
     | 
    
         
            -
                    def  
     | 
| 
       63 
     | 
    
         
            -
                      if foreign_key_present?
         
     | 
| 
       64 
     | 
    
         
            -
                         
     | 
| 
      
 87 
     | 
    
         
            +
                    def update_counters(by)
         
     | 
| 
      
 88 
     | 
    
         
            +
                      if require_counter_update? && foreign_key_present?
         
     | 
| 
      
 89 
     | 
    
         
            +
                        if target && !stale_target?
         
     | 
| 
      
 90 
     | 
    
         
            +
                          target.increment!(reflection.counter_cache_column, by, touch: reflection.options[:touch])
         
     | 
| 
      
 91 
     | 
    
         
            +
                        else
         
     | 
| 
      
 92 
     | 
    
         
            +
                          update_counters_via_scope(klass, owner._read_attribute(reflection.foreign_key), by)
         
     | 
| 
      
 93 
     | 
    
         
            +
                        end
         
     | 
| 
       65 
94 
     | 
    
         
             
                      end
         
     | 
| 
       66 
95 
     | 
    
         
             
                    end
         
     | 
| 
       67 
96 
     | 
    
         | 
| 
       68 
     | 
    
         
            -
                    def  
     | 
| 
       69 
     | 
    
         
            -
                       
     | 
| 
       70 
     | 
    
         
            -
             
     | 
| 
       71 
     | 
    
         
            -
                      end
         
     | 
| 
      
 97 
     | 
    
         
            +
                    def update_counters_via_scope(klass, foreign_key, by)
         
     | 
| 
      
 98 
     | 
    
         
            +
                      scope = klass.unscoped.where!(primary_key(klass) => foreign_key)
         
     | 
| 
      
 99 
     | 
    
         
            +
                      scope.update_counters(reflection.counter_cache_column => by, touch: reflection.options[:touch])
         
     | 
| 
       72 
100 
     | 
    
         
             
                    end
         
     | 
| 
       73 
101 
     | 
    
         | 
| 
       74 
     | 
    
         
            -
                     
     | 
| 
       75 
     | 
    
         
            -
             
     | 
| 
       76 
     | 
    
         
            -
                      record.id != owner[reflection.foreign_key]
         
     | 
| 
      
 102 
     | 
    
         
            +
                    def find_target?
         
     | 
| 
      
 103 
     | 
    
         
            +
                      !loaded? && foreign_key_present? && klass
         
     | 
| 
       77 
104 
     | 
    
         
             
                    end
         
     | 
| 
       78 
105 
     | 
    
         | 
| 
       79 
     | 
    
         
            -
                    def  
     | 
| 
       80 
     | 
    
         
            -
                       
     | 
| 
      
 106 
     | 
    
         
            +
                    def require_counter_update?
         
     | 
| 
      
 107 
     | 
    
         
            +
                      reflection.counter_cache_column && owner.persisted?
         
     | 
| 
       81 
108 
     | 
    
         
             
                    end
         
     | 
| 
       82 
109 
     | 
    
         | 
| 
       83 
     | 
    
         
            -
                    def  
     | 
| 
       84 
     | 
    
         
            -
                       
     | 
| 
      
 110 
     | 
    
         
            +
                    def replace_keys(record, force: false)
         
     | 
| 
      
 111 
     | 
    
         
            +
                      target_key = record ? record._read_attribute(primary_key(record.class)) : nil
         
     | 
| 
      
 112 
     | 
    
         
            +
             
     | 
| 
      
 113 
     | 
    
         
            +
                      if force || owner[reflection.foreign_key] != target_key
         
     | 
| 
      
 114 
     | 
    
         
            +
                        owner[reflection.foreign_key] = target_key
         
     | 
| 
      
 115 
     | 
    
         
            +
                      end
         
     | 
| 
      
 116 
     | 
    
         
            +
                    end
         
     | 
| 
      
 117 
     | 
    
         
            +
             
     | 
| 
      
 118 
     | 
    
         
            +
                    def primary_key(klass)
         
     | 
| 
      
 119 
     | 
    
         
            +
                      reflection.association_primary_key(klass)
         
     | 
| 
       85 
120 
     | 
    
         
             
                    end
         
     | 
| 
       86 
121 
     | 
    
         | 
| 
       87 
122 
     | 
    
         
             
                    def foreign_key_present?
         
     | 
| 
       88 
     | 
    
         
            -
                      owner 
     | 
| 
      
 123 
     | 
    
         
            +
                      owner._read_attribute(reflection.foreign_key)
         
     | 
| 
       89 
124 
     | 
    
         
             
                    end
         
     | 
| 
       90 
125 
     | 
    
         | 
| 
       91 
     | 
    
         
            -
                    # NOTE - for now, we're only supporting inverse setting from belongs_to back onto
         
     | 
| 
       92 
     | 
    
         
            -
                    # has_one associations.
         
     | 
| 
       93 
126 
     | 
    
         
             
                    def invertible_for?(record)
         
     | 
| 
       94 
127 
     | 
    
         
             
                      inverse = inverse_reflection_for(record)
         
     | 
| 
       95 
     | 
    
         
            -
                      inverse && inverse.has_one?
         
     | 
| 
       96 
     | 
    
         
            -
                    end
         
     | 
| 
       97 
     | 
    
         
            -
             
     | 
| 
       98 
     | 
    
         
            -
                    def target_id
         
     | 
| 
       99 
     | 
    
         
            -
                      if options[:primary_key]
         
     | 
| 
       100 
     | 
    
         
            -
                        owner.send(reflection.name).try(:id)
         
     | 
| 
       101 
     | 
    
         
            -
                      else
         
     | 
| 
       102 
     | 
    
         
            -
                        owner[reflection.foreign_key]
         
     | 
| 
       103 
     | 
    
         
            -
                      end
         
     | 
| 
      
 128 
     | 
    
         
            +
                      inverse && (inverse.has_one? || ActiveRecord::Base.has_many_inversing)
         
     | 
| 
       104 
129 
     | 
    
         
             
                    end
         
     | 
| 
       105 
130 
     | 
    
         | 
| 
       106 
131 
     | 
    
         
             
                    def stale_state
         
     | 
| 
       107 
     | 
    
         
            -
                      owner 
     | 
| 
      
 132 
     | 
    
         
            +
                      result = owner._read_attribute(reflection.foreign_key) { |n| owner.send(:missing_attribute, n, caller) }
         
     | 
| 
      
 133 
     | 
    
         
            +
                      result && result.to_s
         
     | 
| 
       108 
134 
     | 
    
         
             
                    end
         
     | 
| 
       109 
135 
     | 
    
         
             
                end
         
     | 
| 
       110 
136 
     | 
    
         
             
              end
         
     | 
| 
         @@ -1,26 +1,27 @@ 
     | 
|
| 
      
 1 
     | 
    
         
            +
            # frozen_string_literal: true
         
     | 
| 
      
 2 
     | 
    
         
            +
             
     | 
| 
       1 
3 
     | 
    
         
             
            module ActiveRecord
         
     | 
| 
       2 
     | 
    
         
            -
              # = Active Record Belongs To Polymorphic Association
         
     | 
| 
       3 
4 
     | 
    
         
             
              module Associations
         
     | 
| 
      
 5 
     | 
    
         
            +
                # = Active Record Belongs To Polymorphic Association
         
     | 
| 
       4 
6 
     | 
    
         
             
                class BelongsToPolymorphicAssociation < BelongsToAssociation #:nodoc:
         
     | 
| 
       5 
7 
     | 
    
         
             
                  def klass
         
     | 
| 
       6 
8 
     | 
    
         
             
                    type = owner[reflection.foreign_type]
         
     | 
| 
       7 
     | 
    
         
            -
                    type.presence && type 
     | 
| 
      
 9 
     | 
    
         
            +
                    type.presence && owner.class.polymorphic_class_for(type)
         
     | 
| 
       8 
10 
     | 
    
         
             
                  end
         
     | 
| 
       9 
11 
     | 
    
         | 
| 
       10 
     | 
    
         
            -
                   
     | 
| 
      
 12 
     | 
    
         
            +
                  def target_changed?
         
     | 
| 
      
 13 
     | 
    
         
            +
                    super || owner.saved_change_to_attribute?(reflection.foreign_type)
         
     | 
| 
      
 14 
     | 
    
         
            +
                  end
         
     | 
| 
       11 
15 
     | 
    
         | 
| 
       12 
     | 
    
         
            -
             
     | 
| 
      
 16 
     | 
    
         
            +
                  private
         
     | 
| 
      
 17 
     | 
    
         
            +
                    def replace_keys(record, force: false)
         
     | 
| 
       13 
18 
     | 
    
         
             
                      super
         
     | 
| 
       14 
     | 
    
         
            -
                      owner[reflection.foreign_type] = record.class.base_class.name
         
     | 
| 
       15 
     | 
    
         
            -
                    end
         
     | 
| 
       16 
19 
     | 
    
         | 
| 
       17 
     | 
    
         
            -
             
     | 
| 
       18 
     | 
    
         
            -
                      super
         
     | 
| 
       19 
     | 
    
         
            -
                      owner[reflection.foreign_type] = nil
         
     | 
| 
       20 
     | 
    
         
            -
                    end
         
     | 
| 
      
 20 
     | 
    
         
            +
                      target_type = record ? record.class.polymorphic_name : nil
         
     | 
| 
       21 
21 
     | 
    
         | 
| 
       22 
     | 
    
         
            -
             
     | 
| 
       23 
     | 
    
         
            -
             
     | 
| 
      
 22 
     | 
    
         
            +
                      if force || owner[reflection.foreign_type] != target_type
         
     | 
| 
      
 23 
     | 
    
         
            +
                        owner[reflection.foreign_type] = target_type
         
     | 
| 
      
 24 
     | 
    
         
            +
                      end
         
     | 
| 
       24 
25 
     | 
    
         
             
                    end
         
     | 
| 
       25 
26 
     | 
    
         | 
| 
       26 
27 
     | 
    
         
             
                    def inverse_reflection_for(record)
         
     |