aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'tago'José Valim2010-06-262-4/+63
|\
| * Add column and index query methods to ActiveRecord::SchemaAndrew White2010-06-262-4/+63
| | | | | | | | | | | | [#4219 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | index dump should not include full text indexes. Thanks Ken Mayer for the ↵Aaron Patterson2010-06-261-8/+3
| | | | | | | | | | | | original patch! [#4949 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | reorder method added to ActiveRelationSantiago Pastorino2010-06-261-0/+8
|/ | | | | | [#4972 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* Support for multiple selects addedNeeraj Singh and Santiago Pastorino2010-06-251-4/+7
| | | | [#4841 state:committed]
* Makes a build_select for the select part of build_arelSantiago Pastorino2010-06-251-10/+13
|
* Metaprogramming not needed hereSantiago Pastorino2010-06-251-11/+9
|
* Avoid a blank line before the add/remove columnsSantiago Pastorino2010-06-251-2/+2
|
* Line break in migration template and nicer code indentationŁukasz Strzałkowski2010-06-251-6/+8
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'miloops/fixes'José Valim2010-06-247-20/+18
|\
| * Only yield block if given.Emilio Tagua2010-06-241-2/+2
| |
| * Remove block definitions in finder methods.Emilio Tagua2010-06-241-4/+4
| |
| * Remove block definition from method, is not needed since yield is used inside.Emilio Tagua2010-06-243-3/+3
| |
| * Don't define block, just yield if block is given.Emilio Tagua2010-06-241-7/+7
| |
| * Remove deprecated block usage in composed_of.Emilio Tagua2010-06-241-4/+2
| |
* | Your original TIME ZONE value on PostgreSQL is correctly restored now, after ↵Santiago Pastorino2010-06-241-3/+5
| | | | | | | | | | | | | | | | going through options :utc and then going back to :local [#4950 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* | quotes are not necessary hereSantiago Pastorino2010-06-241-2/+2
|/ | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing ↵José Valim2010-06-244-35/+33
| | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved]
* Remove incorrect comment regarding #initialize_copyPaul Gillard2010-06-231-8/+0
| | | | | | Comment added in #3164 is incorrect after reading http://dev.rubyonrails.org/ticket/7191. Signed-off-by: José Valim <jose.valim@gmail.com>
* Sessions should not be created until written to and session data should be ↵Michael Lovitt2010-06-231-0/+8
| | | | | | | | destroyed on reset. [#4938] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* adding fix for to_xml for ActiveRecord relation objectNeeraj Singh2010-06-231-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* ActiveRecord's relation object should respond to to_json and to_yamlNeeraj Singh2010-06-231-1/+1
| | | | | | [#4547 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Patch for Namespace problem in Scaffold. [#4763 state:resolved]Mohammed Siddick.E2010-06-231-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Don't clone associations [#4894 state:resolved]Paul Gillard2010-06-231-0/+1
| | | | | | Cloning an active record object should be shallow in that it should copy attributes but not associations. This was no longer true as a result of #3164. Signed-off-by: José Valim <jose.valim@gmail.com>
* remove_column should raise an ArgumentError when no columns are passed ↵Jeff Dean2010-06-232-0/+2
| | | | | | [#4803 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Fix connection reloading in development mode. [#4929 state:resolved]Edgars Beigarts2010-06-222-3/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix small bug where ActiveRecord::PredicateBuilder#build_from_hash didn't ↵James Harton2010-06-221-1/+1
| | | | | | test for Arel::Relation as right hand value. [#4917 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix order method to accept relation attributes.Emilio Tagua2010-06-221-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options ↵Jeroen van Dijk2010-06-212-2/+2
| | | | | | | | | | | | | | | | 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-2013-116/+79
|\ | | | | | | | | 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-203-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-201-1/+5
| | | | | | | | | | | | | | | | 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-202-2/+3
| |\
| | * Fix bug with rolling back frozen attributes.Brian Durand2010-06-182-2/+3
| | | | | | | | | | | | | | | | | | [#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-193-34/+7
| |/
| * setting the timezone in postgres to whatever ruby thinks the timezone is ↵Aaron Patterson2010-06-171-1/+6
| | | | | | | | | | | | [#4895 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | 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
| |