aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge commit 'rails/master'Emilio Tagua2009-06-304-7/+13
|\|
| * Bump up the version to 3.0.preCarl Lerche2009-06-302-4/+4
| * Changed ActiveRecord::Base.human_name to underscore the class name before it ...Justin French2009-06-302-4/+10
* | Merge commit 'rails/master'Emilio Tagua2009-06-306-1/+74
|\|
| * 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-264-0/+16
| * Translate adapter errors that indicate a violated uniqueness constraint to Ac...Michael Schuerig2009-06-266-1/+47
* | Refactoring: Calculations now use construct_finder_sql instead they own method.Emilio Tagua2009-06-232-25/+8
* | Merge commit 'rails/master'Emilio Tagua2009-06-2310-7/+53
|\|
| * Revert "Generate proper :counter_sql from :finder_sql when there is a newline...Yehuda Katz + Carl Lerche2009-06-2214-55/+39
| * Generate proper :counter_sql from :finder_sql when there is a newline charact...Patrick Joyce2009-06-2114-39/+55
| * Fixed a bug where create_table could not be called without a block [#2221 sta...Joseph Wilk2009-06-212-1/+8
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 state...Brian Hogan2009-06-212-1/+27
| * Ensure hm:t#create respects source associations hash conditions [#2090 state:...mattbauer2009-06-214-0/+16
| * 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-234-127/+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
* | Merge commit 'rails/master'Emilio Tagua2009-06-124-98/+6
|\|
| * Move observing notify helper into AMoJoshua Peek2009-06-111-5/+0
| * Integrate ActiveModel::Observing into ActiveRecordJoshua Peek2009-06-103-93/+6
* | Merge commit 'rails/master'Emilio Tagua2009-06-101-8/+8
|\|
| * Whitelist the methods which are called by multiparameter attribute assignment.Michael Koziarski2009-06-101-8/+8
* | Merge branch 'update_all'Emilio Tagua2009-06-101-10/+28
|\ \
| * | Initial update_all migrationEmilio Tagua2009-06-101-10/+28
* | | Use array of orders instead of string concatenationEmilio Tagua2009-06-101-7/+5
|/ /
* | Revert "Use ARel in SQL generation through associations"Emilio Tagua2009-06-101-28/+10