activerecord 3.2.19 → 5.0.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of activerecord might be problematic. Click here for more details.
- checksums.yaml +7 -0
- data/CHANGELOG.md +1715 -604
- data/MIT-LICENSE +2 -2
- data/README.rdoc +40 -45
- data/examples/performance.rb +33 -22
- data/examples/simple.rb +3 -4
- data/lib/active_record/aggregations.rb +76 -51
- data/lib/active_record/association_relation.rb +35 -0
- data/lib/active_record/associations/alias_tracker.rb +54 -40
- data/lib/active_record/associations/association.rb +76 -56
- data/lib/active_record/associations/association_scope.rb +125 -93
- data/lib/active_record/associations/belongs_to_association.rb +57 -28
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +7 -2
- data/lib/active_record/associations/builder/association.rb +120 -32
- data/lib/active_record/associations/builder/belongs_to.rb +115 -62
- data/lib/active_record/associations/builder/collection_association.rb +61 -53
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +117 -43
- data/lib/active_record/associations/builder/has_many.rb +9 -65
- data/lib/active_record/associations/builder/has_one.rb +18 -52
- data/lib/active_record/associations/builder/singular_association.rb +18 -19
- data/lib/active_record/associations/collection_association.rb +268 -186
- data/lib/active_record/associations/collection_proxy.rb +1003 -63
- data/lib/active_record/associations/foreign_association.rb +11 -0
- data/lib/active_record/associations/has_many_association.rb +81 -41
- data/lib/active_record/associations/has_many_through_association.rb +76 -55
- data/lib/active_record/associations/has_one_association.rb +51 -21
- data/lib/active_record/associations/has_one_through_association.rb +1 -1
- data/lib/active_record/associations/join_dependency/join_association.rb +83 -108
- data/lib/active_record/associations/join_dependency/join_base.rb +7 -9
- data/lib/active_record/associations/join_dependency/join_part.rb +30 -37
- data/lib/active_record/associations/join_dependency.rb +239 -155
- data/lib/active_record/associations/preloader/association.rb +97 -62
- data/lib/active_record/associations/preloader/collection_association.rb +2 -8
- data/lib/active_record/associations/preloader/has_many_through.rb +7 -3
- data/lib/active_record/associations/preloader/has_one.rb +0 -8
- data/lib/active_record/associations/preloader/singular_association.rb +3 -3
- data/lib/active_record/associations/preloader/through_association.rb +75 -33
- data/lib/active_record/associations/preloader.rb +111 -79
- data/lib/active_record/associations/singular_association.rb +35 -13
- data/lib/active_record/associations/through_association.rb +41 -19
- data/lib/active_record/associations.rb +727 -501
- data/lib/active_record/attribute/user_provided_default.rb +28 -0
- data/lib/active_record/attribute.rb +213 -0
- data/lib/active_record/attribute_assignment.rb +32 -162
- data/lib/active_record/attribute_decorators.rb +67 -0
- data/lib/active_record/attribute_methods/before_type_cast.rb +52 -7
- data/lib/active_record/attribute_methods/dirty.rb +101 -61
- data/lib/active_record/attribute_methods/primary_key.rb +50 -36
- data/lib/active_record/attribute_methods/query.rb +7 -6
- data/lib/active_record/attribute_methods/read.rb +56 -117
- data/lib/active_record/attribute_methods/serialization.rb +43 -96
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +93 -42
- data/lib/active_record/attribute_methods/write.rb +34 -45
- data/lib/active_record/attribute_methods.rb +333 -144
- data/lib/active_record/attribute_mutation_tracker.rb +70 -0
- data/lib/active_record/attribute_set/builder.rb +108 -0
- data/lib/active_record/attribute_set.rb +108 -0
- data/lib/active_record/attributes.rb +265 -0
- data/lib/active_record/autosave_association.rb +285 -223
- data/lib/active_record/base.rb +95 -490
- data/lib/active_record/callbacks.rb +95 -61
- data/lib/active_record/coders/json.rb +13 -0
- data/lib/active_record/coders/yaml_column.rb +28 -19
- data/lib/active_record/collection_cache_key.rb +40 -0
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +724 -277
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +9 -0
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +199 -192
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +31 -26
- data/lib/active_record/connection_adapters/abstract/quoting.rb +140 -57
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +21 -0
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +147 -0
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +419 -276
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +105 -0
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +963 -276
- data/lib/active_record/connection_adapters/abstract/transaction.rb +232 -0
- data/lib/active_record/connection_adapters/abstract_adapter.rb +397 -106
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +643 -342
- data/lib/active_record/connection_adapters/column.rb +30 -259
- data/lib/active_record/connection_adapters/connection_specification.rb +263 -0
- data/lib/active_record/connection_adapters/determine_if_preparable_visitor.rb +22 -0
- data/lib/active_record/connection_adapters/mysql/column.rb +50 -0
- data/lib/active_record/connection_adapters/mysql/database_statements.rb +125 -0
- data/lib/active_record/connection_adapters/mysql/explain_pretty_printer.rb +70 -0
- data/lib/active_record/connection_adapters/mysql/quoting.rb +51 -0
- data/lib/active_record/connection_adapters/mysql/schema_creation.rb +67 -0
- data/lib/active_record/connection_adapters/mysql/schema_definitions.rb +93 -0
- data/lib/active_record/connection_adapters/mysql/schema_dumper.rb +54 -0
- data/lib/active_record/connection_adapters/mysql/type_metadata.rb +32 -0
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +47 -196
- data/lib/active_record/connection_adapters/postgresql/column.rb +15 -0
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +170 -0
- data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb +42 -0
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +70 -0
- data/lib/active_record/connection_adapters/postgresql/oid/bit.rb +52 -0
- data/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/bytea.rb +15 -0
- data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb +48 -0
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +21 -0
- data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/enum.rb +19 -0
- data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb +59 -0
- data/lib/active_record/connection_adapters/postgresql/oid/inet.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/json.rb +10 -0
- data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +23 -0
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +39 -0
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +43 -0
- data/lib/active_record/connection_adapters/postgresql/oid/rails_5_1_point.rb +50 -0
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +93 -0
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +15 -0
- data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb +109 -0
- data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb +21 -0
- data/lib/active_record/connection_adapters/postgresql/oid/vector.rb +26 -0
- data/lib/active_record/connection_adapters/postgresql/oid/xml.rb +28 -0
- data/lib/active_record/connection_adapters/postgresql/oid.rb +31 -0
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +116 -0
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +49 -0
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +180 -0
- data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb +47 -0
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +682 -0
- data/lib/active_record/connection_adapters/postgresql/type_metadata.rb +35 -0
- data/lib/active_record/connection_adapters/postgresql/utils.rb +77 -0
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +558 -1039
- data/lib/active_record/connection_adapters/schema_cache.rb +74 -36
- data/lib/active_record/connection_adapters/sql_type_metadata.rb +32 -0
- data/lib/active_record/connection_adapters/sqlite3/explain_pretty_printer.rb +19 -0
- data/lib/active_record/connection_adapters/sqlite3/quoting.rb +48 -0
- data/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +22 -0
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +538 -24
- data/lib/active_record/connection_adapters/statement_pool.rb +31 -12
- data/lib/active_record/connection_handling.rb +155 -0
- data/lib/active_record/core.rb +561 -0
- data/lib/active_record/counter_cache.rb +146 -105
- data/lib/active_record/dynamic_matchers.rb +101 -64
- data/lib/active_record/enum.rb +234 -0
- data/lib/active_record/errors.rb +153 -56
- data/lib/active_record/explain.rb +15 -63
- data/lib/active_record/explain_registry.rb +30 -0
- data/lib/active_record/explain_subscriber.rb +10 -6
- data/lib/active_record/fixture_set/file.rb +77 -0
- data/lib/active_record/fixtures.rb +355 -232
- data/lib/active_record/gem_version.rb +15 -0
- data/lib/active_record/inheritance.rb +144 -79
- data/lib/active_record/integration.rb +66 -13
- data/lib/active_record/internal_metadata.rb +56 -0
- data/lib/active_record/legacy_yaml_adapter.rb +46 -0
- data/lib/active_record/locale/en.yml +9 -1
- data/lib/active_record/locking/optimistic.rb +77 -56
- data/lib/active_record/locking/pessimistic.rb +6 -6
- data/lib/active_record/log_subscriber.rb +53 -28
- data/lib/active_record/migration/command_recorder.rb +166 -33
- data/lib/active_record/migration/compatibility.rb +126 -0
- data/lib/active_record/migration/join_table.rb +15 -0
- data/lib/active_record/migration.rb +792 -264
- data/lib/active_record/model_schema.rb +192 -130
- data/lib/active_record/nested_attributes.rb +238 -145
- data/lib/active_record/no_touching.rb +52 -0
- data/lib/active_record/null_relation.rb +89 -0
- data/lib/active_record/persistence.rb +357 -157
- data/lib/active_record/query_cache.rb +22 -43
- data/lib/active_record/querying.rb +34 -23
- data/lib/active_record/railtie.rb +88 -48
- data/lib/active_record/railties/console_sandbox.rb +3 -4
- data/lib/active_record/railties/controller_runtime.rb +5 -4
- data/lib/active_record/railties/databases.rake +170 -422
- data/lib/active_record/railties/jdbcmysql_error.rb +1 -1
- data/lib/active_record/readonly_attributes.rb +2 -5
- data/lib/active_record/reflection.rb +715 -189
- data/lib/active_record/relation/batches/batch_enumerator.rb +67 -0
- data/lib/active_record/relation/batches.rb +203 -50
- data/lib/active_record/relation/calculations.rb +203 -194
- data/lib/active_record/relation/delegation.rb +103 -25
- data/lib/active_record/relation/finder_methods.rb +457 -261
- data/lib/active_record/relation/from_clause.rb +32 -0
- data/lib/active_record/relation/merger.rb +167 -0
- data/lib/active_record/relation/predicate_builder/array_handler.rb +43 -0
- data/lib/active_record/relation/predicate_builder/association_query_handler.rb +88 -0
- data/lib/active_record/relation/predicate_builder/base_handler.rb +17 -0
- data/lib/active_record/relation/predicate_builder/basic_object_handler.rb +17 -0
- data/lib/active_record/relation/predicate_builder/class_handler.rb +27 -0
- data/lib/active_record/relation/predicate_builder/polymorphic_array_handler.rb +57 -0
- data/lib/active_record/relation/predicate_builder/range_handler.rb +33 -0
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +13 -0
- data/lib/active_record/relation/predicate_builder.rb +153 -48
- data/lib/active_record/relation/query_attribute.rb +19 -0
- data/lib/active_record/relation/query_methods.rb +1019 -194
- data/lib/active_record/relation/record_fetch_warning.rb +49 -0
- data/lib/active_record/relation/spawn_methods.rb +46 -150
- data/lib/active_record/relation/where_clause.rb +174 -0
- data/lib/active_record/relation/where_clause_factory.rb +38 -0
- data/lib/active_record/relation.rb +450 -245
- data/lib/active_record/result.rb +104 -12
- data/lib/active_record/runtime_registry.rb +22 -0
- data/lib/active_record/sanitization.rb +120 -94
- data/lib/active_record/schema.rb +28 -18
- data/lib/active_record/schema_dumper.rb +141 -74
- data/lib/active_record/schema_migration.rb +50 -0
- data/lib/active_record/scoping/default.rb +64 -57
- data/lib/active_record/scoping/named.rb +93 -108
- data/lib/active_record/scoping.rb +73 -121
- data/lib/active_record/secure_token.rb +38 -0
- data/lib/active_record/serialization.rb +7 -5
- data/lib/active_record/statement_cache.rb +113 -0
- data/lib/active_record/store.rb +173 -15
- data/lib/active_record/suppressor.rb +58 -0
- data/lib/active_record/table_metadata.rb +68 -0
- data/lib/active_record/tasks/database_tasks.rb +313 -0
- data/lib/active_record/tasks/mysql_database_tasks.rb +151 -0
- data/lib/active_record/tasks/postgresql_database_tasks.rb +110 -0
- data/lib/active_record/tasks/sqlite_database_tasks.rb +59 -0
- data/lib/active_record/timestamp.rb +42 -24
- data/lib/active_record/touch_later.rb +58 -0
- data/lib/active_record/transactions.rb +233 -105
- data/lib/active_record/type/adapter_specific_registry.rb +130 -0
- data/lib/active_record/type/date.rb +7 -0
- data/lib/active_record/type/date_time.rb +7 -0
- data/lib/active_record/type/hash_lookup_type_map.rb +23 -0
- data/lib/active_record/type/internal/abstract_json.rb +29 -0
- data/lib/active_record/type/internal/timezone.rb +15 -0
- data/lib/active_record/type/serialized.rb +63 -0
- data/lib/active_record/type/time.rb +20 -0
- data/lib/active_record/type/type_map.rb +64 -0
- data/lib/active_record/type.rb +72 -0
- data/lib/active_record/type_caster/connection.rb +29 -0
- data/lib/active_record/type_caster/map.rb +19 -0
- data/lib/active_record/type_caster.rb +7 -0
- data/lib/active_record/validations/absence.rb +23 -0
- data/lib/active_record/validations/associated.rb +33 -18
- data/lib/active_record/validations/length.rb +24 -0
- data/lib/active_record/validations/presence.rb +66 -0
- data/lib/active_record/validations/uniqueness.rb +128 -68
- data/lib/active_record/validations.rb +48 -40
- data/lib/active_record/version.rb +5 -7
- data/lib/active_record.rb +71 -47
- data/lib/rails/generators/active_record/migration/migration_generator.rb +56 -8
- data/lib/rails/generators/active_record/migration/templates/create_table_migration.rb +24 -0
- data/lib/rails/generators/active_record/migration/templates/migration.rb +28 -16
- data/lib/rails/generators/active_record/migration.rb +18 -8
- data/lib/rails/generators/active_record/model/model_generator.rb +38 -16
- data/lib/rails/generators/active_record/model/templates/application_record.rb +5 -0
- data/lib/rails/generators/active_record/model/templates/model.rb +7 -6
- data/lib/rails/generators/active_record/model/templates/module.rb +1 -1
- data/lib/rails/generators/active_record.rb +3 -11
- metadata +188 -134
- data/examples/associations.png +0 -0
- data/lib/active_record/associations/has_and_belongs_to_many_association.rb +0 -63
- data/lib/active_record/associations/join_helper.rb +0 -55
- data/lib/active_record/associations/preloader/has_and_belongs_to_many.rb +0 -60
- data/lib/active_record/attribute_methods/deprecated_underscore_read.rb +0 -32
- data/lib/active_record/connection_adapters/abstract/connection_specification.rb +0 -191
- data/lib/active_record/connection_adapters/mysql_adapter.rb +0 -441
- data/lib/active_record/connection_adapters/sqlite_adapter.rb +0 -583
- data/lib/active_record/dynamic_finder_match.rb +0 -68
- data/lib/active_record/dynamic_scope_match.rb +0 -23
- data/lib/active_record/fixtures/file.rb +0 -65
- data/lib/active_record/identity_map.rb +0 -162
- data/lib/active_record/observer.rb +0 -121
- data/lib/active_record/serializers/xml_serializer.rb +0 -203
- data/lib/active_record/session_store.rb +0 -360
- data/lib/active_record/test_case.rb +0 -73
- data/lib/rails/generators/active_record/model/templates/migration.rb +0 -15
- data/lib/rails/generators/active_record/observer/observer_generator.rb +0 -15
- data/lib/rails/generators/active_record/observer/templates/observer.rb +0 -4
- data/lib/rails/generators/active_record/session_migration/session_migration_generator.rb +0 -25
- data/lib/rails/generators/active_record/session_migration/templates/migration.rb +0 -12
@@ -1,57 +1,131 @@
|
|
1
|
-
module ActiveRecord::Associations::Builder
|
2
|
-
class HasAndBelongsToMany
|
3
|
-
|
1
|
+
module ActiveRecord::Associations::Builder # :nodoc:
|
2
|
+
class HasAndBelongsToMany # :nodoc:
|
3
|
+
class JoinTableResolver # :nodoc:
|
4
|
+
KnownTable = Struct.new :join_table
|
4
5
|
|
5
|
-
|
6
|
+
class KnownClass # :nodoc:
|
7
|
+
def initialize(lhs_class, rhs_class_name)
|
8
|
+
@lhs_class = lhs_class
|
9
|
+
@rhs_class_name = rhs_class_name
|
10
|
+
@join_table = nil
|
11
|
+
end
|
6
12
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
define_destroy_hook
|
11
|
-
reflection
|
12
|
-
end
|
13
|
+
def join_table
|
14
|
+
@join_table ||= [@lhs_class.table_name, klass.table_name].sort.join("\0").gsub(/^(.*[._])(.+)\0\1(.+)/, '\1\2_\3').tr("\0", "_")
|
15
|
+
end
|
13
16
|
|
14
|
-
|
17
|
+
private
|
15
18
|
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
20
|
-
def destroy_associations
|
21
|
-
association(#{name.to_sym.inspect}).delete_all_on_destroy
|
22
|
-
super
|
23
|
-
end
|
24
|
-
RUBY
|
25
|
-
})
|
19
|
+
def klass
|
20
|
+
@lhs_class.send(:compute_type, @rhs_class_name)
|
21
|
+
end
|
26
22
|
end
|
27
23
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
24
|
+
def self.build(lhs_class, name, options)
|
25
|
+
if options[:join_table]
|
26
|
+
KnownTable.new options[:join_table].to_s
|
27
|
+
else
|
28
|
+
class_name = options.fetch(:class_name) {
|
29
|
+
name.to_s.camelize.singularize
|
30
|
+
}
|
31
|
+
KnownClass.new lhs_class, class_name
|
34
32
|
end
|
35
|
-
|
36
|
-
reflection.options[:join_table] ||= join_table_name(
|
37
|
-
model.send(:undecorated_table_name, model.to_s),
|
38
|
-
model.send(:undecorated_table_name, reflection.class_name)
|
39
|
-
)
|
40
33
|
end
|
34
|
+
end
|
41
35
|
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
36
|
+
attr_reader :lhs_model, :association_name, :options
|
37
|
+
|
38
|
+
def initialize(association_name, lhs_model, options)
|
39
|
+
@association_name = association_name
|
40
|
+
@lhs_model = lhs_model
|
41
|
+
@options = options
|
42
|
+
end
|
43
|
+
|
44
|
+
def through_model
|
45
|
+
habtm = JoinTableResolver.build lhs_model, association_name, options
|
46
|
+
|
47
|
+
join_model = Class.new(ActiveRecord::Base) {
|
48
|
+
class << self;
|
49
|
+
attr_accessor :left_model
|
50
|
+
attr_accessor :name
|
51
|
+
attr_accessor :table_name_resolver
|
52
|
+
attr_accessor :left_reflection
|
53
|
+
attr_accessor :right_reflection
|
54
|
+
end
|
55
|
+
|
56
|
+
def self.table_name
|
57
|
+
table_name_resolver.join_table
|
58
|
+
end
|
59
|
+
|
60
|
+
def self.compute_type(class_name)
|
61
|
+
left_model.compute_type class_name
|
62
|
+
end
|
63
|
+
|
64
|
+
def self.add_left_association(name, options)
|
65
|
+
belongs_to name, required: false, **options
|
66
|
+
self.left_reflection = _reflect_on_association(name)
|
67
|
+
end
|
68
|
+
|
69
|
+
def self.add_right_association(name, options)
|
70
|
+
rhs_name = name.to_s.singularize.to_sym
|
71
|
+
belongs_to rhs_name, required: false, **options
|
72
|
+
self.right_reflection = _reflect_on_association(rhs_name)
|
52
73
|
end
|
53
74
|
|
54
|
-
|
75
|
+
def self.retrieve_connection
|
76
|
+
left_model.retrieve_connection
|
77
|
+
end
|
78
|
+
|
79
|
+
def self.primary_key
|
80
|
+
false
|
81
|
+
end
|
82
|
+
}
|
83
|
+
|
84
|
+
join_model.name = "HABTM_#{association_name.to_s.camelize}"
|
85
|
+
join_model.table_name_resolver = habtm
|
86
|
+
join_model.left_model = lhs_model
|
87
|
+
|
88
|
+
join_model.add_left_association :left_side, anonymous_class: lhs_model
|
89
|
+
join_model.add_right_association association_name, belongs_to_options(options)
|
90
|
+
join_model
|
91
|
+
end
|
92
|
+
|
93
|
+
def middle_reflection(join_model)
|
94
|
+
middle_name = [lhs_model.name.downcase.pluralize,
|
95
|
+
association_name].join('_'.freeze).gsub('::'.freeze, '_'.freeze).to_sym
|
96
|
+
middle_options = middle_options join_model
|
97
|
+
|
98
|
+
HasMany.create_reflection(lhs_model,
|
99
|
+
middle_name,
|
100
|
+
nil,
|
101
|
+
middle_options)
|
102
|
+
end
|
103
|
+
|
104
|
+
private
|
105
|
+
|
106
|
+
def middle_options(join_model)
|
107
|
+
middle_options = {}
|
108
|
+
middle_options[:class_name] = "#{lhs_model.name}::#{join_model.name}"
|
109
|
+
middle_options[:source] = join_model.left_reflection.name
|
110
|
+
if options.key? :foreign_key
|
111
|
+
middle_options[:foreign_key] = options[:foreign_key]
|
112
|
+
end
|
113
|
+
middle_options
|
114
|
+
end
|
115
|
+
|
116
|
+
def belongs_to_options(options)
|
117
|
+
rhs_options = {}
|
118
|
+
|
119
|
+
if options.key? :class_name
|
120
|
+
rhs_options[:foreign_key] = options[:class_name].to_s.foreign_key
|
121
|
+
rhs_options[:class_name] = options[:class_name]
|
122
|
+
end
|
123
|
+
|
124
|
+
if options.key? :association_foreign_key
|
125
|
+
rhs_options[:foreign_key] = options[:association_foreign_key]
|
55
126
|
end
|
127
|
+
|
128
|
+
rhs_options
|
129
|
+
end
|
56
130
|
end
|
57
131
|
end
|
@@ -1,71 +1,15 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
module ActiveRecord::Associations::Builder
|
1
|
+
module ActiveRecord::Associations::Builder # :nodoc:
|
4
2
|
class HasMany < CollectionAssociation #:nodoc:
|
5
|
-
self.macro
|
6
|
-
|
7
|
-
self.valid_options += [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of]
|
8
|
-
|
9
|
-
def build
|
10
|
-
reflection = super
|
11
|
-
configure_dependency
|
12
|
-
reflection
|
3
|
+
def self.macro
|
4
|
+
:has_many
|
13
5
|
end
|
14
6
|
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
if options[:dependent]
|
19
|
-
unless options[:dependent].in?([:destroy, :delete_all, :nullify, :restrict])
|
20
|
-
raise ArgumentError, "The :dependent option expects either :destroy, :delete_all, " \
|
21
|
-
":nullify or :restrict (#{options[:dependent].inspect})"
|
22
|
-
end
|
23
|
-
|
24
|
-
send("define_#{options[:dependent]}_dependency_method")
|
25
|
-
model.before_destroy dependency_method_name
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
def define_destroy_dependency_method
|
30
|
-
name = self.name
|
31
|
-
mixin.redefine_method(dependency_method_name) do
|
32
|
-
send(name).each do |o|
|
33
|
-
# No point in executing the counter update since we're going to destroy the parent anyway
|
34
|
-
counter_method = ('belongs_to_counter_cache_before_destroy_for_' + self.class.name.downcase).to_sym
|
35
|
-
if o.respond_to?(counter_method)
|
36
|
-
class << o
|
37
|
-
self
|
38
|
-
end.send(:define_method, counter_method, Proc.new {})
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
send(name).delete_all
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
def define_delete_all_dependency_method
|
47
|
-
name = self.name
|
48
|
-
mixin.redefine_method(dependency_method_name) do
|
49
|
-
association(name).delete_all_on_destroy
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
def define_nullify_dependency_method
|
54
|
-
name = self.name
|
55
|
-
mixin.redefine_method(dependency_method_name) do
|
56
|
-
send(name).delete_all
|
57
|
-
end
|
58
|
-
end
|
59
|
-
|
60
|
-
def define_restrict_dependency_method
|
61
|
-
name = self.name
|
62
|
-
mixin.redefine_method(dependency_method_name) do
|
63
|
-
raise ActiveRecord::DeleteRestrictionError.new(name) unless send(name).empty?
|
64
|
-
end
|
65
|
-
end
|
7
|
+
def self.valid_options(options)
|
8
|
+
super + [:primary_key, :dependent, :as, :through, :source, :source_type, :inverse_of, :counter_cache, :join_table, :foreign_type, :index_errors]
|
9
|
+
end
|
66
10
|
|
67
|
-
|
68
|
-
|
69
|
-
|
11
|
+
def self.valid_dependent_options
|
12
|
+
[:destroy, :delete_all, :nullify, :restrict_with_error, :restrict_with_exception]
|
13
|
+
end
|
70
14
|
end
|
71
15
|
end
|
@@ -1,62 +1,28 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
module ActiveRecord::Associations::Builder
|
1
|
+
module ActiveRecord::Associations::Builder # :nodoc:
|
4
2
|
class HasOne < SingularAssociation #:nodoc:
|
5
|
-
self.macro
|
6
|
-
|
7
|
-
self.valid_options += [:order, :as]
|
8
|
-
|
9
|
-
class_attribute :through_options
|
10
|
-
self.through_options = [:through, :source, :source_type]
|
11
|
-
|
12
|
-
def constructable?
|
13
|
-
!options[:through]
|
3
|
+
def self.macro
|
4
|
+
:has_one
|
14
5
|
end
|
15
6
|
|
16
|
-
def
|
17
|
-
|
18
|
-
|
19
|
-
|
7
|
+
def self.valid_options(options)
|
8
|
+
valid = super + [:as]
|
9
|
+
valid += [:through, :source, :source_type] if options[:through]
|
10
|
+
valid
|
20
11
|
end
|
21
12
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
valid_options = self.class.valid_options
|
26
|
-
valid_options += self.class.through_options if options[:through]
|
27
|
-
options.assert_valid_keys(valid_options)
|
28
|
-
end
|
29
|
-
|
30
|
-
def configure_dependency
|
31
|
-
if options[:dependent]
|
32
|
-
unless options[:dependent].in?([:destroy, :delete, :nullify, :restrict])
|
33
|
-
raise ArgumentError, "The :dependent option expects either :destroy, :delete, " \
|
34
|
-
":nullify or :restrict (#{options[:dependent].inspect})"
|
35
|
-
end
|
36
|
-
|
37
|
-
send("define_#{options[:dependent]}_dependency_method")
|
38
|
-
model.before_destroy dependency_method_name
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
def dependency_method_name
|
43
|
-
"has_one_dependent_#{options[:dependent]}_for_#{name}"
|
44
|
-
end
|
13
|
+
def self.valid_dependent_options
|
14
|
+
[:destroy, :delete, :nullify, :restrict_with_error, :restrict_with_exception]
|
15
|
+
end
|
45
16
|
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
association(name).delete
|
50
|
-
end
|
51
|
-
end
|
52
|
-
alias :define_delete_dependency_method :define_destroy_dependency_method
|
53
|
-
alias :define_nullify_dependency_method :define_destroy_dependency_method
|
17
|
+
def self.add_destroy_callbacks(model, reflection)
|
18
|
+
super unless reflection.options[:through]
|
19
|
+
end
|
54
20
|
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
end
|
21
|
+
def self.define_validations(model, reflection)
|
22
|
+
super
|
23
|
+
if reflection.options[:required]
|
24
|
+
model.validates_presence_of reflection.name, message: :required
|
60
25
|
end
|
26
|
+
end
|
61
27
|
end
|
62
28
|
end
|
@@ -1,32 +1,31 @@
|
|
1
|
-
|
2
|
-
class SingularAssociation < Association #:nodoc:
|
3
|
-
self.valid_options += [:remote, :dependent, :counter_cache, :primary_key, :inverse_of]
|
1
|
+
# This class is inherited by the has_one and belongs_to association classes
|
4
2
|
|
5
|
-
|
6
|
-
|
3
|
+
module ActiveRecord::Associations::Builder # :nodoc:
|
4
|
+
class SingularAssociation < Association #:nodoc:
|
5
|
+
def self.valid_options(options)
|
6
|
+
super + [:foreign_type, :dependent, :primary_key, :inverse_of, :required]
|
7
7
|
end
|
8
8
|
|
9
|
-
def define_accessors
|
9
|
+
def self.define_accessors(model, reflection)
|
10
10
|
super
|
11
|
-
define_constructors if constructable?
|
11
|
+
define_constructors(model.generated_association_methods, reflection.name) if reflection.constructable?
|
12
12
|
end
|
13
13
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
name
|
18
|
-
|
19
|
-
mixin.redefine_method("build_#{name}") do |*params, &block|
|
20
|
-
association(name).build(*params, &block)
|
14
|
+
# Defines the (build|create)_association methods for belongs_to or has_one association
|
15
|
+
def self.define_constructors(mixin, name)
|
16
|
+
mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
|
17
|
+
def build_#{name}(*args, &block)
|
18
|
+
association(:#{name}).build(*args, &block)
|
21
19
|
end
|
22
20
|
|
23
|
-
|
24
|
-
association(name).create(*
|
21
|
+
def create_#{name}(*args, &block)
|
22
|
+
association(:#{name}).create(*args, &block)
|
25
23
|
end
|
26
24
|
|
27
|
-
|
28
|
-
association(name).create!(*
|
25
|
+
def create_#{name}!(*args, &block)
|
26
|
+
association(:#{name}).create!(*args, &block)
|
29
27
|
end
|
30
|
-
|
28
|
+
CODE
|
29
|
+
end
|
31
30
|
end
|
32
31
|
end
|