aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options ↵Jeroen van Dijk2010-06-214-30/+36
| | | | | | | | | | | | | | | | hash and make various Validators pass their (filtered) options. This makes it possible to pass additional options through Validators to message generation. E.g. plugin authors want to add validates_presence_of :foo, :format => "some format". Also, cleanup the :default vs :message options confusion in ActiveModel validation message generation. Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in favor of ActiveModel::Errors#add_on_blank(attributes, options). Also, refactoring of ActiveModel and ActiveRecord Validation tests. Test are a lot more DRY now. Better test coverage as well now. The first four points were reapplied from an older patch of Sven Fuchs which didn't apply cleanly anymore and was not complete yet. Signed-off-by: José Valim <jose.valim@gmail.com>
* Don't waste time building relations if there are no values presents. [#4860 ↵Emilio Tagua2010-06-211-4/+4
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-06-2025-137/+131
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * Fix problem with migrations template that can cause bogus code to be createdSteve Abatangle2010-06-201-4/+8
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * remove executable permission from files that don't need it. [#4802 ↵rohit2010-06-206-0/+0
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Refactor build_arel: move joins out and simplify havings. [#4860 state:resolved]Emilio Tagua2010-06-201-46/+46
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Don't overwrite unsaved updates when loading an association but preserve the ↵James Le Cuirot2010-06-203-3/+28
| | | | | | | | | | | | | | | | order of the loaded records. Reapplied from before but now allows already-saved records to be refreshed. [#4830 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-205-14/+21
| |\
| | * Fix test which prevents connection reset on failing and remove hardcoded ↵Master Lambaster2010-06-181-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | connection [#4689 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * Fix bug with rolling back frozen attributes.Brian Durand2010-06-184-6/+14
| | | | | | | | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | ActiveModel::Validations::Callbacks should not be required by default.José Valim2010-06-192-9/+2
| | |
| * | moving before_validation and after_validation functionality from ↵Neeraj Singh2010-06-193-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord to ActiveModel [#4653 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Clear DescendantsTracker on each request.José Valim2010-06-191-1/+0
| | |
| * | ActiveRecord and ActionPack now use the new descendants implementation.José Valim2010-06-194-38/+7
| |/
| * setting the timezone in postgres to whatever ruby thinks the timezone is ↵Aaron Patterson2010-06-172-1/+11
| | | | | | | | | | | | [#4895 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * documents how to run an individual test in ARXavier Noria2010-06-171-0/+2
| |
| * pdoc tasks publishe APIs in api.rubyonrails.orgXavier Noria2010-06-161-1/+1
| |
| * use RDoc 2.2 to generate the documentation of individual componentsXavier Noria2010-06-161-1/+2
| |
| * use assert_in_delta() for floating point comparisons in tests [#4871 ↵Aaron Patterson2010-06-161-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Carl Lerche <carllerche@mac.com>
* | All scopes are now cross-referenced.Rizwan Reza2010-06-211-4/+4
| |
* | Missing quote and indentation wrongMalcolm Locke2010-06-171-2/+2
| |
* | Adds backslash to scope for cross-references.Rizwan Reza2010-06-161-1/+1
| |
* | Adds title to activerecord/lib/active_record/associations/*Rizwan Reza2010-06-1610-0/+12
| |
* | Adds title to the rest of the files in activerecord/libRizwan Reza2010-06-162-2/+7
| |
* | Adds title and proper formatting to docs.Rizwan Reza2010-06-164-6/+25
| |
* | Adds title where needed.Rizwan Reza2010-06-162-6/+11
| |
* | Adds basic description and title.Rizwan Reza2010-06-164-17/+38
| |
* | Adds title and minor changes.Rizwan Reza2010-06-165-17/+30
| |
* | Adds title.Rizwan Reza2010-06-152-36/+65
| |
* | Added typewriter tag to code.Rizwan Reza2010-06-151-2/+3
| |
* | Added description and title to Dynamic Scope MatchRizwan Reza2010-06-151-0/+7
| |
* | Adds title and basic description where needed.Rizwan Reza2010-06-157-0/+13
| |
* | Active Record Associations - minor change of DeleteRestrictionError doc for ↵Bryan Woods2010-06-151-1/+1
| | | | | | | | clarity
* | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-158-20/+20
|\ \
| * | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-118-20/+20
| | |
* | | Revert "removing the extra \"Neeraj Singh2010-06-151-1/+1
| | | | | | | | | | | | This reverts commit 51a9703b1e80caa30d699f30615f023079874623.
* | | Merge branch 'master' of github.com:lifo/docrailsNeeraj Singh2010-06-159-40/+43
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'rails/master'Xavier Noria2010-06-141-18/+21
| |\ \
| | * | refactors AR::Base#reset_table_nameXavier Noria2010-06-141-19/+20
| | | |
| | * | Documentation for #quoted_table_name methodThiago Pradi2010-06-141-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-148-22/+22
| |/ / | | | | | | | | | not "ActiveRecord"
* / / removing the extra \Neeraj Singh2010-06-151-1/+1
|/ /
* | Revert "Revert "Validators should at model level and not at AR:Base level ↵wycats2010-06-121-0/+10
| | | | | | | | | | | | [Closes #4804]"" This reverts commit d67549306567b219089f2355fe432d31d0ebf8a1.
* | Revert "Validators should at model level and not at AR:Base level [Closes ↵wycats2010-06-121-10/+0
| | | | | | | | | | | | #4804]" This reverts commit e11bb95d56ed77b10d54d9dfe5a3cc4aa48b3a61.
* | Use load_paths on AR benchmarks so it uses the bundler setup instead of ↵José Valim2010-06-121-5/+5
| | | | | | | | system gems.
* | Remove an unused methodPratik Naik2010-06-121-13/+0
| |
* | Revert "Don't overwrite unsaved updates when loading an association but ↵José Valim2010-06-113-17/+3
|/ | | | | | | | preserve the order of the loaded records. [#4642 state:open]" This commit introduced a regression described in ticket [#4830]. This reverts commit 0265c708b9696c3943518ad5f3dabdc22c5eba11.
* class_attribute is not a direct replacement of class_inheritable_*.José Valim2010-06-101-2/+6
| | | | | | If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance.
* Validators should at model level and not at AR:Base level [Closes #4804]Neeraj Singh2010-06-101-0/+10
| | | | | | [#4804 state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Cut down even further on rake -T noiseDavid Heinemeier Hansson2010-06-091-13/+13
|