aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-05-185-10/+18
|\
| * 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
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-182-1/+8
| |\|
| | * Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 state:r...Luca Guidi2009-05-181-0/+7
| | * Make sure default_scope#create checks for options[:conditions] [#2181 state:r...Pratik Naik2009-05-181-1/+1
| * | Reimplement Fixtures.identify so that it consistently generates identities ac...Ken Collins2009-05-181-4/+5
| * | 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
| |/
* | Merge commit 'rails/master'Emilio Tagua2009-05-1824-75/+109
|\|
| * Fixed limited eager loading associations with numbers in the name [#2668 stat...Benjamin Floering2009-05-181-1/+1
| * 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
| * has_one :through should not create a new association when assigned nil [#698 ...Daniel Guettler2009-05-171-8/+8
| * Get AR CI passing again by requiring the entire core_extYehuda Katz2009-05-161-0/+3
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-142-12/+7
| |\
| | * Changed ActiveRecord::Base#exists? to invoke find_initial so that it is compa...Peter Marklund2009-05-141-8/+3
| |/
| * 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
| * Allow you to pass :all_blank to :reject_if option to automatically create a P...Mike Breen2009-05-101-1/+10
| * Fixed eager load error on find with include => [:table_name] and hash conditi...Anthony Crumley2009-05-101-4/+16
| * honour :inverse_of for joins based includeFrederick Cheung2009-05-101-2/+8
| * honour inverse_of when preloading associationsFrederick Cheung2009-05-101-1/+3
* | Refactor to calculations. Migration's versions are string not integer. ARel s...Emilio Tagua2009-05-063-24/+23
* | 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
* | Fixes to have all test passing on PostgreSQL.Emilio Tagua2009-05-042-17/+28
* | Merge commit 'rails/master'Emilio Tagua2009-05-041-9/+3
|\|
| * Don't use #tap before Active Support is available, since older versions of ru...Chris Kampmeier2009-05-041-3/+2
| * Check for sibling Active Support firstJeremy Kemper2009-05-021-8/+3
* | Revert "Work around count returning string (bug)"Emilio Tagua2009-05-021-1/+1
* | Refactor to use arel_table method, and also use the same method name for inst...Emilio Tagua2009-05-023-21/+18
* | 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
| * Default scope :order should be overridden by named scopes.Alexander Podgorbunsky2009-05-011-2/+2
| * Ensure ActiveRecord::Base.connection_pool.with_connection creates a new conne...steve2009-05-011-5/+6
| * Use table_exists? in #initialize_schema_migrations_table [#1923 state:resolved]Ken Collins2009-05-011-2/+2
| * 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 use...Emilio Tagua2009-04-302-17/+24
* | 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
| * Ensure the parent record is always saved when the child is invalid. [#2249 st...Eloy Duran2009-04-271-5/+9
| * Fix differing rails_to_json arityJeremy Kemper2009-04-261-3/+6