aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove out-of-date references to jQueryDaniel Colson2018-01-281-11/+6
| | | | Fixes #31703
* Merge pull request #31803 from rmosolgo/rm-dependenciesRafael França2018-01-262-0/+56
|\ | | | | Fix infinite loop when unloading autoloaded modules
| * Remove duplicates after autoloading modulesRobert Mosolgo2018-01-261-0/+1
| |
| * Add failing test for infinite loop when unloading autoloaded modules when an ↵Robert Mosolgo2018-01-261-0/+55
| | | | | | | | error occured during the load.
* | Merge pull request #31800 from rlue/doc/association-basics-guideRafael França2018-01-261-17/+9
|\ \ | | | | | | Fix example migrations in Associations guide
| * | Fix example migrations in Associations guideRyan Lue2018-01-261-17/+9
| | |
* | | Merge pull request #31786 from composerinteralia/respond-to-testsRafael França2018-01-26240-2237/+2237
|\ \ \ | |/ / |/| | Use respond_to test helpers
| * | Remove extra whitespaceDaniel Colson2018-01-2515-95/+95
| | |
| * | Use assert_empty and assert_not_emptyDaniel Colson2018-01-2551-194/+194
| | |
| * | Use assert_predicate and assert_not_predicateDaniel Colson2018-01-25209-1988/+1988
| | |
| * | Change refute to assert_notDaniel Colson2018-01-2519-51/+51
| | |
| * | Use respond_to test helpersDaniel Colson2018-01-2543-158/+158
|/ /
* | Bring back ability to insert zero value on primary key for fixtures (#31795)Ryuta Kamizono2018-01-265-42/+22
| | | | | | | | | | | | Since #29504, mysql2 adapter lost ability to insert zero value on primary key due to enforce `NO_AUTO_VALUE_ON_ZERO` disabled. That is for using `DEFAULT` on auto increment column, but we can use `NULL` instead in that case.
* | Merge pull request #31799 from yahonda/use_minitest_5_11_1Ryuta Kamizono2018-01-262-0/+2
|\ \ | | | | | | Lock Minitest 5.11.1
| * | Lock Minitest 5.11.1Yasuo Honda2018-01-262-0/+2
|/ / | | | | | | | | To workaround `undefined method `error?' for` reported at https://travis-ci.org/rails/rails/jobs/333456146
* | Merge pull request #31797 from eugeneius/mysql_index_orderRyuta Kamizono2018-01-261-1/+1
|\ \ | | | | | | Update note on MySQL index order support [ci skip]
| * | Update note on MySQL index order support [ci skip]Eugene Kenny2018-01-261-1/+1
|/ / | | | | | | | | MySQL supports descending indexes from 8.0.1 onwards: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html
* | Merge pull request #31755 from timdiggins/adjust-autoloading-in-guidesRafael França2018-01-252-12/+31
|\ \ | | | | | | Clarify autoload_paths and eager_load in guides per current usage.
| * | Clarify autoload_paths and eager_load in guides per current usage. [CI SKIP]Tim Diggins2018-01-212-12/+31
| | |
* | | Add test case for deprecated `insert_fixtures`Ryuta Kamizono2018-01-262-5/+21
| | | | | | | | | | | | Since #31422, `insert_fixtures` is deprecated.
* | | Remove unused `test/fixtures/teapots.yml`Ryuta Kamizono2018-01-251-3/+0
| | | | | | | | | | | | It was unused since 9e4c41c903e8e58721f2c41776a8c60ddba7a0a9.
* | | Merge pull request #31787 from kami-zh/fix-documentKasper Timm Hansen2018-01-251-4/+3
|\ \ \ | | | | | | | | Fix typo in API document FormHelper#fields
| * | | Fix typo in API document FormHelper#fieldskami-zh2018-01-251-4/+3
|/ / / | | | | | | | | | | | | - Fix typo - Adjust output example to other example's format
* | | Remove internal `typecasted_attribute_value` methodRyuta Kamizono2018-01-251-5/+1
| | | | | | | | | | | | It is useless since 90c8be76a7d00475be5ff4db2eeedde5cc936c2d.
* | | Fix `count(:all)` with eager loading and having an order other than the ↵Ryuta Kamizono2018-01-254-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | driving table This is a regression caused by 6beb4de. In PostgreSQL, ORDER BY expressions must appear in SELECT list when using DISTINCT. When using `count(:all)` with eager loading, Active Record enforces DISTINCT to count the driving table records only. 6beb4de was caused the regression because `count(:all)` with DISTINCT path no longer removes ORDER BY. We need to ignore ORDER BY when DISTINCT is enforced, otherwise not always generated valid SQL for PostgreSQL. Fixes #31783.
* | | Expand AR to Active Record [ci skip]Ryuta Kamizono2018-01-251-2/+2
| | |
* | | Merge pull request #31751 from ↵Ryuta Kamizono2018-01-253-2/+26
|\ \ \ | | | | | | | | | | | | | | | | yoreek/clear_transaction_state_when_ar_object_is_duped Clear the transaction state when AR object is duped
| * | | Clear the transaction state when AR object is dupedYuriy Ustushenko2018-01-253-2/+26
|/ / /
* | | Only run isolated tests on the latest stable ruby: that's now 2.5Matthew Draper2018-01-251-1/+1
| | |
* | | Merge pull request #31784 from composerinteralia/relation-signatureRafael França2018-01-2414-38/+66
|\ \ \ | | | | | | | | Avoid passing unnecessary arguments to relation
| * | | Avoid passing unnecessary arguments to relationDaniel Colson2018-01-2414-38/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the time the table and predicate_builder passed to Relation.new are exactly the arel_table and predicate builder of the given klass. This uses klass.arel_table and klass.predicate_builder as the defaults, so we don't have to pass them in most cases. This does change the signaure of both Relation and AssocationRelation. Are we ok with that?
* | | | Skip test that use fork in the memory store dbRafael Mendonça França2018-01-241-32/+34
| | | |
* | | | Merge pull request #31690 from olivierlacan/no-verbose-query-logs-in-consoleRafael França2018-01-241-0/+1
|\ \ \ \ | | | | | | | | | | Only enable verbose_query_logs in Rails server
| * | | | Disable verbose_query_logs in Rails ConsoleOlivier Lacan2018-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should fix #31688 unless someone can point me to a better way to achieve this goal. Essentially David's point was that verbose query logging when enabled in Rails console tends to make things very noisy. That's especially true if we display absolute paths to callsites which sadly is still the case when we detect a caller that isn't part of the Rails application — think gems. Discussed this with both @matthewd and @rafaelfranca and went back and forth between enabling if defined?(Rails::Server) or this implementation and this one makes more sense for now. Long term I think it'll make sense to let people override this default disabling in Rails Console because they might want to use the feature but for now it feels like the correct default behavior.
* | | | | 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