Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | Only call set_owner_attributes for has_one association if target exists. | Dieter Komendera | 2011-07-04 | 1 | -0/+11 |
|/ | |||||
* | Assign the association attributes to the associated record before the ↵ | Jon Leighton | 2011-06-30 | 2 | -0/+14 |
| | | | | before_initialize callback of the record runs. Fixes #1842. | ||||
* | Make assert_no_queries literally enforce that there are no queries. As in, ↵ | Jon Leighton | 2011-06-12 | 1 | -15/+0 |
| | | | | not a single line of SQL should be sent to the database, not even stuff that is ignored by assert_queries. The argument being that if you write assert_no_queries, you really do not want there to be any queries. | ||||
* | Refactor tests to be less brittle | Jon Leighton | 2011-06-12 | 1 | -25/+58 |
| | |||||
* | Don't wrap operations on collection associations in transactions when they ↵ | benedikt | 2011-06-12 | 1 | -0/+45 |
| | | | | are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database. | ||||
* | Do not hardcode :id as it was ignored by mass assignment filter | Raimonds Simanovskis | 2011-06-08 | 1 | -2/+2 |
| | | | As a result test was failing on Oracle where ids are assigned by default from 1000 | ||||
* | Allow polymorphic has_one to work when the association is set before the ↵ | Jon Leighton | 2011-06-08 | 1 | -0/+11 |
| | | | | owner has been saved. Fixes #1524. | ||||
* | When you add a record to a polymorphic has_one, you should be able to access ↵ | Jon Leighton | 2011-06-08 | 1 | -1/+4 |
| | | | | the owner from the associated record | ||||
* | Merge pull request #1474 from ganeshkumar/update_column_changes | José Valim | 2011-06-07 | 1 | -0/+9 |
|\ | | | | | added tests for update_column | ||||
| * | added more tests for update_column | ganesh | 2011-06-04 | 1 | -0/+9 |
| | | |||||
* | | please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT | Aaron Patterson | 2011-06-06 | 19 | -19/+19 |
| | | |||||
* | | Refactor Active Record test connection setup. Please see the ↵ | Jon Leighton | 2011-06-04 | 19 | -20/+20 |
|/ | | | | RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases. | ||||
* | added an alias for new to build to the AR collection proxy, this corrects an ↵ | Josh Kalderimis | 2011-06-01 | 2 | -0/+25 |
| | | | | issue where the collection proxies were not consistent | ||||
* | Tests for issue #1360 | Farley Knight | 2011-05-31 | 1 | -0/+9 |
| | |||||
* | Opening class CascadedEagerLoadingTest at once. | Arun Agrawal | 2011-05-31 | 1 | -7/+3 |
| | |||||
* | fixing test for mysql2 | Aaron Patterson | 2011-05-27 | 1 | -5/+2 |
| | |||||
* | adding a test for #1322 | Aaron Patterson | 2011-05-26 | 1 | -0/+15 |
| | |||||
* | Merge pull request #1323 from fx/association_primary_key | Jon Leighton | 2011-05-26 | 1 | -0/+10 |
|\ | | | | | use association_primary_key in AssociationScope#add_constraints | ||||
| * | added assertion for non-standard primary_key on models used in the ↵ | Marian Rudzynski | 2011-05-26 | 1 | -0/+3 |
| | | | | | | | | primary_key test | ||||
| * | use association_primary_key in AssociationScope#add_constraints | Marian Rudzynski | 2011-05-26 | 1 | -0/+7 |
| | | |||||
* | | Removes a now needless test - via Github | Mohammad Typaldos | 2011-05-26 | 1 | -8/+0 |
| | | |||||
* | | Removes the restriction on primary key when joining in a habtm && test that ↵ | Mohammad El-Abid | 2011-05-26 | 1 | -5/+4 |
|/ | | | | it was properly removed | ||||
* | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 1 | -9/+0 |
| | |||||
* | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope | Jon Leighton | 2011-05-24 | 1 | -0/+6 |
|\ | | | | | Ignore :includes on through associations | ||||
| * | Ignore :includes on through associations | Andrew White | 2011-05-24 | 1 | -0/+6 |
| | | |||||
* | | Failing tests for #1233. | Andrew White | 2011-05-24 | 1 | -0/+40 |
| | |