activerecord 3.2.22.5 → 4.2.11.3
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 +5 -5
- data/CHANGELOG.md +1632 -609
- data/MIT-LICENSE +1 -1
- data/README.rdoc +37 -41
- data/examples/performance.rb +31 -19
- data/examples/simple.rb +4 -4
- data/lib/active_record/aggregations.rb +56 -42
- data/lib/active_record/association_relation.rb +35 -0
- data/lib/active_record/associations/alias_tracker.rb +47 -36
- data/lib/active_record/associations/association.rb +73 -55
- data/lib/active_record/associations/association_scope.rb +143 -82
- data/lib/active_record/associations/belongs_to_association.rb +65 -25
- data/lib/active_record/associations/belongs_to_polymorphic_association.rb +7 -2
- data/lib/active_record/associations/builder/association.rb +125 -31
- data/lib/active_record/associations/builder/belongs_to.rb +89 -61
- data/lib/active_record/associations/builder/collection_association.rb +69 -49
- data/lib/active_record/associations/builder/has_and_belongs_to_many.rb +113 -42
- data/lib/active_record/associations/builder/has_many.rb +8 -64
- data/lib/active_record/associations/builder/has_one.rb +12 -51
- data/lib/active_record/associations/builder/singular_association.rb +23 -17
- data/lib/active_record/associations/collection_association.rb +251 -177
- data/lib/active_record/associations/collection_proxy.rb +963 -63
- data/lib/active_record/associations/foreign_association.rb +11 -0
- data/lib/active_record/associations/has_many_association.rb +113 -22
- data/lib/active_record/associations/has_many_through_association.rb +99 -39
- data/lib/active_record/associations/has_one_association.rb +43 -20
- data/lib/active_record/associations/has_one_through_association.rb +1 -1
- data/lib/active_record/associations/join_dependency/join_association.rb +76 -107
- 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 +230 -156
- data/lib/active_record/associations/preloader/association.rb +96 -55
- data/lib/active_record/associations/preloader/collection_association.rb +3 -3
- data/lib/active_record/associations/preloader/has_many_through.rb +7 -3
- data/lib/active_record/associations/preloader/has_one.rb +1 -1
- data/lib/active_record/associations/preloader/singular_association.rb +3 -3
- data/lib/active_record/associations/preloader/through_association.rb +62 -33
- data/lib/active_record/associations/preloader.rb +101 -79
- data/lib/active_record/associations/singular_association.rb +29 -13
- data/lib/active_record/associations/through_association.rb +30 -16
- data/lib/active_record/associations.rb +463 -345
- data/lib/active_record/attribute.rb +163 -0
- data/lib/active_record/attribute_assignment.rb +142 -151
- data/lib/active_record/attribute_decorators.rb +66 -0
- data/lib/active_record/attribute_methods/before_type_cast.rb +52 -7
- data/lib/active_record/attribute_methods/dirty.rb +137 -57
- data/lib/active_record/attribute_methods/primary_key.rb +50 -36
- data/lib/active_record/attribute_methods/query.rb +5 -4
- data/lib/active_record/attribute_methods/read.rb +73 -106
- data/lib/active_record/attribute_methods/serialization.rb +44 -94
- data/lib/active_record/attribute_methods/time_zone_conversion.rb +49 -45
- data/lib/active_record/attribute_methods/write.rb +57 -44
- data/lib/active_record/attribute_methods.rb +301 -141
- data/lib/active_record/attribute_set/builder.rb +106 -0
- data/lib/active_record/attribute_set.rb +81 -0
- data/lib/active_record/attributes.rb +147 -0
- data/lib/active_record/autosave_association.rb +246 -217
- data/lib/active_record/base.rb +70 -474
- data/lib/active_record/callbacks.rb +66 -28
- data/lib/active_record/coders/json.rb +13 -0
- data/lib/active_record/coders/yaml_column.rb +18 -21
- data/lib/active_record/connection_adapters/abstract/connection_pool.rb +396 -219
- data/lib/active_record/connection_adapters/abstract/database_limits.rb +9 -0
- data/lib/active_record/connection_adapters/abstract/database_statements.rb +167 -164
- data/lib/active_record/connection_adapters/abstract/query_cache.rb +29 -24
- data/lib/active_record/connection_adapters/abstract/quoting.rb +74 -55
- data/lib/active_record/connection_adapters/abstract/savepoints.rb +21 -0
- data/lib/active_record/connection_adapters/abstract/schema_creation.rb +125 -0
- data/lib/active_record/connection_adapters/abstract/schema_definitions.rb +261 -169
- data/lib/active_record/connection_adapters/abstract/schema_dumper.rb +50 -0
- data/lib/active_record/connection_adapters/abstract/schema_statements.rb +707 -259
- data/lib/active_record/connection_adapters/abstract/transaction.rb +215 -0
- data/lib/active_record/connection_adapters/abstract_adapter.rb +298 -89
- data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +466 -196
- data/lib/active_record/connection_adapters/column.rb +31 -245
- data/lib/active_record/connection_adapters/connection_specification.rb +275 -0
- data/lib/active_record/connection_adapters/mysql2_adapter.rb +45 -57
- data/lib/active_record/connection_adapters/mysql_adapter.rb +180 -123
- data/lib/active_record/connection_adapters/postgresql/array_parser.rb +93 -0
- data/lib/active_record/connection_adapters/postgresql/column.rb +20 -0
- data/lib/active_record/connection_adapters/postgresql/database_statements.rb +232 -0
- data/lib/active_record/connection_adapters/postgresql/oid/array.rb +100 -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 +46 -0
- data/lib/active_record/connection_adapters/postgresql/oid/date.rb +11 -0
- data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb +36 -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/float.rb +21 -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/infinity.rb +13 -0
- data/lib/active_record/connection_adapters/postgresql/oid/integer.rb +11 -0
- data/lib/active_record/connection_adapters/postgresql/oid/json.rb +35 -0
- data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb +23 -0
- data/lib/active_record/connection_adapters/postgresql/oid/money.rb +43 -0
- data/lib/active_record/connection_adapters/postgresql/oid/point.rb +43 -0
- data/lib/active_record/connection_adapters/postgresql/oid/range.rb +79 -0
- data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb +19 -0
- data/lib/active_record/connection_adapters/postgresql/oid/time.rb +11 -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 +36 -0
- data/lib/active_record/connection_adapters/postgresql/quoting.rb +108 -0
- data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb +30 -0
- data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb +152 -0
- data/lib/active_record/connection_adapters/postgresql/schema_statements.rb +596 -0
- data/lib/active_record/connection_adapters/postgresql/utils.rb +77 -0
- data/lib/active_record/connection_adapters/postgresql_adapter.rb +430 -999
- data/lib/active_record/connection_adapters/schema_cache.rb +52 -27
- data/lib/active_record/connection_adapters/sqlite3_adapter.rb +579 -22
- data/lib/active_record/connection_handling.rb +132 -0
- data/lib/active_record/core.rb +579 -0
- data/lib/active_record/counter_cache.rb +157 -105
- data/lib/active_record/dynamic_matchers.rb +119 -63
- data/lib/active_record/enum.rb +197 -0
- data/lib/active_record/errors.rb +94 -36
- data/lib/active_record/explain.rb +15 -63
- data/lib/active_record/explain_registry.rb +30 -0
- data/lib/active_record/explain_subscriber.rb +9 -5
- data/lib/active_record/fixture_set/file.rb +56 -0
- data/lib/active_record/fixtures.rb +302 -215
- data/lib/active_record/gem_version.rb +15 -0
- data/lib/active_record/inheritance.rb +143 -70
- data/lib/active_record/integration.rb +65 -12
- data/lib/active_record/legacy_yaml_adapter.rb +30 -0
- data/lib/active_record/locale/en.yml +8 -1
- data/lib/active_record/locking/optimistic.rb +73 -52
- data/lib/active_record/locking/pessimistic.rb +5 -5
- data/lib/active_record/log_subscriber.rb +24 -21
- data/lib/active_record/migration/command_recorder.rb +124 -32
- data/lib/active_record/migration/join_table.rb +15 -0
- data/lib/active_record/migration.rb +511 -213
- data/lib/active_record/model_schema.rb +91 -117
- data/lib/active_record/nested_attributes.rb +184 -130
- data/lib/active_record/no_touching.rb +52 -0
- data/lib/active_record/null_relation.rb +81 -0
- data/lib/active_record/persistence.rb +276 -117
- data/lib/active_record/query_cache.rb +19 -37
- data/lib/active_record/querying.rb +28 -18
- data/lib/active_record/railtie.rb +73 -40
- data/lib/active_record/railties/console_sandbox.rb +3 -4
- data/lib/active_record/railties/controller_runtime.rb +4 -3
- data/lib/active_record/railties/databases.rake +141 -416
- data/lib/active_record/railties/jdbcmysql_error.rb +1 -1
- data/lib/active_record/readonly_attributes.rb +1 -4
- data/lib/active_record/reflection.rb +513 -154
- data/lib/active_record/relation/batches.rb +91 -43
- data/lib/active_record/relation/calculations.rb +199 -161
- data/lib/active_record/relation/delegation.rb +116 -25
- data/lib/active_record/relation/finder_methods.rb +362 -248
- data/lib/active_record/relation/merger.rb +193 -0
- data/lib/active_record/relation/predicate_builder/array_handler.rb +48 -0
- data/lib/active_record/relation/predicate_builder/relation_handler.rb +13 -0
- data/lib/active_record/relation/predicate_builder.rb +135 -43
- data/lib/active_record/relation/query_methods.rb +928 -167
- data/lib/active_record/relation/spawn_methods.rb +48 -149
- data/lib/active_record/relation.rb +352 -207
- data/lib/active_record/result.rb +101 -10
- data/lib/active_record/runtime_registry.rb +22 -0
- data/lib/active_record/sanitization.rb +56 -59
- data/lib/active_record/schema.rb +19 -13
- data/lib/active_record/schema_dumper.rb +106 -63
- data/lib/active_record/schema_migration.rb +53 -0
- data/lib/active_record/scoping/default.rb +50 -57
- data/lib/active_record/scoping/named.rb +73 -109
- data/lib/active_record/scoping.rb +58 -123
- data/lib/active_record/serialization.rb +6 -2
- data/lib/active_record/serializers/xml_serializer.rb +12 -22
- data/lib/active_record/statement_cache.rb +111 -0
- data/lib/active_record/store.rb +168 -15
- data/lib/active_record/tasks/database_tasks.rb +299 -0
- data/lib/active_record/tasks/mysql_database_tasks.rb +159 -0
- data/lib/active_record/tasks/postgresql_database_tasks.rb +101 -0
- data/lib/active_record/tasks/sqlite_database_tasks.rb +55 -0
- data/lib/active_record/timestamp.rb +23 -16
- data/lib/active_record/transactions.rb +125 -79
- data/lib/active_record/type/big_integer.rb +13 -0
- data/lib/active_record/type/binary.rb +50 -0
- data/lib/active_record/type/boolean.rb +31 -0
- data/lib/active_record/type/date.rb +50 -0
- data/lib/active_record/type/date_time.rb +54 -0
- data/lib/active_record/type/decimal.rb +64 -0
- data/lib/active_record/type/decimal_without_scale.rb +11 -0
- data/lib/active_record/type/decorator.rb +14 -0
- data/lib/active_record/type/float.rb +19 -0
- data/lib/active_record/type/hash_lookup_type_map.rb +23 -0
- data/lib/active_record/type/integer.rb +59 -0
- data/lib/active_record/type/mutable.rb +16 -0
- data/lib/active_record/type/numeric.rb +36 -0
- data/lib/active_record/type/serialized.rb +62 -0
- data/lib/active_record/type/string.rb +40 -0
- data/lib/active_record/type/text.rb +11 -0
- data/lib/active_record/type/time.rb +26 -0
- data/lib/active_record/type/time_value.rb +38 -0
- data/lib/active_record/type/type_map.rb +64 -0
- data/lib/active_record/type/unsigned_integer.rb +15 -0
- data/lib/active_record/type/value.rb +110 -0
- data/lib/active_record/type.rb +23 -0
- data/lib/active_record/validations/associated.rb +24 -16
- data/lib/active_record/validations/presence.rb +67 -0
- data/lib/active_record/validations/uniqueness.rb +123 -64
- data/lib/active_record/validations.rb +36 -29
- data/lib/active_record/version.rb +5 -7
- data/lib/active_record.rb +66 -46
- data/lib/rails/generators/active_record/migration/migration_generator.rb +53 -8
- data/lib/rails/generators/active_record/{model/templates/migration.rb → migration/templates/create_table_migration.rb} +5 -1
- data/lib/rails/generators/active_record/migration/templates/migration.rb +20 -15
- data/lib/rails/generators/active_record/migration.rb +11 -8
- data/lib/rails/generators/active_record/model/model_generator.rb +9 -4
- data/lib/rails/generators/active_record/model/templates/model.rb +4 -6
- data/lib/rails/generators/active_record/model/templates/module.rb +1 -1
- data/lib/rails/generators/active_record.rb +3 -11
- metadata +101 -45
- 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/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/session_store.rb +0 -360
- data/lib/active_record/test_case.rb +0 -73
- 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,118 +1,68 @@
|
|
1
|
+
require 'active_support/core_ext/string/filters'
|
2
|
+
|
1
3
|
module ActiveRecord
|
2
4
|
module AttributeMethods
|
3
5
|
module Serialization
|
4
6
|
extend ActiveSupport::Concern
|
5
7
|
|
6
|
-
included do
|
7
|
-
# Returns a hash of all the attributes that have been specified for serialization as
|
8
|
-
# keys and their class restriction as values.
|
9
|
-
class_attribute :serialized_attributes
|
10
|
-
self.serialized_attributes = {}
|
11
|
-
end
|
12
|
-
|
13
|
-
class Attribute < Struct.new(:coder, :value, :state)
|
14
|
-
def unserialized_value
|
15
|
-
state == :serialized ? unserialize : value
|
16
|
-
end
|
17
|
-
|
18
|
-
def serialized_value
|
19
|
-
state == :unserialized ? serialize : value
|
20
|
-
end
|
21
|
-
|
22
|
-
def unserialize
|
23
|
-
self.state = :unserialized
|
24
|
-
self.value = coder.load(value)
|
25
|
-
end
|
26
|
-
|
27
|
-
def serialize
|
28
|
-
self.state = :serialized
|
29
|
-
self.value = coder.dump(value)
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
8
|
module ClassMethods
|
34
|
-
# If you have an attribute that needs to be saved to the database as an
|
35
|
-
#
|
36
|
-
#
|
37
|
-
#
|
9
|
+
# If you have an attribute that needs to be saved to the database as an
|
10
|
+
# object, and retrieved as the same object, then specify the name of that
|
11
|
+
# attribute using this method and it will be handled automatically. The
|
12
|
+
# serialization is done through YAML. If +class_name+ is specified, the
|
13
|
+
# serialized object must be of that class on assignment and retrieval.
|
14
|
+
# Otherwise <tt>SerializationTypeMismatch</tt> will be raised.
|
38
15
|
#
|
39
16
|
# ==== Parameters
|
40
17
|
#
|
41
18
|
# * +attr_name+ - The field name that should be serialized.
|
42
|
-
# * +
|
19
|
+
# * +class_name_or_coder+ - Optional, a coder object, which responds to `.load` / `.dump`
|
20
|
+
# or a class name that the object type should be equal to.
|
43
21
|
#
|
44
22
|
# ==== Example
|
45
|
-
#
|
23
|
+
#
|
24
|
+
# # Serialize a preferences attribute.
|
46
25
|
# class User < ActiveRecord::Base
|
47
26
|
# serialize :preferences
|
48
27
|
# end
|
49
|
-
|
50
|
-
|
51
|
-
|
28
|
+
#
|
29
|
+
# # Serialize preferences using JSON as coder.
|
30
|
+
# class User < ActiveRecord::Base
|
31
|
+
# serialize :preferences, JSON
|
32
|
+
# end
|
33
|
+
#
|
34
|
+
# # Serialize preferences as Hash using YAML coder.
|
35
|
+
# class User < ActiveRecord::Base
|
36
|
+
# serialize :preferences, Hash
|
37
|
+
# end
|
38
|
+
def serialize(attr_name, class_name_or_coder = Object)
|
39
|
+
# When ::JSON is used, force it to go through the Active Support JSON encoder
|
40
|
+
# to ensure special objects (e.g. Active Record models) are dumped correctly
|
41
|
+
# using the #as_json hook.
|
42
|
+
coder = if class_name_or_coder == ::JSON
|
43
|
+
Coders::JSON
|
44
|
+
elsif [:load, :dump].all? { |x| class_name_or_coder.respond_to?(x) }
|
45
|
+
class_name_or_coder
|
52
46
|
else
|
53
|
-
Coders::YAMLColumn.new(
|
47
|
+
Coders::YAMLColumn.new(class_name_or_coder)
|
54
48
|
end
|
55
49
|
|
56
|
-
|
57
|
-
|
58
|
-
self.serialized_attributes = serialized_attributes.merge(attr_name.to_s => coder)
|
59
|
-
end
|
60
|
-
|
61
|
-
def initialize_attributes(attributes, options = {}) #:nodoc:
|
62
|
-
serialized = (options.delete(:serialized) { true }) ? :serialized : :unserialized
|
63
|
-
super(attributes, options)
|
64
|
-
|
65
|
-
serialized_attributes.each do |key, coder|
|
66
|
-
if attributes.key?(key)
|
67
|
-
attributes[key] = Attribute.new(coder, attributes[key], serialized)
|
68
|
-
end
|
69
|
-
end
|
70
|
-
|
71
|
-
attributes
|
72
|
-
end
|
73
|
-
|
74
|
-
private
|
75
|
-
|
76
|
-
def attribute_cast_code(attr_name)
|
77
|
-
if serialized_attributes.include?(attr_name)
|
78
|
-
"v.unserialized_value"
|
79
|
-
else
|
80
|
-
super
|
50
|
+
decorate_attribute_type(attr_name, :serialize) do |type|
|
51
|
+
Type::Serialized.new(type, coder)
|
81
52
|
end
|
82
53
|
end
|
83
|
-
end
|
84
54
|
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
else
|
97
|
-
super
|
98
|
-
end
|
99
|
-
end
|
100
|
-
|
101
|
-
def read_attribute_before_type_cast(attr_name)
|
102
|
-
if serialized_attributes.include?(attr_name)
|
103
|
-
super.unserialized_value
|
104
|
-
else
|
105
|
-
super
|
106
|
-
end
|
107
|
-
end
|
108
|
-
|
109
|
-
def attributes_before_type_cast
|
110
|
-
super.dup.tap do |attributes|
|
111
|
-
self.class.serialized_attributes.each_key do |key|
|
112
|
-
if attributes.key?(key)
|
113
|
-
attributes[key] = attributes[key].unserialized_value
|
114
|
-
end
|
115
|
-
end
|
55
|
+
def serialized_attributes
|
56
|
+
ActiveSupport::Deprecation.warn(<<-MSG.squish)
|
57
|
+
`serialized_attributes` is deprecated without replacement, and will
|
58
|
+
be removed in Rails 5.0.
|
59
|
+
MSG
|
60
|
+
|
61
|
+
@serialized_attributes ||= Hash[
|
62
|
+
columns.select { |t| t.cast_type.is_a?(Type::Serialized) }.map { |c|
|
63
|
+
[c.name, c.cast_type.coder]
|
64
|
+
}
|
65
|
+
]
|
116
66
|
end
|
117
67
|
end
|
118
68
|
end
|
@@ -1,64 +1,68 @@
|
|
1
|
-
require 'active_support/core_ext/class/attribute'
|
2
|
-
require 'active_support/core_ext/object/inclusion'
|
3
|
-
|
4
1
|
module ActiveRecord
|
5
2
|
module AttributeMethods
|
6
3
|
module TimeZoneConversion
|
4
|
+
class TimeZoneConverter < DelegateClass(Type::Value) # :nodoc:
|
5
|
+
include Type::Decorator
|
6
|
+
|
7
|
+
def type_cast_from_database(value)
|
8
|
+
convert_time_to_time_zone(super)
|
9
|
+
end
|
10
|
+
|
11
|
+
def type_cast_from_user(value)
|
12
|
+
if value.is_a?(Array)
|
13
|
+
value.map { |v| type_cast_from_user(v) }
|
14
|
+
elsif value.respond_to?(:in_time_zone)
|
15
|
+
begin
|
16
|
+
value.in_time_zone || super
|
17
|
+
rescue ArgumentError
|
18
|
+
nil
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
def convert_time_to_time_zone(value)
|
24
|
+
if value.is_a?(Array)
|
25
|
+
value.map { |v| convert_time_to_time_zone(v) }
|
26
|
+
elsif value.acts_like?(:time)
|
27
|
+
value.in_time_zone
|
28
|
+
else
|
29
|
+
value
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
7
34
|
extend ActiveSupport::Concern
|
8
35
|
|
9
36
|
included do
|
10
|
-
|
37
|
+
mattr_accessor :time_zone_aware_attributes, instance_writer: false
|
11
38
|
self.time_zone_aware_attributes = false
|
12
39
|
|
13
|
-
class_attribute :skip_time_zone_conversion_for_attributes, :
|
40
|
+
class_attribute :skip_time_zone_conversion_for_attributes, instance_writer: false
|
14
41
|
self.skip_time_zone_conversion_for_attributes = []
|
15
42
|
end
|
16
43
|
|
17
44
|
module ClassMethods
|
18
|
-
|
19
|
-
# The enhanced read method automatically converts the UTC time stored in the database to the time
|
20
|
-
# zone stored in Time.zone.
|
21
|
-
def attribute_cast_code(attr_name)
|
22
|
-
column = columns_hash[attr_name]
|
23
|
-
|
24
|
-
if create_time_zone_conversion_attribute?(attr_name, column)
|
25
|
-
typecast = "v = #{super}"
|
26
|
-
time_zone_conversion = "v.acts_like?(:time) ? v.in_time_zone : v"
|
27
|
-
|
28
|
-
"((#{typecast}) && (#{time_zone_conversion}))"
|
29
|
-
else
|
30
|
-
super
|
31
|
-
end
|
32
|
-
end
|
45
|
+
private
|
33
46
|
|
34
|
-
|
35
|
-
#
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time
|
44
|
-
end
|
45
|
-
time = time.in_time_zone rescue nil if time
|
46
|
-
previous_time = attribute_changed?("#{attr_name}") ? changed_attributes["#{attr_name}"] : read_attribute(:#{attr_name})
|
47
|
-
write_attribute(:#{attr_name}, original_time)
|
48
|
-
#{attr_name}_will_change! if previous_time != time
|
49
|
-
@attributes_cache["#{attr_name}"] = time
|
50
|
-
end
|
51
|
-
EOV
|
52
|
-
generated_attribute_methods.module_eval(method_body, __FILE__, line)
|
53
|
-
else
|
54
|
-
super
|
47
|
+
def inherited(subclass)
|
48
|
+
# We need to apply this decorator here, rather than on module inclusion. The closure
|
49
|
+
# created by the matcher would otherwise evaluate for `ActiveRecord::Base`, not the
|
50
|
+
# sub class being decorated. As such, changes to `time_zone_aware_attributes`, or
|
51
|
+
# `skip_time_zone_conversion_for_attributes` would not be picked up.
|
52
|
+
subclass.class_eval do
|
53
|
+
matcher = ->(name, type) { create_time_zone_conversion_attribute?(name, type) }
|
54
|
+
decorate_matching_attribute_types(matcher, :_time_zone_conversion) do |type|
|
55
|
+
TimeZoneConverter.new(type)
|
55
56
|
end
|
56
57
|
end
|
58
|
+
super
|
59
|
+
end
|
57
60
|
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
61
|
+
def create_time_zone_conversion_attribute?(name, cast_type)
|
62
|
+
time_zone_aware_attributes &&
|
63
|
+
!self.skip_time_zone_conversion_for_attributes.include?(name.to_sym) &&
|
64
|
+
(:datetime == cast_type.type)
|
65
|
+
end
|
62
66
|
end
|
63
67
|
end
|
64
68
|
end
|
@@ -1,6 +1,21 @@
|
|
1
|
+
require 'active_support/core_ext/module/method_transplanting'
|
2
|
+
|
1
3
|
module ActiveRecord
|
2
4
|
module AttributeMethods
|
3
5
|
module Write
|
6
|
+
WriterMethodCache = Class.new(AttributeMethodCache) {
|
7
|
+
private
|
8
|
+
|
9
|
+
def method_body(method_name, const_name)
|
10
|
+
<<-EOMETHOD
|
11
|
+
def #{method_name}(value)
|
12
|
+
name = ::ActiveRecord::AttributeMethods::AttrNames::ATTR_#{const_name}
|
13
|
+
write_attribute(name, value)
|
14
|
+
end
|
15
|
+
EOMETHOD
|
16
|
+
end
|
17
|
+
}.new
|
18
|
+
|
4
19
|
extend ActiveSupport::Concern
|
5
20
|
|
6
21
|
included do
|
@@ -9,62 +24,60 @@ module ActiveRecord
|
|
9
24
|
|
10
25
|
module ClassMethods
|
11
26
|
protected
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
27
|
+
|
28
|
+
if Module.methods_transplantable?
|
29
|
+
def define_method_attribute=(name)
|
30
|
+
method = WriterMethodCache[name]
|
31
|
+
generated_attribute_methods.module_eval {
|
32
|
+
define_method "#{name}=", method
|
33
|
+
}
|
34
|
+
end
|
35
|
+
else
|
36
|
+
def define_method_attribute=(name)
|
37
|
+
safe_name = name.unpack('h*').first
|
38
|
+
ActiveRecord::AttributeMethods::AttrNames.set_name_cache safe_name, name
|
39
|
+
|
40
|
+
generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
|
41
|
+
def __temp__#{safe_name}=(value)
|
42
|
+
name = ::ActiveRecord::AttributeMethods::AttrNames::ATTR_#{safe_name}
|
43
|
+
write_attribute(name, value)
|
18
44
|
end
|
19
|
-
|
45
|
+
alias_method #{(name + '=').inspect}, :__temp__#{safe_name}=
|
46
|
+
undef_method :__temp__#{safe_name}=
|
47
|
+
STR
|
20
48
|
end
|
49
|
+
end
|
21
50
|
end
|
22
51
|
|
23
|
-
# Updates the attribute identified by <tt>attr_name</tt> with the
|
24
|
-
# for
|
52
|
+
# Updates the attribute identified by <tt>attr_name</tt> with the
|
53
|
+
# specified +value+. Empty strings for Integer and Float columns are
|
54
|
+
# turned into +nil+.
|
25
55
|
def write_attribute(attr_name, value)
|
26
|
-
attr_name
|
27
|
-
|
28
|
-
@attributes_cache.delete(attr_name)
|
29
|
-
column = column_for_attribute(attr_name)
|
30
|
-
|
31
|
-
unless column || @attributes.has_key?(attr_name)
|
32
|
-
ActiveSupport::Deprecation.warn(
|
33
|
-
"You're trying to create an attribute `#{attr_name}'. Writing arbitrary " \
|
34
|
-
"attributes on a model is deprecated. Please just use `attr_writer` etc."
|
35
|
-
)
|
36
|
-
end
|
56
|
+
write_attribute_with_type_cast(attr_name, value, true)
|
57
|
+
end
|
37
58
|
|
38
|
-
|
59
|
+
def raw_write_attribute(attr_name, value)
|
60
|
+
write_attribute_with_type_cast(attr_name, value, false)
|
39
61
|
end
|
40
|
-
alias_method :raw_write_attribute, :write_attribute
|
41
62
|
|
42
63
|
private
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
64
|
+
# Handle *= for method_missing.
|
65
|
+
def attribute=(attribute_name, value)
|
66
|
+
write_attribute(attribute_name, value)
|
67
|
+
end
|
47
68
|
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
else
|
52
|
-
value
|
53
|
-
end
|
54
|
-
end
|
69
|
+
def write_attribute_with_type_cast(attr_name, value, should_type_cast)
|
70
|
+
attr_name = attr_name.to_s
|
71
|
+
attr_name = self.class.primary_key if attr_name == 'id' && self.class.primary_key
|
55
72
|
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
when TrueClass
|
61
|
-
1
|
62
|
-
when String
|
63
|
-
value.presence
|
64
|
-
else
|
65
|
-
value
|
66
|
-
end
|
73
|
+
if should_type_cast
|
74
|
+
@attributes.write_from_user(attr_name, value)
|
75
|
+
else
|
76
|
+
@attributes.write_cast_value(attr_name, value)
|
67
77
|
end
|
78
|
+
|
79
|
+
value
|
80
|
+
end
|
68
81
|
end
|
69
82
|
end
|
70
83
|
end
|