Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-27 | 1 | -0/+52 |
|\ | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb | ||||
| * | Removed ids_in_list_limit in favor of in_clause_length defined in ↵ | Alex Rothenberg | 2010-11-23 | 1 | -7/+7 |
| | | | | | | | | database_limits.rb | ||||
| * | removing space errors | Aaron Patterson | 2010-11-18 | 1 | -1/+1 |
| | | |||||
| * | Adapters can specify maximum number of ids they support in a list of expressions | Alex Rothenberg | 2010-11-18 | 1 | -0/+52 |
| | | | | | | | | | | (default is nil meaning unlimited but Oracle imposes a limit of 1000) Limit is used to make multiple queries when preloading associated has_many or habtm records | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-17 | 1 | -6/+6 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/test/cases/associations/has_many_through_associations_test.rb | ||||
| * | fisting a bunch of unused variable warnings | Aaron Patterson | 2010-11-15 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-08 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | Fixes queries using limits and punctuation in order, removes order("col1, ↵ | Santiago Pastorino | 2010-11-05 | 1 | -2/+2 |
| | | | | | | | | | | | | col2") usage in favor of order(["col1", "col2"}) [#4597 state:committed] | ||||
| * | Add some tests for functionality in JoinAssociation which already exists but ↵ | Jon Leighton | 2010-10-13 | 1 | -4/+4 |
| | | | | | | | | was previously untested | ||||
| * | Revert "porting 515917f5d8678af6c57842ca5dfd7c18e67ff1fe to master" | Aaron Patterson | 2010-09-28 | 1 | -6/+0 |
| | | | | | | | | This reverts commit bee447a5b9fe1d683c6cc69aefb7fc22c2a9d9af. | ||||
| * | porting 515917f5d8678af6c57842ca5dfd7c18e67ff1fe to master | Aaron Patterson | 2010-09-28 | 1 | -0/+6 |
| | | |||||
* | | Properly support conditions on any of the reflections involved in a nested ↵ | Jon Leighton | 2010-10-19 | 1 | -2/+2 |
| | | | | | | | | through association | ||||
* | | Refactoring JoinDependency and friends. This improves the code (IMO) ↵ | Jon Leighton | 2010-10-06 | 1 | -4/+4 |
| | | | | | | | | including adding some explanatory comments, but more importantly structures it in such a way as to allow a JoinAssociation to produce an arbitrary number of actual joins, which will be necessary for nested has many through support. Also added 3 tests covering functionality which existed but was not previously covered. | ||||
* | | Fix the tests (I have actually verified that these are also the 'right' ↵ | Jon Leighton | 2010-10-03 | 1 | -2/+2 |
|/ | | | | fixes, rather than just making the tests pass again) | ||||
* | Eager loading :through associations will join the :source model if there are ↵ | Grant Ammons | 2010-07-08 | 1 | -0/+6 |
| | | | | | | :conditions. [#2362 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Use better assertion methods for testing | Neeraj Singh | 2010-05-19 | 1 | -1/+1 |
| | | | | | | [#4645 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Dont try to load the record from the db if preloading didn't find anything | Pratik Naik | 2010-03-31 | 1 | -0/+6 |
| | |||||
* | cleaning up a bunch of parse time warnings in AR [#4186 state:resolved] | Aaron Patterson | 2010-03-15 | 1 | -1/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Don't publicize with_scope for tests since it may shadow public misuse | Jeremy Kemper | 2009-12-28 | 1 | -4/+4 |
| | |||||
* | Add Model.from and association_collection#from finder methods | Pratik Naik | 2009-12-28 | 1 | -8/+1 |
| | |||||
* | Use finder options as relation method names to provide more familiar | Emilio Tagua | 2009-08-18 | 1 | -5/+5 |
| | | | | | naming. Use bang methods convention in methods that alter the relation. | ||||
* | added :order option to find :first methods and associations as otherwise ↵ | Raimonds Simanovskis | 2009-08-06 | 1 | -1/+6 |
| | | | | | | | | Oracle tests were failing Oracle stores '' string as NULL Oracle cannot have identifiers larger than 30 characters added missing fixtures to test setup method | ||||
* | Fix eager association test related to different ordering on sqlite | Chad Woolley | 2009-05-21 | 1 | -1/+1 |
| | | | | | | [#2686 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fixed limited eager loading associations with numbers in the name [#2668 ↵ | Benjamin Floering | 2009-05-18 | 1 | -0/+4 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fixed eager load error on find with include => [:table_name] and hash ↵ | Anthony Crumley | 2009-05-10 | 1 | -0/+12 |
| | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Ruby 1.9 compat: rename deprecated assert_raises to assert_raise. | Jeremy Kemper | 2009-03-08 | 1 | -4/+4 |
| | | | | [#1617 state:resolved] | ||||
* | Fix :include of has_one with :primary_key option | Frederick Cheung | 2008-12-26 | 1 | -0/+16 |
| | |||||
* | Fix :include of has_many associations with :primary_key option | Frederick Cheung | 2008-12-26 | 1 | -0/+17 |
| | |||||
* | Preload uses exclusive scope [#643 state:resolved] | Frederick Cheung | 2008-12-26 | 1 | -0/+15 |
| | | | | | | | | | With self referential associations, the scope for the the top level should not affect fetching of associations, for example when doing Person.male.find :all, :include => :friends we should load all of the friends for each male, not just the male friends. | ||||
* | Use explicit order to stop test failing randomly | Frederick Cheung | 2008-12-21 | 1 | -2/+2 |
| | |||||
* | Ensure :include checks joins when determining if it can preload [#528 ↵ | Frederick Cheung | 2008-12-18 | 1 | -0/+65 |
| | | | | state:resolved] | ||||
* | Fix preloading of belongs_to with null foreign key generating useless query ↵ | Frederick Cheung | 2008-12-18 | 1 | -1/+2 |
| | | | | [#1027 state:resolved] | ||||
* | Ensure hash conditions on referenced tables are considered when eager ↵ | Paul | 2008-11-26 | 1 | -2/+18 |
| | | | | | | loading with limit/offset. [#1404 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Remove SQL Server cases from tests for latest adapter work to pass rails ↵ | Ken Collins | 2008-11-19 | 1 | -1/+1 |
| | | | | | | expected behavior. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | explicitly including child associations that are also included in the parent ↵ | Will Bryant | 2008-10-10 | 1 | -1/+41 |
| | | | | | | | association definition should not result in double records in the collection/double loads (#1110) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1110 state:committed] | ||||
* | Fix has_many :through when the source is a belongs_to association. [#323 ↵ | Zach Dennis | 2008-10-04 | 1 | -0/+9 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | wrote a test showing eager loading's misbehavior (sanitizing against the ↵ | Will Bryant | 2008-09-29 | 1 | -0/+7 |
| | | | | | | wrong table) when the association has a :conditions hash Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Fix yet another implicit order dependant test | Tarmo Tänav | 2008-08-26 | 1 | -3/+3 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Load the first and not the last has_one result when doing join-based eager ↵ | Tarmo Tänav | 2008-08-25 | 1 | -0/+6 |
| | | | | | | | | | | | loading This matters when the has_one is defined with an order in which case there is an expectation that the first one will be loaded. [#904 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Don't interpret decimals as table names in ↵ | Peter Wagenet | 2008-08-21 | 1 | -0/+7 |
| | | | | | | ActiveRecord::Associations::ClassMethods#references_eager_loaded_tables? [#532 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Added missing fixtures for tests which fail to run independently if run ↵ | Tarmo Tänav | 2008-08-04 | 1 | -1/+1 |
| | | | | | | after schema reset Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Fix conditions and order on join tables with limited eager loading. [#372 ↵ | Tiago Macedo | 2008-06-08 | 1 | -1/+12 |
| | | | | state:resolved] | ||||
* | When preloading group by reflection rather than by class [#125 state:resolved] | Frederick Cheung | 2008-05-11 | 1 | -0/+6 |
| | | | | | | | | This avoids extra queries when several subclasses inherit the association from their parent class, while still coping with subclasses redefining associations. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure hm:t preloading honours reflection options. [#137 state:resolved] | Frederick Cheung | 2008-05-11 | 1 | -0/+11 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure correct record is returned when preloading has_one where more than ↵ | Frederick Cheung | 2008-05-06 | 1 | -0/+4 |
| | | | | | | | one row exists Signed-off-by: Michael Koziarski <michael@koziarski.com> [#73 state:closed] | ||||
* | Fixed AssociationsPreload such that it doesnt require foreign keys to be ↵ | David Heinemeier Hansson | 2008-04-30 | 1 | -1/+22 |
| | | | | integers (fcheung) [#33 state:resolved] | ||||
* | Ensure table names are quoted by the association preloading code. | Frederick Cheung | 2008-04-26 | 1 | -1/+27 |
| | | | | | | [#45 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Make sure ActiveRecord tests can run individually. Closes #11425 ↵ | Pratik Naik | 2008-03-28 | 1 | -1/+1 |
| | | | | | | [thechrisoshow, h-lame] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9109 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Provide a post title for sqlite3 | Jeremy Kemper | 2008-02-28 | 1 | -2/+2 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8943 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Fix that batched :include would pull in duplicate records in some cases. ↵ | Jeremy Kemper | 2008-02-28 | 1 | -0/+26 |
| | | | | | | Closes #11215 [Catfish] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8942 5ecf4fe2-1ee6-0310-87b1-e25e094e27de |