aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-123-6/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | | | | copy edits [ci skip]Vijay Dev2012-05-121-4/+1
| | | | | | |
| * | | | | | Better document the difference between #clone and #dup.Erich Menge2012-05-111-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add #nodoc to initialize_dup and use :method: to document the #dup method. Relates to issue #6235
| * | | | | | better wordingHrvoje Šimić2012-05-111-4/+4
| | | | | | |
| * | | | | | missing 'with'Hrvoje Šimić2012-05-111-1/+1
| | |/ / / / | |/| | | |
* | | | | | s/wether/whether [ci skip]Vijay Dev2012-05-121-1/+1
| | | | | |
* | | | | | Remove #=== quirkJon Leighton2012-05-111-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Makes it consistent with Relation. Can't see a use for this.
* | | | | | this stuff can all be handled by RelationJon Leighton2012-05-111-38/+0
| | | | | |
* | | | | | extract deprecated codeJon Leighton2012-05-111-8/+1
| | | | | |
* | | | | | set_owner_attributes is covered by the scopingJon Leighton2012-05-111-4/+3
| | | | | |
* | | | | | CollectionProxy < RelationJon Leighton2012-05-116-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 White2012-05-101-2/+1
| | | | | |
* | | | | | remove unnecessary 'examples' noise [ci skip]Vijay Dev2012-05-112-28/+18
| | | | | |
* | | | | | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rbJeremy Kemper2012-05-091-79/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename variables and remove unused code in fixtures.rb
| * | | | | | Rename some variablesAlexey Muranov2012-05-091-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.rbAlexey Muranov2012-05-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the unused private method ActiveRecord::Fixtures#yaml_fixtures_key(path).
| * | | | | | Remove unused parameter in ::instantiate_fixturesAlexey Muranov2012-05-091-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | Second parameter of Fixtures::instantiate_fixtures was not used, so i removed it.
* | | | | | Merge pull request #5362 from zenprogrammer/quoting_bugAaron Patterson2012-05-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed bug in ActiveRecord that caused classes to be quoted incorrectly
| * | | | | | Fixed bug in Quoting that caused classes to be quoted incorrectlyRyan Oblak2012-03-091-0/+1
| | | | | | |
* | | | | | | Fix transaction state not changing when after record gets commitedHemant Kumar2012-05-091-6/+2
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-082-2/+3
|\ \ \ \ \ \
| * | | | | | Doc for ActiveRecord::Result empty? methodRob Zolkos2012-05-071-0/+1
| | | | | | |
| * | | | | | SpawnMethods#merge returns the intersection when passed an array, and not ↵Mitch Crowe2012-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the union. Update the documentation to reflect this.
* | | | | | | Use deep_dup in aciverecord default columns assignmentPiotr Sarnacki2012-05-061-4/+2
| | | | | | |
* | | | | | | Merge pull request #6173 from mhfs/takes_instead_firstJeremy Kemper2012-05-051-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 Silveira2012-05-051-4/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysqlJeremy Kemper2012-05-052-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use strict mode in mysql
| * | | | | | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode.Michael Pearson2012-05-052-4/+9
| | | | | | | |
| * | | | | | | Default to 'strict mode' in MySQLMichael Pearson2012-05-052-0/+11
| |/ / / / / /
* | | | | | | Merge pull request #6054 from flexoid/column-fixJon Leighton2012-05-051-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent creating valid time-like objects from blank string from db
| * | | | | | | Prevent creating valid time-like objects from blank string from dbEgor Lynko2012-05-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #6045
* | | | | | | | Revert "Merge pull request #5494 from ↵Jon Leighton2012-05-053-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 Leighton2012-05-053-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 associationsJared Armstrong2012-05-043-5/+35
| | | | | | |
* | | | | | | Duplicate column_defaults properly (closes #6115)Piotr Sarnacki2012-05-041-1/+4
| | | | | | |
* | | | | | | Change unless + ! into ifPiotr Sarnacki2012-05-041-1/+1
| | | | | | |
* | | | | | | Merge pull request #3713 from kf8a/masterAaron Patterson2012-05-041-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 InfinitySven Bohm2011-11-211-2/+7
| | | | | | | |
* | | | | | | | extract deprecated dynamic methodsJon Leighton2012-05-041-140/+38
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-043-12/+18
|\ \ \ \ \ \ \
| * | | | | | | Add empty rows to improve readability. [ci skip]Edward Tsech2012-05-011-0/+2
| | | | | | | |
| * | | | | | | Add few lines to describe how aggregation part caching works. [ci skip]Edward Tsech2012-05-011-0/+4
| | | | | | | |
| * | | | | | | simpler wording and explanationsHrvoje Šimić2012-05-012-11/+11
| | | | | | | |
| * | | | | | | Lowercase.Ben Pickles2012-05-011-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #5650 from sekrett/masterVijay Dev2012-05-041-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 changelogAlexander Zubkov2012-03-291-1/+1
| | | | | | | | |
* | | | | | | | | actually don't need to expand the aggregates at allJon Leighton2012-05-041-11/+1
| | | | | | | | |
* | | | | | | | | #to_sym is unnecessaryJon Leighton2012-05-041-3/+3
| | | | | | | | |
* | | | | | | | | de-globalise methodJon Leighton2012-05-043-9/+6
| | | | | | | | |
* | | | | | | | | extract code from AR::BaseJon Leighton2012-05-042-33/+29
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-30 18:10:31 +0000