aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
* | | 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. sys...Sam Goldstein2009-07-091-4/+9
| * Add support for dumping non-standard primary keys when using the SQLite3 adap...Hongli Lai (Phusion)2009-07-071-1/+5
* | 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 [#285...Yehuda Katz + Carl Lerche2009-07-011-0/+7
* | 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 a...Pratik Naik2009-07-014-28/+16
* | Merge commit 'rails/master'Emilio Tagua2009-06-302-5/+5
|\|
| * Bump up the version to 3.0.preCarl Lerche2009-06-301-3/+3
| * Changed ActiveRecord::Base.human_name to underscore the class name before it ...Justin French2009-06-301-3/+3
* | Merge commit 'rails/master'Emilio Tagua2009-06-305-1/+59
|\|
| * Make sure the wrapped exceptions also have the original exception available.Michael Koziarski2009-06-264-7/+18
| * Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-263-0/+8
| * Translate adapter errors that indicate a violated uniqueness constraint to Ac...Michael Schuerig2009-06-265-1/+40
* | Refactoring: Calculations now use construct_finder_sql instead they own method.Emilio Tagua2009-06-232-25/+8
* | Merge commit 'rails/master'Emilio Tagua2009-06-236-7/+11
|\|
| * Revert "Generate proper :counter_sql from :finder_sql when there is a newline...Yehuda Katz + Carl Lerche2009-06-224-16/+28
| * Generate proper :counter_sql from :finder_sql when there is a newline charact...Patrick Joyce2009-06-214-28/+16
| * Fixed a bug where create_table could not be called without a block [#2221 sta...Joseph Wilk2009-06-211-1/+1
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 state...Brian Hogan2009-06-211-1/+1
| * Ensure hm:t#create respects source associations hash conditions [#2090 state:...mattbauer2009-06-211-0/+7
| * Simplify AMo validation attribute readerJoshua Peek2009-06-171-4/+0
| * Updated require for AMo moveYehuda Katz + Carl Lerche2009-06-171-1/+1
| * Move model naming into ActiveModelJoshua Peek2009-06-171-0/+1
* | Removed unused methods.Emilio Tagua2009-06-233-106/+1
* | Arel now buils SQL queries for associations. Removed old code andEmilio Tagua2009-06-233-67/+6
* | Removed old commented codeEmilio Tagua2009-06-231-21/+0
* | Forget about auto scope, it's always explicit.Emilio Tagua2009-06-171-7/+6
* | Merge commit 'rails/master'Emilio Tagua2009-06-163-4/+7
|\|
| * uses Object#metaclass and Object#class_eval in a few spotsXavier Noria2009-06-123-4/+7
* | Leave the quoting part to ARelEmilio Tagua2009-06-125-172/+171
|\|
| * HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation.Adam Milligan2009-06-124-167/+166
| * HasOneAssociation inherits AssociationProxy since it shares nothing with Belo...Emilio Tagua2009-06-121-5/+5