aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-042-44/+64
|\ | | | | | | | | | | Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb
| * Revert "Fix string interpolation in belongs_to docs"Vijay Dev2012-08-041-1/+1
| | | | | | | | This reverts commit 3fb0100ef893b8cf229e82ce264b426e0c961eb1.
| * Fix string interpolation in belongs_to docsFranco Catena2012-08-011-1/+1
| |
| * fix ActiveRecord::Associations::CollectionProxy documentationAccessd2012-07-311-1/+1
| |
| * update AR::Validations::AssociatedValidator documentation [ci skip]Francesco Rodriguez2012-07-291-13/+19
| |
| * update AR::Validations::UniquenessValidator documentation [ci skip]Francesco Rodriguez2012-07-291-31/+45
| |
| * Revert "Removed reference to composed_of."Rafael Mendonça França2012-07-271-0/+3
| | | | | | | | | | | | This reverts commit c34c1916d1d6cd6ba219aa39eb97fa2e77c4c61f. Reason: composed_of was added from now to discuss better
| * Removed reference to composed_of.Steve Klabnik2012-07-231-3/+0
| | | | | | | | | | It was previously removed from the code, so we shouldn't mention it in the docs
* | Update Migration Docs: Defaults for Boolean FieldsThomas Klemm2012-08-041-1/+1
| | | | | | A Boolean field will accept true or false as defaults instead of 0 / 1.
* | Make ActiveRecord::Model::DeprecationProxy work betterJon Leighton2012-08-032-19/+32
| | | | | | | | Closes #6600
* | Update the docs to reflect the new association APIJon Leighton2012-08-031-190/+80
| |
* | Remove ActiveRecord::Base.to_aJon Leighton2012-08-031-1/+1
| | | | | | | | | | On reflection, it seems like a bit of a weird method to have on ActiveRecord::Base, and it shouldn't be needed most of the time anyway.
* | Allow Relation#merge to take a proc.Jon Leighton2012-08-031-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was requested by DHH to allow creating of one's own custom association macros. For example: module Commentable def has_many_comments(extra) has_many :comments, -> { where(:foo).merge(extra) } end end class Post < ActiveRecord::Base extend Commentable has_many_comments -> { where(:bar) } end
* | Remove `:rails_env` task since it is not needed anymore.Rafael Mendonça França2012-08-021-9/+9
| |
* | load active_support/deprecation in active_support/railsXavier Noria2012-08-0214-14/+0
| |
* | load active_support/core_ext/module/delegation in active_support/railsXavier Noria2012-08-028-8/+0
| |
* | load active_support/core_ext/class/attribute in active_support/railsXavier Noria2012-08-0212-12/+0
| |
* | load active_support/concern in active_support/railsXavier Noria2012-08-0211-11/+0
| |
* | load active_support/core_ext/object/inclusion in active_support/railsXavier Noria2012-08-027-7/+0
| |
* | load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-0220-20/+0
| |
* | Do not consider the numeric attribute as changed if the old value isRafael Mendonça França2012-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zero and the new value is not a string. Before this commit this was the behavior r = Review.find_by_issue(0) r.issue => 0 r.changes => {} r.issue = 0 => 0 r.changed? => true r.changes => {"issue"=>[0,0]} Fixes #7237 Conflicts: activerecord/CHANGELOG.md
* | s/scoped/scope/Jon Leighton2012-08-018-26/+32
| |
* | Add CollectionProxy#scopeJon Leighton2012-08-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to get a Relation from an association. Previously we had a #scoped method, but we're deprecating that for AR::Base, so it doesn't make sense to have it here. This was requested by DHH, to facilitate code like this: Project.scope.order('created_at DESC').page(current_page).tagged_with(@tag).limit(5).scoping do @topics = @project.topics.scope @todolists = @project.todolists.scope @attachments = @project.attachments.scope @documents = @project.documents.scope end
* | Use explicit delegationsJon Leighton2012-08-011-119/+79
| | | | | | | | | | | | | | This makes it easier to see what the documentation refers to. It also means that we are not doing unnecessary work for delegations that have no args / splats / block / etc.
* | Refactor a bitJon Leighton2012-08-011-38/+37
| | | | | | | | | | This doesn't change the exernal behavior, but it moves some code around to where I think it properly belongs.
* | Add `Relation#load`Jon Leighton2012-08-011-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | This method explicitly loads the records and then returns `self`. Rather than deciding between "do I want an array or a relation?", most people are actually asking themselves "do I want to eager load or lazy load?" Therefore, this method provides a way to explicitly eager-load without having to switch from a `Relation` to an array. Example: @posts = Post.where(published: true).load
* | Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-08-013-1/+22
| |
* | Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-018-35/+142
| | | | | | | | | | | | | | | | | | This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370. Conflicts: activerecord/CHANGELOG.md It will be deprecated only in 4.0, and removed properly in 4.1.
* | Merge pull request #7224 from kennyj/move_to_arJosé Valim2012-08-011-15/+21
|\ \ | | | | | | The use_schema_cache_dump configuration moved to ActiveRecord.
| * | The use_schema_cache_dump configuration moved to ActiveRecord.kennyj2012-08-021-15/+21
| | |
* | | Refactor dependency check validationCarlos Antonio da Silva2012-08-014-28/+19
| | | | | | | | | | | | | | | | | | Move the logic for validation check to the same method, and cache dependent option in a variable to reuse inside the dependency configuration methods instead of relying on the options hash.
* | | move method for dependent option checkHrvoje Šimić2012-08-014-11/+22
|/ /
* | fix typo in collection proxyAccessd2012-07-311-1/+1
| |
* | AR::Relation#order: make new order prepend old oneBogdan Gusiev2012-07-312-3/+3
| | | | | | | | | | | | | | User.order("name asc").order("created_at desc") # SELECT * FROM users ORDER BY created_at desc, name asc This also affects order defined in `default_scope` or any kind of associations.
* | Remove the deprecation of update_column.Rafael Mendonça França2012-07-301-5/+0
| | | | | | | | | | | | update_column was suggested as replacement of update_attribute at the last release of 3-2-stable, so deprecating it now will confuse the users.
* | Explaining a bit better about the default behaviour of dependentRodrigo Flores2012-07-281-1/+2
| |
* | Merge pull request #7185 from route/reset_table_name_refactoringRafael Mendonça França2012-07-281-8/+4
|\ \ | | | | | | Refactor to reset_table_name
| * | Refactor to reset_table_nameDmitry Vorotilin2012-07-281-8/+4
| | |
* | | missing require: the AR session store depends on the AP abstract storeXavier Noria2012-07-281-0/+2
|/ / | | | | | | | | | | | | | | This require makes the dependency even more clear. In particular we are eager loading the session store but that does not work if AR is used outside Rails, this patch is preliminary work in fixing #7160.
* | Revert "Removing composed_of from ActiveRecord."Rafael Mendonça França2012-07-279-9/+342
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 14fc8b34521f8354a17e50cd11fa3f809e423592. Reason: we need to discuss a better path from this removal. Conflicts: activerecord/lib/active_record/reflection.rb activerecord/test/cases/base_test.rb activerecord/test/models/developer.rb
* | Merge pull request #6827 from zephyr-dev/masterJosé Valim2012-07-272-0/+65
|\ \ | | | | | | Validates_presence_of associated object marked for destruction
| * | AR has a subclass of AM:PresenceValidator.Brent Wheeldon & Nick Monje2012-07-202-0/+65
| | | | | | | | | | | | | | | | | | | | | This allows us to mark the parent object as invalid if all associated objects in a presence validated association are marked for destruction. See: https://github.com/rails/rails/issues/6812
* | | Changelog and doc updates for the previous changes.Jon Leighton2012-07-271-6/+6
| | |
* | | Deprecate Relation#all.Jon Leighton2012-07-274-17/+4
| | | | | | | | | | | | | | | | | | It has been moved to active_record_deprecated_finders. Use #to_a instead.
* | | Deprecate ActiveRecord::Base.scoped.Jon Leighton2012-07-275-13/+5
| | | | | | | | | | | | | | | | | | | | | It doesn't serve much purpose now that ActiveRecord::Base.all returns a Relation. The code is moved to active_record_deprecated_finders.
* | | ActiveRecord::Base.all returns a Relation.Jon Leighton2012-07-272-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it returned an Array. If you want an array, call e.g. `Post.to_a` rather than `Post.all`. This is more explicit. In most cases this should not break existing code, since Relations use method_missing to delegate unknown methods to #to_a anyway.
* | | Only require the `:rails_env` task where is needed.Rafael Mendonça França2012-07-271-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:rails_env` tasks is not needed in all the tasks that depends of `load_config`, only in the tasks that uses `Rails.env`. Since `:rails_env` task set the `Rails.env` to be "development" if it is not set we don't need the `||` statements too Fix #7175. Conflicts: activerecord/lib/active_record/railties/databases.rake
* | | Refactor ActiveRecord::Inheritance.base_class logicbeerlington2012-07-261-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Moved logic from class_of_active_record_descendant(class) to the base_class method. This method was confusing because it required an argument, but that argument was 'self'. Moved base_class tests to inheritance_test.rb and added some test coverage for some untested cases.
* | | Missed extend for eager_autoloadDmitry Vorotilin2012-07-261-0/+1
| | |
* | | Merge pull request #7161 from ↵Jon Leighton2012-07-261-5/+7
|\ \ \ | | | | | | | | | | | | | | | | michaelfairley/eager_load_active_record_association_helpers Eager autoload ActiveRecord association helpers