aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29808 from ↵Kasper Timm Hansen2017-07-161-0/+2
|\ | | | | | | | | y-yagi/reset_colun_information_after_schema_changed Reset column information after schema changed
| * Reset column information after schema changedyuuji.yaginuma2017-07-161-0/+2
|/ | | | | This fixes the following failures. https://travis-ci.org/rails/rails/jobs/253990014
* Merge pull request #29380 from ↵Kasper Timm Hansen2017-07-151-0/+4
|\ | | | | | | | | y-yagi/insert_environment_value_to_table_before_check_environment Insert environment value to `InternalMetadata` table before check environment
| * Insert environment value to `InternalMetadata` after recreating the tableyuuji.yaginuma2017-06-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes `ActiveRecord::DatabaseTasksUtilsTask#test_raises_an_error_when_called_with_protected_environment` test fails. https://travis-ci.org/rails/rails/jobs/238861562 https://travis-ci.org/rails/rails/jobs/239950092 There seems to be an error because `environment` value is not exist. This is because did not set the environment after recreating the table in `SchemaMigrationsTest#test_initializes_internal_metadata_for_encoding_utf8mb4`. Therefore, we create value after the test to maintain the original state.
* | Stupid empty line added after merge.Kasper Timm Hansen2017-07-151-1/+0
| |
* | Bump minitest; Use double quotesKasper Timm Hansen2017-07-152-2/+2
| |
* | Merge branch 'master' into unlock-minitestKasper Timm Hansen2017-07-151037-3778/+6367
|\ \
| * | Added time helper method `freeze_time` which is an alias for `travel_to ↵प्रथमेश Sonpatki2017-07-103-0/+47
| | | | | | | | | | | | Time.now` (#29681)
| * | Merge pull request #29735 from ↵Kasper Timm Hansen2017-07-102-1/+9
| |\ \ | | | | | | | | | | | | | | | | y-yagi/make_sidekiq_and_resque_integration_tests_work_in_ci Make sidekiq and resque integration tests work in CI
| | * | Make sidekiq and resque integration tests work in CIyuuji.yaginuma2017-07-102-1/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Since f55ecc6, the integration test of sidekiq and resque is not working in CI. https://travis-ci.org/rails/rails/jobs/251783876 Because f55ecc6 required a password to access redis. Therefore, handling by passing passwords when connecting to redis.
| * | Merge pull request #29733 from kirs/frozen-activejobMatthew Draper2017-07-10102-0/+102
| |\ \ | | | | | | | | Use frozen-string-literal in ActiveJob
| | * | Use frozen-string-literal in ActiveJobKir Shatrov2017-07-09102-0/+102
| |/ /
| * | Merge pull request #29731 from castrodd/patch-1Kasper Timm Hansen2017-07-091-2/+2
| |\ \ | | | | | | | | [ci skip] Updated language on validations.
| | * | [ci skip] Updated language on validations.Daniel Castro2017-07-091-2/+2
| | | |
| * | | Merge pull request #29730 from bdewater/update-encryptor-docsKasper Timm Hansen2017-07-091-5/+6
| |\ \ \ | | |/ / | |/| | Update MessageEncryptor example to use dynamic key length
| | * | [ci skip] update MessageEncryptor example to use the key length as returned ↵Bart de Water2017-07-091-5/+6
| | | | | | | | | | | | | | | | by OpenSSL
| * | | Merge pull request #29721 from y-yagi/fix_29696Kasper Timm Hansen2017-07-092-2/+36
| |\ \ \ | | | | | | | | | | Treat secrets as binary
| | * | | Treat secrets as binaryyuuji.yaginuma2017-07-092-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until Rails 5.1.1 secrets was treated as binary inside Rails. https://github.com/rails/rails/blob/v5.1.1/railties/lib/rails/secrets.rb#L59 https://github.com/rails/rails/blob/v5.1.1/railties/lib/rails/secrets.rb#L63 However, it is treated as String in Rails 5.1.2(changed by 157db872103429e8782b62d1cb5d1d91337177a7). https://github.com/rails/rails/blob/v5.1.2/railties/lib/rails/secrets.rb#L104 https://github.com/rails/rails/blob/v5.1.2/railties/lib/rails/secrets.rb#L108 As a result, when upgrading from Rails 5.1.1 to 5.1.2, to write the value treated as binary using `File.write`, causing an error. In order to avoid `UndefinedConversionError`, fixed it to treat it as binary like 5.1.1. Fixes #29696
| * | | | Merge pull request #29725 from y-yagi/fix_29717Kasper Timm Hansen2017-07-093-0/+73
| |\ \ \ \ | | | | | | | | | | | | Load environment file in `dbconsole` command
| | * | | | Load environment file in `dbconsole` commandyuuji.yaginuma2017-07-093-0/+73
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the environment file is not loaded in `dbconsole` command. Therefore, for example, if use encrypted secrets values in database.yml, `read_encrypted_secrets` will not be true, so the value can not be used correctly. Fixes #29717
| * | | | Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-1018-19/+37
| |\ \ \ \ | | | | | | | | | | | | Prepare AP and AR to be frozen string friendly
| | * | | | Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-0618-19/+37
| | | | | |
| * | | | | Merge pull request #29728 from kirs/frozen-activesupportMatthew Draper2017-07-09429-0/+434
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Use frozen-string-literal in ActiveSupport
| | * | | | Use frozen-string-literal in ActiveSupportKir Shatrov2017-07-09429-0/+434
| | |/ / /
| * | | | Merge pull request #29715 from reverbdotcom/ptd/fix-invalid-uuidsMatthew Draper2017-07-092-2/+4
| |\ \ \ \ | | | | | | | | | | | | Don't allow uuids with orphan curly braces
| | * | | | Don't allow uuids with orphan curly bracespdebelak2017-07-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The uuid validation regex was allowing uuids to have a single leading curly brace or single trailing curly brace. Saving with such a uuid would cause Postgres to generate an exception even though the record seemed valid. With this change, the regex requires both a leading *and* a trailing curly brace or neither to be valid.
| * | | | | Add backticks [ci skip]Ryuta Kamizono2017-07-091-2/+2
| | | | | |
| * | | | | Merge pull request #28867 from eugeneius/skip_query_cache_in_batchesMatthew Draper2017-07-0911-20/+224
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Skip query cache for in_batches and friends
| | * | | | | Skip query cache for in_batches and friendsEugene Kenny2017-07-0610-20/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `find_each`, `find_in_batches` and `in_batches` APIs usually operate on large numbers of records, where it's preferable not to load them all into memory at once. If the query cache is enabled, it will hold onto the query results until the end of the execution context (request/job), which means the memory used is still proportional to the total number of records. These queries are typically not repeated, so the query cache isn't desirable here.
| * | | | | | Merge pull request #29692 from fimmtiu/avoid-translating-non-database-exceptionsMatthew Draper2017-07-093-2/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't translate non-database exceptions.
| | * | | | | | Remove driver-specific hard-coding in the tests.Dennis Taylor2017-07-071-9/+1
| | | | | | | |
| | * | | | | | Rename the StatementInvalid test method for clarity.Dennis Taylor2017-07-071-1/+1
| | | | | | | |
| | * | | | | | Fix changelog wording as suggested.Dennis Taylor2017-07-071-2/+2
| | | | | | | |
| | * | | | | | Use StandardError instead of RuntimeError.Dennis Taylor2017-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whoops.
| | * | | | | | Fix indentation style for private method.Dennis Taylor2017-07-051-5/+5
| | | | | | | |
| | * | | | | | Don't translate non-database exceptions.Dennis Taylor2017-07-053-2/+39
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | The AbstractAdapter will translate all StandardErrors generated during the course of a query into ActiveRecord::StatementInvalids. Unfortunately, it'll also mangle non-database-related errors generated in ActiveSupport::Notification callbacks after the query has successfully completed. This should prevent it from translating errors from ActiveSupport::Notifications.
| * | | | | | Merge pull request #29297 from ↵Matthew Draper2017-07-093-3/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | palkan/fix/action-cable-postgres-identifiers-limit Fix bug with long stream identifiers when using Postgres adapter
| | * | | | | | [Fix #28751] Hash stream long stream identifiers when using Postgres adapterpalkan2017-07-063-3/+31
| | |/ / / / /
| * | | | | | Merge pull request #29495 from eugeneius/_write_attributeMatthew Draper2017-07-096-13/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve the performance of writing attributes
| | * | | | | | Rename raw_write_attribute to write_attribute_without_type_castEugene Kenny2017-07-073-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This name more accurately describes what the method does, and also disambiguates it from `_write_attribute`, which ignores aliases. We can also make the method private, since it's not public API and only called from one place - `update_columns` - without an explicit receiver.
| | * | | | | | Improve the performance of writing attributesEugene Kenny2017-06-184-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a similar approach to 08576b94ad4f19dfc368619d7751e211d23dcad8, this change adds a new internal `_write_attribute` method which bypasses the code that checks for attribute aliases and custom primary keys. We can use this method instead of `write_attribute` when we know that we have the name of the actual column to be updated and not an alias. This makes writing an attribute with `attribute=` about 18% faster. Benchmark: ``` begin require "bundler/inline" rescue LoadError => e $stderr.puts "Bundler version 1.10 or later is required. Please update your Bundler" raise e end gemfile(true) do source "https://rubygems.org" gem "rails", github: "rails/rails" gem "arel", github: "rails/arel" gem "sqlite3" gem "benchmark-ips" end require "active_record" ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:") ActiveRecord::Schema.define do create_table :posts, force: true do |t| end end class Post < ActiveRecord::Base end post = Post.new(id: 1) Benchmark.ips do |x| x.report("attribute=") { post.id = post.id + 1 } end ``` Before: Warming up -------------------------------------- attribute= 25.889k i/100ms Calculating ------------------------------------- attribute= 290.946k (± 3.1%) i/s - 1.476M in 5.077036s After: Warming up -------------------------------------- attribute= 30.056k i/100ms Calculating ------------------------------------- attribute= 345.088k (± 4.8%) i/s - 1.743M in 5.064264s
| * | | | | | | Merge pull request #29695 from y-yagi/secrets_showMatthew Draper2017-07-094-1/+22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add `rails secrets:show` command
| | * | | | | | | Add `rails secrets:show` commandyuuji.yaginuma2017-07-074-1/+22
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When secrets confirmed with the `secrets:edit` command, `secrets.yml.enc` will change without updating the secrets. Therefore, even if only want to check secrets, the difference will come out. This is a little inconvenient. In order to solve this problem, added the `secrets:show` command. If just want to check secrets, no difference will occur use this command.
| * | | | | | | Merge pull request #29705 from y-yagi/do_not_update_secrets_yml_encMatthew Draper2017-07-092-1/+21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Do not update `secrets.yml.enc` when secretes do not change
| | * | | | | | | Do not update `secrets.yml.enc` when secretes do not changeyuuji.yaginuma2017-07-072-1/+21
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if open a file with `secrets:edit` command, `secrets.yml.enc` will be changed even if its contents do not change. Therefore, even if only want to check secrets, the difference will come out. This is a little inconvenient. As a fix to the above problem, when content does not change, `secrets.yml.ecn` is fixed so that it is not changed.
| * | | | | | | Merge pull request #29706 from ↵Matthew Draper2017-07-092-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/use_information_schema_to_extract_expression Use `information_schema` to extract `generation_expression` for MariaDB
| | * | | | | | | Use `information_schema` to extract `generation_expression` for MariaDBRyuta Kamizono2017-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since MariaDB 10.2.5, `information_schema` supports Virtual Columns. Fixes #29670.
| * | | | | | | | Merge pull request #29708 from kamipo/fix_current_timestamp_for_mariadbMatthew Draper2017-07-091-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix default `CURRENT_TIMESTAMP` in schema dumping for MariaDB 10.2
| | * | | | | | | | Fix default `CURRENT_TIMESTAMP` in schema dumping for MariaDB 10.2Ryuta Kamizono2017-07-071-2/+2
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since MariaDB 10.2, `CURRENT_TIMESTAMP` is shown as a function (`current_timestamp()`). Fix matching column default to address that case. Fixes #29698.
| * | | | | | | | Merge pull request #29718 from ragesoss/masterRichard Schneeman2017-07-081-2/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Clarify i18n guide for how pluralization rules work by default
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 02:20:32 +0000