aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* revises recent commit related to :uniq => trueXavier Noria2010-07-101-1/+1
|
* expanding on :uniq option in has_manyNeeraj Singh2010-07-091-1/+1
|
* Merge remote branch 'docrails/master'Xavier Noria2010-07-091-2/+7
|\
| * copy-edits some docsXavier Noria2010-07-081-6/+5
| |
| * Merge branch 'master' of github.com:lifo/docrailsNeeraj Singh2010-07-086-15/+28
| |\
| * | clarifying how to create non standard primary keyNeeraj Singh2010-07-081-1/+7
| | |
* | | Refactor previous commits a bit.José Valim2010-07-081-7/+10
| | |
* | | Return from ActiveRecord::Base#attributes= unless value is a hash [#4070 ↵David Trasbo2010-07-081-1/+1
| | | | | | | | | | | | | | | | | | state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | reset_counter should work with non-traditional belongs_to and polymorphic ↵Neeraj Singh2010-07-081-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | belongs_to [#4984 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Improve a bit the code in latest commits.José Valim2010-07-082-20/+16
| | |
* | | This patch changes update_attribute implementatino so:Neeraj Singh2010-07-082-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - it will only save the attribute it has been asked to save and not all dirty attributes - it does not invoke callbacks - it does change updated_at/on Signed-off-by: José Valim <jose.valim@gmail.com>
* | | consolidating updated_at and updated_onNeeraj Singh2010-07-081-9/+16
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Eager loading :through associations will join the :source model if there are ↵Grant Ammons2010-07-081-1/+6
| | | | | | | | | | | | | | | | | | :conditions. [#2362 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Fix the #using_limitable_reflections? helper to work correctly by not ↵Ken Collins2010-07-081-1/+1
| | | | | | | | | | | | | | | | | | examining the length of an array which contains false/true, hence always passing. [#4869 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | removed an old unused method in AR which removed readonly attributesJosh Kalderimis2010-07-081-9/+0
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | removing unused methodNeeraj Singh2010-07-081-5/+0
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | moving parse_sqlite_config to the sqlite3_connection method (where it ↵Aaron Patterson2010-07-082-20/+11
| | | | | | | | | | | | | | | | | | belongs) [#5071 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | | removing useless code. [#5070 state:resolved]Aaron Patterson2010-07-081-2/+1
| | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | | fix ActiveRecord `destroy_all` so it returns destroyed recordsMislav Marohnić2010-07-082-5/+5
| | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | | mass_assignment_security moved from AR to AMo, and minor test cleanupJosh Kalderimis2010-07-085-214/+1
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | minor changes to mass assignment security patch to bring it in line with ↵Josh Kalderimis2010-07-084-118/+99
| | | | | | | | | | | | | | | | | | rails standards Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Mass assignment security refactoringEric Chapweske2010-07-085-133/+243
| |/ |/| | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge remote branch 'docrails/master'Xavier Noria2010-07-072-2/+8
|\|
| * added more info about << operation in associationsNeeraj Singh2010-07-061-0/+4
| |
| * clarifying the comments regarding base_class declarationNeeraj Singh2010-07-011-2/+4
| |
* | documents automatic management of join models in hmt associations, in ↵Xavier Noria2010-07-061-4/+11
| | | | | | | | particular the gotcha that deletion is direct
* | Define a convention for descendants and subclasses.José Valim2010-07-051-3/+3
| | | | | | | | | | | | The former should be symmetric with ancestors and include all children. However, it should not include self since ancestors + descendants should not have duplicated. The latter is symmetric to superclass in the sense it only includes direct children. By adopting a convention, we expect to have less conflict with other frameworks, as Datamapper. For this moment, to ensure ActiveModel::Validations can be used with Datamapper, we should always call ActiveSupport::DescendantsTracker.descendants(self) internally instead of self.descendants avoiding conflicts.
* | Avoid calls to Rails::Application since this is not the official API.José Valim2010-07-011-1/+1
| | | | | | | | Your application should *always* reference your application const (as Blog::Application) and Rails.application should be used just internally.
* | Don't remove scheduled destroys when loading an association. [#4642 ↵James Le Cuirot2010-07-011-1/+6
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Make relation a private method.José Valim2010-07-012-6/+7
|/
* Merge remote branch 'rails/master'Xavier Noria2010-06-3012-74/+165
|\
| * Support any mysql-like adapterJeremy Kemper2010-06-301-7/+7
| |
| * AssociationCollection#create_by_*, find_or_create_by_* work properly now. ↵Aaron Patterson2010-06-291-0/+11
| | | | | | | | | | | | [#1108 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * migrations.rb requires active_support/core_ext/module/aliasing [#5008 ↵Tekin2010-06-301-0/+1
| | | | | | | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com>
| * Fixed error when removing an index from a table name values, which is a ↵J. Pablo Fernández2010-06-291-1/+1
| | | | | | | | | | | | reserved word, with test. Signed-off-by: José Valim <jose.valim@gmail.com>
| * No need to check if the attribute exists (this is the same behavior as in ↵José Valim2010-06-291-3/+1
| | | | | | | | 2.3) [#4994 state:resolved] and [#5003 state:resolved]
| * array subtraction should be faster than iterating over all the elementsNeeraj Singh2010-06-291-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * splitting a really long line into multiple lines which is easy on eyesNeeraj Singh2010-06-291-1/+5
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Remove ActiveRecord::Base#class_name [#379 state:committed]David Trasbo2010-06-291-8/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Tidy up deprecation message for with_exclusive_scope.José Valim2010-06-292-11/+12
| |
| * Add scoping and unscoped as the syntax to replace the old with_scope and ↵José Valim2010-06-295-44/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with_exclusive_scope. A few examples: * with_scope now should be scoping: Before: Comment.with_scope(:find => { :conditions => { :post_id => 1 } }) do Comment.first #=> SELECT * FROM comments WHERE post_id = 1 end After: Comment.where(:post_id => 1).scoping do Comment.first #=> SELECT * FROM comments WHERE post_id = 1 end * with_exclusive_scope now should be unscoped: class Post < ActiveRecord::Base default_scope :published => true end Post.all #=> SELECT * FROM posts WHERE published = true Before: Post.with_exclusive_scope do Post.all #=> SELECT * FROM posts end After: Post.unscoped do Post.all #=> SELECT * FROM posts end Notice you can also use unscoped without a block and it will return an anonymous scope with default_scope values: Post.unscoped.all #=> SELECT * FROM posts
| * Remove unneeded rejectSantiago Pastorino2010-06-281-8/+1
| |
| * with_exclusive_scope does not work properly if ARel is passed. It does work ↵Neeraj Singh2010-06-291-0/+13
| | | | | | | | | | | | | | | | nicely if hash is passed. Blow up if user is attempting it pass ARel to with_exclusive_scope. [#3838 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Avoid "no such table" exception when schema migrations table does not existAkira Matsuda2010-06-271-0/+5
| | | | | | | | | | | | [#4990 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Use ActiveRecord::Migrator.schema_migrations_table_name instead of ↵Akira Matsuda2010-06-271-1/+1
| | | | | | | | | | | | hardcoding "schema_migrations" Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Add missing require, Base use deprecate methodSantiago Pastorino2010-06-271-0/+1
| |
| * rake db:migrate:status displays status of migrations [#4947 state:resolved]Kevin Skoglund2010-06-281-0/+25
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Warn that ActiveRecord::Base.reset_subclasses is gone in Rails 3 final.Jeremy Kemper2010-06-271-0/+12
| |
* | accepts_nested_attributes_for typoAdam Meehan2010-06-291-1/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-06-2825-195/+279
|\