Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 1 | -0/+8 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | |||||
| * | | | | | Add documentation for arel_table | Oscar Del Ben | 2012-05-14 | 1 | -0/+8 | |
| | | | | | | ||||||
* | | | | | | Set the primary key during #copy_table if necessary. Fixes [#2312] | Sean Scally | 2012-05-14 | 2 | -1/+13 | |
| | | | | | | ||||||
* | | | | | | MySQL doesn't allow default values for blobs. | Rafael Mendonça França | 2012-05-13 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Copy edit [ci skip] | Rafael Mendonça França | 2012-05-13 | 2 | -3/+5 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5807 from Antiarchitect/store-improvement | Rafael Mendonça França | 2012-05-13 | 5 | -6/+55 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Custom coders support for ActiveRecord::Store. | |||||
| * | | | | | | Custom coders support for ActiveRecord::Store. JSON, YAML, Marshal can be ↵ | Andrey Voronkov | 2012-05-09 | 5 | -6/+55 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | used out of the box. | |||||
* | | | | | | | fix todo: use minitest skip instead of return nil | Francesco Rodriguez | 2012-05-13 | 1 | -9/+8 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #6193 from mhfs/fix_oracle_spec | Rafael Mendonça França | 2012-05-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix failing AR test on Oracle | |||||
| * | | | | | | | Fix failing test on Oracle. Having a duplicated column specified in a | Marcelo Silveira | 2012-05-07 | 1 | -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 Dev | 2012-05-12 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | Merge pull request #6285 from ↵ | Vijay Dev | 2012-05-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | acapilleri/missplelling_error_in_abstract_mysql_adapter missplelling error in abstract_mysql_adapter | |||||
| * | | | | | | | missplelling error in abstract_mysql_adapter | Angelo Capilleri | 2012-05-12 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | 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 | |
| | | | | | | | | ||||||
* | | | | | | | | mispelling errors in render_text_test.rb and sqlite_specific_schema | angelo giovanni capilleri | 2012-05-12 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Remove #=== quirk | Jon Leighton | 2012-05-11 | 3 | -17/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it consistent with Relation. Can't see a use for this. | |||||
* | | | | | | | | Lazy load I18n | Santiago Pastorino | 2012-05-11 | 1 | -2/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | 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 | 11 | -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 White | 2012-05-10 | 3 | -2/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | 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 | 2 | -81/+82 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Rename variables and remove unused code in fixtures.rb | |||||
| * | | | | | | | Rename some variables | Alexey Muranov | 2012-05-09 | 2 | -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.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. | |||||
* | | | | | | | Allow to run `connection_adapters/quoting_test.rb` independently | Piotr Sarnacki | 2012-05-09 | 1 | -1/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5362 from zenprogrammer/quoting_bug | Aaron Patterson | 2012-05-09 | 2 | -0/+12 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 | 2 | -0/+12 | |
| | | | | | | | | ||||||
* | | | | | | | | make both cached and record_updated accessors in one line | Hemant Kumar | 2012-05-09 | 1 | -2/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | after_commit :on => :update should be called when save is | Hemant Kumar | 2012-05-09 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called from after_commit callback | |||||
* | | | | | | | | Fix transaction state not changing when after record gets commited | Hemant Kumar | 2012-05-09 | 2 | -6/+27 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | 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 | 3 | -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 Silveira | 2012-05-05 | 3 | -5/+17 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysql | Jeremy Kemper | 2012-05-05 | 6 | -1/+54 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use strict mode in mysql | |||||
| * | | | | | | | Changelog entry regarding mysql(2) STRICT_ALL_TABLES | Michael Pearson | 2012-05-05 | 1 | -0/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode. | Michael Pearson | 2012-05-05 | 4 | -4/+38 | |
| | | | | | | | | ||||||
| * | | | | | | | Default to 'strict mode' in MySQL | Michael Pearson | 2012-05-05 | 2 | -0/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is ↵ | Michael Pearson | 2012-05-05 | 1 | -1/+3 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | required to keep MySQL happy. | |||||
* | | | | | | | Merge pull request #6054 from flexoid/column-fix | Jon Leighton | 2012-05-05 | 2 | -3/+31 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Prevent creating valid time-like objects from blank string from db |