Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-04 | 1 | -18/+18 | |
|\ | ||||||
| * | Remove extra whitespaces | Sebastian Martinez | 2011-05-02 | 1 | -18/+18 | |
| | | ||||||
* | | Merge pull request #357 from joshk/assign_attributes. | David Heinemeier Hansson | 2011-05-01 | 1 | -5/+28 | |
|\ \ | | | | | | | Assign protected attributes with create/new and control the role. | |||||
| * | | Added mass-assignment security :as and :without_protection support to AR.new ↵ | Josh Kalderimis | 2011-05-01 | 1 | -5/+28 | |
| |/ | | | | | | | and AR.create | |||||
* / | removed the default_scope deprecations and updated the docs and tests to ↵ | Josh Kalderimis | 2011-04-28 | 1 | -36/+17 | |
|/ | | | | reflect its use cases | |||||
* | deprecated the use of the guard_protected_attributes argument with ↵ | Josh Kalderimis | 2011-04-25 | 1 | -9/+14 | |
| | | | | attributes= in AR in favor of assign_attributes(attrs, :without_protection => true) | |||||
* | Added assign_attributes to Active Record which accepts a mass-assignment ↵ | Josh Kalderimis | 2011-04-24 | 1 | -1/+40 | |
| | | | | security scope using the :as option, while also allowing mass-assignment security to be bypassed using :with_protected | |||||
* | Bring back support for passing a callable object to the default_scope macro. ↵ | Jon Leighton | 2011-04-18 | 1 | -0/+12 | |
| | | | | You can also just use a block. | |||||
* | Un-deprecate using 'default_scope' as a macro, but if you are calling the ↵ | Jon Leighton | 2011-04-18 | 1 | -20/+27 | |
| | | | | macro multiple times that will give deprecation warnings, and in 3.2 we will simply overwrite the default scope when you call the macro multiple times. | |||||
* | Evaluate default scopes at the last possible moment in order to avoid ↵ | Jon Leighton | 2011-04-12 | 1 | -8/+5 | |
| | | | | problems with default scopes getting included into other scopes and then being unable to remove the default part via unscoped. | |||||
* | Deprecated support for passing hashes and relations to default_scope, in ↵ | Jon Leighton | 2011-04-12 | 1 | -51/+93 | |
| | | | | favour of defining a 'default_scope' class method in the model. See the CHANGELOG for more details. | |||||
* | Delegate first!, last!, any? and many? to scoped | Andrew White | 2011-03-29 | 1 | -1/+2 | |
| | ||||||
* | Bring #reorder back | Sebastian Martinez | 2011-03-28 | 1 | -1/+1 | |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Do not in place modify what table_name returns | Santiago Pastorino | 2011-03-22 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-05 | 1 | -3/+3 | |
|\ | | | | | | | | | Conflicts: activerecord/CHANGELOG | |||||
| * | use Arel::Table#alias rather than passing the :as parameter | Aaron Patterson | 2011-03-05 | 1 | -2/+2 | |
| | | ||||||
| * | fixes a missmatched column in example | mjy | 2011-03-05 | 1 | -1/+1 | |
| | | ||||||
* | | Use Base#type_condition in JoinAssociation | Jon Leighton | 2011-03-05 | 1 | -2/+2 | |
|/ | ||||||
* | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 1 | -1/+1 | |
| | ||||||
* | Fix missing inheritance from AR::Base in docs | Josep M. Bach | 2011-02-24 | 1 | -1/+1 | |
| | ||||||
* | merges docrails | Xavier Noria | 2011-02-18 | 1 | -4/+1 | |
|\ | ||||||
| * | removes unrealistic example (authentication plus gender?), that it is not ↵ | Xavier Noria | 2011-02-18 | 1 | -4/+1 | |
| | | | | | | | | needed anyway | |||||
| * | Clarify Example in ActiveRecord base | Nicholas Rowe | 2011-02-18 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 1 | -70/+152 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb | |||||
| * | | Add interpolation of association conditions back in, in the form of proc { ↵ | Jon Leighton | 2011-02-14 | 1 | -6/+0 | |
| | | | | | | | | | | | | ... } rather than instance_eval-ing strings | |||||
| * | | bugfix for serialized_attributes to be class specific | Raimonds Simanovskis | 2011-02-09 | 1 | -1/+3 | |
| | | | | | | | | | | | | previously serialized_attributes were kept as class attribute of ActiveRecord::Base - if some attribute was defined as serialized in one subclass then it was serialized in all other subclasses as well (if it had the same name) | |||||
| * | | make set_table_name take effect immediately | Jan | 2011-02-08 | 1 | -0/+3 | |
| |/ | ||||||
| * | almost fisted | Aaron Patterson | 2011-02-04 | 1 | -20/+6 | |
| | | ||||||
| * | allow AR caches to be cleared, clear them on class reloading | Aaron Patterson | 2011-02-03 | 1 | -0/+6 | |
| | | ||||||
| * | Revert "ARel only requires the connection from the AR class. Simply return ↵ | Aaron Patterson | 2011-02-03 | 1 | -2/+8 | |
| | | | | | | | | | | | | the AR class rather than jump through hoops and store ivars" This reverts commit d65e3b481e72e8c76818a94353e9ac315c7c0272. | |||||
| * | ARel only requires the connection from the AR class. Simply return the AR ↵ | Aaron Patterson | 2011-02-03 | 1 | -8/+2 | |
| | | | | | | | | class rather than jump through hoops and store ivars | |||||
| * | reduce cache misses on STI subclasses | Aaron Patterson | 2011-02-03 | 1 | -2/+4 | |
| | | ||||||
| * | this method should be private | Aaron Patterson | 2011-02-03 | 1 | -7/+7 | |
| | | ||||||
| * | Make serialized columns with explicit object_type return a new instance of ↵ | Guillermo Álvarez | 2011-02-03 | 1 | -4/+20 | |
| | | | | | | | | the object instead of nil | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-02 | 1 | -1/+1 | |
| |\ | ||||||
| | * | missing parentheses | Akira Matsuda | 2011-01-29 | 1 | -1/+1 | |
| | | | ||||||
| * | | Refactor clear_timestamp_attributes to use the newly created ↵ | Franck Verrot | 2011-02-02 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | all_timestamp_attributes_in_model Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | make sure de-serialization happens on object instantiation | Aaron Patterson | 2011-02-01 | 1 | -2/+8 | |
| | | | ||||||
| * | | store the serialized column values in the @attributes hash | Aaron Patterson | 2011-02-01 | 1 | -7/+14 | |
| | | | ||||||
| * | | serialize can take an arbitrary code object | Aaron Patterson | 2011-02-01 | 1 | -1/+7 | |
| | | | ||||||
| * | | share column cache among subclasses, only look up columns per AR::Base ↵ | Aaron Patterson | 2011-02-01 | 1 | -13/+15 | |
| | | | | | | | | | | | | subclass once | |||||
| * | | move the coders to the serialized_attributes hash | Aaron Patterson | 2011-02-01 | 1 | -8/+4 | |
| | | | ||||||
| * | | avoid column lookup on subclasses, keep column info cached as table_name => ↵ | Aaron Patterson | 2011-02-01 | 1 | -2/+8 | |
| | | | | | | | | | | | | column_list | |||||
| * | | Use run_callbacks; the generated _run_<name>_callbacks method is not a ↵ | John Firebaugh | 2011-01-31 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | public interface. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | load and prefer psych as the YAML parser when it is available | Aaron Patterson | 2011-01-21 | 1 | -0/+5 | |
| |/ | ||||||
| * | Arel::Table.engine will be deprecated, so stop using it | Aaron Patterson | 2011-01-14 | 1 | -1/+1 | |
| | | ||||||
| * | use underlying _read_attribute method rather than causing NoMethodErrors | Aaron Patterson | 2011-01-11 | 1 | -1/+1 | |
| | | ||||||
| * | lazily instantiate AR objects in order to avoid NoMethodErrors | Aaron Patterson | 2011-01-11 | 1 | -9/+10 | |
| | | ||||||
| * | Use encode_with for marshalling | Jon Leighton | 2011-01-07 | 1 | -0/+20 | |
| | | ||||||
| * | use a hash for caching aggregations rather than ivars | Aaron Patterson | 2011-01-07 | 1 | -2/+3 | |
| | |