aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Address incorrect number of queries executed at Oracle enhanced adapterYasuo Honda2017-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pull request addresses these 17 failures when tested with Oracle enhanced adapter. All of these failures are due to the incorrect number of queries. Here is the first one. ```ruby $ ARCONN=oracle bin/test test/cases/nested_attributes_test.rb:1086 Using oracle Run options: --seed 27985 F Finished in 0.874514s, 1.1435 runs/s, 1.1435 assertions/s. 1) Failure: TestHasManyAutosaveAssociationWhichItselfHasAutosaveAssociations#test_circular_references_do_not_perform_unnecessary_queries [/home/yahonda/git/rails/activerecord/test/cases/nested_attributes_test.rb:1086]: 6 instead of 3 queries were executed. Queries: select us.sequence_name from all_sequences us where us.sequence_owner = :owner and us.sequence_name = :sequence_name INSERT INTO "SHIPS" ("NAME", "ID") VALUES (:a1, :a2) select us.sequence_name from all_sequences us where us.sequence_owner = :owner and us.sequence_name = :sequence_name INSERT INTO "SHIP_PARTS" ("NAME", "SHIP_ID", "UPDATED_AT", "ID") VALUES (:a1, :a2, :a3, :a4) select us.sequence_name from all_sequences us where us.sequence_owner = :owner and us.sequence_name = :sequence_name INSERT INTO "TREASURES" ("LOOTER_ID", "LOOTER_TYPE", "SHIP_ID", "ID") VALUES (:a1, :a2, :a3, :a4). Expected: 3 Actual: 6 1 runs, 1 assertions, 1 failures, 0 errors, 0 skips $ ``` Since https://github.com/rsim/oracle-enhanced/pull/1490 Oracle enhanced adapter drops its own schema caching called OracleEnhancedAdapter.cache_columns` to use Rails scehema cache generated by `db:schema:cache:dump`. By this change some extra sql statements executed at ActiveRecord unit test, which can be fixed by adding the sql statement to `oracle_ignored`. * All 17 failures fixed by this pull request: ```ruby ARCONN=oracle bin/test test/cases/nested_attributes_test.rb:1086 ARCONN=oracle bin/test test/cases/locking_test.rb:308 ARCONN=oracle bin/test test/cases/locking_test.rb:365 ARCONN=oracle bin/test test/cases/dirty_test.rb:351 ARCONN=oracle bin/test test/cases/dirty_test.rb:334 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:192 ARCONN=oracle bin/test test/cases/associations/has_many_associations_test.rb:950 ARCONN=oracle bin/test test/cases/associations/has_many_associations_test.rb:1059 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:627 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:607 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:617 ARCONN=oracle bin/test test/cases/autosave_association_test.rb:641 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:546 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:297 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:586 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:172 ARCONN=oracle bin/test test/cases/associations/has_many_through_associations_test.rb:269 ```
* Merge pull request #31013 from dgynn/rescue-layout-white-space-wrappingRafael França2017-10-311-0/+1
|\ | | | | Prevent source line wrapping in rescue layout
| * Prevent source line wrapping in rescue layoutDave Gynn2017-10-311-0/+1
|/ | | | | | Long source lines cause line wrapping in the extracted source section of the rescue handler page which can make the line numbers not match up with the source lines.
* Merge pull request #31004 from shuheiktgw/remove_unnecessary_returnsRafael França2017-10-3112-16/+16
|\ | | | | Remove redundant return statements
| * removed unnecessary returnsShuhei Kitagawa2017-10-2812-16/+16
| |
* | Merge pull request #31012 from y-yagi/remove_unused_missing_requests_errorRafael França2017-10-302-4/+0
|\ \ | | | | | | Remove unused `MissingRequestError`
| * | Remove unused `MissingRequestError`yuuji.yaginuma2017-10-312-4/+0
| | | | | | | | | | | | `MissingRequestError` is no longer used since 1e2b0ce.
* | | `source_type_scope` should respect correct table aliasRyuta Kamizono2017-10-302-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | `join_scopes` in `PolymorphicReflection` is passed aliased `table`, so it should be respected for `source_type_scope`. Closes #13969. Fixes #13920. Fixes #15190.
* | | `PolymorphicReflection#scopes` is no longer used since a5651eb5Ryuta Kamizono2017-10-301-5/+0
| | |
* | | Merge pull request #31002 from ta1kt0me/call_ajax_without_beforeSendGuillermo Iguaran2017-10-293-2/+29
|\ \ \ | | | | | | | | Call Rails.ajax without beforeSend
| * | | Enable to call Rails.ajax without beforeSendta1kt0me2017-10-283-2/+29
| | | |
* | | | Merge pull request #31007 from suginoy/doc_integer_bigintRyuta Kamizono2017-10-294-20/+20
|\ \ \ \ | | | | | | | | | | [ci skip]Update the documentation about the primary key type
| * | | | [ci skip]Update the documentation about the primary key typesuginoy2017-10-294-20/+20
|/ / / / | | | | | | | | | | | | | | | | | | | | Replace the primary key type `integer` in docs with `bigint`. ref #26266
* | | | Merge pull request #30996 from tscoville2012/tscoville2012-patch-1Eileen M. Uchitelle2017-10-281-0/+4
|\ \ \ \ | | | | | | | | | | 5_1_release_notes include more removals [ci skip]
| * | | | [ci skip] Updated 5_1_release_notes.md to include support to :text and ↵Tyler Scoville2017-10-271-0/+4
| | |/ / | |/| | | | | | | | | | :nothing in render
* | | | Merge pull request #31005 from shuheiktgw/remove_unnecessary_semicolonsMatthew Draper2017-10-2811-20/+24
|\ \ \ \ | | | | | | | | | | | | | | | Removed unnecessary semicolons
| * | | | removed unnecessary semicolonsShuhei Kitagawa2017-10-287-17/+17
| | |_|/ | |/| |
* / | | Keep rubocop happy with the new Selenium runnerMatthew Draper2017-10-281-4/+6
|/ / /
* | | Merge pull request #31003 from y-yagi/add_load_hook_for_system_test_caseRyuta Kamizono2017-10-282-0/+3
|\ \ \ | | | | | | | | Add load hook for `ActionDispatch::SystemTestCase`
| * | | Add load hook for `ActionDispatch::SystemTestCase`yuuji.yaginuma2017-10-282-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | This is useful to extend `SystemTestCase`. Also, since other test classes already have load hooks, should also be in `SystemTestCase`. Ref: 0510208dd1ff23baa619884c0abcae4d141fae53
* | | Merge pull request #31001 from eugeneius/rm_x_post_data_format_docRyuta Kamizono2017-10-281-3/+0
|\ \ \ | | | | | | | | Remove mention of X-Post-Data-Format header [ci skip]
| * | | Remove mention of X-Post-Data-Format header [ci skip]Eugene Kenny2017-10-281-3/+0
| | |/ | |/| | | | | | | | | | Support for this header was removed when `actionpack-xml_parser` was extracted, and has since been dropped from the gem.
* / | Puma Rack handler is required by CapybaraGuillermo Iguaran2017-10-281-2/+0
|/ / | | | | See: https://github.com/teamcapybara/capybara/blob/7d693f068c44f6a460336da70fb6e9e5f94f3db9/lib/capybara.rb#L450
* | Remove CHANGELOG entry for PR #28681 [ci skip]Prathamesh Sonpatki2017-10-271-4/+0
| | | | | | | | | | - It is present in Rails 5.1.3 already. - Backport commit https://github.com/rails/rails/commit/9efa0b70a638dcfdc05b30ab530f89f2847bb9c2
* | Fix all `s/trough/through/`Ryuta Kamizono2017-10-271-1/+1
| | | | | | | | | | | | | | ``` % git grep -n trough activerecord/test/cases/associations/has_many_through_associations_test.rb:1253: def test_has_many_trough_with_scope_that_has_joined_same_table_with_parent_relation ```
* | Fix typo `s/trough/through/`Ryuta Kamizono2017-10-271-1/+1
| |
* | Merge pull request #30682 from ahorek/fix_scope_forRyuta Kamizono2017-10-276-1/+11
|\ \ | | | | | | delegate scope_for on PolymorphicReflection
| * | delegate scope forpavel2017-10-276-1/+11
| |/
* | Merge pull request #30995 from ahorek/fix_initial_countRyuta Kamizono2017-10-272-1/+5
|\ \ | |/ |/| fix initial count
| * fix initial countpavel2017-10-272-1/+5
|/
* Merge pull request #30674 from prognostikos/allow_procs_for_length_validatorRafael França2017-10-263-2/+43
|\ | | | | Allow passing a Proc or Symbol as an argument to length validator values
| * Allow passing a Proc or Symbol as an argument to length validator valuesMatt Rohrer2017-10-263-2/+43
|/ | | | | This brings the Length validator in line with the Numericality validator, which currently supports Proc & Symbol arguments
* Merge pull request #30991 from y-yagi/remove_mention_about_evented_redisRyuta Kamizono2017-10-261-2/+2
|\ | | | | Remove mention about Evented Redis [ci skip]
| * Remove mention about Evented Redis [ci skip]yuuji.yaginuma2017-10-261-2/+2
| | | | | | | | Evented Redis adapter was removed in 48766e32d31651606b9f68a16015ad05c3b0de2c.
* | Merge pull request #30989 from joevandyk/patch-3Ryuta Kamizono2017-10-261-3/+1
|\ \ | |/ |/| remove incorrect comment about serializable transactions [ci skip]
| * remove incorrect statement about serializable transactionsJoe Van Dyk2017-10-251-3/+1
|/ | | using serializable isolation would prevent the duplicate insert as done in the example from happening
* Merge pull request #30813 from y-yagi/remove_unused_secrets_ymlRyuta Kamizono2017-10-262-36/+0
|\ | | | | Remove unused `secrets.yml` template
| * Remove unused `secrets.yml` templateyuuji.yaginuma2017-10-062-36/+0
| | | | | | | | | | `secrets.yml` no longer used since #30067. Together, removed `app_secret` method that only used in `secrets.yml`
* | Third party adapters doesn't support index orders yetRyuta Kamizono2017-10-261-2/+2
| |
* | Merge pull request #30984 from yahonda/schema_dumper_pgRyuta Kamizono2017-10-262-9/+13
|\ \ | | | | | | Move `extensions` to `PostgreSQL::SchemaDumper`
| * | Implement `PostgreSQL::SchemaDumper#extensions`Yasuo Honda2017-10-252-9/+13
| | | | | | | | | | | | | | | | | | | | | and abstract `SchemaDumper#extensions` is now an empty method. Since #30337, every database adapter has its own `SchemaDumper`. `extensions` are only supported by PostgreSQL database and postgresql database adapter.
* | | Remove CHANGELOG entry that was backported to Rails 5.1.3. [ci skip] (#30986)प्रथमेश Sonpatki2017-10-251-7/+0
| | | | | | | | | - Backport commit: https://github.com/rails/rails/commit/7122a2cdc3634e170129f8b6cabd1e8fbed13c3d
* | | Merge pull request #30965 from kmanzana/masterRafael Mendonça França2017-10-252-0/+22
|\ \ \ | | | | | | | | | | | | Wrap accepted nested attributes params
| * | | checking for nested attributes when attribute names specified to wrap them ↵Kelton Manzanares2017-10-252-6/+21
| | | | | | | | | | | | | | | | as well
| * | | Fixed functionality to include method in params_wrapper.rbRyan Perez2017-10-251-0/+7
|/ / / | | | | | | | | | to properly wrap all attributes, including those which are nested.
* | | Merge pull request #30970 from rohitpaulk/fix-sqlite-3-index-order-dumpRafael França2017-10-253-2/+19
|\ \ \ | | | | | | | | Save index order :desc to schema.rb (sqlite). Fixes #30902
| * | | Avoid using index_xinfo, only available in sqlite >= 3.8.9Paul Kuruvilla2017-10-251-9/+12
| | | |
| * | | Save index order :desc to schema.rb (sqlite). Fixes #30902Paul Kuruvilla2017-10-243-3/+17
| | | | | | | | | | | | | | | | | | | | Although the sqlite adapter supports index sort orders, they weren't being written to db/schema.rb.
* | | | Merge pull request #30982 from willnet/add-space-before-curly-braceRafael França2017-10-251-2/+2
|\ \ \ \ | | | | | | | | | | [ci skip]Add space before closing curly brace
| * | | | [ci skip]Add space before closing curly bracewillnet2017-10-251-2/+2
| | | | |