aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Correctly handle unknown object in parallel testsyuuji.yaginuma2018-11-172-0/+16
| | | | | | | | | | | | | | | | | | | | | DRb wraps in `DRbUnknown` if the data contains a type that can not be resolved locally. This can happen if an error occurs in the test and the error class can not be resolved on the server side. When this happens, an instance of `DRbUnknown` is passed to the `result` of `Server#record`. This causes another error(undefined method assertions for #<DRb::DRbUnknown:> (NoMethodError)) in `reporter.record`. This can confirm by the following steps. ``` $ rails new app -B --dev; cd app $ rails g scaffold user name:string $ edit `config.action_controller.allow_forgery_protection = true` in environments/test.rb $ bin/rails t ``` In the case of `DRbUnknown` occurs, can't resolve error exception. So wrap exception with `DRbRemoteError` in the same way as an unmarshalled object.
* Merge pull request #34464 from gmcgibbon/re_add_changes_applied_docRafael França2018-11-161-1/+3
|\ | | | | Re-add changes_applied doc
| * Re-add changes_applied docGannon McGibbon2018-11-161-1/+3
| | | | | | | | [ci skip]
* | Merge pull request #34467 from JacobEvelyn/fix-my-typoRafael França2018-11-161-3/+4
|\ \ | | | | | | Fix typo and clarify documentation
| * | Fix typo and clarify documentationJacob Evelyn2018-11-161-3/+4
|/ / | | | | | | | | | | This commit fixes a small typo in documentation of the "UNLOGGED" table option for PostgreSQL databases, and clarifies the documentation slightly.
* / Fix cache_versioning default note (#34466)Gannon McGibbon2018-11-161-1/+1
|/ | | [ci skip]
* Merge pull request #34363 from tnantoka/docs-cache-key-note-5-2Gannon McGibbon2018-11-161-3/+3
|\ | | | | Replace `cache_key` with `cache_key_with_version` on caching_with_rails in Caching with Rails guide [ci skip]
| * Replace cache_key with cache_key_with_version on caching_with_rails guides ↵tnantoka2018-11-161-3/+3
|/ | | | [ci skip]
* Arel: Implemented DB-aware NULL-safe comparison (#34451)Dmytro Shteflyuk2018-11-1523-1/+492
| | | | | | | | | * Arel: Implemented DB-aware NULL-safe comparison * Fixed where clause inversion for NULL-safe comparison * Renaming "null_safe_eq" to "is_not_distinct_from", "null_safe_not_eq" to "is_distinct_from" [Dmytro Shteflyuk + Rafael Mendonça França]
* Merge pull request #34457 from NARKOZ/fix-method-callRyuta Kamizono2018-11-151-1/+1
|\ | | | | Fix a method call in bin/setup file
| * Fix a method call in bin/setup fileNihad Abbasov2018-11-151-1/+1
|/ | | | Follow up to a725539de677adbea0ced19d65647e975dbd3f84
* Merge pull request #34450 from mtsmfm/add-testRafael França2018-11-141-0/+10
|\ | | | | Add test for normalizing non-unicode string
| * Add test for normalizing non-unicode stringFumiaki MATSUSHIMA2018-11-151-0/+10
| | | | | | | | Closes #34062
* | Merge pull request #34446 from alphaappsinc/masterRafael França2018-11-141-3/+4
|\ \ | |/ |/| Allow patching polling interval logarithmic multiplier
| * Allow patching polling interval logarithmic multiplierHusam Bilal2018-11-141-3/+4
|/
* Merge pull request #34444 from esparta/fix_typo_association_basicsRyuta Kamizono2018-11-141-1/+1
|\ | | | | fix typo on association_basics.md [ci skip]
| * fix typo on association_basics.md [ci skip]Espartaco Palma2018-11-141-1/+1
|/
* Merge pull request #34341 from gmcgibbon/parse_error_rescue_2Rafael França2018-11-138-8/+95
|\ | | | | Allow rescue from parse errors
| * Allow rescue from parameter parse errorsGannon McGibbon2018-11-138-8/+95
| | | | | | | | [Gannon McGibbon + Josh Cheek]
* | Merge pull request #34441 from mcary/document-dependent-effectsRafael França2018-11-131-0/+2
|\ \ | |/ |/| Describe how has_many's :dependent option affects #delete
| * Describe how has_many's :dependent option affects #deleteMarcel M. Cary2018-11-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was puzzled about why `collection=` was destroying the removed records on an association with `dependent: :destroy`, even after consulting the documentation for that option. I had to dive into the Active Record source to understand what was going on: eventually `collection=` calls `collection.delete` on the ousted records, and it also uses the `:dependent` option to decide how to remove records. It would have helped me to have mention of this in the documentation for `:dependent`, not just under `collection.delete` (which I found much later). Briefly mention the broader impacts of `:dependent` in the Association Basics guide. [ci skip]
* | Merge pull request #34400 from gmcgibbon/rm_autoload_app_javascriptsRafael França2018-11-134-10/+34
|\ \ | |/ |/| Remove asset paths from autoload_paths
| * Remove asset paths from eager_load_paths and autoload_pathsGannon McGibbon2018-11-094-10/+34
| | | | | | | | | | Remove `app/assets` and `app/javascript` from `eager_load_paths` and `autoload_paths`.
* | Merge pull request #34437 from kbrock/union_all_parenRafael Mendonça França2018-11-134-42/+41
|\ \ | | | | | | | | | Fix: Arel now emits a single pair of parens for UNION and UNION ALL
| * | Emit single pair of parens for UNION and UNION ALLKeenan Brock2018-11-134-42/+41
| | | | | | | | | | | | | | | | | | | | | | | | mysql has a great implementation to suppress multiple parens for union sql statements. This moves that functionality to the generic implementation This also introduces that functionality for UNION ALL
* | | Merge pull request #34411 from N0xFF/masterRafael França2018-11-133-2/+37
|\ \ \ | | | | | | | | Reset Capybara sessions if failed system test screenshot raising an exception
| * | | Reset sessions on failed system test screenshotMaxim Perepelitsa2018-11-133-2/+37
| | | | | | | | | | | | | | | | | | | | Reset Capybara sessions if `take_failed_screenshot` raise exception in system test `after_teardown`.
* | | | Merge pull request #34436 from gmcgibbon/fix_default_max_bind_length_sqliteRafael França2018-11-132-0/+26
|\ \ \ \ | |_|/ / |/| | | Adjust bind length of SQLite to default (999)
| * | | Adjust bind length of SQLite to default (999)Gannon McGibbon2018-11-132-0/+26
| | | | | | | | | | | | | | | | | | | | Change `#bind_params_length` in SQLite adapter to return the default maximum amount (999). See https://www.sqlite.org/limits.html
* | | | Merge pull request #34429 from ↵Rafael França2018-11-131-3/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bogdanvlviv/ensure-that-connected_to-establish_connection Ensure that `ActiveRecord::Base#connected_to` with `:database` establishes connection
| * | | | Ensure that `ActiveRecord::Base#connected_to` with `:database` establishes ↵bogdanvlviv2018-11-121-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection Related to #34052
* | | | | Merge pull request #34221 from JacobEvelyn/allow-postgres-unlogged-test-tablesRafael França2018-11-136-1/+118
|\ \ \ \ \ | | | | | | | | | | | | Add support for UNLOGGED Postgresql tables
| * | | | | Add support for UNLOGGED Postgresql tablesJacob Evelyn2018-11-136-1/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for the `ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.create_unlogged_tables` setting, which turns `CREATE TABLE` SQL statements into `CREATE UNLOGGED TABLE` statements. This can improve PostgreSQL performance but at the cost of data durability, and thus it is highly recommended that you *DO NOT* enable this in a production environment.
* | | | | | Merge pull request #34417 from r3trofitted/fix/added_options_checkRafael França2018-11-132-3/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix ignored options in the `#added?` method
| * | | | | | Fix ignored options in the `#added?` methodRonan Limon Duparcmeur2018-11-132-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #34416
* | | | | | | Merge pull request #34435 from coorasse/masterRafael França2018-11-131-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add an alias for the --webpack option
| * | | | | | | add a nice alias for the --webpack optionAlessandro Rodi2018-11-131-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #34434 from yahonda/ignore_warningsRafael França2018-11-131-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Ignore warnings such as `Psych.safe_load is deprecated`
| * | | | | | Ignore warnings such as `Psych.safe_load is deprecated`Yasuo Honda2018-11-131-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addressing warnings are important but it should be out of this test scope. https://travis-ci.org/rails/rails/jobs/454145524#L4122-L4131 ``` .F Failure: ApplicationTests::BinSetupTest#test_bin_setup_output [test/application/bin_setup_test.rb:49]: --- expected +++ actual @@ -1,4 +1,5 @@ "== Installing dependencies == +warning: Passing permitted_classes with the 2nd argument of Psych.safe_load is deprecated. Use keyword argument like Psych.safe_load(yaml, permitted_classes: ...) instead. The Gemfile's dependencies are satisfied == Preparing database == rails test test/application/bin_setup_test.rb:38 ```
* | | | | | Merge pull request #34431 from albertoalmagro/make-permitted-types-privateRafael França2018-11-121-4/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Make `PERMITTED_TYPES` private
| * | | | | Make `PERMITTED_TYPES` privateAlberto Almagro2018-11-121-4/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constant `PERMITTED_TYPES` is only used by the private method `serialize_argument` and it already has the `# :nodoc:` annotation as the other constants in the class. Complements e899e22
* | | | | Merge pull request #34425 from ↵Ryuta Kamizono2018-11-121-4/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | eugeneius/rm_ensure_from_with_transaction_returning_status Remove ensure from with_transaction_returning_status
| * | | | Remove ensure from with_transaction_returning_statusEugene Kenny2018-11-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test added in 12b0b26df7560ab5199ba830586864085441508f passes even without this code since 9b8c7796a9c2048208aa843ad3dc477dffa8bdee, as the call to `id` in `remember_transaction_record_state` now triggers a `sync_with_transaction_state` which discards the leftover state from the previous transaction. This issue had already been fixed for `save!`, `destroy` and `touch` in caae79a385ce112245262a17414bcd96bea013c2, but continued to affect `save` because the call to `rollback_active_record_state!` in that method would increment the transaction level before `add_to_transaction` could clear it, preventing the fix from working correctly. As `rollback_active_record_state!` was removed entirely in 48007d5390db47fc1223f57c8e7ab3ebb7c3a3d7, this code is no longer needed.
* | | | | Merge pull request #34414 from ↵Ryuta Kamizono2018-11-122-7/+12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | albertoalmagro/include-big-decimal-as-supported-type Document missing supported types [ci skip]
| * | | | Document missing supported types [ci skip]Alberto Almagro2018-11-112-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | This commit adds missing types to the supported types list, which was extended in #30941
* | | | | Fix test case for money schema defaultRyuta Kamizono2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up a741208f80dd33420a56486bd9ed2b0b9862234a. Since a741208, `Decimal#serialize` which is superclass of `Money` type is no longer no-op, so it consistently serialize/deserialize a value as a decimal even if schema default.
* | | | | Ensure casting by decimal attribute when queryingRyuta Kamizono2018-11-122-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related 34cc301f03aea2e579d6687a9ea9782afc1089a0. `QueryAttribute#value_for_database` calls only `type.serialize`, and `Decimal#serialize` is a no-op unlike other attribute types. Whether or not `serialize` will invoke `cast` is undefined in our test cases, but it actually does not work properly unless it does so for now.
* | | | | Revert "Merge pull request #34421 from ↵Ryuta Kamizono2018-11-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | albertoalmagro/use-assert-not-instead-of-refute" This reverts commit ab5d5c95ec51c63d58d7e75694af748f165e2228, reversing changes made to ef4f5ef69b5a50c897bbb17f6b36b729dff12e6c.
* | | | | Merge pull request #34421 from albertoalmagro/use-assert-not-instead-of-refuteGuillermo Iguaran2018-11-102-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Prefer assert_not instead of refute [ci skip]
| * | | | Prefer assert_not instead of refute [ci skip]Alberto Almagro2018-11-102-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in the contributing to Ruby on Rails guides, we should prefer `assert_not` instead of `refute`. And the best place to start giving example are our bug report templates.. See: https://github.com/rails/rails/blame/master/guides/source/contributing_to_ruby_on_rails.md#L256