aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'rails/master'Emilio Tagua2009-07-3123-556/+757
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Start separating primary key concernsJoshua Peek2009-07-304-65/+76
| |
| * Make sure we use send for the default attribute method body because the ↵Joshua Peek2009-07-301-1/+1
| | | | | | | | suffix maybe an invalid method name
| * 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-302-15/+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-302-3/+13
| |
| * 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-303-18/+12
| |
| * Concernify AR AttributeMethodsJoshua Peek2009-07-3010-383/+451
| |
| * Revert "Methods invoked within named scope Procs should respect the scope ↵Jeremy Kemper2009-07-291-6/+1
| | | | | | | | | | | | | | | | | | | | stack. [#1267 state:resolved]" This reverts commit 6a13376525f34a00e013fc3a6022838329dfe856. Conflicts: activerecord/test/cases/named_scope_test.rb
| * Merge docrailsPratik Naik2009-07-2512-21/+147
| |
| * Patch to ActiveModel's (and ActiveRecord, by association) XML serialization: ↵John Maxwell2009-07-221-0/+15
| | | | | | | | | | | | If two parameters are present in Procs supplied to to_xml's :procs option, the model being serialized will be passed as the second argument [#2373 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Added ActiveRecord::Relation tests. Allow Relation to accept conditionalEmilio Tagua2009-07-312-3/+20
| | | | | | | | hashes and arrays like #find does.
* | 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 ↵Emilio Tagua2009-07-214-45/+68
| | | | | | | | AR relation
* | 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-194-10/+43
| |\
| * | Define ActiveModel API ComplianceYehuda Katz2009-07-201-0/+7
| | | | | | | | | | | | | | | | | | - Define to_model on AR - Define to_model on ActiveModel::APICompliant - Update test fixtures to be API Compliant - Start using to_model in AP
* | | Performance boost for AR#createEmilio Tagua2009-07-201-3/+4
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-07-164-9/+35
|\ \ \ | | |/ | |/|
| * | Add primary_key option to belongs_to associationSzymon Nowak2009-07-154-9/+35
| | | | | | | | | | | | | | | | | | [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | | Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods.Emilio Tagua2009-07-162-40/+59
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-07-144-115/+26
|\| |
| * | 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-131-1/+8
| |/
| * Integrate AMo XML serializer into ARJoshua Peek2009-07-111-109/+4
| |
| * Make it so AR attributes which conflict with object-private methods (e.g. ↵Sam Goldstein2009-07-091-4/+9
| | | | | | | | | | | | | | | | | | system) don't 'randomly' cause NoMethodErrors Previously if you called this attribute before others, you'd get exceptions. But if it was the second-or-subsequent attribute you retrieved you'd get the correct behaviour. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2808 state:committed]
| * Add support for dumping non-standard primary keys when using the SQLite3 ↵Hongli Lai (Phusion)2009-07-071-1/+5
| | | | | | | | | | | | adapter. Fix unit tests so that this feature is tested for all adapters. [#2868 state:resolved] Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
* | 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-011-0/+7
|\|
| * Added AR:B#dup method for duplicationg object without frozen attributes ↵Yehuda Katz + Carl Lerche2009-07-011-0/+7
| | | | | | | | | | [#2859 state:resolved] Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
* | 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-304-28/+16
|\|
| * Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵Pratik Naik2009-07-014-28/+16
| | | | | | | | | | | | | | | | | | a newline character immediately following 'SELECT' [#2118 state:resolved]"" This reverts commit 80f1f863cd0f9cba89079511282de5710a2e1832. The feature doesn't work on Postgres, so don't test it on Postgres. Also, Postgres compatibility is irrelevant to the ticket/patch in question.
* | Merge commit 'rails/master'Emilio Tagua2009-06-302-5/+5
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb
| * Bump up the version to 3.0.preCarl Lerche2009-06-301-3/+3
| |