Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #491 from arunagw/readme_changes | Santiago Pastorino | 2011-05-11 | 1 | -1/+1 | |
|\ \ | | | | | | | Some readme fixes as required. | |||||
| * | | Some readme fixes as required. | Arun Agrawal | 2011-05-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations | Jon Leighton | 2011-05-11 | 3 | -6/+18 | |
|\ \ \ | | | | | | | | | Bug fixes for calculations with includes | |||||
| * | | | Bug fixes: | Fadzril Muhamad & Joseph Palermo | 2011-05-12 | 3 | -6/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | - If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not. - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count. Looks like it was broken here: https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265 | |||||
* | | | | Add missing requires | Santiago Pastorino | 2011-05-11 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Fix assigning protected attributes by attributes= | knapo | 2011-05-11 | 2 | -6/+10 | |
| | | | | ||||||
* | | | | Don't remove the target if it has already been destroyed | Andrew White | 2011-05-11 | 2 | -1/+10 | |
| | | | | ||||||
* | | | | Modified NamedScopeTest to use CollectionAssociation. | Michael Ebens | 2011-05-11 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Modified CollectionAssociation to refer to the new class name. | Michael Ebens | 2011-05-11 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Don't use select() values from the join model of a through association. ↵ | Jon Leighton | 2011-05-11 | 5 | -3/+23 | |
| | | | | | | | | | | | | Fixes #508. | |||||
* | | | Bring back obj.association_loaded? as a deprecated method. Fixes #472. | Jon Leighton | 2011-05-11 | 2 | -0/+22 | |
| | | | ||||||
* | | | fix bug in usage example of #unscoped | Corin Langosch | 2011-05-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add test to specify that attributes from an association's conditions should ↵ | Jon Leighton | 2011-05-10 | 4 | -4/+28 | |
| | | | | | | | | | | | | be assigned without mass-assignment protection when a record is built on the association. | |||||
* | | | Remove unnecessary '|| {}' | Jon Leighton | 2011-05-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Don't use mass-assignment protection when applying the ↵ | Jon Leighton | 2011-05-10 | 3 | -3/+16 | |
| | | | | | | | | | | | | scoped.scope_for_create. Fixes #481. | |||||
* | | | minor cleaning with new api method | Vishnu Atrai | 2011-05-11 | 1 | -11/+11 | |
| | | | ||||||
* | | | deprecating CSV fixture support | Aaron Patterson | 2011-05-10 | 4 | -55/+7 | |
| | | | ||||||
* | | | deprecating read_csv_fixture_files method | Aaron Patterson | 2011-05-10 | 1 | -0/+2 | |
| | | | ||||||
* | | | Merge pull request #495 from vatrai/minor_fixes | Piotr Sarnacki | 2011-05-10 | 2 | -2/+2 | |
|\ \ \ | | | | | | | | | minor cleaning | |||||
| * | | | minor cleaning | Vishnu Atrai | 2011-05-10 | 2 | -2/+2 | |
| |/ / | ||||||
* | | | Merge pull request #493 from guilleiguaran/changelog-fixes | Aaron Patterson | 2011-05-10 | 1 | -0/+80 | |
|\ \ \ | | | | | | | | | Merging 3.0.x CHANGELOGs | |||||
| * | | | Merging 3.0.x CHANGELOGs | Guillermo Iguaran | 2011-05-10 | 1 | -0/+80 | |
| | | | | ||||||
* | | | | Methods that return nil should not be considered YAML | Joshua Wehner | 2011-05-10 | 1 | -4/+1 | |
| |/ / |/| | | ||||||
* | | | Puts ActiveRecord::SessionStore attributes in white list, fixes #483 | slainer68 | 2011-05-10 | 2 | -0/+8 | |
| | | | ||||||
* | | | Fix typos in IM documentation | Vijay Dev | 2011-05-10 | 1 | -2/+2 | |
| | | | ||||||
* | | | Document identity map inconsistency with associations, closes #474. | José Valim | 2011-05-10 | 1 | -1/+28 | |
| | | | ||||||
* | | | Fix #480. Passing nil to create association works. | José Valim | 2011-05-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f". | José Valim | 2011-05-10 | 1 | -26/+27 | |
| | | | | | | | | | | | | | | | Wrapping each Record.associations.build in a transaction is going to make several unneeded queries. Reverting this commit also fixes #479. | |||||
* | | | Add failing tests according to #479. | José Valim | 2011-05-10 | 1 | -0/+15 | |
| | | | ||||||
* | | | Add failing tests, according to #480. | José Valim | 2011-05-10 | 1 | -0/+14 | |
| | | | ||||||
* | | | Ensure assign_attributes and update_attributes do not fail on nil, closes #478. | José Valim | 2011-05-10 | 3 | -0/+10 | |
|/ / | ||||||
* | | use a null byte as a bind parameter substitute as it is not allowed in ↵ | Aaron Patterson | 2011-05-09 | 3 | -12/+59 | |
| | | | | | | | | normal SQL. fixes #411, #417 | |||||
* | | removed an unneed AS::Concern from AR::IdentityMap | Josh Kalderimis | 2011-05-09 | 1 | -2/+1 | |
| | | ||||||
* | | Interleave db_list and file_list. | Christopher Wade | 2011-05-09 | 1 | -6/+6 | |
| | | ||||||
* | | Sort migrations by the migration ID. | Christopher Wade | 2011-05-09 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371 | Jon Leighton | 2011-05-08 | 2 | -1/+27 | |
|\ \ | ||||||
| * | | Fix for #371 | Nick Howard | 2011-05-08 | 2 | -1/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if a query contains a limit or an offset, ActiveRecord::FinderMethods#find_last had inconsistent behavior. If the records were loaded, it returned the last record in the cached list. If they were not, it reversed the order of the query and changed the limit to one. If the earlier limit was less than the total matching the query in the db, it would return a different record than if the records had been cached. This commit changes find_last so that it loads the records when getting the last record on a query containing a limit or an offset, which makes the behavior consistent. | |||||
* | | | Ensure that ORDER BY clauses from default scopes are not included in ↵ | Jon Leighton | 2011-05-08 | 2 | -1/+5 | |
| | | | | | | | | | | | | calculation queries. Fixes #406. | |||||
* | | | Don't quote ID's as Arel will quote them -- follow same conventions as the ↵ | Christopher Meiklejohn | 2011-05-08 | 5 | -2/+52 | |
| | | | | | | | | | | | | delete method. | |||||
* | | | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵ | Josh Kalderimis | 2011-05-08 | 3 | -34/+34 | |
|/ / | | | | | | | security guide | |||||
* | | Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s)) | Jason Noble | 2011-05-07 | 1 | -0/+3 | |
| | | ||||||
* | | Namespace Fixtures in ActiveRecord | Jason Noble | 2011-05-07 | 8 | -318/+320 | |
| | | | | | | [Fixes #439] | |||||
* | | Class.new.name returns an empty string on 1.8 | José Valim | 2011-05-07 | 1 | -1/+1 | |
| | | ||||||
* | | Revert "Revert the merge because tests did not pass." | José Valim | 2011-05-07 | 3 | -5/+44 | |
| | | | | | | | | This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3. | |||||
* | | fix yield not working from around filter of observers, fixes Github#329 | Hemant Kumar | 2011-05-07 | 2 | -2/+27 | |
| | | ||||||
* | | Merge pull request #396 from asanghi/lh_4346 | Xavier Noria | 2011-05-06 | 2 | -29/+187 | |
|\ \ | | | | | | | Multiparameter POLA (principle of least authority) with respect to time_select fixes. See LH4346 | |||||
| * | | Multiparameter POLA, time_select fixes. See LH4346 | Aditya Sanghi | 2011-05-05 | 2 | -29/+187 | |
| | | | ||||||
* | | | Update CHANGELOGs. | José Valim | 2011-05-06 | 1 | -19/+16 | |
| | | | ||||||
* | | | Merge pull request #399 from ernie/join_conditions_on_join | Jon Leighton | 2011-05-05 | 2 | -3/+14 | |
|\ \ \ | | | | | | | | | Add association join conditions to JOIN clause, not WHERE | |||||
| * | | | Add a test for outer joins with conditions where value IS NULL | Ernie Miller | 2011-05-05 | 1 | -0/+5 | |
| | | | |