| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | Merge branch 'master' into nested_has_many_through_2 | Jon Leighton | 2010-09-30 | 12 | -56/+209 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Initial nested_has_many_through support [#1152] | Bodaniel Jeanes | 2010-09-26 | 6 | -12/+58 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵ | John Mileham | 2011-03-03 | 2 | -11/+54 | |
| | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counting. | |||||
| * | | | | | | | | | | | | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 4 | -18/+18 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | skip this on oracle | Aaron Patterson | 2011-02-28 | 1 | -0/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | removing limits and offsets from COUNT queries unless both are specified. ↵ | Aaron Patterson | 2011-02-25 | 1 | -0/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6268 state:resolved] | |||||
| * | | | | | | | | | | | | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses | Eric Allam | 2011-02-24 | 1 | -0/+4 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | observers leak across tests, so rather than modify the object, we should ↵ | Aaron Patterson | 2011-02-23 | 1 | -6/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just count the number of times the observer was called | |||||
| * | | | | | | | | | | | | Fix observer callbacks firing multiple times on descendant instances | Kamal Fariz Mahyuddin | 2011-02-22 | 1 | -0/+14 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | expectations change when using IM. Change oracle tests to reflect that | Aaron Patterson | 2011-02-22 | 1 | -2/+6 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | adding a test case for custom locking | Aaron Patterson | 2011-02-21 | 1 | -0/+17 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Use proper objects to do the work to build the associations (adding methods, ↵ | Jon Leighton | 2011-02-21 | 2 | -12/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks etc) rather than calling a whole bunch of methods with rather long names. | |||||
| * | | | | | | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | oops, no need for puts! | Aaron Patterson | 2011-02-18 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | AR::AttributeMethods does not need to be included in an AR::Base class. | Aaron Patterson | 2011-02-18 | 1 | -0/+62 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fixes a merge conflict | Xavier Noria | 2011-02-19 | 1 | -10/+0 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | merges docrails | Xavier Noria | 2011-02-18 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -8/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Remove test which was broken on 1.8. This test is now irrelevant since ↵ | Jon Leighton | 2011-02-18 | 1 | -8/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | singular associations no longer return a proxy object. | |||||
| * | | | | | | | | | | | | | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8 | Emilio Tagua | 2011-02-18 | 2 | -8/+4 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Should use "=" instead "replace" after this commit: ↵ | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b | |||||
| * | | | | | | | | | | | | | | No need to test agaisnt target. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Use to_a instead :load in test, since :load changed. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | No need to test against target anymore. | Emilio Tagua | 2011-02-18 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 16 | -162/+105 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | |||||
| | * | | | | | | | | | | | | | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 10 | -152/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. | |||||
| | * | | | | | | | | | | | | | Allow building and then later saving has_many :through records, such that ↵ | Jon Leighton | 2011-02-18 | 4 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved] | |||||
| | * | | | | | | | | | | | | | Ensure that association_ids uses the correct attribute where the association ↵ | Jon Leighton | 2011-02-18 | 2 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved] | |||||
| | * | | | | | | | | | | | | | explicitly allowing lolqueries | Aaron Patterson | 2011-02-16 | 1 | -3/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing whitespace problems | Aaron Patterson | 2011-02-16 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removed an unnecessary second query when passing an ActiveRecord::Relation ↵ | Steven Fenigstein | 2011-02-16 | 1 | -1/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses. | |||||
| | * | | | | | | | | | | | | | fixture methods can be overridden and super() is useful | Aaron Patterson | 2011-02-15 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing variable names, removing FixtureFile instances from test ivars | Aaron Patterson | 2011-02-15 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix expected queries in relation tests. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Run tests without IdentityMap when IM=false is given. | Emilio Tagua | 2011-02-15 | 6 | -15/+23 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 90 | -783/+2261 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb | |||||
| | * | | | | | | | | | | | | | bad tests are bad | Aaron Patterson | 2011-02-14 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removing irrelevant test | Aaron Patterson | 2011-02-14 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fix test/cases/connection_pool_test.rb for sqlite3 in-memory db | Jon Leighton | 2011-02-14 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Add interpolation of association conditions back in, in the form of proc { ↵ | Jon Leighton | 2011-02-14 | 10 | -25/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... } rather than instance_eval-ing strings | |||||
| | * | | | | | | | | | | | | | Add missing require | Santiago Pastorino | 2011-02-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Remove Relation#& alias for Relation#merge | Ernie Miller | 2011-02-12 | 3 | -10/+10 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Fix table name collision due to incorrect alias count on certain joins. | Ernie Miller | 2011-02-12 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | create_fixtures() should always return a list | Aaron Patterson | 2011-02-11 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | refactor fixtures to do less work in the constructor | Aaron Patterson | 2011-02-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | favor composition over inheritence. use AS::OrderedHash rather than omap | Aaron Patterson | 2011-02-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing tests on 1.8, using a list of lists because order is important | Aaron Patterson | 2011-02-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |