Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ensure that mass assignment options are preserved | Andrew White | 2012-06-10 | 1 | -1/+20 |
| | | | | | | | | | | | | | | | | There are two possible scenarios where the @mass_assignment_options instance variable can become corrupted: 1. If the assign_attributes doesn't complete correctly, then subsequent calls to a nested attribute assignment method will use whatever options were passed to the previous assign_attributes call. 2. With nested assign_attributes calls, the inner call will overwrite the current options. This will only affect nested attributes as the attribute hash is sanitized before any methods are called. To fix this we save the current options in a local variable and then restore these options in an ensure block. | ||||
* | Refactor aggregation writer method | Carlos Antonio da Silva | 2012-05-21 | 1 | -1/+0 |
| | | | | Only constantize class_name once. | ||||
* | Merge pull request #6143 from senny/composed_of_converter_returns_nil | Aaron Patterson | 2012-05-21 | 1 | -0/+5 |
|\ | | | | | allow the :converter Proc form composed_of to return nil | ||||
| * | allow the :converter Proc form composed_of to return nil | Yves Senn | 2012-05-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | This makes it possible to filter invalid input values before they are passed into the value-object (like empty strings). This behaviour is only relevant if the :allow_nil options is set to true. Otherwise you will get the resulting NoMethodError. | ||||
* | | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵ | Andrey Voronkov | 2012-05-09 | 1 | -0/+2 |
| | | | | | | | | used out of the box. | ||||
* | | Fix issue with private kernel methods and collection associations. Closes #2508 | Carlos Antonio da Silva | 2012-05-02 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | Change CollectionProxy#method_missing to use scoped.public_send, to avoid a problem described in issue #2508 when trying to use class methods with names like "open", that clash with private kernel methods. Also changed the dynamic matcher instantiator to send straight to scoped, to avoid another roundtrip to method_missing. | ||||
* | | find and replace deprecated keys | Jon Leighton | 2012-04-27 | 1 | -1/+1 |
| | | |||||
* | | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵ | Jon Leighton | 2012-04-27 | 3 | -8/+8 |
| | | | | | | | | things | ||||
* | | remove unnecessary test code | Jon Leighton | 2012-04-27 | 1 | -5/+1 |
| | | |||||
* | | remove deprecated scope stuff | Jon Leighton | 2012-04-26 | 3 | -22/+2 |
| | | |||||
* | | remove unused method | Jon Leighton | 2012-04-25 | 1 | -6/+0 |
| | | |||||
* | | remove tests for #with_scope (it's now deprecated) | Jon Leighton | 2012-04-25 | 1 | -6/+0 |
| | | |||||
* | | extract deprecated code | Jon Leighton | 2012-04-25 | 1 | -2/+2 |
| | | |||||
* | | Adds test to check that circular preloading does not modify Model.unscoped ↵ | Benedikt Deicke | 2012-04-03 | 1 | -0/+2 |
| | | | | | | | | (as described in #5667) | ||||
* | | Merge pull request #5334 from courtland/master | Jon Leighton | 2012-03-30 | 1 | -0/+6 |
|\ \ | | | | | | | Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. | ||||
| * | | Tests for removing a HABTM association when optimistic locking is enabled. | Nick Rogers | 2012-03-07 | 1 | -0/+6 |
| | | | |||||
* | | | Deprecate eager-evaluated scopes. | Jon Leighton | 2012-03-21 | 16 | -61/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use this: scope :red, where(color: 'red') default_scope where(color: 'red') Use this: scope :red, -> { where(color: 'red') } default_scope { where(color: 'red') } The former has numerous issues. It is a common newbie gotcha to do the following: scope :recent, where(published_at: Time.now - 2.weeks) Or a more subtle variant: scope :recent, -> { where(published_at: Time.now - 2.weeks) } scope :recent_red, recent.where(color: 'red') Eager scopes are also very complex to implement within Active Record, and there are still bugs. For example, the following does not do what you expect: scope :remove_conditions, except(:where) where(...).remove_conditions # => still has conditions | ||||
* | | | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-07 | 2 | -9/+9 |
| | | | |||||
* | | | Add test case to has_many through association when mass_assignment_sanitizer is | Rafael Mendonça França | 2012-03-05 | 3 | -0/+13 |
|/ / | | | | | | | :strict | ||||
* | | added test for #3732 | Rick Martinez | 2012-02-10 | 3 | -1/+12 |
| | | |||||
* | | Allow store to be a not null column. | Jeremy Walker | 2012-02-02 | 1 | -0/+1 |
| | | |||||
* | | test_get_ids_for_ordered_association fixed | gregolsen | 2012-01-31 | 1 | -1/+1 |
| | | |||||
* | | ids_reader method fixed, test added to has_many association | gregolsen | 2012-01-31 | 1 | -0/+1 |
| | | |||||
* | | Fix bug where reset_counters resets the wrong counter cache. | David Peter | 2012-01-16 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | If a model belongs_to two associations with the same class, then reset_counters will reset the wrong counter cache. Finding the right reflection should use the foreign_key instead, which should be unique. | ||||
* | | Deprecate inferred JOINs with includes + SQL snippets. | Jon Leighton | 2012-01-16 | 3 | -3/+6 |
| | | | | | | | | | | | | See the CHANGELOG for details. Fixes #950. | ||||
* | | Revert "Deprecate implicit eager loading. Closes #950." | Jon Leighton | 2012-01-16 | 3 | -5/+5 |
| | | | | | | | | This reverts commit c99d507fccca2e9e4d12e49b4387e007c5481ae9. | ||||
* | | Fixed after_initialize callbacks call on AR model #dup | Bogdan Gusiev | 2012-01-07 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-12-31 | 28 | -33/+93 |
|\ \ | |||||
| * | | Test fixtures with custom model and table names | Alexey Muranov | 2011-12-30 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | Test using fixtures with random names and model names, that is not following naming conventions but using set_fixture_class instead. It is expected that the table name be defined in the model, but this is not explicitly tested here. This will need to be fixed. | ||||
| * | | Deprecate implicit eager loading. Closes #950. | Jon Leighton | 2011-12-29 | 3 | -5/+5 |
| | | | |||||
| * | | Support establishing connection on ActiveRecord::Model. | Jon Leighton | 2011-12-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | This is the 'top level' connection, inherited by any models that include ActiveRecord::Model or inherit from ActiveRecord::Base. | ||||
| * | | Support nested AR::Models | Jon Leighton | 2011-12-24 | 1 | -0/+8 |
| | | | |||||
| * | | Add test for inheritance from a non-AR superclass | Jon Leighton | 2011-12-24 | 1 | -0/+11 |
| | | | |||||
| * | | I herd you like modules. | Jon Leighton | 2011-12-24 | 1 | -0/+13 |
| | | | |||||
| * | | serialize fails on subclass | Alvaro Bautista | 2011-12-23 | 1 | -0/+4 |
| | | | |||||
| * | | added failing tests for has_many, has_one and belongs_to associations with ↵ | Jakub Kuźma | 2011-12-21 | 1 | -2/+2 |
| | | | | | | | | | | | | strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051 | ||||
| * | | call scope within unscoped to prevent duplication of where values | Sergey Nartimov | 2011-12-17 | 1 | -0/+2 |
| | | | |||||
| * | | Allow nested attributes in associations to update values in it's owner ↵ | Andrew Kaspick | 2011-12-14 | 1 | -1/+4 |
| | | | | | | | | | | | | object. Fixes a regression from 3.0.x | ||||
| * | | Fix #3890. (Calling proxy_association in scope chain.) | Jon Leighton | 2011-12-08 | 1 | -1/+5 |
| | | | |||||
| * | | Deprecate set_locking_column in favour of self.locking_column= | Jon Leighton | 2011-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | Deprecate set_primary_key in favour of self.primary_key= | Jon Leighton | 2011-11-29 | 12 | -14/+14 |
| | | | |||||
| * | | Deprecate set_sequence_name in favour of self.sequence_name= | Jon Leighton | 2011-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | Deprecate set_inheritance_column in favour of self.inheritance_column= | Jon Leighton | 2011-11-29 | 1 | -1/+2 |
| | | | |||||
| * | | Deprecate set_table_name in favour of self.table_name= or defining your own ↵ | Jon Leighton | 2011-11-29 | 3 | -5/+5 |
| | | | | | | | | | | | | method. | ||||
| * | | don't change class definition in test case | Josh Susser | 2011-11-29 | 1 | -0/+4 |
| | | | |||||
| * | | use GeneratedFeatureMethods module for associations | Josh Susser | 2011-11-27 | 1 | -1/+0 |
| | | | |||||
| * | | Allow the :class_name option for associations to take a symbol. | Jon Leighton | 2011-11-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This is to avoid confusing newbies, and to be consistent with the fact that other options like :foreign_key already allow a symbol or a string. | ||||
| * | | Tests gotta run in 1.8 too | Jeremy Kemper | 2011-10-13 | 1 | -2/+2 |
| | | | |||||
| * | | Added ActiveRecord::Base.store for declaring simple single-column key/value ↵ | David Heinemeier Hansson | 2011-10-13 | 1 | -0/+1 |
| | | | | | | | | | | | | stores [DHH] | ||||
* | | | Merge branch 'master' of git://github.com/rails/rails | Dmitry Polushkin | 2011-09-15 | 2 | -10/+12 |
|\| | |