aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #35957 from itsWill/reset_post_attributes_stateGannon McGibbon2019-04-121-0/+16
|\ | | | | Fix test flakyness due to `test_truncate_tables`
| * Fix test flakyness due to `test_truncate_tables`Guilherme Mansur2019-04-121-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | `Truncate Tables posts` will also reset the `AUTOINCREMENT` this causes a situation where if a test suite that uses the `taggings` fixtures runs and subsequently the `test_truncate_tables` run, newly created posts would reference the `tagging` in the database. This commit resest the state of the posts table after the `connection.truncate` call in the `test_truncate_tables`, as well as all other tests that call `trucate` This ensures the associations and db state remain consistent after the tests. Fixes: https://github.com/rails/rails/issues/35941
* | Merge pull request #35955 from ↵Gannon McGibbon2019-04-122-3/+2
|\ \ | |/ |/| | | | | shioyama/remove_method_name_from_attribute_method_match Remove unused method_name from AttributeMethodMatch
| * Remove unused method_name from AttributeMethodMatchChris Salzberg2019-04-122-3/+2
|/
* Merge pull request #35952 from utilum/instance_varRafael França2019-04-121-1/+1
|\ | | | | Squash `warning: instance variable @filename not initialized`
| * Squash `warning: instance variable @filename not initialized`utilum2019-04-121-1/+1
| |
* | Merge pull request #35918 from ↵Ryuta Kamizono2019-04-123-8/+10
|\ \ | | | | | | | | | | | | kamipo/lazy_sync_with_transaction_state_on_destroy Lazy sync with transaction state on destroy
| * | Lazy sync with transaction state on destroyRyuta Kamizono2019-04-103-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 58410b3d566e6b93c7b71c0eec0fc11ec906b68e. If we have any implicit commit/rollback callbacks, it is necessary to add record to transaction explicitly like `:touch_deferred_attributes`. https://github.com/rails/rails/blob/5f261d04d6f857d49c75124df809adfbd6cd5b5e/activerecord/lib/active_record/touch_later.rb#L9 https://github.com/rails/rails/blob/5f261d04d6f857d49c75124df809adfbd6cd5b5e/activerecord/lib/active_record/touch_later.rb#L25 But I can't find any other implicit commit/rollback callbacks in our code base at least now. I think the `self.class.connection.add_transaction_record(self)` line doesn't cover any behavior.
* | | Merge pull request #35920 from ↵Ryuta Kamizono2019-04-124-5/+43
|\ \ \ | | | | | | | | | | | | | | | | kamipo/dont_call_commit_callbacks_for_invalid_record Don't call after_commit callbacks despite a record isn't saved
| * | | Don't call after_commit callbacks despite a record isn't savedRyuta Kamizono2019-04-124-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regardless of a record isn't saved (e.g. validation is failed), `after_commit` / `after_rollback` callbacks are invoked for now. To fix the issue, this adds a record to the current transaction only when a record is actually saved. Fixes #29747. Closes #29833.
* | | | Merge pull request #28830 from kamipo/dont_regard_extension_block_as_scopeRyuta Kamizono2019-04-126-40/+33
|\ \ \ \ | | | | | | | | | | Fix `automatic_inverse_of` not to be disabled if extension block is given
| * | | | Fix `automatic_inverse_of` not to be disabled if extension block is givenRyuta Kamizono2019-04-126-40/+33
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | If an association has a scope, `automatic_inverse_of` is to be disabled. But extension block is obviously not a scope. It should not be regarded as a scope. Fixes #28806.
* / | | Refactor around sql_type metadata and columnRyuta Kamizono2019-04-124-33/+35
|/ / / | | | | | | | | | | | | | | | * remove useless `@type_metadata` and `@array` * move the compatibility code (for array) into column * etc.
* | | Merge pull request #32541 from sergiogomez/remove-lock-from-params-wrapperMatthew Draper2019-04-121-1/+1
|\ \ \ | | | | | | | | Remove lock from method model
| * | | Remove lock from method modelSergio Gómez2018-04-121-1/+1
| | | |
* | | | Merge pull request #35949 from shioyama/rename_matchers_iterator_nameRyuta Kamizono2019-04-121-1/+1
|\ \ \ \ | | | | | | | | | | Rename "method" to "matcher" in map block
| * | | | Rename "method" to "matcher" in map blockChris Salzberg2019-04-121-1/+1
|/ / / /
* | | | Merge pull request #35865 from jhawthorn/template_file_sourceRafael França2019-04-117-83/+46
|\ \ \ \ | | | | | | | | | | Introduce Template::Source::File, replacing FileTemplate and Template#refresh
| * | | | Remove FileTemplateJohn Hawthorn2019-04-043-14/+3
| | | | | | | | | | | | | | | | | | | | This is unnecessary now that we can just provide a file source
| * | | | Deprecate Template#refreshJohn Hawthorn2019-04-042-36/+4
| | | | |
| * | | | Add ActionView::Template::Sources::FileJohn Hawthorn2019-04-044-24/+38
| | | | |
| * | | | Don't call Template#refreshJohn Hawthorn2019-04-041-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Now that Template#source will always return a source, this is unnecessary.
| * | | | Don't discard source after renderingJohn Hawthorn2019-04-042-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we would discard the template source after rendering, if we had a virtual path, in hopes that the virtual path would let us find our same template again going through the Resolver. Previously we discarded the source as an optimization, to avoid keeping it around in memory. By instead just reading the file every time source is called, as FileTemplate does, this is unnecessary.
* | | | | Auto-correct `Style/RedundantBegin` cop offencesRyuta Kamizono2019-04-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is newly added at 7b6b10542d5dac2b50f2578143dc5d70120d1146. ``` % be rubocop -a Inspecting 2781 files ...............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................. Offenses: activesupport/lib/active_support/dependencies/zeitwerk_integration.rb:12:1: C: [Corrected] Layout/EmptyLinesAroundBlockBody: Extra empty line detected at block body beginning. activesupport/lib/active_support/dependencies/zeitwerk_integration.rb:12:1: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected. activesupport/lib/active_support/dependencies/zeitwerk_integration.rb:12:13: C: [Corrected] Style/RedundantBegin: Redundant begin block detected. begin ^^^^^ activesupport/lib/active_support/dependencies/zeitwerk_integration.rb:13:11: C: [Corrected] Layout/IndentationWidth: Use 2 (not 4) spaces for indentation. Rails.autoloaders.main.reload ^^^^ activesupport/lib/active_support/dependencies/zeitwerk_integration.rb:16:1: C: [Corrected] Layout/EmptyLinesAroundBlockBody: Extra empty line detected at block body end. activesupport/lib/active_support/dependencies/zeitwerk_integration.rb:16:1: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected. 2781 files inspected, 6 offenses detected, 6 offenses corrected ```
* | | | | Merge pull request #35908 from soartec-lab/update_guide_engine_app_dirRafael França2019-04-111-3/+25
|\ \ \ \ \ | | | | | | | | | | | | Add all descriptions in app directory [skip ci]
| * | | | | Add all descriptions in app directory [skip ci]soartec-lab2019-04-091-3/+25
| | | | | |
* | | | | | Merge pull request #35919 from Shopify/simplify-define_url_helperRafael França2019-04-111-12/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Simplify and fasten NamedRouteCollection#define_url_helper
| * | | | | | Simplify and fasten NamedRouteCollection#define_url_helperJean Boussier2019-04-101-12/+10
| | | | | | |
* | | | | | | Merge pull request #35838 from yahonda/more_than_1000_inlistRafael França2019-04-114-0/+138
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Address `ORA-01795: maximum number of expressions in a list is 1000`
| * | | | | | | Address `ORA-01795: maximum number of expressions in a list is 1000`Yasuo Honda2019-04-114-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * To address this error, this commit splits expressions by slices of 1000 elements. * "Oracle Database Error Messages 18c" https://docs.oracle.com/en/database/oracle/oracle-database/18/errmg/ ``` ORA-01795: maximum number of expressions in a list is 1000 Cause: Number of expressions in the query exceeded than 1000. Note that unused column/expressions are also counted Maximum number of expressions that are allowed are 1000. ``` * This commit addresses this ORA-01795 error Note: Actually addressing this error raises another "ORA-00913: too many values" Number of values Oracle database allows is 65535 regardless bind values or literal values. ```ruby $ ARCONN=oracle bin/test test/cases/bind_parameter_test.rb -n test_too_many_binds ... snip ... Error: ActiveRecord::BindParameterTest#test_too_many_binds: ActiveRecord::StatementInvalid: OCIError: ORA-01795: maximum number of expressions in a list is 1000 stmt.c:267:in oci8lib_260.so /home/yahonda/.rbenv/versions/2.6.2/lib/ruby/gems/2.6.0/gems/ruby-oci8-2.2.7/lib/oci8/cursor.rb:131:in `exec' /home/yahonda/git/oracle-enhanced/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb:142:in `exec' /home/yahonda/git/oracle-enhanced/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb:41:in `block in exec_query' /home/yahonda/git/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb:676:in `block (2 levels) in log' /home/yahonda/.rbenv/versions/2.6.2/lib/ruby/2.6.0/monitor.rb:230:in `mon_synchronize' /home/yahonda/git/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb:675:in `block in log' /home/yahonda/git/rails/activesupport/lib/active_support/notifications/instrumenter.rb:24:in `instrument' /home/yahonda/git/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb:666:in `log' /home/yahonda/git/oracle-enhanced/lib/active_record/connection_adapters/oracle_enhanced/dbms_output.rb:36:in `log' /home/yahonda/git/oracle-enhanced/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb:24:in `exec_query' /home/yahonda/git/rails/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb:484:in `select' /home/yahonda/git/rails/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb:70:in `select_all' /home/yahonda/git/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:106:in `select_all' /home/yahonda/git/rails/activerecord/lib/active_record/relation/calculations.rb:299:in `block in execute_simple_calculation' /home/yahonda/git/rails/activerecord/lib/active_record/relation.rb:755:in `skip_query_cache_if_necessary' /home/yahonda/git/rails/activerecord/lib/active_record/relation/calculations.rb:299:in `execute_simple_calculation' /home/yahonda/git/rails/activerecord/lib/active_record/relation/calculations.rb:251:in `perform_calculation' /home/yahonda/git/rails/activerecord/lib/active_record/relation/calculations.rb:141:in `calculate' /home/yahonda/git/rails/activerecord/lib/active_record/relation/calculations.rb:49:in `count' /home/yahonda/git/rails/activerecord/test/cases/bind_parameter_test.rb:113:in `test_too_many_binds' bin/test test/cases/bind_parameter_test.rb:109 .............................F ```
* | | | | | | | Merge pull request #35921 from Shopify/deduplicate-activerecord-stringsRafael França2019-04-111-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Deduplicate Active Record reflection names
| * | | | | | | | Deduplicate Active Record reflection namesJean Boussier2019-04-101-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #35922 from ↵Rafael França2019-04-112-80/+80
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | michaelglass/move-sqlite-3-database-statements-into-database-statements make SQLite3 `last_inserted_id` private and organize DatabaseStatement methods
| * | | | | | | | moves sqlite3 methods that mirror Abstract::DatabaseStatements into ↵Michael Glass2019-04-102-80/+80
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Sqlite3::DatabaseStatements and make those that are private in Abstract::DatabaseStatements private for sqlite3
* | | | | | | | Merge pull request #35938 from soartec-lab/update_guide_engine_sample_codeRafael França2019-04-111-14/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use modele to generate generated defaults [skip ci]
| * | | | | | | | Use modele to generate generated defaults [skip ci]soartec-lab2019-04-111-14/+17
| | | | | | | | |
* | | | | | | | | improves the reloading disabled error messageXavier Noria2019-04-114-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original message from Zeitwerk is "can't reload, please call loader.enable_reloading before setup (Zeitwerk::Error)", which is not very informative for Rails programmers. Rails should err with a message worded in terms of its interface.
* | | | | | | | | Address new cop offence in railtiesRyuta Kamizono2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is necessary to run `rubocop` manually when new cop is added since codeclimate checks any offences only in files touched in PRs.
* | | | | | | | | Merge pull request #35933 from kamipo/refactor_dirty_trackingRyuta Kamizono2019-04-123-128/+122
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | PERF: 2x ~ 30x faster dirty tracking
| * | | | | | | | | PERF: 2x ~ 30x faster dirty trackingRyuta Kamizono2019-04-113-128/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, although using both dirty tracking (ivar backed and attributes backed) on one model is not supported (doesn't fully work at least), both dirty tracking are being performed, that is very slow. As long as attributes backed dirty tracking is used, ivar backed dirty tracking should not need to be performed. I've refactored to extract new `ForcedMutationTracker` which only tracks `force_change` to be performed for ivar backed dirty tracking, that makes dirty tracking on Active Record 2x ~ 30x faster. https://gist.github.com/kamipo/971dfe0891f0fe1ec7db8ab31f016435 Before: ``` Warming up -------------------------------------- changed? 4.467k i/100ms changed 5.134k i/100ms changes 3.023k i/100ms changed_attributes 4.358k i/100ms title_change 3.185k i/100ms title_was 3.381k i/100ms Calculating ------------------------------------- changed? 42.197k (±28.5%) i/s - 187.614k in 5.050446s changed 50.481k (±16.0%) i/s - 246.432k in 5.045759s changes 30.799k (± 7.2%) i/s - 154.173k in 5.030765s changed_attributes 51.530k (±14.2%) i/s - 252.764k in 5.041106s title_change 44.667k (± 9.0%) i/s - 222.950k in 5.040646s title_was 44.635k (±16.6%) i/s - 216.384k in 5.051098s ``` After: ``` Warming up -------------------------------------- changed? 24.130k i/100ms changed 13.503k i/100ms changes 6.511k i/100ms changed_attributes 9.226k i/100ms title_change 48.221k i/100ms title_was 96.060k i/100ms Calculating ------------------------------------- changed? 245.478k (±16.1%) i/s - 1.182M in 5.015837s changed 157.641k (± 4.9%) i/s - 796.677k in 5.066734s changes 70.633k (± 5.7%) i/s - 358.105k in 5.086553s changed_attributes 95.155k (±13.6%) i/s - 470.526k in 5.082841s title_change 566.481k (± 3.5%) i/s - 2.845M in 5.028852s title_was 1.487M (± 3.9%) i/s - 7.493M in 5.046774s ```
* | | | | | | | | | Merge pull request #35932 from takakuda/feature/adjust_nodoc_styleRafael França2019-04-112-17/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | adjust #:nodoc: style
| * | | | | | | | | | Layout/SpaceBeforeComment Enabled: truekei2019-04-121-0/+3
| | | | | | | | | | |
| * | | | | | | | | | adjust styletakakuda2019-04-111-17/+17
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #35945 from soartec-lab/update_guide_engine_sample_code_blockRafael França2019-04-111-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Code is enclosed by code block [skip ci]
| * | | | | | | | | | Code is enclosed by code block [skip ci]soartec-lab2019-04-121-1/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #35944 from ↵Rafael França2019-04-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | soartec-lab/update_guide_engine_gem_development_dependency Updated the description of `add_development_dependency` [skip ci]
| * | | | | | | | | Updated the description of `add_development_dependency` [skip ci]soartec-lab2019-04-121-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #35935 from y-yagi/fixes_34837George Claghorn2019-04-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix loading `ActionMailbox::BaseController` when CSRF protection is disabled
| * | | | | | | | | Fix loading `ActionMailbox::BaseController` when CSRF protection is disabledyuuji.yaginuma2019-04-111-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `default_protect_from_forgery` is false, `verify_authenticity_token` callback does not define and `skip_forgery_protection` raise exception. Fixes #34837.
* | | | | | | | | Merge pull request #35934 from YuezhiLi/patch-1Ryuta Kamizono2019-04-111-7/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated debugging plugins [ci skip]