aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Revert "corrected some misspelling"Vijay Dev2012-05-151-3/+3
| | | | | | This reverts commit 3b6c0e35d0c6e2671c423fd8524e88b3bf25503b. Reason: changelogs aren't meant to be edited in docrails.
* Merge pull request #99 from GRoguelon/masterVijay Dev2012-05-151-1/+1
|\ | | | | Fix an error in methods example of instanciated fixtures.
| * Fix an error in example in methods of instanciated fixtures.Geoffrey Roguelon2012-05-151-1/+1
| |
* | corrected some misspellingAngelo capilleri2012-05-151-3/+3
| |
* | Fix typo [ci skip]Peter Suschlik2012-05-151-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-0/+8
|\| | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * Add documentation for arel_tableOscar Del Ben2012-05-141-0/+8
| |
* | Set the primary key during #copy_table if necessary. Fixes [#2312]Sean Scally2012-05-142-1/+13
| |
* | MySQL doesn't allow default values for blobs.Rafael Mendonça França2012-05-131-2/+2
| |
* | Copy edit [ci skip]Rafael Mendonça França2012-05-132-3/+5
| |
* | Merge pull request #5807 from Antiarchitect/store-improvementRafael Mendonça França2012-05-135-6/+55
|\ \ | | | | | | Custom coders support for ActiveRecord::Store.
| * | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵Andrey Voronkov2012-05-095-6/+55
| | | | | | | | | | | | used out of the box.
* | | fix todo: use minitest skip instead of return nilFrancesco Rodriguez2012-05-131-9/+8
| | |
* | | Merge pull request #6193 from mhfs/fix_oracle_specRafael Mendonça França2012-05-121-1/+1
|\ \ \ | | | | | | | | Fix failing AR test on Oracle
| * | | Fix failing test on Oracle. Having a duplicated column specified in aMarcelo Silveira2012-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | select with order on the same column makes Oracle complain about "column ambiguously defined" when an order is defined on such column (introduced by default order on `first`) (fixes #6147).
* | | | fixes a nodoc which swallowed the documentation for the rest of the methods ↵Vijay Dev2012-05-121-2/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #6285 from ↵Vijay Dev2012-05-121-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | acapilleri/missplelling_error_in_abstract_mysql_adapter missplelling error in abstract_mysql_adapter
| * | | missplelling error in abstract_mysql_adapterAngelo Capilleri2012-05-121-1/+1
| | | |
* | | | 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
| | | |
* | | | mispelling errors in render_text_test.rb and sqlite_specific_schemaangelo giovanni capilleri2012-05-121-1/+1
| | | |
* | | | Remove #=== quirkJon Leighton2012-05-113-17/+0
| | | | | | | | | | | | | | | | Makes it consistent with Relation. Can't see a use for this.
* | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
| | | |
* | | | 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-1111-60/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-2/+3
| | | |
* | | | remove unnecessary 'examples' noise [ci skip]Vijay Dev2012-05-112-28/+18
| | | |
* | | | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rbJeremy Kemper2012-05-092-81/+82
|\ \ \ \ | | | | | | | | | | Rename variables and remove unused code in fixtures.rb
| * | | | Rename some variablesAlexey Muranov2012-05-092-78/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Allow to run `connection_adapters/quoting_test.rb` independentlyPiotr Sarnacki2012-05-091-1/+3
| | | |
* | | | Merge pull request #5362 from zenprogrammer/quoting_bugAaron Patterson2012-05-092-0/+12
|\ \ \ \ | | | | | | | | | | Fixed bug in ActiveRecord that caused classes to be quoted incorrectly
| * | | | Fixed bug in Quoting that caused classes to be quoted incorrectlyRyan Oblak2012-03-092-0/+12
| | | | |
* | | | | make both cached and record_updated accessors in one lineHemant Kumar2012-05-091-2/+1
| | | | |
* | | | | after_commit :on => :update should be called when save isHemant Kumar2012-05-091-0/+7
| | | | | | | | | | | | | | | | | | | | called from after_commit callback
* | | | | Fix transaction state not changing when after record gets commitedHemant Kumar2012-05-092-6/+27
| |/ / / |/| | |
* | | | 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-053-5/+17
|\ \ \ \ | | | | | | | | | | 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-053-5/+17
| | | | |
* | | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysqlJeremy Kemper2012-05-056-1/+54
|\ \ \ \ \ | | | | | | | | | | | | Use strict mode in mysql