aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-05-185-10/+18
|\ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-2/+2
| |\
| | * Remove unnecessary condition and local variable [#2602 state:resolved]Emilio Tagua2009-05-181-2/+2
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-182-1/+8
| |\|
| | * Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵Luca Guidi2009-05-181-0/+7
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Make sure default_scope#create checks for options[:conditions] [#2181 ↵Pratik Naik2009-05-181-1/+1
| | | | | | | | | | | | state:resolved] [James Le Cuirot]
| * | Reimplement Fixtures.identify so that it consistently generates identities ↵Ken Collins2009-05-181-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Missing 1.8.7 backport extensionsJeremy Kemper2009-05-182-0/+3
| | |
| * | Revert "Get AR CI passing again by requiring the entire core_ext"Jeremy Kemper2009-05-181-3/+0
| |/ | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547.
* | Merge commit 'rails/master'Emilio Tagua2009-05-1824-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 Floering2009-05-181-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix reset_session with ActiveRecord store [#2200 state:resolved]Joshua Peek2009-05-171-1/+9
| |
| * Implement #many? for NamedScope and AssociationCollection using #size [#1500 ↵Chris Kampmeier2009-05-172-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 Guettler2009-05-171-8/+8
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Get AR CI passing again by requiring the entire core_extYehuda Katz2009-05-161-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 Lerche2009-05-142-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 Marklund2009-05-141-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 extensionsJeremy Kemper2009-05-1320-30/+62
| |
| * Remove support for deprecated validation message interpolation formatJeremy Kemper2009-05-132-27/+0
| |
* | Merge commit 'rails/master'Emilio Tagua2009-05-1220-122/+142
|\|
| * Use DependencyModule for included hooks in ActiveRecordBryan Helmkamp2009-05-1119-113/+104
| |
| * Revert "Fixed bug with polymorphic has_one :as pointing to an STI record"Jeremy Kemper2009-05-111-1/+1
| | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5.
| * Allow you to pass :all_blank to :reject_if option to automatically create a ↵Mike Breen2009-05-101-1/+10
| | | | | | | | Proc that will reject any record with blank attributes.
| * Fixed eager load error on find with include => [:table_name] and hash ↵Anthony Crumley2009-05-101-4/+16
| | | | | | | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * honour :inverse_of for joins based includeFrederick Cheung2009-05-101-2/+8
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * honour inverse_of when preloading associationsFrederick Cheung2009-05-101-1/+3
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | Refactor to calculations. Migration's versions are string not integer. ARel ↵Emilio Tagua2009-05-063-24/+23
| | | | | | | | submodule updated.
* | Merge commit 'rails/master'Emilio Tagua2009-05-058-12/+81
|\|
| * Providing support for :inverse_of as an option to associations.Murray Steele2009-05-048-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 Tagua2009-05-042-17/+28
| | | | | | | | | | | | Calculations now use construct_calculation_arel, making construct_finder_arel less hackish. Updated ARel to support PostgreSQL.
* | Merge commit 'rails/master'Emilio Tagua2009-05-041-9/+3
|\|
| * Don't use #tap before Active Support is available, since older versions of ↵Chris Kampmeier2009-05-041-3/+2
| | | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Check for sibling Active Support firstJeremy Kemper2009-05-021-8/+3
| |
* | Revert "Work around count returning string (bug)"Emilio Tagua2009-05-021-1/+1
| | | | | | | | This reverts commit 4bb6f77059a34ea7c8575523397032b4cc67e00a.
* | Refactor to use arel_table method, and also use the same method name for ↵Emilio Tagua2009-05-023-21/+18
| | | | | | | | instance and class methods.
* | Removed ARel table assignmentEmilio Tagua2009-05-021-1/+0
| |
* | Merge commit 'rails/master'Emilio Tagua2009-05-024-10/+11
|\|
| * Fixed bug with polymorphic has_one :as pointing to an STI recordRuy Asan2009-05-011-1/+1
| | | | | | | | | | | | [#2594 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Default scope :order should be overridden by named scopes.Alexander Podgorbunsky2009-05-011-2/+2
| | | | | | | | | | | | [#2346 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Ensure ActiveRecord::Base.connection_pool.with_connection creates a new ↵steve2009-05-011-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 Collins2009-05-011-2/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Explicitly require builder for to_xmlJeremy Kemper2009-04-301-0/+2
| |
* | Explicitly require builder for to_xmlJeremy Kemper2009-04-301-0/+2
| |
* | Work around count returning string (bug)Jeremy Kemper2009-04-301-1/+1
| |
* | exists? method now uses ARelEmilio Tagua2009-04-301-10/+5
| |
* | Added arel_attributes_values methods, refactored locking and AR#update to ↵Emilio Tagua2009-04-302-17/+24
| | | | | | | | use this method
* | Merge commit 'rails/master'Emilio Tagua2009-04-293-12/+19
|\|
| * Show executed queries when assert_sql assertion fails [#2573 state:resolved]Emilio Tagua2009-04-281-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure the parent record is always saved when the child is invalid. [#2249 ↵Eloy Duran2009-04-271-5/+9
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix differing rails_to_json arityJeremy Kemper2009-04-261-3/+6
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 12:29:36 +0000