aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Changed ActiveRecord::Base.human_name to underscore the class name before it ↵Justin French2009-06-301-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 Tagua2009-06-305-1/+59
|\| | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb
| * Make sure the wrapped exceptions also have the original exception available.Michael Koziarski2009-06-264-7/+18
| | | | | | | | [#2419 state:committed]
| * Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-263-0/+8
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Translate adapter errors that indicate a violated uniqueness constraint to ↵Michael Schuerig2009-06-265-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 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 ↵Yehuda Katz + Carl Lerche2009-06-224-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 Joyce2009-06-214-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 Wilk2009-06-211-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵Brian Hogan2009-06-211-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure hm:t#create respects source associations hash conditions [#2090 ↵mattbauer2009-06-211-0/+7
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * 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
| | | | | | | | updated Arel version to support this.
* | 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
| | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Leave the quoting part to ARelEmilio Tagua2009-06-125-172/+171
|\|
| * HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation.Adam Milligan2009-06-124-167/+166
| | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * HasOneAssociation inherits AssociationProxy since it shares nothing with ↵Emilio Tagua2009-06-121-5/+5
| | | | | | | | | | | | | | | | BelongsToAssociation. [#2796 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | 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
| | | | | | | | This prevents users from causing NoMethodErrors and the like by editing the parameter names, and closes a potential exploit of CVE-2009-1904.
* | Merge branch 'update_all'Emilio Tagua2009-06-101-10/+28
|\ \
| * | Initial update_all migrationEmilio Tagua2009-06-101-10/+28
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 23:54:44 +0000