Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-12 | 3 | -6/+28 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb | |||||
| * | | | | | | copy edits [ci skip] | Vijay Dev | 2012-05-12 | 1 | -4/+1 | |
| | | | | | | | ||||||
| * | | | | | | Better document the difference between #clone and #dup. | Erich Menge | 2012-05-11 | 1 | -1/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add #nodoc to initialize_dup and use :method: to document the #dup method. Relates to issue #6235 | |||||
| * | | | | | | better wording | Hrvoje Šimić | 2012-05-11 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | missing 'with' | Hrvoje Šimić | 2012-05-11 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | s/wether/whether [ci skip] | Vijay Dev | 2012-05-12 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Remove #=== quirk | Jon Leighton | 2012-05-11 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Makes it consistent with Relation. Can't see a use for this. | |||||
* | | | | | | this stuff can all be handled by Relation | Jon Leighton | 2012-05-11 | 1 | -38/+0 | |
| | | | | | | ||||||
* | | | | | | extract deprecated code | Jon Leighton | 2012-05-11 | 1 | -8/+1 | |
| | | | | | | ||||||
* | | | | | | set_owner_attributes is covered by the scoping | Jon Leighton | 2012-05-11 | 1 | -4/+3 | |
| | | | | | | ||||||
* | | | | | | CollectionProxy < Relation | Jon Leighton | 2012-05-11 | 6 | -51/+57 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps bring the interfaces of CollectionProxy and Relation closer together, and reduces the delegation backflips we need to perform. For example, first_or_create is defined thus: class ActiveRecord::Relation def first_or_create(...) first || create(...) end end If CollectionProxy < Relation, then post.comments.first_or_create will hit the association's #create method which will actually add the new record to the association, just as post.comments.create would. With the previous delegation, post.comments.first_or_create expands to post.comments.scoped.first_or_create, where post.comments.scoped has no knowledge of the association. | |||||
* | | | | | | Return false for exists? with new records - fixes #6199. | Andrew White | 2012-05-10 | 1 | -2/+1 | |
| | | | | | | ||||||
* | | | | | | remove unnecessary 'examples' noise [ci skip] | Vijay Dev | 2012-05-11 | 2 | -28/+18 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rb | Jeremy Kemper | 2012-05-09 | 1 | -79/+80 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Rename variables and remove unused code in fixtures.rb | |||||
| * | | | | | | Rename some variables | Alexey Muranov | 2012-05-09 | 1 | -76/+80 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename some parameters and instance and local variables, mostly in fixtures.rb. Also remove an unused assignment to an instance variable. There are minor code changes. | |||||
| * | | | | | | Remove unused private method in fixtures.rb | Alexey Muranov | 2012-05-09 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the unused private method ActiveRecord::Fixtures#yaml_fixtures_key(path). | |||||
| * | | | | | | Remove unused parameter in ::instantiate_fixtures | Alexey Muranov | 2012-05-09 | 1 | -5/+5 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it. | |||||
* | | | | | | Merge pull request #5362 from zenprogrammer/quoting_bug | Aaron Patterson | 2012-05-09 | 1 | -0/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed bug in ActiveRecord that caused classes to be quoted incorrectly | |||||
| * | | | | | | Fixed bug in Quoting that caused classes to be quoted incorrectly | Ryan Oblak | 2012-03-09 | 1 | -0/+1 | |
| | | | | | | | ||||||
* | | | | | | | Fix transaction state not changing when after record gets commited | Hemant Kumar | 2012-05-09 | 1 | -6/+2 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-08 | 2 | -2/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Doc for ActiveRecord::Result empty? method | Rob Zolkos | 2012-05-07 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | SpawnMethods#merge returns the intersection when passed an array, and not ↵ | Mitch Crowe | 2012-05-05 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the union. Update the documentation to reflect this. | |||||
* | | | | | | | Use deep_dup in aciverecord default columns assignment | Piotr Sarnacki | 2012-05-06 | 1 | -4/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #6173 from mhfs/takes_instead_first | Jeremy Kemper | 2012-05-05 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use `take` instead of `first` to avoid unwanted implicit ordering. Closes #6147. | |||||
| * | | | | | | | Use `take` instead of `first` to avoid unwanted implicit ordering (fixes #6147) | Marcelo Silveira | 2012-05-05 | 1 | -4/+4 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysql | Jeremy Kemper | 2012-05-05 | 2 | -0/+16 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use strict mode in mysql | |||||
| * | | | | | | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode. | Michael Pearson | 2012-05-05 | 2 | -4/+9 | |
| | | | | | | | | ||||||
| * | | | | | | | Default to 'strict mode' in MySQL | Michael Pearson | 2012-05-05 | 2 | -0/+11 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #6054 from flexoid/column-fix | Jon Leighton | 2012-05-05 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Prevent creating valid time-like objects from blank string from db | |||||
| * | | | | | | | Prevent creating valid time-like objects from blank string from db | Egor Lynko | 2012-05-05 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #6045 | |||||
* | | | | | | | | Revert "Merge pull request #5494 from ↵ | Jon Leighton | 2012-05-05 | 3 | -35/+5 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge" This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing changes made to 58a49875df63729f07a9a81d1ee349087d258df5. | |||||
* | | | | | | | Merge pull request #5494 from ↵ | Jon Leighton | 2012-05-05 | 3 | -5/+35 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge ActiveRecord::Relation - maintain context of joined associations on merges | |||||
| * | | | | | | Allow ActiveRecord::Relation merges to maintain context of joined associations | Jared Armstrong | 2012-05-04 | 3 | -5/+35 | |
| | | | | | | | ||||||
* | | | | | | | Duplicate column_defaults properly (closes #6115) | Piotr Sarnacki | 2012-05-04 | 1 | -1/+4 | |
| | | | | | | | ||||||
* | | | | | | | Change unless + ! into if | Piotr Sarnacki | 2012-05-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #3713 from kf8a/master | Aaron Patterson | 2012-05-04 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | postgresql adapter should quote not a number and infinity correctly for float columns | |||||
| * | | | | | | | postgresql adapter handles quoting of not a number (NaN) and Infinity | Sven Bohm | 2011-11-21 | 1 | -2/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | extract deprecated dynamic methods | Jon Leighton | 2012-05-04 | 1 | -140/+38 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-04 | 3 | -12/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add empty rows to improve readability. [ci skip] | Edward Tsech | 2012-05-01 | 1 | -0/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Add few lines to describe how aggregation part caching works. [ci skip] | Edward Tsech | 2012-05-01 | 1 | -0/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | simpler wording and explanations | Hrvoje Šimić | 2012-05-01 | 2 | -11/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | Lowercase. | Ben Pickles | 2012-05-01 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #5650 from sekrett/master | Vijay Dev | 2012-05-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Documentation fix: Change the example for habtm association to use proc according to changelog | |||||
| * | | | | | | | | Change the example for habtm association to use proc according to changelog | Alexander Zubkov | 2012-03-29 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | actually don't need to expand the aggregates at all | Jon Leighton | 2012-05-04 | 1 | -11/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | #to_sym is unnecessary | Jon Leighton | 2012-05-04 | 1 | -3/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | de-globalise method | Jon Leighton | 2012-05-04 | 3 | -9/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | extract code from AR::Base | Jon Leighton | 2012-05-04 | 2 | -33/+29 | |
| | | | | | | | | |