rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \|	Fix intermittent test failures	schneems	2016-01-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	😳
\| * \| \| \| \| \| \| \| \|	Revert "Revert "Set environment even when no migration runs""	schneems	2016-01-14	2	-19/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 11e85b91731ca6125ee1db33553f984549a3bc2b.
* \| \| \| \| \| \| \| \| \|	Merge pull request #22278 from poporul/master	Godfrey Chan	2016-01-15	2	-6/+14
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to store .keep file in cache directory
\| * \| \| \| \| \| \| \| \| \|	Allow to store .keep file in cache directory	Alexey Pokhozhaev	2015-11-13	2	-6/+14
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23071 from ↵	Jon Moss	2016-01-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	khundawg/dave_moore/update-docs-ActionCable__Connection__Identification.class_methods [ci skip] Fix typo in docs
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix typo in docs	DAVID MOORE	2016-01-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Found this small omission while reviewing the ActionCable docs. [Dave Moore]
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #23065 from kamipo/clean_up_internal_metadata_definition	Richard Schneeman	2016-01-15	2	-4/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Clean up internal metadata definition
\| * \| \| \| \| \| \| \| \| \| \|	Clean up internal metadata definition	Ryuta Kamizono	2016-01-15	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `t.index` in `create_table` instead of `add_index` It is slightly more efficient. Revert "Use `key` as primary key in schema." This reverts commit 350ae6cdc1ea83e21c23abd10e7e99c9a0bbdbd2. `:primary_key` option does nothing if `id: false`. https://github.com/rails/rails/blob/v5.0.0.beta1/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb#L251-L261
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #23068 from kamipo/remove_unused_last_insert_id_value	Sean Griffin	2016-01-15	1	-9/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	`last_insert_id_value` and `last_insert_id` are unused anymore
\| * \| \| \| \| \| \| \| \| \| \|	`last_insert_id_value` and `last_insert_id` are unused anymore	Ryuta Kamizono	2016-01-15	1	-9/+1
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These methods are private and unused from anywhere.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23014 from jonatack/improve-generated-config-files	Rafael França	2016-01-15	2	-4/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve generated config initializer files
\| * \| \| \| \| \| \| \| \| \| \|	Improve generated config initializer files	Jon Atack	2016-01-13	2	-4/+6
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fix grammar. - Improve readability/understanding. - Wrap lines at 80 characters. [skip ci]
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23052 from kamipo/update_deprecation_horizon	Rafael França	2016-01-15	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Update deprecation_horizon to 5.1 from 5.0 [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Update deprecation_horizon to 5.1 from 5.0 [ci skip]	Ryuta Kamizono	2016-01-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23059 from ↵	Sean Griffin	2016-01-14	2	-58/+19
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rails/revert-23017-schneems/migration-sets-environment-value Revert "Set environment even when no migration runs"
\| * \| \| \| \| \| \| \| \| \| \|	Revert "Set environment even when no migration runs"	Sean Griffin	2016-01-14	2	-58/+19
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #20835 from ↵	Kasper Timm Hansen	2016-01-14	5	-45/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	glittershark/if-and-unless-in-secure-token" This reverts commit 224eddfc0eeff6555ae88691306e61c7a9e8b758, reversing changes made to 9d681fc74c6251d5f2b93fa9576c9b2113116680. When merging the pull request, I misunderstood `has_secure_token` as declaring a model has a token from birth and through the rest of its lifetime. Therefore, supporting conditional creation doesn't make sense. You should never mark a model as having a secure token if there's a time when it shouldn't have it on creation.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23048 from kamipo/substitute_at_is_no_longer_used	Sean Griffin	2016-01-14	6	-20/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`substitute_at` is no longer used
\| * \| \| \| \| \| \| \| \| \| \|	`substitute_at` is no longer used	Ryuta Kamizono	2016-01-14	6	-20/+3
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Arel handles substitution for bind parameters by now.
* \| \| \| \| \| \| \| \| \| \|	Properly include the `from` clause when merging relations	Sean Griffin	2016-01-14	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The code that set the from clause was removed in bdc5141652770fd227455681cde1f9899f55b0b9. I did not give any reason for doing so. My assumption was that I intended to change it to use the clause objects, but forgot. We appeared to not have test coverage for this case. Fixes #22996
* \| \| \| \| \| \| \| \| \| \|	Ensure enum scopes work properly with STI and inheritance	Sean Griffin	2016-01-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The code was changed to call `where` on a specific class in 813c8c07, but no reasoning was given and I can't see any good reason why we would need to do that. This will ensure that the method is called on whatever class the scope is called on. Fixes #23013
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23017 from ↵	Richard Schneeman	2016-01-14	2	-19/+58
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	schneems/schneems/migration-sets-environment-value Set environment even when no migration runs
\| * \| \| \| \| \| \| \| \| \| \|	Set environment even when no migration runs	schneems	2016-01-11	2	-1/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This PR addresses the issue described in https://github.com/rails/rails/pull/22967#issuecomment-170251635. If the database is non empty and has no new migrations than `db:migrate` will not set the environment. This PR works by always setting the environment value on successful `up` migration regardless of whether or not a migration was actually executed.
\| * \| \| \| \| \| \| \| \| \| \|	Clean up duplicate migration logic	schneems	2016-01-11	2	-18/+21
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23054 from ankit1910/update-doc	Jon Moss	2016-01-14	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update doc for << method of has_many association
\| * \| \| \| \| \| \| \| \| \| \|	update doc for << method of has_many association	ankit1910	2016-01-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #23056 from ankit1910/fix-typo	Rafael França	2016-01-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	[ci skip] fix typo in docs
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] fix typo in docs	ankit1910	2016-01-14	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #23049 from sevenseacat/patch-1	Jon Moss	2016-01-13	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Fix typo in docs [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Fix typo in docs [ci skip]	Rebecca Skinner	2016-01-14	1	-2/+2
\|/ / / / / / / / / /
* \| / / / / / / / /	Space Oddity	Akira Matsuda	2016-01-14	3	-4/+4
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Converting nbsp(\u{00A0}) to the normal ASCII space(\u{0020}) [ci skip]
* \| \| \| \| \| \| \| \|	docs, formatting pass over changelogs. [ci skip]	Yves Senn	2016-01-13	4	-11/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	fix regression when loading fixture files with symbol keys.	Yves Senn	2016-01-13	4	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #22584.
* \| \| \| \| \| \| \| \|	Merge pull request #23040 from rafaelfranca/or-error-message	Matthew Draper	2016-01-13	2	-7/+11
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	Improve error message for #or when it is structurally incompatible
\| * \| \| \| \| \| \| \|	Improve error message for #or when it is structurally incompatible	Rafael Mendonça França	2016-01-13	2	-7/+11
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When you are using scopes and you chaining these scopes it is hard to know which are the values that are incompatible. This way you can read the message and know for which values you need to look for. [Herminio Torres]
* \| \| \| \| \| \| \|	do not run in parallel on travis	Aaron Patterson	2016-01-12	1	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "Change `WhereClause#merge` to same named columns on diff tables"	Sean Griffin	2016-01-12	2	-25/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5d41cb3bfd6b19833261622ce5d339b1e580bd8b. This implementation does not properly handle cases involving predicates which are not associated with a bind param. I have the fix in mind, but don't have time to implement just yet. It will be more similar to #22823 than not.
* \| \| \| \| \| \| \|	remove `present?` calls	Aaron Patterson	2016-01-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Empty strings / data structures should be treated differently than nils. We don't really need these calls here (don't pass in blank strings).
* \| \| \| \| \| \| \|	monkey patch `recycle!` on to controllers once	Aaron Patterson	2016-01-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of checking whether the class has recycle! or not, we can just always add the method to all controller classes when the test harness is loaded. Technically this means that the controller test harness will not work with controllers that do not inherit from AC::Metal, but then, I'm not sure that is supported anyway. Mixing in the module one will ensure that we don't break method caches, and eliminates a runtime check so it should speed up tests (slightly).
* \| \| \| \| \| \| \|	Merge pull request #22935 from cllns/add-status-name-to-output	Rafael França	2016-01-12	5	-17/+84
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add HTTP status name to output of tests
\| * \| \| \| \| \| \| \|	Add both HTTP Response Code and Type to assertion messages	Sean Collins	2016-01-12	5	-17/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, refactor logic to convert between symbol and response code, via the AssertionResponse class
* \| \| \| \| \| \| \| \|	Merge pull request #23035 from jkowens/fix-null-byte	Rafael França	2016-01-12	2	-1/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent static middleware from attempting to serve a request with a null byte
\| * \| \| \| \| \| \| \| \|	Prevent attempt to serve a request with a null byte	Jordan Owens	2016-01-12	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File paths cannot contain null byte characters and methods that do path operations such as Rack::Utils#clean_path_info will raise unwanted errors.
* \| \| \| \| \| \| \| \| \|	Change `WhereClause#merge` to same named columns on diff tables	Sean Griffin	2016-01-12	2	-13/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While the predicates are an arel equality node where the left side is a full arel attribute, the binds just have the name of the column and nothing else. This means that while splitting the predicates can include the table as a factor, the binds cannot. It's entirely possible that we might be able to have the bind params carry a bit more information (I don't believe the name is used for anything but logging), and that is probably a worthwhile change to make in the future. However the simplest (and likely slightly faster) solution is to simply use the indices of the conflicts in both cases. This means that we only have to compute the collision space once, instead of twice even though we're doing an additional array iteration. Regardless, this method isn't a performance hotspot. Close #22823. [Ben Woosley & Sean Griffin]
* \| \| \| \| \| \| \| \| \|	Merge pull request #23034 from claudiob/fix-ac-param-as-json	Rafael França	2016-01-12	2	-1/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	AC::Parameters#at_json: restore Rails 4.2’s value
\| * \| \| \| \| \| \| \| \|	AC::Parameters#at_json: restore Rails 4.2’s value	claudiob	2016-01-12	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #23026 See discussion at #23026
* \| \| \| \| \| \| \| \| \|	bring back `TEST` env for `rake test`.	Yves Senn	2016-01-12	3	-1/+21
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23027. This does not restore complete backwards compatibility. It simply passes the contets of the `TEST` env to the new runner.
* \| \| \| \| \| \| \| \|	add migration versioning example to the changelog. [ci skip]	Yves Senn	2016-01-12	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23021.
* \| \| \| \| \| \| \| \|	Merge pull request #23004 from matthewd/default-scope-sti	Matthew Draper	2016-01-12	7	-19/+61
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make default scopes + STI happy again
\| * \| \| \| \| \| \| \| \|	Skip the STI condition when evaluating a default scope	Matthew Draper	2016-01-12	4	-3/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given a default_scope on a parent of the current class, where that parent is not the base class, the parent's STI condition would become attached to the evaluated default scope, and then override the child's own STI condition. Instead, we can treat the STI condition as though it is a default scope, and skip it in this situation: the scope will be merged into the base relation, which already contains the correct STI condition. Fixes #22426.