aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix `ActiveRecord::RecordNotFound` error message with custom primary keyKuldeep Aggarwal2014-01-252-9/+26
|
* Merge pull request #13791 from kei-s/remove_duplicate_mergeCarlos Antonio da Silva2014-01-221-1/+0
|\ | | | | Remove duplicate merge
| * Remove duplicate mergekei2014-01-221-1/+0
| |
* | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2014-01-221-2/+14
| |
* | Make CollectionProxy#reset return selfRafael Mendonça França2014-01-221-1/+2
| |
* | Merge pull request #13790 from kschlarman/collection_association_reset_fixRafael Mendonça França2014-01-223-0/+36
|\ \ | |/ |/| | | Calling reset on a collection association should unload the assocation
| * Calling reset on a collection association should unload the assocationKelsey Schlarman2014-01-213-0/+36
| | | | | | | | Need to define #reset on CollectionProxy.
* | Merge pull request #13728 from semenyukdmitriy/masterYves Senn2014-01-222-2/+2
|\ \ | |/ |/| Added missing `file` delivery method to the Configuration Guide
| * [ci skip] Added missing `file` delivery methodSemenyuk Dmitriy2014-01-222-2/+2
| |
* | Merge pull request #13786 from terracatta/masterRafael Mendonça França2014-01-219-85/+168
|\ \ | | | | | | Ensure AR #second, #third, etc. finders work through associations
| * | Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-219-85/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes two regressions introduced in cafe31a078 where newly created finder methods #second, #third, #forth, and #fifth caused a NoMethodError error on reload associations and where we were pulling the wrong element out of cached associations. Examples: some_book.authors.reload.second # Before # => NoMethodError: undefined method 'first' for nil:NilClass # After # => #<Author id: 2, name: "Sally Second", ...> some_book.first.authors.first some_book.first.authors.second # Before # => #<Author id: 1, name: "Freddy First", ...> # => #<Author id: 1, name: "Freddy First", ...> # After # => #<Author id: 1, name: "Freddy First", ...> # => #<Author id: 2, name: "Sally Second", ...> Fixes #13783.
* | | Fix typoRafael Mendonça França2014-01-211-1/+1
|/ /
* | Merge pull request #13776 from rails/dirty-enumRafael Mendonça França2014-01-216-4/+128
|\ \ | | | | | | | | | | | | | | | | | | Implement the Dirty API with the Enum feature correctly. Conflicts: activerecord/CHANGELOG.md
| * | Use string as keysRafael Mendonça França2014-01-211-2/+2
| | |
| * | Store the enum values in the DEFINED_ENUM constantRafael Mendonça França2014-01-211-8/+8
| | | | | | | | | | | | | | | This will make simpler to compare if the values changed in the save_changed_attribute method.
| * | Add more tests for the dirty feature for enumsRafael Mendonça França2014-01-215-8/+53
| | |
| * | Make enum feature work with dirty methodsRafael Mendonça França2014-01-213-1/+76
| | | | | | | | | | | | | | | To make this possible we have to override the save_changed_attribute hook.
| * | Extract all attribute changed work to its own methodRafael Mendonça França2014-01-211-3/+7
| | | | | | | | | | | | This will make easier to hook on this feature to customize the behavior
* | | Merge pull request #13784 from kuldeepaggarwal/fix-doc-collection-proxyRafael Mendonça França2014-01-211-1/+1
|\ \ \ | | | | | | | | Add missing information for `id` field when used with `select` [ci skip]
| * | | add missing information for `id` field when used with `select` [ci skip]Kuldeep Aggarwal2014-01-221-1/+1
|/ / /
* | | `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore.Rafael Mendonça França2014-01-214-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 4.0, we add an ORDER BY in the `first` method to ensure consistent results among different database engines. But for singular associations this behavior is not needed since we will have one record to return. As this ORDER BY option can lead some performance issues we are removing it for singular associations accessors. Fixes #12623.
* | | prepend table name for `Relation#select` columns.Yves Senn2014-01-213-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where `select(:id)` combined with `joins()` raised: ``` ActiveRecord::StatementInvalid: SQLite3::SQLException: ambiguous column name: id: SELECT id, authors.author_address_id FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY posts.id LIMIT 3 ``` The `select_values` are still String and Symbols because other parts (mainly calculations.rb) rely on that fact. /cc @tenderlove
* | | Merge pull request #13696 from senny/engine_bin_rails_load_bundlerYves Senn2014-01-211-0/+4
|\ \ \ | | | | | | | | setup Bundler in engines `bin/rails` stub.
| * | | setup Bundler in engines `bin/rails` stub.Yves Senn2014-01-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary when bundling gems locally using `BUNDLE_PATH`. Without this patch `bin/rails` fails with: ``` /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- rails/all (LoadError) from /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require' from bin/rails:7:in `<main>' ```
* | | | Active Record changelog wording and formatting. [ci skip]Yves Senn2014-01-211-5/+6
| | | |
* | | | Merge pull request #9969 from divineforest/fix-find-in-batchesYves Senn2014-01-213-6/+13
|\ \ \ \ | | | | | | | | | | Fail early with "Primary key not included in the custom select clause" i...
| * | | | Fail early with "Primary key not included in the custom select clause" in ↵Alexander Balashov2014-01-213-6/+13
| | |/ / | |/| | | | | | | | | | | | | | find_in_batches Before this patch find_in_batches raises this error only on second iteration. So you will know about the problem only when you get the batch size threshold.
* / | | Remove missed usage of @first variableCarlos Antonio da Silva2014-01-211-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | With the introduction of `#second` method and friends, we added an offsets hash which replaced the @first variable, so removing it from the reset method to avoid creating an unused variable now. Introduced in bc625080308e4853ae3036f2ad74fe3826e463ef.
* | | Forgot to push this change in the parent commitRafael Mendonça França2014-01-201-1/+1
| | |
* | | When applying changes or reseting changes create the right classRafael Mendonça França2014-01-202-3/+11
| | | | | | | | | | | | | | | | | | | | | Before this patch after the changes are applied the changes can be only accessed using string keys, but before symbols are also accepted. After this change every state of the model will be consistent.
* | | Remove unneded argumentRafael Mendonça França2014-01-201-2/+2
| | | | | | | | | | | | This variable is internal and should not be exposed to end users
* | | Merge pull request #13757 from terracatta/masterRafael Mendonça França2014-01-2010-34/+245
|\ \ \ | | | | | | | | | | | | Ensure #second (and others) acts like #first AR finder
| * | | Ensure #second acts like #first AR finderJason Meller2014-01-2010-34/+245
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit bring the famous ordinal Array instance methods defined in ActiveSupport into ActiveRecord as fully-fledged finders. These finders ensure a default ascending order of the table's primary key, and utilize the OFFSET SQL verb to locate the user's desired record. If an offset is defined in the query, calling #second adds to the offset to get the actual desired record. Fixes #13743.
* | | Merge branch 'anilmaurya-master'Rafael Mendonça França2014-01-201-3/+1
|\ \ \
| * | | moving controller_name assignment before model name conditionanilmaurya2014-01-201-3/+1
|/ / /
* | | Tidy up tests and CHANGELOG for #12598Andrew White2014-01-204-7/+37
| | |
* | | Automatically convert dashes to underscores in shorthand routesMikko Johansson2014-01-202-0/+11
| | |
* | | Automatically convert dashes to underscores for url helpersAmr Tamimi2014-01-204-2/+20
| | |
* | | docs should say `email` not `Email`. [ci skip]Yves Senn2014-01-203-4/+4
| | |
* | | docs, hyperlink the `Mail gem` in Action Mailer guide. [ci skip]Yves Senn2014-01-201-2/+2
| | |
* | | let's link to the gem README not to the upgrading guide. [ci skip]Yves Senn2014-01-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PR #13767 added link to the upgrading guide to explain details about activerecord_deprecated-finders. However the link target features a stack of changes not releated at all. Also the relevant details are not very informative. I think we better link to the README so people can see what the gem is about and how to use it. /cc @chancancode @zzak
* | | Fix secrets.yml path in exception messageCarlos Antonio da Silva2014-01-201-9/+7
| | | | | | | | | | | | The file is config/secrets.yml, not config/initializers/secrets.yml.
* | | Merge pull request #13767 from zzak/doc_4_1_release_notes_deprecated_findersGodfrey Chan2014-01-201-0/+3
|\ \ \ | | | | | | | | Add link to upgrade guide for full list of deprecated finders [ci skip]
| * | | Add link to upgrade guide for full list of deprecated finders [ci skip]Zachary Scott2014-01-191-0/+3
| | | |
* | | | Merge pull request #13769 from arelenglish/fix_typo_upgrad_guideGodfrey Chan2014-01-191-1/+1
|\ \ \ \ | | | | | | | | | | Fix a typo that says you application [ci skip]
| * | | | Fix a typo that says you application [ci skip]Arel English2014-01-201-1/+1
|/ / / /
* | | | Merge pull request #13768 from rajeshthummalapally/rails_blog_correct_patch_linkGodfrey Chan2014-01-191-1/+1
|\ \ \ \ | | | | | | | | | | Fix for incorrect link that is pointing to Rails blog [ci skip]
| * | | | Correcting link that is pointing to Rails blog [ci skip]Rajesh Thummalapally2014-01-191-1/+1
|/ / / /
* | | | Merge pull request #13765 from robertomiranda/secrets_tokenGuillermo Iguaran2014-01-191-4/+4
|\ \ \ \ | | | | | | | | | | Update Error Message when secrets.secret_key_base isn't given
| * | | | Update Error Message when secrets.secret_key_base isn't givenrobertomiranda2014-01-191-4/+4
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 20:35:47 +0000