aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
Commit message (Collapse)AuthorAgeFilesLines
* 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-011-14/+15
| |
* | Small refactor to update_all.Emilio Tagua2009-07-011-3/+3
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-301-2/+2
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb
| * 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-301-0/+19
|\| | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb
| * Make sure the wrapped exceptions also have the original exception available.Michael Koziarski2009-06-261-2/+13
| | | | | | | | [#2419 state:committed]
| * Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-261-0/+4
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Translate adapter errors that indicate a violated uniqueness constraint to ↵Michael Schuerig2009-06-261-0/+4
| | | | | | | | | | | | 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-231-6/+4
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-231-0/+1
|\|
| * Move model naming into ActiveModelJoshua Peek2009-06-171-0/+1
| |
* | Removed unused methods.Emilio Tagua2009-06-231-67/+1
| |
* | 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-161-1/+2
|\|
| * uses Object#metaclass and Object#class_eval in a few spotsXavier Noria2009-06-121-1/+2
| | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge commit 'rails/master'Emilio Tagua2009-06-121-1/+1
|\|
| * Integrate ActiveModel::Observing into ActiveRecordJoshua Peek2009-06-101-1/+1
| |
* | 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
| | |
* | | 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
| | | | | | | | This reverts commit 7be3e3ba0547587313d87bccb788a8466a62628a.
* | Use ARel in SQL generation through associationsEmilio Tagua2009-06-101-10/+28
| |
* | Set ActiveRecord as Arel engine on load.Emilio Tagua2009-06-021-2/+2
| |
* | Refactors to work with latest Arel implementation.Emilio Tagua2009-06-021-4/+8
| |
* | Merge commit 'rails/master'Emilio Tagua2009-05-261-1/+1
|\|
| * Remove 'core' fluff. Hookable ActiveSupport.load_all!Jeremy Kemper2009-05-201-1/+1
| |
* | Merge commit 'rails/master'Emilio Tagua2009-05-181-3/+4
|\| | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-2/+2
| |\
| | * Remove unnecessary condition and local variable [#2602 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-1/+1
| |\|
| | * Make sure default_scope#create checks for options[:conditions] [#2181 ↵Pratik Naik2009-05-181-1/+1
| | | | | | | | | | | | state:resolved] [James Le Cuirot]
| * | Missing 1.8.7 backport extensionsJeremy Kemper2009-05-181-0/+1
| |/
* | Merge commit 'rails/master'Emilio Tagua2009-05-181-10/+19
|\| | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-141-9/+4
| |\ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb
| | * Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵Peter Marklund2009-05-141-8/+3
| |/ | | | | | | | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed]
| * Cherry-pick core extensionsJeremy Kemper2009-05-131-6/+15
| |
* | Fixes to have all test passing on PostgreSQL.Emilio Tagua2009-05-041-11/+6
| | | | | | | | | | | | Calculations now use construct_calculation_arel, making construct_finder_arel less hackish. Updated ARel to support PostgreSQL.
* | Revert "Work around count returning string (bug)"Emilio Tagua2009-05-021-1/+1
| | | | | | | | This reverts commit 4bb6f77059a34ea7c8575523397032b4cc67e00a.
* | Refactor to use arel_table method, and also use the same method name for ↵Emilio Tagua2009-05-021-6/+5
| | | | | | | | instance and class methods.
* | Work around count returning string (bug)Jeremy Kemper2009-04-301-1/+1
| |
* | exists? method now uses ARelEmilio Tagua2009-04-301-10/+5
| |
* | Added arel_attributes_values methods, refactored locking and AR#update to ↵Emilio Tagua2009-04-301-9/+23
| | | | | | | | use this method
* | Calculations now use Arel to construct the query.Emilio Tagua2009-04-291-13/+18
| | | | | | | | Implemented other methods in AR::Base with Arel support.
* | construct_finder_sql now use ArelEmilio Tagua2009-04-241-21/+86
|/
* Opt in to DependenciesJeremy Kemper2009-04-221-0/+1
|