Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ensure association preloading properly merges default scope and association ↵ | Pratik Naik | 2012-08-28 | 1 | -0/+12 |
| | | | | | | | | conditions Conflicts: activerecord/test/models/reader.rb | ||||
* | Merge pull request #7377 from ↵ | Carlos Antonio da Silva | 2012-08-21 | 1 | -0/+6 |
| | | | | | | | | | | | brainopia/use_inversed_parent_for_first_and_last_child Use inversed parent for first and last child of has_many association [Backport] Closes #3223. Conflicts: activerecord/lib/active_record/associations/collection_association.rb | ||||
* | Merge pull request #7286 from kennyj/fix_7191 | Rafael Mendonça França | 2012-08-10 | 1 | -0/+13 |
| | | | | | | Fix #7191. Remove unnecessary transaction when assigning has_one associations. Conflicts: activerecord/test/cases/associations/has_one_associations_test.rb | ||||
* | Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql." | Jon Leighton | 2012-08-01 | 2 | -40/+9 |
| | | | | | | | | | | This reverts commit a79bfa92e7bdc31b346d13ee5447d3fdac382bfb. Conflicts: activerecord/CHANGELOG.md We shouldn't introducing deprecations in point releases. It will be deprecated in 4.0 instead. | ||||
* | Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql. | Jon Leighton | 2012-07-20 | 2 | -9/+40 |
| | |||||
* | Make test cover previous reversion | Jon Leighton | 2012-06-07 | 1 | -0/+1 |
| | |||||
* | Revert "Perf: Don't load the association for #delete_all." | Jon Leighton | 2012-06-07 | 1 | -12/+0 |
| | | | | | | | | | | This reverts commit b98d1e21635d8776de8893cc09bd86c71f6c78f0. Closes #6609 Conflicts: activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | ||||
* | Restore behavior of Active Record 3.2.3 scopes | Andrew White | 2012-06-01 | 1 | -24/+0 |
| | | | | | | | | | | | | | | A series of commits relating to preloading and scopes caused a regression. Cloning the relation calls initialize_copy which resets a number of instance variables to nil. Without this the scope thinks that it is already loaded when it is called again. Reverts the following commits: 13f1401a6cf0266a3b0a91b173f976db2d4e50f3 8491740ca5361ba9df20e1c8b906c709f5bfbc12 dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e Fixes #6575, #6576 & #6577 | ||||
* | Ensure that CollectionAssociation#replace returns proper target | Piotr Sarnacki | 2012-05-19 | 1 | -2/+2 |
| | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association. | ||||
* | fix #delete_all with habtm with :delete_sql | Jon Leighton | 2012-05-18 | 1 | -0/+6 |
| | |||||
* | Perf: Don't load the association for #delete_all. | Jon Leighton | 2012-05-18 | 1 | -0/+12 |
| | | | | | | | | Bug #6289 Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb | ||||
* | Fix CollectionAssociation#replace to return new target (closes #6231) | Piotr Sarnacki | 2012-05-16 | 1 | -0/+12 |
| | | | | | | Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb | ||||
* | Add extra order clause to fix failing test on Ruby 1.8.7 | Carlos Antonio da Silva | 2012-04-24 | 1 | -1/+1 |
| | |||||
* | Adds test to check that circular preloading does not modify Model.unscoped ↵ | Benedikt Deicke | 2012-04-19 | 1 | -0/+24 |
| | | | | | | | | (as described in #5667) Conflicts: activerecord/test/cases/associations/eager_test.rb | ||||
* | Revert "Fix #5667. Preloading should ignore scoping." | Jeremy Kemper | 2012-04-18 | 1 | -11/+0 |
| | | | | | | | | Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e. | ||||
* | Fix #5667. Preloading should ignore scoping. | Jon Leighton | 2012-03-30 | 1 | -0/+11 |
| | | | | | | Conflicts: activerecord/test/cases/associations/eager_test.rb | ||||
* | Change the order argument from ('id') to ('taggings.id') | Yasuo Honda | 2012-03-28 | 1 | -1/+1 |
| | | | | to address ORA-00918 error | ||||
* | Add order to tests that rely on db ordering, to fix failing tests on pg | Carlos Antonio da Silva | 2012-03-22 | 3 | -17/+16 |
| | | | | | | | Also skip persistente tests related to UPDATE + ORDER BY for postgresql PostgreSQL does not support updates with order by, and these tests are failing randomly depending on the fixture loading order now. | ||||
* | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-08 | 1 | -3/+2 |
| | |||||
* | Add test case to has_many through association when mass_assignment_sanitizer is | Rafael Mendonça França | 2012-03-08 | 1 | -4/+21 |
| | | | | | | | | :strict Conflicts: activerecord/test/models/person.rb | ||||
* | Add tests to test that through associations are not readonly, and we can ↵ | kuahyeow | 2012-03-08 | 1 | -0/+11 |
| | | | | update the records we retrive from the association | ||||
* | Fix #5069 - Protect foreign key from mass assignment throught association ↵ | Jean Boussier | 2012-03-05 | 2 | -0/+38 |
| | | | | builder | ||||
* | Merge pull request #4543 from jdelStrother/find_or_init | Jon Leighton | 2012-02-01 | 1 | -0/+12 |
| | | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by | ||||
* | Fix broken tests added by 85c724d59 | Rafael Mendonça França | 2012-01-31 | 1 | -10/+10 |
| | |||||
* | Merge pull request #4783 from gregolsen/ids_reader_fix | Jon Leighton | 2012-01-31 | 1 | -0/+4 |
| | | | | ids_reader method fixed, test added to has_many association (for PostgreSQL) | ||||
* | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 1 | -0/+10 |
| | | | | allow reorder to affect eager loading correctly | ||||
* | bypass preloading for ids_reader | Sergey Nartimov | 2011-12-18 | 1 | -0/+6 |
| | | | | | when fetching ids for a collection, bypass preloading to avoid the unnecessary performance overhead | ||||
* | Delete obsolete comment | Jon Leighton | 2011-12-16 | 1 | -1/+0 |
| | |||||
* | Cache columns at the model level. | Jon Leighton | 2011-12-16 | 1 | -2/+2 |
| | | | | Allows two models to use the same table but have different primary keys. | ||||
* | Remove that there copy/pasted code :bomb: | Jon Leighton | 2011-12-14 | 1 | -5/+0 |
| | |||||
* | Don't try to autosave nested assocs. Fixes #2961. | Jon Leighton | 2011-12-14 | 1 | -0/+14 |
| | |||||
* | Use `table_exists?` from the schema cache. | Aaron Patterson | 2011-12-09 | 1 | -3/+3 |
| | |||||
* | Fix #3890. (Calling proxy_association in scope chain.) | Jon Leighton | 2011-12-08 | 1 | -0/+6 |
| | |||||
* | reintroduce patch from #726 to handle nested eager loading via associations | Jay Levitt | 2011-11-30 | 1 | -0/+35 |
| | |||||
* | Deprecate set_table_name in favour of self.table_name= or defining your own ↵ | Jon Leighton | 2011-11-29 | 3 | -7/+7 |
| | | | | method. | ||||
* | Merge pull request #3636 from joshsusser/master | Jon Leighton | 2011-11-29 | 1 | -1/+21 |
|\ | | | | | association methods are now generated in modules | ||||
| * | use GeneratedFeatureMethods module for associations | Josh Susser | 2011-11-27 | 1 | -1/+21 |
| | | |||||
* | | load has_many associations keyed off a custom primary key if that key is ↵ | Brian Samson | 2011-11-25 | 1 | -1/+28 |
|/ | | | | present but the record is unsaved | ||||
* | Merge pull request #3507 from jmazzi/issue-3503 | Jeremy Kemper | 2011-11-03 | 1 | -0/+15 |
| | | | | Preserve SELECT columns on the COUNT for finder_sql when possible | ||||
* | Remove all revelant through records. | Jon Leighton | 2011-11-03 | 1 | -0/+15 |
| | | | | | | | | | If a record is removed from a has_many :through, all of the join records relating to that record should also be removed from the through association's target. (Previously the records were removed in the database, but only one was removed from the in-memory target array.) | ||||
* | Fix adding multiple instances of the same record to a has_many :through. | Jon Leighton | 2011-11-03 | 1 | -0/+10 |
| | | | | Fixes #3425. | ||||
* | Fix #3247. | Jon Leighton | 2011-11-03 | 1 | -0/+5 |
| | | | | | Fixes creating records in a through association with a polymorphic source type. | ||||
* | Fixed failed test under 1.8.7 as map.keys order in indeterminable | Rocky Jaiswal | 2011-09-28 | 2 | -2/+2 |
| | |||||
* | Merge pull request #3030 from htanata/fix_habtm_select_query_method | Jon Leighton | 2011-09-26 | 2 | -0/+16 |
| | | | | Fix: habtm doesn't respect select query method | ||||
* | Fix belongs_to polymorphic with custom primary key on target. | Jon Leighton | 2011-09-26 | 1 | -0/+8 |
| | | | | Closes #3104. | ||||
* | CollectionProxy#replace should change the DB records rather than just ↵ | Jon Leighton | 2011-09-26 | 1 | -0/+11 |
| | | | | mutating the array. Fixes #3020. | ||||
* | Don't include any of includes, preload, joins, eager_load in the through ↵ | Jon Leighton | 2011-09-07 | 1 | -3/+5 |
| | | | | association scope. | ||||
* | Nested through associations: preloads from the default scope of a through ↵ | Jon Leighton | 2011-09-06 | 1 | -0/+9 |
| | | | | model should not be included in the association scope. (We're already excluding includes.) Fixes #2834. | ||||
* | Ensure we are not comparing a string with a symbol in ↵ | Jon Leighton | 2011-09-06 | 1 | -0/+10 |
| | | | | HasManyAssociation#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be. | ||||
* | Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they ↵ | Jon Leighton | 2011-09-06 | 1 | -0/+10 |
| | | | | have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys. |