activerecord 4.2.11.1 → 6.0.3.5
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of activerecord might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +721 -1522
- data/MIT-LICENSE +4 -2
- data/README.rdoc +14 -13
- data/examples/performance.rb +33 -32
- data/examples/simple.rb +5 -4
- data/lib/active_record/advisory_lock_base.rb +18 -0
- data/lib/active_record/aggregations.rb +266 -251
- data/lib/active_record/association_relation.rb +20 -13
- data/lib/active_record/associations/alias_tracker.rb +29 -36
- data/lib/active_record/associations/association.rb +128 -57
- data/lib/active_record/associations/association_scope.rb +103 -132
- data/lib/active_record/associations/belongs_to_association.rb +65 -60
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +8 -12
- data/lib/active_record/associations/builder/association.rb +27 -40
- data/lib/active_record/associations/builder/belongs_to.rb +69 -55
- data/lib/active_record/associations/builder/collection_association.rb +10 -33
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +50 -66
- data/lib/active_record/associations/builder/has_many.rb +8 -4
- data/lib/active_record/associations/builder/has_one.rb +46 -5
- data/lib/active_record/associations/builder/singular_association.rb +16 -10
- data/lib/active_record/associations/collection_association.rb +136 -288
- data/lib/active_record/associations/collection_proxy.rb +241 -147
- data/lib/active_record/associations/foreign_association.rb +10 -1
- data/lib/active_record/associations/has_many_association.rb +34 -98
- data/lib/active_record/associations/has_many_through_association.rb +60 -87
- data/lib/active_record/associations/has_one_association.rb +61 -49
- data/lib/active_record/associations/has_one_through_association.rb +20 -11
- data/lib/active_record/associations/join_dependency/join_association.rb +38 -86
- 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 +149 -166
- data/lib/active_record/associations/preloader/association.rb +90 -123
- data/lib/active_record/associations/preloader/through_association.rb +85 -65
- data/lib/active_record/associations/preloader.rb +90 -93
- data/lib/active_record/associations/singular_association.rb +18 -39
- data/lib/active_record/associations/through_association.rb +38 -18
- data/lib/active_record/associations.rb +1737 -1597
- data/lib/active_record/attribute_assignment.rb +57 -185
- data/lib/active_record/attribute_decorators.rb +39 -17
- data/lib/active_record/attribute_methods/before_type_cast.rb +13 -9
- data/lib/active_record/attribute_methods/dirty.rb +174 -144
- data/lib/active_record/attribute_methods/primary_key.rb +90 -84
- data/lib/active_record/attribute_methods/query.rb +6 -5
- data/lib/active_record/attribute_methods/read.rb +20 -77
- data/lib/active_record/attribute_methods/serialization.rb +40 -21
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +57 -37
- data/lib/active_record/attribute_methods/write.rb +32 -55
- data/lib/active_record/attribute_methods.rb +120 -135
- data/lib/active_record/attributes.rb +213 -82
- data/lib/active_record/autosave_association.rb +97 -41
- data/lib/active_record/base.rb +57 -45
- data/lib/active_record/callbacks.rb +101 -76
- data/lib/active_record/coders/json.rb +3 -1
- data/lib/active_record/coders/yaml_column.rb +23 -12
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +804 -297
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +26 -8
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +240 -115
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +83 -24
- data/lib/active_record/connection_adapters/abstract/quoting.rb +170 -53
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +5 -3
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +74 -47
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +371 -242
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +79 -36
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +694 -256
- data/lib/active_record/connection_adapters/abstract/transaction.rb +190 -83
- data/lib/active_record/connection_adapters/abstract_adapter.rb +473 -202
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +507 -639
- data/lib/active_record/connection_adapters/column.rb +56 -43
- data/lib/active_record/connection_adapters/connection_specification.rb +174 -153
- data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +29 -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 +81 -0
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +71 -0
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +95 -0
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +88 -0
- data/lib/active_record/connection_adapters/mysql/schema_statements.rb +264 -0
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +31 -0
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +58 -181
- data/lib/active_record/connection_adapters/postgresql/column.rb +21 -11
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +70 -114
- data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +44 -0
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +49 -58
- 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 +4 -2
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +5 -1
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +13 -1
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +9 -22
- data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +3 -1
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +5 -4
- 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/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/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 +51 -34
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +4 -5
- data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +58 -54
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +9 -5
- 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 +23 -25
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +144 -47
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +27 -14
- data/lib/active_record/connection_adapters/postgresql/schema_creation.rb +76 -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 +462 -296
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +36 -0
- data/lib/active_record/connection_adapters/postgresql/utils.rb +11 -8
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +558 -356
- data/lib/active_record/connection_adapters/schema_cache.rb +72 -25
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +37 -0
- data/lib/active_record/connection_adapters/sqlite3/database_statements.rb +119 -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 +17 -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 +137 -0
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +299 -349
- data/lib/active_record/connection_adapters/statement_pool.rb +33 -13
- data/lib/active_record/connection_handling.rb +167 -41
- data/lib/active_record/core.rb +252 -230
- data/lib/active_record/counter_cache.rb +70 -49
- data/lib/active_record/database_configurations/database_config.rb +37 -0
- data/lib/active_record/database_configurations/hash_config.rb +50 -0
- data/lib/active_record/database_configurations/url_config.rb +78 -0
- data/lib/active_record/database_configurations.rb +233 -0
- data/lib/active_record/define_callbacks.rb +22 -0
- data/lib/active_record/dynamic_matchers.rb +87 -106
- data/lib/active_record/enum.rb +163 -86
- data/lib/active_record/errors.rb +188 -53
- data/lib/active_record/explain.rb +22 -11
- data/lib/active_record/explain_registry.rb +4 -2
- data/lib/active_record/explain_subscriber.rb +10 -5
- data/lib/active_record/fixture_set/file.rb +35 -9
- data/lib/active_record/fixture_set/model_metadata.rb +33 -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 +227 -501
- data/lib/active_record/gem_version.rb +6 -4
- data/lib/active_record/inheritance.rb +158 -115
- data/lib/active_record/insert_all.rb +179 -0
- data/lib/active_record/integration.rb +123 -29
- data/lib/active_record/internal_metadata.rb +53 -0
- data/lib/active_record/legacy_yaml_adapter.rb +21 -3
- data/lib/active_record/locale/en.yml +3 -2
- data/lib/active_record/locking/optimistic.rb +86 -96
- data/lib/active_record/locking/pessimistic.rb +18 -6
- data/lib/active_record/log_subscriber.rb +76 -33
- data/lib/active_record/middleware/database_selector/resolver/session.rb +45 -0
- data/lib/active_record/middleware/database_selector/resolver.rb +87 -0
- data/lib/active_record/middleware/database_selector.rb +74 -0
- data/lib/active_record/migration/command_recorder.rb +166 -91
- data/lib/active_record/migration/compatibility.rb +244 -0
- data/lib/active_record/migration/join_table.rb +8 -7
- data/lib/active_record/migration.rb +623 -305
- data/lib/active_record/model_schema.rb +313 -112
- data/lib/active_record/nested_attributes.rb +263 -223
- data/lib/active_record/no_touching.rb +15 -2
- data/lib/active_record/null_relation.rb +24 -38
- data/lib/active_record/persistence.rb +557 -126
- data/lib/active_record/query_cache.rb +19 -23
- data/lib/active_record/querying.rb +44 -30
- data/lib/active_record/railtie.rb +143 -44
- data/lib/active_record/railties/collection_cache_association_loading.rb +34 -0
- data/lib/active_record/railties/console_sandbox.rb +2 -0
- data/lib/active_record/railties/controller_runtime.rb +34 -33
- data/lib/active_record/railties/databases.rake +331 -185
- data/lib/active_record/readonly_attributes.rb +5 -4
- data/lib/active_record/reflection.rb +430 -281
- data/lib/active_record/relation/batches/batch_enumerator.rb +69 -0
- data/lib/active_record/relation/batches.rb +206 -55
- data/lib/active_record/relation/calculations.rb +268 -254
- data/lib/active_record/relation/delegation.rb +75 -84
- data/lib/active_record/relation/finder_methods.rb +285 -241
- data/lib/active_record/relation/from_clause.rb +30 -0
- data/lib/active_record/relation/merger.rb +78 -88
- data/lib/active_record/relation/predicate_builder/array_handler.rb +27 -26
- data/lib/active_record/relation/predicate_builder/association_query_value.rb +43 -0
- data/lib/active_record/relation/predicate_builder/base_handler.rb +18 -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 +53 -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 +110 -119
- data/lib/active_record/relation/query_attribute.rb +50 -0
- data/lib/active_record/relation/query_methods.rb +603 -397
- data/lib/active_record/relation/record_fetch_warning.rb +51 -0
- data/lib/active_record/relation/spawn_methods.rb +11 -14
- data/lib/active_record/relation/where_clause.rb +189 -0
- data/lib/active_record/relation/where_clause_factory.rb +33 -0
- data/lib/active_record/relation.rb +530 -341
- data/lib/active_record/result.rb +79 -43
- data/lib/active_record/runtime_registry.rb +6 -4
- data/lib/active_record/sanitization.rb +144 -121
- data/lib/active_record/schema.rb +21 -24
- data/lib/active_record/schema_dumper.rb +112 -93
- data/lib/active_record/schema_migration.rb +24 -17
- data/lib/active_record/scoping/default.rb +98 -83
- data/lib/active_record/scoping/named.rb +86 -33
- data/lib/active_record/scoping.rb +45 -27
- data/lib/active_record/secure_token.rb +40 -0
- data/lib/active_record/serialization.rb +5 -5
- data/lib/active_record/statement_cache.rb +73 -36
- data/lib/active_record/store.rb +127 -42
- data/lib/active_record/suppressor.rb +61 -0
- data/lib/active_record/table_metadata.rb +90 -0
- data/lib/active_record/tasks/database_tasks.rb +307 -100
- data/lib/active_record/tasks/mysql_database_tasks.rb +55 -100
- data/lib/active_record/tasks/postgresql_database_tasks.rb +80 -41
- data/lib/active_record/tasks/sqlite_database_tasks.rb +37 -16
- data/lib/active_record/test_databases.rb +23 -0
- data/lib/active_record/test_fixtures.rb +225 -0
- data/lib/active_record/timestamp.rb +86 -41
- data/lib/active_record/touch_later.rb +65 -0
- data/lib/active_record/transactions.rb +223 -157
- 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 -45
- data/lib/active_record/type/date_time.rb +4 -49
- data/lib/active_record/type/decimal_without_scale.rb +6 -2
- data/lib/active_record/type/hash_lookup_type_map.rb +5 -4
- 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 +23 -15
- data/lib/active_record/type/text.rb +2 -2
- data/lib/active_record/type/time.rb +11 -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 +77 -23
- data/lib/active_record/type_caster/connection.rb +34 -0
- data/lib/active_record/type_caster/map.rb +20 -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/presence.rb +14 -13
- data/lib/active_record/validations/uniqueness.rb +42 -55
- data/lib/active_record/validations.rb +38 -35
- data/lib/active_record/version.rb +3 -1
- data/lib/active_record.rb +42 -22
- data/lib/arel/alias_predication.rb +9 -0
- data/lib/arel/attributes/attribute.rb +37 -0
- data/lib/arel/attributes.rb +22 -0
- data/lib/arel/collectors/bind.rb +24 -0
- data/lib/arel/collectors/composite.rb +31 -0
- data/lib/arel/collectors/plain_string.rb +20 -0
- data/lib/arel/collectors/sql_string.rb +20 -0
- data/lib/arel/collectors/substitute_binds.rb +28 -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 +52 -0
- data/lib/arel/nodes/bind_param.rb +36 -0
- data/lib/arel/nodes/case.rb +55 -0
- data/lib/arel/nodes/casted.rb +50 -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 +18 -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 +8 -0
- data/lib/arel/nodes/in.rb +8 -0
- data/lib/arel/nodes/infix_operation.rb +80 -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 +50 -0
- data/lib/arel/nodes/node_expression.rb +13 -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 +16 -0
- data/lib/arel/nodes/string_join.rb +11 -0
- data/lib/arel/nodes/table_alias.rb +27 -0
- data/lib/arel/nodes/terminal.rb +16 -0
- data/lib/arel/nodes/true.rb +16 -0
- data/lib/arel/nodes/unary.rb +45 -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 +68 -0
- data/lib/arel/order_predications.rb +13 -0
- data/lib/arel/predications.rb +256 -0
- data/lib/arel/select_manager.rb +271 -0
- data/lib/arel/table.rb +110 -0
- data/lib/arel/tree_manager.rb +72 -0
- data/lib/arel/update_manager.rb +34 -0
- data/lib/arel/visitors/depth_first.rb +203 -0
- data/lib/arel/visitors/dot.rb +296 -0
- data/lib/arel/visitors/ibm_db.rb +34 -0
- data/lib/arel/visitors/informix.rb +62 -0
- data/lib/arel/visitors/mssql.rb +156 -0
- data/lib/arel/visitors/mysql.rb +83 -0
- data/lib/arel/visitors/oracle.rb +158 -0
- data/lib/arel/visitors/oracle12.rb +65 -0
- data/lib/arel/visitors/postgresql.rb +109 -0
- data/lib/arel/visitors/sqlite.rb +38 -0
- data/lib/arel/visitors/to_sql.rb +888 -0
- data/lib/arel/visitors/visitor.rb +45 -0
- data/lib/arel/visitors/where_sql.rb +22 -0
- data/lib/arel/visitors.rb +20 -0
- data/lib/arel/window_predications.rb +9 -0
- data/lib/arel.rb +62 -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 +42 -37
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb.tt +24 -0
- data/lib/rails/generators/active_record/migration/templates/{migration.rb → migration.rb.tt} +11 -2
- data/lib/rails/generators/active_record/migration.rb +30 -1
- data/lib/rails/generators/active_record/model/model_generator.rb +18 -22
- data/lib/rails/generators/active_record/model/templates/model.rb.tt +22 -0
- data/lib/rails/generators/active_record/model/templates/{module.rb → module.rb.tt} +0 -0
- data/lib/rails/generators/active_record.rb +7 -5
- metadata +168 -59
- 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 -163
- data/lib/active_record/attribute_set/builder.rb +0 -106
- data/lib/active_record/attribute_set.rb +0 -81
- data/lib/active_record/connection_adapters/mysql_adapter.rb +0 -498
- 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 -31
- data/lib/active_record/type/decimal.rb +0 -64
- 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 -59
- 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 -40
- data/lib/active_record/type/time_value.rb +0 -38
- data/lib/active_record/type/value.rb +0 -110
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb +0 -19
- data/lib/rails/generators/active_record/model/templates/model.rb +0 -10
@@ -1,269 +1,284 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ActiveRecord
|
2
|
-
#
|
3
|
-
module Aggregations
|
4
|
-
|
4
|
+
# See ActiveRecord::Aggregations::ClassMethods for documentation
|
5
|
+
module Aggregations
|
6
|
+
def initialize_dup(*) # :nodoc:
|
7
|
+
@aggregation_cache = {}
|
8
|
+
super
|
9
|
+
end
|
5
10
|
|
6
|
-
def
|
7
|
-
|
11
|
+
def reload(*) # :nodoc:
|
12
|
+
clear_aggregation_cache
|
13
|
+
super
|
8
14
|
end
|
9
15
|
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
#
|
172
|
-
#
|
173
|
-
#
|
174
|
-
#
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
16
|
+
private
|
17
|
+
def clear_aggregation_cache
|
18
|
+
@aggregation_cache.clear if persisted?
|
19
|
+
end
|
20
|
+
|
21
|
+
def init_internals
|
22
|
+
@aggregation_cache = {}
|
23
|
+
super
|
24
|
+
end
|
25
|
+
|
26
|
+
# Active Record implements aggregation through a macro-like class method called #composed_of
|
27
|
+
# for representing attributes as value objects. It expresses relationships like "Account [is]
|
28
|
+
# composed of Money [among other things]" or "Person [is] composed of [an] address". Each call
|
29
|
+
# to the macro adds a description of how the value objects are created from the attributes of
|
30
|
+
# the entity object (when the entity is initialized either as a new object or from finding an
|
31
|
+
# existing object) and how it can be turned back into attributes (when the entity is saved to
|
32
|
+
# the database).
|
33
|
+
#
|
34
|
+
# class Customer < ActiveRecord::Base
|
35
|
+
# composed_of :balance, class_name: "Money", mapping: %w(balance amount)
|
36
|
+
# composed_of :address, mapping: [ %w(address_street street), %w(address_city city) ]
|
37
|
+
# end
|
38
|
+
#
|
39
|
+
# The customer class now has the following methods to manipulate the value objects:
|
40
|
+
# * <tt>Customer#balance, Customer#balance=(money)</tt>
|
41
|
+
# * <tt>Customer#address, Customer#address=(address)</tt>
|
42
|
+
#
|
43
|
+
# These methods will operate with value objects like the ones described below:
|
44
|
+
#
|
45
|
+
# class Money
|
46
|
+
# include Comparable
|
47
|
+
# attr_reader :amount, :currency
|
48
|
+
# EXCHANGE_RATES = { "USD_TO_DKK" => 6 }
|
49
|
+
#
|
50
|
+
# def initialize(amount, currency = "USD")
|
51
|
+
# @amount, @currency = amount, currency
|
52
|
+
# end
|
53
|
+
#
|
54
|
+
# def exchange_to(other_currency)
|
55
|
+
# exchanged_amount = (amount * EXCHANGE_RATES["#{currency}_TO_#{other_currency}"]).floor
|
56
|
+
# Money.new(exchanged_amount, other_currency)
|
57
|
+
# end
|
58
|
+
#
|
59
|
+
# def ==(other_money)
|
60
|
+
# amount == other_money.amount && currency == other_money.currency
|
61
|
+
# end
|
62
|
+
#
|
63
|
+
# def <=>(other_money)
|
64
|
+
# if currency == other_money.currency
|
65
|
+
# amount <=> other_money.amount
|
66
|
+
# else
|
67
|
+
# amount <=> other_money.exchange_to(currency).amount
|
68
|
+
# end
|
69
|
+
# end
|
70
|
+
# end
|
71
|
+
#
|
72
|
+
# class Address
|
73
|
+
# attr_reader :street, :city
|
74
|
+
# def initialize(street, city)
|
75
|
+
# @street, @city = street, city
|
76
|
+
# end
|
77
|
+
#
|
78
|
+
# def close_to?(other_address)
|
79
|
+
# city == other_address.city
|
80
|
+
# end
|
81
|
+
#
|
82
|
+
# def ==(other_address)
|
83
|
+
# city == other_address.city && street == other_address.street
|
84
|
+
# end
|
85
|
+
# end
|
86
|
+
#
|
87
|
+
# Now it's possible to access attributes from the database through the value objects instead. If
|
88
|
+
# you choose to name the composition the same as the attribute's name, it will be the only way to
|
89
|
+
# access that attribute. That's the case with our +balance+ attribute. You interact with the value
|
90
|
+
# objects just like you would with any other attribute:
|
91
|
+
#
|
92
|
+
# customer.balance = Money.new(20) # sets the Money value object and the attribute
|
93
|
+
# customer.balance # => Money value object
|
94
|
+
# customer.balance.exchange_to("DKK") # => Money.new(120, "DKK")
|
95
|
+
# customer.balance > Money.new(10) # => true
|
96
|
+
# customer.balance == Money.new(20) # => true
|
97
|
+
# customer.balance < Money.new(5) # => false
|
98
|
+
#
|
99
|
+
# Value objects can also be composed of multiple attributes, such as the case of Address. The order
|
100
|
+
# of the mappings will determine the order of the parameters.
|
101
|
+
#
|
102
|
+
# customer.address_street = "Hyancintvej"
|
103
|
+
# customer.address_city = "Copenhagen"
|
104
|
+
# customer.address # => Address.new("Hyancintvej", "Copenhagen")
|
105
|
+
#
|
106
|
+
# customer.address = Address.new("May Street", "Chicago")
|
107
|
+
# customer.address_street # => "May Street"
|
108
|
+
# customer.address_city # => "Chicago"
|
109
|
+
#
|
110
|
+
# == Writing value objects
|
111
|
+
#
|
112
|
+
# Value objects are immutable and interchangeable objects that represent a given value, such as
|
113
|
+
# a Money object representing $5. Two Money objects both representing $5 should be equal (through
|
114
|
+
# methods such as <tt>==</tt> and <tt><=></tt> from Comparable if ranking makes sense). This is
|
115
|
+
# unlike entity objects where equality is determined by identity. An entity class such as Customer can
|
116
|
+
# easily have two different objects that both have an address on Hyancintvej. Entity identity is
|
117
|
+
# determined by object or relational unique identifiers (such as primary keys). Normal
|
118
|
+
# ActiveRecord::Base classes are entity objects.
|
119
|
+
#
|
120
|
+
# It's also important to treat the value objects as immutable. Don't allow the Money object to have
|
121
|
+
# its amount changed after creation. Create a new Money object with the new value instead. The
|
122
|
+
# <tt>Money#exchange_to</tt> method is an example of this. It returns a new value object instead of changing
|
123
|
+
# its own values. Active Record won't persist value objects that have been changed through means
|
124
|
+
# other than the writer method.
|
125
|
+
#
|
126
|
+
# The immutable requirement is enforced by Active Record by freezing any object assigned as a value
|
127
|
+
# object. Attempting to change it afterwards will result in a +RuntimeError+.
|
128
|
+
#
|
129
|
+
# Read more about value objects on http://c2.com/cgi/wiki?ValueObject and on the dangers of not
|
130
|
+
# keeping value objects immutable on http://c2.com/cgi/wiki?ValueObjectsShouldBeImmutable
|
131
|
+
#
|
132
|
+
# == Custom constructors and converters
|
133
|
+
#
|
134
|
+
# By default value objects are initialized by calling the <tt>new</tt> constructor of the value
|
135
|
+
# class passing each of the mapped attributes, in the order specified by the <tt>:mapping</tt>
|
136
|
+
# option, as arguments. If the value class doesn't support this convention then #composed_of allows
|
137
|
+
# a custom constructor to be specified.
|
138
|
+
#
|
139
|
+
# When a new value is assigned to the value object, the default assumption is that the new value
|
140
|
+
# is an instance of the value class. Specifying a custom converter allows the new value to be automatically
|
141
|
+
# converted to an instance of value class if necessary.
|
142
|
+
#
|
143
|
+
# For example, the +NetworkResource+ model has +network_address+ and +cidr_range+ attributes that should be
|
144
|
+
# aggregated using the +NetAddr::CIDR+ value class (http://www.rubydoc.info/gems/netaddr/1.5.0/NetAddr/CIDR).
|
145
|
+
# The constructor for the value class is called +create+ and it expects a CIDR address string as a parameter.
|
146
|
+
# New values can be assigned to the value object using either another +NetAddr::CIDR+ object, a string
|
147
|
+
# or an array. The <tt>:constructor</tt> and <tt>:converter</tt> options can be used to meet
|
148
|
+
# these requirements:
|
149
|
+
#
|
150
|
+
# class NetworkResource < ActiveRecord::Base
|
151
|
+
# composed_of :cidr,
|
152
|
+
# class_name: 'NetAddr::CIDR',
|
153
|
+
# mapping: [ %w(network_address network), %w(cidr_range bits) ],
|
154
|
+
# allow_nil: true,
|
155
|
+
# constructor: Proc.new { |network_address, cidr_range| NetAddr::CIDR.create("#{network_address}/#{cidr_range}") },
|
156
|
+
# converter: Proc.new { |value| NetAddr::CIDR.create(value.is_a?(Array) ? value.join('/') : value) }
|
157
|
+
# end
|
158
|
+
#
|
159
|
+
# # This calls the :constructor
|
160
|
+
# network_resource = NetworkResource.new(network_address: '192.168.0.1', cidr_range: 24)
|
161
|
+
#
|
162
|
+
# # These assignments will both use the :converter
|
163
|
+
# network_resource.cidr = [ '192.168.2.1', 8 ]
|
164
|
+
# network_resource.cidr = '192.168.0.1/24'
|
165
|
+
#
|
166
|
+
# # This assignment won't use the :converter as the value is already an instance of the value class
|
167
|
+
# network_resource.cidr = NetAddr::CIDR.create('192.168.2.1/8')
|
168
|
+
#
|
169
|
+
# # Saving and then reloading will use the :constructor on reload
|
170
|
+
# network_resource.save
|
171
|
+
# network_resource.reload
|
172
|
+
#
|
173
|
+
# == Finding records by a value object
|
174
|
+
#
|
175
|
+
# Once a #composed_of relationship is specified for a model, records can be loaded from the database
|
176
|
+
# by specifying an instance of the value object in the conditions hash. The following example
|
177
|
+
# finds all customers with +address_street+ equal to "May Street" and +address_city+ equal to "Chicago":
|
178
|
+
#
|
179
|
+
# Customer.where(address: Address.new("May Street", "Chicago"))
|
180
|
+
#
|
181
|
+
module ClassMethods
|
182
|
+
# Adds reader and writer methods for manipulating a value object:
|
183
|
+
# <tt>composed_of :address</tt> adds <tt>address</tt> and <tt>address=(new_address)</tt> methods.
|
184
|
+
#
|
185
|
+
# Options are:
|
186
|
+
# * <tt>:class_name</tt> - Specifies the class name of the association. Use it only if that name
|
187
|
+
# can't be inferred from the part id. So <tt>composed_of :address</tt> will by default be linked
|
188
|
+
# to the Address class, but if the real class name is +CompanyAddress+, you'll have to specify it
|
189
|
+
# with this option.
|
190
|
+
# * <tt>:mapping</tt> - Specifies the mapping of entity attributes to attributes of the value
|
191
|
+
# object. Each mapping is represented as an array where the first item is the name of the
|
192
|
+
# entity attribute and the second item is the name of the attribute in the value object. The
|
193
|
+
# order in which mappings are defined determines the order in which attributes are sent to the
|
194
|
+
# value class constructor.
|
195
|
+
# * <tt>:allow_nil</tt> - Specifies that the value object will not be instantiated when all mapped
|
196
|
+
# attributes are +nil+. Setting the value object to +nil+ has the effect of writing +nil+ to all
|
197
|
+
# mapped attributes.
|
198
|
+
# This defaults to +false+.
|
199
|
+
# * <tt>:constructor</tt> - A symbol specifying the name of the constructor method or a Proc that
|
200
|
+
# is called to initialize the value object. The constructor is passed all of the mapped attributes,
|
201
|
+
# in the order that they are defined in the <tt>:mapping option</tt>, as arguments and uses them
|
202
|
+
# to instantiate a <tt>:class_name</tt> object.
|
203
|
+
# The default is <tt>:new</tt>.
|
204
|
+
# * <tt>:converter</tt> - A symbol specifying the name of a class method of <tt>:class_name</tt>
|
205
|
+
# or a Proc that is called when a new value is assigned to the value object. The converter is
|
206
|
+
# passed the single value that is used in the assignment and is only called if the new value is
|
207
|
+
# not an instance of <tt>:class_name</tt>. If <tt>:allow_nil</tt> is set to true, the converter
|
208
|
+
# can return +nil+ to skip the assignment.
|
209
|
+
#
|
210
|
+
# Option examples:
|
211
|
+
# composed_of :temperature, mapping: %w(reading celsius)
|
212
|
+
# composed_of :balance, class_name: "Money", mapping: %w(balance amount)
|
213
|
+
# composed_of :address, mapping: [ %w(address_street street), %w(address_city city) ]
|
214
|
+
# composed_of :gps_location
|
215
|
+
# composed_of :gps_location, allow_nil: true
|
216
|
+
# composed_of :ip_address,
|
217
|
+
# class_name: 'IPAddr',
|
218
|
+
# mapping: %w(ip to_i),
|
219
|
+
# constructor: Proc.new { |ip| IPAddr.new(ip, Socket::AF_INET) },
|
220
|
+
# converter: Proc.new { |ip| ip.is_a?(Integer) ? IPAddr.new(ip, Socket::AF_INET) : IPAddr.new(ip.to_s) }
|
221
|
+
#
|
222
|
+
def composed_of(part_id, options = {})
|
223
|
+
options.assert_valid_keys(:class_name, :mapping, :allow_nil, :constructor, :converter)
|
224
|
+
|
225
|
+
unless self < Aggregations
|
226
|
+
include Aggregations
|
227
|
+
end
|
214
228
|
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
229
|
+
name = part_id.id2name
|
230
|
+
class_name = options[:class_name] || name.camelize
|
231
|
+
mapping = options[:mapping] || [ name, name ]
|
232
|
+
mapping = [ mapping ] unless mapping.first.is_a?(Array)
|
233
|
+
allow_nil = options[:allow_nil] || false
|
234
|
+
constructor = options[:constructor] || :new
|
235
|
+
converter = options[:converter]
|
222
236
|
|
223
|
-
|
224
|
-
|
237
|
+
reader_method(name, class_name, mapping, allow_nil, constructor)
|
238
|
+
writer_method(name, class_name, mapping, allow_nil, converter)
|
225
239
|
|
226
|
-
|
227
|
-
|
228
|
-
|
240
|
+
reflection = ActiveRecord::Reflection.create(:composed_of, part_id, nil, options, self)
|
241
|
+
Reflection.add_aggregate_reflection self, part_id, reflection
|
242
|
+
end
|
229
243
|
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
244
|
+
private
|
245
|
+
def reader_method(name, class_name, mapping, allow_nil, constructor)
|
246
|
+
define_method(name) do
|
247
|
+
if @aggregation_cache[name].nil? && (!allow_nil || mapping.any? { |key, _| !_read_attribute(key).nil? })
|
248
|
+
attrs = mapping.collect { |key, _| _read_attribute(key) }
|
249
|
+
object = constructor.respond_to?(:call) ?
|
250
|
+
constructor.call(*attrs) :
|
251
|
+
class_name.constantize.send(constructor, *attrs)
|
252
|
+
@aggregation_cache[name] = object
|
253
|
+
end
|
254
|
+
@aggregation_cache[name]
|
239
255
|
end
|
240
|
-
@aggregation_cache[name]
|
241
256
|
end
|
242
|
-
end
|
243
257
|
|
244
|
-
|
245
|
-
|
246
|
-
|
258
|
+
def writer_method(name, class_name, mapping, allow_nil, converter)
|
259
|
+
define_method("#{name}=") do |part|
|
260
|
+
klass = class_name.constantize
|
247
261
|
|
248
|
-
|
249
|
-
|
250
|
-
|
262
|
+
unless part.is_a?(klass) || converter.nil? || part.nil?
|
263
|
+
part = converter.respond_to?(:call) ? converter.call(part) : klass.send(converter, part)
|
264
|
+
end
|
251
265
|
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
266
|
+
hash_from_multiparameter_assignment = part.is_a?(Hash) &&
|
267
|
+
part.each_key.all? { |k| k.is_a?(Integer) }
|
268
|
+
if hash_from_multiparameter_assignment
|
269
|
+
raise ArgumentError unless part.size == part.each_key.max
|
270
|
+
part = klass.new(*part.sort.map(&:last))
|
271
|
+
end
|
257
272
|
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
273
|
+
if part.nil? && allow_nil
|
274
|
+
mapping.each { |key, _| self[key] = nil }
|
275
|
+
@aggregation_cache[name] = nil
|
276
|
+
else
|
277
|
+
mapping.each { |key, value| self[key] = part.send(value) }
|
278
|
+
@aggregation_cache[name] = part.freeze
|
279
|
+
end
|
264
280
|
end
|
265
281
|
end
|
266
|
-
|
267
|
-
end
|
282
|
+
end
|
268
283
|
end
|
269
284
|
end
|
@@ -1,7 +1,9 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ActiveRecord
|
2
4
|
class AssociationRelation < Relation
|
3
|
-
def initialize(klass,
|
4
|
-
super(klass
|
5
|
+
def initialize(klass, association, **)
|
6
|
+
super(klass)
|
5
7
|
@association = association
|
6
8
|
end
|
7
9
|
|
@@ -10,26 +12,31 @@ module ActiveRecord
|
|
10
12
|
end
|
11
13
|
|
12
14
|
def ==(other)
|
13
|
-
other ==
|
15
|
+
other == records
|
14
16
|
end
|
15
17
|
|
16
|
-
def build(
|
17
|
-
|
18
|
+
def build(attributes = nil, &block)
|
19
|
+
block = _deprecated_scope_block("new", &block)
|
20
|
+
scoping { @association.build(attributes, &block) }
|
18
21
|
end
|
19
22
|
alias new build
|
20
23
|
|
21
|
-
def create(
|
22
|
-
|
24
|
+
def create(attributes = nil, &block)
|
25
|
+
block = _deprecated_scope_block("create", &block)
|
26
|
+
scoping { @association.create(attributes, &block) }
|
23
27
|
end
|
24
28
|
|
25
|
-
def create!(
|
26
|
-
|
29
|
+
def create!(attributes = nil, &block)
|
30
|
+
block = _deprecated_scope_block("create!", &block)
|
31
|
+
scoping { @association.create!(attributes, &block) }
|
27
32
|
end
|
28
33
|
|
29
34
|
private
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
35
|
+
def exec_queries
|
36
|
+
super do |record|
|
37
|
+
@association.set_inverse_instance_from_queries(record)
|
38
|
+
yield record if block_given?
|
39
|
+
end
|
40
|
+
end
|
34
41
|
end
|
35
42
|
end
|