aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #31642 from fatkodima/metal-action-duplicationRafael França2018-01-241-10/+8
|\ | | | | Remove code duplication for `ActionController::Metal.action`
| * Remove code duplication for `ActionController::Metal.action`fatkodima2018-01-221-10/+8
| |
* | Make discard safe when it follows a manual disconnectMatthew Draper2018-01-252-1/+41
| | | | | | | | | | | | It doesn't have to do anything, but it shouldn't fail. Fixes #31766.
* | Merge pull request #31773 from dinahshi/postgresql_bulk_patchMatthew Draper2018-01-242-3/+4
|\ \ | | | | | | Postgresql bulk_change_table should flatten procs array
| * | Use concat to join procs arrays in bulk_change_tableDinah Shi2018-01-232-3/+4
| | |
* | | Merge pull request #31422 from Edouard-chin/multistatement-fixturesMatthew Draper2018-01-246-56/+260
|\ \ \ | | | | | | | | Build a multi-statement query when inserting fixtures
| * | | Allow a 2 bytes margin:Edouard CHIN2018-01-232-4/+7
| | | | | | | | | | | | | | | | | | | | - mysql will add a 2 bytes margin to the statement, so given a `max_allowed_packet` set to 1024 bytes, a 1024 bytes fixtures will no be inserted (mysql will throw an error) - Preventing this by decreasing the max_allowed_packet by 2 bytes when doing the comparison with the actual statement size
| * | | Combine delete and insert statements in the same queryEdouard CHIN2018-01-222-13/+10
| | | |
| * | | Build a multi-statement query when inserting fixtures:Edouard CHIN2018-01-226-56/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The `insert_fixtures` method can be optimized by making a single multi statement query for all fixtures having the same connection instead of doing a single query per table - The previous code was bulk inserting fixtures for a single table, making X query for X fixture files - This patch builds a single **multi statement query** for every tables. Given a set of 3 fixtures (authors, dogs, computers): ```ruby # before %w(authors dogs computers).each do |table| sql = build_sql(table) connection.query(sql) end # after sql = build_sql(authors, dogs, computers) connection.query(sql) ``` - `insert_fixtures` is now deprecated, `insert_fixtures_set` is the new way to go with performance improvement - My tests were done with an app having more than 700 fixtures, the time it takes to insert all of them was around 15s. Using a single multi statement query, it took on average of 8 seconds - In order for a multi statement to be executed, mysql needs to be connected with the `MULTI_STATEMENTS` [flag](https://dev.mysql.com/doc/refman/5.7/en/c-api-multiple-queries.html), which is done before inserting the fixtures by reconnecting to da the database with the flag declared. Reconnecting to the database creates some caveats: 1. We loose all open transactions; Inside the original code, when inserting fixtures, a transaction is open. Multple delete statements are [executed](https://github.com/rails/rails/blob/a681eaf22955734c142609961a6d71746cfa0583/activerecord/lib/active_record/fixtures.rb#L566) and finally the fixtures are inserted. The problem with this patch is that we need to open the transaction only after we reconnect to the DB otherwise reconnecting drops the open transaction which doesn't commit all delete statements and inserting fixtures doesn't work since we duplicated them (Primary key duplicate exception)... - In order to fix this problem, the transaction is now open directly inside the `insert_fixtures` method, right after we reconnect to the db - As an effect, since the transaction is open inside the `insert_fixtures` method, the DELETE statements need to be executed here since the transaction is open later 2. The same problem happens for the `disable_referential_integrity` since we reconnect, the `FOREIGN_KEY_CHECKS` is reset to the original value - Same solution as 1. , the disable_referential_integrity can be called after we reconnect to the transaction 3. When the multi statement query is executed, no other queries can be performed until we paginate over the set of results, otherwise mysql throws a "Commands out of sync" [Ref](https://dev.mysql.com/doc/refman/5.7/en/commands-out-of-sync.html) - Iterating over the set of results until `mysql_client.next_result` is false. [Ref](https://github.com/brianmario/mysql2#multiple-result-sets) - Removed the `active_record.sql "Fixture delete"` notification, the delete statements are now inside the INSERT's one - On mysql the `max_allowed_packet` is looked up: 1. Before executing the multi-statements query, we check the packet length of each statements, if the packet is bigger than the max_allowed_packet config, an `ActiveRecordError` is raised 2. Otherwise we concatenate the current sql statement into the previous and so on until the packet is `< max_allowed_packet`
* | | | Fix CHANGELOG format [ci skip]Ryuta Kamizono2018-01-241-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | * Add backticks * Expand tabs * Fix indentation
* | | | tweaks for #31704 [ci skip]Ryuta Kamizono2018-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | * rDBMS -> RDBMS. There is only place using rDBMS. * a SQL -> an SQL
* | | | Clarification for noobs. (#31704)loothunter12018-01-232-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update active_record_basics.md I made a bit of clarification for people, who are not familiar with SQL (pretty much like me). However, I don't know what tutorial for MySQL is better, so I haven't inserted a link yet. * [ci skip] For those who new to GitHub Added more instructions for contributing guides. Without them, it was somewhat confusing for me to find what I should actually do. * Update active_record_basics.md Fixed grammar and text wrapping as requested. * Update contributing_to_ruby_on_rails.md Revised instructions. * Update contributing_to_ruby_on_rails.md Typos * Update active_record_basics.md * [ci skip] Update active_record_basics Added a few links to SQL tutorials found on the net. Also, changed MySQL to SQL (or one of its extensions) - I think that it's a good compromise. * [ci skip] I think now it's more clear what to do. * [ci skip] Fixed strings [Rafael Mendonça França + loothunter1]
* | | | Merge pull request #30622 from aidanharan/custom-discarded-job-handlingRafael França2018-01-234-1/+36
|\ \ \ \ | | | | | | | | | | Allow for custom handling of exceptions that are discarded
| * \ \ \ Merge branch 'master' into custom-discarded-job-handlingAidan Haran2017-12-091020-6684/+15161
| |\ \ \ \
| * | | | | Allow for custom handling of exceptions that are discardedAidan Haran2017-09-164-1/+36
| | | | | |
* | | | | | Allow attributes with a proc default to be marshalledSean Griffin2018-01-233-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't implement much custom marshalling logic for these objects, but the proc default case needs to be handled separately. Unfortunately there's no way to just say "do what you would have done but with this value for one ivar", so we have to manually implement `marshal_load` as well. The test case is a little bit funky, but I'd really like an equality test in there, and there's no easy way to add one now that this is out of AR (since the `attributes` method isn't here) Fixes #31216
* | | | | | Merge pull request #30391 from jbourassa/fix-actionmailer-lambda-defaultRyuta Kamizono2018-01-244-2/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix actionmailer lambda default
| * | | | | | Fix AM::Base.default proc arity breaking changeJimmy Bourassa2017-08-294-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #29270 changed the number of arguments that gets passed to Procs defined in ActionMail::Base.default. With this changeset, Procs can now have 1 or 0 arguments Also adds test coverage for AM::Base.default Proc arity.
* | | | | | | Merge pull request #31750 from morygonzalez/consider-locale_selector-missingYuji Yaginuma2018-01-231-5/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix locale_selector JS bug in ActionMailer Preview
| * | | | | | | Fix locale_selector JS bug in ActionMailer PreviewHitoshi Nakashima2018-01-231-5/+16
| | | | | | | |
* | | | | | | | Merge pull request #31487 from fatkodima/improve_cache_fault_toleranceRafael França2018-01-225-10/+137
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve fault tolerance for redis cache store
| * | | | | | | | Improve fault tolerance for redis cache storefatkodima2018-01-235-10/+137
|/ / / / / / / /
* | | | | | | | Add missing requireGeorge Claghorn2018-01-221-3/+5
| | | | | | | |
* | | | | | | | Merge pull request #31765 from utilum/langRafael França2018-01-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove text repetition
| * | | | | | | | remove text repetitionutilum2018-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #31447 from fatkodima/redis_cache-connection_poolRafael Mendonça França2018-01-229-74/+167
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | Add support for connection pooling on RedisCacheStore
| * | | | | | | | Add support for connection pooling on RedisCacheStorefatkodima2018-01-229-74/+167
| | | | | | | | |
* | | | | | | | | Merge pull request #31763 from utilum/image_not_truncatedRafael França2018-01-221-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update guide text not to contradict image
| * | | | | | | | | Update guide text not to contradict imageutilum2018-01-221-2/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bottom line in the image of `ActionController::UnknownFormat`is not truncated. Now the text does not say it is. [ci skip]
* | | | | | | | | Merge pull request #31549 from fatkodima/foreign_tablesRyuta Kamizono2018-01-234-1/+128
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Support for PostgreSQL foreign tables
| * | | | | | | | | Support for PostgreSQL foreign tablesfatkodima2018-01-224-1/+128
| |/ / / / / / / /
* / / / / / / / / Fix building has_one through recordRyuta Kamizono2018-01-234-14/+22
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #31762.
* | | | | | | | Merge pull request #30535 from leonelgalan/becomes_and_default_inheritanceRyuta Kamizono2018-01-232-1/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ignores a default subclass when `becomes(Parent)`
| * | | | | | | | Ignores a default subclass when `becomes(Parent)`Leonel Galan2018-01-222-1/+18
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue described in #30399: A default value on the inheritance column prevented `child.becomes(Parent)` to return an instance of `Parent` as expected, instead it returns an instance of the default subclass. The change was introduced by #17169 and it was meant to affect initialization, alone. Where `Parent.new` is expected to return an instance of the default subclass.
* | | | | | | | Merge pull request #24964 from vipulnsward/true-falseMatthew Draper2018-01-231-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Don't perform unnecessary check with false, just use true/false values
| * | | | | | | Dont perform unnecessary check with false, just use true/false values for ↵Vipul A M2016-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @active on SQLite adapter.
* | | | | | | | Merge pull request #31710 from eugeneius/indestructible_through_recordRyuta Kamizono2018-01-226-5/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't update counter cache when through record was not destroyed
| * | | | | | | | Don't update counter cache when through record was not destroyedEugene Kenny2018-01-146-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing a record from a has many through association, the counter cache was being updated even if the through record halted the callback chain and prevented itself from being destroyed.
* | | | | | | | | Pass desired driver to Redis client constructor rather than munging global ↵George Claghorn2018-01-211-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config
* | | | | | | | | Merge pull request #31753 from justjake/patch-1George Claghorn2018-01-211-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | bin/yarn: Pass through arguments with spaces
| * | | | | | | | | bin/yarn: Pass through arguments with spacesJake Teton-Landis2018-01-211-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the `bin/yarn` wrapper would "unquote" arguments to yarn like this: `yarn run add-copyright "(c) 2017, 2018 MyCompany"` That results in an ARGV of ['run', 'add-copyright', '(c) 2017, 2018 MyCompany'] in the yarn wrapper, but a ARGV in the yarn executable of ['run', 'add-copyright', '(c)', '2017,', '2018', MyCompany']
* | | | | | | | | Merge pull request #31757 from composerinteralia/define-attributeRyuta Kamizono2018-01-221-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use singular define_attribute_method
| * | | | | | | | | Use singular define_attribute_methodDaniel Colson2018-01-211-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `define_attribute_methods` splats the arguments, then calls out to `define_attribute_method` for each. When defining a singule attribute, using the singular version of the method saves us an array and an extra method call.
* / / / / / / / / PERF: Recover `changes_applied` performance (#31698)Ryuta Kamizono2018-01-224-75/+45
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #30985 caused `object.save` performance regression since calling `changes` in `changes_applied` is very slow. We don't need to call the expensive method in `changes_applied` as long as `@attributes` is tracked by mutation tracker. https://gist.github.com/kamipo/1a9f4f3891803b914fc72ede98268aa2 Before: ``` Warming up -------------------------------------- create_string_columns 73.000 i/100ms Calculating ------------------------------------- create_string_columns 722.256 (± 5.8%) i/s - 3.650k in 5.073031s ``` After: ``` Warming up -------------------------------------- create_string_columns 96.000 i/100ms Calculating ------------------------------------- create_string_columns 950.224 (± 7.7%) i/s - 4.800k in 5.084837s ```
* | | | | | | | Cope with videos with undefined display aspect ratiosGeorge Claghorn2018-01-203-2/+15
| | | | | | | |
* | | | | | | | Merge pull request #31641 from ckoenig/remove_frozen_string_literalYuji Yaginuma2018-01-201-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use dup'ed options hash
| * | | | | | | | Work on a dup'ed options hashChristof Koenig2018-01-091-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, at least using JRuby, the replacements in convert_database_option_for_jruby won't work. Thus a call to bundle exec rails app:update fails. Simply replacing those replace statements doesn't seem to work either, since the options hash seems to be frozen, too.
* | | | | | | | | More exercise `ActiveModel::Dirty` testsRyuta Kamizono2018-01-201-3/+24
| | | | | | | | |
* | | | | | | | | Merge pull request #31749 from jameslovejoy/fix-documentationRyuta Kamizono2018-01-202-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos and improve text_helper documentation regarding sanitization [ci skip]
| * | | | | | | | | Fix typos. Improve text_helper documentation.James Lovejoy2018-01-192-7/+7
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 22:33:06 +0000