aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-07-3128-571/+763
|\
| * Start separating primary key concernsJoshua Peek2009-07-304-65/+76
| * Make sure we use send for the default attribute method body because the suffi...Joshua Peek2009-07-301-1/+1
| * Make sure to reset defined methods after calling attribute_method_suffixJoshua Peek2009-07-301-9/+7
| * Move attribute_types_cached_by_default into attribute methods reading concernJoshua Peek2009-07-302-10/+11
| * Don't need to pass attr_name to evaluate_attribute_method anymoreJoshua Peek2009-07-304-9/+9
| * Undefine id and let it automatically be generatedJoshua Peek2009-07-304-24/+6
| * Redirect method missing for primary key to read_attributeJoshua Peek2009-07-302-5/+3
| * ditto for id=Joshua Peek2009-07-302-8/+4
| * Don't define id_before_type_cast, just let it be generated on its ownJoshua Peek2009-07-302-6/+6
| * Move id attribute methods into their related concernJoshua Peek2009-07-304-29/+28
| * Restore DangerousAttributeErrorJoshua Peek2009-07-303-3/+27
| * Wrap up attribute method reset concerns in 'undefine_attribute_methods'Joshua Peek2009-07-302-2/+7
| * read_attribute is always available through attributeJoshua Peek2009-07-301-7/+1
| * cache_attributes is related to attribute readingJoshua Peek2009-07-302-19/+19
| * Generate methods for all suffixesJoshua Peek2009-07-304-32/+12
| * Concernify AR AttributeMethodsJoshua Peek2009-07-3010-383/+451
| * Revert "Methods invoked within named scope Procs should respect the scope sta...Jeremy Kemper2009-07-293-12/+1
| * Merge docrailsPratik Naik2009-07-2512-21/+147
| * Patch to ActiveModel's (and ActiveRecord, by association) XML serialization: ...John Maxwell2009-07-222-0/+21
* | Added ActiveRecord::Relation tests. Allow Relation to accept conditionalEmilio Tagua2009-07-313-3/+98
* | Performance: cache/reload arel relation when possible to speed up things.Emilio Tagua2009-07-212-6/+7
* | Removed unused local variable.Emilio Tagua2009-07-211-1/+0
* | Introduced ActiveRecord::Relation, a layer between an ARel relation and an AR...Emilio Tagua2009-07-218-54/+77
* | Merge commit 'rails/master'Emilio Tagua2009-07-212-8/+2
|\|
| * AMo conversion helperJoshua Peek2009-07-211-7/+1
| * Add wrap_with_notifications helper to AMo observingJoshua Peek2009-07-201-1/+1
* | Merge commit 'rails/master'Emilio Tagua2009-07-201-0/+7
|\|
| * Merge branch 'master' of git@github.com:rails/railsYehuda Katz2009-07-1915-19/+173
| |\
| * | Define ActiveModel API ComplianceYehuda Katz2009-07-201-0/+7
* | | Performance boost for AR#createEmilio Tagua2009-07-201-3/+4
* | | Removed legacy test.Emilio Tagua2009-07-201-19/+0
* | | Merge commit 'rails/master'Emilio Tagua2009-07-1614-16/+159
|\ \ \ | | |/ | |/|
| * | Add primary_key option to belongs_to associationSzymon Nowak2009-07-1514-16/+159
* | | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods.Emilio Tagua2009-07-162-40/+59
* | | Merge commit 'rails/master'Emilio Tagua2009-07-147-124/+55
|\| |
| * | Use map! instead of map for <association>_idsPratik Naik2009-07-131-2/+2
| * | Optimize <association>_ids for hm:t with belongs_to sourcePratik Naik2009-07-132-3/+14
| |/
| * Integrate AMo XML serializer into ARJoshua Peek2009-07-111-109/+4
| * Make it so AR attributes which conflict with object-private methods (e.g. sys...Sam Goldstein2009-07-092-4/+25
| * Add support for dumping non-standard primary keys when using the SQLite3 adap...Hongli Lai (Phusion)2009-07-072-8/+12
* | Merge commit 'rails/master'Emilio Tagua2009-07-063-141/+24
|\|
| * Integrate AMo JSON serializer into ARJoshua Peek2009-07-033-141/+24
* | Merge commit 'rails/master'Emilio Tagua2009-07-013-2/+11
|\|
| * Added AR:B#dup method for duplicationg object without frozen attributes [#285...Yehuda Katz + Carl Lerche2009-07-012-0/+11
| * Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 s...Yehuda Katz + Carl Lerche2009-07-011-2/+0
* | Create is now powered by Arel. Removed methods that are no longer used.Emilio Tagua2009-07-013-18/+19
* | Small refactor to update_all.Emilio Tagua2009-07-011-3/+3
* | Merge commit 'rails/master'Emilio Tagua2009-06-3014-39/+57
|\|
| * Revert "Revert "Generate proper :counter_sql from :finder_sql when there is a...Pratik Naik2009-07-0114-39/+57