aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15285 from ↵Rafael Mendonça França2014-05-232-9/+5
|\ | | | | | | | | sergey-alekseev/remove-active-record-where-duplicated-condition Remove duplicated parameter check on #where!
| * Remove duplicated parameter check on #where!Sergey Alekseev2014-05-232-9/+5
| | | | | | | | | | | | | | | | | | | | It seems that #where! is not designed to be used as a chained where. See initial implementation at 8c2c60511beaad05a218e73c4918ab89fb1804f0. So, no need to check twice. We should not test #where! https://github.com/rails/rails/pull/15285#discussion_r13018316
* | Merge pull request #15277 from sgrif/sg-schema-cache-refactorRafael Mendonça França2014-05-231-31/+11
|\ \ | |/ |/| Simplify the code in schema cache
| * Simplify the code in schema cacheSean Griffin2014-05-231-31/+11
| | | | | | | | | | The use of default procs was unnessecary, made the code confusing to follow, and made marshalling needlessly complex.
* | Merge pull request #15261 from hbin/missing_parametersRafael Mendonça França2014-05-231-1/+5
|\ \ | | | | | | Bring the missing parameters back.
| * | Bring the missing parameters back.Bin Huang2014-05-231-1/+5
| | |
* | | Merge pull request #15282 from sgrif/sg-remove-column-primaryRafael Mendonça França2014-05-237-52/+10
|\ \ \ | | | | | | | | Remove `Column#primary`
| * | | Remove `Column#primary`Sean Griffin2014-05-237-52/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | It appears to have been used at some point in the past, but is no longer used in any meaningful way. Whether a column is considered primary is a property of the model, not the schema/column. This also removes the need for yet another layer of caching of the model's schema, and we can leave that to the schema cache.
* | | Merge pull request #15265 from danielmbarlow/masterRafael Mendonça França2014-05-231-2/+3
|\ \ \ | | | | | | | | Added force_reload to Auto-generated methods doc
| * | | Added force_reload to Auto-generated methods docdanielmbarlow2014-05-231-2/+3
| | |/ | |/| | | | Should make it a little easier to find the information. Also added note to look below for the definition of the generated methods.
* | | Merge pull request #15280 from sgrif/sg-postgres-defaultsRafael Mendonça França2014-05-233-76/+78
|\ \ \ | | | | | | | | Move parsing of PG sql strings for defaults out of column
| * | | Move parsing of PG sql strings for defaults out of columnSean Griffin2014-05-233-76/+78
| | |/ | |/|
* | | Merge pull request #15271 from sgrif/sg-remove-duplicated-setupRafael Mendonça França2014-05-231-4/+3
|\ \ \ | | | | | | | | Remove duplicated setup in test
| * | | Remove duplicated setup in testSean Griffin2014-05-231-4/+3
| |/ /
* | | Merge pull request #15281 from sgrif/sg-inline-point-type-castRafael Mendonça França2014-05-232-8/+4
|\ \ \ | | | | | | | | Inline type cast method for PG points
| * | | Inline type cast method for PG pointsSean Griffin2014-05-232-8/+4
| |/ /
* | | Merge pull request #15274 from sgrif/sg-move-type-testsRafael Mendonça França2014-05-232-159/+159
|\ \ \ | | | | | | | | Change typecasting unit tests to test type objects directly
| * | | Change typecasting unit tests to test type objects directlySean Griffin2014-05-232-159/+159
| |/ / | | | | | | | | | | | | | | | There's no longer type casting behavior of any kind inside of `Column` for the general case. These tests can be made clearer by testing the type objects directly.
* | | Avoid slowing down AR object initializationGodfrey Chan2014-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d73f5a forces AR to enter the `define_attribute_methods` method whenever it instantiate a record from the `init_with` entry point. This is a potential performance hotspot, because `init_with` is called from all `find*` family methods, and `define_attribute_methods` is slow because it tries to acquire a lock on the mutex everytime it is entered. By using [DCL](http://en.wikipedia.org/wiki/Double-checked_locking), we can avoid grabbing the lock most of the time when the attribute methods are already defined (the common case). This is made possible by the fact that reading an instance variable is an atomic operation in Ruby. Credit goes to Aaron Patterson for pointing me to DCL and filling me in on the atomicity guarantees in Ruby. [*Godfrey Chan*, *Aaron Patterson*]
* | | Fixed serialization for records with an attribute named `format`.Godfrey Chan2014-05-225-0/+30
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * * * 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
| | |
* | | Don't recurse infinitely when calling non-existent method on superKris Kemper2014-05-221-0/+12
| |/ |/|
* | Push limit to type objectsSean Griffin2014-05-227-73/+67
| | | | | | | | | | 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-224-84/+63
|\ | | | | Use the generic type map for all PG type registrations
| * Use the generic type map for all PG type registrationsSean Griffin2014-05-224-84/+63
| | | | | | | | | | | | | | 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
* | Merge pull request #15248 from sgrif/sg-additional-type-map-argsRafael Mendonça França2014-05-225-12/+29
|\ \ | | | | | | Allow additional arguments to be used during type map lookups
| * | Allow additional arguments to be used during type map lookupsSean Griffin2014-05-225-12/+29
| |/ | | | | | | | | | | | | | | 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
* | pg test, extract tsvector tests into `postgresql/full_text_test.rb`Yves Senn2014-05-222-27/+31
| |
* | pg test, move timestamp tests over to `postgresql/timestamp_test.rb`.Yves Senn2014-05-222-43/+53
| |
* | pg test, extract network address type tests into separate file.Yves Senn2014-05-223-51/+79
| |
* | pg test, remove unused code.Yves Senn2014-05-221-3/+0
|/
* Merge pull request #14803 from kuldeepaggarwal/null_relation_sum_fixMatthew Draper2014-05-223-3/+66
|\ | | | | | | 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-153-3/+66
| | | | | | | | with a grouping was not returning a Hash.
* | Merge pull request #15237 from sgrif/sg-move-extract-scaleRafael Mendonça França2014-05-214-8/+7
|\ \ | | | | | | Move extract_scale to decimal type
| * | Move extract_scale to decimal typeSean Griffin2014-05-214-8/+7
| | | | | | | | | | | | | | | | | | 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-212-15/+5
| |/ / |/| |
* | | 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-214-14/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix serialized field returning serialized data after update_column Conflicts: activerecord/CHANGELOG.md
| * | | Fix serialized field returning serialized data after update_columnSimon Eskildsen2014-04-054-14/+51
| | | |
* | | | Revert "Merge pull request #14544 from jefflai2/named_scope_sti"Rafael Mendonça França2014-05-218-42/+5
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | build fix, use lambda syntax that ruby 1.9.3 understands.Yves Senn2014-05-211-1/+1
| | |
* | | 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