aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15924 from sgrif/sg-write-unknown-columnRafael Mendonça França2014-06-269-13/+34
|\ | | | | Move writing unknown column exception to null attribute
| * Move writing unknown column exception to null attributeSean Griffin2014-06-269-13/+34
| | | | | | | | | | | | Making this change revealed several subtle bugs related to models with no primary key, and anonymous classes. These have been fixed as well, with regression tests added.
* | Merge pull request #15916 from sgrif/sg-test-update-allRafael Mendonça França2014-06-264-30/+28
|\ \ | |/ |/| Consolidate testing of update_all type casting
| * Consolidate testing of update_all type castingSean Griffin2014-06-264-30/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We have several test cases on "tricky" types that are essentially testing that `update_all` goes through the same type casting behavior as a normal assignment + save. We recently had another case to add this test for another type in https://github.com/rails/rails/pull/12742. Rather than testing this separately for every type which is "tricky" when round tripping, let's instead have a fairly exhaustive test that ensures we're getting the correct values at every step for `update_all`. Given the structure of the code now, we can be confident that if the type is correct, and `update_all` is type casting correctly, we're going to get the right behavior for all types.
* | Merge pull request #15754 from sgrif/sg-deprecate-hmt-counter-cacheRafael Mendonça França2014-06-2616-36/+93
|\ \ | |/ |/| Deprecate automatic counter caches on has_many :through
| * Deprecate automatic counter caches on has_many :throughSean Griffin2014-06-2616-36/+93
|/ | | | | | | | | | | Reliant on https://github.com/rails/rails/pull/15747 but pulled to a separate PR to reduce noise. `has_many :through` associations have the undocumented behavior of automatically detecting counter caches. However, the way in which it does so is inconsistent with counter caches everywhere else, and doesn't actually work consistently. As with normal `has_many` associations, the user should specify the counter cache on the `belongs_to`, if they'd like it updated.
* Merge pull request #15870 from sgrif/sg-attribute-nameRafael Mendonça França2014-06-265-44/+64
|\ | | | | `Attribute` should know about its name
| * `Attribute` should know about its nameSean Griffin2014-06-265-44/+64
|/ | | | | This allows using polymorphism for the uninitialized attributes raising an exception behavior.
* Merge pull request #15845 from robin850/jruby-isolationRafael Mendonça França2014-06-261-6/+16
|\ | | | | Make the isolated tests run on JRuby
| * Make the isolated tests run on JRubyRobin Dupret2014-06-211-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As there is no forking on JRuby, we need to spawn sub-processes to make the tests run in isolation. Previously, we were defining globally env variables and running the test file through backticks and delete these variables once the test ran. Now, we simply rely on IO.popen as this is cross-platform and the env variables are available during the child-process execution only so there are no race conditions. [Ben Browning & Robin Dupret]
* | Merge pull request #15834 from rmehner/allow_proc_and_symbol_for_only_integerRafael Mendonça França2014-06-263-1/+32
|\ \ | | | | | | Allow proc and symbol as values for `only_integer` of `NumericalityValidator`
| * | `only_integer` of `NumericalityValidator` now allows procs and symbolsRobin Mehner2014-06-223-1/+32
| | |
* | | Require shellwords since it is dependecy of this fileRafael Mendonça França2014-06-261-0/+2
| | | | | | | | | | | | Closes #15919
* | | Encapsulate the creation of `Attribute` objectsSean Griffin2014-06-267-19/+92
| | | | | | | | | | | | | | | | | | | | | | | | This will make it less painful to add additional properties, which should persist across writes, such as `name`. Conflicts: activerecord/lib/active_record/attribute_set.rb
* | | Merge pull request #15868 from sgrif/sg-uninitialized-attributesRafael Mendonça França2014-06-266-28/+144
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move behavior of `read_attribute` to `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb activerecord/test/cases/attribute_set_test.rb
| * | | Move behavior of `read_attribute` to `AttributeSet`Sean Griffin2014-06-256-28/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved `Builder` to its own file, as it started looking very weird once I added private methods to the `AttributeSet` class and the `Builder` class started to grow. Would like to refactor `fetch_value` to change to ```ruby self[name].value(&block) ``` But that requires the attributes to know about their name, which they currently do not.
* | | | Merge pull request #15847 from sgrif/sg-encapsulate-result-typesRafael Mendonça França2014-06-265-28/+59
|\ \ \ \ | | | | | | | | | | Encapsulate knowledge of type objects on `ActiveRecord::Result`
| * | | | Encapsulate knowledge of type objects on `ActiveRecord::Result`Sean Griffin2014-06-225-28/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to reduce the number of places that care about the details of how type casting occurs. We remove the type casting of the primary key in `JoinDependecy`, rather than encapsulating it. It was originally added for consistency with https://github.com/rails/rails/commit/40898c8c19fa04442fc5f8fb5daf3a8bdb9a1e03#diff-06059df8d3dee3101718fb2c01151ad0R211, but that conditional was later removed in https://github.com/rails/rails/commit/d7ddaa530fd1b94e22d745cbaf2e8a5a34ee9734. What is important is that the same row twice will have the same value for the primary key, which it will.
* | | | | Merge pull request #15846 from sgrif/sg-attributes-before-type-castRafael Mendonça França2014-06-263-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `attributes_before_type_cast` to `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb activerecord/test/cases/attribute_set_test.rb
| * | | | | Move `attributes_before_type_cast` to `AttributeSet`Sean Griffin2014-06-213-2/+13
| | |_|_|/ | |/| | |
* | | | | docs, fix BacktraceCleaner code example. Closes #15911. [ci skip]Yves Senn2014-06-251-1/+1
| | | | |
* | | | | sync deprecations and removals with 4.2 release notes. [ci skip]Yves Senn2014-06-251-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed that there was no section about Action View and added the heading. Notable changes need to be compiled. /cc @chancancode @zzak
* | | | | synchronize Active Record deprecations / removals with 4.2 release notesYves Senn2014-06-252-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] /cc @chancancode @zzak
* | | | | `preload` preserves readonly flag on associations. #15853Yves Senn2014-06-253-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial fix for #15853. It only works when a `preload` is issued and not an `eager_load`. I've added a skipped failing test-case to keep in mind that we need to deal with `eager_load`.
* | | | | Merge pull request #15902 from yuki24/fix-name-error-bugRafael Mendonça França2014-06-242-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix a bug where NameError#name returns a qualified name in string
| * | | | | Fix a bug where NameError#name returns a qualified name in stringYuki Nishijima2014-06-242-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby's original behaviour is that : * It only returns a const name, not a qualified aname * It returns a symbol, not a string
* | | | | | Merge pull request #15836 from DNNX/router-swap-select-sortRafael Mendonça França2014-06-241-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Replace x.sort_by!.select! with x.select!.sort_by!
| * | | | | | Replace x.sort_by!.select! with x.select!.sort_by!Viktar Basharymau2014-06-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter has the same speed as the former in the worst case and faster in general, because it is always better to sort less items. Unfortunately, `routes.select!{...}.sort_by!{...}` is not possible here because `select!` returns `nil`, so select! and sort! must be done in two steps.
* | | | | | | Merge pull request #15885 from lucasmazza/lm-skip-routesRafael Mendonça França2014-06-242-2/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add a '--skip-routes' flag for the Controller generator.
| * | | | | | Add a '--skip-routes' flag for the Controller generator.Lucas Mazza2014-06-242-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way it is possible to skip the addition of the 'get "foo/bar"' routes when generating a controller.
* | | | | | | Merge pull request #15899 from garethrees/gr-texthelperRafael Mendonça França2014-06-242-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Deal with regex match groups in excerpt
| * | | | | | | Deal with regex match groups in excerptGareth Rees2014-06-242-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original implementation has bugs if the regex contains a match group. Example: excerpt('This is a beautiful? morning', /\b(beau\w*)\b/i, :radius => 5) Expected: "...is a beautiful? mor..." Actual: "...is a beautifulbeaut..." The original phrase was being converted to a regex and returning the text either side of the phrase as expected: 'This is a beautiful? morning'.split(/beautiful/i, 2) # => ["This is a ", "? morning"] When we have a match with groups the match is returned in the array. Quoting the ruby docs: "If pattern is a Regexp, str is divided where the pattern matches. [...] If pattern contains groups, the respective matches will be returned in the array as well." 'This is a beautiful? morning'.split(/\b(beau\w*)\b/iu, 2) # => ["This is a ", "beautiful", "? morning"] If we assume we want to split on the first match – this fix makes that assumption – we can pass the already assigned `phrase` variable as the place to split (because we already know that a match exists from line 168). Originally spotted by Louise Crow (@crowbot) at https://github.com/mysociety/alaveteli/pull/1557
* | | | | | | | Merge pull request #15887 from RudyOnRails/patch-1Arthur Nogueira Neves2014-06-241-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Improves readability of this line...
| * | | | | | | Improves readability...Kevin Musiorski2014-06-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #15828 from yuki24/add-warning-about-rescue-from-exceptionSean Griffin2014-06-241-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add warning section for `rescue_from Exception` in Guides
| * | | | | | | | Add warning for `rescue_from Exception` and `rescue_from StandardError`Yuki Nishijima2014-06-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Doc pass for `Type::Value` [ci skip]Sean Griffin2014-06-242-23/+43
| | | | | | | | |
* | | | | | | | | Merge pull request #15895 from sgrif/sg-numeric-changesYves Senn2014-06-243-3/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Always assume strings with non-numeric characters change numeric types
| * | | | | | | | | Always assume strings with non-numeric characters change numeric typesSean Griffin2014-06-243-3/+35
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously only did this if the old value was zero, to make sure numericality validations run and failed if the user gave 'wibble' as the value, which would be type cast to 0. However, numericality validations will fail if there are any non-numeric characters in the string, so 5 -> '5wibble' should also be marked as changed.
* | | | | | | | | Merge pull request #15894 from sgrif/sg-silence-warning-in-testYves Senn2014-06-242-7/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Silence warning in test
| * | | | | | | | Silence warning in testSean Griffin2014-06-242-7/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still had one file using `column_for_attribute` when it could return nil, causing deprecation warnings in the tests.
* | | | | | | | `:nodoc: all` does not remove the constants from the API. [ci skip]Yves Senn2014-06-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to add individual `:nodoc:` for nested classes / modules to completely remove the constants from the API.
* | | | | | | | add missing `:nodoc:` to `store.rb`. [ci skip]Yves Senn2014-06-241-4/+4
| | | | | | | |
* | | | | | | | Merge pull request #15871 from yuki24/add-model-name-instance-methodDavid Heinemeier Hansson2014-06-242-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add #model_name instance method to ActiveModel::Naming
| * | | | | | | | Delegate #model_name method to self.classYuki Nishijima2014-06-222-0/+12
| | | | | | | | |
* | | | | | | | | add missing `:nodoc:` for recent refactorings. [ci skip]Yves Senn2014-06-2431-36/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding `# :nodoc:` to the parent `class` / `module` is not going to ignore nested classes or modules. There is a modifier `# :nodoc: all` but sadly the containing class or module will continue to be in the docs. /cc @sgrif
* | | | | | | | | Merge pull request #15810 from maurogeorge/guides-rails-updateYves Senn2014-06-241-0/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add rails:update to the upgrading guides
| * | | | | | | | | Add rails:update to the upgrading guidesMauro George2014-06-191-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge pull request #15881 from mmozuras/remove_unused_paramsRafael Mendonça França2014-06-232-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Remove unused params
| * | | | | | | | | Remove unused param 'conn' from ConnectionPool#releaseMindaugas Mozūras2014-06-231-3/+3
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-14 20:39:29 +0000