Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 9 | -35/+142 |
|\ | | | | | | | | | | | | | | | Conflicts: 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/persistence.rb | ||||
| * | Fix various issues with the :primary_key option in :through associations ↵ | Jon Leighton | 2010-12-15 | 1 | -0/+16 |
| | | | | | | | | [#2421 state:resolved] | ||||
| * | Fix problem with duplicated records when a :uniq :through association is ↵ | Jon Leighton | 2010-12-15 | 2 | -2/+15 |
| | | | | | | | | preloaded [#2447 state:resolved] | ||||
| * | test for eager load of has_one association with condition on the through table | Pivotal Labs | 2010-12-16 | 1 | -1/+9 |
| | | |||||
| * | Verify that creating a has_many through record where there is a ↵ | Jon Leighton | 2010-12-16 | 1 | -0/+7 |
| | | | | | | | | default_scope on the join model works correctly (creates the join record with the default scope applied) | ||||
| * | Respect the default_scope on a join model when reading a through association | Jon Leighton | 2010-12-16 | 2 | -1/+13 |
| | | |||||
| * | Fix hm:t to self table aliasing in construct_scope | Ernie Miller | 2010-12-16 | 1 | -1/+1 |
| | | |||||
| * | add test which fails for has_many through self join [#4361 state:open] | Joe Hannon | 2010-12-16 | 1 | -0/+7 |
| | | |||||
| * | fixing whitespace errors | Aaron Patterson | 2010-12-16 | 1 | -4/+4 |
| | | |||||
| * | preheating cache so that tests can run in isolation | Aaron Patterson | 2010-12-09 | 1 | -0/+5 |
| | | |||||
| * | Setting the id of a belongs_to object updates all referenced objects [#2989 ↵ | Jeff Dean | 2010-12-08 | 1 | -0/+37 |
| | | | | | | | | state:resolved] | ||||
| * | not a responsibility for rails to test | Aaron Patterson | 2010-12-03 | 1 | -10/+0 |
| | | |||||
| * | test case on has_one :through after a destroy | John Hawthorn | 2010-11-29 | 1 | -0/+17 |
| | | | | | | | | | | | | [#6037 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | removing unused variables | Aaron Patterson | 2010-11-22 | 5 | -10/+5 |
| | | |||||
| * | Removed ids_in_list_limit in favor of in_clause_length defined in ↵ | Alex Rothenberg | 2010-11-23 | 1 | -7/+7 |
| | | | | | | | | database_limits.rb | ||||
* | | Clear IdentityMap before continue this test, we can do this here because ↵ | Emilio Tagua | 2010-11-19 | 1 | -0/+1 |
| | | | | | | | | store_full_sti_class is not supposed to change during "runtime". | ||||
* | | Fix number of queries performed in tests. | Emilio Tagua | 2010-11-19 | 1 | -6/+6 |
| | | |||||
* | | Revert "IdentityMap - Adjustments to test cases" | Emilio Tagua | 2010-11-19 | 3 | -18/+12 |
| | | | | | | | | | | | | | | | | This reverts commit 4db9dca55e3acc2c59f252eb83ecb83db5f4b81b. Conflicts: activerecord/test/cases/identity_map_test.rb | ||||
* | | Test with target object, failing on 1.9.2 when comparing object against ↵ | Emilio Tagua | 2010-11-19 | 1 | -0/+1 |
| | | | | | | | | association proxy object. | ||||
* | | Add tests for inverse relations when using has many and identity map. | Emilio Tagua | 2010-11-19 | 1 | -0/+134 |
| | | |||||
* | | IdentityMap - Adjustments to test cases | Marcin Raczkowski | 2010-11-19 | 3 | -12/+18 |
| | | |||||
* | | IdentityMap - Tests for IM | Marcin Raczkowski | 2010-11-19 | 1 | -1/+1 |
|/ | |||||
* | 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 | ||||
* | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵ | Jon Leighton | 2010-11-17 | 1 | -1/+2 |
| | | | | fixtures declaration in cascaded_eager_loading_test.rb | ||||
* | removing many unused variables | Aaron Patterson | 2010-11-16 | 1 | -2/+2 |
| | |||||
* | reloading an association will properly set attributes of instantiated ↵ | Aaron Patterson | 2010-11-16 | 1 | -0/+21 |
| | | | | objects. Thanks Brian Palmer [#5802 state:resolved] | ||||
* | if association is already loaded and if a find operation is performed on the ↵ | Neeraj Singh | 2010-11-15 | 1 | -0/+11 |
| | | | | | | already loaded association list with an empty hash then do not perform another sql [#5972 state:resolved] | ||||
* | fisting a bunch of unused variable warnings | Aaron Patterson | 2010-11-15 | 4 | -20/+16 |
| | |||||
* | Fix bug where size of through association is not correct after adding a ↵ | Jason Cheow | 2010-11-14 | 1 | -0/+7 |
| | | | | | | | | has_many association (occurs only before main object has been reloaded). [#5968 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | use persisted? instead of new_record? wherever possible | David Chelimsky | 2010-11-09 | 5 | -35/+35 |
| | | | | | | | | | | | - persisted? is the API defined in ActiveModel - makes it easier for extension libraries to conform to ActiveModel APIs without concern for whether the extended object is specifically ActiveRecord [#5927 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Fixes queries using limits and punctuation in order, removes order("col1, ↵ | Santiago Pastorino | 2010-11-05 | 2 | -3/+3 |
| | | | | | | col2") usage in favor of order(["col1", "col2"}) [#4597 state:committed] | ||||
* | Convert :primary_key in association to a string before comparing to column ↵ | Denis Odorcic | 2010-10-30 | 1 | -0/+7 |
| | | | | names, so that for example :primary_key => :another_pk works as well [#5605 state:resolved] | ||||
* | Fix issues when including the same association multiple times and mixing ↵ | Ernie Miller | 2010-10-30 | 1 | -0/+26 |
| | | | | joins/includes together. | ||||
* | removing unused variables | Aaron Patterson | 2010-10-20 | 1 | -2/+2 |
| | |||||
* | Add some tests for functionality in JoinAssociation which already exists but ↵ | Jon Leighton | 2010-10-13 | 4 | -11/+33 |
| | | | | was previously untested | ||||
* | AssociationCollection#include? working properly for objects added with build ↵ | Marcelo Giorgi | 2010-09-30 | 3 | -0/+26 |
| | | | | method [#3472 state:resolved] | ||||
* | Revert "porting 515917f5d8678af6c57842ca5dfd7c18e67ff1fe to master" | Aaron Patterson | 2010-09-28 | 1 | -6/+0 |
| | | | | This reverts commit bee447a5b9fe1d683c6cc69aefb7fc22c2a9d9af. | ||||
* | Set attributes properly for model built from association with conditions ↵ | Marcelo Giorgi | 2010-09-28 | 5 | -0/+46 |
| | | | | | | [#5562 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | porting 515917f5d8678af6c57842ca5dfd7c18e67ff1fe to master | Aaron Patterson | 2010-09-28 | 1 | -0/+6 |
| | |||||
* | remove join table rows before removing owner row for habtm associations, ↵ | Hemant Kumar | 2010-09-21 | 1 | -1/+1 |
| | | | | fixes#5674 | ||||
* | providing arel with column information when possible [#5392 state:resolved] | Aaron Patterson | 2010-09-21 | 1 | -0/+10 |
| | |||||
* | Change relation merging to always append select, group and order values | Pratik Naik | 2010-08-31 | 2 | -41/+10 |
| | |||||
* | removing unused code | Aaron Patterson | 2010-08-22 | 1 | -2/+2 |
| | |||||
* | updated test_should_record_timestamp_for_join_table for Oracle | Raimonds Simanovskis | 2010-08-22 | 1 | -1/+1 |
| | |||||
* | While creating a new record using has_many create method default scope of ↵ | Neeraj Singh | 2010-08-19 | 1 | -0/+19 |
| | | | | | | | | | | | child should be respected. author.posts.create should take into account default_scope defined on post. [#3939: state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | avoids warnings about mismatched indentations in Ruby 1.9.2 | Xavier Noria | 2010-08-19 | 1 | -8/+5 |
| | |||||
* | code gardening: we have assert_(nil|blank|present), more concise, with ↵ | Xavier Noria | 2010-08-17 | 4 | -6/+6 |
| | | | | better default failure messages - let's use them | ||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 3 | -14/+14 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | fixed indentation in test cases | Mark Turner | 2010-08-11 | 1 | -2/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> |