aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #28160 from ↵Eileen M. Uchitelle2017-02-271-2/+2
|\ | | | | | | | | y-yagi/only_load_systemtestcase_if_puma_is_defined Only load SystemTestCase if Puma is defined
| * Only load SystemTestCase if Puma is definedyuuji.yaginuma2017-02-271-2/+2
| | | | | | | | | | | | | | | | SystemTestCase supports only Puma, and always load puma's file. https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/system_testing/server.rb#L1 For that reason, the case of use Capybara but do not use Puma, it will cause an error. So we need to check about Puma is defined as well.
* | Merge pull request #28188 from ↵Andrew White2017-02-264-8/+8
|\ \ | | | | | | | | | | | | kamipo/use_max_identifier_length_for_index_name_length Use `max_identifier_length` for `index_name_length`
| * | Use `max_identifier_length` for `index_name_length` in PostgreSQL adapterRyuta Kamizono2017-02-274-8/+8
| | | | | | | | | | | | | | | Actually `index_name_length` depend on `max_identifier_length`, not always 63.
* | | Merge pull request #28187 from kamipo/fix_intermittent_test_failureAndrew White2017-02-261-0/+3
|\ \ \ | | | | | | | | Fix `test_apply_distinct_in_count` failure in PG adapter
| * | | Fix `test_apply_distinct_in_count` failure in PG adapterRyuta Kamizono2017-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` % ARCONN=postgresql be ruby -w -Itest test/cases/calculations_test.rb -n test_apply_distinct_in_count /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/core_ext/enumerable.rb:20: warning: method redefined; discarding old sum Using postgresql Run options: -n test_apply_distinct_in_count --seed 27731 F Finished in 0.163682s, 6.1094 runs/s, 30.5470 assertions/s. 1) Failure: CalculationsTest#test_apply_distinct_in_count [test/cases/calculations_test.rb:238]: Expected /\ASELECT(?! DISTINCT) COUNT\(DISTINCT\b/ to match "SHOW max_identifier_length". 1 runs, 5 assertions, 1 failures, 0 errors, 0 skips ``` https://travis-ci.org/rails/rails/jobs/205493811#L1933 https://travis-ci.org/rails/rails/jobs/205496299#L1562 https://travis-ci.org/rails/rails/jobs/205514765#L1562
* | | | Merge pull request #25274 from kamipo/fix_find_nth_with_limit_valueAndrew White2017-02-262-6/+10
|\ \ \ \ | | | | | | | | | | Fix `find_nth` with `limit_value`
| * | | | Fix `find_nth` with `limit_value`Ryuta Kamizono2017-02-262-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | If the `index` exceeds a `limit`, simply return an empty result without querying the database.
* | | | | Merge pull request #28190 from annejohnson/update-i18n-guide-with-zero-optJon Moss2017-02-261-2/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Update i18n guide to cover :zero key support in pluralization [ci skip]
| * | | | Update i18n guide to cover :zero key support in pluralization [ci skip]Anne Johnson2017-02-261-2/+8
|/ / / /
* | | | Merge pull request #28172 from kamipo/deprecate_supports_migrationsAndrew White2017-02-2613-338/+306
|\ \ \ \ | | | | | | | | | | Deprecate `supports_migrations?` on connection adapters
| * | | | Deprecate `supports_migrations?` on connection adaptersRyuta Kamizono2017-02-2713-338/+306
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | `supports_migrations?` was added at 4160b518 to determine if schema statements (`create_table`, `drop_table`, etc) are implemented in the adapter. But all tested databases has been supported migrations since a4fc93c3 at least.
* | | | Merge pull request #28186 from kirs/patch-2Andrew White2017-02-261-1/+4
|\ \ \ \ | |/ / / |/| | | Refactor connection_pool_test
| * | | Refactor connection_pool_testKir Shatrov2017-02-261-1/+4
|/ / /
* | | [ci skip] Add CHANGELOG entry for #28183Andrew White2017-02-261-0/+4
| | |
* | | Merge pull request #28183 from eugeneius/having_select_columnAndrew White2017-02-262-1/+3
|\ \ \ | | | | | | | | Include selects in group query with having clause
| * | | Include selects in group query with having clauseEugene Kenny2017-02-262-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a grouped calculation contains a having clause that references a selected value, we need to include that selected value in the query. Postgres doesn't support referencing a selected value in a having clause, but other databases do; we can skip the test on the pg adapter but run it for the others. This was fixed before in 9a298a162c16e019fe6971e563e7f4916e86ced6, but the test coverage was lost in 5a05207d99b7e2678f9b42db2d9ffc21ec2c8c3b. The fix regressed in 6311975fb3c02f50730fd1e11b8dba8dd9c05306 and was removed in 97d46c17ea9113b0ce970167f5208c8d9170915c.
* | | | Merge pull request #28106 from jerry-tao/masterAndrew White2017-02-262-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | Remove unused params in RouteSet#add_route
| * | | Remove unused params.Jerry Tao2017-02-262-2/+2
|/ / /
* | | Merge pull request #28176 from kamipo/push_valid_type_up_to_abstract_adapterAndrew White2017-02-264-11/+3
|\ \ \ | |/ / |/| | Push `valid_type?` up to abstract adapter
| * | Push `valid_type?` up to abstract adapterRyuta Kamizono2017-02-264-11/+3
| | | | | | | | | | | | | | | | | | | | | `valid_type?` should return true if a type exists in `native_database_types` at least. https://github.com/rails/rails/blob/v5.1.0.beta1/activerecord/lib/active_record/schema_dumper.rb#L136
* | | Merge pull request #28177 from kami-zh/remove-duplicated-privateAndrew White2017-02-261-102/+100
|\ \ \ | | | | | | | | Remove duplicated private method in ActiveRecord::FinderMethods
| * | | Remove duplicated private methodkami-zh2017-02-261-102/+100
| | | |
* | | | Merge pull request #28179 from kamipo/remove_useless_lineAndrew White2017-02-261-1/+0
|\ \ \ \ | | | | | | | | | | Remove useless `select_values += select_values`
| * | | | Remove useless `select_values += select_values`Ryuta Kamizono2017-02-261-1/+0
| | |/ / | |/| | | | | | | | | | | | | | `select_values` is a local variable defined at previous line. `select_values += select_values` is totally useless.
* | | | Merge pull request #28180 from y-yagi/use_released_arelAndrew White2017-02-261-1/+0
|\ \ \ \ | |_|/ / |/| | | Use released arel
| * | | Use released arelyuuji.yaginuma2017-02-261-1/+0
|/ / / | | | | | | | | | Follow up to ea9566f6cd1b4d3f0d8a5f03283b49423b89044d
* | | Add Duration#before and #after as aliases for #ago and #sinceNick Johnstone2017-02-263-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's common in test cases at my job to have code like this: let(:today) { customer_start_date + 2.weeks } let(:earlier_date) { today - 5.days } With this change, we can instead write let(:today) { 2.weeks.after(customer_start_date) } let(:earlier_date) { 5.days.before(today) } Closes #27721
* | | Merge pull request #28175 from sevenseacat/patch-1Kasper Timm Hansen2017-02-261-1/+1
|\ \ \ | | | | | | | | Fix typo 'affect' -> 'effect' [ci skip]
| * | | Fix typo 'affect' -> 'effect' [ci skip]Rebecca Skinner2017-02-261-1/+1
|/ / /
* | | Fix `change_column` to drop default with `null: false`Ryuta Kamizono2017-02-264-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `change_column` cannot drop default if `null: false` is specified at the same time. This change fixes the issue. ```ruby # cannot drop default change_column "tests", "contributor", :boolean, default: nil, null: false # we need the following workaround currently change_column "tests", "contributor", :boolean, null: false change_column "tests", "contributor", :boolean, default: nil ``` Closes #26582
* | | Merge pull request #28173 from vipulnsward/as-ch-passKasper Timm Hansen2017-02-261-3/+3
|\ \ \ | |/ / |/| | AS CHANGELOG Pass
| * | AS CHANGELOG Pass [ci skip]Vipul A M2017-02-261-3/+3
|/ /
* | Merge pull request #28167 from kirs/deprecate-verify-argsMatthew Draper2017-02-262-0/+15
|\ \ | | | | | | Deprecate AbstractAdapter#verify! with arguments
| * | Deprecate AbstractAdapter#verify! with argumentsKir Shatrov2017-02-252-0/+15
| | |
* | | Merge pull request #28169 from kirs/ensure-conn-verifyMatthew Draper2017-02-262-1/+2
|\ \ \ | | | | | | | | Use ensure block for things we cleanup in tests
| * | | Use ensure block for things we cleanup in testsKir Shatrov2017-02-252-1/+2
| |/ /
* | | Suppress `DISTINCT` clause outside aggregate functionRyuta Kamizono2017-02-252-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `DISTINCT` clause is applied inside aggregate function by `operation_over_aggregate_column` if needed. Unneeded outside aggregate function. ```ruby # Before author.unique_categorized_posts.count # => SELECT DISTINCT COUNT(DISTINCT "posts"."id") FROM "posts" INNER JOIN "categorizations" ON "posts"."id" = "categorizations"."post_id" WHERE "categorizations"."author_id" = ? [["author_id", 2]] # After author.unique_categorized_posts.count # => SELECT COUNT(DISTINCT "posts"."id") FROM "posts" INNER JOIN "categorizations" ON "posts"."id" = "categorizations"."post_id" WHERE "categorizations"."author_id" = ? [["author_id", 2]] ``` Closes #27615
* | | Commit flash changes when using a redirect route.Andrew White2017-02-253-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ca324a0 the flash middleware was effectively removed by its constructor returning the app it was passed and the `commit_flash` call was moved to the `ActionController::Metal#dispatch` method. This broke any redirect routes that modified the flash because the redirect happens before `dispatch` gets called. To fix it, this commit adds a `commit_flash` call in the `serve` method of `ActionDispatch::Routing::Redirect`. Fixes #27992.
* | | Merge pull request #28162 from dixpac/update-docs-Rails_AppGeneratorJon Moss2017-02-251-0/+8
|\ \ \ | | | | | | | | Improve docs for Rails::AppGenerator. [ci skip]
| * | | Imporove docs for Rails::AppGenerator [ci skip]dixpac2017-02-251-0/+8
| | | | | | | | | | | | | | | | | | | | Add example so its easier to understand how one can overide an app generator.
* | | | [ci ckip] Fix example of resolve in CHANGELOG.mdAndrew White2017-02-251-1/+1
|/ / /
* | | Fix typo `HashWithIndifferentAcces` to `HashWithIndifferentAccess` [ci skip]Ryuta Kamizono2017-02-251-1/+1
| | |
* | | Order array contents to match Relation#firstMatthew Draper2017-02-251-1/+1
| | |
* | | Merge pull request #28137 from schneems/schneems/fix-default-puma-portRichard Schneeman2017-02-242-11/+52
|\ \ \ | | | | | | | | [close #24435] Send user_supplied_options to server
| * | | [close #24435] Send user_supplied_options to serverschneems2017-02-242-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when Puma gets a `:Port` it doesn't know if it is Rails' default port or if it is one that is specified by a user. Because of this it assumes that the port passed in is always a user defined port and therefor 3000 always "wins" even if you specify `port` inside of the `config/puma.rb` file when booting your server with `rails s`. The fix is to record the options that are explicitly passed in from the user and pass those to the Puma server (or all servers really). Puma then has enough information to know when `:Port` is the default and when it is user defined. I went ahead and did this for all values rails server exposes as server side options for completeness. The hardest thing was converting the input say `-p` or `--port` into the appropriate "name", in this case `Port`. There may be a more straightforward way to do this with Thor, but I'm not an expert here. Move logic for parsing user options to method Better variable name for iteration Explicitly test `--port` user input ✂️ Update array if environment variables are used
* | | | Use shasum 256 on the releaseRafael Mendonça França2017-02-241-2/+2
| | | |
* | | | Merge branch 'jhawthorn-ruby_2_4_bigdecimal_casting'Rafael Mendonça França2017-02-244-1/+24
|\ \ \ \ | | | | | | | | | | | | | | | Closes #27429
| * | | | Match the behavior of bigdecimal after ↵Rafael Mendonça França2017-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | https://github.com/ruby/bigdecimal/pull/55
| * | | | Fix invalid string Decimal casting under ruby 2.4John Hawthorn2017-02-244-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4, BigDecimal(), as used by the Decimal cast, was changed so that it will raise ArgumentError when passed an invalid string, in order to be more consistent with Integer(), Float(), etc. The other numeric types use ex. to_i and to_f. Unfortunately, we can't simply change BigDecimal() to to_d. String#to_d raises errors like BigDecimal(), unlike all the other to_* methods (this should probably be filed as a ruby bug). Instead, this simulates the existing behaviour and the behaviour of the other to_* methods by finding a numeric string at the start of the passed in value, and parsing that using BigDecimal(). See also https://bugs.ruby-lang.org/issues/10286 https://github.com/ruby/bigdecimal/commit/3081a627cebdc1fc119425c7a9f009dbb6bec8e8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 21:25:37 +0000