aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix kindlerb version [ci skip]Xavier Noria2015-01-311-1/+1
| | | | | This means we know generation works with this version, it does not mean it does not work with the last releases (should be tested).
* Merge pull request #18748 from JuanitoFatas/doc/process-formatAbdelkader Boudih2015-01-311-0/+1
|\ | | | | [ci skip] Document format parameter of process method in AC test_case.
| * [ci skip] Document format parameter of process method in AC test_case.Juanito Fatas2015-01-311-0/+1
|/
* unify CHANGELOG format. [ci skip]Yves Senn2015-01-314-39/+42
|
* Fixed a few things from ee9e4c3Godfrey Chan2015-01-305-12/+12
| | | | | Mostly cosmetics, except that `isolate_namespace` should be applied to the last module in the chain.
* Merge pull request #13601 from robinboening/allow_dashes_in_gem_namesGodfrey Chan2015-01-3021-67/+194
|\ | | | | | | Allow hyphenated names for `rails plugin new` generator
| * Allow hyphenated names for `rails plugin new` generator.Robin Böning2015-01-3021-67/+194
| | | | | | | | | | | | It was not possible to create a new gem with a hyphenated name via the `rails plugin new` generator. The naming guide of rubygems clearly says dashes should be used for gems that extend other gems. http://guides.rubygems.org/name-your-gem/
* | Allow keyword arguments to work with ActiveJobSean Griffin2015-01-304-19/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, the HashWithIndifferent access approach is insufficient for our needs. It's perfectly reasonable to want to use keyword arguments with Active Job, which we will see as a symbol keyed hash. For Ruby to convert this back to keyword arguments, it must deserialize to a symbol keyed hash. There are two primary changes to the serialization behavior. We first treat a HWIA separately, and mark it as such so we can convert it back into a HWIA during deserialization. For normal hashes, we keep a list of all symbol keys, and convert them back to symbol keys after deserialization. Fixes #18741.
* | Remove most type related predicates from `Column`Sean Griffin2015-01-3026-101/+134
| | | | | | | | | | | | Remaining are `limit`, `precision`, `scale`, and `type` (the symbol version). These will remain on the column, since they mirror the options to the `column` method in the schema definition DSL
* | Remove most uses of `Column#cast_type`Sean Griffin2015-01-306-22/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal is to remove the type object from the column, and remove columns from the type casting process entirely. The primary motivation for this is clarity. The connection adapter does not have sufficient type information, since the type we want to work with might have been overriden at the class level. By taking this object from the column, it is easy to mistakenly think that the column object which exists on the connection adapter is sufficient. It isn't. A concrete example of this is `serialize`. In 4.2 and earlier, `where` worked in a very inconsistent and confusing manner. If you passed a single value to `where`, it would serialize it before querying, and do the right thing. However, passing it as part of an array, hash, or range would cause it to not work. This is because it would stop using prepared statements, so the type casting would come from arel. Arel would have no choice but to get the column from the connection adapter, which would treat it as any other string column, and query for the wrong value. There are a handful of cases where using the column object to find the cast type is appropriate. These are cases where there is not actually a class involved, such as the migration DSL, or fixtures. For all other cases, the API should be designed as such that the type is provided before we get to the connection adapter. (For an example of this, see the work done to decorate the arel table object with a type caster, or the introduction of `QueryAttribute` to `Relation`). There are times that it is appropriate to use information from the column to change behavior in the connection adapter. These cases are when the primitive used to represent that type before it goes to the database does not sufficiently express what needs to happen. An example of this that affects every adapter is binary vs varchar, where the primitive used for both is a string. In this case it is appropriate to look at the column object to determine which quoting method to use, as this is something schema dependent. An example of something which would not be appropriate is to look at the type and see that it is a datetime, and performing string parsing when given a string instead of a date. This is the type of logic that should live entirely on the type. The value which comes out of the type should be a sufficiently generic primitive that the adapter can be expected to know how to work with it. The one place that is still using the column for type information which should not be necessary is the connection adapter type caster which is sometimes given to the arel table when we can't find the associated table. This will hopefully go away in the near future.
* | Fix a state leak in `autosave_association_test`Sean Griffin2015-01-301-0/+5
|/ | | | | | The test added in 85465ed3e6c582d25f0c8fafe21f7a2c182c2f67 was passing when the file was run on its own, but failing when the entire suite was run since this test modifies the class and doesn't clean up.
* Always perform validations on nested attribute associationsSean Griffin2015-01-304-5/+22
| | | | | | | Collection associations would have already been validated, but singular associations were not. Fixes #18735.
* fix typo in `_filter` deprecation message. [ci skip]Yves Senn2015-01-301-5/+5
|
* build fix II, adjust broken tests as a consequence of 670ac73126.Yves Senn2015-01-301-4/+4
|
* build fix.Yves Senn2015-01-301-4/+4
|
* scaffold controller_test template should use kwargs. refs #18323.Yves Senn2015-01-301-5/+5
| | | | This prevents a flood of warnings when generating a new scaffold.
* tests, use `capture` instead of custom `redirect_stderr` helper.Yves Senn2015-01-301-12/+2
|
* Merge pull request #18736 from nonsensery/autoload-guide-grammar-fixYves Senn2015-01-301-1/+1
|\ | | | | Fix grammar in Qualified Constants section [ci skip]
| * Fix grammar in Qualified Constants sectionAlex Johnson2015-01-291-1/+1
| | | | | | | | | | New wording is based on the "cref" sentence earlier in the section. [ci skip]
* | Merge pull request #18734 from andreynering/docs-dumpingRafael Mendonça França2015-01-291-5/+10
|\ \ | | | | | | Improvements about schema dumping [ci skip]
| * | Improvements about schema dumping [ci skip]Andrey Nering2015-01-291-5/+10
| | |
* | | Merge pull request #18477 from Alamoz/scaffold_css_templateRafael Mendonça França2015-01-291-0/+11
|\ \ \ | | | | | | | | Add a margin to body and padding to th, td in scaffold.css.
| * | | Add a margin to body and padding to th, td.Adrien Lamothe2015-01-291-0/+11
|/ / / | | | | | | | | | Add space to new css defs.
* | | Merge pull request #18732 from BMorearty/document-bundle-updateRafael Mendonça França2015-01-291-0/+8
|\ \ \ | | | | | | | | Doc: run bundle update after cloning Rails.
| * | | Doc: run bundle update after cloning Rails.Brian Morearty2015-01-291-0/+8
| |/ /
* | | Remove duplicated testsRafael Mendonça França2015-01-291-30/+0
| | |
* | | Merge pull request #18705 from mrgilman/skip-testRafael Mendonça França2015-01-2911-22/+26
|\ \ \ | |_|/ |/| | Update option to skip test in generators
| * | Change option description and update test namesMelanie Gilman2015-01-293-3/+3
| | |
| * | Update option to skip test in generatorsMelanie Gilman2015-01-2711-20/+24
| | | | | | | | | | | | Rails no longer generates Test::Unit files by default.
* | | Post.all.or(anything) == Post.allSean Griffin2015-01-293-7/+7
| |/ |/|
* | Merge pull request #18722 from bogdan/group-by-key-wordRafael Mendonça França2015-01-293-13/+27
|\ \ | | | | | | Fixed AR::Relation#group method when argument is a SQL reserved keyword
| * | Fixed AR::Relation#group method when argument is a SQL reserved keywordBogdan Gusiev2015-01-293-13/+27
| | |
* | | Consistent usage of spaces in hashes across our codebaseRafael Mendonça França2015-01-2925-113/+117
| | |
* | | Use fixed fonts only in the name of the parameterRafael Mendonça França2015-01-293-14/+14
| | |
* | | Improve CHANGELOGRafael Mendonça França2015-01-291-6/+5
| | |
* | | Merge pull request #18323 from kirs/controller-test-kwargsRafael Mendonça França2015-01-2945-417/+938
|\ \ \ | |/ / |/| | | | | Use kwargs in ActionController::TestCase and ActionDispatch::Integration HTTP methods
| * | Switch to kwargs in ActionController::TestCase and ActionDispatch::IntegrationKir Shatrov2015-01-2945-417/+938
|/ / | | | | | | | | | | | | | | Non-kwargs requests are deprecated now. Guides are updated as well. `post url, nil, nil, { a: 'b' }` doesn't make sense. `post url, params: { y: x }, session: { a: 'b' }` would be an explicit way to do the same
* | Merge pull request #18627 from tekin/dont-blat-default-formatAndrew White2015-01-293-3/+33
|\ \ | | | | | | Preserve default format when generating URLs
| * | Preserve default url options when generating URLsTekin Suleyman2015-01-283-3/+33
| | | | | | | | | | | | | | | Fixes an issue that would cause default_url_options to be lost when generating URLs with fewer positional arguments than parameters in the route definition.
* | | Merge pull request #18719 from ↵Yves Senn2015-01-291-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5t111111/add-fix-for-loading-fixtures-in-engine-tests Add fix for loading fixtures in engine tests (additional fix for #4971) Conflicts: railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb
| * | | Add fix for loading fixtures in engine testsWAKASUGI 5T1111112015-01-291-0/+1
| | | |
* | | | reassign `file_fixture_path` in plugins `test_helper.rb`. refs #18658.Yves Senn2015-01-291-0/+1
| | | |
* | | | let dependencies use Module#const_defined?Xavier Noria2015-01-281-2/+2
|/ / / | | | | | | | | | | | | | | | | | | Module#const_defined? accepts constant paths in modern Ruby, we no longer need our qualified_* extensions. References #17845.
* | | Don't error when grouped calculations return 0 recordsSean Griffin2015-01-282-1/+6
| | | | | | | | | | | | Fixes #18717
* | | Merge Pull Request #16052 Added #or to ActiveRecord::RelationSean Griffin2015-01-288-1/+166
|\ \ \
| * | | Bring the implementation of Relation#or up to speedSean Griffin2015-01-285-44/+48
| | | |
| * | | Added #or to ActiveRecord::RelationMatthew Draper2015-01-286-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Post.where('id = 1').or(Post.where('id = 2')) # => SELECT * FROM posts WHERE (id = 1) OR (id = 2) [Matthew Draper & Gael Muller]
* | | | Always convert strings to UTF-8, regardless of column type in SQLiteSean Griffin2015-01-282-12/+7
| |/ / |/| | | | | | | | | | | | | | | | | | | | All columns which would map to a string primitive need this behavior. Binary has it's own marker type, so it won't go through this conversion. String and text, which need this, will. Fixes #18585.
* | | Merge branch 'rm-deprecate_via_redirect'Rafael Mendonça França2015-01-283-5/+31
|\ \ \
| * | | Just assert the deprecation of one methodRafael Mendonça França2015-01-281-10/+15
| | | |