Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | Don't find belongs_to target when the foreign_key is NULL. Fixes #2828 | Georg Friedrich | 2011-09-05 | 1 | -0/+6 |
| | |||||
* | The join_nodes must be passed to the JoinDependency initializer and ↵ | Jon Leighton | 2011-08-29 | 1 | -0/+4 |
| | | | | therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556. | ||||
* | Ensure empty has_many :through association preloaded via joins is marked as ↵ | Jon Leighton | 2011-08-15 | 1 | -0/+8 |
| | | | | loaded. Fixes #2054. | ||||
* | Work around for lolruby bug. (Read on for explanation.) | Jon Leighton | 2011-08-13 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were experiencing CI test failures, for example: * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407 * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80 These failures only happened on 1.8.7-p352, and we were only able to reproduce on the Travis CI VM worker. We even tried creating a new 32 bit Ubuntu VM and running the tests on that, and it all worked fine. After some epic trial and error, we discovered that replacing the following: fuu = Marshal.load(Marshal.dump(fuu)) with: marshalled = Marshal.dump(fuu) fuu = Marshal.load(marshalled) seemed to prevent the failure. We have NO IDEA why this is. If anyone has some great insight to contribute then that is welcome. Otherwise, hopefully this will just help us get the CI green again. Many thanks to @joshk for help with sorting this out. | ||||
* | Fix test for Rubinius | Santiago Pastorino | 2011-08-05 | 1 | -1/+1 |
| | |||||
* | ActiveRecord: Fix eager loading so that giving a blank order clause ↵ | Elliot Winkler | 2011-07-18 | 1 | -0/+12 |
| | | | | generates valid SQL | ||||
* | Fix exception if old and new targets are both nil. Fixes #1471. | Jon Leighton | 2011-07-12 | 1 | -0/+9 |
| | |||||
* | Foo.joins(:bar).includes(:bar) should result in a single query with :bar as ↵ | Jon Leighton | 2011-07-09 | 1 | -0/+8 |
| | | | | a join. Related: #1873. | ||||
* | Ensure that the foreign key gets set when doing record.create_association or ↵ | Jon Leighton | 2011-07-08 | 1 | -0/+14 |
| | | | | record.create_association. Fixes #1960. | ||||
* | Fix bug in collection_singular_ids on has many through association with ↵ | Anatoliy Lysenko | 2011-07-06 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | conditions and includes, when condtions references tables from includes. Test fail because of invalid sql: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: comments.id: SELECT "posts".id FROM "posts" INNER JOIN "readers" ON "posts"."id" = "readers"."post_id" WHERE "readers"."person_id" = 1 AND (comments.id is null) Bug described in github#925 This commit will revert fix from https://github.com/rails/rails/commit/3436fdfc12d58925e3d981e0afa61084ea34736c , but tests is ok. Bug described in #6569 ticket. | ||||
* | Merge pull request #1968 from bogdan/associations_find_array_compatibility2 | Santiago Pastorino | 2011-07-05 | 1 | -0/+4 |
|\ | | | | | Fixed CollectionAssociation#find to be compatible with Array#find | ||||
| * | Fixed CollectionAssociation#find to be compatible with Array#find | Bogdan Gusiev | 2011-07-05 | 1 | -0/+4 |
| | | | | | | | | | | In order to make CollectionAssociation behave closer to Array Add the ability to pass block to #find method just like Array#find does. |