aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump ZeitwerkXavier Noria2019-03-062-3/+3
|
* Merge pull request #35497 from eileencodes/parse-yaml-without-erb-for-rake-tasksEileen M. Uchitelle2019-03-064-13/+40
|\ | | | | Load YAML for rake tasks without parsing ERB
| * Load YAML for rake tasks without parsing ERBeileencodes2019-03-064-13/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new method that loads the YAML for the database config without parsing the ERB. This may seem odd but bear with me: When we added the ability to have rake tasks for multiple databases we started looping through the configurations to collect the namespaces so we could do `rake db:create:my_second_db`. See #32274. This caused a problem where if you had `Rails.config.max_threads` set in your database.yml it will blow up because the environment that defines `max_threads` isn't loaded during `rake -T`. See #35468. We tried to fix this by adding the ability to just load the YAML and ignore ERB all together but that caused a bug in GitHub's YAML loading where if you used multi-line ERB the YAML was invalid. That led us to reverting some changes in #33748. After trying to resolve this a bunch of ways `@tenderlove` came up with replacing the ERB values so that we don't need to load the environment but we also can load the YAML. This change adds a DummyCompiler for ERB that will replace all the values so we can load the database yaml and create the rake tasks. Nothing else uses this method so it's "safe". DO NOT use this method in your application. Fixes #35468
* | Add some whitespace for readability.Kasper Timm Hansen2019-03-062-0/+14
| |
* | Fix test case name after file extractionKasper Timm Hansen2019-03-061-1/+1
| | | | | | | | | | Although the old name had a certain persistence, this ain't the kind of file we're in now.
* | Handle blank inserts like update_all; raise upfront.Kasper Timm Hansen2019-03-062-7/+5
| |
* | Allow `remove_foreign_key` with both `to_table` and `options`Ryuta Kamizono2019-03-067-33/+32
| | | | | | | | | | | | | | Foreign keys could be created to the same table. So `remove_foreign_key :from_table, :to_table` is sometimes ambiguous. This allows `remove_foreign_key` to remove the select one on the same table with giving both `to_table` and `options`.
* | Merge pull request #35491 from abhaynikam/35077-fix-insert-many-doc-typoPrem Sichanugrist2019-03-061-1/+1
|\ \ | | | | | | [ci skip] Fix typo `beacuse` -> `because`
| * | [ci skip] Fix typo beacuse -> becauseAbhay Nikam2019-03-061-1/+1
|/ /
* | Enable `Lint/AmbiguousOperator` and `Lint/AmbiguousRegexpLiteral` copsRyuta Kamizono2019-03-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | To avoid newly adding the warnings, which are frequently addressed. ac721c855203ac7570545c0e85fe086f8e94d94a 951383bd9afa4a71c17e56d1d4eb5866da851483 8a0f235fd3bd3f3c813fa7034c6d741831e55c3e c33c03e80cbe9f27274b45fe55f93bad3af988fb 424b2019830ea4c08e86ba9ff9600aa23a54cb4f
* | Enable `Performance/ReverseEach` cop to avoid newly adding `reverse.each`Ryuta Kamizono2019-03-061-0/+3
| | | | | | | | https://github.com/rails/rails/pull/35451#discussion_r262746834
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2019-03-055-26/+25
|\ \
| * | Ensure `clear_cache!` clears the prepared statements cacheRyuta Kamizono2019-03-065-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #23461, all adapters supports prepared statements, so that clears the prepared statements cache is no longer database specific. Actually, I struggled to identify the cause of random CI failure in #23461, that was missing `@statements.clear` in `clear_cache!`. This extracts `clear_cache!` to ensure the common concerns in the abstract adapter.
* | | Added Array#including, Array#excluding, Enumerable#including, ↵David Heinemeier Hansson2019-03-055-11/+77
|/ / | | | | | | Enumerable#excluding
* / Add insert_all to ActiveRecord models (#35077)Bob Lail2019-03-0512-17/+613
|/ | | | | Adds a method to ActiveRecord allowing records to be inserted in bulk without instantiating ActiveRecord models. This method supports options for handling uniqueness violations by skipping duplicate records or overwriting them in an UPSERT operation. ActiveRecord already supports bulk-update and bulk-destroy actions that execute SQL UPDATE and DELETE commands directly. It also supports bulk-read actions through `pluck`. It makes sense for it also to support bulk-creation.
* Reset `connection_handlers` to default when any test dirties thatRyuta Kamizono2019-03-051-0/+4
| | | | | | | | | Most existing tests expects `connection_handlers` has only one default handler, but the test added at #34779 dirties that. We need to reset `connection_handlers` to default in that case. Closes #35471.
* Decrypt the ASt test config if availableMatthew Draper2019-03-051-0/+8
|
* Merge pull request #35473 from rmacklin/patch-1Ryuta Kamizono2019-03-051-1/+1
|\ | | | | | | | | Fix Getting Started guide to state the correct number of files created by the controller generator [ci skip]
| * Fix guide to use correct number of files created by controller generatorrmacklin2019-03-041-1/+1
| | | | | | | | | | | | | | | | In e8546aba904fb6685ef2e61f1623c64e699a2c9c, the Getting Started guide was updated to reflect the removal of CoffeeScript stubs being generated by the controller generator. However, the comment above the table of generated files wasn't updated, so it incorrectly remained "This creates five files and one empty directory". This fixes it to now say "This creates four files and one empty directory".
* | Merge pull request #35474 from sharang-d/patch-3Ryuta Kamizono2019-03-051-1/+1
|\ \ | |/ |/| Fix typo in test name
| * Fix typo in test nameSharang Dashputre2019-03-051-1/+1
|/
* Merge pull request #35434 from matthewd/faster-isolated-arMatthew Draper2019-03-052-2/+56
|\ | | | | Copy the forking isolated test runner from railties
| * Clean up AR's isolated test runnerMatthew Draper2019-03-052-3/+21
| |
| * Copy the forking isolated test runner from railtiesMatthew Draper2019-03-051-2/+38
| | | | | | | | | | | | All the tests have a substantial chunk of identical setup effort (in cases/helper.rb); this makes isolated tests run much faster, without any change to the variety of how we load files.
* | Allow `truncate` for SQLite3 adapter and add `rails db:seed:replant` (#34779)Bogdan2019-03-0410-1/+334
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add `ActiveRecord::Base.connection.truncate` for SQLite3 adapter. SQLite doesn't support `TRUNCATE TABLE`, but SQLite3 adapter can support `ActiveRecord::Base.connection.truncate` by using `DELETE FROM`. `DELETE` without `WHERE` uses "The Truncate Optimization", see https://www.sqlite.org/lang_delete.html. * Add `rails db:seed:replant` that truncates database tables and loads the seeds Closes #34765
* | Merge pull request #35469 from sharang-d/patch-2Vipul A M2019-03-041-1/+1
|\ \ | | | | | | Fix typo in CHANGELOG.md [ci skip]
| * | Fix typo in CHANGELOG.md [ci skip]Sharang Dashputre2019-03-041-1/+1
|/ /
* | Merge pull request #35350 from ↵Ryuta Kamizono2019-03-046-12/+86
|\ \ | | | | | | | | | | | | kamipo/deprecate_validate_uniqueness_mismatched_collation Deprecate mismatched collation comparison for uniquness validator
| * | Deprecate mismatched collation comparison for uniquness validatorRyuta Kamizono2019-03-046-12/+86
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MySQL, the default collation is case insensitive. Since the uniqueness validator enforces case sensitive comparison by default, it frequently causes mismatched collation issues (performance, weird behavior, etc) to MySQL users. https://grosser.it/2009/12/11/validates_uniqness_of-mysql-slow/ https://github.com/rails/rails/issues/1399 https://github.com/rails/rails/pull/13465 https://github.com/gitlabhq/gitlabhq/commit/c1dddf8c7d947691729f6d64a8ea768b5c915855 https://github.com/huginn/huginn/pull/1330#discussion_r55152573 I'd like to deprecate the implicit default enforcing since I frequently experienced the problems in code reviews. Note that this change has no effect to sqlite3, postgresql, and oracle-enhanced adapters which are implemented as case sensitive by default, only affect to mysql2 adapter (I can take a work if sqlserver adapter will support Rails 6.0).
* | Merge pull request #35467 from ↵Kasper Timm Hansen2019-03-041-9/+9
|\ \ | | | | | | | | | | | | bogdanvlviv/move-changelog-entry-about-reselect-method Move changelog entry about `reselect` method to the section of the next release [ci skip]
| * | Move changelog entry about `reselect` method to the section of the next releasebogdanvlviv2019-03-041-9/+9
|/ / | | | | | | | | | | | | Fixes https://github.com/rails/rails/pull/33611#discussion_r261549790 Related to https://3.basecamp.com/3076981/buckets/24956/chats/12416418@1631552581 [ci skip]
* | Correctly escape ERB tagyuuji.yaginuma2019-03-041-1/+1
| | | | | | | | Ref: https://travis-ci.org/rails/rails/jobs/501220262#L1194
* | Add an example about how to load images under app/javascript/imagesGuillermo Iguaran2019-03-031-0/+8
| | | | | | Similarly to https://github.com/rails/webpacker/pull/1976
* | Merge pull request #35460 from abhaynikam/33611-follow-up-on-add-reselectRyuta Kamizono2019-03-044-2/+16
|\ \ | | | | | | Fixed reselect throwing NoMethodError on ActiveRecord.
| * | Fixed reselect throwing NoMethodError on ActiveRecord.Abhay Nikam2019-03-034-2/+16
| | |
* | | Merge pull request #35462 from yahonda/another_30_byte_limitGeorge Claghorn2019-03-032-14/+6
|\ \ \ | |/ / |/| | Remove unnecessary `current_adapter?(:OracleAdapter)` for index length
| * | Remove unnecessary `current_adapter?(:OracleAdapter)` for index lengthYasuo Honda2019-03-032-14/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up #35455, there are two more test cases unnecessary `if current_adapter?(:OracleAdapter)` ```ruby $ ARCONN=oracle bin/test test/cases/associations/eager_test.rb -n test_include_has_many_using_primary_key Using oracle Run options: -n test_include_has_many_using_primary_key --seed 62842 . Finished in 50.280024s, 0.0199 runs/s, 0.0398 assertions/s. 1 runs, 2 assertions, 0 failures, 0 errors, 0 skips $ ``` ``` $ ARCONN=oracle bin/test test/cases/migration/index_test.rb -n test_add_index Using oracle Run options: -n test_add_index --seed 52034 . Finished in 13.152620s, 0.0760 runs/s, 0.0000 assertions/s. 1 runs, 0 assertions, 0 failures, 0 errors, 0 skips $ ```
* | Merge pull request #35457 from yahonda/run_delte_all_testRyuta Kamizono2019-03-031-19/+17
|\ \ | | | | | | Oracle database can run `delete` with `order by` and`fetch first n rows only`
| * | Oracle database can run `delete` statement with `order by` and`fetch first n ↵Yasuo Honda2019-03-031-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rows only` Since https://github.com/rails/arel/pull/337 Oracle adapter uses better top N query using `fetch first n rows only`, which can remove this unless condition. * This commit passes with Oracle database ```ruby $ ARCONN=oracle bin/test test/cases/relation/delete_all_test.rb -n test_delete_all_with_order_and_limit_deletes_subset_only Using oracle Run options: -n test_delete_all_with_order_and_limit_deletes_subset_only --seed 1081 . Finished in 8.068626s, 0.1239 runs/s, 0.6197 assertions/s. 1 runs, 5 assertions, 0 failures, 0 errors, 0 skips $ ``` * SQL statement includes `ORDER BY` and `FETCH FIRST n ROWS ONLY` ```sql Post Destroy (12.5ms) DELETE FROM "POSTS" WHERE "POSTS"."ID" IN (SELECT "POSTS"."ID" FROM "POSTS" WHERE "POSTS"."AUTHOR_ID" = :a1 ORDER BY "POSTS"."ID" ASC FETCH FIRST :a2 ROWS ONLY) [["author_id", 1], ["LIMIT", 1]] ```
* | | Merge pull request #35456 from yahonda/rails_datetime_mapped_to_oracle_timestampRyuta Kamizono2019-03-031-12/+2
|\ \ \ | | | | | | | | Rails `DateTime` type is mapped to Oracle `TIMESTAMP` since Rails 5.0
| * | | Rails `DateTime` type is mapped to Oracle `TIMESTAMP` since Rails 5.0Yasuo Honda2019-03-031-12/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kind of reverting https://github.com/rails/rails/commit/3a1cbc5c3b3bcb2de4be6e4469bb87b99759dc59 ``` From: test/cases/date_test.rb @ line 26 : 21: 22: invalid_dates = [[2007, 11, 31], [1993, 2, 29], [2007, 2, 29]] 23: 24: valid_dates.each do |date_src| 25: topic = Topic.new("last_read(1i)" => date_src[0].to_s, "last_read(2i)" => date_src[1].to_s, "last_read(3i)" => date_src[2].to_s) => 26: binding.irb 27: assert_equal(topic.last_read, Date.new(*date_src)) 28: end 29: 30: invalid_dates.each do |date_src| 31: assert_nothing_raised do irb(#<DateTest:0x0000556618194668>):001:0> topic.last_read.class => Date ``` Refer rsim/oracle-enhanced#845 rails/rails#25897
* | | Merge pull request #35455 from yahonda/revert_9395Ryuta Kamizono2019-03-031-10/+2
|\ \ \ | |/ / |/| | Oracle 12.2+ supports 128 byte identifier length
| * | Oracle 12.2+ supports 128 byte identifier lengthYasuo Honda2019-03-031-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby $ ARCONN=oracle bin/test test/cases/migration/columns_test.rb -n test_rename_column_with_multi_column_index ... snip ... F Failure: ActiveRecord::Migration::ColumnsTest#test_rename_column_with_multi_column_index [/home/yahonda/git/rails/activerecord/test/cases/migration/columns_test.rb:113]: --- expected +++ actual @@ -1 +1 @@ -["i_test_models_hat_style_size"] +["index_test_models_on_hat_style_and_size"] ``` Kind of reverting #9395 Refer https://github.com/rsim/oracle-enhanced/pull/1703
* | | activesupport: Simplify class_attribute implementation (#35454)Dylan Thacker-Smith2019-03-031-15/+10
|/ / | | | | | | | | | | | | | | * activesupport(class_attribute): Use redefine_singleton_method * activesupport(class_attribute): Use keyword arguments * activesupport(class_attribute): Avoid unnecessary redefinition for default
* | Merge pull request #35446 from jhawthorn/actionmailer_format_assignmentAaron Patterson2019-03-015-2/+17
|\ \ | | | | | | Add test and change how format set in ActionMailer
| * | Add test and change how format set in ActionMailerJohn Hawthorn2019-03-015-2/+17
|/ / | | | | | | | | | | | | | | | | | | Previously this used self.formats= to set the format which render would use to find templates. This worked, but was untested, and looked a little confusing because it was doing the mutation within a loop. This commit replaces the assignment with passing formats: [format] into the render call, which makes it more obvious that that's the purpose of the format. It also adds a test to verify the formats being used.
* | Merge pull request #35429 from jhawthorn/template_format_nilAaron Patterson2019-03-019-19/+16
|\ \ | | | | | | Allow nil format on templates
| * | Remove query_format argument from resolverJohn Hawthorn2019-02-263-5/+5
| | |
| * | Create templates with format=nilJohn Hawthorn2019-02-266-9/+11
| | |
| * | Allow format to be nilJohn Hawthorn2019-02-261-5/+0
| | |