aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29646 from y-yagi/fix_format_of_ap_to_sRyuta Kamizono2017-07-011-0/+1
|\ | | | | Fix format of `ActionController::Parameters#to_s` doc [ci skip]
| * Fix format of `ActionController::Parameters#to_s` doc [ci skip]yuuji.yaginuma2017-07-011-0/+1
| |
* | Merge pull request #29643 from fatkodima/delete_stale_commentRyuta Kamizono2017-07-011-2/+0
|\ \ | |/ |/| Delete stale comment for `AR::Associations::Builder::CollectionAssociation` [ci skip]
| * Delete stale comment for `AR::Associations::Builder::CollectionAssociation`fatkodima2017-07-011-2/+0
|/
* Add CHANGELOG for #29630 [ci skip]Prathamesh Sonpatki2017-07-011-0/+4
|
* Merge pull request #29630 from kirs/fallback-tos_parametersRafael França2017-06-303-1/+19
|\ | | | | Fallback Parameters#to_s to Hash#to_s
| * Fallback Parameters#to_s to Hash#to_sKir Shatrov2017-06-303-1/+19
| | | | | | Fixes https://github.com/rails/rails/issues/29617
* | Merge pull request #29418 from dinahshi/scaffold_system_testsEileen M. Uchitelle2017-06-307-13/+104
|\ \ | |/ |/| Add system tests to generate scaffold
| * Add system tests to generate scaffoldDinah Shi2017-06-307-13/+104
| |
* | Merge pull request #29640 from sai29/getting_started_editVipul A M2017-06-301-2/+2
|\ \ | | | | | | [ci skip] run migration before looking at schema
| * | [ci skip] run migration before looking at schemaSai Prashanth2017-06-301-2/+2
|/ /
* | Merge pull request #29618 from diasjorge/patch-1Rafael França2017-06-291-1/+1
|\ \ | | | | | | Specify correct extension for text layouts
| * | Specify correct extension for text layoutsJorge Dias2017-06-291-1/+1
| | | | | | | | | When using render plain the extension for the layout needs to be .text.erb instead of .txt.erb
* | | Merge pull request #29623 from kamipo/should_use_same_connection_in_query_cacheRafael França2017-06-293-11/+5
|\ \ \ | | | | | | | | Should use the same connection in using query cache
| * | | Should use the same connection in using query cacheRyuta Kamizono2017-06-293-11/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `test_cache_is_available_when_using_a_not_connected_connection` is always failed if running only the test since #29609. ``` % ARCONN=mysql2 be ruby -w -Itest test/cases/query_cache_test.rb -n test_cache_is_available_when_using_a_not_connected_connection Using mysql2 Run options: -n test_cache_is_available_when_using_a_not_connected_connection --seed 15043 F Finished in 0.070519s, 14.1806 runs/s, 28.3612 assertions/s. 1) Failure: QueryCacheTest#test_cache_is_available_when_using_a_not_connected_connection [test/cases/query_cache_test.rb:336]: 2 instead of 1 queries were executed. Queries: SELECT `tasks`.* FROM `tasks` WHERE `tasks`.`id` = ? LIMIT ? SET NAMES utf8 COLLATE utf8_unicode_ci, @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'), @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483. Expected: 1 Actual: 2 1 runs, 2 assertions, 1 failures, 0 errors, 0 skips ``` This failure is due to `LogSubscriber` will use not connected `ActiveRecord::Base.connection` even if `Task.connection` is connected. I fixed to always pass `type_casted_binds` to log subscriber to avoid the issue.
* | | Merge pull request #29628 from kamipo/fix_next_version_of_railsRafael França2017-06-291-2/+2
|\ \ \ | | | | | | | | Fix the next version of Rails from 5.3 to 6.0
| * | | Fix the next version of Rails from 5.3 to 6.0Ryuta Kamizono2017-06-291-2/+2
|/ / /
* | | Merge pull request #29619 from kamipo/deprecate_delegating_to_arel_in_relationKasper Timm Hansen2017-06-293-0/+21
|\ \ \ | | | | | | | | Deprecate delegating to `arel` in `Relation`
| * | | Deprecate delegating to `arel` in `Relation`Ryuta Kamizono2017-06-293-0/+21
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record doesn't rely delegating to `arel` in the internal since 425f2ca. The delegation is a lower priority than delegating to `klass`, so it is pretty unclear which method is delegated to `arel`. For example, `bind_values` method was removed at b06f64c (a series of changes https://github.com/rails/rails/compare/79f71d3...b06f64c). But a relation still could respond to the method because `arel` also have the same named method (#28976). Removing the delegation will achieve predictable behavior.
* | | Merge pull request #29616 from kamipo/remove_unused_aliased_table_nameRafael França2017-06-292-9/+0
|\ \ \ | | | | | | | | Remove unused `aliased_table_name` in `Association`
| * | | Remove unused `aliased_table_name` in `Association`Ryuta Kamizono2017-06-292-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `aliased_table_name` in `Association` was added at a3502c4. `aliased_table_name` in `JoinDependency` (added at 55854c4) is used, but it looks like that added one in `Association` is never used from the beginning.
* | | | Merge pull request #29569 from kamipo/fix_to_scoping_is_correctly_restoredRafael França2017-06-293-4/+14
|\ \ \ \ | |_|/ / |/| | | Fix to scoping is correctly restored
| * | | Fix to scoping is correctly restoredRyuta Kamizono2017-06-293-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This regression was caused by #23004. If STI subclass is using scoping in parent class scoping, `current_scope` in subclass is never restored. I fixed to restore `current_scope` to previous value correctly.
* | | | Merge pull request #28932 from ↵Rafael França2017-06-281-10/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/remove_method_missing_in_relation_delegation Remove `method_missing` in `Relation::Delegation`
| * | | | Remove `method_missing` in `Relation::Delegation`Ryuta Kamizono2017-04-301-10/+0
| | | | | | | | | | | | | | | | | | | | The `method_missing` is never reached since 64c53d7c.
* | | | | Merge pull request #29612 from kamipo/use_quote_method_rather_than_single_quoteRafael França2017-06-285-13/+12
|\ \ \ \ \ | | | | | | | | | | | | Use `quote` method rather than single quotes to identifiers in SQL
| * | | | | Use `quote` method rather than single quotes to identifiers in SQLRyuta Kamizono2017-06-295-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because identifiers in SQL could include a single quote. Related #24950, #26784.
* | | | | | Merge pull request #29129 from kamipo/prevent_extra_through_scopeRafael França2017-06-281-2/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Prevent extra `through_scope`
| * | | | | Prevent extra `through_scope`Ryuta Kamizono2017-05-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | We can reuse `through_scope` for `reset_association`.
* | | | | | Merge pull request #29301 from kamipo/receiver_in_scope_should_be_relationRafael França2017-06-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | The receiver in a scope should be a `relation`
| * | | | | | The receiver in a scope should be a `relation`Ryuta Kamizono2017-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the receiver in a scope is `klass`, not `relation`. I think it is a strange because the receiver in `default_scope` and a scope on association is `relation`. I fixed to the receiver is to be a `relation` properly for consistency.
* | | | | | | Merge pull request #29416 from kamipo/remove_unused_subject_modelRafael França2017-06-281-14/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused `Subject` model in tests
| * | | | | | | Remove unused `Subject` model in testsRyuta Kamizono2017-06-111-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `subjects` table doesn't exist.
* | | | | | | | Merge pull request #29076 from ↵Rafael França2017-06-281-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/use_timestamp_attributes_for_update_in_model Use `timestamp_attributes_for_update_in_model` rather than `timestamp_attributes_for_update`
| * | | | | | | | Use `timestamp_attributes_for_update_in_model` rather than ↵Ryuta Kamizono2017-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `timestamp_attributes_for_update`
* | | | | | | | | Merge pull request #28928 from kamipo/remove_habtm_initializeRafael França2017-06-281-4/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Remove `HasAndBelongsToManyReflection#initialize`
| * | | | | | | | Remove `HasAndBelongsToManyReflection#initialize`Ryuta Kamizono2017-04-291-4/+0
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | It is delegating `super` only.
* | | | | | | | Merge pull request #29405 from kamipo/locked_should_not_build_arelRafael França2017-06-287-9/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | `Relation#locked?` should not build arel
| * | | | | | | | Remove delegating to arel in a relationRyuta Kamizono2017-06-296-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The delegation was needed since passing `relation` with `relation.bound_attributes`. It should use `relation.arel` in that case.
| * | | | | | | | `Relation#locked?` should not build arelRyuta Kamizono2017-06-202-1/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #29614 from kamipo/show_query_cache_keys_2Rafael França2017-06-281-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Show query cache keys in `test_middleware_caches`
| * | | | | | | | | Show query cache keys in `test_middleware_caches`Ryuta Kamizono2017-06-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `test_middleware_caches` also failed same as #29600. https://travis-ci.org/rails/rails/jobs/248017174#L487-L489
* | | | | | | | | | Merge pull request #29601 from ↵Rafael Mendonça França2017-06-283-11/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_eager_loading_to_respect_store_full_sti_class Fix eager loading to respect `store_full_sti_class` setting
| * | | | | | | | | | Fix eager loading to respect `store_full_sti_class` settingRyuta Kamizono2017-06-293-11/+22
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #29610 from ↵Rafael França2017-06-285-9/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/dont_passing_klass_connection_to_association_scope Don't passing `klass.connection` to `AssociationScope`
| * | | | | | | | | | Don't passing `klass.connection` to `AssociationScope`Ryuta Kamizono2017-06-295-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing `klass.connection` is redundant because `AssociationScope` is passed an association itself and an association has `klass`.
* | | | | | | | | | | Merge pull request #29611 from kamipo/add_test_case_for_unscoping_default_scopeRafael França2017-06-281-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a test case for unscoping `default_scope` in associations
| * | | | | | | | | | | Add a test case for unscoping `default_scope` in associationsRyuta Kamizono2017-06-291-2/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unscoping `default_scope` in associations has already supported (#17360 for preloading, c9cf8b8 for eager loading). Fixes #20679. Closes #16531.
* | | | | | | | | | | Merge pull request #29609 from tsukasaoishi/query_cache_from_beginningRafael França2017-06-283-20/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Enable query cache if set a configurations
| * | | | | | | | | | Enable query cache if set a configurationsTsukasa OISHI2017-06-293-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord query cache is available when a connection is connected. Therefore, query cache is unavailable when entering the ActiveRecord::Base.cache block without being connected. ```ruby ActiveRecord::Base.cache do Task.find(1) # access to database. Task.find(1) # access to database. unavailable query cache end ``` If we use query cache with batch script etc, we need to connect before that. ```ruby Task.connection ActiveRecord::Base.cache do Task.find(1) # access to database. Task.find(1) # available query cache end ``` Before version 3.1, query cache had been enabled if a configuration was set up. In order to solve the `DATABASE_URL` issue(#8074), ActiveRecord has checked whether a connection is connected or not. Today, ActiveRecord.configurations respect `DATABASE_URL`. https://github.com/rails/rails/blob/master/activerecord/lib/active_record/core.rb#L46
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 22:53:07 +0000