Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Add wrap_with_notifications helper to AMo observing | Joshua Peek | 2009-07-20 | 1 | -1/+1 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-20 | 1 | -0/+7 | |
|\| | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | Yehuda Katz | 2009-07-19 | 4 | -10/+43 | |
| |\ | ||||||
| * | | Define ActiveModel API Compliance | Yehuda Katz | 2009-07-20 | 1 | -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#create | Emilio Tagua | 2009-07-20 | 1 | -3/+4 | |
| | | | ||||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-16 | 4 | -9/+35 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Add primary_key option to belongs_to association | Szymon Nowak | 2009-07-15 | 4 | -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 Tagua | 2009-07-16 | 2 | -40/+59 | |
| | | | ||||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-14 | 4 | -115/+26 | |
|\| | | ||||||
| * | | Use map! instead of map for <association>_ids | Pratik Naik | 2009-07-13 | 1 | -2/+2 | |
| | | | ||||||
| * | | Optimize <association>_ids for hm:t with belongs_to source | Pratik Naik | 2009-07-13 | 1 | -1/+8 | |
| |/ | ||||||
| * | Integrate AMo XML serializer into AR | Joshua Peek | 2009-07-11 | 1 | -109/+4 | |
| | | ||||||
| * | Make it so AR attributes which conflict with object-private methods (e.g. ↵ | Sam Goldstein | 2009-07-09 | 1 | -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-07 | 1 | -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 Tagua | 2009-07-06 | 3 | -141/+24 | |
|\| | ||||||
| * | Integrate AMo JSON serializer into AR | Joshua Peek | 2009-07-03 | 3 | -141/+24 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-07-01 | 1 | -0/+7 | |
|\| | ||||||
| * | Added AR:B#dup method for duplicationg object without frozen attributes ↵ | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -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 Tagua | 2009-07-01 | 3 | -18/+19 | |
| | | ||||||
* | | Small refactor to update_all. | Emilio Tagua | 2009-07-01 | 1 | -3/+3 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 4 | -28/+16 | |
|\| | ||||||
| * | Revert "Revert "Generate proper :counter_sql from :finder_sql when there is ↵ | Pratik Naik | 2009-07-01 | 4 | -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 Tagua | 2009-06-30 | 2 | -5/+5 | |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb | |||||
| * | Bump up the version to 3.0.pre | Carl Lerche | 2009-06-30 | 1 | -3/+3 | |
| | | ||||||
| * | Changed ActiveRecord::Base.human_name to underscore the class name before it ↵ | Justin French | 2009-06-30 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | humanizes it This gives you 'Post comment' rather than 'Postcomment' by default. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2120 state:committed] | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 5 | -1/+59 | |
|\| | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb | |||||
| * | Make sure the wrapped exceptions also have the original exception available. | Michael Koziarski | 2009-06-26 | 4 | -7/+18 | |
| | | | | | | | | [#2419 state:committed] | |||||
| * | Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions. | Michael Schuerig | 2009-06-26 | 3 | -0/+8 | |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | Translate adapter errors that indicate a violated uniqueness constraint to ↵ | Michael Schuerig | 2009-06-26 | 5 | -1/+40 | |
| | | | | | | | | | | | | ActiveRecord::RecordNotUnique exception derived from ActiveReecord::StatementInvalid. Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | | Refactoring: Calculations now use construct_finder_sql instead they own method. | Emilio Tagua | 2009-06-23 | 2 | -25/+8 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-23 | 6 | -7/+11 | |
|\| | ||||||
| * | Revert "Generate proper :counter_sql from :finder_sql when there is a ↵ | Yehuda Katz + Carl Lerche | 2009-06-22 | 4 | -16/+28 | |
| | | | | | | | | | | | | | | | | newline character immediately following 'SELECT' [#2118 state:resolved]" This reverts commit 4851ca9e13a4317342df02ae25b1929340523f7a. The tests do not pass for postgresql. | |||||
| * | Generate proper :counter_sql from :finder_sql when there is a newline ↵ | Patrick Joyce | 2009-06-21 | 4 | -28/+16 | |
| | | | | | | | | | | | | character immediately following 'SELECT' [#2118 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | Fixed a bug where create_table could not be called without a block [#2221 ↵ | Joseph Wilk | 2009-06-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵ | Brian Hogan | 2009-06-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | Ensure hm:t#create respects source associations hash conditions [#2090 ↵ | mattbauer | 2009-06-21 | 1 | -0/+7 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | Simplify AMo validation attribute reader | Joshua Peek | 2009-06-17 | 1 | -4/+0 | |
| | | ||||||
| * | Updated require for AMo move | Yehuda Katz + Carl Lerche | 2009-06-17 | 1 | -1/+1 | |
| | | ||||||
| * | Move model naming into ActiveModel | Joshua Peek | 2009-06-17 | 1 | -0/+1 | |
| | | ||||||
* | | Removed unused methods. | Emilio Tagua | 2009-06-23 | 3 | -106/+1 | |
| | | ||||||
* | | Arel now buils SQL queries for associations. Removed old code and | Emilio Tagua | 2009-06-23 | 3 | -67/+6 | |
| | | | | | | | | updated Arel version to support this. | |||||
* | | Removed old commented code | Emilio Tagua | 2009-06-23 | 1 | -21/+0 | |
| | | ||||||
* | | Forget about auto scope, it's always explicit. | Emilio Tagua | 2009-06-17 | 1 | -7/+6 | |
| | | ||||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-16 | 3 | -4/+7 | |
|\| | ||||||
| * | uses Object#metaclass and Object#class_eval in a few spots | Xavier Noria | 2009-06-12 | 3 | -4/+7 | |
| | | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | Leave the quoting part to ARel | Emilio Tagua | 2009-06-12 | 5 | -172/+171 | |
|\| | ||||||
| * | HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation. | Adam Milligan | 2009-06-12 | 4 | -167/+166 | |
| | | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | HasOneAssociation inherits AssociationProxy since it shares nothing with ↵ | Emilio Tagua | 2009-06-12 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | BelongsToAssociation. [#2796 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-12 | 4 | -98/+6 | |
|\| | ||||||
| * | Move observing notify helper into AMo | Joshua Peek | 2009-06-11 | 1 | -5/+0 | |
| | |