aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Fixed serialization for records with an attribute named `format`.Godfrey Chan2014-05-221-0/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * * * This bug can be triggered when serializing record R (the instance) of type C (the class), provided that the following conditions are met: 1. The name of one or more columns/attributes on C/R matches an existing private method on C (e.g. those defined by `Kernel`, such as `format`). 2. The attribute methods have not yet been generated on C. In this case, the matching private methods will be called by the serialization code (with no arguments) and their return values will be serialized instead. If the method requires one or more arguments, it will result in an `ArgumentError`. This regression is introduced in d1316bb. * * * Attribute methods (e.g. `#name` and `#format`, assuming the class has columns named `name` and `format` in its database table) are lazily defined. Instead of defining them when a the class is defined (e.g. in the `inherited` hook on `ActiveRecord::Base`), this operation is deferred until they are first accessed. The reason behind this is that is defining those methods requires knowing what columns are defined on the database table, which usually requires a round-trip to the database. Deferring their definition until the last-possible moment helps reducing unnessary work, especially in development mode where classes are redefined and throw away between requests. Typically, when an attribute is first accessed (e.g. `a_book.format`), it will fire the `method_missing` hook on the class, which triggers the definition of the attribute methods. This even works for methods like `format`, because calling a private method with an explicit receiver will also trigger that hook. Unfortunately, `read_attribute_for_serialization` is simply an alias to `send`, which does not respect method visibility. As a result, when serializing a record with those conflicting attributes, the `method_missing` is not fired, and as a result the attribute methods are not defined one would expected. Before d1316bb, this is negated by the fact that calling the `run_callbacks` method will also trigger a call to `respond_to?`, which is another trigger point for the class to define its attribute methods. Therefore, when Active Record tries to run the `after_find` callbacks, it will also define all the attribute methods thus masking the problem. * * * The proper fix for this problem is probably to restrict `read_attribute_for_serialization` to call public methods only (i.e. alias `read_attribute_for_serialization` to `public_send` instead of `send`). This however would be quite risky to change in a patch release and would probably require a full deprecation cycle. Another approach would be to override `read_attribute_for_serialization` inside Active Record to force the definition of attribute methods: def read_attribute_for_serialization(attribute) self.class.define_attribute_methods send(attribute) end Unfortunately, this is quite likely going to cause a performance degradation. This patch therefore restores the behaviour from the 4-0-stable branch by explicitly forcing the class to define its attribute methods in a similar spot (when records are initialized). This should not cause any extra roundtrips to the database because the `@columns` should already be cached on the class. Fixes #15188.
* | | | | Merge pull request #15257 from jetthoughts/remove_redundant_codeRafael Mendonça França2014-05-221-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Removed not used code
| * | | | | Removed not-used codePaul Nikitochkin2014-05-221-1/+0
| | | | | |
* | | | | | fix test from 7537057888d2d63c3b6c2019d5828bc445fbd6c9Aaron Patterson2014-05-221-0/+1
| |/ / / / |/| | | |
* | | | | Push limit to type objectsSean Griffin2014-05-226-70/+64
| | | | | | | | | | | | | | | | | | | | | | | | | Columns and injected types no longer have any conditionals based on the format of SQL type strings! Hooray!
* | | | | Push precision to type objectsSean Griffin2014-05-226-22/+27
| | | | |
* | | | | Push scale to type objectsSean Griffin2014-05-227-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ideally types will be usable without having to specify a sql type string, so we should keep the information related to parsing them on the adapter or another object.
* | | | | Move `extract_precision` onto type objectsDan Croak and Sean Griffin2014-05-227-19/+15
|/ / / /
* | | | Merge pull request #15249 from sgrif/sg-register-types-in-adapterRafael Mendonça França2014-05-223-75/+62
|\ \ \ \ | | | | | | | | | | Use the generic type map for all PG type registrations
| * | | | Use the generic type map for all PG type registrationsSean Griffin2014-05-223-75/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to want all of the benefits of the type map object for registrations, including block registration and real aliasing. Moves type name registrations to the adapter, and aliases the OIDs to the named types
* | | | | Allow additional arguments to be used during type map lookupsSean Griffin2014-05-224-12/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Determining things like precision and scale in postgresql will require the given blocks to take additional arguments besides the OID. - Adds the ability to handle additional arguments to `TypeMap` - Passes the column type to blocks when looking up PG types
* | | | Merge pull request #14803 from kuldeepaggarwal/null_relation_sum_fixMatthew Draper2014-05-221-3/+17
|\ \ \ \ | | | | | | | | | | | | | | | Fixed a problem where `sum` used with a `group` was not returning a Hash.
| * | | | Fixed a problem where `sum`, `size`, `average`, `minimum` and `maximum` usedKuldeep Aggarwal2014-05-151-3/+17
| | | | | | | | | | | | | | | | | | | | with a grouping was not returning a Hash.
* | | | | Merge pull request #15237 from sgrif/sg-move-extract-scaleRafael Mendonça França2014-05-213-6/+5
|\ \ \ \ \ | | | | | | | | | | | | Move extract_scale to decimal type
| * | | | | Move extract_scale to decimal typeSean Griffin2014-05-213-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only type that has a scale is decimal. There's a special case where decimal columns with 0 scale are type cast to integers if the scale is not specified. Appears to only affect schema dumping.
* | | | | | Merge pull request #15218 from sgrif/sg-move-oid-typesRafael Mendonça França2014-05-2123-353/+532
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move PG OID types to their own files
| * | | | | | Move PG OID types to their own filesSean Griffin2014-05-2123-353/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we promote these classes to first class concepts, these classes are starting to gain enough behavior to warrant being moved into their own files. Many of them will become quite large as we move additional behavior to the type objects.
* | | | | | | Rename `oid_type` to `cast_type` to make PG columns consistentSean Griffin2014-05-211-5/+4
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #15219 from sgrif/sg-missing-nodocRafael Mendonça França2014-05-211-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add missing nodoc
| * | | | | | Add missing nodocs to MySQL adapterSean Griffin2014-05-211-3/+3
| |/ / / / /
* | | | | | Merge pull request #14613 from Sirupsen/fix-serialize-update-columnRafael Mendonça França2014-05-212-14/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix serialized field returning serialized data after update_column Conflicts: activerecord/CHANGELOG.md
| * | | | | | Fix serialized field returning serialized data after update_columnSimon Eskildsen2014-04-052-14/+30
| | | | | | |
* | | | | | | Revert "Merge pull request #14544 from jefflai2/named_scope_sti"Rafael Mendonça França2014-05-212-8/+4
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065. Conflicts: activerecord/CHANGELOG.md activerecord/test/models/comment.rb This change break integration with activerecord-deprecated_finders so I'm reverting until we find a way to make it work with this gem.
* | | | | | push `extract_scale` to the `Type`.Yves Senn2014-05-214-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `extract_precision`, `extract_limit`, and `extract_default` probably need to follow. - would be good to remove the delegation `Column#extract_scale`. /cc @sgrif
* | | | | | Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_keyYves Senn2014-05-211-4/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix polymorphic eager load with foreign_key as String.
| * | | | | | Fix polymorphic eager load with foreign_key as String.Lauro Caetano2014-05-201-2/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The foreign_key could be `String` and just doing `owners_map[owner_key]` could return `nil`. To prevent this bug, we should `to_s` both keys if their types are different. Fixes #14734.
* | | | | | Merge pull request #14544 from jefflai2/named_scope_stiRafael Mendonça França2014-05-202-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Issue #13466. Conflicts: activerecord/CHANGELOG.md
| * | | | | | Fixes Issue #13466.Jefferson Lai2014-04-232-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the call to a scope block to be evaluated with instance_eval. The result is that ScopeRegistry can use the actual class instead of base_class when caching scopes so queries made by classes with a common ancestor won't leak scopes.
* | | | | | | Merge pull request #15205 from sgrif/sg-delegate-klassRafael Mendonça França2014-05-209-14/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Delegate `klass` to the injected type object
| * | | | | | | Delegate `klass` to the injected type objectSean Griffin2014-05-209-14/+33
| | | | | | | |
* | | | | | | | Merge pull request #14979 from brocktimus/masterRafael Mendonça França2014-05-201-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Making belongs_to: touch behaviour be consistent with save updating updated_at
| * | | | | | | | Prevented belongs_to: touch propagating up if there are no changes being savedBrock Trappitt2014-05-211-1/+1
| |/ / / / / / /
* / / / / / / / Revert "Revert "Merge pull request #8313 from ↵Rafael Mendonça França2014-05-201-2/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alan/only_save_changed_has_one_objects"" This reverts commit e94e6c27af495a2460c811bb506459f1428dec6b. Conflicts: activerecord/CHANGELOG.md The original commit was reverted only to be safe since #14407 were reported. We don't have any proof we added a regression with the original commit so reverting it now will give us more problem. Closes #14407
* | | | | | | Delegate `type_cast_for_write` to injected type objectSean Griffin2014-05-204-30/+14
| | | | | | |
* | | | | | | Merge pull request #15207 from sgrif/sg-inline-column-helpersRafael Mendonça França2014-05-209-119/+75
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Inline typecasting helpers from Column to the appropriate types
| * | | | | | | Inline typecasting helpers from Column to the appropriate typesSean Griffin2014-05-209-119/+75
| | | | | | | |
* | | | | | | | Merge pull request #15206 from sgrif/sg-type-map-postgresqlRafael Mendonça França2014-05-203-45/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use the generic type map for PostgreSQL OID registrations
| * | | | | | | | Use the generic type map for PostgreSQL OID registrationsSean Griffin2014-05-203-45/+31
| |/ / / / / / /
* / / / / / / / Delegate predicate methods to injected type object on ColumnSean Griffin2014-05-2011-23/+43
|/ / / / / / /
* | | | | | | Use the generic type map object for mysql field lookupsSean Griffin2014-05-203-23/+26
| | | | | | |
* | | | | | | Merge pull request #15203 from sgrif/sg-delegate-type-castRafael Mendonça França2014-05-206-74/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Replace `type_cast` case statement with delegation
| * | | | | | | Replace `type_cast` case statement with delegationSean Griffin2014-05-206-74/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All subclasses of column were now delegating `type_cast` to their injected type object. We can remove the overriding methods, and generalize it on the `Column` class itself. This also enabled us to remove several column classes completely, as they no longer had any meaningful behavior of their own.
* | | | | | | | Merge pull request #15201 from sgrif/sg-types-postgresqlRafael Mendonça França2014-05-203-147/+81
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Have Postgres OID types inherit from general types
| * | | | | | | | Have Postgres OID types inherit from general typesSean Griffin2014-05-203-147/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using general types where possible. Several more can go away once infinity gets figured out.
* | | | | | | | | fix multiple hash preloads. Fixes #14994Aaron Patterson2014-05-201-6/+7
| | | | | | | | |
* | | | | | | | | Use general types for mysql fieldsSean Griffin2014-05-201-69/+11
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Delegate type_cast to injected type object in mysqlSean Griffin2014-05-206-53/+72
|/ / / / / / /
* | | | | | | Merge pull request #15197 from sgrif/sg-delegate-type-cast-sqlite3Yves Senn2014-05-2010-6/+82
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Delegate `#type_cast` to injected type objects on SQLite3
| * | | | | | | Delegate `#type_cast` to injected type objects on SQLite3Sean Griffin2014-05-2010-6/+82
| | | | | | | |
* | | | | | | | Fixed the inferred table name for HABTM within a schemaEric Chahin2014-05-201-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #14824.