Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 5 | -10/+18 |
|\ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 1 | -2/+2 |
| |\ | |||||
| | * | Remove unnecessary condition and local variable [#2602 state:resolved] | Emilio Tagua | 2009-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 2 | -1/+8 |
| |\| | |||||
| | * | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵ | Luca Guidi | 2009-05-18 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Make sure default_scope#create checks for options[:conditions] [#2181 ↵ | Pratik Naik | 2009-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] [James Le Cuirot] | ||||
| * | | Reimplement Fixtures.identify so that it consistently generates identities ↵ | Ken Collins | 2009-05-18 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Missing 1.8.7 backport extensions | Jeremy Kemper | 2009-05-18 | 2 | -0/+3 |
| | | | |||||
| * | | Revert "Get AR CI passing again by requiring the entire core_ext" | Jeremy Kemper | 2009-05-18 | 1 | -3/+0 |
| |/ | | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 24 | -75/+109 |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb | ||||
| * | Fixed limited eager loading associations with numbers in the name [#2668 ↵ | Benjamin Floering | 2009-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix reset_session with ActiveRecord store [#2200 state:resolved] | Joshua Peek | 2009-05-17 | 1 | -1/+9 |
| | | |||||
| * | Implement #many? for NamedScope and AssociationCollection using #size [#1500 ↵ | Chris Kampmeier | 2009-05-17 | 2 | -1/+19 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | has_one :through should not create a new association when assigned nil [#698 ↵ | Daniel Guettler | 2009-05-17 | 1 | -8/+8 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Get AR CI passing again by requiring the entire core_ext | Yehuda Katz | 2009-05-16 | 1 | -0/+3 |
| | | | | | | | | | | Note that this includes Time and Date; we should really figure out what parts of core_ext are really required for AR and require just those. | ||||
| * | Merge commit 'origin/master' | Yehuda Katz + Carl Lerche | 2009-05-14 | 2 | -12/+7 |
| |\ | | | | | | | | | | | | | | | | 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 Marklund | 2009-05-14 | 1 | -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 extensions | Jeremy Kemper | 2009-05-13 | 20 | -30/+62 |
| | | |||||
| * | Remove support for deprecated validation message interpolation format | Jeremy Kemper | 2009-05-13 | 2 | -27/+0 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-12 | 20 | -122/+142 |
|\| | |||||
| * | Use DependencyModule for included hooks in ActiveRecord | Bryan Helmkamp | 2009-05-11 | 19 | -113/+104 |
| | | |||||
| * | Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" | Jeremy Kemper | 2009-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5. | ||||
| * | Allow you to pass :all_blank to :reject_if option to automatically create a ↵ | Mike Breen | 2009-05-10 | 1 | -1/+10 |
| | | | | | | | | Proc that will reject any record with blank attributes. | ||||
| * | Fixed eager load error on find with include => [:table_name] and hash ↵ | Anthony Crumley | 2009-05-10 | 1 | -4/+16 |
| | | | | | | | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | honour :inverse_of for joins based include | Frederick Cheung | 2009-05-10 | 1 | -2/+8 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | honour inverse_of when preloading associations | Frederick Cheung | 2009-05-10 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Refactor to calculations. Migration's versions are string not integer. ARel ↵ | Emilio Tagua | 2009-05-06 | 3 | -24/+23 |
| | | | | | | | | submodule updated. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-05 | 8 | -12/+81 |
|\| | |||||
| * | Providing support for :inverse_of as an option to associations. | Murray Steele | 2009-05-04 | 8 | -12/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now add an :inverse_of option to has_one, has_many and belongs_to associations. This is best described with an example: class Man < ActiveRecord::Base has_one :face, :inverse_of => :man end class Face < ActiveRecord::Base belongs_to :man, :inverse_of => :face end m = Man.first f = m.face Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again). With these new :inverse_of options m and f.man are the same in memory instance. Currently :inverse_of supports has_one and has_many (but not the :through variants) associations. It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic. Signed-off-by: Murray Steele <muz@h-lame.com> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Fixes to have all test passing on PostgreSQL. | Emilio Tagua | 2009-05-04 | 2 | -17/+28 |
| | | | | | | | | | | | | Calculations now use construct_calculation_arel, making construct_finder_arel less hackish. Updated ARel to support PostgreSQL. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-04 | 1 | -9/+3 |
|\| | |||||
| * | Don't use #tap before Active Support is available, since older versions of ↵ | Chris Kampmeier | 2009-05-04 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Check for sibling Active Support first | Jeremy Kemper | 2009-05-02 | 1 | -8/+3 |
| | | |||||
* | | Revert "Work around count returning string (bug)" | Emilio Tagua | 2009-05-02 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 4bb6f77059a34ea7c8575523397032b4cc67e00a. | ||||
* | | Refactor to use arel_table method, and also use the same method name for ↵ | Emilio Tagua | 2009-05-02 | 3 | -21/+18 |
| | | | | | | | | instance and class methods. | ||||
* | | Removed ARel table assignment | Emilio Tagua | 2009-05-02 | 1 | -1/+0 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-02 | 4 | -10/+11 |
|\| | |||||
| * | Fixed bug with polymorphic has_one :as pointing to an STI record | Ruy Asan | 2009-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | [#2594 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Default scope :order should be overridden by named scopes. | Alexander Podgorbunsky | 2009-05-01 | 1 | -2/+2 |
| | | | | | | | | | | | | [#2346 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Ensure ActiveRecord::Base.connection_pool.with_connection creates a new ↵ | steve | 2009-05-01 | 1 | -5/+6 |
| | | | | | | | | | | | | connection only when needed [#1752 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Use table_exists? in #initialize_schema_migrations_table [#1923 state:resolved] | Ken Collins | 2009-05-01 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Explicitly require builder for to_xml | Jeremy Kemper | 2009-04-30 | 1 | -0/+2 |
| | | |||||
* | | Explicitly require builder for to_xml | Jeremy Kemper | 2009-04-30 | 1 | -0/+2 |
| | | |||||
* | | Work around count returning string (bug) | Jeremy Kemper | 2009-04-30 | 1 | -1/+1 |
| | | |||||
* | | exists? method now uses ARel | Emilio Tagua | 2009-04-30 | 1 | -10/+5 |
| | | |||||
* | | Added arel_attributes_values methods, refactored locking and AR#update to ↵ | Emilio Tagua | 2009-04-30 | 2 | -17/+24 |
| | | | | | | | | use this method | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-04-29 | 3 | -12/+19 |
|\| | |||||
| * | Show executed queries when assert_sql assertion fails [#2573 state:resolved] | Emilio Tagua | 2009-04-28 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure the parent record is always saved when the child is invalid. [#2249 ↵ | Eloy Duran | 2009-04-27 | 1 | -5/+9 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix differing rails_to_json arity | Jeremy Kemper | 2009-04-26 | 1 | -3/+6 |
| | |