From f5f7a563e516c5713a1d91cde3ded0608d5f68e3 Mon Sep 17 00:00:00 2001
From: Laurents Meyer <laucomm@gmail.com>
Date: Wed, 28 Feb 2024 12:21:48 +0100
Subject: [PATCH] Upgrade to EF Core 9.0.0-preview.1 (#1853)

* Update branding to 9.0.0-preview.1.

* Update dependencies.

* Update project files.

* Update EFCore.MySql.

* Update EFCore.MySql.FunctionalTests.

* Update MySQL version used in CI.

* Remove special case for MySqlBug96947Workaround from tests.

* Explicitly throw exception if primitive collection support has not been enabled, to ensure the error message is not lost along the way.

* Update test baselines.

* Add new test classes.

* Fix new tests.

* Add CompiledModelMySqlTest scaffolding baselines.

* Fix test baselines for MariaDB.
---
 .github/workflows/build.yml                   |    3 +-
 Dependencies.targets                          |   41 +-
 NuGet.config                                  |    4 +-
 Version.props                                 |    4 +-
 dotnet-tools.json                             |    2 +-
 .../Infrastructure/MariaDbServerVersion.cs    |    2 +-
 .../Infrastructure/MySqlServerVersion.cs      |    2 +-
 .../Infrastructure/ServerVersionSupport.cs    |    2 +-
 .../Internal/MySqlMigrationsModelDiffer.cs    |    2 +
 .../Internal/MySqlJsonTableExpression.cs      |   22 +-
 .../MySqlStringComparisonMethodTranslator.cs  |    8 +-
 .../MySqlBoolOptimizingExpressionVisitor.cs   |    2 +-
 .../MySqlQueryTranslationPostprocessor.cs     |    2 +-
 ...SqlQueryTranslationPostprocessorFactory.cs |    2 +-
 ...yableMethodTranslatingExpressionVisitor.cs |   87 +-
 ...thodTranslatingExpressionVisitorFactory.cs |    2 +-
 test/Directory.Build.props                    |    1 +
 .../ComplexTypeBulkUpdatesMySqlTest.cs        |  199 +
 .../NonSharedModelBulkUpdatesMySqlTest.cs     |   19 +-
 .../NorthwindBulkUpdatesMySqlTest.cs          |  334 +-
 ...CFiltersInheritanceBulkUpdatesMySqlTest.cs |   40 +-
 .../TPCInheritanceBulkUpdatesMySqlTest.cs     |   34 +-
 ...TFiltersInheritanceBulkUpdatesMySqlTest.cs |   10 -
 .../TPTInheritanceBulkUpdatesMySqlTest.cs     |    5 -
 .../EFCore.MySql.FunctionalTests.csproj       |    5 +
 .../MaterializationInterceptionMySqlTest.cs   |   41 +-
 .../MigrationsInfrastructureMySqlTest.cs      |  337 +
 .../MigrationsMySqlTest.cs                    |   37 +
 .../MySqlModelBuilderGenericTest.cs           |   69 +
 .../MySqlModelBuilderTestBase.cs              |   39 +
 .../MySqlComplianceTest.cs                    |    2 +-
 .../AdHocAdvancedMappingsQueryMySqlTest.cs    |   39 +
 .../Query/AdHocJsonQueryMySqlTest.cs          |  272 +
 .../Query/AdHocManyToManyQueryMySqlTest.cs    |   11 +
 .../Query/AdHocMiscellaneousQueryMySqlTest.cs |   36 +
 .../Query/AdHocNavigationsQueryMySqlTest.cs   |   11 +
 .../Query/AdHocQueryFiltersQueryMySqlTest.cs  |  106 +
 .../AdHocQuerySplittingQueryMySqlTest.cs      |   44 +
 ...lexNavigationsCollectionsQueryMySqlTest.cs |  992 +-
 ...ionsCollectionsSharedTypeQueryMySqlTest.cs |  186 +-
 ...vigationsCollectionsSplitQueryMySqlTest.cs | 1806 ++--
 .../Query/ComplexNavigationsQueryMySqlTest.cs |   12 +-
 ...plexNavigationsSharedTypeQueryMySqlTest.cs |  109 +-
 .../Query/ComplexTypeQueryMySqlTest.cs        |   88 +-
 .../Query/CompositeKeysQueryMySqlTest.cs      |   58 +-
 .../Query/CompositeKeysSplitQueryMySqlTest.cs |  488 +-
 .../Query/Ef6GroupByMySqlTest.cs              |  112 +-
 .../Query/EntitySplittingQueryMySqlTest.cs    |   70 +-
 .../Query/FunkyDataQueryMySqlTest.cs          |   16 +-
 .../Query/GearsOfWarQueryMySqlTest.cs         |    8 +-
 .../ManyToManyHeterogeneousQueryMySqlTest.cs  |   68 -
 ...rthwindAggregateOperatorsQueryMySqlTest.cs |   15 +
 ...orthwindEFPropertyIncludeQueryMySqlTest.cs |  602 +-
 .../Query/NorthwindFunctionsQueryMySqlTest.cs |   70 +-
 .../Query/NorthwindGroupByQueryMySqlTest.cs   |   66 +-
 .../NorthwindMiscellaneousQueryMySqlTest.cs   |   74 +-
 .../NorthwindQueryFiltersQueryMySqlTest.cs    |    6 +-
 .../NorthwindSelectQueryMySqlTest.MySql.cs    |   46 +-
 .../Query/NorthwindSelectQueryMySqlTest.cs    |   21 +-
 .../NorthwindSetOperationsQueryMySqlTest.cs   |   14 +-
 .../Query/NorthwindSqlQueryMySqlTest.cs       |    8 +-
 .../Query/OwnedEntityQueryMySqlTest.cs        |   73 +-
 .../PrimitiveCollectionsQueryMySqlTest.cs     |  283 +-
 .../Query/SimpleQueryMySqlTest.cs             |   59 -
 .../TPCFiltersInheritanceQueryMySqlTest.cs    |   62 +-
 .../Query/TPCGearsOfWarQueryMySqlTest.cs      | 4814 +++++----
 .../TPCManyToManyNoTrackingQueryMySqlTest.cs  |  928 +-
 .../Query/TPCManyToManyQueryMySqlTest.cs      |  948 +-
 .../Query/TPCRelationshipsQueryMySqlTest.cs   | 2046 ++--
 .../Baselines/BigModel/DataEntityType.cs      |  173 +
 .../Baselines/BigModel/DbContextModel.cs      |   48 +
 .../BigModel/DbContextModelBuilder.cs         | 2758 +++++
 .../BigModel/DependentBaseEntityType.cs       |  192 +
 .../BigModel/DependentDerivedEntityType.cs    |   99 +
 .../Baselines/BigModel/ManyTypesEntityType.cs | 9246 +++++++++++++++++
 .../BigModel/OwnedType0EntityType.cs          |  560 +
 .../Baselines/BigModel/OwnedTypeEntityType.cs |  596 ++
 .../BigModel/PrincipalBaseEntityType.cs       |  721 ++
 ...cipalDerivedDependentBasebyteEntityType.cs |  192 +
 .../BigModel/PrincipalDerivedEntityType.cs    |   84 +
 .../CheckConstraints/DataEntityType.cs        |   90 +
 .../CheckConstraints/DbContextModel.cs        |   48 +
 .../CheckConstraints/DbContextModelBuilder.cs |   82 +
 .../Baselines/ComplexTypes/DbContextModel.cs  |   48 +
 .../ComplexTypes/DbContextModelBuilder.cs     | 1106 ++
 .../ComplexTypes/PrincipalBaseEntityType.cs   | 1744 ++++
 .../PrincipalDerivedEntityType.cs             |   41 +
 ...unctionParameterTypeMappingContextModel.cs |   48 +
 ...ParameterTypeMappingContextModelBuilder.cs |  102 +
 .../FunctionTypeMappingContextModel.cs        |   48 +
 .../FunctionTypeMappingContextModelBuilder.cs |  102 +
 .../Baselines/DbFunctions/DataEntityType.cs   |   64 +
 .../DbFunctions/DbFunctionContextModel.cs     |   48 +
 .../DbFunctionContextModelBuilder.cs          |  322 +
 .../Baselines/DbFunctions/ObjectEntityType.cs |   38 +
 .../Dynamic_schema/DataEntityType.cs          |   90 +
 .../Dynamic_schema/DbContextModel.cs          |   48 +
 .../Dynamic_schema/DbContextModelBuilder.cs   |   82 +
 .../DbContextModelCustomizer.cs               |   72 +
 .../Baselines/Sequences/DbContextModel.cs     |   48 +
 .../Sequences/DbContextModelBuilder.cs        |   48 +
 .../Baselines/Tpc/DbContextModel.cs           |   48 +
 .../Baselines/Tpc/DbContextModelBuilder.cs    | 1092 ++
 .../Baselines/Tpc/DependentBaseEntityType.cs  |  120 +
 .../Baselines/Tpc/PrincipalBaseEntityType.cs  |  762 ++
 .../Tpc/PrincipalDerivedEntityType.cs         |  129 +
 .../Baselines/Triggers/DataEntityType.cs      |   96 +
 .../Baselines/Triggers/DbContextModel.cs      |   48 +
 .../Triggers/DbContextModelBuilder.cs         |   84 +
 .../Scaffolding/CompiledModelMySqlTest.cs     |  385 +
 .../TestUtilities/MySqlTestHelpers.cs         |    4 +
 .../TestUtilities/MySqlTestStoreFactory.cs    |    4 +-
 .../MySqlXunitTestFrameworkDiscoverer.cs      |    3 +
 .../UpdatesMySqlTest.cs                       |    2 +-
 test/EFCore.MySql.Tests/Bugs/MySqlBug96947.cs |    3 -
 115 files changed, 30796 insertions(+), 6998 deletions(-)
 create mode 100644 test/EFCore.MySql.FunctionalTests/ModelBuilding/MySqlModelBuilderGenericTest.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/ModelBuilding/MySqlModelBuilderTestBase.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Query/AdHocAdvancedMappingsQueryMySqlTest.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Query/AdHocJsonQueryMySqlTest.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Query/AdHocManyToManyQueryMySqlTest.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Query/AdHocMiscellaneousQueryMySqlTest.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Query/AdHocNavigationsQueryMySqlTest.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Query/AdHocQueryFiltersQueryMySqlTest.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Query/AdHocQuerySplittingQueryMySqlTest.cs
 delete mode 100644 test/EFCore.MySql.FunctionalTests/Query/ManyToManyHeterogeneousQueryMySqlTest.cs
 delete mode 100644 test/EFCore.MySql.FunctionalTests/Query/SimpleQueryMySqlTest.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DataEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/ObjectEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelCustomizer.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DbContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DbContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DependentBaseEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalBaseEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalDerivedEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DataEntityType.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModel.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModelBuilder.cs
 create mode 100644 test/EFCore.MySql.FunctionalTests/Scaffolding/CompiledModelMySqlTest.cs

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb99f7388..07a475338 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,8 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         dbVersion:
-          - 8.0.34-mysql
-          - 5.7.43-mysql
+          - 8.0.36-mysql
           - 11.2.2-mariadb
           - 11.1.3-mariadb
           - 11.0.4-mariadb
diff --git a/Dependencies.targets b/Dependencies.targets
index 33f6c76da..e1ae374d5 100644
--- a/Dependencies.targets
+++ b/Dependencies.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Common Versions">
-    <EFCoreVersion>[8.0.1,8.0.999]</EFCoreVersion>
+    <EFCoreVersion>[9.0.0-preview.1.24081.2,9.0.0-preview.1.999999]</EFCoreVersion>
   </PropertyGroup>
 
   <ItemGroup Label="Dependencies">
@@ -13,36 +13,37 @@
     <PackageReference Update="MySqlConnector.DependencyInjection" Version="2.3.5" />
 
     <PackageReference Update="NetTopologySuite" Version="2.5.0" />
-    <PackageReference Update="System.Text.Json" Version="8.0.1" />
+    <PackageReference Update="System.Text.Json" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
     <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
 
     <PackageReference Update="Castle.Core" Version="5.1.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
-    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="[8.0.0,8.0.999]" />
+    <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[8.0.0,8.0.999]" />
+    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
     <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
+    <PackageReference Update="Microsoft.Extensions.Configuration" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" /> <!-- CHECK: used? -->
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
+    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageReference Update="Moq" Version="4.20.70" />
-    <PackageReference Update="System.Collections.Immutable" Version="8.0.0" />
+    <PackageReference Update="System.Collections.Immutable" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
     <PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
     <PackageReference Update="GitHubActionsTestLogger" Version="2.3.3" />
+    <PackageReference Update="Xunit.SkippableFact" Version="1.4.13" />
 
     <!-- Keep at the same level that the EF Core projects use. -->
-    <PackageReference Update="xunit.assert" Version="2.4.2" />
-    <PackageReference Update="xunit.core" Version="2.4.2" />
-    <PackageReference Update="xunit.runner.console" Version="2.4.2" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.2" />
+    <PackageReference Update="xunit.assert" Version="2.6.1" />
+    <PackageReference Update="xunit.core" Version="2.6.1" />
+    <PackageReference Update="xunit.runner.console" Version="2.6.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.3" />
     <PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
     <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis" Version="4.5.0" />
diff --git a/NuGet.config b/NuGet.config
index ca4722e3c..61d71d04a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,9 +6,9 @@
     <add key="pomelo-nightly-public-myget" value="https://www.myget.org/F/pomelo/api/v3/index.json" />
     <add key="pomelo-nightly-debug-myget" value="https://www.myget.org/F/pomelo-debug/api/v3/index.json" />
 
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
-    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
 
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/Version.props b/Version.props
index 9a2422c08..0a28ca2d3 100644
--- a/Version.props
+++ b/Version.props
@@ -12,8 +12,8 @@
           - "rtm"       - EF Core release independent, code quality production ready, major release
           - "servicing" - EF Core release independent, code quality production ready, mainly bugfixes
     -->
-    <VersionPrefix>8.0.1</VersionPrefix>
-    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
+    <VersionPrefix>9.0.0</VersionPrefix>
+    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
 
     <!--
diff --git a/dotnet-tools.json b/dotnet-tools.json
index fd9a39d87..dc078fec0 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "8.0.1",
+      "version": "9.0.0-preview.1.24081.2",
       "commands": [
         "dotnet-ef"
       ]
diff --git a/src/EFCore.MySql/Infrastructure/MariaDbServerVersion.cs b/src/EFCore.MySql/Infrastructure/MariaDbServerVersion.cs
index 6ab2e1466..7f230b695 100644
--- a/src/EFCore.MySql/Infrastructure/MariaDbServerVersion.cs
+++ b/src/EFCore.MySql/Infrastructure/MariaDbServerVersion.cs
@@ -90,7 +90,7 @@ internal MariaDbServerVersionSupport([NotNull] ServerVersion serverVersion)
             public override bool JsonValue => true;
             public override bool Values => ServerVersion.Version >= new Version(10, 3, 3);
             public override bool ValuesWithRows => false;
-            public override bool OffsetReferencesOuterQuery => false;
+            public override bool WhereSubqueryReferencesOuterQuery => false;
 
             public override bool JsonTableImplementationStable => false;
             public override bool JsonTableImplementationWithoutMariaDbBugs => false;
diff --git a/src/EFCore.MySql/Infrastructure/MySqlServerVersion.cs b/src/EFCore.MySql/Infrastructure/MySqlServerVersion.cs
index 9a6d71602..8ec1e47e4 100644
--- a/src/EFCore.MySql/Infrastructure/MySqlServerVersion.cs
+++ b/src/EFCore.MySql/Infrastructure/MySqlServerVersion.cs
@@ -93,7 +93,7 @@ internal MySqlServerVersionSupport([NotNull] ServerVersion serverVersion)
             public override bool JsonValue => ServerVersion.Version >= new Version(8, 0, 21);
             public override bool Values => false;
             public override bool ValuesWithRows => ServerVersion.Version >= new Version(8, 0, 19);
-            public override bool OffsetReferencesOuterQuery => false;
+            public override bool WhereSubqueryReferencesOuterQuery => false;
 
             public override bool JsonTableImplementationStable => false;
             public override bool JsonTableImplementationWithoutMySqlBugs => false; // Other non-fatal bugs regarding JSON_TABLE.
diff --git a/src/EFCore.MySql/Infrastructure/ServerVersionSupport.cs b/src/EFCore.MySql/Infrastructure/ServerVersionSupport.cs
index 185fe0978..644309070 100644
--- a/src/EFCore.MySql/Infrastructure/ServerVersionSupport.cs
+++ b/src/EFCore.MySql/Infrastructure/ServerVersionSupport.cs
@@ -93,7 +93,7 @@ public virtual bool PropertyOrVersion(string propertyNameOrServerVersion)
         public virtual bool JsonValue => false;
         public virtual bool Values => false;
         public virtual bool ValuesWithRows => false;
-        public virtual bool OffsetReferencesOuterQuery => false;
+        public virtual bool WhereSubqueryReferencesOuterQuery => false;
 
         public virtual bool JsonTableImplementationStable => JsonTable;
         public virtual bool JsonTableImplementationWithoutMySqlBugs => JsonTable;
diff --git a/src/EFCore.MySql/Migrations/Internal/MySqlMigrationsModelDiffer.cs b/src/EFCore.MySql/Migrations/Internal/MySqlMigrationsModelDiffer.cs
index 63f97c0c6..6e4f0ab21 100644
--- a/src/EFCore.MySql/Migrations/Internal/MySqlMigrationsModelDiffer.cs
+++ b/src/EFCore.MySql/Migrations/Internal/MySqlMigrationsModelDiffer.cs
@@ -32,11 +32,13 @@ protected static class InternalLocalAnnotationNames
         public MySqlMigrationsModelDiffer(
             IRelationalTypeMappingSource typeMappingSource,
             IMigrationsAnnotationProvider migrationsAnnotationProvider,
+            IRelationalAnnotationProvider relationalAnnotationProvider,
             IRowIdentityMapFactory rowIdentityMapFactory,
             CommandBatchPreparerDependencies commandBatchPreparerDependencies)
             : base(
                 typeMappingSource,
                 migrationsAnnotationProvider,
+                relationalAnnotationProvider,
                 rowIdentityMapFactory,
                 commandBatchPreparerDependencies)
         {
diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlJsonTableExpression.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlJsonTableExpression.cs
index ba8e35001..c3e49c32f 100644
--- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlJsonTableExpression.cs
+++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlJsonTableExpression.cs
@@ -14,7 +14,7 @@ namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal;
 /// <summary>
 ///     An expression that represents a MySQL JSON_TABLE() function call in a SQL tree.
 /// </summary>
-public class MySqlJsonTableExpression : TableValuedFunctionExpression, IClonableTableExpressionBase
+public class MySqlJsonTableExpression : TableValuedFunctionExpression
 {
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -134,26 +134,6 @@ public virtual MySqlJsonTableExpression Update(
             ? this
             : new MySqlJsonTableExpression(Alias, jsonExpression, path, columnInfos);
 
-
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     any release. You should only use it directly in your code with extreme caution and knowing that
-    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
-    /// </summary>
-    // TODO: Deep clone, see #30982
-    public virtual TableExpressionBase Clone()
-    {
-        var clone = new MySqlJsonTableExpression(Alias, JsonExpression, Path, ColumnInfos);
-
-        foreach (var annotation in GetAnnotations())
-        {
-            clone.AddAnnotation(annotation.Name, annotation.Value);
-        }
-
-        return clone;
-    }
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs
index f929557b1..3ee77e601 100644
--- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs
+++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -517,7 +518,8 @@ private SqlExpression MakeContainsExpressionImpl(
                             _sqlExpressionFactory.Constant(string.Empty, stringTypeMapping)))));
         }
 
-        protected virtual SqlExpression GetLikeExpressionUsingParameter(QueryCompilationContext queryCompilationContext,
+        protected virtual SqlExpression GetLikeExpressionUsingParameter(
+            QueryCompilationContext queryCompilationContext,
             SqlExpression target,
             Func<SqlExpression, SqlExpression> targetTransform,
             SqlExpression pattern,
@@ -538,7 +540,9 @@ protected virtual SqlExpression GetLikeExpressionUsingParameter(QueryCompilation
                     QueryCompilationContext.QueryContextParameter);
 
                 var escapedPatternParameter =
-                    queryCompilationContext.RegisterRuntimeParameter(patternParameter.Name + "_rewritten", lambda);
+                    queryCompilationContext.RegisterRuntimeParameter(
+                        $"{patternParameter.Name}_{methodType.ToString().ToLower(CultureInfo.InvariantCulture)}",
+                        lambda);
 
                 return _sqlExpressionFactory.Like(
                     targetTransform(target),
diff --git a/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlBoolOptimizingExpressionVisitor.cs b/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlBoolOptimizingExpressionVisitor.cs
index afa63c7a7..2ca66b9cc 100644
--- a/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlBoolOptimizingExpressionVisitor.cs
+++ b/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlBoolOptimizingExpressionVisitor.cs
@@ -98,7 +98,7 @@ protected override Expression VisitColumn(ColumnExpression columnExpression)
         }
 
         protected override Expression VisitDelete(DeleteExpression deleteExpression)
-            => deleteExpression.Update((SelectExpression)Visit(deleteExpression.SelectExpression));
+            => deleteExpression.Update(deleteExpression.Table, (SelectExpression)Visit(deleteExpression.SelectExpression));
 
         protected override Expression VisitDistinct(DistinctExpression distinctExpression)
         {
diff --git a/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQueryTranslationPostprocessor.cs b/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQueryTranslationPostprocessor.cs
index 574e7e13b..ed219a6ed 100644
--- a/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQueryTranslationPostprocessor.cs
+++ b/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQueryTranslationPostprocessor.cs
@@ -16,7 +16,7 @@ public class MySqlQueryTranslationPostprocessor : RelationalQueryTranslationPost
         public MySqlQueryTranslationPostprocessor(
             QueryTranslationPostprocessorDependencies dependencies,
             RelationalQueryTranslationPostprocessorDependencies relationalDependencies,
-            QueryCompilationContext queryCompilationContext,
+            MySqlQueryCompilationContext queryCompilationContext,
             IMySqlOptions options,
             MySqlSqlExpressionFactory sqlExpressionFactory)
             : base(dependencies, relationalDependencies, queryCompilationContext)
diff --git a/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQueryTranslationPostprocessorFactory.cs b/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQueryTranslationPostprocessorFactory.cs
index 34330a09c..b05689cab 100644
--- a/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQueryTranslationPostprocessorFactory.cs
+++ b/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlQueryTranslationPostprocessorFactory.cs
@@ -30,7 +30,7 @@ public virtual QueryTranslationPostprocessor Create(QueryCompilationContext quer
             => new MySqlQueryTranslationPostprocessor(
                 _dependencies,
                 _relationalDependencies,
-                queryCompilationContext,
+                (MySqlQueryCompilationContext)queryCompilationContext,
                 _options,
                 _sqlExpressionFactory);
     }
diff --git a/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitor.cs
index 1134d48f1..a16cc6f29 100644
--- a/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitor.cs
+++ b/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitor.cs
@@ -7,7 +7,9 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
@@ -29,16 +31,18 @@ private static readonly bool _mySql8EngineCrashWhenUsingJsonTableWithPrimitiveCo
     private readonly IMySqlOptions _options;
     private readonly MySqlSqlExpressionFactory _sqlExpressionFactory;
     private readonly IRelationalTypeMappingSource _typeMappingSource;
+    private readonly SqlAliasManager _sqlAliasManager;
 
     public MySqlQueryableMethodTranslatingExpressionVisitor(
         QueryableMethodTranslatingExpressionVisitorDependencies dependencies,
         RelationalQueryableMethodTranslatingExpressionVisitorDependencies relationalDependencies,
-        QueryCompilationContext queryCompilationContext,
+        RelationalQueryCompilationContext relationalQueryCompilationContext,
         IMySqlOptions options)
-        : base(dependencies, relationalDependencies, queryCompilationContext)
+        : base(dependencies, relationalDependencies, relationalQueryCompilationContext)
     {
         _sqlExpressionFactory = (MySqlSqlExpressionFactory)relationalDependencies.SqlExpressionFactory;
         _typeMappingSource = relationalDependencies.TypeMappingSource;
+        _sqlAliasManager = relationalQueryCompilationContext.SqlAliasManager;
         _options = options;
     }
 
@@ -62,19 +66,20 @@ protected override bool IsNaturallyOrdered(SelectExpression selectExpression)
                    Orderings:
                    [
                        {
-                           Expression: ColumnExpression { Name: "key", Table: var orderingTable } orderingColumn,
+                           Expression: ColumnExpression { Name: "key", TableAlias: var orderingTable } orderingColumn,
                            IsAscending: true
                        }
                    ]
                }
-               && orderingTable == mainTable
-               && IsJsonEachKeyColumn(orderingColumn);
-
-        bool IsJsonEachKeyColumn(ColumnExpression orderingColumn)
-            => orderingColumn.Table is MySqlJsonTableExpression
-               || (orderingColumn.Table is SelectExpression subquery
-                   && subquery.Projection.FirstOrDefault(p => p.Alias == "key")?.Expression is ColumnExpression projectedColumn
-                   && IsJsonEachKeyColumn(projectedColumn));
+               && orderingTable == mainTable.Alias
+               && IsJsonEachKeyColumn(selectExpression, orderingColumn);
+
+        bool IsJsonEachKeyColumn(SelectExpression selectExpression, ColumnExpression orderingColumn)
+            => selectExpression.Tables.FirstOrDefault(t => t.Alias == orderingColumn.TableAlias)?.UnwrapJoin() is TableExpressionBase table
+               && (table is MySqlJsonTableExpression
+                   || (table is SelectExpression subquery
+                       && subquery.Projection.FirstOrDefault(p => p.Alias == "key")?.Expression is ColumnExpression projectedColumn
+                       && IsJsonEachKeyColumn(subquery, projectedColumn)));
     }
 
     protected override bool IsValidSelectExpressionForExecuteDelete(
@@ -97,11 +102,7 @@ protected override bool IsValidSelectExpressionForExecuteDelete(
                 var projectionBindingExpression = (ProjectionBindingExpression)shaper.ValueBufferExpression;
                 var entityProjectionExpression = (StructuralTypeProjectionExpression)selectExpression.GetProjection(projectionBindingExpression);
                 var column = entityProjectionExpression.BindProperty(shaper.StructuralType.GetProperties().First());
-                table = column.Table;
-                if (table is JoinExpressionBase joinExpressionBase)
-                {
-                    table = joinExpressionBase.Table;
-                }
+                table = selectExpression.GetTable(column).UnwrapJoin();
             }
 
             if (table is TableExpression te)
@@ -178,7 +179,7 @@ protected override ShapedQueryExpression TranslateAny(ShapedQueryExpression sour
                         typeof(int)),
                     _sqlExpressionFactory.Constant(0));
 
-            return source.UpdateQueryExpression(_sqlExpressionFactory.Select(translation));
+            return source.UpdateQueryExpression(new SelectExpression(translation, _sqlAliasManager));
         }
 
         return base.TranslateAny(source, predicate);
@@ -206,7 +207,7 @@ protected override ShapedQueryExpression TranslateElementAtOrDefault(
                 Limit: null,
                 Offset: null
             } selectExpression
-            && orderingColumn.Table == jsonEachExpression
+            && orderingColumn.TableAlias == jsonEachExpression.Alias
             && TranslateExpression(index) is { } translatedIndex)
         {
             // Index on JSON array
@@ -238,7 +239,7 @@ protected override ShapedQueryExpression TranslateElementAtOrDefault(
                         translation, _sqlExpressionFactory, projectionColumn.TypeMapping, projectionColumn.IsNullable);
                 }
 
-                return source.UpdateQueryExpression(_sqlExpressionFactory.Select(translation));
+                return source.UpdateQueryExpression(new SelectExpression(translation, _sqlAliasManager));
             }
         }
 
@@ -255,8 +256,10 @@ protected override ShapedQueryExpression TranslatePrimitiveCollection(SqlExpress
     {
         if (!_options.PrimitiveCollectionsSupport)
         {
-            AddTranslationErrorDetails("Primitive collections support has not been enabled.");
-            return null;
+            throw new InvalidOperationException(
+                CoreStrings.TranslationFailedWithDetails(
+                    sqlExpression.Print(),
+                    "Primitive collections support has not been enabled."));
         }
 
         // if (!_options.ServerVersion.Supports.JsonTableImplementationUsesImplicitLateralJoin &&
@@ -309,21 +312,21 @@ elementTypeMapping is not null
         // which case we only have the CLR type (note that we cannot produce different SQLs based on the nullability of an *element* in
         // a parameter collection - our caching mechanism only supports varying by the nullability of the parameter itself (i.e. the
         // collection).
-        // TODO: if property is non-null, GetElementType() should never be null, but we have #31469 for shadow properties
-        var isElementNullable = property?.GetElementType() is null
-            ? elementClrType.IsNullableType()
-            : property.GetElementType()!.IsNullable;
+        var isElementNullable = property?.GetElementType()!.IsNullable;
+
+        var keyColumnTypeMapping = _typeMappingSource.FindMapping(typeof(int))!;
 
 #pragma warning disable EF1001 // Internal EF Core API usage.
         var selectExpression = new SelectExpression(
-            jsonTableExpression,
-            columnName: "value",
-            columnType: elementClrType,
-            columnTypeMapping: elementTypeMapping,
-            isElementNullable,
-            identifierColumnName: "key",
-            identifierColumnType: typeof(uint),
-            identifierColumnTypeMapping: _typeMappingSource.FindMapping(typeof(uint)));
+            [jsonTableExpression],
+            new ColumnExpression(
+                "value",
+                tableAlias,
+                elementClrType.UnwrapNullableType(),
+                elementTypeMapping,
+                isElementNullable ?? elementClrType.IsNullableType()),
+            identifier: [(new ColumnExpression("key", tableAlias, typeof(int), keyColumnTypeMapping, nullable: false), keyColumnTypeMapping.Comparer)],
+            _sqlAliasManager);
 #pragma warning restore EF1001 // Internal EF Core API usage.
 
         // JSON_TABLE() doesn't guarantee the ordering of the elements coming out; when using JSON_TABLE() without COLUMNS, a [key] column is returned
@@ -360,7 +363,7 @@ elementTypeMapping is not null
 
     protected override Expression ApplyInferredTypeMappings(
         Expression expression,
-        IReadOnlyDictionary<(TableExpressionBase, string), RelationalTypeMapping> inferredTypeMappings)
+        IReadOnlyDictionary<(string, string), RelationalTypeMapping> inferredTypeMappings)
         => new MySqlInferredTypeMappingApplier(
             RelationalDependencies.Model, _typeMappingSource, _sqlExpressionFactory, inferredTypeMappings).Visit(expression);
 
@@ -384,7 +387,7 @@ protected class MySqlInferredTypeMappingApplier : RelationalInferredTypeMappingA
     {
         private readonly IRelationalTypeMappingSource _typeMappingSource;
         private readonly ISqlExpressionFactory _sqlExpressionFactory;
-        private Dictionary<TableExpressionBase, RelationalTypeMapping> _currentSelectInferredTypeMappings;
+        private Dictionary<string, RelationalTypeMapping> _currentSelectInferredTypeMappings;
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -396,7 +399,7 @@ public MySqlInferredTypeMappingApplier(
             IModel model,
             IRelationalTypeMappingSource typeMappingSource,
             ISqlExpressionFactory sqlExpressionFactory,
-            IReadOnlyDictionary<(TableExpressionBase, string), RelationalTypeMapping> inferredTypeMappings)
+            IReadOnlyDictionary<(string, string), RelationalTypeMapping> inferredTypeMappings)
             : base(model, sqlExpressionFactory, inferredTypeMappings)
         {
             (_typeMappingSource, _sqlExpressionFactory) = (typeMappingSource, sqlExpressionFactory);
@@ -413,7 +416,7 @@ protected override Expression VisitExtension(Expression expression)
             switch (expression)
             {
                 case MySqlJsonTableExpression { Name: "JSON_TABLE", Schema: null, IsBuiltIn: true } jsonTableExpression
-                    when TryGetInferredTypeMapping(jsonTableExpression, "value", out var typeMapping):
+                    when TryGetInferredTypeMapping(jsonTableExpression.Alias, "value", out var typeMapping):
                     return ApplyTypeMappingsOnJsonTableExpression(jsonTableExpression, typeMapping);
 
                 // Above, we applied the type mapping the the parameter that JSON_TABLE accepts as an argument.
@@ -422,20 +425,20 @@ when TryGetInferredTypeMapping(jsonTableExpression, "value", out var typeMapping
                 // in the immediate SelectExpression, and continue visiting down (see ColumnExpression visitation below).
                 case SelectExpression selectExpression:
                 {
-                    Dictionary<TableExpressionBase, RelationalTypeMapping> previousSelectInferredTypeMappings = null;
+                    Dictionary<string, RelationalTypeMapping> previousSelectInferredTypeMappings = null;
 
                     foreach (var table in selectExpression.Tables)
                     {
                         if (table is TableValuedFunctionExpression { Name: "JSON_TABLE", Schema: null, IsBuiltIn: true } jsonTableExpression
-                            && TryGetInferredTypeMapping(jsonTableExpression, "value", out var inferredTypeMapping))
+                            && TryGetInferredTypeMapping(jsonTableExpression.Alias, "value", out var inferredTypeMapping))
                         {
                             if (previousSelectInferredTypeMappings is null)
                             {
                                 previousSelectInferredTypeMappings = _currentSelectInferredTypeMappings;
-                                _currentSelectInferredTypeMappings = new Dictionary<TableExpressionBase, RelationalTypeMapping>();
+                                _currentSelectInferredTypeMappings = new Dictionary<string, RelationalTypeMapping>();
                             }
 
-                            _currentSelectInferredTypeMappings![jsonTableExpression] = inferredTypeMapping;
+                            _currentSelectInferredTypeMappings![jsonTableExpression.Alias] = inferredTypeMapping;
                         }
                     }
 
@@ -450,7 +453,7 @@ when TryGetInferredTypeMapping(jsonTableExpression, "value", out var typeMapping
                 // opposed to parameter collections, where the type mapping needs to be inferred). This is in order to apply SQL conversion
                 // logic later in the process, see note in TranslateCollection.
                 case ColumnExpression { Name: "value" } columnExpression
-                    when _currentSelectInferredTypeMappings?.TryGetValue(columnExpression.Table, out var inferredTypeMapping) is true:
+                    when _currentSelectInferredTypeMappings?.TryGetValue(columnExpression.TableAlias, out var inferredTypeMapping) is true:
                     return ApplyJsonSqlConversion(
                         columnExpression.ApplyTypeMapping(inferredTypeMapping),
                         _sqlExpressionFactory,
diff --git a/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitorFactory.cs b/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitorFactory.cs
index cf9d63e39..a9e812b21 100644
--- a/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitorFactory.cs
+++ b/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitorFactory.cs
@@ -43,5 +43,5 @@ public MySqlQueryableMethodTranslatingExpressionVisitorFactory(
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
-        => new MySqlQueryableMethodTranslatingExpressionVisitor(Dependencies, RelationalDependencies, queryCompilationContext, _options);
+        => new MySqlQueryableMethodTranslatingExpressionVisitor(Dependencies, RelationalDependencies, (MySqlQueryCompilationContext)queryCompilationContext, _options);
 }
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 09501c267..3dcc35d0a 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -14,5 +14,6 @@
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="xunit.runner.console" />
     <PackageReference Include="GitHubActionsTestLogger" />
+    <PackageReference Include="Xunit.SkippableFact" />
   </ItemGroup>
 </Project>
diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesMySqlTest.cs
index 8b0144f8b..f87694622 100644
--- a/test/EFCore.MySql.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesMySqlTest.cs
@@ -102,6 +102,205 @@ public override async Task Update_projected_complex_type_via_OrderBy_Skip_throws
         AssertExecuteUpdateSql();
     }
 
+    public override async Task Update_complex_type_to_parameter(bool async)
+    {
+        await base.Update_complex_type_to_parameter(async);
+
+        AssertSql(
+"""
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""",
+                //
+                """
+@__complex_type_newAddress_0_AddressLine1='New AddressLine1' (Size = 4000)
+@__complex_type_newAddress_0_AddressLine2='New AddressLine2' (Size = 4000)
+@__complex_type_newAddress_0_Tags='["new_tag1","new_tag2"]' (Size = 4000)
+@__complex_type_newAddress_0_ZipCode='99999' (Nullable = true)
+@__complex_type_newAddress_0_Code='FR' (Size = 4000)
+@__complex_type_newAddress_0_FullName='France' (Size = 4000)
+
+UPDATE `Customer` AS `c`
+SET `c`.`ShippingAddress_AddressLine1` = @__complex_type_newAddress_0_AddressLine1,
+    `c`.`ShippingAddress_AddressLine2` = @__complex_type_newAddress_0_AddressLine2,
+    `c`.`ShippingAddress_Tags` = @__complex_type_newAddress_0_Tags,
+    `c`.`ShippingAddress_ZipCode` = @__complex_type_newAddress_0_ZipCode,
+    `c`.`ShippingAddress_Country_Code` = @__complex_type_newAddress_0_Code,
+    `c`.`ShippingAddress_Country_FullName` = @__complex_type_newAddress_0_FullName
+""",
+                //
+                """
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""");
+    }
+
+    public override async Task Update_nested_complex_type_to_parameter(bool async)
+    {
+        await base.Update_nested_complex_type_to_parameter(async);
+
+        AssertSql(
+"""
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""",
+                //
+                """
+@__complex_type_newCountry_0_Code='FR' (Size = 4000)
+@__complex_type_newCountry_0_FullName='France' (Size = 4000)
+
+UPDATE `Customer` AS `c`
+SET `c`.`ShippingAddress_Country_Code` = @__complex_type_newCountry_0_Code,
+    `c`.`ShippingAddress_Country_FullName` = @__complex_type_newCountry_0_FullName
+""",
+                //
+                """
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""");
+    }
+
+    public override async Task Update_complex_type_to_another_database_complex_type(bool async)
+    {
+        await base.Update_complex_type_to_another_database_complex_type(async);
+
+        AssertSql(
+"""
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""",
+                //
+                """
+UPDATE `Customer` AS `c`
+SET `c`.`ShippingAddress_AddressLine1` = `c`.`BillingAddress_AddressLine1`,
+    `c`.`ShippingAddress_AddressLine2` = `c`.`BillingAddress_AddressLine2`,
+    `c`.`ShippingAddress_Tags` = `c`.`BillingAddress_Tags`,
+    `c`.`ShippingAddress_ZipCode` = `c`.`BillingAddress_ZipCode`,
+    `c`.`ShippingAddress_Country_Code` = `c`.`ShippingAddress_Country_Code`,
+    `c`.`ShippingAddress_Country_FullName` = `c`.`ShippingAddress_Country_FullName`
+""",
+                //
+                """
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""");
+    }
+
+    public override async Task Update_complex_type_to_inline_without_lambda(bool async)
+    {
+        await base.Update_complex_type_to_inline_without_lambda(async);
+
+        AssertSql(
+"""
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""",
+                //
+                """
+UPDATE `Customer` AS `c`
+SET `c`.`ShippingAddress_AddressLine1` = 'New AddressLine1',
+    `c`.`ShippingAddress_AddressLine2` = 'New AddressLine2',
+    `c`.`ShippingAddress_Tags` = '["new_tag1","new_tag2"]',
+    `c`.`ShippingAddress_ZipCode` = 99999,
+    `c`.`ShippingAddress_Country_Code` = 'FR',
+    `c`.`ShippingAddress_Country_FullName` = 'France'
+""",
+                //
+                """
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""");
+    }
+
+    public override async Task Update_complex_type_to_inline_with_lambda(bool async)
+    {
+        await base.Update_complex_type_to_inline_with_lambda(async);
+
+        AssertSql(
+"""
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""",
+                //
+                """
+UPDATE `Customer` AS `c`
+SET `c`.`ShippingAddress_AddressLine1` = 'New AddressLine1',
+    `c`.`ShippingAddress_AddressLine2` = 'New AddressLine2',
+    `c`.`ShippingAddress_Tags` = '["new_tag1","new_tag2"]',
+    `c`.`ShippingAddress_ZipCode` = 99999,
+    `c`.`ShippingAddress_Country_Code` = 'FR',
+    `c`.`ShippingAddress_Country_FullName` = 'France'
+""",
+                //
+                """
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""");
+    }
+
+    public override async Task Update_complex_type_to_another_database_complex_type_with_subquery(bool async)
+    {
+        await base.Update_complex_type_to_another_database_complex_type_with_subquery(async);
+
+        AssertSql(
+"""
+@__p_0='1'
+
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+ORDER BY `c`.`Id`
+LIMIT 18446744073709551610 OFFSET @__p_0
+""",
+                //
+                """
+@__p_0='1'
+
+UPDATE `Customer` AS `c0`
+INNER JOIN (
+    SELECT `c`.`Id`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+    FROM `Customer` AS `c`
+    ORDER BY `c`.`Id`
+    LIMIT 18446744073709551610 OFFSET @__p_0
+) AS `c1` ON `c0`.`Id` = `c1`.`Id`
+SET `c0`.`ShippingAddress_AddressLine1` = `c1`.`BillingAddress_AddressLine1`,
+    `c0`.`ShippingAddress_AddressLine2` = `c1`.`BillingAddress_AddressLine2`,
+    `c0`.`ShippingAddress_Tags` = `c1`.`BillingAddress_Tags`,
+    `c0`.`ShippingAddress_ZipCode` = `c1`.`BillingAddress_ZipCode`,
+    `c0`.`ShippingAddress_Country_Code` = `c1`.`ShippingAddress_Country_Code`,
+    `c0`.`ShippingAddress_Country_FullName` = `c1`.`ShippingAddress_Country_FullName`
+""",
+                //
+                """
+@__p_0='1'
+
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+ORDER BY `c`.`Id`
+LIMIT 18446744073709551610 OFFSET @__p_0
+""");
+    }
+
+    public override async Task Update_collection_inside_complex_type(bool async)
+    {
+        await base.Update_collection_inside_complex_type(async);
+
+        AssertSql(
+"""
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""",
+                //
+                """
+UPDATE `Customer` AS `c`
+SET `c`.`ShippingAddress_Tags` = '["new_tag1","new_tag2"]'
+""",
+                //
+                """
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+FROM `Customer` AS `c`
+""");
+    }
+
     [ConditionalFact]
     public virtual void Check_all_tests_overridden()
     {
diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesMySqlTest.cs
index 23b70b1f3..81c2441cd 100644
--- a/test/EFCore.MySql.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesMySqlTest.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.BulkUpdates;
 using Microsoft.EntityFrameworkCore.TestUtilities;
+using MySqlConnector;
 using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
 using Xunit;
 
@@ -108,7 +109,8 @@ public override async Task Update_non_main_table_in_entity_with_entity_splitting
 
         AssertSql(
 """
-UPDATE `BlogsPart1` AS `b0`
+UPDATE `Blogs` AS `b`
+INNER JOIN `BlogsPart1` AS `b0` ON `b`.`Id` = `b0`.`Id`
 SET `b0`.`Rating` = CHAR_LENGTH(`b0`.`Title`),
     `b0`.`Title` = CAST(`b0`.`Rating` AS char)
 """);
@@ -141,6 +143,21 @@ SELECT COALESCE(SUM(`o0`.`Amount`), 0)
 """);
     }
 
+    public override Task Delete_with_owned_collection_and_non_natively_translatable_query(bool async)
+        => Assert.ThrowsAsync<MySqlException>(() =>base.Delete_with_owned_collection_and_non_natively_translatable_query(async));
+
+    public override async Task Update_non_owned_property_on_entity_with_owned_in_join(bool async)
+    {
+        await base.Update_non_owned_property_on_entity_with_owned_in_join(async);
+
+        AssertSql(
+"""
+UPDATE `Owner` AS `o`
+INNER JOIN `Owner` AS `o0` ON `o`.`Id` = `o0`.`Id`
+SET `o`.`Title` = 'NewValue'
+""");
+    }
+
     private void AssertSql(params string[] expected)
         => TestSqlLoggerFactory.AssertBaseline(expected);
 
diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesMySqlTest.cs
index 8150b30ad..732c4d0c7 100644
--- a/test/EFCore.MySql.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesMySqlTest.cs
@@ -19,7 +19,7 @@ public NorthwindBulkUpdatesMySqlTest(
         : base(fixture, testOutputHelper)
     {
         ClearLog();
-        // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
+        Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
     }
 
     [ConditionalFact]
@@ -98,13 +98,13 @@ public override async Task Delete_Where_OrderBy_Skip(bool async)
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
+        SELECT `o0`.`OrderID`, `o0`.`ProductID`
         FROM `Order Details` AS `o0`
         WHERE `o0`.`OrderID` < 10300
         ORDER BY `o0`.`OrderID`
         LIMIT 18446744073709551610 OFFSET @__p_0
-    ) AS `t`
-    WHERE (`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`))
+    ) AS `o1`
+    WHERE (`o1`.`OrderID` = `o`.`OrderID`) AND (`o1`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -137,13 +137,13 @@ public override async Task Delete_Where_OrderBy_Skip_Take(bool async)
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
+        SELECT `o0`.`OrderID`, `o0`.`ProductID`
         FROM `Order Details` AS `o0`
         WHERE `o0`.`OrderID` < 10300
         ORDER BY `o0`.`OrderID`
         LIMIT @__p_0 OFFSET @__p_0
-    ) AS `t`
-    WHERE (`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`))
+    ) AS `o1`
+    WHERE (`o1`.`OrderID` = `o`.`OrderID`) AND (`o1`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -160,12 +160,12 @@ public override async Task Delete_Where_Skip(bool async)
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
+        SELECT `o0`.`OrderID`, `o0`.`ProductID`
         FROM `Order Details` AS `o0`
         WHERE `o0`.`OrderID` < 10300
         LIMIT 18446744073709551610 OFFSET @__p_0
-    ) AS `t`
-    WHERE (`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`))
+    ) AS `o1`
+    WHERE (`o1`.`OrderID` = `o`.`OrderID`) AND (`o1`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -197,12 +197,12 @@ public override async Task Delete_Where_Skip_Take(bool async)
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
+        SELECT `o0`.`OrderID`, `o0`.`ProductID`
         FROM `Order Details` AS `o0`
         WHERE `o0`.`OrderID` < 10300
         LIMIT @__p_0 OFFSET @__p_0
-    ) AS `t`
-    WHERE (`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`))
+    ) AS `o1`
+    WHERE (`o1`.`OrderID` = `o`.`OrderID`) AND (`o1`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -278,16 +278,16 @@ public override async Task Delete_Where_Skip_Take_Skip_Take_causing_subquery(boo
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `t`.`OrderID`, `t`.`ProductID`, `t`.`Discount`, `t`.`Quantity`, `t`.`UnitPrice`
+        SELECT `o0`.`OrderID`, `o0`.`ProductID`
         FROM (
-            SELECT `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
-            FROM `Order Details` AS `o0`
-            WHERE `o0`.`OrderID` < 10300
+            SELECT `o1`.`OrderID`, `o1`.`ProductID`
+            FROM `Order Details` AS `o1`
+            WHERE `o1`.`OrderID` < 10300
             LIMIT @__p_0 OFFSET @__p_0
-        ) AS `t`
+        ) AS `o0`
         LIMIT @__p_2 OFFSET @__p_1
-    ) AS `t0`
-    WHERE (`t0`.`OrderID` = `o`.`OrderID`) AND (`t0`.`ProductID` = `o`.`ProductID`))
+    ) AS `o2`
+    WHERE (`o2`.`OrderID` = `o`.`OrderID`) AND (`o2`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -328,11 +328,11 @@ WHERE EXISTS (
     SELECT 1
     FROM `Orders` AS `o0`
     INNER JOIN (
-        SELECT `o1`.`OrderID`, `o1`.`ProductID`, `o1`.`Discount`, `o1`.`Quantity`, `o1`.`UnitPrice`
-        FROM `Order Details` AS `o1`
-        WHERE `o1`.`ProductID` > 0
-    ) AS `t` ON `o0`.`OrderID` = `t`.`OrderID`
-    WHERE (`o0`.`OrderID` < 10250) AND ((`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`)))
+        SELECT `o2`.`OrderID`, `o2`.`ProductID`
+        FROM `Order Details` AS `o2`
+        WHERE `o2`.`ProductID` > 0
+    ) AS `o1` ON `o0`.`OrderID` = `o1`.`OrderID`
+    WHERE (`o0`.`OrderID` < 10250) AND ((`o1`.`OrderID` = `o`.`OrderID`) AND (`o1`.`ProductID` = `o`.`ProductID`)))
 """);
     }
 
@@ -380,8 +380,8 @@ SELECT 1
         SELECT `o1`.`OrderID`, `o1`.`ProductID`, `o1`.`Discount`, `o1`.`Quantity`, `o1`.`UnitPrice`
         FROM `Order Details` AS `o1`
         WHERE `o1`.`OrderID` > 11250
-    ) AS `t`
-    WHERE (`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`))
+    ) AS `u`
+    WHERE (`u`.`OrderID` = `o`.`OrderID`) AND (`u`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -396,15 +396,15 @@ public override async Task Delete_Concat(bool async)
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
+        SELECT `o0`.`OrderID`, `o0`.`ProductID`
         FROM `Order Details` AS `o0`
         WHERE `o0`.`OrderID` < 10250
         UNION ALL
-        SELECT `o1`.`OrderID`, `o1`.`ProductID`, `o1`.`Discount`, `o1`.`Quantity`, `o1`.`UnitPrice`
+        SELECT `o1`.`OrderID`, `o1`.`ProductID`
         FROM `Order Details` AS `o1`
         WHERE `o1`.`OrderID` > 11250
-    ) AS `t`
-    WHERE (`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`))
+    ) AS `u`
+    WHERE (`u`.`OrderID` = `o`.`OrderID`) AND (`u`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -426,8 +426,8 @@ SELECT 1
         SELECT `o1`.`OrderID`, `o1`.`ProductID`, `o1`.`Discount`, `o1`.`Quantity`, `o1`.`UnitPrice`
         FROM `Order Details` AS `o1`
         WHERE `o1`.`OrderID` > 11250
-    ) AS `t`
-    WHERE (`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`))
+    ) AS `i`
+    WHERE (`i`.`OrderID` = `o`.`OrderID`) AND (`i`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -449,8 +449,8 @@ SELECT 1
         SELECT `o1`.`OrderID`, `o1`.`ProductID`, `o1`.`Discount`, `o1`.`Quantity`, `o1`.`UnitPrice`
         FROM `Order Details` AS `o1`
         WHERE `o1`.`OrderID` > 11250
-    ) AS `t`
-    WHERE (`t`.`OrderID` = `o`.`OrderID`) AND (`t`.`ProductID` = `o`.`ProductID`))
+    ) AS `e`
+    WHERE (`e`.`OrderID` = `o`.`OrderID`) AND (`e`.`ProductID` = `o`.`ProductID`))
 """);
     }
 
@@ -519,12 +519,12 @@ public override async Task Delete_with_join(bool async)
 DELETE `o`
 FROM `Order Details` AS `o`
 INNER JOIN (
-    SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+    SELECT `o0`.`OrderID`
     FROM `Orders` AS `o0`
     WHERE `o0`.`OrderID` < 10300
     ORDER BY `o0`.`OrderID`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t` ON `o`.`OrderID` = `t`.`OrderID`
+) AS `o1` ON `o`.`OrderID` = `o1`.`OrderID`
 """);
     }
 
@@ -540,12 +540,12 @@ public override async Task Delete_with_left_join(bool async)
 DELETE `o`
 FROM `Order Details` AS `o`
 LEFT JOIN (
-    SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+    SELECT `o0`.`OrderID`
     FROM `Orders` AS `o0`
     WHERE `o0`.`OrderID` < 10300
     ORDER BY `o0`.`OrderID`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t` ON `o`.`OrderID` = `t`.`OrderID`
+) AS `o1` ON `o`.`OrderID` = `o1`.`OrderID`
 WHERE `o`.`OrderID` < 10276
 """);
     }
@@ -559,12 +559,12 @@ public override async Task Delete_with_cross_join(bool async)
 DELETE `o`
 FROM `Order Details` AS `o`
 CROSS JOIN (
-    SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+    SELECT 1
     FROM `Orders` AS `o0`
     WHERE `o0`.`OrderID` < 10300
     ORDER BY `o0`.`OrderID`
     LIMIT 100 OFFSET 0
-) AS `t`
+) AS `o1`
 WHERE `o`.`OrderID` < 10276
 """);
     }
@@ -578,12 +578,12 @@ public override async Task Delete_with_cross_apply(bool async)
 DELETE `o`
 FROM `Order Details` AS `o`
 JOIN LATERAL (
-    SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+    SELECT 1
     FROM `Orders` AS `o0`
     WHERE `o0`.`OrderID` < `o`.`OrderID`
     ORDER BY `o0`.`OrderID`
     LIMIT 100 OFFSET 0
-) AS `t` ON TRUE
+) AS `o1` ON TRUE
 WHERE `o`.`OrderID` < 10276
 """);
     }
@@ -597,12 +597,12 @@ public override async Task Delete_with_outer_apply(bool async)
 DELETE `o`
 FROM `Order Details` AS `o`
 LEFT JOIN LATERAL (
-    SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+    SELECT 1
     FROM `Orders` AS `o0`
     WHERE `o0`.`OrderID` < `o`.`OrderID`
     ORDER BY `o0`.`OrderID`
     LIMIT 100 OFFSET 0
-) AS `t` ON TRUE
+) AS `o1` ON TRUE
 WHERE `o`.`OrderID` < 10276
 """);
     }
@@ -725,14 +725,14 @@ public override async Task Update_Where_Skip_set_constant(bool async)
 """
 @__p_0='4'
 
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c0`
 INNER JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-    FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
+    SELECT `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+) AS `c1` ON `c0`.`CustomerID` = `c1`.`CustomerID`
+SET `c0`.`ContactName` = 'Updated'
 """);
     }
 
@@ -766,14 +766,14 @@ public override async Task Update_Where_Skip_Take_set_constant(bool async)
 @__p_1='4'
 @__p_0='2'
 
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c0`
 INNER JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-    FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
+    SELECT `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+) AS `c1` ON `c0`.`CustomerID` = `c1`.`CustomerID`
+SET `c0`.`ContactName` = 'Updated'
 """);
     }
 
@@ -783,13 +783,13 @@ public override async Task Update_Where_OrderBy_set_constant(bool async)
 
         AssertExecuteUpdateSql(
 """
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c0`
 INNER JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-    FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+    SELECT `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
+) AS `c1` ON `c0`.`CustomerID` = `c1`.`CustomerID`
+SET `c0`.`ContactName` = 'Updated'
 """);
     }
 
@@ -801,15 +801,15 @@ public override async Task Update_Where_OrderBy_Skip_set_constant(bool async)
 """
 @__p_0='4'
 
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c0`
 INNER JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-    FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
-    ORDER BY `c0`.`City`
+    SELECT `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
+    ORDER BY `c`.`City`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+) AS `c1` ON `c0`.`CustomerID` = `c1`.`CustomerID`
+SET `c0`.`ContactName` = 'Updated'
 """);
     }
 
@@ -821,15 +821,15 @@ public override async Task Update_Where_OrderBy_Take_set_constant(bool async)
 """
 @__p_0='4'
 
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c0`
 INNER JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-    FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
-    ORDER BY `c0`.`City`
+    SELECT `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
+    ORDER BY `c`.`City`
     LIMIT @__p_0
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+) AS `c1` ON `c0`.`CustomerID` = `c1`.`CustomerID`
+SET `c0`.`ContactName` = 'Updated'
 """);
     }
 
@@ -842,15 +842,15 @@ public override async Task Update_Where_OrderBy_Skip_Take_set_constant(bool asyn
 @__p_1='4'
 @__p_0='2'
 
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c0`
 INNER JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-    FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
-    ORDER BY `c0`.`City`
+    SELECT `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
+    ORDER BY `c`.`City`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+) AS `c1` ON `c0`.`CustomerID` = `c1`.`CustomerID`
+SET `c0`.`ContactName` = 'Updated'
 """);
     }
 
@@ -863,20 +863,20 @@ public override async Task Update_Where_OrderBy_Skip_Take_Skip_Take_set_constant
 @__p_1='6'
 @__p_0='2'
 
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c1`
 INNER JOIN (
-    SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`
+    SELECT `c0`.`CustomerID`
     FROM (
-        SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-        FROM `Customers` AS `c0`
-        WHERE `c0`.`CustomerID` LIKE 'F%'
-        ORDER BY `c0`.`City`
+        SELECT `c`.`CustomerID`, `c`.`City`
+        FROM `Customers` AS `c`
+        WHERE `c`.`CustomerID` LIKE 'F%'
+        ORDER BY `c`.`City`
         LIMIT @__p_1 OFFSET @__p_0
-    ) AS `t`
-    ORDER BY `t`.`City`
+    ) AS `c0`
+    ORDER BY `c0`.`City`
     LIMIT @__p_0 OFFSET @__p_0
-) AS `t0` ON `c`.`CustomerID` = `t0`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+) AS `c2` ON `c1`.`CustomerID` = `c2`.`CustomerID`
+SET `c1`.`ContactName` = 'Updated'
 """);
     }
 
@@ -964,13 +964,13 @@ public override async Task Update_Where_Distinct_set_constant(bool async)
 
         AssertExecuteUpdateSql(
 """
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c0`
 INNER JOIN (
-    SELECT DISTINCT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-    FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+    SELECT DISTINCT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
+) AS `c1` ON `c0`.`CustomerID` = `c1`.`CustomerID`
+SET `c0`.`ContactName` = 'Updated'
 """);
     }
 
@@ -1032,7 +1032,7 @@ public override async Task Update_Where_set_property_plus_parameter(bool async)
 
         AssertExecuteUpdateSql(
 """
-@__value_0='Abc' (Size = 30)
+@__value_0='Abc' (Size = 4000)
 
 UPDATE `Customers` AS `c`
 SET `c`.`ContactName` = CONCAT(COALESCE(`c`.`ContactName`, ''), @__value_0)
@@ -1125,17 +1125,17 @@ public override async Task Update_Union_set_constant(bool async)
 
         AssertExecuteUpdateSql(
 """
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c1`
 INNER JOIN (
+    SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
+    UNION
     SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
     FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
-    UNION
-    SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`
-    FROM `Customers` AS `c1`
-    WHERE `c1`.`CustomerID` LIKE 'A%'
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+    WHERE `c0`.`CustomerID` LIKE 'A%'
+) AS `u` ON `c1`.`CustomerID` = `u`.`CustomerID`
+SET `c1`.`ContactName` = 'Updated'
 """);
     }
 
@@ -1145,17 +1145,17 @@ public override async Task Update_Concat_set_constant(bool async)
 
         AssertExecuteUpdateSql(
 """
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c1`
 INNER JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
-    FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
+    SELECT `c`.`CustomerID`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
     UNION ALL
-    SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`
-    FROM `Customers` AS `c1`
-    WHERE `c1`.`CustomerID` LIKE 'A%'
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+    SELECT `c0`.`CustomerID`
+    FROM `Customers` AS `c0`
+    WHERE `c0`.`CustomerID` LIKE 'A%'
+) AS `u` ON `c1`.`CustomerID` = `u`.`CustomerID`
+SET `c1`.`ContactName` = 'Updated'
 """);
     }
 
@@ -1165,17 +1165,17 @@ public override async Task Update_Except_set_constant(bool async)
 
         AssertExecuteUpdateSql(
 """
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c1`
 INNER JOIN (
+    SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
+    EXCEPT
     SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
     FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
-    EXCEPT
-    SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`
-    FROM `Customers` AS `c1`
-    WHERE `c1`.`CustomerID` LIKE 'A%'
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+    WHERE `c0`.`CustomerID` LIKE 'A%'
+) AS `e` ON `c1`.`CustomerID` = `e`.`CustomerID`
+SET `c1`.`ContactName` = 'Updated'
 """);
     }
 
@@ -1185,17 +1185,17 @@ public override async Task Update_Intersect_set_constant(bool async)
 
         AssertExecuteUpdateSql(
 """
-UPDATE `Customers` AS `c`
+UPDATE `Customers` AS `c1`
 INNER JOIN (
+    SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+    FROM `Customers` AS `c`
+    WHERE `c`.`CustomerID` LIKE 'F%'
+    INTERSECT
     SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
     FROM `Customers` AS `c0`
-    WHERE `c0`.`CustomerID` LIKE 'F%'
-    INTERSECT
-    SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`
-    FROM `Customers` AS `c1`
-    WHERE `c1`.`CustomerID` LIKE 'A%'
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
-SET `c`.`ContactName` = 'Updated'
+    WHERE `c0`.`CustomerID` LIKE 'A%'
+) AS `i` ON `c1`.`CustomerID` = `i`.`CustomerID`
+SET `c1`.`ContactName` = 'Updated'
 """);
     }
 
@@ -1207,10 +1207,10 @@ public override async Task Update_with_join_set_constant(bool async)
 """
 UPDATE `Customers` AS `c`
 INNER JOIN (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+    SELECT `o`.`CustomerID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10300
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
+) AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
 SET `c`.`ContactName` = 'Updated'
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
@@ -1224,10 +1224,10 @@ public override async Task Update_with_left_join_set_constant(bool async)
 """
 UPDATE `Customers` AS `c`
 LEFT JOIN (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+    SELECT `o`.`CustomerID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10300
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
+) AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
 SET `c`.`ContactName` = 'Updated'
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
@@ -1241,10 +1241,10 @@ public override async Task Update_with_cross_join_set_constant(bool async)
 """
 UPDATE `Customers` AS `c`
 CROSS JOIN (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+    SELECT 1
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10300
-) AS `t`
+) AS `o0`
 SET `c`.`ContactName` = 'Updated'
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
@@ -1258,10 +1258,10 @@ public override async Task Update_with_cross_apply_set_constant(bool async)
 """
 UPDATE `Customers` AS `c`
 JOIN LATERAL (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+    SELECT 1
     FROM `Orders` AS `o`
     WHERE (`o`.`OrderID` < 10300) AND (EXTRACT(year FROM `o`.`OrderDate`) < CHAR_LENGTH(`c`.`ContactName`))
-) AS `t` ON TRUE
+) AS `o0` ON TRUE
 SET `c`.`ContactName` = 'Updated'
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
@@ -1275,10 +1275,10 @@ public override async Task Update_with_outer_apply_set_constant(bool async)
 """
 UPDATE `Customers` AS `c`
 LEFT JOIN LATERAL (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+    SELECT 1
     FROM `Orders` AS `o`
     WHERE (`o`.`OrderID` < 10300) AND (EXTRACT(year FROM `o`.`OrderDate`) < CHAR_LENGTH(`c`.`ContactName`))
-) AS `t` ON TRUE
+) AS `o0` ON TRUE
 SET `c`.`ContactName` = 'Updated'
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
@@ -1292,15 +1292,15 @@ public override async Task Update_with_cross_join_left_join_set_constant(bool as
 """
 UPDATE `Customers` AS `c`
 CROSS JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+    SELECT 1
     FROM `Customers` AS `c0`
     WHERE `c0`.`City` LIKE 'S%'
-) AS `t`
+) AS `c1`
 LEFT JOIN (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+    SELECT `o`.`CustomerID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10300
-) AS `t0` ON `c`.`CustomerID` = `t0`.`CustomerID`
+) AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
 SET `c`.`ContactName` = 'Updated'
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
@@ -1314,15 +1314,15 @@ public override async Task Update_with_cross_join_cross_apply_set_constant(bool
 """
 UPDATE `Customers` AS `c`
 CROSS JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+    SELECT 1
     FROM `Customers` AS `c0`
     WHERE `c0`.`City` LIKE 'S%'
-) AS `t`
+) AS `c1`
 JOIN LATERAL (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+    SELECT 1
     FROM `Orders` AS `o`
     WHERE (`o`.`OrderID` < 10300) AND (EXTRACT(year FROM `o`.`OrderDate`) < CHAR_LENGTH(`c`.`ContactName`))
-) AS `t0` ON TRUE
+) AS `o0` ON TRUE
 SET `c`.`ContactName` = 'Updated'
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
@@ -1336,15 +1336,15 @@ public override async Task Update_with_cross_join_outer_apply_set_constant(bool
 """
 UPDATE `Customers` AS `c`
 CROSS JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+    SELECT 1
     FROM `Customers` AS `c0`
     WHERE `c0`.`City` LIKE 'S%'
-) AS `t`
+) AS `c1`
 LEFT JOIN LATERAL (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+    SELECT 1
     FROM `Orders` AS `o`
     WHERE (`o`.`OrderID` < 10300) AND (EXTRACT(year FROM `o`.`OrderDate`) < CHAR_LENGTH(`c`.`ContactName`))
-) AS `t0` ON TRUE
+) AS `o0` ON TRUE
 SET `c`.`ContactName` = 'Updated'
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
@@ -1363,18 +1363,18 @@ public override async Task Update_Where_SelectMany_subquery_set_null(bool async)
 
         AssertExecuteUpdateSql(
 """
-UPDATE `Orders` AS `o`
+UPDATE `Orders` AS `o1`
 INNER JOIN (
-    SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`
+    SELECT `o0`.`OrderID`
     FROM `Customers` AS `c`
     INNER JOIN (
-        SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
-        FROM `Orders` AS `o0`
-        WHERE EXTRACT(year FROM `o0`.`OrderDate`) = 1997
-    ) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
+        SELECT `o`.`OrderID`, `o`.`CustomerID`
+        FROM `Orders` AS `o`
+        WHERE EXTRACT(year FROM `o`.`OrderDate`) = 1997
+    ) AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
     WHERE `c`.`CustomerID` LIKE 'F%'
-) AS `t0` ON `o`.`OrderID` = `t0`.`OrderID`
-SET `o`.`OrderDate` = NULL
+) AS `s` ON `o1`.`OrderID` = `s`.`OrderID`
+SET `o1`.`OrderDate` = NULL
 """);
     }
 
@@ -1403,11 +1403,11 @@ public override async Task Update_Where_Join_set_property_from_joined_table(bool
 """
 UPDATE `Customers` AS `c`
 CROSS JOIN (
-    SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+    SELECT `c0`.`City`
     FROM `Customers` AS `c0`
     WHERE `c0`.`CustomerID` = 'ALFKI'
-) AS `t`
-SET `c`.`City` = `t`.`City`
+) AS `c1`
+SET `c`.`City` = `c1`.`City`
 WHERE `c`.`CustomerID` LIKE 'F%'
 """);
     }
diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesMySqlTest.cs
index b1a4e9d84..2a7aab5d6 100644
--- a/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesMySqlTest.cs
@@ -51,13 +51,13 @@ public override async Task Delete_where_using_hierarchy(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM (
-        SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
+        SELECT `e`.`CountryId`
         FROM `Eagle` AS `e`
         UNION ALL
-        SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
+        SELECT `k`.`CountryId`
         FROM `Kiwi` AS `k`
-    ) AS `t`
-    WHERE ((`t`.`CountryId` = 1) AND (`c`.`Id` = `t`.`CountryId`)) AND (`t`.`CountryId` > 0)) > 0
+    ) AS `u`
+    WHERE ((`u`.`CountryId` = 1) AND (`c`.`Id` = `u`.`CountryId`)) AND (`u`.`CountryId` > 0)) > 0
 """);
     }
 
@@ -72,10 +72,10 @@ public override async Task Delete_where_using_hierarchy_derived(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM (
-        SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
+        SELECT `k`.`CountryId`
         FROM `Kiwi` AS `k`
-    ) AS `t`
-    WHERE ((`t`.`CountryId` = 1) AND (`c`.`Id` = `t`.`CountryId`)) AND (`t`.`CountryId` > 0)) > 0
+    ) AS `u`
+    WHERE ((`u`.`CountryId` = 1) AND (`c`.`Id` = `u`.`CountryId`)) AND (`u`.`CountryId` > 0)) > 0
 """);
     }
 
@@ -132,13 +132,13 @@ public override async Task Update_where_using_hierarchy(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM (
-        SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
+        SELECT `e`.`CountryId`
         FROM `Eagle` AS `e`
         UNION ALL
-        SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
+        SELECT `k`.`CountryId`
         FROM `Kiwi` AS `k`
-    ) AS `t`
-    WHERE ((`t`.`CountryId` = 1) AND (`c`.`Id` = `t`.`CountryId`)) AND (`t`.`CountryId` > 0)) > 0
+    ) AS `u`
+    WHERE ((`u`.`CountryId` = 1) AND (`c`.`Id` = `u`.`CountryId`)) AND (`u`.`CountryId` > 0)) > 0
 """);
     }
 
@@ -153,10 +153,10 @@ public override async Task Update_where_using_hierarchy_derived(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM (
-        SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
+        SELECT `k`.`CountryId`
         FROM `Kiwi` AS `k`
-    ) AS `t`
-    WHERE ((`t`.`CountryId` = 1) AND (`c`.`Id` = `t`.`CountryId`)) AND (`t`.`CountryId` > 0)) > 0
+    ) AS `u`
+    WHERE ((`u`.`CountryId` = 1) AND (`c`.`Id` = `u`.`CountryId`)) AND (`u`.`CountryId` > 0)) > 0
 """);
     }
 
@@ -173,15 +173,15 @@ public override async Task Update_base_type(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`Group`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE (`t`.`CountryId` = 1) AND (`t`.`Name` = 'Great spotted kiwi')
+) AS `u`
+WHERE (`u`.`CountryId` = 1) AND (`u`.`Name` = 'Great spotted kiwi')
 """);
     }
 
@@ -191,12 +191,12 @@ public override async Task Update_base_type_with_OfType(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
+) AS `u`
+WHERE `u`.`CountryId` = 1
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesMySqlTest.cs
index 289f70bc7..40d0bf351 100644
--- a/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesMySqlTest.cs
@@ -50,13 +50,13 @@ public override async Task Delete_where_using_hierarchy(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM (
-        SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
+        SELECT `e`.`CountryId`
         FROM `Eagle` AS `e`
         UNION ALL
-        SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
+        SELECT `k`.`CountryId`
         FROM `Kiwi` AS `k`
-    ) AS `t`
-    WHERE (`c`.`Id` = `t`.`CountryId`) AND (`t`.`CountryId` > 0)) > 0
+    ) AS `u`
+    WHERE (`c`.`Id` = `u`.`CountryId`) AND (`u`.`CountryId` > 0)) > 0
 """);
     }
 
@@ -71,10 +71,10 @@ public override async Task Delete_where_using_hierarchy_derived(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM (
-        SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
+        SELECT `k`.`CountryId`
         FROM `Kiwi` AS `k`
-    ) AS `t`
-    WHERE (`c`.`Id` = `t`.`CountryId`) AND (`t`.`CountryId` > 0)) > 0
+    ) AS `u`
+    WHERE (`c`.`Id` = `u`.`CountryId`) AND (`u`.`CountryId` > 0)) > 0
 """);
     }
 
@@ -131,13 +131,13 @@ public override async Task Update_where_using_hierarchy(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM (
-        SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
+        SELECT `e`.`CountryId`
         FROM `Eagle` AS `e`
         UNION ALL
-        SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
+        SELECT `k`.`CountryId`
         FROM `Kiwi` AS `k`
-    ) AS `t`
-    WHERE (`c`.`Id` = `t`.`CountryId`) AND (`t`.`CountryId` > 0)) > 0
+    ) AS `u`
+    WHERE (`c`.`Id` = `u`.`CountryId`) AND (`u`.`CountryId` > 0)) > 0
 """);
     }
 
@@ -152,10 +152,10 @@ public override async Task Update_where_using_hierarchy_derived(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM (
-        SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
+        SELECT `k`.`CountryId`
         FROM `Kiwi` AS `k`
-    ) AS `t`
-    WHERE (`c`.`Id` = `t`.`CountryId`) AND (`t`.`CountryId` > 0)) > 0
+    ) AS `u`
+    WHERE (`c`.`Id` = `u`.`CountryId`) AND (`u`.`CountryId` > 0)) > 0
 """);
     }
 
@@ -172,15 +172,15 @@ public override async Task Update_base_type(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`Group`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`Name` = 'Great spotted kiwi'
+) AS `u`
+WHERE `u`.`Name` = 'Great spotted kiwi'
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesMySqlTest.cs
index 5ce0722d0..5c3f4220f 100644
--- a/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesMySqlTest.cs
@@ -46,9 +46,6 @@ public override async Task Delete_where_using_hierarchy(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM `Animals` AS `a`
-    LEFT JOIN `Birds` AS `b` ON `a`.`Id` = `b`.`Id`
-    LEFT JOIN `Eagle` AS `e` ON `a`.`Id` = `e`.`Id`
-    LEFT JOIN `Kiwi` AS `k` ON `a`.`Id` = `k`.`Id`
     WHERE ((`a`.`CountryId` = 1) AND (`c`.`Id` = `a`.`CountryId`)) AND (`a`.`CountryId` > 0)) > 0
 """);
     }
@@ -64,8 +61,6 @@ public override async Task Delete_where_using_hierarchy_derived(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM `Animals` AS `a`
-    LEFT JOIN `Birds` AS `b` ON `a`.`Id` = `b`.`Id`
-    LEFT JOIN `Eagle` AS `e` ON `a`.`Id` = `e`.`Id`
     LEFT JOIN `Kiwi` AS `k` ON `a`.`Id` = `k`.`Id`
     WHERE (((`a`.`CountryId` = 1) AND (`c`.`Id` = `a`.`CountryId`)) AND `k`.`Id` IS NOT NULL) AND (`a`.`CountryId` > 0)) > 0
 """);
@@ -124,9 +119,6 @@ public override async Task Update_where_using_hierarchy(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM `Animals` AS `a`
-    LEFT JOIN `Birds` AS `b` ON `a`.`Id` = `b`.`Id`
-    LEFT JOIN `Eagle` AS `e` ON `a`.`Id` = `e`.`Id`
-    LEFT JOIN `Kiwi` AS `k` ON `a`.`Id` = `k`.`Id`
     WHERE ((`a`.`CountryId` = 1) AND (`c`.`Id` = `a`.`CountryId`)) AND (`a`.`CountryId` > 0)) > 0
 """);
     }
@@ -142,8 +134,6 @@ public override async Task Update_where_using_hierarchy_derived(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM `Animals` AS `a`
-    LEFT JOIN `Birds` AS `b` ON `a`.`Id` = `b`.`Id`
-    LEFT JOIN `Eagle` AS `e` ON `a`.`Id` = `e`.`Id`
     LEFT JOIN `Kiwi` AS `k` ON `a`.`Id` = `k`.`Id`
     WHERE (((`a`.`CountryId` = 1) AND (`c`.`Id` = `a`.`CountryId`)) AND `k`.`Id` IS NOT NULL) AND (`a`.`CountryId` > 0)) > 0
 """);
diff --git a/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesMySqlTest.cs
index daba6724b..37e1f31c1 100644
--- a/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesMySqlTest.cs
@@ -101,9 +101,6 @@ public override async Task Update_where_using_hierarchy(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM `Animals` AS `a`
-    LEFT JOIN `Birds` AS `b` ON `a`.`Id` = `b`.`Id`
-    LEFT JOIN `Eagle` AS `e` ON `a`.`Id` = `e`.`Id`
-    LEFT JOIN `Kiwi` AS `k` ON `a`.`Id` = `k`.`Id`
     WHERE (`c`.`Id` = `a`.`CountryId`) AND (`a`.`CountryId` > 0)) > 0
 """);
     }
@@ -119,8 +116,6 @@ public override async Task Update_where_using_hierarchy_derived(bool async)
 WHERE (
     SELECT COUNT(*)
     FROM `Animals` AS `a`
-    LEFT JOIN `Birds` AS `b` ON `a`.`Id` = `b`.`Id`
-    LEFT JOIN `Eagle` AS `e` ON `a`.`Id` = `e`.`Id`
     LEFT JOIN `Kiwi` AS `k` ON `a`.`Id` = `k`.`Id`
     WHERE ((`c`.`Id` = `a`.`CountryId`) AND `k`.`Id` IS NOT NULL) AND (`a`.`CountryId` > 0)) > 0
 """);
diff --git a/test/EFCore.MySql.FunctionalTests/EFCore.MySql.FunctionalTests.csproj b/test/EFCore.MySql.FunctionalTests/EFCore.MySql.FunctionalTests.csproj
index 3762cf72e..668dae678 100644
--- a/test/EFCore.MySql.FunctionalTests/EFCore.MySql.FunctionalTests.csproj
+++ b/test/EFCore.MySql.FunctionalTests/EFCore.MySql.FunctionalTests.csproj
@@ -19,6 +19,11 @@
     <DefineConstants Condition="'$(SpecificTestOrder)' == 'true'">$(DefineConstants);SPECIFIC_TEST_ORDER</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Scaffolding\Baselines\**\*" />
+    <None Include="Scaffolding\Baselines\**\*" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\Shared\**\*.cs" />
   </ItemGroup>
diff --git a/test/EFCore.MySql.FunctionalTests/MaterializationInterceptionMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/MaterializationInterceptionMySqlTest.cs
index e4a2b2cd9..7b0d95e58 100644
--- a/test/EFCore.MySql.FunctionalTests/MaterializationInterceptionMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/MaterializationInterceptionMySqlTest.cs
@@ -1,23 +1,11 @@
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.TestUtilities;
-using Microsoft.Extensions.DependencyInjection;
 using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
-using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
-using Xunit;
 
 namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests;
 
-public class MaterializationInterceptionMySqlTest : MaterializationInterceptionTestBase<MaterializationInterceptionMySqlTest.MySqlLibraryContext>,
-    IClassFixture<MaterializationInterceptionMySqlTest.MaterializationInterceptionMySqlFixture>
+public class MaterializationInterceptionMySqlTest : MaterializationInterceptionTestBase<MaterializationInterceptionMySqlTest.MySqlLibraryContext>
 {
-    public MaterializationInterceptionMySqlTest(MaterializationInterceptionMySqlFixture fixture)
-        : base(fixture)
-    {
-    }
-
     public class MySqlLibraryContext : LibraryContext
     {
         public MySqlLibraryContext(DbContextOptions options)
@@ -36,27 +24,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         }
     }
 
-    public override LibraryContext CreateContext(IEnumerable<ISingletonInterceptor> interceptors, bool inject)
-        => new MySqlLibraryContext(Fixture.CreateOptions(interceptors, inject));
-
-    public class MaterializationInterceptionMySqlFixture : SingletonInterceptorsFixtureBase
-    {
-        protected override string StoreName
-            => "MaterializationInterception";
-
-        protected override ITestStoreFactory TestStoreFactory
-            => MySqlTestStoreFactory.Instance;
-
-        protected override IServiceCollection InjectInterceptors(
-            IServiceCollection serviceCollection,
-            IEnumerable<ISingletonInterceptor> injectedInterceptors)
-            => base.InjectInterceptors(serviceCollection.AddEntityFrameworkMySql(), injectedInterceptors);
-
-        public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-        {
-            new MySqlDbContextOptionsBuilder(base.AddOptions(builder))
-                .ExecutionStrategy(d => new MySqlExecutionStrategy(d));
-            return builder;
-        }
-    }
+    protected override ITestStoreFactory TestStoreFactory
+        => MySqlTestStoreFactory.Instance;
 }
diff --git a/test/EFCore.MySql.FunctionalTests/MigrationsInfrastructureMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/MigrationsInfrastructureMySqlTest.cs
index d6fb04be0..ba0b81774 100644
--- a/test/EFCore.MySql.FunctionalTests/MigrationsInfrastructureMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/MigrationsInfrastructureMySqlTest.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.TestUtilities;
+using MySqlConnector;
 using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
 using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
 using Pomelo.EntityFrameworkCore.MySql.Tests.TestUtilities.Attributes;
@@ -66,6 +68,7 @@ public override void Can_generate_up_scripts()
 CREATE TABLE `Table1` (
     `Id` int NOT NULL,
     `Foo` int NOT NULL,
+    `Description` longtext NOT NULL,
     CONSTRAINT `PK_Table1` PRIMARY KEY (`Id`)
 );
 
@@ -90,6 +93,51 @@ public override void Can_generate_up_scripts()
 
 COMMIT;
 
+START TRANSACTION;
+
+INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+VALUES ('00000000000004_Migration4', '7.0.0-test');
+
+COMMIT;
+
+START TRANSACTION;
+
+INSERT INTO Table1 (Id, Bar, Description) VALUES (-1, ' ', 'Value With
+
+Empty Lines')
+
+INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+VALUES ('00000000000005_Migration5', '7.0.0-test');
+
+COMMIT;
+
+START TRANSACTION;
+
+INSERT INTO Table1 (Id, Bar, Description) VALUES (-2, ' ', 'GO
+Value With
+
+Empty Lines')
+
+INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+VALUES ('00000000000006_Migration6', '7.0.0-test');
+
+COMMIT;
+
+START TRANSACTION;
+
+INSERT INTO Table1 (Id, Bar, Description) VALUES (-3, ' ', 'GO
+Value With
+
+GO
+
+Empty Lines
+GO')
+
+INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+VALUES ('00000000000007_Migration7', '7.0.0-test');
+
+COMMIT;
+
 ",
                 Sql,
                 ignoreLineEndingDifferences: true);
@@ -154,6 +202,7 @@ IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000
     CREATE TABLE `Table1` (
         `Id` int NOT NULL,
         `Foo` int NOT NULL,
+        `Description` longtext NOT NULL,
         CONSTRAINT `PK_Table1` PRIMARY KEY (`Id`)
     );
 
@@ -232,6 +281,135 @@ IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000
 
 COMMIT;
 
+START TRANSACTION;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000004_Migration4') THEN
+
+    INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+    VALUES ('00000000000004_Migration4', '7.0.0-test');
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+COMMIT;
+
+START TRANSACTION;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000005_Migration5') THEN
+
+    INSERT INTO Table1 (Id, Bar, Description) VALUES (-1, ' ', 'Value With
+
+    Empty Lines')
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000005_Migration5') THEN
+
+    INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+    VALUES ('00000000000005_Migration5', '7.0.0-test');
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+COMMIT;
+
+START TRANSACTION;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000006_Migration6') THEN
+
+    INSERT INTO Table1 (Id, Bar, Description) VALUES (-2, ' ', 'GO
+    Value With
+
+    Empty Lines')
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000006_Migration6') THEN
+
+    INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+    VALUES ('00000000000006_Migration6', '7.0.0-test');
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+COMMIT;
+
+START TRANSACTION;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000007_Migration7') THEN
+
+    INSERT INTO Table1 (Id, Bar, Description) VALUES (-3, ' ', 'GO
+    Value With
+
+    GO
+
+    Empty Lines
+    GO')
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000007_Migration7') THEN
+
+    INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+    VALUES ('00000000000007_Migration7', '7.0.0-test');
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+COMMIT;
+
 ",
                 Sql,
                 ignoreLineEndingDifferences: true);
@@ -400,6 +578,7 @@ public override void Can_generate_up_scripts_noTransactions()
 CREATE TABLE `Table1` (
     `Id` int NOT NULL,
     `Foo` int NOT NULL,
+    `Description` longtext NOT NULL,
     CONSTRAINT `PK_Table1` PRIMARY KEY (`Id`)
 );
 
@@ -414,6 +593,35 @@ public override void Can_generate_up_scripts_noTransactions()
 INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
 VALUES ('00000000000003_Migration3', '7.0.0-test');
 
+INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+VALUES ('00000000000004_Migration4', '7.0.0-test');
+
+INSERT INTO Table1 (Id, Bar, Description) VALUES (-1, ' ', 'Value With
+
+Empty Lines')
+
+INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+VALUES ('00000000000005_Migration5', '7.0.0-test');
+
+INSERT INTO Table1 (Id, Bar, Description) VALUES (-2, ' ', 'GO
+Value With
+
+Empty Lines')
+
+INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+VALUES ('00000000000006_Migration6', '7.0.0-test');
+
+INSERT INTO Table1 (Id, Bar, Description) VALUES (-3, ' ', 'GO
+Value With
+
+GO
+
+Empty Lines
+GO')
+
+INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+VALUES ('00000000000007_Migration7', '7.0.0-test');
+
 ",
                 Sql,
                 ignoreLineEndingDifferences: true);
@@ -439,6 +647,7 @@ IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000
     CREATE TABLE `Table1` (
         `Id` int NOT NULL,
         `Foo` int NOT NULL,
+        `Description` longtext NOT NULL,
         CONSTRAINT `PK_Table1` PRIMARY KEY (`Id`)
     );
 
@@ -507,6 +716,119 @@ IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000
 CALL MigrationsScript();
 DROP PROCEDURE MigrationsScript;
 
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000004_Migration4') THEN
+
+    INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+    VALUES ('00000000000004_Migration4', '7.0.0-test');
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000005_Migration5') THEN
+
+    INSERT INTO Table1 (Id, Bar, Description) VALUES (-1, ' ', 'Value With
+
+    Empty Lines')
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000005_Migration5') THEN
+
+    INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+    VALUES ('00000000000005_Migration5', '7.0.0-test');
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000006_Migration6') THEN
+
+    INSERT INTO Table1 (Id, Bar, Description) VALUES (-2, ' ', 'GO
+    Value With
+
+    Empty Lines')
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000006_Migration6') THEN
+
+    INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+    VALUES ('00000000000006_Migration6', '7.0.0-test');
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000007_Migration7') THEN
+
+    INSERT INTO Table1 (Id, Bar, Description) VALUES (-3, ' ', 'GO
+    Value With
+
+    GO
+
+    Empty Lines
+    GO')
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
+DROP PROCEDURE IF EXISTS MigrationsScript;
+DELIMITER //
+CREATE PROCEDURE MigrationsScript()
+BEGIN
+    IF NOT EXISTS(SELECT 1 FROM `__EFMigrationsHistory` WHERE `MigrationId` = '00000000000007_Migration7') THEN
+
+    INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`)
+    VALUES ('00000000000007_Migration7', '7.0.0-test');
+
+    END IF;
+END //
+DELIMITER ;
+CALL MigrationsScript();
+DROP PROCEDURE MigrationsScript;
+
 ",
                 Sql,
                 ignoreLineEndingDifferences: true);
@@ -536,6 +858,21 @@ public override void Can_diff_against_2_1_ASP_NET_Identity_model()
             throw new NotImplementedException();
         }
 
+        public override void Can_apply_all_migrations()
+            => Assert.Throws<MySqlException>(() => base.Can_apply_all_migrations());
+
+        public override void Can_apply_range_of_migrations()
+            => Assert.Throws<MySqlException>(() => base.Can_apply_range_of_migrations());
+
+        public override void Can_revert_all_migrations()
+            => Assert.Throws<MySqlException>(() => base.Can_revert_all_migrations());
+
+        public override void Can_revert_one_migrations()
+            => Assert.Throws<MySqlException>(() => base.Can_revert_one_migrations());
+
+        public override Task Can_apply_all_migrations_async()
+            => Assert.ThrowsAsync<MySqlException>(() => base.Can_apply_all_migrations_async());
+
         public class MigrationsInfrastructureMySqlFixture : MigrationsInfrastructureFixtureBase
         {
             protected override ITestStoreFactory TestStoreFactory
diff --git a/test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs
index 852f21bd7..462ede9f9 100644
--- a/test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs
@@ -1302,6 +1302,43 @@ public override Task Rename_table()
                 },
                 withConventions: false);
 
+        #region ToJson
+
+        public override Task Create_table_with_json_column()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Create_table_with_json_column());
+
+        public override Task Create_table_with_json_column_explicit_json_column_names()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Create_table_with_json_column_explicit_json_column_names());
+
+        public override Task Rename_table_with_json_column()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Rename_table_with_json_column());
+
+        public override Task Add_json_columns_to_existing_table()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Add_json_columns_to_existing_table());
+
+        public override Task Convert_json_entities_to_regular_owned()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Convert_json_entities_to_regular_owned());
+
+        public override Task Convert_regular_owned_entities_to_json()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Convert_regular_owned_entities_to_json());
+
+        public override Task Convert_string_column_to_a_json_column_containing_reference()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Convert_string_column_to_a_json_column_containing_reference());
+
+        public override Task Convert_string_column_to_a_json_column_containing_required_reference()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Convert_string_column_to_a_json_column_containing_required_reference());
+
+        public override Task Convert_string_column_to_a_json_column_containing_collection()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Convert_string_column_to_a_json_column_containing_collection());
+
+        public override Task Drop_json_columns_from_existing_table()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Drop_json_columns_from_existing_table());
+
+        public override Task Rename_json_column()
+            => Assert.ThrowsAsync<NullReferenceException>(() => base.Rename_json_column());
+
+        #endregion ToJson
+
         // The constraint name for a primary key is always PRIMARY in MySQL.
         protected override bool AssertConstraintNames
             => false;
diff --git a/test/EFCore.MySql.FunctionalTests/ModelBuilding/MySqlModelBuilderGenericTest.cs b/test/EFCore.MySql.FunctionalTests/ModelBuilding/MySqlModelBuilderGenericTest.cs
new file mode 100644
index 000000000..db031080d
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/ModelBuilding/MySqlModelBuilderGenericTest.cs
@@ -0,0 +1,69 @@
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ModelBuilding;
+using Xunit;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.ModelBuilding;
+
+public class MySqlModelBuilderGenericTest : MySqlModelBuilderTestBase
+{
+    public class MySqlGenericNonRelationship(MySqlModelBuilderFixture fixture) : MySqlNonRelationship(fixture)
+    {
+        protected override TestModelBuilder CreateModelBuilder(
+            Action<ModelConfigurationBuilder> configure)
+            => new ModelBuilderTest.GenericTestModelBuilder(Fixture, configure);
+    }
+
+    public class MySqlGenericComplexType(MySqlModelBuilderFixture fixture) : MySqlComplexType(fixture)
+    {
+        protected override TestModelBuilder CreateModelBuilder(
+            Action<ModelConfigurationBuilder> configure)
+            => new ModelBuilderTest.GenericTestModelBuilder(Fixture, configure);
+    }
+
+    public class MySqlGenericInheritance(MySqlModelBuilderFixture fixture) : MySqlInheritance(fixture)
+    {
+        protected override TestModelBuilder CreateModelBuilder(
+            Action<ModelConfigurationBuilder> configure)
+            => new ModelBuilderTest.GenericTestModelBuilder(Fixture, configure);
+    }
+
+    public class MySqlGenericOneToMany(MySqlModelBuilderFixture fixture) : MySqlOneToMany(fixture)
+    {
+        protected override TestModelBuilder CreateModelBuilder(
+            Action<ModelConfigurationBuilder> configure)
+            => new ModelBuilderTest.GenericTestModelBuilder(Fixture, configure);
+    }
+
+    public class MySqlGenericManyToOne(MySqlModelBuilderFixture fixture) : MySqlManyToOne(fixture)
+    {
+        protected override TestModelBuilder CreateModelBuilder(
+            Action<ModelConfigurationBuilder> configure)
+            => new ModelBuilderTest.GenericTestModelBuilder(Fixture, configure);
+    }
+
+    public class MySqlGenericOneToOne(MySqlModelBuilderFixture fixture) : MySqlOneToOne(fixture)
+    {
+        protected override TestModelBuilder CreateModelBuilder(
+            Action<ModelConfigurationBuilder> configure)
+            => new ModelBuilderTest.GenericTestModelBuilder(Fixture, configure);
+    }
+
+    public class MySqlGenericManyToMany(MySqlModelBuilderFixture fixture) : MySqlManyToMany(fixture)
+    {
+        protected override TestModelBuilder CreateModelBuilder(
+            Action<ModelConfigurationBuilder> configure)
+            => new ModelBuilderTest.GenericTestModelBuilder(Fixture, configure);
+    }
+
+    public class MySqlGenericOwnedTypes(MySqlModelBuilderFixture fixture) : MySqlOwnedTypes(fixture)
+    {
+        // MySQL stored procedures do not support result columns.
+        public override void Can_use_sproc_mapping_with_owned_reference()
+            => Assert.Throws<InvalidOperationException>(() => base.Can_use_sproc_mapping_with_owned_reference());
+
+        protected override TestModelBuilder CreateModelBuilder(
+            Action<ModelConfigurationBuilder> configure)
+            => new ModelBuilderTest.GenericTestModelBuilder(Fixture, configure);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/ModelBuilding/MySqlModelBuilderTestBase.cs b/test/EFCore.MySql.FunctionalTests/ModelBuilding/MySqlModelBuilderTestBase.cs
new file mode 100644
index 000000000..e1949703c
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/ModelBuilding/MySqlModelBuilderTestBase.cs
@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.ModelBuilding;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+using Xunit;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.ModelBuilding;
+
+public class MySqlModelBuilderTestBase : RelationalModelBuilderTest
+{
+    public abstract class MySqlNonRelationship(MySqlModelBuilderFixture fixture)
+        : RelationalNonRelationshipTestBase(fixture), IClassFixture<MySqlModelBuilderFixture>;
+
+    public abstract class MySqlComplexType(MySqlModelBuilderFixture fixture)
+        : RelationalComplexTypeTestBase(fixture), IClassFixture<MySqlModelBuilderFixture>;
+
+    public abstract class MySqlInheritance(MySqlModelBuilderFixture fixture)
+        : RelationalInheritanceTestBase(fixture), IClassFixture<MySqlModelBuilderFixture>;
+
+    public abstract class MySqlOneToMany(MySqlModelBuilderFixture fixture)
+        : RelationalOneToManyTestBase(fixture), IClassFixture<MySqlModelBuilderFixture>;
+
+    public abstract class MySqlManyToOne(MySqlModelBuilderFixture fixture)
+        : RelationalManyToOneTestBase(fixture), IClassFixture<MySqlModelBuilderFixture>;
+
+    public abstract class MySqlOneToOne(MySqlModelBuilderFixture fixture)
+        : RelationalOneToOneTestBase(fixture), IClassFixture<MySqlModelBuilderFixture>;
+
+    public abstract class MySqlManyToMany(MySqlModelBuilderFixture fixture)
+        : RelationalManyToManyTestBase(fixture), IClassFixture<MySqlModelBuilderFixture>;
+
+    public abstract class MySqlOwnedTypes(MySqlModelBuilderFixture fixture)
+        : RelationalOwnedTypesTestBase(fixture), IClassFixture<MySqlModelBuilderFixture>;
+
+    public class MySqlModelBuilderFixture : RelationalModelBuilderFixture
+    {
+        public override TestHelpers TestHelpers
+            => MySqlTestHelpers.Instance;
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs b/test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs
index 6d6706849..65753ad2a 100644
--- a/test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs
@@ -22,7 +22,7 @@ public class MySqlComplianceTest : RelationalComplianceTestBase
             typeof(LoggingRelationalTestBase<,>),
 
             // We have our own JSON support for now
-            typeof(JsonQueryAdHocTestBase),
+            typeof(AdHocJsonQueryTestBase),
             typeof(JsonQueryTestBase<>),
             typeof(JsonTypesRelationalTestBase),
             typeof(JsonTypesTestBase),
diff --git a/test/EFCore.MySql.FunctionalTests/Query/AdHocAdvancedMappingsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AdHocAdvancedMappingsQueryMySqlTest.cs
new file mode 100644
index 000000000..5b413d4b7
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Query/AdHocAdvancedMappingsQueryMySqlTest.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+using Xunit;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query;
+
+public class AdHocAdvancedMappingsQueryMySqlTest : AdHocAdvancedMappingsQueryRelationalTestBase
+{
+    [SkippableTheory]
+    public override async Task Query_generates_correct_datetime2_parameter_definition(int? fractionalSeconds, string postfix)
+    {
+        Skip.If(fractionalSeconds > 6, "MySQL has a max. DateTime precision of 6.");
+
+        await base.Query_generates_correct_datetime2_parameter_definition(fractionalSeconds, postfix);
+    }
+
+    [SkippableTheory]
+    public override async Task Query_generates_correct_datetimeoffset_parameter_definition(int? fractionalSeconds, string postfix)
+    {
+        Skip.If(fractionalSeconds > 6, "MySQL has a max. DateTimeOffset precision of 6.");
+
+        await base.Query_generates_correct_datetimeoffset_parameter_definition(fractionalSeconds, postfix);
+    }
+
+    [SkippableTheory]
+    public override async Task Query_generates_correct_timespan_parameter_definition(int? fractionalSeconds, string postfix)
+    {
+        Skip.If(fractionalSeconds > 6, "MySQL has a max. TimeSpan precision of 6.");
+
+        await base.Query_generates_correct_timespan_parameter_definition(fractionalSeconds, postfix);
+    }
+
+    protected override ITestStoreFactory TestStoreFactory
+        => MySqlTestStoreFactory.Instance;
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/AdHocJsonQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AdHocJsonQueryMySqlTest.cs
new file mode 100644
index 000000000..fd8349a93
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Query/AdHocJsonQueryMySqlTest.cs
@@ -0,0 +1,272 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+using Xunit;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query;
+
+// Disabled via internal access. The EF Core 7.0 JSON support isn't currently implemented.
+internal class AdHocJsonQueryMySqlTest : AdHocJsonQueryTestBase
+{
+    protected override ITestStoreFactory TestStoreFactory
+        => MySqlTestStoreFactory.Instance;
+
+    protected override void Seed29219(MyContext29219 ctx)
+    {
+        var entity1 = new MyEntity29219
+        {
+            Id = 1,
+            Reference = new MyJsonEntity29219 { NonNullableScalar = 10, NullableScalar = 11 },
+            Collection =
+            [
+                new() { NonNullableScalar = 100, NullableScalar = 101 },
+                new() { NonNullableScalar = 200, NullableScalar = 201 },
+                new() { NonNullableScalar = 300, NullableScalar = null }
+            ]
+        };
+
+        var entity2 = new MyEntity29219
+        {
+            Id = 2,
+            Reference = new MyJsonEntity29219 { NonNullableScalar = 20, NullableScalar = null },
+            Collection = [new() { NonNullableScalar = 1001, NullableScalar = null }]
+        };
+
+        ctx.Entities.AddRange(entity1, entity2);
+        ctx.SaveChanges();
+
+        ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Id`, `Reference`, `Collection`)
+VALUES(3, '{{ "NonNullableScalar" : 30 }}', '[{{ "NonNullableScalar" : 10001 }}]')
+""");
+    }
+
+    protected override void Seed30028(MyContext30028 ctx)
+    {
+        // complete
+        ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Id`, `Json`)
+VALUES(
+1,
+'{{"RootName":"e1","Collection":[{{"BranchName":"e1 c1","Nested":{{"LeafName":"e1 c1 l"}}}},{{"BranchName":"e1 c2","Nested":{{"LeafName":"e1 c2 l"}}}}],"OptionalReference":{{"BranchName":"e1 or","Nested":{{"LeafName":"e1 or l"}}}},"RequiredReference":{{"BranchName":"e1 rr","Nested":{{"LeafName":"e1 rr l"}}}}}}')
+""");
+
+        // missing collection
+        ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Id`, `Json`)
+VALUES(
+2,
+'{{"RootName":"e2","OptionalReference":{{"BranchName":"e2 or","Nested":{{"LeafName":"e2 or l"}}}},"RequiredReference":{{"BranchName":"e2 rr","Nested":{{"LeafName":"e2 rr l"}}}}}}')
+""");
+
+        // missing optional reference
+        ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Id`, `Json`)
+VALUES(
+3,
+'{{"RootName":"e3","Collection":[{{"BranchName":"e3 c1","Nested":{{"LeafName":"e3 c1 l"}}}},{{"BranchName":"e3 c2","Nested":{{"LeafName":"e3 c2 l"}}}}],"RequiredReference":{{"BranchName":"e3 rr","Nested":{{"LeafName":"e3 rr l"}}}}}}')
+""");
+
+        // missing required reference
+        ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Id`, `Json`)
+VALUES(
+4,
+'{{"RootName":"e4","Collection":[{{"BranchName":"e4 c1","Nested":{{"LeafName":"e4 c1 l"}}}},{{"BranchName":"e4 c2","Nested":{{"LeafName":"e4 c2 l"}}}}],"OptionalReference":{{"BranchName":"e4 or","Nested":{{"LeafName":"e4 or l"}}}}}}')
+""");
+    }
+
+    protected override void SeedArrayOfPrimitives(MyContextArrayOfPrimitives ctx)
+    {
+        var entity1 = new MyEntityArrayOfPrimitives
+        {
+            Id = 1,
+            Reference = new MyJsonEntityArrayOfPrimitives
+            {
+                IntArray = [1, 2, 3],
+                ListOfString =
+                [
+                    "Foo",
+                    "Bar",
+                    "Baz"
+                ]
+            },
+            Collection =
+            [
+                new() { IntArray = [111, 112, 113], ListOfString = ["Foo11", "Bar11"] },
+                new() { IntArray = [211, 212, 213], ListOfString = ["Foo12", "Bar12"] }
+            ]
+        };
+
+        var entity2 = new MyEntityArrayOfPrimitives
+        {
+            Id = 2,
+            Reference = new MyJsonEntityArrayOfPrimitives
+            {
+                IntArray = [10, 20, 30],
+                ListOfString =
+                [
+                    "A",
+                    "B",
+                    "C"
+                ]
+            },
+            Collection =
+            [
+                new() { IntArray = [110, 120, 130], ListOfString = ["A1", "Z1"] },
+                new() { IntArray = [210, 220, 230], ListOfString = ["A2", "Z2"] }
+            ]
+        };
+
+        ctx.Entities.AddRange(entity1, entity2);
+        ctx.SaveChanges();
+    }
+
+    protected override void SeedJunkInJson(MyContextJunkInJson ctx)
+        => ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Collection`, `CollectionWithCtor`, `Reference`, `ReferenceWithCtor`, `Id`)
+VALUES(
+'[{{"JunkReference":{{"Something":"SomeValue" }},"Name":"c11","JunkProperty1":50,"Number":11.5,"JunkCollection1":[],"JunkCollection2":[{{"Foo":"junk value"}}],"NestedCollection":[{{"DoB":"2002-04-01T00:00:00","DummyProp":"Dummy value"}},{{"DoB":"2002-04-02T00:00:00","DummyReference":{{"Foo":5}}}}],"NestedReference":{{"DoB":"2002-03-01T00:00:00"}}}},{{"Name":"c12","Number":12.5,"NestedCollection":[{{"DoB":"2002-06-01T00:00:00"}},{{"DoB":"2002-06-02T00:00:00"}}],"NestedDummy":59,"NestedReference":{{"DoB":"2002-05-01T00:00:00"}}}}]',
+'[{{"MyBool":true,"Name":"c11 ctor","JunkReference":{{"Something":"SomeValue","JunkCollection":[{{"Foo":"junk value"}}]}},"NestedCollection":[{{"DoB":"2002-08-01T00:00:00"}},{{"DoB":"2002-08-02T00:00:00"}}],"NestedReference":{{"DoB":"2002-07-01T00:00:00"}}}},{{"MyBool":false,"Name":"c12 ctor","NestedCollection":[{{"DoB":"2002-10-01T00:00:00"}},{{"DoB":"2002-10-02T00:00:00"}}],"JunkCollection":[{{"Foo":"junk value"}}],"NestedReference":{{"DoB":"2002-09-01T00:00:00"}}}}]',
+'{{"Name":"r1","JunkCollection":[{{"Foo":"junk value"}}],"JunkReference":{{"Something":"SomeValue" }},"Number":1.5,"NestedCollection":[{{"DoB":"2000-02-01T00:00:00","JunkReference":{{"Something":"SomeValue"}}}},{{"DoB":"2000-02-02T00:00:00"}}],"NestedReference":{{"DoB":"2000-01-01T00:00:00"}}}}',
+'{{"MyBool":true,"JunkCollection":[{{"Foo":"junk value"}}],"Name":"r1 ctor","JunkReference":{{"Something":"SomeValue" }},"NestedCollection":[{{"DoB":"2001-02-01T00:00:00"}},{{"DoB":"2001-02-02T00:00:00"}}],"NestedReference":{{"JunkCollection":[{{"Foo":"junk value"}}],"DoB":"2001-01-01T00:00:00"}}}}',
+1)
+""");
+
+    protected override void SeedTrickyBuffering(MyContextTrickyBuffering ctx)
+        => ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Reference`, `Id`)
+VALUES(
+'{{"Name": "r1", "Number": 7, "JunkReference":{{"Something": "SomeValue" }}, "JunkCollection": [{{"Foo": "junk value"}}], "NestedReference": {{"DoB": "2000-01-01T00:00:00Z"}}, "NestedCollection": [{{"DoB": "2000-02-01T00:00:00Z", "JunkReference": {{"Something": "SomeValue"}}}}, {{"DoB": "2000-02-02T00:00:00Z"}}]}}',1)
+""");
+
+    protected override void SeedShadowProperties(MyContextShadowProperties ctx)
+        => ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Collection`, `CollectionWithCtor`, `Reference`, `ReferenceWithCtor`, `Id`, `Name`)
+VALUES(
+'[{{"Name":"e1_c1","ShadowDouble":5.5}},{{"ShadowDouble":20.5,"Name":"e1_c2"}}]',
+'[{{"Name":"e1_c1 ctor","ShadowNullableByte":6}},{{"ShadowNullableByte":null,"Name":"e1_c2 ctor"}}]',
+'{{"Name":"e1_r", "ShadowString":"Foo"}}',
+'{{"ShadowInt":143,"Name":"e1_r ctor"}}',
+1,
+'e1')
+""");
+
+    protected override void SeedNotICollection(MyContextNotICollection ctx)
+    {
+        ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Json`, `Id`)
+VALUES(
+'{{"Collection":[{{"Bar":11,"Foo":"c11"}},{{"Bar":12,"Foo":"c12"}},{{"Bar":13,"Foo":"c13"}}]}}',
+1)
+""");
+
+        ctx.Database.ExecuteSqlRaw(
+            """
+INSERT INTO `Entities` (`Json`, `Id`)
+VALUES(
+'{{"Collection":[{{"Bar":21,"Foo":"c21"}},{{"Bar":22,"Foo":"c22"}}]}}',
+2)
+""");
+    }
+
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
+    public virtual async Task Json_predicate_on_bytea(bool async)
+    {
+        var contextFactory = await InitializeAsync<TypesDbContext>(
+            seed: context =>
+            {
+                context.Entities.AddRange(
+                    new TypesContainerEntity { JsonEntity = new TypesJsonEntity { Bytea = [1, 2, 3] } },
+                    new TypesContainerEntity { JsonEntity = new TypesJsonEntity { Bytea = [1, 2, 4] } });
+                context.SaveChanges();
+            });
+
+        using (var context = contextFactory.CreateContext())
+        {
+            var query = context.Entities.Where(x => x.JsonEntity.Bytea == new byte[] { 1, 2, 4 });
+
+            var result = async
+                ? await query.SingleAsync()
+                : query.Single();
+
+            Assert.Equal(2, result.Id);
+
+            AssertSql(
+                """
+SELECT e.`Id`, e.`JsonEntity`
+FROM `Entities` AS e
+WHERE (decode(e.`JsonEntity` ->> 'Bytea', 'base64')) = BYTEA E'\\x010204'
+LIMIT 2
+""");
+        }
+    }
+
+    [ConditionalTheory, MemberData(nameof(IsAsyncData))]
+    public virtual async Task Json_predicate_on_interval(bool async)
+    {
+        var contextFactory = await InitializeAsync<TypesDbContext>(
+            seed: context =>
+            {
+                context.Entities.AddRange(
+                    new TypesContainerEntity { JsonEntity = new TypesJsonEntity { Interval = new TimeSpan(1, 2, 3, 4, 123, 456) } },
+                    new TypesContainerEntity { JsonEntity = new TypesJsonEntity { Interval = new TimeSpan(2, 2, 3, 4, 123, 456) } });
+                context.SaveChanges();
+            });
+
+        using (var context = contextFactory.CreateContext())
+        {
+            var query = context.Entities.Where(x => x.JsonEntity.Interval == new TimeSpan(2, 2, 3, 4, 123, 456));
+
+            var result = async
+                ? await query.SingleAsync()
+                : query.Single();
+
+            Assert.Equal(2, result.Id);
+
+            AssertSql(
+                """
+SELECT e.`Id`, e.`JsonEntity`
+FROM `Entities` AS e
+WHERE (CAST(e.`JsonEntity` ->> 'Interval' AS interval)) = INTERVAL '2 02:03:04.123456'
+LIMIT 2
+""");
+        }
+    }
+
+    protected class TypesDbContext(DbContextOptions options) : DbContext(options)
+    {
+        public DbSet<TypesContainerEntity> Entities { get; set; }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+            => modelBuilder.Entity<TypesContainerEntity>().OwnsOne(b => b.JsonEntity).ToJson();
+    }
+
+    public class TypesContainerEntity
+    {
+        public int Id { get; set; }
+        public TypesJsonEntity JsonEntity { get; set; }
+    }
+
+    public class TypesJsonEntity
+    {
+        public byte[] Bytea { get; set; }
+        public TimeSpan Interval { get; set; }
+    }
+
+    protected void AssertSql(params string[] expected)
+        => TestSqlLoggerFactory.AssertBaseline(expected);
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/AdHocManyToManyQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AdHocManyToManyQueryMySqlTest.cs
new file mode 100644
index 000000000..552076859
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Query/AdHocManyToManyQueryMySqlTest.cs
@@ -0,0 +1,11 @@
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query;
+
+public class AdHocManyToManyQueryMySqlTest : AdHocManyToManyQueryRelationalTestBase
+{
+    protected override ITestStoreFactory TestStoreFactory
+        => MySqlTestStoreFactory.Instance;
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/AdHocMiscellaneousQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AdHocMiscellaneousQueryMySqlTest.cs
new file mode 100644
index 000000000..2235fb2a9
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Query/AdHocMiscellaneousQueryMySqlTest.cs
@@ -0,0 +1,36 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using NameSpace1;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query;
+
+public class AdHocMiscellaneousQueryMySqlTest : AdHocMiscellaneousQueryRelationalTestBase
+{
+    protected override ITestStoreFactory TestStoreFactory
+        => MySqlTestStoreFactory.Instance;
+
+    protected override void Seed2951(Context2951 context)
+        => context.Database.ExecuteSqlRaw(
+            """
+CREATE TABLE `ZeroKey` (`Id` int);
+INSERT INTO `ZeroKey` VALUES (NULL)
+""");
+
+    public override async Task Multiple_different_entity_type_from_different_namespaces(bool async)
+    {
+        // The only change is the FromSqlRaw SQL string:
+        //     Original: SELECT cast(null as int) AS MyValue
+        //     Changed:  SELECT cast(null as signed) AS MyValue
+        // The other comments are part of the base implementation.
+
+        var contextFactory = await InitializeAsync<Context23981>();
+        using var context = contextFactory.CreateContext();
+        //var good1 = context.Set<NameSpace1.TestQuery>().FromSqlRaw(@"SELECT 1 AS MyValue").ToList(); // OK
+        //var good2 = context.Set<NameSpace2.TestQuery>().FromSqlRaw(@"SELECT 1 AS MyValue").ToList(); // OK
+        var bad = context.Set<TestQuery>().FromSqlRaw(@"SELECT cast(null as signed) AS MyValue").ToList(); // Exception
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/AdHocNavigationsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AdHocNavigationsQueryMySqlTest.cs
new file mode 100644
index 000000000..734163c9b
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Query/AdHocNavigationsQueryMySqlTest.cs
@@ -0,0 +1,11 @@
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query;
+
+public class AdHocNavigationsQueryMySqlTest : AdHocNavigationsQueryRelationalTestBase
+{
+    protected override ITestStoreFactory TestStoreFactory
+        => MySqlTestStoreFactory.Instance;
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/AdHocQueryFiltersQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AdHocQueryFiltersQueryMySqlTest.cs
new file mode 100644
index 000000000..02a014cee
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Query/AdHocQueryFiltersQueryMySqlTest.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using MySqlConnector;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.Tests;
+using Xunit;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query;
+
+public class AdHocQueryFiltersQueryMySqlTest : AdHocQueryFiltersQueryRelationalTestBase
+{
+    public override async Task Group_by_multiple_aggregate_joining_different_tables(bool async)
+    {
+        if (!AppConfig.ServerVersion.Supports.OuterReferenceInMultiLevelSubquery)
+        {
+            await Assert.ThrowsAsync<MySqlException>(() => base.Group_by_multiple_aggregate_joining_different_tables(async));
+            return;
+        }
+
+        await base.Group_by_multiple_aggregate_joining_different_tables(async);
+
+        AssertSql(
+"""
+SELECT (
+    SELECT COUNT(*)
+    FROM (
+        SELECT DISTINCT `c`.`Value1`
+        FROM (
+            SELECT `p2`.`Child1Id`, 1 AS `Key`
+            FROM `Parents` AS `p2`
+        ) AS `p1`
+        LEFT JOIN `Child1` AS `c` ON `p1`.`Child1Id` = `c`.`Id`
+        WHERE `p0`.`Key` = `p1`.`Key`
+    ) AS `s`) AS `Test1`, (
+    SELECT COUNT(*)
+    FROM (
+        SELECT DISTINCT `c0`.`Value2`
+        FROM (
+            SELECT `p4`.`Child2Id`, 1 AS `Key`
+            FROM `Parents` AS `p4`
+        ) AS `p3`
+        LEFT JOIN `Child2` AS `c0` ON `p3`.`Child2Id` = `c0`.`Id`
+        WHERE `p0`.`Key` = `p3`.`Key`
+    ) AS `s0`) AS `Test2`
+FROM (
+    SELECT 1 AS `Key`
+    FROM `Parents` AS `p`
+) AS `p0`
+GROUP BY `p0`.`Key`
+""");
+    }
+
+    public override async Task Group_by_multiple_aggregate_joining_different_tables_with_query_filter(bool async)
+    {
+        if (!AppConfig.ServerVersion.Supports.OuterReferenceInMultiLevelSubquery)
+        {
+            await Assert.ThrowsAsync<MySqlException>(() => base.Group_by_multiple_aggregate_joining_different_tables_with_query_filter(async));
+            return;
+        }
+
+        await base.Group_by_multiple_aggregate_joining_different_tables_with_query_filter(async);
+
+        AssertSql(
+"""
+SELECT (
+    SELECT COUNT(*)
+    FROM (
+        SELECT DISTINCT `c0`.`Value1`
+        FROM (
+            SELECT `p2`.`ChildFilter1Id`, 1 AS `Key`
+            FROM `Parents` AS `p2`
+        ) AS `p1`
+        LEFT JOIN (
+            SELECT `c`.`Id`, `c`.`Value1`
+            FROM `ChildFilter1` AS `c`
+            WHERE `c`.`Filter1` = 'Filter1'
+        ) AS `c0` ON `p1`.`ChildFilter1Id` = `c0`.`Id`
+        WHERE `p0`.`Key` = `p1`.`Key`
+    ) AS `s`) AS `Test1`, (
+    SELECT COUNT(*)
+    FROM (
+        SELECT DISTINCT `c2`.`Value2`
+        FROM (
+            SELECT `p4`.`ChildFilter2Id`, 1 AS `Key`
+            FROM `Parents` AS `p4`
+        ) AS `p3`
+        LEFT JOIN (
+            SELECT `c1`.`Id`, `c1`.`Value2`
+            FROM `ChildFilter2` AS `c1`
+            WHERE `c1`.`Filter2` = 'Filter2'
+        ) AS `c2` ON `p3`.`ChildFilter2Id` = `c2`.`Id`
+        WHERE `p0`.`Key` = `p3`.`Key`
+    ) AS `s0`) AS `Test2`
+FROM (
+    SELECT 1 AS `Key`
+    FROM `Parents` AS `p`
+) AS `p0`
+GROUP BY `p0`.`Key`
+""");
+    }
+
+    protected override ITestStoreFactory TestStoreFactory
+        => MySqlTestStoreFactory.Instance;
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/AdHocQuerySplittingQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AdHocQuerySplittingQueryMySqlTest.cs
new file mode 100644
index 000000000..a3eebe24c
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Query/AdHocQuerySplittingQueryMySqlTest.cs
@@ -0,0 +1,44 @@
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query;
+
+public class AdHocQuerySplittingQueryMySqlTest : AdHocQuerySplittingQueryTestBase
+{
+    protected override DbContextOptionsBuilder SetQuerySplittingBehavior(
+        DbContextOptionsBuilder optionsBuilder,
+        QuerySplittingBehavior splittingBehavior)
+    {
+        new MySqlDbContextOptionsBuilder(optionsBuilder).UseQuerySplittingBehavior(splittingBehavior);
+
+        return optionsBuilder;
+    }
+
+    protected override DbContextOptionsBuilder ClearQuerySplittingBehavior(DbContextOptionsBuilder optionsBuilder)
+    {
+        var extension = optionsBuilder.Options.FindExtension<MySqlOptionsExtension>();
+        if (extension == null)
+        {
+            extension = new MySqlOptionsExtension();
+        }
+        else
+        {
+            _querySplittingBehaviorFieldInfo.SetValue(extension, null);
+        }
+
+        ((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
+
+        return optionsBuilder;
+    }
+
+    private static readonly FieldInfo _querySplittingBehaviorFieldInfo =
+        typeof(RelationalOptionsExtension).GetField("_querySplittingBehavior", BindingFlags.NonPublic | BindingFlags.Instance);
+
+    protected override ITestStoreFactory TestStoreFactory
+        => MySqlTestStoreFactory.Instance;
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsQueryMySqlTest.cs
index 7b5f83473..abe689442 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsQueryMySqlTest.cs
@@ -23,43 +23,48 @@ public override async Task Multi_level_include_one_to_many_optional_and_one_to_m
         {
             await base.Multi_level_include_one_to_many_optional_and_one_to_many_optional_produces_valid_sql(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Multi_level_include_correct_PK_is_chosen_as_the_join_predicate_for_queries_that_join_same_table_multiple_times(bool async)
         {
             await base.Multi_level_include_correct_PK_is_chosen_as_the_join_predicate_for_queries_that_join_same_table_multiple_times(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `t0`.`Id00`, `t0`.`Date0`, `t0`.`Level1_Optional_Id0`, `t0`.`Level1_Required_Id0`, `t0`.`Name00`, `t0`.`OneToMany_Optional_Inverse2Id0`, `t0`.`OneToMany_Optional_Self_Inverse2Id0`, `t0`.`OneToMany_Required_Inverse2Id0`, `t0`.`OneToMany_Required_Self_Inverse2Id0`, `t0`.`OneToOne_Optional_PK_Inverse2Id0`, `t0`.`OneToOne_Optional_Self2Id0`, `t0`.`Id1`, `t0`.`Level2_Optional_Id0`, `t0`.`Level2_Required_Id0`, `t0`.`Name1`, `t0`.`OneToMany_Optional_Inverse3Id0`, `t0`.`OneToMany_Optional_Self_Inverse3Id0`, `t0`.`OneToMany_Required_Inverse3Id0`, `t0`.`OneToMany_Required_Self_Inverse3Id0`, `t0`.`OneToOne_Optional_PK_Inverse3Id0`, `t0`.`OneToOne_Optional_Self3Id0`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s0`.`Id`, `s0`.`Date`, `s0`.`Level1_Optional_Id`, `s0`.`Level1_Required_Id`, `s0`.`Name`, `s0`.`OneToMany_Optional_Inverse2Id`, `s0`.`OneToMany_Optional_Self_Inverse2Id`, `s0`.`OneToMany_Required_Inverse2Id`, `s0`.`OneToMany_Required_Self_Inverse2Id`, `s0`.`OneToOne_Optional_PK_Inverse2Id`, `s0`.`OneToOne_Optional_Self2Id`, `s0`.`Id0`, `s0`.`Level2_Optional_Id`, `s0`.`Level2_Required_Id`, `s0`.`Name0`, `s0`.`OneToMany_Optional_Inverse3Id`, `s0`.`OneToMany_Optional_Self_Inverse3Id`, `s0`.`OneToMany_Required_Inverse3Id`, `s0`.`OneToMany_Required_Self_Inverse3Id`, `s0`.`OneToOne_Optional_PK_Inverse3Id`, `s0`.`OneToOne_Optional_Self3Id`, `s0`.`Id00`, `s0`.`Date0`, `s0`.`Level1_Optional_Id0`, `s0`.`Level1_Required_Id0`, `s0`.`Name00`, `s0`.`OneToMany_Optional_Inverse2Id0`, `s0`.`OneToMany_Optional_Self_Inverse2Id0`, `s0`.`OneToMany_Required_Inverse2Id0`, `s0`.`OneToMany_Required_Self_Inverse2Id0`, `s0`.`OneToOne_Optional_PK_Inverse2Id0`, `s0`.`OneToOne_Optional_Self2Id0`, `s0`.`Id1`, `s0`.`Level2_Optional_Id0`, `s0`.`Level2_Required_Id0`, `s0`.`Name1`, `s0`.`OneToMany_Optional_Inverse3Id0`, `s0`.`OneToMany_Optional_Self_Inverse3Id0`, `s0`.`OneToMany_Required_Inverse3Id0`, `s0`.`OneToMany_Required_Self_Inverse3Id0`, `s0`.`OneToOne_Optional_PK_Inverse3Id0`, `s0`.`OneToOne_Optional_Self3Id0`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `t`.`Id` AS `Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name` AS `Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `t`.`Id0` AS `Id00`, `t`.`Date` AS `Date0`, `t`.`Level1_Optional_Id` AS `Level1_Optional_Id0`, `t`.`Level1_Required_Id` AS `Level1_Required_Id0`, `t`.`Name0` AS `Name00`, `t`.`OneToMany_Optional_Inverse2Id` AS `OneToMany_Optional_Inverse2Id0`, `t`.`OneToMany_Optional_Self_Inverse2Id` AS `OneToMany_Optional_Self_Inverse2Id0`, `t`.`OneToMany_Required_Inverse2Id` AS `OneToMany_Required_Inverse2Id0`, `t`.`OneToMany_Required_Self_Inverse2Id` AS `OneToMany_Required_Self_Inverse2Id0`, `t`.`OneToOne_Optional_PK_Inverse2Id` AS `OneToOne_Optional_PK_Inverse2Id0`, `t`.`OneToOne_Optional_Self2Id` AS `OneToOne_Optional_Self2Id0`, `t`.`Id1`, `t`.`Level2_Optional_Id0`, `t`.`Level2_Required_Id0`, `t`.`Name1`, `t`.`OneToMany_Optional_Inverse3Id0`, `t`.`OneToMany_Optional_Self_Inverse3Id0`, `t`.`OneToMany_Required_Inverse3Id0`, `t`.`OneToMany_Required_Self_Inverse3Id0`, `t`.`OneToOne_Optional_PK_Inverse3Id0`, `t`.`OneToOne_Optional_Self3Id0`
+    SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `s`.`Id` AS `Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name` AS `Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id0` AS `Id00`, `s`.`Date` AS `Date0`, `s`.`Level1_Optional_Id` AS `Level1_Optional_Id0`, `s`.`Level1_Required_Id` AS `Level1_Required_Id0`, `s`.`Name0` AS `Name00`, `s`.`OneToMany_Optional_Inverse2Id` AS `OneToMany_Optional_Inverse2Id0`, `s`.`OneToMany_Optional_Self_Inverse2Id` AS `OneToMany_Optional_Self_Inverse2Id0`, `s`.`OneToMany_Required_Inverse2Id` AS `OneToMany_Required_Inverse2Id0`, `s`.`OneToMany_Required_Self_Inverse2Id` AS `OneToMany_Required_Self_Inverse2Id0`, `s`.`OneToOne_Optional_PK_Inverse2Id` AS `OneToOne_Optional_PK_Inverse2Id0`, `s`.`OneToOne_Optional_Self2Id` AS `OneToOne_Optional_Self2Id0`, `s`.`Id1`, `s`.`Level2_Optional_Id0`, `s`.`Level2_Required_Id0`, `s`.`Name1`, `s`.`OneToMany_Optional_Inverse3Id0`, `s`.`OneToMany_Optional_Self_Inverse3Id0`, `s`.`OneToMany_Required_Inverse3Id0`, `s`.`OneToMany_Required_Self_Inverse3Id0`, `s`.`OneToOne_Optional_PK_Inverse3Id0`, `s`.`OneToOne_Optional_Self3Id0`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN (
         SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l2`.`Id` AS `Id0`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l3`.`Id` AS `Id1`, `l3`.`Level2_Optional_Id` AS `Level2_Optional_Id0`, `l3`.`Level2_Required_Id` AS `Level2_Required_Id0`, `l3`.`Name` AS `Name1`, `l3`.`OneToMany_Optional_Inverse3Id` AS `OneToMany_Optional_Inverse3Id0`, `l3`.`OneToMany_Optional_Self_Inverse3Id` AS `OneToMany_Optional_Self_Inverse3Id0`, `l3`.`OneToMany_Required_Inverse3Id` AS `OneToMany_Required_Inverse3Id0`, `l3`.`OneToMany_Required_Self_Inverse3Id` AS `OneToMany_Required_Self_Inverse3Id0`, `l3`.`OneToOne_Optional_PK_Inverse3Id` AS `OneToOne_Optional_PK_Inverse3Id0`, `l3`.`OneToOne_Optional_Self3Id` AS `OneToOne_Optional_Self3Id0`
         FROM `LevelThree` AS `l1`
         INNER JOIN `LevelTwo` AS `l2` ON `l1`.`OneToMany_Required_Inverse3Id` = `l2`.`Id`
         LEFT JOIN `LevelThree` AS `l3` ON `l2`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
-    ) AS `t` ON `l0`.`Id` = `t`.`OneToMany_Optional_Inverse3Id`
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id00`");
+    ) AS `s` ON `l0`.`Id` = `s`.`OneToMany_Optional_Inverse3Id`
+) AS `s0` ON `l`.`Id` = `s0`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id00`
+""");
         }
 
         public override async Task Multiple_complex_includes(bool async)
         {
             await base.Multiple_complex_includes(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
@@ -67,16 +72,18 @@ LEFT JOIN (
     SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l3`.`Id` AS `Id0`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name` AS `Name0`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l2`
     LEFT JOIN `LevelThree` AS `l3` ON `l2`.`Id` = `l3`.`Level2_Optional_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `t`.`Id`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Multiple_complex_includes_self_ref(bool async)
         {
             await base.Multiple_complex_includes_self_ref(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`, `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `t`.`Id0`, `t`.`Date0`, `t`.`Name0`, `t`.`OneToMany_Optional_Self_Inverse1Id0`, `t`.`OneToMany_Required_Self_Inverse1Id0`, `t`.`OneToOne_Optional_Self1Id0`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`, `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Name`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`, `s`.`Id0`, `s`.`Date0`, `s`.`Name0`, `s`.`OneToMany_Optional_Self_Inverse1Id0`, `s`.`OneToMany_Required_Self_Inverse1Id0`, `s`.`OneToOne_Optional_Self1Id0`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelOne` AS `l0` ON `l`.`OneToOne_Optional_Self1Id` = `l0`.`Id`
 LEFT JOIN `LevelOne` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Self_Inverse1Id`
@@ -84,8 +91,9 @@ LEFT JOIN (
     SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Name`, `l2`.`OneToMany_Optional_Self_Inverse1Id`, `l2`.`OneToMany_Required_Self_Inverse1Id`, `l2`.`OneToOne_Optional_Self1Id`, `l3`.`Id` AS `Id0`, `l3`.`Date` AS `Date0`, `l3`.`Name` AS `Name0`, `l3`.`OneToMany_Optional_Self_Inverse1Id` AS `OneToMany_Optional_Self_Inverse1Id0`, `l3`.`OneToMany_Required_Self_Inverse1Id` AS `OneToMany_Required_Self_Inverse1Id0`, `l3`.`OneToOne_Optional_Self1Id` AS `OneToOne_Optional_Self1Id0`
     FROM `LevelOne` AS `l2`
     LEFT JOIN `LevelOne` AS `l3` ON `l2`.`OneToOne_Optional_Self1Id` = `l3`.`Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Self_Inverse1Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `t`.`Id`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Self_Inverse1Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Include_reference_and_collection_order_by(bool async)
@@ -116,15 +124,17 @@ public override async Task Include_collection_then_reference(bool async)
         {
             await base.Include_collection_then_reference(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Optional_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Include_collection_with_conditional_order_by(bool async)
@@ -147,8 +157,9 @@ public override async Task Multiple_complex_include_select(bool async)
         {
             await base.Multiple_complex_include_select(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
@@ -156,89 +167,98 @@ LEFT JOIN (
     SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l3`.`Id` AS `Id0`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name` AS `Name0`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l2`
     LEFT JOIN `LevelThree` AS `l3` ON `l2`.`Id` = `l3`.`Level2_Optional_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `t`.`Id`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Include_nested_with_optional_navigation(bool async)
         {
             await base.Include_nested_with_optional_navigation(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `t`.`Id0`, `t`.`Level3_Optional_Id`, `t`.`Level3_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse4Id`, `t`.`OneToMany_Optional_Self_Inverse4Id`, `t`.`OneToMany_Required_Inverse4Id`, `t`.`OneToMany_Required_Self_Inverse4Id`, `t`.`OneToOne_Optional_PK_Inverse4Id`, `t`.`OneToOne_Optional_Self4Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `s`.`Id`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id0`, `s`.`Level3_Optional_Id`, `s`.`Level3_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse4Id`, `s`.`OneToMany_Optional_Self_Inverse4Id`, `s`.`OneToMany_Required_Inverse4Id`, `s`.`OneToMany_Required_Self_Inverse4Id`, `s`.`OneToOne_Optional_PK_Inverse4Id`, `s`.`OneToOne_Optional_Self4Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 LEFT JOIN (
     SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l2`.`Id` AS `Id0`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`
     FROM `LevelThree` AS `l1`
     LEFT JOIN `LevelFour` AS `l2` ON `l1`.`Id` = `l2`.`Level3_Required_Id`
-) AS `t` ON `l0`.`Id` = `t`.`OneToMany_Required_Inverse3Id`
+) AS `s` ON `l0`.`Id` = `s`.`OneToMany_Required_Inverse3Id`
 WHERE (`l0`.`Name` <> 'L2 09') OR `l0`.`Name` IS NULL
-ORDER BY `l`.`Id`, `l0`.`Id`, `t`.`Id`");
+ORDER BY `l`.`Id`, `l0`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Complex_multi_include_with_order_by_and_paging(bool async)
         {
             await base.Complex_multi_include_with_order_by_and_paging(async);
 
-            AssertSql(
-                @"@__p_1='10'
+        AssertSql(
+"""
+@__p_1='10'
 @__p_0='0'
 
-SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Required_Id`
-LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-LEFT JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`OneToMany_Required_Inverse3Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`");
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Required_Id`
+LEFT JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`OneToMany_Optional_Inverse3Id`
+LEFT JOIN `LevelThree` AS `l3` ON `l0`.`Id` = `l3`.`OneToMany_Required_Inverse3Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Complex_multi_include_with_order_by_and_paging_joins_on_correct_key(bool async)
         {
             await base.Complex_multi_include_with_order_by_and_paging_joins_on_correct_key(async);
 
-            AssertSql(
-                @"@__p_1='10'
+        AssertSql(
+"""
+@__p_1='10'
 @__p_0='0'
 
-SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l2`.`Id`, `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l4`.`Id`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l1` ON `t`.`Id` = `l1`.`Level1_Required_Id`
-LEFT JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`OneToMany_Optional_Inverse3Id`
-LEFT JOIN `LevelThree` AS `l3` ON `l1`.`Id` = `l3`.`OneToMany_Required_Inverse3Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`");
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l2` ON `l1`.`Id` = `l2`.`Level1_Required_Id`
+LEFT JOIN `LevelThree` AS `l3` ON `l0`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+LEFT JOIN `LevelThree` AS `l4` ON `l2`.`Id` = `l4`.`OneToMany_Required_Inverse3Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`, `l3`.`Id`
+""");
         }
 
         public override async Task Complex_multi_include_with_order_by_and_paging_joins_on_correct_key2(bool async)
         {
             await base.Complex_multi_include_with_order_by_and_paging_joins_on_correct_key2(async);
 
-            AssertSql(
-                @"@__p_1='10'
+        AssertSql(
+"""
+@__p_1='10'
 @__p_0='0'
 
-SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `l3`.`Id`, `l3`.`Level3_Optional_Id`, `l3`.`Level3_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse4Id`, `l3`.`OneToMany_Optional_Self_Inverse4Id`, `l3`.`OneToMany_Required_Inverse4Id`, `l3`.`OneToMany_Required_Self_Inverse4Id`, `l3`.`OneToOne_Optional_PK_Inverse4Id`, `l3`.`OneToOne_Optional_Self4Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Optional_Id`
-LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Required_Id`
-LEFT JOIN `LevelFour` AS `l2` ON `l1`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`");
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Optional_Id`
+LEFT JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`Level2_Required_Id`
+LEFT JOIN `LevelFour` AS `l3` ON `l2`.`Id` = `l3`.`OneToMany_Optional_Inverse4Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Multiple_include_with_multiple_optional_navigations(bool async)
@@ -347,16 +367,18 @@ public override async Task Optional_navigation_with_Include_ThenInclude(bool asy
         {
             await base.Optional_navigation_with_Include_ThenInclude(async);
 
-            AssertSql(
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `t`.`Id0`, `t`.`Level3_Optional_Id`, `t`.`Level3_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse4Id`, `t`.`OneToMany_Optional_Self_Inverse4Id`, `t`.`OneToMany_Required_Inverse4Id`, `t`.`OneToMany_Required_Self_Inverse4Id`, `t`.`OneToOne_Optional_PK_Inverse4Id`, `t`.`OneToOne_Optional_Self4Id`
+        AssertSql(
+"""
+SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `s`.`Id`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id0`, `s`.`Level3_Optional_Id`, `s`.`Level3_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse4Id`, `s`.`OneToMany_Optional_Self_Inverse4Id`, `s`.`OneToMany_Required_Inverse4Id`, `s`.`OneToMany_Required_Self_Inverse4Id`, `s`.`OneToOne_Optional_PK_Inverse4Id`, `s`.`OneToOne_Optional_Self4Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 LEFT JOIN (
     SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l2`.`Id` AS `Id0`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`
     FROM `LevelThree` AS `l1`
     LEFT JOIN `LevelFour` AS `l2` ON `l1`.`Id` = `l2`.`Level3_Optional_Id`
-) AS `t` ON `l0`.`Id` = `t`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t`.`Id`");
+) AS `s` ON `l0`.`Id` = `s`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Multiple_optional_navigation_with_Include(bool async)
@@ -437,38 +459,43 @@ public override async Task SelectMany_with_navigation_and_Distinct(bool async)
         {
             await base.SelectMany_with_navigation_and_Distinct(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`, `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l1`.`Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT DISTINCT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
     FROM `LevelTwo` AS `l0`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-LEFT JOIN `LevelTwo` AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
+LEFT JOIN `LevelTwo` AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l1`.`Id`
+""");
         }
 
         public override async Task SelectMany_with_navigation_and_Distinct_projecting_columns_including_join_key(bool async)
         {
             await base.SelectMany_with_navigation_and_Distinct_projecting_columns_including_join_key(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`, `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l1`.`Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT DISTINCT `l0`.`Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id` AS `FK`
     FROM `LevelTwo` AS `l0`
-) AS `t` ON `l`.`Id` = `t`.`FK`
-LEFT JOIN `LevelTwo` AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+) AS `l1` ON `l`.`Id` = `l1`.`FK`
+LEFT JOIN `LevelTwo` AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l1`.`Id`
+""");
         }
 
         public override async Task Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(bool async)
         {
             await base.Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(async);
 
-            AssertSql(
-                @"SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`, `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `l14`.`Name`
+        AssertSql(
+"""
+SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`, `l16`.`Id`, `l16`.`Date`, `l16`.`Level1_Optional_Id`, `l16`.`Level1_Required_Id`, `l16`.`Name`, `l16`.`OneToMany_Optional_Inverse2Id`, `l16`.`OneToMany_Optional_Self_Inverse2Id`, `l16`.`OneToMany_Required_Inverse2Id`, `l16`.`OneToMany_Required_Self_Inverse2Id`, `l16`.`OneToOne_Optional_PK_Inverse2Id`, `l16`.`OneToOne_Optional_Self2Id`, `l14`.`Name`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Required_Id`
 LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Optional_Id`
@@ -479,25 +506,26 @@ INNER JOIN (
     INNER JOIN `LevelThree` AS `l4` ON `l3`.`Level3_Required_Id` = `l4`.`Id`
     LEFT JOIN `LevelTwo` AS `l5` ON `l4`.`Level2_Optional_Id` = `l5`.`Id`
     LEFT JOIN `LevelTwo` AS `l6` ON `l5`.`Id` = `l6`.`OneToMany_Required_Self_Inverse2Id`
-) AS `t` ON `l2`.`Id` = `t`.`Id2`
+) AS `s` ON `l2`.`Id` = `s`.`Id2`
 LEFT JOIN (
     SELECT `l7`.`Id`, `l8`.`Id` AS `Id0`, `l9`.`Id` AS `Id1`, `l10`.`Id` AS `Id2`, `l10`.`Level2_Optional_Id` AS `Level2_Optional_Id0`
     FROM `LevelFour` AS `l7`
     INNER JOIN `LevelThree` AS `l8` ON `l7`.`Level3_Required_Id` = `l8`.`Id`
     INNER JOIN `LevelTwo` AS `l9` ON `l8`.`Level2_Required_Id` = `l9`.`Id`
     LEFT JOIN `LevelThree` AS `l10` ON `l9`.`Id` = `l10`.`OneToMany_Required_Inverse3Id`
-) AS `t0` ON `t`.`Id2` = `t0`.`Id2`
+) AS `s0` ON `s`.`Id2` = `s0`.`Id2`
 LEFT JOIN `LevelThree` AS `l11` ON `l2`.`OneToMany_Optional_Inverse4Id` = `l11`.`Id`
-LEFT JOIN `LevelThree` AS `l12` ON `t`.`Id2` = `l12`.`Level2_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l13` ON `t0`.`Level2_Optional_Id0` = `l13`.`Id`
+LEFT JOIN `LevelThree` AS `l12` ON `s`.`Id2` = `l12`.`Level2_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l13` ON `s0`.`Level2_Optional_Id0` = `l13`.`Id`
 LEFT JOIN `LevelThree` AS `l14` ON `l13`.`Id` = `l14`.`Level2_Required_Id`
 LEFT JOIN (
     SELECT `l15`.`Id`, `l15`.`Date`, `l15`.`Level1_Optional_Id`, `l15`.`Level1_Required_Id`, `l15`.`Name`, `l15`.`OneToMany_Optional_Inverse2Id`, `l15`.`OneToMany_Optional_Self_Inverse2Id`, `l15`.`OneToMany_Required_Inverse2Id`, `l15`.`OneToMany_Required_Self_Inverse2Id`, `l15`.`OneToOne_Optional_PK_Inverse2Id`, `l15`.`OneToOne_Optional_Self2Id`
     FROM `LevelTwo` AS `l15`
     WHERE `l15`.`Id` <> 42
-) AS `t1` ON `t`.`Id2` = `t1`.`OneToMany_Optional_Self_Inverse2Id`
+) AS `l16` ON `s`.`Id2` = `l16`.`OneToMany_Optional_Self_Inverse2Id`
 WHERE (`l11`.`Name` <> 'Foo') OR `l11`.`Name` IS NULL
-ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`");
+ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`
+""");
         }
 
         public override async Task Project_collection_navigation(bool async)
@@ -551,16 +579,18 @@ public override async Task Project_collection_navigation_composed(bool async)
         {
             await base.Project_collection_navigation_composed(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
     FROM `LevelTwo` AS `l0`
     WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
 WHERE `l`.`Id` < 3
-ORDER BY `l`.`Id`");
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Project_collection_and_root_entity(bool async)
@@ -602,17 +632,19 @@ public override async Task Include_inside_subquery(bool async)
         {
             await base.Include_inside_subquery(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
     WHERE `l0`.`Id` > 0
-) AS `t` ON TRUE
+) AS `s` ON TRUE
 WHERE `l`.`Id` < 3
-ORDER BY `l`.`Id`, `t`.`Id`");
+ORDER BY `l`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Include_collection_with_multiple_orderbys_member(bool async)
@@ -715,30 +747,34 @@ public override async Task Null_check_in_anonymous_type_projection_should_not_be
         {
             await base.Null_check_in_anonymous_type_projection_should_not_be_removed(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t`.`c`, `t`.`Name`, `t`.`Id`, `t`.`Id0`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `s`.`c`, `s`.`Name`, `s`.`Id`, `s`.`Id0`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l1`.`Id` IS NULL AS `c`, `l1`.`Name`, `l0`.`Id`, `l1`.`Id` AS `Id0`, `l0`.`OneToMany_Optional_Inverse2Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Required_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Null_check_in_Dto_projection_should_not_be_removed(bool async)
         {
             await base.Null_check_in_Dto_projection_should_not_be_removed(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t`.`c`, `t`.`Name`, `t`.`Id`, `t`.`Id0`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `s`.`c`, `s`.`Name`, `s`.`Id`, `s`.`Id0`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l1`.`Id` IS NULL AS `c`, `l1`.`Name`, `l0`.`Id`, `l1`.`Id` AS `Id0`, `l0`.`OneToMany_Optional_Inverse2Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Required_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task SelectMany_navigation_property_followed_by_select_collection_navigation(bool async)
@@ -783,25 +819,27 @@ public override async Task Lift_projection_mapping_when_pushing_down_subquery(bo
         {
             await base.Lift_projection_mapping_when_pushing_down_subquery(async);
 
-            AssertSql(
-                @"@__p_0='25'
+        AssertSql(
+"""
+@__p_0='25'
 
-SELECT `t`.`Id`, `t0`.`Id`, `l1`.`Id`, `t0`.`c`
+SELECT `l2`.`Id`, `l4`.`Id`, `l1`.`Id`, `l4`.`c`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     LIMIT @__p_0
-) AS `t`
+) AS `l2`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`c`, `t1`.`OneToMany_Required_Inverse2Id`
+    SELECT `l3`.`Id`, `l3`.`c`, `l3`.`OneToMany_Required_Inverse2Id`
     FROM (
         SELECT `l0`.`Id`, 1 AS `c`, `l0`.`OneToMany_Required_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Required_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Id` = `t0`.`OneToMany_Required_Inverse2Id`
-LEFT JOIN `LevelTwo` AS `l1` ON `t`.`Id` = `l1`.`OneToMany_Required_Inverse2Id`
-ORDER BY `t`.`Id`, `t0`.`Id`");
+    ) AS `l3`
+    WHERE `l3`.`row` <= 1
+) AS `l4` ON `l2`.`Id` = `l4`.`OneToMany_Required_Inverse2Id`
+LEFT JOIN `LevelTwo` AS `l1` ON `l2`.`Id` = `l1`.`OneToMany_Required_Inverse2Id`
+ORDER BY `l2`.`Id`, `l4`.`Id`
+""");
         }
 
         public override async Task Including_reference_navigation_and_projecting_collection_navigation(bool async)
@@ -863,57 +901,63 @@ public override async Task Select_subquery_single_nested_subquery(bool async)
         {
             await base.Select_subquery_single_nested_subquery(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t0`.`Id`, `l1`.`Id`, `t0`.`c`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l3`.`Id`, `l1`.`Id`, `l3`.`c`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`c`, `t`.`Id`, `t`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l2`.`c`, `l2`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`
     FROM (
         SELECT 1 AS `c`, `l0`.`Id`, `l0`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-LEFT JOIN `LevelThree` AS `l1` ON `t0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `t0`.`Id`, `l1`.`Id`");
+    ) AS `l2`
+    WHERE `l2`.`row` <= 1
+) AS `l3` ON `l`.`Id` = `l3`.`OneToMany_Optional_Inverse2Id`
+LEFT JOIN `LevelThree` AS `l1` ON `l3`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l3`.`Id`, `l1`.`Id`
+""");
         }
 
         public override async Task Select_subquery_single_nested_subquery2(bool async)
         {
             await base.Select_subquery_single_nested_subquery2(async);
 
-            AssertSql(
-                $@"SELECT `l`.`Id`, `t1`.`Id`, `t1`.`Id0`, `t1`.`Id1`, `t1`.`c`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`c`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `l0`.`Id`, `t0`.`Id` AS `Id0`, `l1`.`Id` AS `Id1`, `t0`.`c`, `l0`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l0`.`Id`, `l4`.`Id` AS `Id0`, `l2`.`Id` AS `Id1`, `l4`.`c`, `l0`.`OneToMany_Optional_Inverse2Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN (
-        SELECT `t`.`c`, `t`.`Id`, `t`.`OneToMany_Optional_Inverse3Id`
+        SELECT `l3`.`c`, `l3`.`Id`, `l3`.`OneToMany_Optional_Inverse3Id`
         FROM (
-            SELECT {(AppConfig.ServerVersion.Supports.MySqlBug96947Workaround ? "CAST(1 AS signed)" : "1")} AS `c`, `l2`.`Id`, `l2`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l2`.`OneToMany_Optional_Inverse3Id` ORDER BY `l2`.`Id`) AS `row`
-            FROM `LevelThree` AS `l2`
-        ) AS `t`
-        WHERE `t`.`row` <= 1
-    ) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-    LEFT JOIN `LevelFour` AS `l1` ON `t0`.`Id` = `l1`.`OneToMany_Optional_Inverse4Id`
-) AS `t1` ON `l`.`Id` = `t1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t1`.`Id`, `t1`.`Id0`, `t1`.`Id1`");
+            SELECT 1 AS `c`, `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
+            FROM `LevelThree` AS `l1`
+        ) AS `l3`
+        WHERE `l3`.`row` <= 1
+    ) AS `l4` ON `l0`.`Id` = `l4`.`OneToMany_Optional_Inverse3Id`
+    LEFT JOIN `LevelFour` AS `l2` ON `l4`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`
+""");
         }
 
         public override async Task Filtered_include_basic_Where(bool async)
         {
             await base.Filtered_include_basic_Where(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
     FROM `LevelTwo` AS `l0`
     WHERE `l0`.`Id` > 5
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`");
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Filtered_include_OrderBy(bool async)
@@ -931,258 +975,284 @@ public override async Task Filtered_ThenInclude_OrderBy(bool async)
         {
             await base.Filtered_ThenInclude_OrderBy(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`, `t`.`Name0`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Name0`
+""");
         }
 
         public override async Task Filtered_include_ThenInclude_OrderBy(bool async)
         {
             await base.Filtered_include_ThenInclude_OrderBy(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Name`, `t`.`Id`, `t`.`Name0` DESC");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s`.`Name`, `s`.`Id`, `s`.`Name0` DESC
+""");
         }
 
         public override async Task Filtered_include_basic_OrderBy_Take(bool async)
         {
             await base.Filtered_include_basic_OrderBy_Take(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 3
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Name`
+""");
         }
 
         public override async Task Filtered_include_basic_OrderBy_Skip(bool async)
         {
             await base.Filtered_include_basic_OrderBy_Skip(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE 1 < `t`.`row`
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`");
+    ) AS `l1`
+    WHERE 1 < `l1`.`row`
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Name`
+""");
         }
 
         public override async Task Filtered_include_basic_OrderBy_Skip_Take(bool async)
         {
             await base.Filtered_include_basic_OrderBy_Skip_Take(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 4)
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`");
+    ) AS `l1`
+    WHERE (1 < `l1`.`row`) AND (`l1`.`row` <= 4)
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Name`
+""");
         }
 
         public override async Task Filtered_include_Skip_without_OrderBy(bool async)
         {
             await base.Filtered_include_Skip_without_OrderBy(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE 1 < `t`.`row`
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`");
+    ) AS `l1`
+    WHERE 1 < `l1`.`row`
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Filtered_include_Take_without_OrderBy(bool async)
         {
             await base.Filtered_include_Take_without_OrderBy(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 1
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Filtered_include_on_ThenInclude(bool async)
         {
             await base.Filtered_include_on_ThenInclude(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `t0`.`Id`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Name`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 4)
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Name`");
+    ) AS `l2`
+    WHERE (1 < `l2`.`row`) AND (`l2`.`row` <= 4)
+) AS `l3` ON `l0`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`Name`
+""");
         }
 
         public override async Task Filtered_include_after_reference_navigation(bool async)
         {
             await base.Filtered_include_after_reference_navigation(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `t0`.`Id`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Name`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 4)
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Name`");
+    ) AS `l2`
+    WHERE (1 < `l2`.`row`) AND (`l2`.`row` <= 4)
+) AS `l3` ON `l0`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`Name`
+""");
         }
 
         public override async Task Filtered_include_after_different_filtered_include_same_level(bool async)
         {
             await base.Filtered_include_after_different_filtered_include_same_level(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l3`.`Id`, `l3`.`Date`, `l3`.`Level1_Optional_Id`, `l3`.`Level1_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`OneToMany_Optional_Self_Inverse2Id`, `l3`.`OneToMany_Required_Inverse2Id`, `l3`.`OneToMany_Required_Self_Inverse2Id`, `l3`.`OneToOne_Optional_PK_Inverse2Id`, `l3`.`OneToOne_Optional_Self2Id`, `l5`.`Id`, `l5`.`Date`, `l5`.`Level1_Optional_Id`, `l5`.`Level1_Required_Id`, `l5`.`Name`, `l5`.`OneToMany_Optional_Inverse2Id`, `l5`.`OneToMany_Optional_Self_Inverse2Id`, `l5`.`OneToMany_Required_Inverse2Id`, `l5`.`OneToMany_Required_Self_Inverse2Id`, `l5`.`OneToOne_Optional_PK_Inverse2Id`, `l5`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
+    ) AS `l2`
+    WHERE `l2`.`row` <= 3
+) AS `l3` ON `l`.`Id` = `l3`.`OneToMany_Optional_Inverse2Id`
 LEFT JOIN (
-    SELECT `t2`.`Id`, `t2`.`Date`, `t2`.`Level1_Optional_Id`, `t2`.`Level1_Required_Id`, `t2`.`Name`, `t2`.`OneToMany_Optional_Inverse2Id`, `t2`.`OneToMany_Optional_Self_Inverse2Id`, `t2`.`OneToMany_Required_Inverse2Id`, `t2`.`OneToMany_Required_Self_Inverse2Id`, `t2`.`OneToOne_Optional_PK_Inverse2Id`, `t2`.`OneToOne_Optional_Self2Id`
+    SELECT `l4`.`Id`, `l4`.`Date`, `l4`.`Level1_Optional_Id`, `l4`.`Level1_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse2Id`, `l4`.`OneToMany_Optional_Self_Inverse2Id`, `l4`.`OneToMany_Required_Inverse2Id`, `l4`.`OneToMany_Required_Self_Inverse2Id`, `l4`.`OneToOne_Optional_PK_Inverse2Id`, `l4`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Required_Inverse2Id` ORDER BY `l1`.`Name` DESC) AS `row`
         FROM `LevelTwo` AS `l1`
         WHERE (`l1`.`Name` <> 'Bar') OR `l1`.`Name` IS NULL
-    ) AS `t2`
-    WHERE 1 < `t2`.`row`
-) AS `t1` ON `l`.`Id` = `t1`.`OneToMany_Required_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`, `t0`.`Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`Name` DESC");
+    ) AS `l4`
+    WHERE 1 < `l4`.`row`
+) AS `l5` ON `l`.`Id` = `l5`.`OneToMany_Required_Inverse2Id`
+ORDER BY `l`.`Id`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`Name`, `l3`.`Id`, `l5`.`OneToMany_Required_Inverse2Id`, `l5`.`Name` DESC
+""");
         }
 
         public override async Task Filtered_include_after_different_filtered_include_different_level(bool async)
         {
             await base.Filtered_include_after_different_filtered_include_different_level(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t2`.`Id`, `t2`.`Date`, `t2`.`Level1_Optional_Id`, `t2`.`Level1_Required_Id`, `t2`.`Name`, `t2`.`OneToMany_Optional_Inverse2Id`, `t2`.`OneToMany_Optional_Self_Inverse2Id`, `t2`.`OneToMany_Required_Inverse2Id`, `t2`.`OneToMany_Required_Self_Inverse2Id`, `t2`.`OneToOne_Optional_PK_Inverse2Id`, `t2`.`OneToOne_Optional_Self2Id`, `t2`.`Id0`, `t2`.`Level2_Optional_Id`, `t2`.`Level2_Required_Id`, `t2`.`Name0`, `t2`.`OneToMany_Optional_Inverse3Id`, `t2`.`OneToMany_Optional_Self_Inverse3Id`, `t2`.`OneToMany_Required_Inverse3Id`, `t2`.`OneToMany_Required_Self_Inverse3Id`, `t2`.`OneToOne_Optional_PK_Inverse3Id`, `t2`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t0`.`Id` AS `Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name` AS `Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l4`.`Id` AS `Id0`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name` AS `Name0`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
         FROM `LevelTwo` AS `l0`
         WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
         ORDER BY `l0`.`Name`
         LIMIT 3
-    ) AS `t`
+    ) AS `l2`
     LEFT JOIN (
-        SELECT `t1`.`Id`, `t1`.`Level2_Optional_Id`, `t1`.`Level2_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse3Id`, `t1`.`OneToMany_Optional_Self_Inverse3Id`, `t1`.`OneToMany_Required_Inverse3Id`, `t1`.`OneToMany_Required_Self_Inverse3Id`, `t1`.`OneToOne_Optional_PK_Inverse3Id`, `t1`.`OneToOne_Optional_Self3Id`
+        SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
         FROM (
             SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Required_Inverse3Id` ORDER BY `l1`.`Name` DESC) AS `row`
             FROM `LevelThree` AS `l1`
             WHERE (`l1`.`Name` <> 'Bar') OR `l1`.`Name` IS NULL
-        ) AS `t1`
-        WHERE 1 < `t1`.`row`
-    ) AS `t0` ON `t`.`Id` = `t0`.`OneToMany_Required_Inverse3Id`
-) AS `t2` ON TRUE
-ORDER BY `l`.`Id`, `t2`.`Name`, `t2`.`Id`, `t2`.`OneToMany_Required_Inverse3Id`, `t2`.`Name0` DESC");
+        ) AS `l3`
+        WHERE 1 < `l3`.`row`
+    ) AS `l4` ON `l2`.`Id` = `l4`.`OneToMany_Required_Inverse3Id`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Name`, `s`.`Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`Name0` DESC
+""");
         }
 
         public override async Task Filtered_include_same_filter_set_on_same_navigation_twice(bool async)
         {
             await base.Filtered_include_same_filter_set_on_same_navigation_twice(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id` DESC) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id` DESC");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 2
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id` DESC
+""");
         }
 
         public override async Task Filtered_include_same_filter_set_on_same_navigation_twice_followed_by_ThenIncludes(bool async)
         {
             await base.Filtered_include_same_filter_set_on_same_navigation_twice_followed_by_ThenIncludes(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `t0`.`Level2_Optional_Id0`, `t0`.`Level2_Required_Id0`, `t0`.`Name1`, `t0`.`OneToMany_Optional_Inverse3Id0`, `t0`.`OneToMany_Optional_Self_Inverse3Id0`, `t0`.`OneToMany_Required_Inverse3Id0`, `t0`.`OneToMany_Required_Self_Inverse3Id0`, `t0`.`OneToOne_Optional_PK_Inverse3Id0`, `t0`.`OneToOne_Optional_Self3Id0`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Level2_Optional_Id0`, `s`.`Level2_Required_Id0`, `s`.`Name1`, `s`.`OneToMany_Optional_Inverse3Id0`, `s`.`OneToMany_Optional_Self_Inverse3Id0`, `s`.`OneToMany_Required_Inverse3Id0`, `s`.`OneToMany_Required_Self_Inverse3Id0`, `s`.`OneToOne_Optional_PK_Inverse3Id0`, `s`.`OneToOne_Optional_Self3Id0`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l1`.`Id` AS `Id1`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l0`.`Level2_Optional_Id` AS `Level2_Optional_Id0`, `l0`.`Level2_Required_Id` AS `Level2_Required_Id0`, `l0`.`Name` AS `Name1`, `l0`.`OneToMany_Optional_Inverse3Id` AS `OneToMany_Optional_Inverse3Id0`, `l0`.`OneToMany_Optional_Self_Inverse3Id` AS `OneToMany_Optional_Self_Inverse3Id0`, `l0`.`OneToMany_Required_Inverse3Id` AS `OneToMany_Required_Inverse3Id0`, `l0`.`OneToMany_Required_Self_Inverse3Id` AS `OneToMany_Required_Self_Inverse3Id0`, `l0`.`OneToOne_Optional_PK_Inverse3Id` AS `OneToOne_Optional_PK_Inverse3Id0`, `l0`.`OneToOne_Optional_Self3Id` AS `OneToOne_Optional_Self3Id0`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l3`.`Id` AS `Id1`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name` AS `Name0`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l1`.`Level2_Optional_Id` AS `Level2_Optional_Id0`, `l1`.`Level2_Required_Id` AS `Level2_Required_Id0`, `l1`.`Name` AS `Name1`, `l1`.`OneToMany_Optional_Inverse3Id` AS `OneToMany_Optional_Inverse3Id0`, `l1`.`OneToMany_Optional_Self_Inverse3Id` AS `OneToMany_Optional_Self_Inverse3Id0`, `l1`.`OneToMany_Required_Inverse3Id` AS `OneToMany_Required_Inverse3Id0`, `l1`.`OneToMany_Required_Self_Inverse3Id` AS `OneToMany_Required_Self_Inverse3Id0`, `l1`.`OneToOne_Optional_PK_Inverse3Id` AS `OneToOne_Optional_PK_Inverse3Id0`, `l1`.`OneToOne_Optional_Self3Id` AS `OneToOne_Optional_Self3Id0`
     FROM (
-        SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l2`
-        WHERE (`l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`) AND ((`l2`.`Name` <> 'Foo') OR `l2`.`Name` IS NULL)
-        ORDER BY `l2`.`Id`
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 2
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`Level2_Required_Id`
-    LEFT JOIN `LevelThree` AS `l1` ON `t`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-) AS `t0` ON TRUE
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`");
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Required_Id`
+    LEFT JOIN `LevelThree` AS `l3` ON `l2`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""");
         }
 
         public override async Task Filtered_include_multiple_multi_level_includes_with_first_level_using_filter_include_on_one_of_the_chains_only(bool async)
@@ -1190,194 +1260,213 @@ public override async Task Filtered_include_multiple_multi_level_includes_with_f
             await base
                 .Filtered_include_multiple_multi_level_includes_with_first_level_using_filter_include_on_one_of_the_chains_only(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `t0`.`Level2_Optional_Id0`, `t0`.`Level2_Required_Id0`, `t0`.`Name1`, `t0`.`OneToMany_Optional_Inverse3Id0`, `t0`.`OneToMany_Optional_Self_Inverse3Id0`, `t0`.`OneToMany_Required_Inverse3Id0`, `t0`.`OneToMany_Required_Self_Inverse3Id0`, `t0`.`OneToOne_Optional_PK_Inverse3Id0`, `t0`.`OneToOne_Optional_Self3Id0`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Level2_Optional_Id0`, `s`.`Level2_Required_Id0`, `s`.`Name1`, `s`.`OneToMany_Optional_Inverse3Id0`, `s`.`OneToMany_Optional_Self_Inverse3Id0`, `s`.`OneToMany_Required_Inverse3Id0`, `s`.`OneToMany_Required_Self_Inverse3Id0`, `s`.`OneToOne_Optional_PK_Inverse3Id0`, `s`.`OneToOne_Optional_Self3Id0`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l1`.`Id` AS `Id1`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l0`.`Level2_Optional_Id` AS `Level2_Optional_Id0`, `l0`.`Level2_Required_Id` AS `Level2_Required_Id0`, `l0`.`Name` AS `Name1`, `l0`.`OneToMany_Optional_Inverse3Id` AS `OneToMany_Optional_Inverse3Id0`, `l0`.`OneToMany_Optional_Self_Inverse3Id` AS `OneToMany_Optional_Self_Inverse3Id0`, `l0`.`OneToMany_Required_Inverse3Id` AS `OneToMany_Required_Inverse3Id0`, `l0`.`OneToMany_Required_Self_Inverse3Id` AS `OneToMany_Required_Self_Inverse3Id0`, `l0`.`OneToOne_Optional_PK_Inverse3Id` AS `OneToOne_Optional_PK_Inverse3Id0`, `l0`.`OneToOne_Optional_Self3Id` AS `OneToOne_Optional_Self3Id0`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l3`.`Id` AS `Id1`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name` AS `Name0`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l1`.`Level2_Optional_Id` AS `Level2_Optional_Id0`, `l1`.`Level2_Required_Id` AS `Level2_Required_Id0`, `l1`.`Name` AS `Name1`, `l1`.`OneToMany_Optional_Inverse3Id` AS `OneToMany_Optional_Inverse3Id0`, `l1`.`OneToMany_Optional_Self_Inverse3Id` AS `OneToMany_Optional_Self_Inverse3Id0`, `l1`.`OneToMany_Required_Inverse3Id` AS `OneToMany_Required_Inverse3Id0`, `l1`.`OneToMany_Required_Self_Inverse3Id` AS `OneToMany_Required_Self_Inverse3Id0`, `l1`.`OneToOne_Optional_PK_Inverse3Id` AS `OneToOne_Optional_PK_Inverse3Id0`, `l1`.`OneToOne_Optional_Self3Id` AS `OneToOne_Optional_Self3Id0`
     FROM (
-        SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l2`
-        WHERE (`l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`) AND ((`l2`.`Name` <> 'Foo') OR `l2`.`Name` IS NULL)
-        ORDER BY `l2`.`Id`
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 2
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`Level2_Required_Id`
-    LEFT JOIN `LevelThree` AS `l1` ON `t`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-) AS `t0` ON TRUE
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`");
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Required_Id`
+    LEFT JOIN `LevelThree` AS `l3` ON `l2`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""");
         }
 
         public override async Task Filtered_include_and_non_filtered_include_on_same_navigation1(bool async)
         {
             await base.Filtered_include_and_non_filtered_include_on_same_navigation1(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 3
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Filtered_include_and_non_filtered_include_on_same_navigation2(bool async)
         {
             await base.Filtered_include_and_non_filtered_include_on_same_navigation2(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 3
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Filtered_include_and_non_filtered_include_followed_by_then_include_on_same_navigation(bool async)
         {
             await base.Filtered_include_and_non_filtered_include_followed_by_then_include_on_same_navigation(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `t1`.`Id0`, `t1`.`Level2_Optional_Id`, `t1`.`Level2_Required_Id`, `t1`.`Name0`, `t1`.`OneToMany_Optional_Inverse3Id`, `t1`.`OneToMany_Optional_Self_Inverse3Id`, `t1`.`OneToMany_Required_Inverse3Id`, `t1`.`OneToMany_Required_Self_Inverse3Id`, `t1`.`OneToOne_Optional_PK_Inverse3Id`, `t1`.`OneToOne_Optional_Self3Id`, `t1`.`Id1`, `t1`.`Level3_Optional_Id`, `t1`.`Level3_Required_Id`, `t1`.`Name1`, `t1`.`OneToMany_Optional_Inverse4Id`, `t1`.`OneToMany_Optional_Self_Inverse4Id`, `t1`.`OneToMany_Required_Inverse4Id`, `t1`.`OneToMany_Required_Self_Inverse4Id`, `t1`.`OneToOne_Optional_PK_Inverse4Id`, `t1`.`OneToOne_Optional_Self4Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id1`, `s`.`Level3_Optional_Id`, `s`.`Level3_Required_Id`, `s`.`Name1`, `s`.`OneToMany_Optional_Inverse4Id`, `s`.`OneToMany_Optional_Self_Inverse4Id`, `s`.`OneToMany_Required_Inverse4Id`, `s`.`OneToMany_Required_Self_Inverse4Id`, `s`.`OneToOne_Optional_PK_Inverse4Id`, `s`.`OneToOne_Optional_Self4Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l0`.`Level2_Optional_Id`, `l0`.`Level2_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse3Id`, `l0`.`OneToMany_Optional_Self_Inverse3Id`, `l0`.`OneToMany_Required_Inverse3Id`, `l0`.`OneToMany_Required_Self_Inverse3Id`, `l0`.`OneToOne_Optional_PK_Inverse3Id`, `l0`.`OneToOne_Optional_Self3Id`, `t0`.`Id` AS `Id1`, `t0`.`Level3_Optional_Id`, `t0`.`Level3_Required_Id`, `t0`.`Name` AS `Name1`, `t0`.`OneToMany_Optional_Inverse4Id`, `t0`.`OneToMany_Optional_Self_Inverse4Id`, `t0`.`OneToMany_Required_Inverse4Id`, `t0`.`OneToMany_Required_Self_Inverse4Id`, `t0`.`OneToOne_Optional_PK_Inverse4Id`, `t0`.`OneToOne_Optional_Self4Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l4`.`Id` AS `Id1`, `l4`.`Level3_Optional_Id`, `l4`.`Level3_Required_Id`, `l4`.`Name` AS `Name1`, `l4`.`OneToMany_Optional_Inverse4Id`, `l4`.`OneToMany_Optional_Self_Inverse4Id`, `l4`.`OneToMany_Required_Inverse4Id`, `l4`.`OneToMany_Required_Self_Inverse4Id`, `l4`.`OneToOne_Optional_PK_Inverse4Id`, `l4`.`OneToOne_Optional_Self4Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE (`l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 1
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`OneToOne_Optional_PK_Inverse3Id`
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`OneToOne_Optional_PK_Inverse3Id`
     LEFT JOIN (
-        SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`
-        FROM `LevelFour` AS `l2`
-        WHERE `l2`.`Id` > 1
-    ) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse4Id`
-) AS `t1` ON TRUE
-ORDER BY `l`.`Id`, `t1`.`Id`, `t1`.`Id0`");
+        SELECT `l3`.`Id`, `l3`.`Level3_Optional_Id`, `l3`.`Level3_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse4Id`, `l3`.`OneToMany_Optional_Self_Inverse4Id`, `l3`.`OneToMany_Required_Inverse4Id`, `l3`.`OneToMany_Required_Self_Inverse4Id`, `l3`.`OneToOne_Optional_PK_Inverse4Id`, `l3`.`OneToOne_Optional_Self4Id`
+        FROM `LevelFour` AS `l3`
+        WHERE `l3`.`Id` > 1
+    ) AS `l4` ON `l1`.`Id` = `l4`.`OneToMany_Optional_Inverse4Id`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""");
         }
 
         public override async Task Filtered_include_complex_three_level_with_middle_having_filter1(bool async)
         {
             await base.Filtered_include_complex_three_level_with_middle_having_filter1(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `t1`.`Id0`, `t1`.`Level2_Optional_Id`, `t1`.`Level2_Required_Id`, `t1`.`Name0`, `t1`.`OneToMany_Optional_Inverse3Id`, `t1`.`OneToMany_Optional_Self_Inverse3Id`, `t1`.`OneToMany_Required_Inverse3Id`, `t1`.`OneToMany_Required_Self_Inverse3Id`, `t1`.`OneToOne_Optional_PK_Inverse3Id`, `t1`.`OneToOne_Optional_Self3Id`, `t1`.`Id00`, `t1`.`Level3_Optional_Id`, `t1`.`Level3_Required_Id`, `t1`.`Name00`, `t1`.`OneToMany_Optional_Inverse4Id`, `t1`.`OneToMany_Optional_Self_Inverse4Id`, `t1`.`OneToMany_Required_Inverse4Id`, `t1`.`OneToMany_Required_Self_Inverse4Id`, `t1`.`OneToOne_Optional_PK_Inverse4Id`, `t1`.`OneToOne_Optional_Self4Id`, `t1`.`Id1`, `t1`.`Level3_Optional_Id0`, `t1`.`Level3_Required_Id0`, `t1`.`Name1`, `t1`.`OneToMany_Optional_Inverse4Id0`, `t1`.`OneToMany_Optional_Self_Inverse4Id0`, `t1`.`OneToMany_Required_Inverse4Id0`, `t1`.`OneToMany_Required_Self_Inverse4Id0`, `t1`.`OneToOne_Optional_PK_Inverse4Id0`, `t1`.`OneToOne_Optional_Self4Id0`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s0`.`Id`, `s0`.`Date`, `s0`.`Level1_Optional_Id`, `s0`.`Level1_Required_Id`, `s0`.`Name`, `s0`.`OneToMany_Optional_Inverse2Id`, `s0`.`OneToMany_Optional_Self_Inverse2Id`, `s0`.`OneToMany_Required_Inverse2Id`, `s0`.`OneToMany_Required_Self_Inverse2Id`, `s0`.`OneToOne_Optional_PK_Inverse2Id`, `s0`.`OneToOne_Optional_Self2Id`, `s0`.`Id0`, `s0`.`Level2_Optional_Id`, `s0`.`Level2_Required_Id`, `s0`.`Name0`, `s0`.`OneToMany_Optional_Inverse3Id`, `s0`.`OneToMany_Optional_Self_Inverse3Id`, `s0`.`OneToMany_Required_Inverse3Id`, `s0`.`OneToMany_Required_Self_Inverse3Id`, `s0`.`OneToOne_Optional_PK_Inverse3Id`, `s0`.`OneToOne_Optional_Self3Id`, `s0`.`Id00`, `s0`.`Level3_Optional_Id`, `s0`.`Level3_Required_Id`, `s0`.`Name00`, `s0`.`OneToMany_Optional_Inverse4Id`, `s0`.`OneToMany_Optional_Self_Inverse4Id`, `s0`.`OneToMany_Required_Inverse4Id`, `s0`.`OneToMany_Required_Self_Inverse4Id`, `s0`.`OneToOne_Optional_PK_Inverse4Id`, `s0`.`OneToOne_Optional_Self4Id`, `s0`.`Id1`, `s0`.`Level3_Optional_Id0`, `s0`.`Level3_Required_Id0`, `s0`.`Name1`, `s0`.`OneToMany_Optional_Inverse4Id0`, `s0`.`OneToMany_Optional_Self_Inverse4Id0`, `s0`.`OneToMany_Required_Inverse4Id0`, `s0`.`OneToMany_Required_Self_Inverse4Id0`, `s0`.`OneToOne_Optional_PK_Inverse4Id0`, `s0`.`OneToOne_Optional_Self4Id0`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `t0`.`Id` AS `Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name` AS `Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `t0`.`Id0` AS `Id00`, `t0`.`Level3_Optional_Id`, `t0`.`Level3_Required_Id`, `t0`.`Name0` AS `Name00`, `t0`.`OneToMany_Optional_Inverse4Id`, `t0`.`OneToMany_Optional_Self_Inverse4Id`, `t0`.`OneToMany_Required_Inverse4Id`, `t0`.`OneToMany_Required_Self_Inverse4Id`, `t0`.`OneToOne_Optional_PK_Inverse4Id`, `t0`.`OneToOne_Optional_Self4Id`, `t0`.`Id1`, `t0`.`Level3_Optional_Id0`, `t0`.`Level3_Required_Id0`, `t0`.`Name1`, `t0`.`OneToMany_Optional_Inverse4Id0`, `t0`.`OneToMany_Optional_Self_Inverse4Id0`, `t0`.`OneToMany_Required_Inverse4Id0`, `t0`.`OneToMany_Required_Self_Inverse4Id0`, `t0`.`OneToOne_Optional_PK_Inverse4Id0`, `t0`.`OneToOne_Optional_Self4Id0`
+    SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `s`.`Id` AS `Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name` AS `Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id0` AS `Id00`, `s`.`Level3_Optional_Id`, `s`.`Level3_Required_Id`, `s`.`Name0` AS `Name00`, `s`.`OneToMany_Optional_Inverse4Id`, `s`.`OneToMany_Optional_Self_Inverse4Id`, `s`.`OneToMany_Required_Inverse4Id`, `s`.`OneToMany_Required_Self_Inverse4Id`, `s`.`OneToOne_Optional_PK_Inverse4Id`, `s`.`OneToOne_Optional_Self4Id`, `s`.`Id1`, `s`.`Level3_Optional_Id0`, `s`.`Level3_Required_Id0`, `s`.`Name1`, `s`.`OneToMany_Optional_Inverse4Id0`, `s`.`OneToMany_Optional_Self_Inverse4Id0`, `s`.`OneToMany_Required_Inverse4Id0`, `s`.`OneToMany_Required_Self_Inverse4Id0`, `s`.`OneToOne_Optional_PK_Inverse4Id0`, `s`.`OneToOne_Optional_Self4Id0`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN LATERAL (
-        SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `l1`.`Id` AS `Id0`, `l1`.`Level3_Optional_Id`, `l1`.`Level3_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse4Id`, `l1`.`OneToMany_Optional_Self_Inverse4Id`, `l1`.`OneToMany_Required_Inverse4Id`, `l1`.`OneToMany_Required_Self_Inverse4Id`, `l1`.`OneToOne_Optional_PK_Inverse4Id`, `l1`.`OneToOne_Optional_Self4Id`, `l2`.`Id` AS `Id1`, `l2`.`Level3_Optional_Id` AS `Level3_Optional_Id0`, `l2`.`Level3_Required_Id` AS `Level3_Required_Id0`, `l2`.`Name` AS `Name1`, `l2`.`OneToMany_Optional_Inverse4Id` AS `OneToMany_Optional_Inverse4Id0`, `l2`.`OneToMany_Optional_Self_Inverse4Id` AS `OneToMany_Optional_Self_Inverse4Id0`, `l2`.`OneToMany_Required_Inverse4Id` AS `OneToMany_Required_Inverse4Id0`, `l2`.`OneToMany_Required_Self_Inverse4Id` AS `OneToMany_Required_Self_Inverse4Id0`, `l2`.`OneToOne_Optional_PK_Inverse4Id` AS `OneToOne_Optional_PK_Inverse4Id0`, `l2`.`OneToOne_Optional_Self4Id` AS `OneToOne_Optional_Self4Id0`
+        SELECT `l4`.`Id`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`, `l2`.`Id` AS `Id0`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l3`.`Id` AS `Id1`, `l3`.`Level3_Optional_Id` AS `Level3_Optional_Id0`, `l3`.`Level3_Required_Id` AS `Level3_Required_Id0`, `l3`.`Name` AS `Name1`, `l3`.`OneToMany_Optional_Inverse4Id` AS `OneToMany_Optional_Inverse4Id0`, `l3`.`OneToMany_Optional_Self_Inverse4Id` AS `OneToMany_Optional_Self_Inverse4Id0`, `l3`.`OneToMany_Required_Inverse4Id` AS `OneToMany_Required_Inverse4Id0`, `l3`.`OneToMany_Required_Self_Inverse4Id` AS `OneToMany_Required_Self_Inverse4Id0`, `l3`.`OneToOne_Optional_PK_Inverse4Id` AS `OneToOne_Optional_PK_Inverse4Id0`, `l3`.`OneToOne_Optional_Self4Id` AS `OneToOne_Optional_Self4Id0`
         FROM (
-            SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
-            FROM `LevelThree` AS `l3`
-            WHERE (`l0`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`) AND ((`l3`.`Name` <> 'Foo') OR `l3`.`Name` IS NULL)
-            ORDER BY `l3`.`Id`
+            SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
+            FROM `LevelThree` AS `l1`
+            WHERE (`l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
+            ORDER BY `l1`.`Id`
             LIMIT 1
-        ) AS `t`
-        LEFT JOIN `LevelFour` AS `l1` ON `t`.`Id` = `l1`.`OneToMany_Optional_Inverse4Id`
-        LEFT JOIN `LevelFour` AS `l2` ON `t`.`Id` = `l2`.`OneToMany_Required_Inverse4Id`
-    ) AS `t0` ON TRUE
-) AS `t1` ON `l`.`Id` = `t1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t1`.`Id`, `t1`.`Id0`, `t1`.`Id00`");
+        ) AS `l4`
+        LEFT JOIN `LevelFour` AS `l2` ON `l4`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
+        LEFT JOIN `LevelFour` AS `l3` ON `l4`.`Id` = `l3`.`OneToMany_Required_Inverse4Id`
+    ) AS `s` ON TRUE
+) AS `s0` ON `l`.`Id` = `s0`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id00`
+""");
         }
 
         public override async Task Filtered_include_complex_three_level_with_middle_having_filter2(bool async)
         {
             await base.Filtered_include_complex_three_level_with_middle_having_filter2(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `t1`.`Id0`, `t1`.`Level2_Optional_Id`, `t1`.`Level2_Required_Id`, `t1`.`Name0`, `t1`.`OneToMany_Optional_Inverse3Id`, `t1`.`OneToMany_Optional_Self_Inverse3Id`, `t1`.`OneToMany_Required_Inverse3Id`, `t1`.`OneToMany_Required_Self_Inverse3Id`, `t1`.`OneToOne_Optional_PK_Inverse3Id`, `t1`.`OneToOne_Optional_Self3Id`, `t1`.`Id00`, `t1`.`Level3_Optional_Id`, `t1`.`Level3_Required_Id`, `t1`.`Name00`, `t1`.`OneToMany_Optional_Inverse4Id`, `t1`.`OneToMany_Optional_Self_Inverse4Id`, `t1`.`OneToMany_Required_Inverse4Id`, `t1`.`OneToMany_Required_Self_Inverse4Id`, `t1`.`OneToOne_Optional_PK_Inverse4Id`, `t1`.`OneToOne_Optional_Self4Id`, `t1`.`Id1`, `t1`.`Level3_Optional_Id0`, `t1`.`Level3_Required_Id0`, `t1`.`Name1`, `t1`.`OneToMany_Optional_Inverse4Id0`, `t1`.`OneToMany_Optional_Self_Inverse4Id0`, `t1`.`OneToMany_Required_Inverse4Id0`, `t1`.`OneToMany_Required_Self_Inverse4Id0`, `t1`.`OneToOne_Optional_PK_Inverse4Id0`, `t1`.`OneToOne_Optional_Self4Id0`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `s0`.`Id`, `s0`.`Date`, `s0`.`Level1_Optional_Id`, `s0`.`Level1_Required_Id`, `s0`.`Name`, `s0`.`OneToMany_Optional_Inverse2Id`, `s0`.`OneToMany_Optional_Self_Inverse2Id`, `s0`.`OneToMany_Required_Inverse2Id`, `s0`.`OneToMany_Required_Self_Inverse2Id`, `s0`.`OneToOne_Optional_PK_Inverse2Id`, `s0`.`OneToOne_Optional_Self2Id`, `s0`.`Id0`, `s0`.`Level2_Optional_Id`, `s0`.`Level2_Required_Id`, `s0`.`Name0`, `s0`.`OneToMany_Optional_Inverse3Id`, `s0`.`OneToMany_Optional_Self_Inverse3Id`, `s0`.`OneToMany_Required_Inverse3Id`, `s0`.`OneToMany_Required_Self_Inverse3Id`, `s0`.`OneToOne_Optional_PK_Inverse3Id`, `s0`.`OneToOne_Optional_Self3Id`, `s0`.`Id00`, `s0`.`Level3_Optional_Id`, `s0`.`Level3_Required_Id`, `s0`.`Name00`, `s0`.`OneToMany_Optional_Inverse4Id`, `s0`.`OneToMany_Optional_Self_Inverse4Id`, `s0`.`OneToMany_Required_Inverse4Id`, `s0`.`OneToMany_Required_Self_Inverse4Id`, `s0`.`OneToOne_Optional_PK_Inverse4Id`, `s0`.`OneToOne_Optional_Self4Id`, `s0`.`Id1`, `s0`.`Level3_Optional_Id0`, `s0`.`Level3_Required_Id0`, `s0`.`Name1`, `s0`.`OneToMany_Optional_Inverse4Id0`, `s0`.`OneToMany_Optional_Self_Inverse4Id0`, `s0`.`OneToMany_Required_Inverse4Id0`, `s0`.`OneToMany_Required_Self_Inverse4Id0`, `s0`.`OneToOne_Optional_PK_Inverse4Id0`, `s0`.`OneToOne_Optional_Self4Id0`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `t0`.`Id` AS `Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name` AS `Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `t0`.`Id0` AS `Id00`, `t0`.`Level3_Optional_Id`, `t0`.`Level3_Required_Id`, `t0`.`Name0` AS `Name00`, `t0`.`OneToMany_Optional_Inverse4Id`, `t0`.`OneToMany_Optional_Self_Inverse4Id`, `t0`.`OneToMany_Required_Inverse4Id`, `t0`.`OneToMany_Required_Self_Inverse4Id`, `t0`.`OneToOne_Optional_PK_Inverse4Id`, `t0`.`OneToOne_Optional_Self4Id`, `t0`.`Id1`, `t0`.`Level3_Optional_Id0`, `t0`.`Level3_Required_Id0`, `t0`.`Name1`, `t0`.`OneToMany_Optional_Inverse4Id0`, `t0`.`OneToMany_Optional_Self_Inverse4Id0`, `t0`.`OneToMany_Required_Inverse4Id0`, `t0`.`OneToMany_Required_Self_Inverse4Id0`, `t0`.`OneToOne_Optional_PK_Inverse4Id0`, `t0`.`OneToOne_Optional_Self4Id0`
+    SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `s`.`Id` AS `Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name` AS `Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id0` AS `Id00`, `s`.`Level3_Optional_Id`, `s`.`Level3_Required_Id`, `s`.`Name0` AS `Name00`, `s`.`OneToMany_Optional_Inverse4Id`, `s`.`OneToMany_Optional_Self_Inverse4Id`, `s`.`OneToMany_Required_Inverse4Id`, `s`.`OneToMany_Required_Self_Inverse4Id`, `s`.`OneToOne_Optional_PK_Inverse4Id`, `s`.`OneToOne_Optional_Self4Id`, `s`.`Id1`, `s`.`Level3_Optional_Id0`, `s`.`Level3_Required_Id0`, `s`.`Name1`, `s`.`OneToMany_Optional_Inverse4Id0`, `s`.`OneToMany_Optional_Self_Inverse4Id0`, `s`.`OneToMany_Required_Inverse4Id0`, `s`.`OneToMany_Required_Self_Inverse4Id0`, `s`.`OneToOne_Optional_PK_Inverse4Id0`, `s`.`OneToOne_Optional_Self4Id0`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN LATERAL (
-        SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `l1`.`Id` AS `Id0`, `l1`.`Level3_Optional_Id`, `l1`.`Level3_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse4Id`, `l1`.`OneToMany_Optional_Self_Inverse4Id`, `l1`.`OneToMany_Required_Inverse4Id`, `l1`.`OneToMany_Required_Self_Inverse4Id`, `l1`.`OneToOne_Optional_PK_Inverse4Id`, `l1`.`OneToOne_Optional_Self4Id`, `l2`.`Id` AS `Id1`, `l2`.`Level3_Optional_Id` AS `Level3_Optional_Id0`, `l2`.`Level3_Required_Id` AS `Level3_Required_Id0`, `l2`.`Name` AS `Name1`, `l2`.`OneToMany_Optional_Inverse4Id` AS `OneToMany_Optional_Inverse4Id0`, `l2`.`OneToMany_Optional_Self_Inverse4Id` AS `OneToMany_Optional_Self_Inverse4Id0`, `l2`.`OneToMany_Required_Inverse4Id` AS `OneToMany_Required_Inverse4Id0`, `l2`.`OneToMany_Required_Self_Inverse4Id` AS `OneToMany_Required_Self_Inverse4Id0`, `l2`.`OneToOne_Optional_PK_Inverse4Id` AS `OneToOne_Optional_PK_Inverse4Id0`, `l2`.`OneToOne_Optional_Self4Id` AS `OneToOne_Optional_Self4Id0`
+        SELECT `l4`.`Id`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`, `l2`.`Id` AS `Id0`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l3`.`Id` AS `Id1`, `l3`.`Level3_Optional_Id` AS `Level3_Optional_Id0`, `l3`.`Level3_Required_Id` AS `Level3_Required_Id0`, `l3`.`Name` AS `Name1`, `l3`.`OneToMany_Optional_Inverse4Id` AS `OneToMany_Optional_Inverse4Id0`, `l3`.`OneToMany_Optional_Self_Inverse4Id` AS `OneToMany_Optional_Self_Inverse4Id0`, `l3`.`OneToMany_Required_Inverse4Id` AS `OneToMany_Required_Inverse4Id0`, `l3`.`OneToMany_Required_Self_Inverse4Id` AS `OneToMany_Required_Self_Inverse4Id0`, `l3`.`OneToOne_Optional_PK_Inverse4Id` AS `OneToOne_Optional_PK_Inverse4Id0`, `l3`.`OneToOne_Optional_Self4Id` AS `OneToOne_Optional_Self4Id0`
         FROM (
-            SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
-            FROM `LevelThree` AS `l3`
-            WHERE (`l0`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`) AND ((`l3`.`Name` <> 'Foo') OR `l3`.`Name` IS NULL)
-            ORDER BY `l3`.`Id`
+            SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
+            FROM `LevelThree` AS `l1`
+            WHERE (`l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
+            ORDER BY `l1`.`Id`
             LIMIT 1
-        ) AS `t`
-        LEFT JOIN `LevelFour` AS `l1` ON `t`.`Id` = `l1`.`OneToMany_Optional_Inverse4Id`
-        LEFT JOIN `LevelFour` AS `l2` ON `t`.`Id` = `l2`.`OneToMany_Required_Inverse4Id`
-    ) AS `t0` ON TRUE
-) AS `t1` ON `l`.`Id` = `t1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t1`.`Id`, `t1`.`Id0`, `t1`.`Id00`");
+        ) AS `l4`
+        LEFT JOIN `LevelFour` AS `l2` ON `l4`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
+        LEFT JOIN `LevelFour` AS `l3` ON `l4`.`Id` = `l3`.`OneToMany_Required_Inverse4Id`
+    ) AS `s` ON TRUE
+) AS `s0` ON `l`.`Id` = `s0`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id00`
+""");
         }
 
         public override async Task Filtered_include_variable_used_inside_filter(bool async)
         {
             await base.Filtered_include_variable_used_inside_filter(async);
 
-            AssertSql(
-                @"@__prm_0='Foo' (Size = 4000)
+        AssertSql(
+"""
+@__prm_0='Foo' (Size = 4000)
 
-SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> @__prm_0) OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 3
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Filtered_include_context_accessed_inside_filter(bool async)
         {
             await base.Filtered_include_context_accessed_inside_filter(async);
 
-            AssertSql(
-                @"SELECT COUNT(*)
-FROM `LevelOne` AS `l`",
+        AssertSql(
+"""
+SELECT COUNT(*)
+FROM `LevelOne` AS `l`
+""",
                 //
-                @"@__p_0='True'
+                """
+@__p_0='True'
 
-SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE @__p_0
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 3
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Filtered_include_context_accessed_inside_filter_correlated(bool async)
         {
             await base.Filtered_include_context_accessed_inside_filter_correlated(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l3`.`Id`, `l3`.`Date`, `l3`.`Level1_Optional_Id`, `l3`.`Level1_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`OneToMany_Optional_Self_Inverse2Id`, `l3`.`OneToMany_Required_Inverse2Id`, `l3`.`OneToMany_Required_Self_Inverse2Id`, `l3`.`OneToOne_Optional_PK_Inverse2Id`, `l3`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
@@ -1385,69 +1474,75 @@ LEFT JOIN (
             SELECT COUNT(*)
             FROM `LevelOne` AS `l1`
             WHERE `l1`.`Id` <> `l0`.`Id`) > 1
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id`");
+    ) AS `l2`
+    WHERE `l2`.`row` <= 3
+) AS `l3` ON `l`.`Id` = `l3`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`Id`
+""");
         }
 
         public override async Task Filtered_include_outer_parameter_used_inside_filter(bool async)
         {
             await base.Filtered_include_outer_parameter_used_inside_filter(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s0`.`Id`, `s0`.`Date`, `s0`.`Level1_Optional_Id`, `s0`.`Level1_Required_Id`, `s0`.`Name`, `s0`.`OneToMany_Optional_Inverse2Id`, `s0`.`OneToMany_Optional_Self_Inverse2Id`, `s0`.`OneToMany_Required_Inverse2Id`, `s0`.`OneToMany_Required_Self_Inverse2Id`, `s0`.`OneToOne_Optional_PK_Inverse2Id`, `s0`.`OneToOne_Optional_Self2Id`, `s0`.`Id0`, `s0`.`Level2_Optional_Id`, `s0`.`Level2_Required_Id`, `s0`.`Name0`, `s0`.`OneToMany_Optional_Inverse3Id`, `s0`.`OneToMany_Optional_Self_Inverse3Id`, `s0`.`OneToMany_Required_Inverse3Id`, `s0`.`OneToMany_Required_Self_Inverse3Id`, `s0`.`OneToOne_Optional_PK_Inverse3Id`, `s0`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-) AS `t` ON TRUE
+) AS `s` ON TRUE
 LEFT JOIN LATERAL (
-    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `t1`.`Id` AS `Id0`, `t1`.`Level2_Optional_Id`, `t1`.`Level2_Required_Id`, `t1`.`Name` AS `Name0`, `t1`.`OneToMany_Optional_Inverse3Id`, `t1`.`OneToMany_Optional_Self_Inverse3Id`, `t1`.`OneToMany_Required_Inverse3Id`, `t1`.`OneToMany_Required_Self_Inverse3Id`, `t1`.`OneToOne_Optional_PK_Inverse3Id`, `t1`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l4`.`Id` AS `Id0`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name` AS `Name0`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l2`
     LEFT JOIN (
         SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
         FROM `LevelThree` AS `l3`
         WHERE `l3`.`Id` <> `l`.`Id`
-    ) AS `t1` ON `l2`.`Id` = `t1`.`OneToMany_Optional_Inverse3Id`
-) AS `t0` ON TRUE
-ORDER BY `l`.`Id`, `t`.`Id`, `t`.`Id0`, `t0`.`Id`");
+    ) AS `l4` ON `l2`.`Id` = `l4`.`OneToMany_Optional_Inverse3Id`
+) AS `s0` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`, `s0`.`Id`
+""");
         }
 
         public override async Task Complex_query_with_let_collection_projection_FirstOrDefault(bool async)
         {
             await base.Complex_query_with_let_collection_projection_FirstOrDefault(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t0`.`Id`, `t1`.`Name`, `t1`.`Id`, `t0`.`c`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l4`.`Id`, `l5`.`Name`, `l5`.`Id`, `l4`.`c`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`c`, `t`.`Id`, `t`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l3`.`c`, `l3`.`Id`, `l3`.`OneToMany_Optional_Inverse2Id`
     FROM (
         SELECT 1 AS `c`, `l0`.`Id`, `l0`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
+    ) AS `l3`
+    WHERE `l3`.`row` <= 1
+) AS `l4` ON `l`.`Id` = `l4`.`OneToMany_Optional_Inverse2Id`
 LEFT JOIN LATERAL (
     SELECT `l1`.`Name`, `l1`.`Id`
     FROM `LevelOne` AS `l1`
     WHERE EXISTS (
         SELECT 1
         FROM `LevelTwo` AS `l2`
-        WHERE (`l1`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`) AND (`l2`.`Id` = `t0`.`Id`))
-) AS `t1` ON TRUE
-ORDER BY `l`.`Id`, `t0`.`Id`");
+        WHERE (`l1`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`) AND (`l2`.`Id` = `l4`.`Id`))
+) AS `l5` ON TRUE
+ORDER BY `l`.`Id`, `l4`.`Id`
+""");
         }
 
         public override async Task SelectMany_DefaultIfEmpty_multiple_times_with_joins_projecting_a_collection(bool async)
         {
             await base.SelectMany_DefaultIfEmpty_multiple_times_with_joins_projecting_a_collection(async);
 
-            AssertSql(
-                @"SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`, `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `l14`.`Name`
+        AssertSql(
+"""
+SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`, `l16`.`Id`, `l16`.`Date`, `l16`.`Level1_Optional_Id`, `l16`.`Level1_Required_Id`, `l16`.`Name`, `l16`.`OneToMany_Optional_Inverse2Id`, `l16`.`OneToMany_Optional_Self_Inverse2Id`, `l16`.`OneToMany_Required_Inverse2Id`, `l16`.`OneToMany_Required_Self_Inverse2Id`, `l16`.`OneToOne_Optional_PK_Inverse2Id`, `l16`.`OneToOne_Optional_Self2Id`, `l14`.`Name`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Required_Id`
 LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Optional_Id`
@@ -1458,155 +1553,164 @@ INNER JOIN (
     INNER JOIN `LevelThree` AS `l4` ON `l3`.`Level3_Required_Id` = `l4`.`Id`
     LEFT JOIN `LevelTwo` AS `l5` ON `l4`.`Level2_Optional_Id` = `l5`.`Id`
     LEFT JOIN `LevelTwo` AS `l6` ON `l5`.`Id` = `l6`.`OneToMany_Required_Self_Inverse2Id`
-) AS `t` ON `l2`.`Id` = `t`.`Id2`
+) AS `s` ON `l2`.`Id` = `s`.`Id2`
 LEFT JOIN (
     SELECT `l7`.`Id`, `l8`.`Id` AS `Id0`, `l9`.`Id` AS `Id1`, `l10`.`Id` AS `Id2`, `l10`.`Level2_Optional_Id` AS `Level2_Optional_Id0`
     FROM `LevelFour` AS `l7`
     INNER JOIN `LevelThree` AS `l8` ON `l7`.`Level3_Required_Id` = `l8`.`Id`
     INNER JOIN `LevelTwo` AS `l9` ON `l8`.`Level2_Required_Id` = `l9`.`Id`
     LEFT JOIN `LevelThree` AS `l10` ON `l9`.`Id` = `l10`.`OneToMany_Required_Inverse3Id`
-) AS `t0` ON `t`.`Id2` = `t0`.`Id2`
+) AS `s0` ON `s`.`Id2` = `s0`.`Id2`
 LEFT JOIN `LevelThree` AS `l11` ON `l2`.`OneToMany_Optional_Inverse4Id` = `l11`.`Id`
-LEFT JOIN `LevelThree` AS `l12` ON `t`.`Id2` = `l12`.`Level2_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l13` ON `t0`.`Level2_Optional_Id0` = `l13`.`Id`
+LEFT JOIN `LevelThree` AS `l12` ON `s`.`Id2` = `l12`.`Level2_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l13` ON `s0`.`Level2_Optional_Id0` = `l13`.`Id`
 LEFT JOIN `LevelThree` AS `l14` ON `l13`.`Id` = `l14`.`Level2_Required_Id`
 LEFT JOIN (
     SELECT `l15`.`Id`, `l15`.`Date`, `l15`.`Level1_Optional_Id`, `l15`.`Level1_Required_Id`, `l15`.`Name`, `l15`.`OneToMany_Optional_Inverse2Id`, `l15`.`OneToMany_Optional_Self_Inverse2Id`, `l15`.`OneToMany_Required_Inverse2Id`, `l15`.`OneToMany_Required_Self_Inverse2Id`, `l15`.`OneToOne_Optional_PK_Inverse2Id`, `l15`.`OneToOne_Optional_Self2Id`
     FROM `LevelTwo` AS `l15`
     WHERE `l15`.`Id` <> 42
-) AS `t1` ON `t`.`Id2` = `t1`.`OneToMany_Optional_Self_Inverse2Id`
+) AS `l16` ON `s`.`Id2` = `l16`.`OneToMany_Optional_Self_Inverse2Id`
 WHERE (`l11`.`Name` <> 'Foo') OR `l11`.`Name` IS NULL
-ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`");
+ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`
+""");
         }
 
         public override async Task Take_Select_collection_Take(bool async)
         {
             await base.Take_Select_collection_Take(async);
 
-            AssertSql(
-                @"@__p_0='1'
+        AssertSql(
+"""
+@__p_0='1'
 
-SELECT `t`.`Id`, `t`.`Name`, `t0`.`Id`, `t0`.`Name`, `t0`.`Level1Id`, `t0`.`Level2Id`, `t0`.`Id0`, `t0`.`Date`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`
+SELECT `l3`.`Id`, `l3`.`Name`, `s`.`Id`, `s`.`Name`, `s`.`Level1Id`, `s`.`Level2Id`, `s`.`Id0`, `s`.`Date`, `s`.`Name0`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Id`
     LIMIT @__p_0
-) AS `t`
+) AS `l3`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `t1`.`Level1_Required_Id` AS `Level2Id`, `l0`.`Id` AS `Id0`, `l0`.`Date`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
+    SELECT `l2`.`Id`, `l2`.`Name`, `l2`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `l2`.`Level1_Required_Id` AS `Level2Id`, `l1`.`Id` AS `Id0`, `l1`.`Date`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Required_Inverse2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE `t`.`Id` = `l1`.`OneToMany_Required_Inverse2Id`
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Required_Inverse2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE `l3`.`Id` = `l0`.`OneToMany_Required_Inverse2Id`
+        ORDER BY `l0`.`Id`
         LIMIT 3
-    ) AS `t1`
-    INNER JOIN `LevelOne` AS `l0` ON `t1`.`Level1_Required_Id` = `l0`.`Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id`, `t0`.`Id`");
+    ) AS `l2`
+    INNER JOIN `LevelOne` AS `l1` ON `l2`.`Level1_Required_Id` = `l1`.`Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Skip_Take_Select_collection_Skip_Take(bool async)
         {
             await base.Skip_Take_Select_collection_Skip_Take(async);
 
-            AssertSql(
-                @"@__p_0='1'
+        AssertSql(
+"""
+@__p_0='1'
 
-SELECT `t`.`Id`, `t`.`Name`, `t0`.`Id`, `t0`.`Name`, `t0`.`Level1Id`, `t0`.`Level2Id`, `t0`.`Id0`, `t0`.`Date`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`
+SELECT `l3`.`Id`, `l3`.`Name`, `s`.`Id`, `s`.`Name`, `s`.`Level1Id`, `s`.`Level2Id`, `s`.`Id0`, `s`.`Date`, `s`.`Name0`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Id`
     LIMIT @__p_0 OFFSET @__p_0
-) AS `t`
+) AS `l3`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `t1`.`Level1_Required_Id` AS `Level2Id`, `l0`.`Id` AS `Id0`, `l0`.`Date`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
+    SELECT `l2`.`Id`, `l2`.`Name`, `l2`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `l2`.`Level1_Required_Id` AS `Level2Id`, `l1`.`Id` AS `Id0`, `l1`.`Date`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Required_Inverse2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE `t`.`Id` = `l1`.`OneToMany_Required_Inverse2Id`
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Required_Inverse2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE `l3`.`Id` = `l0`.`OneToMany_Required_Inverse2Id`
+        ORDER BY `l0`.`Id`
         LIMIT 3 OFFSET 1
-    ) AS `t1`
-    INNER JOIN `LevelOne` AS `l0` ON `t1`.`Level1_Required_Id` = `l0`.`Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id`, `t0`.`Id`");
+    ) AS `l2`
+    INNER JOIN `LevelOne` AS `l1` ON `l2`.`Level1_Required_Id` = `l1`.`Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Projecting_collection_with_FirstOrDefault(bool async)
         {
             await base.Projecting_collection_with_FirstOrDefault(async);
 
-            AssertSql(
-                @"SELECT `t`.`Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l1`.`Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     WHERE `l`.`Id` = 1
     LIMIT 1
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `t`.`Id`");
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l1`.`Id`
+""");
         }
 
         public override async Task Filtered_include_Take_with_another_Take_on_top_level(bool async)
         {
             await base.Filtered_include_Take_with_another_Take_on_top_level(async);
 
-            AssertSql(
-                @"@__p_0='5'
+        AssertSql(
+"""
+@__p_0='5'
 
-SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`
+SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l3`.`OneToMany_Optional_Self_Inverse1Id`, `l3`.`OneToMany_Required_Self_Inverse1Id`, `l3`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Id`
     LIMIT @__p_0
-) AS `t`
+) AS `l3`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l0`.`Level2_Optional_Id`, `l0`.`Level2_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse3Id`, `l0`.`OneToMany_Optional_Self_Inverse3Id`, `l0`.`OneToMany_Required_Inverse3Id`, `l0`.`OneToMany_Required_Self_Inverse3Id`, `l0`.`OneToOne_Optional_PK_Inverse3Id`, `l0`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE `t`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-        ORDER BY `l1`.`Name` DESC
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE `l3`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
+        ORDER BY `l0`.`Name` DESC
         LIMIT 4
-    ) AS `t1`
-    LEFT JOIN `LevelThree` AS `l0` ON `t1`.`Id` = `l0`.`Level2_Optional_Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id`, `t0`.`Name` DESC, `t0`.`Id`");
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Optional_Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Id`, `s`.`Name` DESC, `s`.`Id`
+""");
         }
 
         public override async Task Filtered_include_Skip_Take_with_another_Skip_Take_on_top_level(bool async)
         {
             await base.Filtered_include_Skip_Take_with_another_Skip_Take_on_top_level(async);
 
-            AssertSql(
+        AssertSql(
 """
 @__p_1='5'
 @__p_0='1'
 
-SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`
+SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l3`.`OneToMany_Optional_Self_Inverse1Id`, `l3`.`OneToMany_Required_Self_Inverse1Id`, `l3`.`OneToOne_Optional_Self1Id`, `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Id` DESC
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
+) AS `l3`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l0`.`Level2_Optional_Id`, `l0`.`Level2_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse3Id`, `l0`.`OneToMany_Optional_Self_Inverse3Id`, `l0`.`OneToMany_Required_Inverse3Id`, `l0`.`OneToMany_Required_Self_Inverse3Id`, `l0`.`OneToOne_Optional_PK_Inverse3Id`, `l0`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE `t`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-        ORDER BY `l1`.`Name` DESC
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE `l3`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
+        ORDER BY `l0`.`Name` DESC
         LIMIT 4 OFFSET 1
-    ) AS `t1`
-    LEFT JOIN `LevelThree` AS `l0` ON `t1`.`Id` = `l0`.`Level2_Optional_Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id` DESC, `t0`.`Name` DESC, `t0`.`Id`
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Optional_Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Id` DESC, `s`.`Name` DESC, `s`.`Id`
 """);
         }
 
@@ -1614,102 +1718,110 @@ public override async Task Skip_Take_on_grouping_element_inside_collection_proje
         {
             await base.Skip_Take_on_grouping_element_inside_collection_projection(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t2`.`Date`, `t2`.`Id`, `t2`.`Date0`, `t2`.`Name`, `t2`.`OneToMany_Optional_Self_Inverse1Id`, `t2`.`OneToMany_Required_Self_Inverse1Id`, `t2`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `s`.`Date`, `s`.`Id`, `s`.`Date0`, `s`.`Name`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Date`, `t0`.`Id`, `t0`.`Date` AS `Date0`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`
+    SELECT `l2`.`Date`, `l4`.`Id`, `l4`.`Date` AS `Date0`, `l4`.`Name`, `l4`.`OneToMany_Optional_Self_Inverse1Id`, `l4`.`OneToMany_Required_Self_Inverse1Id`, `l4`.`OneToOne_Optional_Self1Id`
     FROM (
         SELECT `l0`.`Date`
         FROM `LevelOne` AS `l0`
         WHERE (`l0`.`Name` = `l`.`Name`) OR (`l0`.`Name` IS NULL AND (`l`.`Name` IS NULL))
         GROUP BY `l0`.`Date`
-    ) AS `t`
+    ) AS `l2`
     LEFT JOIN (
-        SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`
+        SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l3`.`OneToMany_Optional_Self_Inverse1Id`, `l3`.`OneToMany_Required_Self_Inverse1Id`, `l3`.`OneToOne_Optional_Self1Id`
         FROM (
             SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`Date` ORDER BY `l1`.`Name`) AS `row`
             FROM `LevelOne` AS `l1`
             WHERE (`l1`.`Name` = `l`.`Name`) OR (`l1`.`Name` IS NULL AND (`l`.`Name` IS NULL))
-        ) AS `t1`
-        WHERE (1 < `t1`.`row`) AND (`t1`.`row` <= 6)
-    ) AS `t0` ON `t`.`Date` = `t0`.`Date`
-) AS `t2` ON TRUE
-ORDER BY `l`.`Id`, `t2`.`Date`, `t2`.`Date0`, `t2`.`Name`");
+        ) AS `l3`
+        WHERE (1 < `l3`.`row`) AND (`l3`.`row` <= 6)
+    ) AS `l4` ON `l2`.`Date` = `l4`.`Date`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Date`, `s`.`Date0`, `s`.`Name`
+""");
         }
 
         public override async Task Skip_Take_on_grouping_element_with_collection_include(bool async)
         {
             await base.Skip_Take_on_grouping_element_with_collection_include(async);
 
-            AssertSql(
-                @"SELECT `t`.`Date`, `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t0`.`Id0`, `t0`.`Date0`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l2`.`Date`, `s`.`Id`, `s`.`Date`, `s`.`Name`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`, `s`.`Id0`, `s`.`Date0`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`
 FROM (
     SELECT `l`.`Date`
     FROM `LevelOne` AS `l`
     GROUP BY `l`.`Date`
-) AS `t`
+) AS `l2`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`, `l0`.`Id` AS `Id0`, `l0`.`Date` AS `Date0`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+    SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l3`.`OneToMany_Optional_Self_Inverse1Id`, `l3`.`OneToMany_Required_Self_Inverse1Id`, `l3`.`OneToOne_Optional_Self1Id`, `l1`.`Id` AS `Id0`, `l1`.`Date` AS `Date0`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`
-        FROM `LevelOne` AS `l1`
-        WHERE `t`.`Date` = `l1`.`Date`
-        ORDER BY `l1`.`Name`
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
+        FROM `LevelOne` AS `l0`
+        WHERE `l2`.`Date` = `l0`.`Date`
+        ORDER BY `l0`.`Name`
         LIMIT 5 OFFSET 1
-    ) AS `t1`
-    LEFT JOIN `LevelTwo` AS `l0` ON `t1`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Date`, `t0`.`Name`, `t0`.`Id`");
+    ) AS `l3`
+    LEFT JOIN `LevelTwo` AS `l1` ON `l3`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
+) AS `s` ON TRUE
+ORDER BY `l2`.`Date`, `s`.`Name`, `s`.`Id`
+""");
         }
 
         public override async Task Skip_Take_on_grouping_element_with_reference_include(bool async)
         {
             await base.Skip_Take_on_grouping_element_with_reference_include(async);
 
-            AssertSql(
-                @"SELECT `t`.`Date`, `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t0`.`Id0`, `t0`.`Date0`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l3`.`Date`, `s`.`Id`, `s`.`Date`, `s`.`Name`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`, `s`.`Id0`, `s`.`Date0`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`
 FROM (
     SELECT `l`.`Date`
     FROM `LevelOne` AS `l`
     GROUP BY `l`.`Date`
-) AS `t`
+) AS `l3`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`, `l0`.`Id` AS `Id0`, `l0`.`Date` AS `Date0`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Name`, `l2`.`OneToMany_Optional_Self_Inverse1Id`, `l2`.`OneToMany_Required_Self_Inverse1Id`, `l2`.`OneToOne_Optional_Self1Id`, `l1`.`Id` AS `Id0`, `l1`.`Date` AS `Date0`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`
-        FROM `LevelOne` AS `l1`
-        WHERE `t`.`Date` = `l1`.`Date`
-        ORDER BY `l1`.`Name`
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
+        FROM `LevelOne` AS `l0`
+        WHERE `l3`.`Date` = `l0`.`Date`
+        ORDER BY `l0`.`Name`
         LIMIT 5 OFFSET 1
-    ) AS `t1`
-    LEFT JOIN `LevelTwo` AS `l0` ON `t1`.`Id` = `l0`.`Level1_Optional_Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Date`, `t0`.`Name`, `t0`.`Id`");
+    ) AS `l2`
+    LEFT JOIN `LevelTwo` AS `l1` ON `l2`.`Id` = `l1`.`Level1_Optional_Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Date`, `s`.`Name`, `s`.`Id`
+""");
         }
 
         public override async Task Skip_Take_Distinct_on_grouping_element(bool async)
         {
             await base.Skip_Take_Distinct_on_grouping_element(async);
 
-            AssertSql(
-                @"SELECT `t`.`Date`, `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l2`.`Date`, `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l3`.`OneToMany_Optional_Self_Inverse1Id`, `l3`.`OneToMany_Required_Self_Inverse1Id`, `l3`.`OneToOne_Optional_Self1Id`
 FROM (
     SELECT `l`.`Date`
     FROM `LevelOne` AS `l`
     GROUP BY `l`.`Date`
-) AS `t`
+) AS `l2`
 LEFT JOIN LATERAL (
-    SELECT DISTINCT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`
+    SELECT DISTINCT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
         FROM `LevelOne` AS `l0`
-        WHERE `t`.`Date` = `l0`.`Date`
+        WHERE `l2`.`Date` = `l0`.`Date`
         ORDER BY `l0`.`Name`
         LIMIT 5 OFFSET 1
-    ) AS `t1`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Date`");
+    ) AS `l1`
+) AS `l3` ON TRUE
+ORDER BY `l2`.`Date`
+""");
         }
 
         private void AssertSql(params string[] expected)
diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryMySqlTest.cs
index f149fa8c7..40bfe3971 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryMySqlTest.cs
@@ -20,221 +20,237 @@ public override async Task SelectMany_with_Include1(bool async)
         {
             await base.SelectMany_with_Include1(async);
 
-            AssertSql(
-                @"SELECT `t`.`Id`, `t`.`OneToOne_Required_PK_Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Level2_Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `l`.`Id`, `t0`.`Id`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Level3_Name`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`
+        AssertSql(
+"""
+SELECT `l1`.`Id`, `l1`.`OneToOne_Required_PK_Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Level2_Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l`.`Id`, `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Level3_Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`
 FROM `Level1` AS `l`
 INNER JOIN (
     SELECT `l0`.`Id`, `l0`.`OneToOne_Required_PK_Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Level2_Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`
     FROM `Level1` AS `l0`
     WHERE (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
 LEFT JOIN (
-    SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Level3_Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`
-    FROM `Level1` AS `l1`
-    WHERE `l1`.`Level2_Required_Id` IS NOT NULL AND (`l1`.`OneToMany_Required_Inverse3Id` IS NOT NULL)
-) AS `t0` ON CASE
-    WHEN (`t`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`t`.`Level1_Required_Id` IS NOT NULL)) AND `t`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `t`.`Id`
-END = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+    SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Level3_Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`
+    FROM `Level1` AS `l2`
+    WHERE `l2`.`Level2_Required_Id` IS NOT NULL AND (`l2`.`OneToMany_Required_Inverse3Id` IS NOT NULL)
+) AS `l3` ON CASE
+    WHEN (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l1`.`Id`
+END = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l1`.`Id`
+""");
         }
 
         public override async Task SelectMany_with_navigation_and_Distinct(bool async)
         {
             await base.SelectMany_with_navigation_and_Distinct(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `t`.`Id`, `t0`.`Id`, `t0`.`OneToOne_Required_PK_Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Level2_Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l1`.`Id`, `l3`.`Id`, `l3`.`OneToOne_Required_PK_Date`, `l3`.`Level1_Optional_Id`, `l3`.`Level1_Required_Id`, `l3`.`Level2_Name`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`OneToMany_Required_Inverse2Id`, `l3`.`OneToOne_Optional_PK_Inverse2Id`
 FROM `Level1` AS `l`
 INNER JOIN (
     SELECT DISTINCT `l0`.`Id`, `l0`.`OneToOne_Required_PK_Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Level2_Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`
     FROM `Level1` AS `l0`
     WHERE (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
 LEFT JOIN (
-    SELECT `l1`.`Id`, `l1`.`OneToOne_Required_PK_Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Level2_Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`
-    FROM `Level1` AS `l1`
-    WHERE (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-WHERE (`t`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`t`.`Level1_Required_Id` IS NOT NULL)) AND `t`.`OneToMany_Required_Inverse2Id` IS NOT NULL
-ORDER BY `l`.`Id`, `t`.`Id`");
+    SELECT `l2`.`Id`, `l2`.`OneToOne_Required_PK_Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Level2_Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`
+    FROM `Level1` AS `l2`
+    WHERE (`l2`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l2`.`Level1_Required_Id` IS NOT NULL)) AND `l2`.`OneToMany_Required_Inverse2Id` IS NOT NULL
+) AS `l3` ON `l`.`Id` = `l3`.`OneToMany_Optional_Inverse2Id`
+WHERE (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL
+ORDER BY `l`.`Id`, `l1`.`Id`
+""");
         }
 
         public override async Task Take_Select_collection_Take(bool async)
         {
             await base.Take_Select_collection_Take(async);
 
-            AssertSql(
-                @"@__p_0='1'
+        AssertSql(
+"""
+@__p_0='1'
 
-SELECT `t`.`Id`, `t`.`Name`, `t0`.`Id`, `t0`.`Name`, `t0`.`Level1Id`, `t0`.`Level2Id`, `t0`.`Id0`, `t0`.`Date`, `t0`.`Name0`, `t0`.`Id1`
+SELECT `l3`.`Id`, `l3`.`Name`, `s`.`Id`, `s`.`Name`, `s`.`Level1Id`, `s`.`Level2Id`, `s`.`Id0`, `s`.`Date`, `s`.`Name0`, `s`.`Id1`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `Level1` AS `l`
     ORDER BY `l`.`Id`
     LIMIT @__p_0
-) AS `t`
+) AS `l3`
 LEFT JOIN LATERAL (
     SELECT CASE
-        WHEN (`t1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`t1`.`Level1_Required_Id` IS NOT NULL)) AND `t1`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `t1`.`Id`
-    END AS `Id`, `t1`.`Level2_Name` AS `Name`, `t1`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `t1`.`Level1_Required_Id` AS `Level2Id`, `l0`.`Id` AS `Id0`, `l0`.`Date`, `l0`.`Name` AS `Name0`, `t1`.`Id` AS `Id1`, `t1`.`c`
+        WHEN (`l2`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l2`.`Level1_Required_Id` IS NOT NULL)) AND `l2`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l2`.`Id`
+    END AS `Id`, `l2`.`Level2_Name` AS `Name`, `l2`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `l2`.`Level1_Required_Id` AS `Level2Id`, `l1`.`Id` AS `Id0`, `l1`.`Date`, `l1`.`Name` AS `Name0`, `l2`.`Id` AS `Id1`, `l2`.`c`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`OneToOne_Required_PK_Date`, `l1`.`Level1_Required_Id`, `l1`.`Level2_Name`, `l1`.`OneToMany_Required_Inverse2Id`, CASE
-            WHEN (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l1`.`Id`
+        SELECT `l0`.`Id`, `l0`.`OneToOne_Required_PK_Date`, `l0`.`Level1_Required_Id`, `l0`.`Level2_Name`, `l0`.`OneToMany_Required_Inverse2Id`, CASE
+            WHEN (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l0`.`Id`
         END AS `c`
-        FROM `Level1` AS `l1`
-        WHERE ((`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL) AND (`t`.`Id` = `l1`.`OneToMany_Required_Inverse2Id`)
+        FROM `Level1` AS `l0`
+        WHERE ((`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL) AND (`l3`.`Id` = `l0`.`OneToMany_Required_Inverse2Id`)
         ORDER BY CASE
-            WHEN (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l1`.`Id`
+            WHEN (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l0`.`Id`
         END
         LIMIT 3
-    ) AS `t1`
-    INNER JOIN `Level1` AS `l0` ON `t1`.`Level1_Required_Id` = `l0`.`Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id`, `t0`.`c`, `t0`.`Id1`");
+    ) AS `l2`
+    INNER JOIN `Level1` AS `l1` ON `l2`.`Level1_Required_Id` = `l1`.`Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Id`, `s`.`c`, `s`.`Id1`
+""");
         }
 
         public override async Task Skip_Take_Select_collection_Skip_Take(bool async)
         {
             await base.Skip_Take_Select_collection_Skip_Take(async);
 
-            AssertSql(
-                @"@__p_0='1'
+        AssertSql(
+"""
+@__p_0='1'
 
-SELECT `t`.`Id`, `t`.`Name`, `t0`.`Id`, `t0`.`Name`, `t0`.`Level1Id`, `t0`.`Level2Id`, `t0`.`Id0`, `t0`.`Date`, `t0`.`Name0`, `t0`.`Id1`
+SELECT `l3`.`Id`, `l3`.`Name`, `s`.`Id`, `s`.`Name`, `s`.`Level1Id`, `s`.`Level2Id`, `s`.`Id0`, `s`.`Date`, `s`.`Name0`, `s`.`Id1`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `Level1` AS `l`
     ORDER BY `l`.`Id`
     LIMIT @__p_0 OFFSET @__p_0
-) AS `t`
+) AS `l3`
 LEFT JOIN LATERAL (
     SELECT CASE
-        WHEN (`t1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`t1`.`Level1_Required_Id` IS NOT NULL)) AND `t1`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `t1`.`Id`
-    END AS `Id`, `t1`.`Level2_Name` AS `Name`, `t1`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `t1`.`Level1_Required_Id` AS `Level2Id`, `l0`.`Id` AS `Id0`, `l0`.`Date`, `l0`.`Name` AS `Name0`, `t1`.`Id` AS `Id1`, `t1`.`c`
+        WHEN (`l2`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l2`.`Level1_Required_Id` IS NOT NULL)) AND `l2`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l2`.`Id`
+    END AS `Id`, `l2`.`Level2_Name` AS `Name`, `l2`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `l2`.`Level1_Required_Id` AS `Level2Id`, `l1`.`Id` AS `Id0`, `l1`.`Date`, `l1`.`Name` AS `Name0`, `l2`.`Id` AS `Id1`, `l2`.`c`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`OneToOne_Required_PK_Date`, `l1`.`Level1_Required_Id`, `l1`.`Level2_Name`, `l1`.`OneToMany_Required_Inverse2Id`, CASE
-            WHEN (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l1`.`Id`
+        SELECT `l0`.`Id`, `l0`.`OneToOne_Required_PK_Date`, `l0`.`Level1_Required_Id`, `l0`.`Level2_Name`, `l0`.`OneToMany_Required_Inverse2Id`, CASE
+            WHEN (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l0`.`Id`
         END AS `c`
-        FROM `Level1` AS `l1`
-        WHERE ((`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL) AND (`t`.`Id` = `l1`.`OneToMany_Required_Inverse2Id`)
+        FROM `Level1` AS `l0`
+        WHERE ((`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL) AND (`l3`.`Id` = `l0`.`OneToMany_Required_Inverse2Id`)
         ORDER BY CASE
-            WHEN (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l1`.`Id`
+            WHEN (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l0`.`Id`
         END
         LIMIT 3 OFFSET 1
-    ) AS `t1`
-    INNER JOIN `Level1` AS `l0` ON `t1`.`Level1_Required_Id` = `l0`.`Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id`, `t0`.`c`, `t0`.`Id1`");
+    ) AS `l2`
+    INNER JOIN `Level1` AS `l1` ON `l2`.`Level1_Required_Id` = `l1`.`Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Id`, `s`.`c`, `s`.`Id1`
+""");
         }
 
         public override async Task Skip_Take_on_grouping_element_inside_collection_projection(bool async)
         {
             await base.Skip_Take_on_grouping_element_inside_collection_projection(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t2`.`Date`, `t2`.`Id`, `t2`.`Date0`, `t2`.`Name`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `s`.`Date`, `s`.`Id`, `s`.`Date0`, `s`.`Name`
 FROM `Level1` AS `l`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Date`, `t0`.`Id`, `t0`.`Date` AS `Date0`, `t0`.`Name`
+    SELECT `l2`.`Date`, `l4`.`Id`, `l4`.`Date` AS `Date0`, `l4`.`Name`
     FROM (
         SELECT `l0`.`Date`
         FROM `Level1` AS `l0`
         WHERE (`l0`.`Name` = `l`.`Name`) OR (`l0`.`Name` IS NULL AND (`l`.`Name` IS NULL))
         GROUP BY `l0`.`Date`
-    ) AS `t`
+    ) AS `l2`
     LEFT JOIN (
-        SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`
+        SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`
         FROM (
             SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, ROW_NUMBER() OVER(PARTITION BY `l1`.`Date` ORDER BY `l1`.`Name`) AS `row`
             FROM `Level1` AS `l1`
             WHERE (`l1`.`Name` = `l`.`Name`) OR (`l1`.`Name` IS NULL AND (`l`.`Name` IS NULL))
-        ) AS `t1`
-        WHERE (1 < `t1`.`row`) AND (`t1`.`row` <= 6)
-    ) AS `t0` ON `t`.`Date` = `t0`.`Date`
-) AS `t2` ON TRUE
-ORDER BY `l`.`Id`, `t2`.`Date`, `t2`.`Date0`, `t2`.`Name`");
+        ) AS `l3`
+        WHERE (1 < `l3`.`row`) AND (`l3`.`row` <= 6)
+    ) AS `l4` ON `l2`.`Date` = `l4`.`Date`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Date`, `s`.`Date0`, `s`.`Name`
+""");
         }
 
         public override async Task Skip_Take_Distinct_on_grouping_element(bool async)
         {
             await base.Skip_Take_Distinct_on_grouping_element(async);
 
-            AssertSql(
-                @"SELECT `t`.`Date`, `t0`.`Id`, `t0`.`Date`, `t0`.`Name`
+        AssertSql(
+"""
+SELECT `l2`.`Date`, `l3`.`Id`, `l3`.`Date`, `l3`.`Name`
 FROM (
     SELECT `l`.`Date`
     FROM `Level1` AS `l`
     GROUP BY `l`.`Date`
-) AS `t`
+) AS `l2`
 LEFT JOIN LATERAL (
-    SELECT DISTINCT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`
+    SELECT DISTINCT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`
         FROM `Level1` AS `l0`
-        WHERE `t`.`Date` = `l0`.`Date`
+        WHERE `l2`.`Date` = `l0`.`Date`
         ORDER BY `l0`.`Name`
         LIMIT 5 OFFSET 1
-    ) AS `t1`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Date`");
+    ) AS `l1`
+) AS `l3` ON TRUE
+ORDER BY `l2`.`Date`
+""");
         }
 
         public override async Task Skip_Take_on_grouping_element_with_collection_include(bool async)
         {
             await base.Skip_Take_on_grouping_element_with_collection_include(async);
 
-            AssertSql(
-                @"SELECT `t`.`Date`, `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`Id0`, `t1`.`OneToOne_Required_PK_Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Level2_Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`
+        AssertSql(
+"""
+SELECT `l2`.`Date`, `s`.`Id`, `s`.`Date`, `s`.`Name`, `s`.`Id0`, `s`.`OneToOne_Required_PK_Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Level2_Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`
 FROM (
     SELECT `l`.`Date`
     FROM `Level1` AS `l`
     GROUP BY `l`.`Date`
-) AS `t`
+) AS `l2`
 LEFT JOIN LATERAL (
-    SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t2`.`Id` AS `Id0`, `t2`.`OneToOne_Required_PK_Date`, `t2`.`Level1_Optional_Id`, `t2`.`Level1_Required_Id`, `t2`.`Level2_Name`, `t2`.`OneToMany_Optional_Inverse2Id`, `t2`.`OneToMany_Required_Inverse2Id`, `t2`.`OneToOne_Optional_PK_Inverse2Id`
+    SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l4`.`Id` AS `Id0`, `l4`.`OneToOne_Required_PK_Date`, `l4`.`Level1_Optional_Id`, `l4`.`Level1_Required_Id`, `l4`.`Level2_Name`, `l4`.`OneToMany_Optional_Inverse2Id`, `l4`.`OneToMany_Required_Inverse2Id`, `l4`.`OneToOne_Optional_PK_Inverse2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`
         FROM `Level1` AS `l0`
-        WHERE `t`.`Date` = `l0`.`Date`
+        WHERE `l2`.`Date` = `l0`.`Date`
         ORDER BY `l0`.`Name`
         LIMIT 5 OFFSET 1
-    ) AS `t0`
+    ) AS `l3`
     LEFT JOIN (
         SELECT `l1`.`Id`, `l1`.`OneToOne_Required_PK_Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Level2_Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`
         FROM `Level1` AS `l1`
         WHERE (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL
-    ) AS `t2` ON `t0`.`Id` = `t2`.`OneToMany_Optional_Inverse2Id`
-) AS `t1` ON TRUE
-ORDER BY `t`.`Date`, `t1`.`Name`, `t1`.`Id`");
+    ) AS `l4` ON `l3`.`Id` = `l4`.`OneToMany_Optional_Inverse2Id`
+) AS `s` ON TRUE
+ORDER BY `l2`.`Date`, `s`.`Name`, `s`.`Id`
+""");
         }
 
         public override async Task Skip_Take_on_grouping_element_with_reference_include(bool async)
         {
             await base.Skip_Take_on_grouping_element_with_reference_include(async);
 
-            AssertSql(
-                @"SELECT `t`.`Date`, `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`Id0`, `t1`.`OneToOne_Required_PK_Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Level2_Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`
+        AssertSql(
+"""
+SELECT `l4`.`Date`, `s`.`Id`, `s`.`Date`, `s`.`Name`, `s`.`Id0`, `s`.`OneToOne_Required_PK_Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Level2_Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`
 FROM (
     SELECT `l`.`Date`
     FROM `Level1` AS `l`
     GROUP BY `l`.`Date`
-) AS `t`
+) AS `l4`
 LEFT JOIN LATERAL (
-    SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t2`.`Id` AS `Id0`, `t2`.`OneToOne_Required_PK_Date`, `t2`.`Level1_Optional_Id`, `t2`.`Level1_Required_Id`, `t2`.`Level2_Name`, `t2`.`OneToMany_Optional_Inverse2Id`, `t2`.`OneToMany_Required_Inverse2Id`, `t2`.`OneToOne_Optional_PK_Inverse2Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Name`, `l3`.`Id` AS `Id0`, `l3`.`OneToOne_Required_PK_Date`, `l3`.`Level1_Optional_Id`, `l3`.`Level1_Required_Id`, `l3`.`Level2_Name`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`OneToMany_Required_Inverse2Id`, `l3`.`OneToOne_Optional_PK_Inverse2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`
         FROM `Level1` AS `l0`
-        WHERE `t`.`Date` = `l0`.`Date`
+        WHERE `l4`.`Date` = `l0`.`Date`
         ORDER BY `l0`.`Name`
         LIMIT 5 OFFSET 1
-    ) AS `t0`
+    ) AS `l2`
     LEFT JOIN (
         SELECT `l1`.`Id`, `l1`.`OneToOne_Required_PK_Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Level2_Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`
         FROM `Level1` AS `l1`
         WHERE (`l1`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l1`.`Level1_Required_Id` IS NOT NULL)) AND `l1`.`OneToMany_Required_Inverse2Id` IS NOT NULL
-    ) AS `t2` ON `t0`.`Id` = `t2`.`Level1_Optional_Id`
-) AS `t1` ON TRUE
-ORDER BY `t`.`Date`, `t1`.`Name`, `t1`.`Id`");
+    ) AS `l3` ON `l2`.`Id` = `l3`.`Level1_Optional_Id`
+) AS `s` ON TRUE
+ORDER BY `l4`.`Date`, `s`.`Name`, `s`.`Id`
+""");
         }
 
         private void AssertSql(params string[] expected)
diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQueryMySqlTest.cs
index 3d1e8eae9..23f47e655 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQueryMySqlTest.cs
@@ -22,19 +22,23 @@ public override async Task Filtered_include_basic_Where(bool async)
         {
             await base.Filtered_include_basic_Where(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
     FROM `LevelTwo` AS `l0`
     WHERE `l0`.`Id` > 5
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`");
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Filtered_include_OrderBy(bool async)
@@ -98,543 +102,635 @@ public override async Task Filtered_include_basic_OrderBy_Take(bool async)
         {
             await base.Filtered_include_basic_OrderBy_Take(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 3
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Name`
+""");
         }
 
         public override async Task Filtered_include_basic_OrderBy_Skip(bool async)
         {
             await base.Filtered_include_basic_OrderBy_Skip(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE 1 < `t`.`row`
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`");
+    ) AS `l1`
+    WHERE 1 < `l1`.`row`
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Name`
+""");
         }
 
         public override async Task Filtered_include_basic_OrderBy_Skip_Take(bool async)
         {
             await base.Filtered_include_basic_OrderBy_Skip_Take(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 4)
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`");
+    ) AS `l1`
+    WHERE (1 < `l1`.`row`) AND (`l1`.`row` <= 4)
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Name`
+""");
         }
 
         public override async Task Filtered_include_on_ThenInclude(bool async)
         {
             await base.Filtered_include_on_ThenInclude(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Name`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 4)
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Name`");
+    ) AS `l2`
+    WHERE (1 < `l2`.`row`) AND (`l2`.`row` <= 4)
+) AS `l3` ON `l0`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`Name`
+""");
         }
 
         public override async Task Filtered_include_after_reference_navigation(bool async)
         {
             await base.Filtered_include_after_reference_navigation(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Name`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 4)
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Name`");
+    ) AS `l2`
+    WHERE (1 < `l2`.`row`) AND (`l2`.`row` <= 4)
+) AS `l3` ON `l0`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`Name`
+""");
         }
 
         public override async Task Filtered_include_after_different_filtered_include_same_level(bool async)
         {
             await base.Filtered_include_after_different_filtered_include_same_level(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Level1_Optional_Id`, `l3`.`Level1_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`OneToMany_Optional_Self_Inverse2Id`, `l3`.`OneToMany_Required_Inverse2Id`, `l3`.`OneToMany_Required_Self_Inverse2Id`, `l3`.`OneToOne_Optional_PK_Inverse2Id`, `l3`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`",
+    ) AS `l2`
+    WHERE `l2`.`row` <= 3
+) AS `l3` ON `l`.`Id` = `l3`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`Name`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l5`.`Id`, `l5`.`Date`, `l5`.`Level1_Optional_Id`, `l5`.`Level1_Required_Id`, `l5`.`Name`, `l5`.`OneToMany_Optional_Inverse2Id`, `l5`.`OneToMany_Optional_Self_Inverse2Id`, `l5`.`OneToMany_Required_Inverse2Id`, `l5`.`OneToMany_Required_Self_Inverse2Id`, `l5`.`OneToOne_Optional_PK_Inverse2Id`, `l5`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l4`.`Id`, `l4`.`Date`, `l4`.`Level1_Optional_Id`, `l4`.`Level1_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse2Id`, `l4`.`OneToMany_Optional_Self_Inverse2Id`, `l4`.`OneToMany_Required_Inverse2Id`, `l4`.`OneToMany_Required_Self_Inverse2Id`, `l4`.`OneToOne_Optional_PK_Inverse2Id`, `l4`.`OneToOne_Optional_Self2Id`
     FROM (
-        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Required_Inverse2Id` ORDER BY `l0`.`Name` DESC) AS `row`
-        FROM `LevelTwo` AS `l0`
-        WHERE (`l0`.`Name` <> 'Bar') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE 1 < `t`.`row`
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Required_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`Name` DESC");
+        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Required_Inverse2Id` ORDER BY `l1`.`Name` DESC) AS `row`
+        FROM `LevelTwo` AS `l1`
+        WHERE (`l1`.`Name` <> 'Bar') OR `l1`.`Name` IS NULL
+    ) AS `l4`
+    WHERE 1 < `l4`.`row`
+) AS `l5` ON `l`.`Id` = `l5`.`OneToMany_Required_Inverse2Id`
+ORDER BY `l`.`Id`, `l5`.`OneToMany_Required_Inverse2Id`, `l5`.`Name` DESC
+""");
         }
 
         public override async Task Filtered_include_after_different_filtered_include_different_level(bool async)
         {
             await base.Filtered_include_after_different_filtered_include_different_level(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Level1_Optional_Id`, `l3`.`Level1_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`OneToMany_Optional_Self_Inverse2Id`, `l3`.`OneToMany_Required_Inverse2Id`, `l3`.`OneToMany_Required_Self_Inverse2Id`, `l3`.`OneToOne_Optional_PK_Inverse2Id`, `l3`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`, `t0`.`Id`",
+    ) AS `l2`
+    WHERE `l2`.`row` <= 3
+) AS `l3` ON `l`.`Id` = `l3`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`Name`, `l3`.`Id`
+""",
                 //
-                @"SELECT `t1`.`Id`, `t1`.`Level2_Optional_Id`, `t1`.`Level2_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse3Id`, `t1`.`OneToMany_Optional_Self_Inverse3Id`, `t1`.`OneToMany_Required_Inverse3Id`, `t1`.`OneToMany_Required_Self_Inverse3Id`, `t1`.`OneToOne_Optional_PK_Inverse3Id`, `t1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `t0`.`Id`
+                """
+SELECT `l5`.`Id`, `l5`.`Level2_Optional_Id`, `l5`.`Level2_Required_Id`, `l5`.`Name`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`OneToMany_Optional_Self_Inverse3Id`, `l5`.`OneToMany_Required_Inverse3Id`, `l5`.`OneToMany_Required_Self_Inverse3Id`, `l5`.`OneToOne_Optional_PK_Inverse3Id`, `l5`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l3`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l2`.`Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Name`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
+    ) AS `l2`
+    WHERE `l2`.`row` <= 3
+) AS `l3` ON `l`.`Id` = `l3`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
-    SELECT `t2`.`Id`, `t2`.`Level2_Optional_Id`, `t2`.`Level2_Required_Id`, `t2`.`Name`, `t2`.`OneToMany_Optional_Inverse3Id`, `t2`.`OneToMany_Optional_Self_Inverse3Id`, `t2`.`OneToMany_Required_Inverse3Id`, `t2`.`OneToMany_Required_Self_Inverse3Id`, `t2`.`OneToOne_Optional_PK_Inverse3Id`, `t2`.`OneToOne_Optional_Self3Id`
+    SELECT `l4`.`Id`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Required_Inverse3Id` ORDER BY `l1`.`Name` DESC) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Bar') OR `l1`.`Name` IS NULL
-    ) AS `t2`
-    WHERE 1 < `t2`.`row`
-) AS `t1` ON `t0`.`Id` = `t1`.`OneToMany_Required_Inverse3Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Name`, `t0`.`Id`, `t1`.`OneToMany_Required_Inverse3Id`, `t1`.`Name` DESC");
+    ) AS `l4`
+    WHERE 1 < `l4`.`row`
+) AS `l5` ON `l3`.`Id` = `l5`.`OneToMany_Required_Inverse3Id`
+ORDER BY `l`.`Id`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`Name`, `l3`.`Id`, `l5`.`OneToMany_Required_Inverse3Id`, `l5`.`Name` DESC
+""");
         }
 
         public override async Task Filtered_include_same_filter_set_on_same_navigation_twice(bool async)
         {
             await base.Filtered_include_same_filter_set_on_same_navigation_twice(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id` DESC) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id` DESC");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 2
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id` DESC
+""");
         }
 
         public override async Task Filtered_include_same_filter_set_on_same_navigation_twice_followed_by_ThenIncludes(bool async)
         {
             await base.Filtered_include_same_filter_set_on_same_navigation_twice_followed_by_ThenIncludes(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`
+                """
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l0`.`Level2_Optional_Id`, `l0`.`Level2_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse3Id`, `l0`.`OneToMany_Optional_Self_Inverse3Id`, `l0`.`OneToMany_Required_Inverse3Id`, `l0`.`OneToMany_Required_Self_Inverse3Id`, `l0`.`OneToOne_Optional_PK_Inverse3Id`, `l0`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE (`l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 2
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`Level2_Required_Id`
-) AS `t0` ON TRUE
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`",
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Required_Id`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""",
                 //
-                @"SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `t0`.`Id`, `t0`.`Id0`
+                """
+SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `s`.`Id`, `s`.`Id0`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `t`.`Id`, `l0`.`Id` AS `Id0`
+    SELECT `l2`.`Id`, `l1`.`Id` AS `Id0`
     FROM (
-        SELECT `l1`.`Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE (`l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 2
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`Level2_Required_Id`
-) AS `t0` ON TRUE
-INNER JOIN `LevelThree` AS `l2` ON `t0`.`Id` = `l2`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`");
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Required_Id`
+) AS `s` ON TRUE
+INNER JOIN `LevelThree` AS `l3` ON `s`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""");
         }
 
         public override async Task Filtered_include_multiple_multi_level_includes_with_first_level_using_filter_include_on_one_of_the_chains_only(bool async)
         {
             await base.Filtered_include_multiple_multi_level_includes_with_first_level_using_filter_include_on_one_of_the_chains_only(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`
+                """
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l0`.`Level2_Optional_Id`, `l0`.`Level2_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse3Id`, `l0`.`OneToMany_Optional_Self_Inverse3Id`, `l0`.`OneToMany_Required_Inverse3Id`, `l0`.`OneToMany_Required_Self_Inverse3Id`, `l0`.`OneToOne_Optional_PK_Inverse3Id`, `l0`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE (`l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 2
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`Level2_Required_Id`
-) AS `t0` ON TRUE
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`",
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Required_Id`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""",
                 //
-                @"SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `t0`.`Id`, `t0`.`Id0`
+                """
+SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `s`.`Id`, `s`.`Id0`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `t`.`Id`, `l0`.`Id` AS `Id0`
+    SELECT `l2`.`Id`, `l1`.`Id` AS `Id0`
     FROM (
-        SELECT `l1`.`Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE (`l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 2
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`Level2_Required_Id`
-) AS `t0` ON TRUE
-INNER JOIN `LevelThree` AS `l2` ON `t0`.`Id` = `l2`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`");
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Required_Id`
+) AS `s` ON TRUE
+INNER JOIN `LevelThree` AS `l3` ON `s`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""");
         }
 
         public override async Task Filtered_include_and_non_filtered_include_on_same_navigation1(bool async)
         {
             await base.Filtered_include_and_non_filtered_include_on_same_navigation1(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 3
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Filtered_include_and_non_filtered_include_on_same_navigation2(bool async)
         {
             await base.Filtered_include_and_non_filtered_include_on_same_navigation2(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 3
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 3
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Filtered_include_and_non_filtered_include_followed_by_then_include_on_same_navigation(bool async)
         {
             await base.Filtered_include_and_non_filtered_include_followed_by_then_include_on_same_navigation(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `l`.`Id`
+                """
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l0`.`Level2_Optional_Id`, `l0`.`Level2_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse3Id`, `l0`.`OneToMany_Optional_Self_Inverse3Id`, `l0`.`OneToMany_Required_Inverse3Id`, `l0`.`OneToMany_Required_Self_Inverse3Id`, `l0`.`OneToOne_Optional_PK_Inverse3Id`, `l0`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE (`l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 1
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`OneToOne_Optional_PK_Inverse3Id`
-) AS `t0` ON TRUE
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`",
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`OneToOne_Optional_PK_Inverse3Id`
+) AS `s` ON TRUE
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""",
                 //
-                @"SELECT `t1`.`Id`, `t1`.`Level3_Optional_Id`, `t1`.`Level3_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse4Id`, `t1`.`OneToMany_Optional_Self_Inverse4Id`, `t1`.`OneToMany_Required_Inverse4Id`, `t1`.`OneToMany_Required_Self_Inverse4Id`, `t1`.`OneToOne_Optional_PK_Inverse4Id`, `t1`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `t0`.`Id`, `t0`.`Id0`
+                """
+SELECT `l4`.`Id`, `l4`.`Level3_Optional_Id`, `l4`.`Level3_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse4Id`, `l4`.`OneToMany_Optional_Self_Inverse4Id`, `l4`.`OneToMany_Required_Inverse4Id`, `l4`.`OneToMany_Required_Self_Inverse4Id`, `l4`.`OneToOne_Optional_PK_Inverse4Id`, `l4`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `s`.`Id`, `s`.`Id0`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `t`.`Id`, `l0`.`Id` AS `Id0`
+    SELECT `l2`.`Id`, `l1`.`Id` AS `Id0`
     FROM (
-        SELECT `l1`.`Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE (`l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`) AND ((`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL)
-        ORDER BY `l1`.`Id`
+        SELECT `l0`.`Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE (`l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`) AND ((`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL)
+        ORDER BY `l0`.`Id`
         LIMIT 1
-    ) AS `t`
-    LEFT JOIN `LevelThree` AS `l0` ON `t`.`Id` = `l0`.`OneToOne_Optional_PK_Inverse3Id`
-) AS `t0` ON TRUE
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`OneToOne_Optional_PK_Inverse3Id`
+) AS `s` ON TRUE
 INNER JOIN (
-    SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`
-    FROM `LevelFour` AS `l2`
-    WHERE `l2`.`Id` > 1
-) AS `t1` ON `t0`.`Id0` = `t1`.`OneToMany_Optional_Inverse4Id`
-ORDER BY `l`.`Id`, `t0`.`Id`, `t0`.`Id0`");
+    SELECT `l3`.`Id`, `l3`.`Level3_Optional_Id`, `l3`.`Level3_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse4Id`, `l3`.`OneToMany_Optional_Self_Inverse4Id`, `l3`.`OneToMany_Required_Inverse4Id`, `l3`.`OneToMany_Required_Self_Inverse4Id`, `l3`.`OneToOne_Optional_PK_Inverse4Id`, `l3`.`OneToOne_Optional_Self4Id`
+    FROM `LevelFour` AS `l3`
+    WHERE `l3`.`Id` > 1
+) AS `l4` ON `s`.`Id0` = `l4`.`OneToMany_Optional_Inverse4Id`
+ORDER BY `l`.`Id`, `s`.`Id`, `s`.`Id0`
+""");
         }
 
         public override async Task Filtered_include_complex_three_level_with_middle_having_filter1(bool async)
         {
             await base.Filtered_include_complex_three_level_with_middle_having_filter1(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l5`.`Id`, `l5`.`Level2_Optional_Id`, `l5`.`Level2_Required_Id`, `l5`.`Name`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`OneToMany_Optional_Self_Inverse3Id`, `l5`.`OneToMany_Required_Inverse3Id`, `l5`.`OneToMany_Required_Self_Inverse3Id`, `l5`.`OneToOne_Optional_PK_Inverse3Id`, `l5`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+    SELECT `l4`.`Id`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Id`",
+    ) AS `l4`
+    WHERE `l4`.`row` <= 1
+) AS `l5` ON `l0`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`Id`
+""",
                 //
-                @"SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `t0`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l5`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`OneToMany_Optional_Inverse3Id`
+    SELECT `l4`.`Id`, `l4`.`OneToMany_Optional_Inverse3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-INNER JOIN `LevelFour` AS `l2` ON `t0`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Id`",
+    ) AS `l4`
+    WHERE `l4`.`row` <= 1
+) AS `l5` ON `l0`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
+INNER JOIN `LevelFour` AS `l2` ON `l5`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`Id`
+""",
                 //
-                @"SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `t0`.`Id`
+                """
+SELECT `l3`.`Id`, `l3`.`Level3_Optional_Id`, `l3`.`Level3_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse4Id`, `l3`.`OneToMany_Optional_Self_Inverse4Id`, `l3`.`OneToMany_Required_Inverse4Id`, `l3`.`OneToMany_Required_Self_Inverse4Id`, `l3`.`OneToOne_Optional_PK_Inverse4Id`, `l3`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l5`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`OneToMany_Optional_Inverse3Id`
+    SELECT `l4`.`Id`, `l4`.`OneToMany_Optional_Inverse3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-INNER JOIN `LevelFour` AS `l2` ON `t0`.`Id` = `l2`.`OneToMany_Required_Inverse4Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Id`");
+    ) AS `l4`
+    WHERE `l4`.`row` <= 1
+) AS `l5` ON `l0`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
+INNER JOIN `LevelFour` AS `l3` ON `l5`.`Id` = `l3`.`OneToMany_Required_Inverse4Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`Id`
+""");
         }
 
         public override async Task Filtered_include_complex_three_level_with_middle_having_filter2(bool async)
         {
             await base.Filtered_include_complex_three_level_with_middle_having_filter2(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l5`.`Id`, `l5`.`Level2_Optional_Id`, `l5`.`Level2_Required_Id`, `l5`.`Name`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`OneToMany_Optional_Self_Inverse3Id`, `l5`.`OneToMany_Required_Inverse3Id`, `l5`.`OneToMany_Required_Self_Inverse3Id`, `l5`.`OneToOne_Optional_PK_Inverse3Id`, `l5`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+    SELECT `l4`.`Id`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Id`",
+    ) AS `l4`
+    WHERE `l4`.`row` <= 1
+) AS `l5` ON `l0`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`Id`
+""",
                 //
-                @"SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `t0`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l5`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`OneToMany_Optional_Inverse3Id`
+    SELECT `l4`.`Id`, `l4`.`OneToMany_Optional_Inverse3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-INNER JOIN `LevelFour` AS `l2` ON `t0`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Id`",
+    ) AS `l4`
+    WHERE `l4`.`row` <= 1
+) AS `l5` ON `l0`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
+INNER JOIN `LevelFour` AS `l2` ON `l5`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`Id`
+""",
                 //
-                @"SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `t0`.`Id`
+                """
+SELECT `l3`.`Id`, `l3`.`Level3_Optional_Id`, `l3`.`Level3_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse4Id`, `l3`.`OneToMany_Optional_Self_Inverse4Id`, `l3`.`OneToMany_Required_Inverse4Id`, `l3`.`OneToMany_Required_Self_Inverse4Id`, `l3`.`OneToOne_Optional_PK_Inverse4Id`, `l3`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l5`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`OneToMany_Optional_Inverse3Id`
+    SELECT `l4`.`Id`, `l4`.`OneToMany_Optional_Inverse3Id`
     FROM (
         SELECT `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
         FROM `LevelThree` AS `l1`
         WHERE (`l1`.`Name` <> 'Foo') OR `l1`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-INNER JOIN `LevelFour` AS `l2` ON `t0`.`Id` = `l2`.`OneToMany_Required_Inverse4Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`Id`");
+    ) AS `l4`
+    WHERE `l4`.`row` <= 1
+) AS `l5` ON `l0`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
+INNER JOIN `LevelFour` AS `l3` ON `l5`.`Id` = `l3`.`OneToMany_Required_Inverse4Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`Id`
+""");
         }
 
         public override async Task Filtered_include_outer_parameter_used_inside_filter(bool async)
         {
             await base.Filtered_include_outer_parameter_used_inside_filter(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l4`.`Id`, `l4`.`Date`, `l4`.`Level1_Optional_Id`, `l4`.`Level1_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse2Id`, `l4`.`OneToMany_Optional_Self_Inverse2Id`, `l4`.`OneToMany_Required_Inverse2Id`, `l4`.`OneToMany_Required_Self_Inverse2Id`, `l4`.`OneToOne_Optional_PK_Inverse2Id`, `l4`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
-JOIN `LevelTwo` AS `l0` ON TRUE
-ORDER BY `l`.`Id`, `l0`.`Id`",
+JOIN `LevelTwo` AS `l4` ON TRUE
+ORDER BY `l`.`Id`, `l4`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l5`.`Id`, `l5`.`Level2_Optional_Id`, `l5`.`Level2_Required_Id`, `l5`.`Name`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`OneToMany_Optional_Self_Inverse3Id`, `l5`.`OneToMany_Required_Inverse3Id`, `l5`.`OneToMany_Required_Self_Inverse3Id`, `l5`.`OneToOne_Optional_PK_Inverse3Id`, `l5`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l4`.`Id`
 FROM `LevelOne` AS `l`
-JOIN `LevelTwo` AS `l0` ON TRUE
-INNER JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+JOIN `LevelTwo` AS `l4` ON TRUE
+INNER JOIN `LevelThree` AS `l5` ON `l4`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l4`.`Id`
+""",
                 //
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l8`.`Id`, `l8`.`Date`, `l8`.`Level1_Optional_Id`, `l8`.`Level1_Required_Id`, `l8`.`Name`, `l8`.`OneToMany_Optional_Inverse2Id`, `l8`.`OneToMany_Optional_Self_Inverse2Id`, `l8`.`OneToMany_Required_Inverse2Id`, `l8`.`OneToMany_Required_Self_Inverse2Id`, `l8`.`OneToOne_Optional_PK_Inverse2Id`, `l8`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
-JOIN `LevelTwo` AS `l0` ON TRUE
-ORDER BY `l`.`Id`, `l0`.`Id`",
+JOIN `LevelTwo` AS `l8` ON TRUE
+ORDER BY `l`.`Id`, `l8`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l9`.`Id`, `l9`.`Level2_Optional_Id`, `l9`.`Level2_Required_Id`, `l9`.`Name`, `l9`.`OneToMany_Optional_Inverse3Id`, `l9`.`OneToMany_Optional_Self_Inverse3Id`, `l9`.`OneToMany_Required_Inverse3Id`, `l9`.`OneToMany_Required_Self_Inverse3Id`, `l9`.`OneToOne_Optional_PK_Inverse3Id`, `l9`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l8`.`Id`
 FROM `LevelOne` AS `l`
-JOIN `LevelTwo` AS `l0` ON TRUE
-INNER JOIN `LevelThree` AS `l1` ON (`l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`) AND (`l`.`Id` <> `l1`.`Id`)
-ORDER BY `l`.`Id`, `l0`.`Id`");
+JOIN `LevelTwo` AS `l8` ON TRUE
+INNER JOIN `LevelThree` AS `l9` ON (`l8`.`Id` = `l9`.`OneToMany_Optional_Inverse3Id`) AND (`l`.`Id` <> `l9`.`Id`)
+ORDER BY `l`.`Id`, `l8`.`Id`
+""");
         }
 
 
@@ -642,23 +738,28 @@ public override async Task Select_nav_prop_collection_one_to_many_required(bool
         {
             await base.Select_nav_prop_collection_one_to_many_required(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `l0`.`Id`, `l`.`Id`
+                """
+SELECT `l2`.`Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
-INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Required_Inverse2Id`
-ORDER BY `l`.`Id`");
+INNER JOIN `LevelTwo` AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Required_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(bool async)
         {
             await base.Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(async);
 
-            AssertSql(
-                @"SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`, `l14`.`Name`
+        AssertSql(
+"""
+SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`, `l14`.`Name`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Required_Id`
 LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Optional_Id`
@@ -669,22 +770,24 @@ INNER JOIN (
     INNER JOIN `LevelThree` AS `l4` ON `l3`.`Level3_Required_Id` = `l4`.`Id`
     LEFT JOIN `LevelTwo` AS `l5` ON `l4`.`Level2_Optional_Id` = `l5`.`Id`
     LEFT JOIN `LevelTwo` AS `l6` ON `l5`.`Id` = `l6`.`OneToMany_Required_Self_Inverse2Id`
-) AS `t` ON `l2`.`Id` = `t`.`Id2`
+) AS `s` ON `l2`.`Id` = `s`.`Id2`
 LEFT JOIN (
     SELECT `l7`.`Id`, `l8`.`Id` AS `Id0`, `l9`.`Id` AS `Id1`, `l10`.`Id` AS `Id2`, `l10`.`Level2_Optional_Id` AS `Level2_Optional_Id0`
     FROM `LevelFour` AS `l7`
     INNER JOIN `LevelThree` AS `l8` ON `l7`.`Level3_Required_Id` = `l8`.`Id`
     INNER JOIN `LevelTwo` AS `l9` ON `l8`.`Level2_Required_Id` = `l9`.`Id`
     LEFT JOIN `LevelThree` AS `l10` ON `l9`.`Id` = `l10`.`OneToMany_Required_Inverse3Id`
-) AS `t0` ON `t`.`Id2` = `t0`.`Id2`
+) AS `s0` ON `s`.`Id2` = `s0`.`Id2`
 LEFT JOIN `LevelThree` AS `l11` ON `l2`.`OneToMany_Optional_Inverse4Id` = `l11`.`Id`
-LEFT JOIN `LevelThree` AS `l12` ON `t`.`Id2` = `l12`.`Level2_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l13` ON `t0`.`Level2_Optional_Id0` = `l13`.`Id`
+LEFT JOIN `LevelThree` AS `l12` ON `s`.`Id2` = `l12`.`Level2_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l13` ON `s0`.`Level2_Optional_Id0` = `l13`.`Id`
 LEFT JOIN `LevelThree` AS `l14` ON `l13`.`Id` = `l14`.`Level2_Required_Id`
 WHERE (`l11`.`Name` <> 'Foo') OR `l11`.`Name` IS NULL
-ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`",
+ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`
+""",
                 //
-                @"SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`
+                """
+SELECT `l18`.`Id`, `l18`.`Date`, `l18`.`Level1_Optional_Id`, `l18`.`Level1_Required_Id`, `l18`.`Name`, `l18`.`OneToMany_Optional_Inverse2Id`, `l18`.`OneToMany_Optional_Self_Inverse2Id`, `l18`.`OneToMany_Required_Inverse2Id`, `l18`.`OneToMany_Required_Self_Inverse2Id`, `l18`.`OneToOne_Optional_PK_Inverse2Id`, `l18`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Required_Id`
 LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Optional_Id`
@@ -695,25 +798,26 @@ INNER JOIN (
     INNER JOIN `LevelThree` AS `l4` ON `l3`.`Level3_Required_Id` = `l4`.`Id`
     LEFT JOIN `LevelTwo` AS `l5` ON `l4`.`Level2_Optional_Id` = `l5`.`Id`
     LEFT JOIN `LevelTwo` AS `l6` ON `l5`.`Id` = `l6`.`OneToMany_Required_Self_Inverse2Id`
-) AS `t` ON `l2`.`Id` = `t`.`Id2`
+) AS `s` ON `l2`.`Id` = `s`.`Id2`
 LEFT JOIN (
     SELECT `l7`.`Id`, `l8`.`Id` AS `Id0`, `l9`.`Id` AS `Id1`, `l10`.`Id` AS `Id2`, `l10`.`Level2_Optional_Id` AS `Level2_Optional_Id0`
     FROM `LevelFour` AS `l7`
     INNER JOIN `LevelThree` AS `l8` ON `l7`.`Level3_Required_Id` = `l8`.`Id`
     INNER JOIN `LevelTwo` AS `l9` ON `l8`.`Level2_Required_Id` = `l9`.`Id`
     LEFT JOIN `LevelThree` AS `l10` ON `l9`.`Id` = `l10`.`OneToMany_Required_Inverse3Id`
-) AS `t0` ON `t`.`Id2` = `t0`.`Id2`
+) AS `s0` ON `s`.`Id2` = `s0`.`Id2`
 LEFT JOIN `LevelThree` AS `l11` ON `l2`.`OneToMany_Optional_Inverse4Id` = `l11`.`Id`
-LEFT JOIN `LevelThree` AS `l12` ON `t`.`Id2` = `l12`.`Level2_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l13` ON `t0`.`Level2_Optional_Id0` = `l13`.`Id`
+LEFT JOIN `LevelThree` AS `l12` ON `s`.`Id2` = `l12`.`Level2_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l13` ON `s0`.`Level2_Optional_Id0` = `l13`.`Id`
 LEFT JOIN `LevelThree` AS `l14` ON `l13`.`Id` = `l14`.`Level2_Required_Id`
 INNER JOIN (
-    SELECT `l15`.`Id`, `l15`.`Date`, `l15`.`Level1_Optional_Id`, `l15`.`Level1_Required_Id`, `l15`.`Name`, `l15`.`OneToMany_Optional_Inverse2Id`, `l15`.`OneToMany_Optional_Self_Inverse2Id`, `l15`.`OneToMany_Required_Inverse2Id`, `l15`.`OneToMany_Required_Self_Inverse2Id`, `l15`.`OneToOne_Optional_PK_Inverse2Id`, `l15`.`OneToOne_Optional_Self2Id`
-    FROM `LevelTwo` AS `l15`
-    WHERE `l15`.`Id` <> 42
-) AS `t1` ON `t`.`Id2` = `t1`.`OneToMany_Optional_Self_Inverse2Id`
+    SELECT `l17`.`Id`, `l17`.`Date`, `l17`.`Level1_Optional_Id`, `l17`.`Level1_Required_Id`, `l17`.`Name`, `l17`.`OneToMany_Optional_Inverse2Id`, `l17`.`OneToMany_Optional_Self_Inverse2Id`, `l17`.`OneToMany_Required_Inverse2Id`, `l17`.`OneToMany_Required_Self_Inverse2Id`, `l17`.`OneToOne_Optional_PK_Inverse2Id`, `l17`.`OneToOne_Optional_Self2Id`
+    FROM `LevelTwo` AS `l17`
+    WHERE `l17`.`Id` <> 42
+) AS `l18` ON `s`.`Id2` = `l18`.`OneToMany_Optional_Self_Inverse2Id`
 WHERE (`l11`.`Name` <> 'Foo') OR `l11`.`Name` IS NULL
-ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`");
+ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`
+""");
         }
 
         public override async Task Project_collection_navigation(bool async)
@@ -752,24 +856,28 @@ public override async Task Project_collection_navigation_nested_with_take(bool a
         {
             await base.Project_collection_navigation_nested_with_take(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l0`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l5`.`Id`, `l5`.`Level2_Optional_Id`, `l5`.`Level2_Required_Id`, `l5`.`Name`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`OneToMany_Optional_Self_Inverse3Id`, `l5`.`OneToMany_Required_Inverse3Id`, `l5`.`OneToMany_Required_Self_Inverse3Id`, `l5`.`OneToOne_Optional_PK_Inverse3Id`, `l5`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`
+    SELECT `l4`.`Id`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
-        FROM `LevelThree` AS `l1`
-    ) AS `t`
-    WHERE `t`.`row` <= 50
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`");
+        SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, ROW_NUMBER() OVER(PARTITION BY `l3`.`OneToMany_Optional_Inverse3Id` ORDER BY `l3`.`Id`) AS `row`
+        FROM `LevelThree` AS `l3`
+    ) AS `l4`
+    WHERE `l4`.`row` <= 50
+) AS `l5` ON `l0`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`
+""");
         }
 
         public override async Task Project_collection_navigation_using_ef_property(bool async)
@@ -810,21 +918,25 @@ public override async Task Project_collection_navigation_composed(bool async)
         {
             await base.Project_collection_navigation_composed(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
 WHERE `l`.`Id` < 3
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Level1_Optional_Id`, `l3`.`Level1_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse2Id`, `l3`.`OneToMany_Optional_Self_Inverse2Id`, `l3`.`OneToMany_Required_Inverse2Id`, `l3`.`OneToMany_Required_Self_Inverse2Id`, `l3`.`OneToOne_Optional_PK_Inverse2Id`, `l3`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
-    FROM `LevelTwo` AS `l0`
-    WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
+    FROM `LevelTwo` AS `l2`
+    WHERE (`l2`.`Name` <> 'Foo') OR `l2`.`Name` IS NULL
+) AS `l3` ON `l`.`Id` = `l3`.`OneToMany_Optional_Inverse2Id`
 WHERE `l`.`Id` < 3
-ORDER BY `l`.`Id`");
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Project_collection_and_root_entity(bool async)
@@ -846,20 +958,26 @@ public override async Task Project_collection_and_include(bool async)
         {
             await base.Project_collection_and_include(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
-INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`");
+INNER JOIN `LevelTwo` AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Project_navigation_and_collection(bool async)
@@ -883,70 +1001,84 @@ public override async Task Include_inside_subquery(bool async)
         {
             await base.Include_inside_subquery(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
 WHERE `l`.`Id` < 3
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l6`.`Id`, `l6`.`Date`, `l6`.`Level1_Optional_Id`, `l6`.`Level1_Required_Id`, `l6`.`Name`, `l6`.`OneToMany_Optional_Inverse2Id`, `l6`.`OneToMany_Optional_Self_Inverse2Id`, `l6`.`OneToMany_Required_Inverse2Id`, `l6`.`OneToMany_Required_Self_Inverse2Id`, `l6`.`OneToOne_Optional_PK_Inverse2Id`, `l6`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
-    FROM `LevelTwo` AS `l0`
-    WHERE `l0`.`Id` > 0
-) AS `t` ON TRUE
+    SELECT `l4`.`Id`, `l4`.`Date`, `l4`.`Level1_Optional_Id`, `l4`.`Level1_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse2Id`, `l4`.`OneToMany_Optional_Self_Inverse2Id`, `l4`.`OneToMany_Required_Inverse2Id`, `l4`.`OneToMany_Required_Self_Inverse2Id`, `l4`.`OneToOne_Optional_PK_Inverse2Id`, `l4`.`OneToOne_Optional_Self2Id`
+    FROM `LevelTwo` AS `l4`
+    WHERE `l4`.`Id` > 0
+) AS `l6` ON TRUE
 WHERE `l`.`Id` < 3
-ORDER BY `l`.`Id`, `t`.`Id`",
+ORDER BY `l`.`Id`, `l6`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `t`.`Id`
+                """
+SELECT `l5`.`Id`, `l5`.`Level2_Optional_Id`, `l5`.`Level2_Required_Id`, `l5`.`Name`, `l5`.`OneToMany_Optional_Inverse3Id`, `l5`.`OneToMany_Optional_Self_Inverse3Id`, `l5`.`OneToMany_Required_Inverse3Id`, `l5`.`OneToMany_Required_Self_Inverse3Id`, `l5`.`OneToOne_Optional_PK_Inverse3Id`, `l5`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l6`.`Id`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `l0`.`Id`
-    FROM `LevelTwo` AS `l0`
-    WHERE `l0`.`Id` > 0
-) AS `t` ON TRUE
-INNER JOIN `LevelThree` AS `l1` ON `t`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
+    SELECT `l4`.`Id`
+    FROM `LevelTwo` AS `l4`
+    WHERE `l4`.`Id` > 0
+) AS `l6` ON TRUE
+INNER JOIN `LevelThree` AS `l5` ON `l6`.`Id` = `l5`.`OneToMany_Optional_Inverse3Id`
 WHERE `l`.`Id` < 3
-ORDER BY `l`.`Id`, `t`.`Id`");
+ORDER BY `l`.`Id`, `l6`.`Id`
+""");
         }
 
         public override async Task Null_check_in_anonymous_type_projection_should_not_be_removed(bool async)
         {
             await base.Null_check_in_anonymous_type_projection_should_not_be_removed(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t`.`c`, `t`.`Name`, `l`.`Id`
+                """
+SELECT `s`.`c`, `s`.`Name`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `l1`.`Id` IS NULL AS `c`, `l1`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`
-    FROM `LevelTwo` AS `l0`
-    LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Required_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`");
+    SELECT `l5`.`Id` IS NULL AS `c`, `l5`.`Name`, `l4`.`OneToMany_Optional_Inverse2Id`
+    FROM `LevelTwo` AS `l4`
+    LEFT JOIN `LevelThree` AS `l5` ON `l4`.`Id` = `l5`.`Level2_Required_Id`
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Null_check_in_Dto_projection_should_not_be_removed(bool async)
         {
             await base.Null_check_in_Dto_projection_should_not_be_removed(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t`.`c`, `t`.`Name`, `l`.`Id`
+                """
+SELECT `s`.`c`, `s`.`Name`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
-    SELECT `l1`.`Id` IS NULL AS `c`, `l1`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`
-    FROM `LevelTwo` AS `l0`
-    LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Required_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`");
+    SELECT `l5`.`Id` IS NULL AS `c`, `l5`.`Name`, `l4`.`OneToMany_Optional_Inverse2Id`
+    FROM `LevelTwo` AS `l4`
+    LEFT JOIN `LevelThree` AS `l5` ON `l4`.`Id` = `l5`.`Level2_Required_Id`
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task SelectMany_navigation_property_followed_by_select_collection_navigation(bool async)
@@ -989,126 +1121,146 @@ public override async Task SelectMany_navigation_property_with_include_and_follo
         {
             await base.SelectMany_navigation_property_with_include_and_followed_by_select_collection_navigation(async);
 
-            AssertSql(
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+        AssertSql(
+"""
+SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Required_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-INNER JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`");
+INNER JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`
+""");
         }
 
         public override async Task Lift_projection_mapping_when_pushing_down_subquery(bool async)
         {
             await base.Lift_projection_mapping_when_pushing_down_subquery(async);
 
-            AssertSql(
-                @"@__p_0='25'
+        AssertSql(
+"""
+@__p_0='25'
 
-SELECT `t`.`Id`, `t0`.`Id`, `t0`.`c`
+SELECT `l1`.`Id`, `l3`.`Id`, `l3`.`c`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     LIMIT @__p_0
-) AS `t`
+) AS `l1`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`c`, `t1`.`OneToMany_Required_Inverse2Id`
+    SELECT `l2`.`Id`, `l2`.`c`, `l2`.`OneToMany_Required_Inverse2Id`
     FROM (
         SELECT `l0`.`Id`, 1 AS `c`, `l0`.`OneToMany_Required_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Required_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Id` = `t0`.`OneToMany_Required_Inverse2Id`
-ORDER BY `t`.`Id`",
+    ) AS `l2`
+    WHERE `l2`.`row` <= 1
+) AS `l3` ON `l1`.`Id` = `l3`.`OneToMany_Required_Inverse2Id`
+ORDER BY `l1`.`Id`
+""",
                 //
-                @"@__p_0='25'
+                """
+@__p_0='25'
 
-SELECT `l0`.`Id`, `t`.`Id`
+SELECT `l4`.`Id`, `l5`.`Id`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     LIMIT @__p_0
-) AS `t`
-INNER JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`OneToMany_Required_Inverse2Id`
-ORDER BY `t`.`Id`");
+) AS `l5`
+INNER JOIN `LevelTwo` AS `l4` ON `l5`.`Id` = `l4`.`OneToMany_Required_Inverse2Id`
+ORDER BY `l5`.`Id`
+""");
         }
 
         public override async Task Select_subquery_single_nested_subquery(bool async)
         {
             await base.Select_subquery_single_nested_subquery(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t0`.`Id`, `t0`.`c`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l2`.`Id`, `l2`.`c`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`c`, `t`.`Id`, `t`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l1`.`c`, `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse2Id`
     FROM (
         SELECT 1 AS `c`, `l0`.`Id`, `l0`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`Id`",
+    ) AS `l1`
+    WHERE `l1`.`row` <= 1
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l`.`Id`, `t0`.`Id`
+                """
+SELECT `l11`.`Id`, `l`.`Id`, `l13`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l12`.`Id`, `l12`.`OneToMany_Optional_Inverse2Id`
     FROM (
-        SELECT `l0`.`Id`, `l0`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
-        FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-INNER JOIN `LevelThree` AS `l1` ON `t0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `t0`.`Id`, `l1`.`Id`");
+        SELECT `l8`.`Id`, `l8`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l8`.`OneToMany_Optional_Inverse2Id` ORDER BY `l8`.`Id`) AS `row`
+        FROM `LevelTwo` AS `l8`
+    ) AS `l12`
+    WHERE `l12`.`row` <= 1
+) AS `l13` ON `l`.`Id` = `l13`.`OneToMany_Optional_Inverse2Id`
+INNER JOIN `LevelThree` AS `l11` ON `l13`.`Id` = `l11`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l13`.`Id`, `l11`.`Id`
+""");
         }
 
         public override async Task Select_subquery_single_nested_subquery2(bool async)
         {
             await base.Select_subquery_single_nested_subquery2(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `l`.`Id`, `l0`.`Id`, `t0`.`Id`, `t0`.`c`
+                """
+SELECT `l`.`Id`, `l26`.`Id`, `l40`.`Id`, `l40`.`c`
 FROM `LevelOne` AS `l`
-INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
+INNER JOIN `LevelTwo` AS `l26` ON `l`.`Id` = `l26`.`OneToMany_Optional_Inverse2Id`
 LEFT JOIN (
-    SELECT `t`.`c`, `t`.`Id`, `t`.`OneToMany_Optional_Inverse3Id`
+    SELECT `l39`.`c`, `l39`.`Id`, `l39`.`OneToMany_Optional_Inverse3Id`
     FROM (
-        SELECT 1 AS `c`, `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
-        FROM `LevelThree` AS `l1`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`Id`",
+        SELECT 1 AS `c`, `l35`.`Id`, `l35`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l35`.`OneToMany_Optional_Inverse3Id` ORDER BY `l35`.`Id`) AS `row`
+        FROM `LevelThree` AS `l35`
+    ) AS `l39`
+    WHERE `l39`.`row` <= 1
+) AS `l40` ON `l26`.`Id` = `l40`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l26`.`Id`, `l40`.`Id`
+""",
                 //
-                @"SELECT `l2`.`Id`, `l`.`Id`, `l0`.`Id`, `t0`.`Id`
+                """
+SELECT `l38`.`Id`, `l`.`Id`, `l26`.`Id`, `l40`.`Id`
 FROM `LevelOne` AS `l`
-INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
+INNER JOIN `LevelTwo` AS `l26` ON `l`.`Id` = `l26`.`OneToMany_Optional_Inverse2Id`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`OneToMany_Optional_Inverse3Id`
+    SELECT `l39`.`Id`, `l39`.`OneToMany_Optional_Inverse3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`OneToMany_Optional_Inverse3Id` ORDER BY `l1`.`Id`) AS `row`
-        FROM `LevelThree` AS `l1`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l0`.`Id` = `t0`.`OneToMany_Optional_Inverse3Id`
-INNER JOIN `LevelFour` AS `l2` ON `t0`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t0`.`Id`, `l2`.`Id`");
+        SELECT `l35`.`Id`, `l35`.`OneToMany_Optional_Inverse3Id`, ROW_NUMBER() OVER(PARTITION BY `l35`.`OneToMany_Optional_Inverse3Id` ORDER BY `l35`.`Id`) AS `row`
+        FROM `LevelThree` AS `l35`
+    ) AS `l39`
+    WHERE `l39`.`row` <= 1
+) AS `l40` ON `l26`.`Id` = `l40`.`OneToMany_Optional_Inverse3Id`
+INNER JOIN `LevelFour` AS `l38` ON `l40`.`Id` = `l38`.`OneToMany_Optional_Inverse4Id`
+ORDER BY `l`.`Id`, `l26`.`Id`, `l40`.`Id`, `l38`.`Id`
+""");
         }
 
         public override async Task Queryable_in_subquery_works_when_final_projection_is_List(bool async)
@@ -1122,82 +1274,91 @@ public override async Task Complex_query_with_let_collection_projection_FirstOrD
         {
             await base.Complex_query_with_let_collection_projection_FirstOrDefault_with_ToList_on_inner_and_outer(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t`.`Id`, `t`.`c`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l1`.`Id`, `l1`.`c`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
     SELECT 1 AS `c`, `l0`.`Id`
     FROM `LevelTwo` AS `l0`
     WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
     LIMIT 1
-) AS `t` ON TRUE
-ORDER BY `l`.`Id`, `t`.`Id`",
+) AS `l1` ON TRUE
+ORDER BY `l`.`Id`, `l1`.`Id`
+""",
                 //
-                @"SELECT `t0`.`Name`, `l`.`Id`, `t`.`Id`
+                """
+SELECT `l29`.`Name`, `l`.`Id`, `l28`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
-    SELECT `l0`.`Id`
-    FROM `LevelTwo` AS `l0`
-    WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
+    SELECT `l21`.`Id`
+    FROM `LevelTwo` AS `l21`
+    WHERE (`l21`.`Name` <> 'Foo') OR `l21`.`Name` IS NULL
     LIMIT 1
-) AS `t` ON TRUE
+) AS `l28` ON TRUE
 JOIN LATERAL (
-    SELECT `l1`.`Name`
-    FROM `LevelOne` AS `l1`
+    SELECT `l26`.`Name`
+    FROM `LevelOne` AS `l26`
     WHERE EXISTS (
         SELECT 1
-        FROM `LevelTwo` AS `l2`
-        WHERE (`l1`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`) AND (`l2`.`Id` = `t`.`Id`))
-) AS `t0` ON TRUE
-ORDER BY `l`.`Id`, `t`.`Id`");
+        FROM `LevelTwo` AS `l27`
+        WHERE (`l26`.`Id` = `l27`.`OneToMany_Optional_Inverse2Id`) AND (`l27`.`Id` = `l28`.`Id`))
+) AS `l29` ON TRUE
+ORDER BY `l`.`Id`, `l28`.`Id`
+""");
         }
 
         public override async Task Complex_query_with_let_collection_projection_FirstOrDefault(bool async)
         {
             await base.Complex_query_with_let_collection_projection_FirstOrDefault(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `t0`.`Id`, `t0`.`c`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l2`.`Id`, `l2`.`c`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`c`, `t`.`Id`, `t`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l1`.`c`, `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse2Id`
     FROM (
         SELECT 1 AS `c`, `l0`.`Id`, `l0`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
         WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`Id`",
+    ) AS `l1`
+    WHERE `l1`.`row` <= 1
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`Id`
+""",
                 //
-                @"SELECT `t1`.`Name`, `l`.`Id`, `t0`.`Id`
+                """
+SELECT `l23`.`Name`, `l`.`Id`, `l22`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`OneToMany_Optional_Inverse2Id`
+    SELECT `l21`.`Id`, `l21`.`OneToMany_Optional_Inverse2Id`
     FROM (
-        SELECT `l0`.`Id`, `l0`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
-        FROM `LevelTwo` AS `l0`
-        WHERE (`l0`.`Name` <> 'Foo') OR `l0`.`Name` IS NULL
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
+        SELECT `l14`.`Id`, `l14`.`OneToMany_Optional_Inverse2Id`, ROW_NUMBER() OVER(PARTITION BY `l14`.`OneToMany_Optional_Inverse2Id` ORDER BY `l14`.`Id`) AS `row`
+        FROM `LevelTwo` AS `l14`
+        WHERE (`l14`.`Name` <> 'Foo') OR `l14`.`Name` IS NULL
+    ) AS `l21`
+    WHERE `l21`.`row` <= 1
+) AS `l22` ON `l`.`Id` = `l22`.`OneToMany_Optional_Inverse2Id`
 JOIN LATERAL (
-    SELECT `l1`.`Name`
-    FROM `LevelOne` AS `l1`
+    SELECT `l19`.`Name`
+    FROM `LevelOne` AS `l19`
     WHERE EXISTS (
         SELECT 1
-        FROM `LevelTwo` AS `l2`
-        WHERE (`l1`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`) AND (`l2`.`Id` = `t0`.`Id`))
-) AS `t1` ON TRUE
-ORDER BY `l`.`Id`, `t0`.`Id`");
+        FROM `LevelTwo` AS `l20`
+        WHERE (`l19`.`Id` = `l20`.`OneToMany_Optional_Inverse2Id`) AND (`l20`.`Id` = `l22`.`Id`))
+) AS `l23` ON TRUE
+ORDER BY `l`.`Id`, `l22`.`Id`
+""");
         }
 
         public override async Task SelectMany_DefaultIfEmpty_multiple_times_with_joins_projecting_a_collection(bool async)
         {
             await base.SelectMany_DefaultIfEmpty_multiple_times_with_joins_projecting_a_collection(async);
 
-            AssertSql(
-                @"SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`, `l14`.`Name`
+        AssertSql(
+"""
+SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`, `l14`.`Name`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Required_Id`
 LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Optional_Id`
@@ -1208,22 +1369,24 @@ INNER JOIN (
     INNER JOIN `LevelThree` AS `l4` ON `l3`.`Level3_Required_Id` = `l4`.`Id`
     LEFT JOIN `LevelTwo` AS `l5` ON `l4`.`Level2_Optional_Id` = `l5`.`Id`
     LEFT JOIN `LevelTwo` AS `l6` ON `l5`.`Id` = `l6`.`OneToMany_Required_Self_Inverse2Id`
-) AS `t` ON `l2`.`Id` = `t`.`Id2`
+) AS `s` ON `l2`.`Id` = `s`.`Id2`
 LEFT JOIN (
     SELECT `l7`.`Id`, `l8`.`Id` AS `Id0`, `l9`.`Id` AS `Id1`, `l10`.`Id` AS `Id2`, `l10`.`Level2_Optional_Id` AS `Level2_Optional_Id0`
     FROM `LevelFour` AS `l7`
     INNER JOIN `LevelThree` AS `l8` ON `l7`.`Level3_Required_Id` = `l8`.`Id`
     INNER JOIN `LevelTwo` AS `l9` ON `l8`.`Level2_Required_Id` = `l9`.`Id`
     LEFT JOIN `LevelThree` AS `l10` ON `l9`.`Id` = `l10`.`OneToMany_Required_Inverse3Id`
-) AS `t0` ON `t`.`Id2` = `t0`.`Id2`
+) AS `s0` ON `s`.`Id2` = `s0`.`Id2`
 LEFT JOIN `LevelThree` AS `l11` ON `l2`.`OneToMany_Optional_Inverse4Id` = `l11`.`Id`
-LEFT JOIN `LevelThree` AS `l12` ON `t`.`Id2` = `l12`.`Level2_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l13` ON `t0`.`Level2_Optional_Id0` = `l13`.`Id`
+LEFT JOIN `LevelThree` AS `l12` ON `s`.`Id2` = `l12`.`Level2_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l13` ON `s0`.`Level2_Optional_Id0` = `l13`.`Id`
 LEFT JOIN `LevelThree` AS `l14` ON `l13`.`Id` = `l14`.`Level2_Required_Id`
 WHERE (`l11`.`Name` <> 'Foo') OR `l11`.`Name` IS NULL
-ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`",
+ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`
+""",
                 //
-                @"SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`
+                """
+SELECT `l18`.`Id`, `l18`.`Date`, `l18`.`Level1_Optional_Id`, `l18`.`Level1_Required_Id`, `l18`.`Name`, `l18`.`OneToMany_Optional_Inverse2Id`, `l18`.`OneToMany_Optional_Self_Inverse2Id`, `l18`.`OneToMany_Required_Inverse2Id`, `l18`.`OneToMany_Required_Self_Inverse2Id`, `l18`.`OneToOne_Optional_PK_Inverse2Id`, `l18`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l12`.`Id`, `l13`.`Id`, `l14`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Required_Id`
 LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Optional_Id`
@@ -1234,95 +1397,104 @@ INNER JOIN (
     INNER JOIN `LevelThree` AS `l4` ON `l3`.`Level3_Required_Id` = `l4`.`Id`
     LEFT JOIN `LevelTwo` AS `l5` ON `l4`.`Level2_Optional_Id` = `l5`.`Id`
     LEFT JOIN `LevelTwo` AS `l6` ON `l5`.`Id` = `l6`.`OneToMany_Required_Self_Inverse2Id`
-) AS `t` ON `l2`.`Id` = `t`.`Id2`
+) AS `s` ON `l2`.`Id` = `s`.`Id2`
 LEFT JOIN (
     SELECT `l7`.`Id`, `l8`.`Id` AS `Id0`, `l9`.`Id` AS `Id1`, `l10`.`Id` AS `Id2`, `l10`.`Level2_Optional_Id` AS `Level2_Optional_Id0`
     FROM `LevelFour` AS `l7`
     INNER JOIN `LevelThree` AS `l8` ON `l7`.`Level3_Required_Id` = `l8`.`Id`
     INNER JOIN `LevelTwo` AS `l9` ON `l8`.`Level2_Required_Id` = `l9`.`Id`
     LEFT JOIN `LevelThree` AS `l10` ON `l9`.`Id` = `l10`.`OneToMany_Required_Inverse3Id`
-) AS `t0` ON `t`.`Id2` = `t0`.`Id2`
+) AS `s0` ON `s`.`Id2` = `s0`.`Id2`
 LEFT JOIN `LevelThree` AS `l11` ON `l2`.`OneToMany_Optional_Inverse4Id` = `l11`.`Id`
-LEFT JOIN `LevelThree` AS `l12` ON `t`.`Id2` = `l12`.`Level2_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l13` ON `t0`.`Level2_Optional_Id0` = `l13`.`Id`
+LEFT JOIN `LevelThree` AS `l12` ON `s`.`Id2` = `l12`.`Level2_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l13` ON `s0`.`Level2_Optional_Id0` = `l13`.`Id`
 LEFT JOIN `LevelThree` AS `l14` ON `l13`.`Id` = `l14`.`Level2_Required_Id`
 INNER JOIN (
-    SELECT `l15`.`Id`, `l15`.`Date`, `l15`.`Level1_Optional_Id`, `l15`.`Level1_Required_Id`, `l15`.`Name`, `l15`.`OneToMany_Optional_Inverse2Id`, `l15`.`OneToMany_Optional_Self_Inverse2Id`, `l15`.`OneToMany_Required_Inverse2Id`, `l15`.`OneToMany_Required_Self_Inverse2Id`, `l15`.`OneToOne_Optional_PK_Inverse2Id`, `l15`.`OneToOne_Optional_Self2Id`
-    FROM `LevelTwo` AS `l15`
-    WHERE `l15`.`Id` <> 42
-) AS `t1` ON `t`.`Id2` = `t1`.`OneToMany_Optional_Self_Inverse2Id`
+    SELECT `l17`.`Id`, `l17`.`Date`, `l17`.`Level1_Optional_Id`, `l17`.`Level1_Required_Id`, `l17`.`Name`, `l17`.`OneToMany_Optional_Inverse2Id`, `l17`.`OneToMany_Optional_Self_Inverse2Id`, `l17`.`OneToMany_Required_Inverse2Id`, `l17`.`OneToMany_Required_Self_Inverse2Id`, `l17`.`OneToOne_Optional_PK_Inverse2Id`, `l17`.`OneToOne_Optional_Self2Id`
+    FROM `LevelTwo` AS `l17`
+    WHERE `l17`.`Id` <> 42
+) AS `l18` ON `s`.`Id2` = `l18`.`OneToMany_Optional_Self_Inverse2Id`
 WHERE (`l11`.`Name` <> 'Foo') OR `l11`.`Name` IS NULL
-ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `t`.`Id`, `t`.`Id0`, `t`.`Id1`, `t`.`Id2`, `t0`.`Id`, `t0`.`Id0`, `t0`.`Id1`, `t0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`");
+ORDER BY `l12`.`Id`, `l`.`Id`, `l0`.`Id`, `l1`.`Id`, `l2`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Id2`, `s0`.`Id`, `s0`.`Id0`, `s0`.`Id1`, `s0`.`Id2`, `l11`.`Id`, `l13`.`Id`, `l14`.`Id`
+""");
         }
 
         public override async Task Take_Select_collection_Take(bool async)
         {
             await base.Take_Select_collection_Take(async);
 
-            AssertSql(
-                @"@__p_0='1'
+        AssertSql(
+"""
+@__p_0='1'
 
 SELECT `l`.`Id`, `l`.`Name`
 FROM `LevelOne` AS `l`
 ORDER BY `l`.`Id`
-LIMIT @__p_0",
+LIMIT @__p_0
+""",
                 //
-                @"@__p_0='1'
+                """
+@__p_0='1'
 
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Level1Id`, `t0`.`Level2Id`, `t0`.`Id0`, `t0`.`Date`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t`.`Id`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Level1Id`, `s`.`Level2Id`, `s`.`Id0`, `s`.`Date`, `s`.`Name0`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`, `l9`.`Id`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Id`
     LIMIT @__p_0
-) AS `t`
+) AS `l9`
 JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `t1`.`Level1_Required_Id` AS `Level2Id`, `l0`.`Id` AS `Id0`, `l0`.`Date`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
+    SELECT `l8`.`Id`, `l8`.`Name`, `l8`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `l8`.`Level1_Required_Id` AS `Level2Id`, `l7`.`Id` AS `Id0`, `l7`.`Date`, `l7`.`Name` AS `Name0`, `l7`.`OneToMany_Optional_Self_Inverse1Id`, `l7`.`OneToMany_Required_Self_Inverse1Id`, `l7`.`OneToOne_Optional_Self1Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Required_Inverse2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE `t`.`Id` = `l1`.`OneToMany_Required_Inverse2Id`
-        ORDER BY `l1`.`Id`
+        SELECT `l6`.`Id`, `l6`.`Level1_Required_Id`, `l6`.`Name`, `l6`.`OneToMany_Required_Inverse2Id`
+        FROM `LevelTwo` AS `l6`
+        WHERE `l9`.`Id` = `l6`.`OneToMany_Required_Inverse2Id`
+        ORDER BY `l6`.`Id`
         LIMIT 3
-    ) AS `t1`
-    INNER JOIN `LevelOne` AS `l0` ON `t1`.`Level1_Required_Id` = `l0`.`Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id`, `t0`.`Id`");
+    ) AS `l8`
+    INNER JOIN `LevelOne` AS `l7` ON `l8`.`Level1_Required_Id` = `l7`.`Id`
+) AS `s` ON TRUE
+ORDER BY `l9`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Skip_Take_Select_collection_Skip_Take(bool async)
         {
             await base.Skip_Take_Select_collection_Skip_Take(async);
 
-            AssertSql(
-                @"@__p_0='1'
+        AssertSql(
+"""
+@__p_0='1'
 
 SELECT `l`.`Id`, `l`.`Name`
 FROM `LevelOne` AS `l`
 ORDER BY `l`.`Id`
-LIMIT @__p_0 OFFSET @__p_0",
+LIMIT @__p_0 OFFSET @__p_0
+""",
                 //
-                @"@__p_0='1'
+                """
+@__p_0='1'
 
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Level1Id`, `t0`.`Level2Id`, `t0`.`Id0`, `t0`.`Date`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t`.`Id`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Level1Id`, `s`.`Level2Id`, `s`.`Id0`, `s`.`Date`, `s`.`Name0`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`, `l9`.`Id`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Id`
     LIMIT @__p_0 OFFSET @__p_0
-) AS `t`
+) AS `l9`
 JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `t1`.`Level1_Required_Id` AS `Level2Id`, `l0`.`Id` AS `Id0`, `l0`.`Date`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
+    SELECT `l8`.`Id`, `l8`.`Name`, `l8`.`OneToMany_Required_Inverse2Id` AS `Level1Id`, `l8`.`Level1_Required_Id` AS `Level2Id`, `l7`.`Id` AS `Id0`, `l7`.`Date`, `l7`.`Name` AS `Name0`, `l7`.`OneToMany_Optional_Self_Inverse1Id`, `l7`.`OneToMany_Required_Self_Inverse1Id`, `l7`.`OneToOne_Optional_Self1Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Required_Inverse2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE `t`.`Id` = `l1`.`OneToMany_Required_Inverse2Id`
-        ORDER BY `l1`.`Id`
+        SELECT `l6`.`Id`, `l6`.`Level1_Required_Id`, `l6`.`Name`, `l6`.`OneToMany_Required_Inverse2Id`
+        FROM `LevelTwo` AS `l6`
+        WHERE `l9`.`Id` = `l6`.`OneToMany_Required_Inverse2Id`
+        ORDER BY `l6`.`Id`
         LIMIT 3 OFFSET 1
-    ) AS `t1`
-    INNER JOIN `LevelOne` AS `l0` ON `t1`.`Level1_Required_Id` = `l0`.`Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id`, `t0`.`Id`");
+    ) AS `l8`
+    INNER JOIN `LevelOne` AS `l7` ON `l8`.`Level1_Required_Id` = `l7`.`Id`
+) AS `s` ON TRUE
+ORDER BY `l9`.`Id`, `s`.`Id`
+""");
         }
 
         public override async Task Multi_level_include_one_to_many_optional_and_one_to_many_optional_produces_valid_sql(bool async)
@@ -1350,90 +1522,110 @@ public override async Task Multi_level_include_correct_PK_is_chosen_as_the_join_
         {
             await base.Multi_level_include_correct_PK_is_chosen_as_the_join_predicate_for_queries_that_join_same_table_multiple_times(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+                """
+SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `t`.`Id0`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `s`.`Id`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id0`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
     SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l2`.`Id` AS `Id0`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
     FROM `LevelThree` AS `l1`
     INNER JOIN `LevelTwo` AS `l2` ON `l1`.`OneToMany_Required_Inverse3Id` = `l2`.`Id`
-) AS `t` ON `l0`.`Id` = `t`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t`.`Id`, `t`.`Id0`",
+) AS `s` ON `l0`.`Id` = `s`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `s`.`Id`, `s`.`Id0`
+""",
                 //
-                @"SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`, `t`.`Id`, `t`.`Id0`
+                """
+SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`, `s`.`Id`, `s`.`Id0`
 FROM `LevelOne` AS `l`
 INNER JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
 INNER JOIN (
     SELECT `l1`.`Id`, `l1`.`OneToMany_Optional_Inverse3Id`, `l2`.`Id` AS `Id0`
     FROM `LevelThree` AS `l1`
     INNER JOIN `LevelTwo` AS `l2` ON `l1`.`OneToMany_Required_Inverse3Id` = `l2`.`Id`
-) AS `t` ON `l0`.`Id` = `t`.`OneToMany_Optional_Inverse3Id`
-INNER JOIN `LevelThree` AS `l3` ON `t`.`Id0` = `l3`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`, `t`.`Id`, `t`.`Id0`");
+) AS `s` ON `l0`.`Id` = `s`.`OneToMany_Optional_Inverse3Id`
+INNER JOIN `LevelThree` AS `l3` ON `s`.`Id0` = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`, `s`.`Id`, `s`.`Id0`
+""");
         }
 
         public override async Task Multiple_complex_includes(bool async)
         {
             await base.Multiple_complex_includes(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN (
-    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `l2`.`Id` AS `Id0`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`
-    FROM `LevelTwo` AS `l1`
-    LEFT JOIN `LevelThree` AS `l2` ON `l1`.`Id` = `l2`.`Level2_Optional_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `l0`.`Id`");
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l3`.`Id` AS `Id0`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name` AS `Name0`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
+    FROM `LevelTwo` AS `l2`
+    LEFT JOIN `LevelThree` AS `l3` ON `l2`.`Id` = `l3`.`Level2_Optional_Id`
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l0`.`Id`
+""");
         }
 
         public override async Task Multiple_complex_includes_self_ref(bool async)
         {
             await base.Multiple_complex_includes_self_ref(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelOne` AS `l0` ON `l`.`OneToOne_Optional_Self1Id` = `l0`.`Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelOne` AS `l0` ON `l`.`OneToOne_Optional_Self1Id` = `l0`.`Id`
 INNER JOIN `LevelOne` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Self_Inverse1Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `t`.`Id0`, `t`.`Date0`, `t`.`Name0`, `t`.`OneToMany_Optional_Self_Inverse1Id0`, `t`.`OneToMany_Required_Self_Inverse1Id0`, `t`.`OneToOne_Optional_Self1Id0`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Name`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`, `s`.`Id0`, `s`.`Date0`, `s`.`Name0`, `s`.`OneToMany_Optional_Self_Inverse1Id0`, `s`.`OneToMany_Required_Self_Inverse1Id0`, `s`.`OneToOne_Optional_Self1Id0`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelOne` AS `l0` ON `l`.`OneToOne_Optional_Self1Id` = `l0`.`Id`
 INNER JOIN (
-    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l2`.`Id` AS `Id0`, `l2`.`Date` AS `Date0`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Self_Inverse1Id` AS `OneToMany_Optional_Self_Inverse1Id0`, `l2`.`OneToMany_Required_Self_Inverse1Id` AS `OneToMany_Required_Self_Inverse1Id0`, `l2`.`OneToOne_Optional_Self1Id` AS `OneToOne_Optional_Self1Id0`
-    FROM `LevelOne` AS `l1`
-    LEFT JOIN `LevelOne` AS `l2` ON `l1`.`OneToOne_Optional_Self1Id` = `l2`.`Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Self_Inverse1Id`
-ORDER BY `l`.`Id`, `l0`.`Id`");
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Name`, `l2`.`OneToMany_Optional_Self_Inverse1Id`, `l2`.`OneToMany_Required_Self_Inverse1Id`, `l2`.`OneToOne_Optional_Self1Id`, `l3`.`Id` AS `Id0`, `l3`.`Date` AS `Date0`, `l3`.`Name` AS `Name0`, `l3`.`OneToMany_Optional_Self_Inverse1Id` AS `OneToMany_Optional_Self_Inverse1Id0`, `l3`.`OneToMany_Required_Self_Inverse1Id` AS `OneToMany_Required_Self_Inverse1Id0`, `l3`.`OneToOne_Optional_Self1Id` AS `OneToOne_Optional_Self1Id0`
+    FROM `LevelOne` AS `l2`
+    LEFT JOIN `LevelOne` AS `l3` ON `l2`.`OneToOne_Optional_Self1Id` = `l3`.`Id`
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Self_Inverse1Id`
+ORDER BY `l`.`Id`, `l0`.`Id`
+""");
         }
 
         public override async Task Include_reference_and_collection_order_by(bool async)
@@ -1474,19 +1666,23 @@ public override async Task Include_collection_then_reference(bool async)
         {
             await base.Include_collection_then_reference(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `l`.`Id`
+                """
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Optional_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`");
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`
+""");
         }
 
         public override async Task Include_collection_with_conditional_order_by(bool async)
@@ -1518,182 +1714,208 @@ public override async Task Multiple_complex_include_select(bool async)
         {
             await base.Multiple_complex_include_select(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`, `t`.`Id0`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN (
-    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `l2`.`Id` AS `Id0`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`
-    FROM `LevelTwo` AS `l1`
-    LEFT JOIN `LevelThree` AS `l2` ON `l1`.`Id` = `l2`.`Level2_Optional_Id`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `l0`.`Id`");
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l3`.`Id` AS `Id0`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name` AS `Name0`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`
+    FROM `LevelTwo` AS `l2`
+    LEFT JOIN `LevelThree` AS `l3` ON `l2`.`Id` = `l3`.`Level2_Optional_Id`
+) AS `s` ON `l`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l0`.`Id`
+""");
         }
 
         public override async Task Include_nested_with_optional_navigation(bool async)
         {
             await base.Include_nested_with_optional_navigation(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 WHERE (`l0`.`Name` <> 'L2 09') OR `l0`.`Name` IS NULL
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `t`.`Id0`, `t`.`Level3_Optional_Id`, `t`.`Level3_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse4Id`, `t`.`OneToMany_Optional_Self_Inverse4Id`, `t`.`OneToMany_Required_Inverse4Id`, `t`.`OneToMany_Required_Self_Inverse4Id`, `t`.`OneToOne_Optional_PK_Inverse4Id`, `t`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `s`.`Id`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id0`, `s`.`Level3_Optional_Id`, `s`.`Level3_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse4Id`, `s`.`OneToMany_Optional_Self_Inverse4Id`, `s`.`OneToMany_Required_Inverse4Id`, `s`.`OneToMany_Required_Self_Inverse4Id`, `s`.`OneToOne_Optional_PK_Inverse4Id`, `s`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN (
     SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l2`.`Id` AS `Id0`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`
     FROM `LevelThree` AS `l1`
     LEFT JOIN `LevelFour` AS `l2` ON `l1`.`Id` = `l2`.`Level3_Required_Id`
-) AS `t` ON `l0`.`Id` = `t`.`OneToMany_Required_Inverse3Id`
+) AS `s` ON `l0`.`Id` = `s`.`OneToMany_Required_Inverse3Id`
 WHERE (`l0`.`Name` <> 'L2 09') OR `l0`.`Name` IS NULL
-ORDER BY `l`.`Id`, `l0`.`Id`");
+ORDER BY `l`.`Id`, `l0`.`Id`
+""");
         }
 
         public override async Task Complex_multi_include_with_order_by_and_paging(bool async)
         {
             await base.Complex_multi_include_with_order_by_and_paging(async);
 
-            AssertSql(
-                @"@__p_1='10'
+        AssertSql(
+"""
+@__p_1='10'
 @__p_0='0'
 
-SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Required_Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`",
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Required_Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`
+""",
                 //
-                @"@__p_1='10'
+                """
+@__p_1='10'
 @__p_0='0'
 
-SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `t`.`Id`, `l0`.`Id`
+SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `l1`.`Id`, `l0`.`Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Required_Id`
-INNER JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`",
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Required_Id`
+INNER JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`
+""",
                 //
-                @"@__p_1='10'
+                """
+@__p_1='10'
 @__p_0='0'
 
-SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `t`.`Id`, `l0`.`Id`
+SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l1`.`Id`, `l0`.`Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Required_Id`
-INNER JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`OneToMany_Required_Inverse3Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`");
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Required_Id`
+INNER JOIN `LevelThree` AS `l3` ON `l0`.`Id` = `l3`.`OneToMany_Required_Inverse3Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`
+""");
         }
 
         public override async Task Complex_multi_include_with_order_by_and_paging_joins_on_correct_key(bool async)
         {
             await base.Complex_multi_include_with_order_by_and_paging_joins_on_correct_key(async);
 
-            AssertSql(
-                @"@__p_1='10'
+        AssertSql(
+"""
+@__p_1='10'
 @__p_0='0'
 
-SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l1` ON `t`.`Id` = `l1`.`Level1_Required_Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`",
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l2` ON `l1`.`Id` = `l2`.`Level1_Required_Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
+""",
                 //
-                @"@__p_1='10'
+                """
+@__p_1='10'
 @__p_0='0'
 
-SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`
+SELECT `l3`.`Id`, `l3`.`Level2_Optional_Id`, `l3`.`Level2_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse3Id`, `l3`.`OneToMany_Optional_Self_Inverse3Id`, `l3`.`OneToMany_Required_Inverse3Id`, `l3`.`OneToMany_Required_Self_Inverse3Id`, `l3`.`OneToOne_Optional_PK_Inverse3Id`, `l3`.`OneToOne_Optional_Self3Id`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l1` ON `t`.`Id` = `l1`.`Level1_Required_Id`
-INNER JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`",
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l2` ON `l1`.`Id` = `l2`.`Level1_Required_Id`
+INNER JOIN `LevelThree` AS `l3` ON `l0`.`Id` = `l3`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
+""",
                 //
-                @"@__p_1='10'
+                """
+@__p_1='10'
 @__p_0='0'
 
-SELECT `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`
+SELECT `l4`.`Id`, `l4`.`Level2_Optional_Id`, `l4`.`Level2_Required_Id`, `l4`.`Name`, `l4`.`OneToMany_Optional_Inverse3Id`, `l4`.`OneToMany_Optional_Self_Inverse3Id`, `l4`.`OneToMany_Required_Inverse3Id`, `l4`.`OneToMany_Required_Self_Inverse3Id`, `l4`.`OneToOne_Optional_PK_Inverse3Id`, `l4`.`OneToOne_Optional_Self3Id`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Optional_Id`
-LEFT JOIN `LevelTwo` AS `l1` ON `t`.`Id` = `l1`.`Level1_Required_Id`
-INNER JOIN `LevelThree` AS `l2` ON `l1`.`Id` = `l2`.`OneToMany_Required_Inverse3Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`");
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Optional_Id`
+LEFT JOIN `LevelTwo` AS `l2` ON `l1`.`Id` = `l2`.`Level1_Required_Id`
+INNER JOIN `LevelThree` AS `l4` ON `l2`.`Id` = `l4`.`OneToMany_Required_Inverse3Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Complex_multi_include_with_order_by_and_paging_joins_on_correct_key2(bool async)
         {
             await base.Complex_multi_include_with_order_by_and_paging_joins_on_correct_key2(async);
 
-            AssertSql(
-                @"@__p_1='10'
+        AssertSql(
+"""
+@__p_1='10'
 @__p_0='0'
 
-SELECT `t`.`Id`, `t`.`Date`, `t`.`Name`, `t`.`OneToMany_Optional_Self_Inverse1Id`, `t`.`OneToMany_Required_Self_Inverse1Id`, `t`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
+SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l2`.`Id`, `l2`.`Level2_Optional_Id`, `l2`.`Level2_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse3Id`, `l2`.`OneToMany_Optional_Self_Inverse3Id`, `l2`.`OneToMany_Required_Inverse3Id`, `l2`.`OneToMany_Required_Self_Inverse3Id`, `l2`.`OneToOne_Optional_PK_Inverse3Id`, `l2`.`OneToOne_Optional_Self3Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Optional_Id`
-LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Required_Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`",
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Optional_Id`
+LEFT JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`Level2_Required_Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
+""",
                 //
-                @"@__p_1='10'
+                """
+@__p_1='10'
 @__p_0='0'
 
-SELECT `l2`.`Id`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`
+SELECT `l3`.`Id`, `l3`.`Level3_Optional_Id`, `l3`.`Level3_Required_Id`, `l3`.`Name`, `l3`.`OneToMany_Optional_Inverse4Id`, `l3`.`OneToMany_Optional_Self_Inverse4Id`, `l3`.`OneToMany_Required_Inverse4Id`, `l3`.`OneToMany_Required_Self_Inverse4Id`, `l3`.`OneToOne_Optional_PK_Inverse4Id`, `l3`.`OneToOne_Optional_Self4Id`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
 FROM (
     SELECT `l`.`Id`, `l`.`Name`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Name`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`Level1_Optional_Id`
-LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Level2_Required_Id`
-INNER JOIN `LevelFour` AS `l2` ON `l1`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`
-ORDER BY `t`.`Name`, `t`.`Id`, `l0`.`Id`, `l1`.`Id`");
+) AS `l1`
+LEFT JOIN `LevelTwo` AS `l0` ON `l1`.`Id` = `l0`.`Level1_Optional_Id`
+LEFT JOIN `LevelThree` AS `l2` ON `l0`.`Id` = `l2`.`Level2_Required_Id`
+INNER JOIN `LevelFour` AS `l3` ON `l2`.`Id` = `l3`.`OneToMany_Optional_Inverse4Id`
+ORDER BY `l1`.`Name`, `l1`.`Id`, `l0`.`Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Multiple_include_with_multiple_optional_navigations(bool async)
@@ -1835,21 +2057,25 @@ public override async Task Optional_navigation_with_Include_ThenInclude(bool asy
         {
             await base.Optional_navigation_with_Include_ThenInclude(async);
 
-            AssertSql(
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
+        AssertSql(
+"""
+SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `l`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
-ORDER BY `l`.`Id`, `l0`.`Id`",
+ORDER BY `l`.`Id`, `l0`.`Id`
+""",
                 //
-                @"SELECT `t`.`Id`, `t`.`Level2_Optional_Id`, `t`.`Level2_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse3Id`, `t`.`OneToMany_Optional_Self_Inverse3Id`, `t`.`OneToMany_Required_Inverse3Id`, `t`.`OneToMany_Required_Self_Inverse3Id`, `t`.`OneToOne_Optional_PK_Inverse3Id`, `t`.`OneToOne_Optional_Self3Id`, `t`.`Id0`, `t`.`Level3_Optional_Id`, `t`.`Level3_Required_Id`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse4Id`, `t`.`OneToMany_Optional_Self_Inverse4Id`, `t`.`OneToMany_Required_Inverse4Id`, `t`.`OneToMany_Required_Self_Inverse4Id`, `t`.`OneToOne_Optional_PK_Inverse4Id`, `t`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`
+                """
+SELECT `s`.`Id`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `s`.`Id0`, `s`.`Level3_Optional_Id`, `s`.`Level3_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse4Id`, `s`.`OneToMany_Optional_Self_Inverse4Id`, `s`.`OneToMany_Required_Inverse4Id`, `s`.`OneToMany_Required_Self_Inverse4Id`, `s`.`OneToOne_Optional_PK_Inverse4Id`, `s`.`OneToOne_Optional_Self4Id`, `l`.`Id`, `l0`.`Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN `LevelTwo` AS `l0` ON `l`.`Id` = `l0`.`Level1_Optional_Id`
 INNER JOIN (
     SELECT `l1`.`Id`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`, `l2`.`Id` AS `Id0`, `l2`.`Level3_Optional_Id`, `l2`.`Level3_Required_Id`, `l2`.`Name` AS `Name0`, `l2`.`OneToMany_Optional_Inverse4Id`, `l2`.`OneToMany_Optional_Self_Inverse4Id`, `l2`.`OneToMany_Required_Inverse4Id`, `l2`.`OneToMany_Required_Self_Inverse4Id`, `l2`.`OneToOne_Optional_PK_Inverse4Id`, `l2`.`OneToOne_Optional_Self4Id`
     FROM `LevelThree` AS `l1`
     LEFT JOIN `LevelFour` AS `l2` ON `l1`.`Id` = `l2`.`Level3_Optional_Id`
-) AS `t` ON `l0`.`Id` = `t`.`OneToMany_Optional_Inverse3Id`
-ORDER BY `l`.`Id`, `l0`.`Id`");
+) AS `s` ON `l0`.`Id` = `s`.`OneToMany_Optional_Inverse3Id`
+ORDER BY `l`.`Id`, `l0`.`Id`
+""");
         }
 
         public override async Task Multiple_optional_navigation_with_Include(bool async)
@@ -1962,46 +2188,54 @@ public override async Task SelectMany_with_navigation_and_Distinct(bool async)
         {
             await base.SelectMany_with_navigation_and_Distinct(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l1`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT DISTINCT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
     FROM `LevelTwo` AS `l0`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`",
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l1`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `t`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `l1`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT DISTINCT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
     FROM `LevelTwo` AS `l0`
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-INNER JOIN `LevelTwo` AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
+INNER JOIN `LevelTwo` AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l1`.`Id`
+""");
         }
 
         public override async Task SelectMany_with_navigation_and_Distinct_projecting_columns_including_join_key(bool async)
         {
             await base.SelectMany_with_navigation_and_Distinct_projecting_columns_including_join_key(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l1`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT DISTINCT `l0`.`Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id` AS `FK`
     FROM `LevelTwo` AS `l0`
-) AS `t` ON `l`.`Id` = `t`.`FK`
-ORDER BY `l`.`Id`, `t`.`Id`",
+) AS `l1` ON `l`.`Id` = `l1`.`FK`
+ORDER BY `l`.`Id`, `l1`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `t`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l`.`Id`, `l1`.`Id`
 FROM `LevelOne` AS `l`
 INNER JOIN (
     SELECT DISTINCT `l0`.`Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id` AS `FK`
     FROM `LevelTwo` AS `l0`
-) AS `t` ON `l`.`Id` = `t`.`FK`
-INNER JOIN `LevelTwo` AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t`.`Id`");
+) AS `l1` ON `l`.`Id` = `l1`.`FK`
+INNER JOIN `LevelTwo` AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l1`.`Id`
+""");
         }
 
         public override async Task Include_collection_with_multiple_orderbys_member(bool async)
@@ -2098,129 +2332,141 @@ public override async Task Include_collection_with_groupby_in_subquery(bool asyn
         {
             await base.Include_collection_with_groupby_in_subquery(async);
 
-            AssertSql(
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t`.`Name`
+        AssertSql(
+"""
+SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l3`.`OneToMany_Optional_Self_Inverse1Id`, `l3`.`OneToMany_Required_Self_Inverse1Id`, `l3`.`OneToOne_Optional_Self1Id`, `l1`.`Name`
 FROM (
     SELECT `l`.`Name`
     FROM `LevelOne` AS `l`
     GROUP BY `l`.`Name`
-) AS `t`
+) AS `l1`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Name`, `l2`.`OneToMany_Optional_Self_Inverse1Id`, `l2`.`OneToMany_Required_Self_Inverse1Id`, `l2`.`OneToOne_Optional_Self1Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`Name` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelOne` AS `l0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Name` = `t0`.`Name`
-ORDER BY `t`.`Name`, `t0`.`Id`",
+    ) AS `l2`
+    WHERE `l2`.`row` <= 1
+) AS `l3` ON `l1`.`Name` = `l3`.`Name`
+ORDER BY `l1`.`Name`, `l3`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `t`.`Name`, `t0`.`Id`
+                """
+SELECT `l6`.`Id`, `l6`.`Date`, `l6`.`Level1_Optional_Id`, `l6`.`Level1_Required_Id`, `l6`.`Name`, `l6`.`OneToMany_Optional_Inverse2Id`, `l6`.`OneToMany_Optional_Self_Inverse2Id`, `l6`.`OneToMany_Required_Inverse2Id`, `l6`.`OneToMany_Required_Self_Inverse2Id`, `l6`.`OneToOne_Optional_PK_Inverse2Id`, `l6`.`OneToOne_Optional_Self2Id`, `l7`.`Name`, `l9`.`Id`
 FROM (
     SELECT `l`.`Name`
     FROM `LevelOne` AS `l`
     GROUP BY `l`.`Name`
-) AS `t`
+) AS `l7`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Name`
+    SELECT `l8`.`Id`, `l8`.`Name`
     FROM (
-        SELECT `l0`.`Id`, `l0`.`Name`, ROW_NUMBER() OVER(PARTITION BY `l0`.`Name` ORDER BY `l0`.`Id`) AS `row`
-        FROM `LevelOne` AS `l0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Name` = `t0`.`Name`
-INNER JOIN `LevelTwo` AS `l1` ON `t0`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `t`.`Name`, `t0`.`Id`");
+        SELECT `l5`.`Id`, `l5`.`Name`, ROW_NUMBER() OVER(PARTITION BY `l5`.`Name` ORDER BY `l5`.`Id`) AS `row`
+        FROM `LevelOne` AS `l5`
+    ) AS `l8`
+    WHERE `l8`.`row` <= 1
+) AS `l9` ON `l7`.`Name` = `l9`.`Name`
+INNER JOIN `LevelTwo` AS `l6` ON `l9`.`Id` = `l6`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l7`.`Name`, `l9`.`Id`
+""");
         }
 
         public override async Task Include_collection_with_groupby_in_subquery_and_filter_before_groupby(bool async)
         {
             await base.Include_collection_with_groupby_in_subquery_and_filter_before_groupby(async);
 
-            AssertSql(
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t`.`Name`
+        AssertSql(
+"""
+SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l3`.`OneToMany_Optional_Self_Inverse1Id`, `l3`.`OneToMany_Required_Self_Inverse1Id`, `l3`.`OneToOne_Optional_Self1Id`, `l1`.`Name`
 FROM (
     SELECT `l`.`Name`
     FROM `LevelOne` AS `l`
     WHERE `l`.`Id` > 3
     GROUP BY `l`.`Name`
-) AS `t`
+) AS `l1`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Name`, `l2`.`OneToMany_Optional_Self_Inverse1Id`, `l2`.`OneToMany_Required_Self_Inverse1Id`, `l2`.`OneToOne_Optional_Self1Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`Name` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelOne` AS `l0`
         WHERE `l0`.`Id` > 3
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Name` = `t0`.`Name`
-ORDER BY `t`.`Name`, `t0`.`Id`",
+    ) AS `l2`
+    WHERE `l2`.`row` <= 1
+) AS `l3` ON `l1`.`Name` = `l3`.`Name`
+ORDER BY `l1`.`Name`, `l3`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `t`.`Name`, `t0`.`Id`
+                """
+SELECT `l6`.`Id`, `l6`.`Date`, `l6`.`Level1_Optional_Id`, `l6`.`Level1_Required_Id`, `l6`.`Name`, `l6`.`OneToMany_Optional_Inverse2Id`, `l6`.`OneToMany_Optional_Self_Inverse2Id`, `l6`.`OneToMany_Required_Inverse2Id`, `l6`.`OneToMany_Required_Self_Inverse2Id`, `l6`.`OneToOne_Optional_PK_Inverse2Id`, `l6`.`OneToOne_Optional_Self2Id`, `l7`.`Name`, `l9`.`Id`
 FROM (
     SELECT `l`.`Name`
     FROM `LevelOne` AS `l`
     WHERE `l`.`Id` > 3
     GROUP BY `l`.`Name`
-) AS `t`
+) AS `l7`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Name`
+    SELECT `l8`.`Id`, `l8`.`Name`
     FROM (
-        SELECT `l0`.`Id`, `l0`.`Name`, ROW_NUMBER() OVER(PARTITION BY `l0`.`Name` ORDER BY `l0`.`Id`) AS `row`
-        FROM `LevelOne` AS `l0`
-        WHERE `l0`.`Id` > 3
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Name` = `t0`.`Name`
-INNER JOIN `LevelTwo` AS `l1` ON `t0`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `t`.`Name`, `t0`.`Id`");
+        SELECT `l5`.`Id`, `l5`.`Name`, ROW_NUMBER() OVER(PARTITION BY `l5`.`Name` ORDER BY `l5`.`Id`) AS `row`
+        FROM `LevelOne` AS `l5`
+        WHERE `l5`.`Id` > 3
+    ) AS `l8`
+    WHERE `l8`.`row` <= 1
+) AS `l9` ON `l7`.`Name` = `l9`.`Name`
+INNER JOIN `LevelTwo` AS `l6` ON `l9`.`Id` = `l6`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l7`.`Name`, `l9`.`Id`
+""");
         }
 
         public override async Task Include_collection_with_groupby_in_subquery_and_filter_after_groupby(bool async)
         {
             await base.Include_collection_with_groupby_in_subquery_and_filter_after_groupby(async);
 
-            AssertSql(
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t`.`Name`
+        AssertSql(
+"""
+SELECT `l3`.`Id`, `l3`.`Date`, `l3`.`Name`, `l3`.`OneToMany_Optional_Self_Inverse1Id`, `l3`.`OneToMany_Required_Self_Inverse1Id`, `l3`.`OneToOne_Optional_Self1Id`, `l1`.`Name`
 FROM (
-    SELECT `t`.`Name`
+    SELECT `l10`.`Name`
     FROM (
         SELECT `l`.`Name`, (`l`.`Name` <> 'Foo') OR `l`.`Name` IS NULL AS `c`
         FROM `LevelOne` AS `l`
         GROUP BY `l`.`Name`, `c`
         HAVING `c`
-    ) AS `t`
-) AS `t`
+    ) AS `l10`
+) AS `l1`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Name`, `l2`.`OneToMany_Optional_Self_Inverse1Id`, `l2`.`OneToMany_Required_Self_Inverse1Id`, `l2`.`OneToOne_Optional_Self1Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`Name` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelOne` AS `l0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Name` = `t0`.`Name`
-ORDER BY `t`.`Name`, `t0`.`Id`",
+    ) AS `l2`
+    WHERE `l2`.`row` <= 1
+) AS `l3` ON `l1`.`Name` = `l3`.`Name`
+ORDER BY `l1`.`Name`, `l3`.`Id`
+""",
                 //
-                @"SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`, `t`.`Name`, `t0`.`Id`
+                """
+SELECT `l6`.`Id`, `l6`.`Date`, `l6`.`Level1_Optional_Id`, `l6`.`Level1_Required_Id`, `l6`.`Name`, `l6`.`OneToMany_Optional_Inverse2Id`, `l6`.`OneToMany_Optional_Self_Inverse2Id`, `l6`.`OneToMany_Required_Inverse2Id`, `l6`.`OneToMany_Required_Self_Inverse2Id`, `l6`.`OneToOne_Optional_PK_Inverse2Id`, `l6`.`OneToOne_Optional_Self2Id`, `l7`.`Name`, `l9`.`Id`
 FROM (
-    SELECT `t`.`Name`
+    SELECT `l11`.`Name`
     FROM (
         SELECT `l`.`Name`, (`l`.`Name` <> 'Foo') OR `l`.`Name` IS NULL AS `c`
         FROM `LevelOne` AS `l`
         GROUP BY `l`.`Name`, `c`
         HAVING `c`
-    ) AS `t`
-) AS `t`
+    ) AS `l11`
+) AS `l7`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Name`
+    SELECT `l8`.`Id`, `l8`.`Name`
     FROM (
-        SELECT `l0`.`Id`, `l0`.`Name`, ROW_NUMBER() OVER(PARTITION BY `l0`.`Name` ORDER BY `l0`.`Id`) AS `row`
-        FROM `LevelOne` AS `l0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Name` = `t0`.`Name`
-INNER JOIN `LevelTwo` AS `l1` ON `t0`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `t`.`Name`, `t0`.`Id`");
+        SELECT `l5`.`Id`, `l5`.`Name`, ROW_NUMBER() OVER(PARTITION BY `l5`.`Name` ORDER BY `l5`.`Id`) AS `row`
+        FROM `LevelOne` AS `l5`
+    ) AS `l8`
+    WHERE `l8`.`row` <= 1
+) AS `l9` ON `l7`.`Name` = `l9`.`Name`
+INNER JOIN `LevelTwo` AS `l6` ON `l9`.`Id` = `l6`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l7`.`Name`, `l9`.`Id`
+""");
         }
 
         public override async Task Include_reference_collection_order_by_reference_navigation(bool async)
@@ -2393,18 +2639,20 @@ public override async Task Filtered_include_is_considered_loaded(bool async)
         {
             await base.Filtered_include_is_considered_loaded(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`, `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`
 FROM `LevelOne` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Date`, `t`.`Level1_Optional_Id`, `t`.`Level1_Required_Id`, `t`.`Name`, `t`.`OneToMany_Optional_Inverse2Id`, `t`.`OneToMany_Optional_Self_Inverse2Id`, `t`.`OneToMany_Required_Inverse2Id`, `t`.`OneToMany_Required_Self_Inverse2Id`, `t`.`OneToOne_Optional_PK_Inverse2Id`, `t`.`OneToOne_Optional_Self2Id`
+    SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
     FROM (
         SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, ROW_NUMBER() OVER(PARTITION BY `l0`.`OneToMany_Optional_Inverse2Id` ORDER BY `l0`.`Id`) AS `row`
         FROM `LevelTwo` AS `l0`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `l`.`Id` = `t0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `l`.`Id`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`Id`");
+    ) AS `l1`
+    WHERE `l1`.`row` <= 1
+) AS `l2` ON `l`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l`.`Id`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`Id`
+""");
         }
 
         public override async Task Filtered_include_with_Distinct_throws(bool async)
@@ -2427,42 +2675,46 @@ public override async Task Filtered_include_Take_with_another_Take_on_top_level(
         {
             await base.Filtered_include_Take_with_another_Take_on_top_level(async);
 
-            AssertSql(
-                @"@__p_0='5'
+        AssertSql(
+"""
+@__p_0='5'
 
 SELECT `l`.`Id`, `l`.`Date`, `l`.`Name`, `l`.`OneToMany_Optional_Self_Inverse1Id`, `l`.`OneToMany_Required_Self_Inverse1Id`, `l`.`OneToOne_Optional_Self1Id`
 FROM `LevelOne` AS `l`
 ORDER BY `l`.`Id`
-LIMIT @__p_0",
+LIMIT @__p_0
+""",
                 //
-                @"@__p_0='5'
+                """
+@__p_0='5'
 
-SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `t`.`Id`
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `l3`.`Id`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Id`
     LIMIT @__p_0
-) AS `t`
+) AS `l3`
 JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l0`.`Level2_Optional_Id`, `l0`.`Level2_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse3Id`, `l0`.`OneToMany_Optional_Self_Inverse3Id`, `l0`.`OneToMany_Required_Inverse3Id`, `l0`.`OneToMany_Required_Self_Inverse3Id`, `l0`.`OneToOne_Optional_PK_Inverse3Id`, `l0`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE `t`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-        ORDER BY `l1`.`Name` DESC
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE `l3`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
+        ORDER BY `l0`.`Name` DESC
         LIMIT 4
-    ) AS `t1`
-    LEFT JOIN `LevelThree` AS `l0` ON `t1`.`Id` = `l0`.`Level2_Optional_Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id`, `t0`.`Name` DESC");
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Optional_Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Id`, `s`.`Name` DESC
+""");
         }
 
         public override async Task Filtered_include_Skip_Take_with_another_Skip_Take_on_top_level(bool async)
         {
             await base.Filtered_include_Skip_Take_with_another_Skip_Take_on_top_level(async);
 
-            AssertSql(
+        AssertSql(
 """
 @__p_1='5'
 @__p_0='1'
@@ -2473,29 +2725,29 @@ ORDER BY `l`.`Id` DESC
 LIMIT @__p_1 OFFSET @__p_0
 """,
                 //
-"""
+                """
 @__p_1='5'
 @__p_0='1'
 
-SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t0`.`Id0`, `t0`.`Level2_Optional_Id`, `t0`.`Level2_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse3Id`, `t0`.`OneToMany_Optional_Self_Inverse3Id`, `t0`.`OneToMany_Required_Inverse3Id`, `t0`.`OneToMany_Required_Self_Inverse3Id`, `t0`.`OneToOne_Optional_PK_Inverse3Id`, `t0`.`OneToOne_Optional_Self3Id`, `t`.`Id`
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `s`.`Id0`, `s`.`Level2_Optional_Id`, `s`.`Level2_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id`, `s`.`OneToMany_Optional_Self_Inverse3Id`, `s`.`OneToMany_Required_Inverse3Id`, `s`.`OneToMany_Required_Self_Inverse3Id`, `s`.`OneToOne_Optional_PK_Inverse3Id`, `s`.`OneToOne_Optional_Self3Id`, `l3`.`Id`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     ORDER BY `l`.`Id` DESC
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
+) AS `l3`
 JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Level1_Optional_Id`, `t1`.`Level1_Required_Id`, `t1`.`Name`, `t1`.`OneToMany_Optional_Inverse2Id`, `t1`.`OneToMany_Optional_Self_Inverse2Id`, `t1`.`OneToMany_Required_Inverse2Id`, `t1`.`OneToMany_Required_Self_Inverse2Id`, `t1`.`OneToOne_Optional_PK_Inverse2Id`, `t1`.`OneToOne_Optional_Self2Id`, `l0`.`Id` AS `Id0`, `l0`.`Level2_Optional_Id`, `l0`.`Level2_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse3Id`, `l0`.`OneToMany_Optional_Self_Inverse3Id`, `l0`.`OneToMany_Required_Inverse3Id`, `l0`.`OneToMany_Required_Self_Inverse3Id`, `l0`.`OneToOne_Optional_PK_Inverse3Id`, `l0`.`OneToOne_Optional_Self3Id`
+    SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l1`.`Id` AS `Id0`, `l1`.`Level2_Optional_Id`, `l1`.`Level2_Required_Id`, `l1`.`Name` AS `Name0`, `l1`.`OneToMany_Optional_Inverse3Id`, `l1`.`OneToMany_Optional_Self_Inverse3Id`, `l1`.`OneToMany_Required_Inverse3Id`, `l1`.`OneToMany_Required_Self_Inverse3Id`, `l1`.`OneToOne_Optional_PK_Inverse3Id`, `l1`.`OneToOne_Optional_Self3Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Level1_Optional_Id`, `l1`.`Level1_Required_Id`, `l1`.`Name`, `l1`.`OneToMany_Optional_Inverse2Id`, `l1`.`OneToMany_Optional_Self_Inverse2Id`, `l1`.`OneToMany_Required_Inverse2Id`, `l1`.`OneToMany_Required_Self_Inverse2Id`, `l1`.`OneToOne_Optional_PK_Inverse2Id`, `l1`.`OneToOne_Optional_Self2Id`
-        FROM `LevelTwo` AS `l1`
-        WHERE `t`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
-        ORDER BY `l1`.`Name` DESC
+        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+        FROM `LevelTwo` AS `l0`
+        WHERE `l3`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
+        ORDER BY `l0`.`Name` DESC
         LIMIT 4 OFFSET 1
-    ) AS `t1`
-    LEFT JOIN `LevelThree` AS `l0` ON `t1`.`Id` = `l0`.`Level2_Optional_Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Id` DESC, `t0`.`Name` DESC
+    ) AS `l2`
+    LEFT JOIN `LevelThree` AS `l1` ON `l2`.`Id` = `l1`.`Level2_Optional_Id`
+) AS `s` ON TRUE
+ORDER BY `l3`.`Id` DESC, `s`.`Name` DESC
 """);
         }
 
@@ -2503,119 +2755,137 @@ public override async Task Skip_Take_Distinct_on_grouping_element(bool async)
         {
             await base.Skip_Take_Distinct_on_grouping_element(async);
 
-            AssertSql(
-                @"SELECT `l`.`Date`
+        AssertSql(
+"""
+SELECT `l`.`Date`
 FROM `LevelOne` AS `l`
 GROUP BY `l`.`Date`
-ORDER BY `l`.`Date`",
+ORDER BY `l`.`Date`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t`.`Date`
+                """
+SELECT `l8`.`Id`, `l8`.`Date`, `l8`.`Name`, `l8`.`OneToMany_Optional_Self_Inverse1Id`, `l8`.`OneToMany_Required_Self_Inverse1Id`, `l8`.`OneToOne_Optional_Self1Id`, `l7`.`Date`
 FROM (
     SELECT `l`.`Date`
     FROM `LevelOne` AS `l`
     GROUP BY `l`.`Date`
-) AS `t`
+) AS `l7`
 JOIN LATERAL (
-    SELECT DISTINCT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`
+    SELECT DISTINCT `l6`.`Id`, `l6`.`Date`, `l6`.`Name`, `l6`.`OneToMany_Optional_Self_Inverse1Id`, `l6`.`OneToMany_Required_Self_Inverse1Id`, `l6`.`OneToOne_Optional_Self1Id`
     FROM (
-        SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Name`, `l0`.`OneToMany_Optional_Self_Inverse1Id`, `l0`.`OneToMany_Required_Self_Inverse1Id`, `l0`.`OneToOne_Optional_Self1Id`
-        FROM `LevelOne` AS `l0`
-        WHERE `t`.`Date` = `l0`.`Date`
-        ORDER BY `l0`.`Name`
+        SELECT `l5`.`Id`, `l5`.`Date`, `l5`.`Name`, `l5`.`OneToMany_Optional_Self_Inverse1Id`, `l5`.`OneToMany_Required_Self_Inverse1Id`, `l5`.`OneToOne_Optional_Self1Id`
+        FROM `LevelOne` AS `l5`
+        WHERE `l7`.`Date` = `l5`.`Date`
+        ORDER BY `l5`.`Name`
         LIMIT 5 OFFSET 1
-    ) AS `t1`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Date`");
+    ) AS `l6`
+) AS `l8` ON TRUE
+ORDER BY `l7`.`Date`
+""");
         }
 
         public override async Task Skip_Take_on_grouping_element_inside_collection_projection(bool async)
         {
             await base.Skip_Take_on_grouping_element_inside_collection_projection(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
-ORDER BY `l`.`Id`",
+ORDER BY `l`.`Id`
+""",
                 //
-                @"SELECT `t`.`Date`, `l`.`Id`
+                """
+SELECT `l15`.`Date`, `l`.`Id`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `l0`.`Date`
-    FROM `LevelOne` AS `l0`
-    WHERE (`l0`.`Name` = `l`.`Name`) OR (`l0`.`Name` IS NULL AND (`l`.`Name` IS NULL))
-    GROUP BY `l0`.`Date`
-) AS `t` ON TRUE
-ORDER BY `l`.`Id`, `t`.`Date`",
+    SELECT `l10`.`Date`
+    FROM `LevelOne` AS `l10`
+    WHERE (`l10`.`Name` = `l`.`Name`) OR (`l10`.`Name` IS NULL AND (`l`.`Name` IS NULL))
+    GROUP BY `l10`.`Date`
+) AS `l15` ON TRUE
+ORDER BY `l`.`Id`, `l15`.`Date`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `l`.`Id`, `t`.`Date`
+                """
+SELECT `l17`.`Id`, `l17`.`Date`, `l17`.`Name`, `l17`.`OneToMany_Optional_Self_Inverse1Id`, `l17`.`OneToMany_Required_Self_Inverse1Id`, `l17`.`OneToOne_Optional_Self1Id`, `l`.`Id`, `l15`.`Date`
 FROM `LevelOne` AS `l`
 JOIN LATERAL (
-    SELECT `l0`.`Date`
-    FROM `LevelOne` AS `l0`
-    WHERE (`l0`.`Name` = `l`.`Name`) OR (`l0`.`Name` IS NULL AND (`l`.`Name` IS NULL))
-    GROUP BY `l0`.`Date`
-) AS `t` ON TRUE
+    SELECT `l10`.`Date`
+    FROM `LevelOne` AS `l10`
+    WHERE (`l10`.`Name` = `l`.`Name`) OR (`l10`.`Name` IS NULL AND (`l`.`Name` IS NULL))
+    GROUP BY `l10`.`Date`
+) AS `l15` ON TRUE
 INNER JOIN (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`
+    SELECT `l16`.`Id`, `l16`.`Date`, `l16`.`Name`, `l16`.`OneToMany_Optional_Self_Inverse1Id`, `l16`.`OneToMany_Required_Self_Inverse1Id`, `l16`.`OneToOne_Optional_Self1Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`, ROW_NUMBER() OVER(PARTITION BY `l1`.`Name`, `l1`.`Date` ORDER BY `l1`.`Name`) AS `row`
-        FROM `LevelOne` AS `l1`
-    ) AS `t1`
-    WHERE (1 < `t1`.`row`) AND (`t1`.`row` <= 6)
-) AS `t0` ON ((`l`.`Name` = `t0`.`Name`) OR (`l`.`Name` IS NULL AND (`t0`.`Name` IS NULL))) AND (`t`.`Date` = `t0`.`Date`)
-ORDER BY `l`.`Id`, `t`.`Date`, `t0`.`Name`, `t0`.`Date`");
+        SELECT `l14`.`Id`, `l14`.`Date`, `l14`.`Name`, `l14`.`OneToMany_Optional_Self_Inverse1Id`, `l14`.`OneToMany_Required_Self_Inverse1Id`, `l14`.`OneToOne_Optional_Self1Id`, ROW_NUMBER() OVER(PARTITION BY `l14`.`Name`, `l14`.`Date` ORDER BY `l14`.`Name`) AS `row`
+        FROM `LevelOne` AS `l14`
+    ) AS `l16`
+    WHERE (1 < `l16`.`row`) AND (`l16`.`row` <= 6)
+) AS `l17` ON ((`l`.`Name` = `l17`.`Name`) OR (`l`.`Name` IS NULL AND (`l17`.`Name` IS NULL))) AND (`l15`.`Date` = `l17`.`Date`)
+ORDER BY `l`.`Id`, `l15`.`Date`, `l17`.`Name`, `l17`.`Date`
+""");
         }
 
         public override async Task Skip_Take_on_grouping_element_with_reference_include(bool async)
         {
             await base.Skip_Take_on_grouping_element_with_reference_include(async);
 
-            AssertSql(
-                @"SELECT `l`.`Date`
+        AssertSql(
+"""
+SELECT `l`.`Date`
 FROM `LevelOne` AS `l`
 GROUP BY `l`.`Date`
-ORDER BY `l`.`Date`",
+ORDER BY `l`.`Date`
+""",
                 //
-                @"SELECT `t0`.`Id`, `t0`.`Date`, `t0`.`Name`, `t0`.`OneToMany_Optional_Self_Inverse1Id`, `t0`.`OneToMany_Required_Self_Inverse1Id`, `t0`.`OneToOne_Optional_Self1Id`, `t0`.`Id0`, `t0`.`Date0`, `t0`.`Level1_Optional_Id`, `t0`.`Level1_Required_Id`, `t0`.`Name0`, `t0`.`OneToMany_Optional_Inverse2Id`, `t0`.`OneToMany_Optional_Self_Inverse2Id`, `t0`.`OneToMany_Required_Inverse2Id`, `t0`.`OneToMany_Required_Self_Inverse2Id`, `t0`.`OneToOne_Optional_PK_Inverse2Id`, `t0`.`OneToOne_Optional_Self2Id`, `t`.`Date`
+                """
+SELECT `s`.`Id`, `s`.`Date`, `s`.`Name`, `s`.`OneToMany_Optional_Self_Inverse1Id`, `s`.`OneToMany_Required_Self_Inverse1Id`, `s`.`OneToOne_Optional_Self1Id`, `s`.`Id0`, `s`.`Date0`, `s`.`Level1_Optional_Id`, `s`.`Level1_Required_Id`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse2Id`, `s`.`OneToMany_Optional_Self_Inverse2Id`, `s`.`OneToMany_Required_Inverse2Id`, `s`.`OneToMany_Required_Self_Inverse2Id`, `s`.`OneToOne_Optional_PK_Inverse2Id`, `s`.`OneToOne_Optional_Self2Id`, `l10`.`Date`
 FROM (
     SELECT `l`.`Date`
     FROM `LevelOne` AS `l`
     GROUP BY `l`.`Date`
-) AS `t`
+) AS `l10`
 JOIN LATERAL (
-    SELECT `t1`.`Id`, `t1`.`Date`, `t1`.`Name`, `t1`.`OneToMany_Optional_Self_Inverse1Id`, `t1`.`OneToMany_Required_Self_Inverse1Id`, `t1`.`OneToOne_Optional_Self1Id`, `l0`.`Id` AS `Id0`, `l0`.`Date` AS `Date0`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name` AS `Name0`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`
+    SELECT `l9`.`Id`, `l9`.`Date`, `l9`.`Name`, `l9`.`OneToMany_Optional_Self_Inverse1Id`, `l9`.`OneToMany_Required_Self_Inverse1Id`, `l9`.`OneToOne_Optional_Self1Id`, `l8`.`Id` AS `Id0`, `l8`.`Date` AS `Date0`, `l8`.`Level1_Optional_Id`, `l8`.`Level1_Required_Id`, `l8`.`Name` AS `Name0`, `l8`.`OneToMany_Optional_Inverse2Id`, `l8`.`OneToMany_Optional_Self_Inverse2Id`, `l8`.`OneToMany_Required_Inverse2Id`, `l8`.`OneToMany_Required_Self_Inverse2Id`, `l8`.`OneToOne_Optional_PK_Inverse2Id`, `l8`.`OneToOne_Optional_Self2Id`
     FROM (
-        SELECT `l1`.`Id`, `l1`.`Date`, `l1`.`Name`, `l1`.`OneToMany_Optional_Self_Inverse1Id`, `l1`.`OneToMany_Required_Self_Inverse1Id`, `l1`.`OneToOne_Optional_Self1Id`
-        FROM `LevelOne` AS `l1`
-        WHERE `t`.`Date` = `l1`.`Date`
-        ORDER BY `l1`.`Name`
+        SELECT `l7`.`Id`, `l7`.`Date`, `l7`.`Name`, `l7`.`OneToMany_Optional_Self_Inverse1Id`, `l7`.`OneToMany_Required_Self_Inverse1Id`, `l7`.`OneToOne_Optional_Self1Id`
+        FROM `LevelOne` AS `l7`
+        WHERE `l10`.`Date` = `l7`.`Date`
+        ORDER BY `l7`.`Name`
         LIMIT 5 OFFSET 1
-    ) AS `t1`
-    LEFT JOIN `LevelTwo` AS `l0` ON `t1`.`Id` = `l0`.`Level1_Optional_Id`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Date`, `t0`.`Name`");
+    ) AS `l9`
+    LEFT JOIN `LevelTwo` AS `l8` ON `l9`.`Id` = `l8`.`Level1_Optional_Id`
+) AS `s` ON TRUE
+ORDER BY `l10`.`Date`, `s`.`Name`
+""");
         }
 
         public override async Task Projecting_collection_with_FirstOrDefault(bool async)
         {
             await base.Projecting_collection_with_FirstOrDefault(async);
 
-            AssertSql(
-                @"SELECT `l`.`Id`
+        AssertSql(
+"""
+SELECT `l`.`Id`
 FROM `LevelOne` AS `l`
 WHERE `l`.`Id` = 1
 ORDER BY `l`.`Id`
-LIMIT 1",
+LIMIT 1
+""",
                 //
-                @"SELECT `l0`.`Id`, `l0`.`Date`, `l0`.`Level1_Optional_Id`, `l0`.`Level1_Required_Id`, `l0`.`Name`, `l0`.`OneToMany_Optional_Inverse2Id`, `l0`.`OneToMany_Optional_Self_Inverse2Id`, `l0`.`OneToMany_Required_Inverse2Id`, `l0`.`OneToMany_Required_Self_Inverse2Id`, `l0`.`OneToOne_Optional_PK_Inverse2Id`, `l0`.`OneToOne_Optional_Self2Id`, `t`.`Id`
+                """
+SELECT `l2`.`Id`, `l2`.`Date`, `l2`.`Level1_Optional_Id`, `l2`.`Level1_Required_Id`, `l2`.`Name`, `l2`.`OneToMany_Optional_Inverse2Id`, `l2`.`OneToMany_Optional_Self_Inverse2Id`, `l2`.`OneToMany_Required_Inverse2Id`, `l2`.`OneToMany_Required_Self_Inverse2Id`, `l2`.`OneToOne_Optional_PK_Inverse2Id`, `l2`.`OneToOne_Optional_Self2Id`, `l3`.`Id`
 FROM (
     SELECT `l`.`Id`
     FROM `LevelOne` AS `l`
     WHERE `l`.`Id` = 1
     LIMIT 1
-) AS `t`
-INNER JOIN `LevelTwo` AS `l0` ON `t`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `t`.`Id`");
+) AS `l3`
+INNER JOIN `LevelTwo` AS `l2` ON `l3`.`Id` = `l2`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l3`.`Id`
+""");
         }
 
         private void AssertSql(params string[] expected)
diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlTest.cs
index 727b35502..5c46ba16d 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlTest.cs
@@ -80,11 +80,12 @@ public override async Task Nested_SelectMany_correlated_with_join_table_correctl
             await Assert.ThrowsAsync<EqualException>(
                 async () => await base.Nested_SelectMany_correlated_with_join_table_correctly_translated_to_apply(async));
 
-            AssertSql(
-                @"SELECT `t0`.`l1Name`, `t0`.`l2Name`, `t0`.`l3Name`
+        AssertSql(
+"""
+SELECT `s0`.`l1Name`, `s0`.`l2Name`, `s0`.`l3Name`
 FROM `LevelOne` AS `l`
 LEFT JOIN LATERAL (
-    SELECT `t`.`l1Name`, `t`.`l2Name`, `t`.`l3Name`
+    SELECT `s`.`l1Name`, `s`.`l2Name`, `s`.`l3Name`
     FROM `LevelTwo` AS `l0`
     LEFT JOIN `LevelThree` AS `l1` ON `l0`.`Id` = `l1`.`Id`
     JOIN LATERAL (
@@ -92,9 +93,10 @@ JOIN LATERAL (
         FROM `LevelFour` AS `l2`
         LEFT JOIN `LevelThree` AS `l3` ON `l2`.`OneToOne_Optional_PK_Inverse4Id` = `l3`.`Id`
         WHERE `l1`.`Id` IS NOT NULL AND (`l1`.`Id` = `l2`.`OneToMany_Optional_Inverse4Id`)
-    ) AS `t` ON TRUE
+    ) AS `s` ON TRUE
     WHERE `l`.`Id` = `l0`.`OneToMany_Optional_Inverse2Id`
-) AS `t0` ON TRUE");
+) AS `s0` ON TRUE
+""");
         }
 
         public override async Task Method_call_on_optional_navigation_translates_to_null_conditional_properly_for_arguments(bool async)
diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryMySqlTest.cs
index bf7c4885f..3c2954f2b 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryMySqlTest.cs
@@ -66,18 +66,111 @@ await AssertQuery(
                     .OrderBy(e => e.Name) // <-- fix
                     .Take(1));
 
-            AssertSql(
-                @"@__p_0='1'
+        AssertSql(
+"""
+@__p_0='1'
 
-SELECT `t`.`Name`
+SELECT `l1`.`Name`
 FROM `Level1` AS `l`
 INNER JOIN (
     SELECT `l0`.`Level2_Name` AS `Name`, `l0`.`OneToMany_Optional_Inverse2Id`
     FROM `Level1` AS `l0`
     WHERE (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL
-) AS `t` ON `l`.`Id` = `t`.`OneToMany_Optional_Inverse2Id`
-ORDER BY `t`.`Name`
-LIMIT @__p_0");
+) AS `l1` ON `l`.`Id` = `l1`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l1`.`Name`
+LIMIT @__p_0
+""");
+        }
+
+        public override async Task Max_in_multi_level_nested_subquery(bool async)
+        {
+            await AssertQuery(
+                async,
+                ss => ss.Set<Level1>()
+                    .OrderBy(l1 => l1.Id) // <-- ensure order is deterministic
+                    .Take(2).Select(x => new
+                {
+                    x.Id,
+                    LevelTwos = x.OneToMany_Optional1.AsQueryable().Select(xx => new
+                    {
+                        xx.Id,
+                        LevelThree = new
+                        {
+                            xx.OneToOne_Required_FK2.Id,
+                            LevelFour = new
+                            {
+                                xx.OneToOne_Required_FK2.OneToOne_Required_FK3.Id,
+                                Result = (xx.OneToOne_Required_FK2.OneToMany_Optional3.Max(xxx => (int?)xxx.Id) ?? 0) > 1
+                            }
+                        }
+                    }).ToList()
+                }),
+                elementSorter: e => e.Id,
+                elementAsserter: (e, a) =>
+                {
+                    AssertEqual(e.Id, a.Id);
+                    AssertCollection(
+                        e.LevelTwos,
+                        a.LevelTwos,
+                        elementSorter: ee => ee.Id,
+                        elementAsserter: (ee, aa) =>
+                        {
+                            AssertEqual(ee.Id, aa.Id);
+                            AssertEqual(ee.LevelThree.Id, aa.LevelThree.Id);
+                            AssertEqual(ee.LevelThree.LevelFour.Id, aa.LevelThree.LevelFour.Id);
+                            AssertEqual(ee.LevelThree.LevelFour.Result, aa.LevelThree.LevelFour.Result);
+                        });
+                });
+
+            AssertSql(
+"""
+@__p_0='2'
+
+SELECT `l6`.`Id`, `s`.`Id`, `s`.`Id0`, `s`.`Id1`, `s`.`Result`, `s`.`Id2`, `s`.`Id3`, `s`.`Id4`
+FROM (
+    SELECT `l`.`Id`
+    FROM `Level1` AS `l`
+    ORDER BY `l`.`Id`
+    LIMIT @__p_0
+) AS `l6`
+LEFT JOIN (
+    SELECT CASE
+        WHEN (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l0`.`Id`
+    END AS `Id`, CASE
+        WHEN `l2`.`Level2_Required_Id` IS NOT NULL AND (`l2`.`OneToMany_Required_Inverse3Id` IS NOT NULL) THEN `l2`.`Id`
+    END AS `Id0`, CASE
+        WHEN `l4`.`Level3_Required_Id` IS NOT NULL AND (`l4`.`OneToMany_Required_Inverse4Id` IS NOT NULL) THEN `l4`.`Id`
+    END AS `Id1`, COALESCE((
+        SELECT MAX(CASE
+            WHEN `l5`.`Level3_Required_Id` IS NOT NULL AND (`l5`.`OneToMany_Required_Inverse4Id` IS NOT NULL) THEN `l5`.`Id`
+        END)
+        FROM `Level1` AS `l5`
+        WHERE (`l5`.`Level3_Required_Id` IS NOT NULL AND (`l5`.`OneToMany_Required_Inverse4Id` IS NOT NULL)) AND (CASE
+            WHEN `l2`.`Level2_Required_Id` IS NOT NULL AND (`l2`.`OneToMany_Required_Inverse3Id` IS NOT NULL) THEN `l2`.`Id`
+        END IS NOT NULL AND ((CASE
+            WHEN `l2`.`Level2_Required_Id` IS NOT NULL AND (`l2`.`OneToMany_Required_Inverse3Id` IS NOT NULL) THEN `l2`.`Id`
+        END = `l5`.`OneToMany_Optional_Inverse4Id`) OR (CASE
+            WHEN `l2`.`Level2_Required_Id` IS NOT NULL AND (`l2`.`OneToMany_Required_Inverse3Id` IS NOT NULL) THEN `l2`.`Id`
+        END IS NULL AND (`l5`.`OneToMany_Optional_Inverse4Id` IS NULL))))), 0) > 1 AS `Result`, `l0`.`Id` AS `Id2`, `l2`.`Id` AS `Id3`, `l4`.`Id` AS `Id4`, `l0`.`OneToMany_Optional_Inverse2Id`
+    FROM `Level1` AS `l0`
+    LEFT JOIN (
+        SELECT `l1`.`Id`, `l1`.`Level2_Required_Id`, `l1`.`OneToMany_Required_Inverse3Id`
+        FROM `Level1` AS `l1`
+        WHERE `l1`.`Level2_Required_Id` IS NOT NULL AND (`l1`.`OneToMany_Required_Inverse3Id` IS NOT NULL)
+    ) AS `l2` ON CASE
+        WHEN (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL THEN `l0`.`Id`
+    END = `l2`.`Level2_Required_Id`
+    LEFT JOIN (
+        SELECT `l3`.`Id`, `l3`.`Level3_Required_Id`, `l3`.`OneToMany_Required_Inverse4Id`
+        FROM `Level1` AS `l3`
+        WHERE `l3`.`Level3_Required_Id` IS NOT NULL AND (`l3`.`OneToMany_Required_Inverse4Id` IS NOT NULL)
+    ) AS `l4` ON CASE
+        WHEN `l2`.`Level2_Required_Id` IS NOT NULL AND (`l2`.`OneToMany_Required_Inverse3Id` IS NOT NULL) THEN `l2`.`Id`
+    END = `l4`.`Level3_Required_Id`
+    WHERE (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL
+) AS `s` ON `l6`.`Id` = `s`.`OneToMany_Optional_Inverse2Id`
+ORDER BY `l6`.`Id`, `s`.`Id2`, `s`.`Id3`
+""");
         }
 
         public override async Task Method_call_on_optional_navigation_translates_to_null_conditional_properly_for_arguments(bool async)
@@ -92,8 +185,8 @@ LEFT JOIN (
     SELECT `l0`.`Level1_Optional_Id`, `l0`.`Level2_Name`
     FROM `Level1` AS `l0`
     WHERE (`l0`.`OneToOne_Required_PK_Date` IS NOT NULL AND (`l0`.`Level1_Required_Id` IS NOT NULL)) AND `l0`.`OneToMany_Required_Inverse2Id` IS NOT NULL
-) AS `t` ON `l`.`Id` = `t`.`Level1_Optional_Id`
-WHERE `t`.`Level2_Name` IS NOT NULL AND (LEFT(`t`.`Level2_Name`, CHAR_LENGTH(`t`.`Level2_Name`)) = `t`.`Level2_Name`)
+) AS `l1` ON `l`.`Id` = `l1`.`Level1_Optional_Id`
+WHERE `l1`.`Level2_Name` IS NOT NULL AND (LEFT(`l1`.`Level2_Name`, CHAR_LENGTH(`l1`.`Level2_Name`)) = `l1`.`Level2_Name`)
 """);
         }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexTypeQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexTypeQueryMySqlTest.cs
index 71c1dd890..c7e021390 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/ComplexTypeQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexTypeQueryMySqlTest.cs
@@ -25,7 +25,7 @@ public override async Task Filter_on_property_inside_complex_type(bool async)
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 WHERE `c`.`ShippingAddress_ZipCode` = 7728
 """);
@@ -37,7 +37,7 @@ public override async Task Filter_on_property_inside_nested_complex_type(bool as
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 WHERE `c`.`ShippingAddress_Country_Code` = 'DE'
 """);
@@ -51,14 +51,14 @@ public override async Task Filter_on_property_inside_complex_type_after_subquery
 """
 @__p_0='1'
 
-SELECT DISTINCT `t`.`Id`, `t`.`Name`, `t`.`BillingAddress_AddressLine1`, `t`.`BillingAddress_AddressLine2`, `t`.`BillingAddress_ZipCode`, `t`.`BillingAddress_Country_Code`, `t`.`BillingAddress_Country_FullName`, `t`.`ShippingAddress_AddressLine1`, `t`.`ShippingAddress_AddressLine2`, `t`.`ShippingAddress_ZipCode`, `t`.`ShippingAddress_Country_Code`, `t`.`ShippingAddress_Country_FullName`
+SELECT DISTINCT `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_Tags`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM (
-    SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+    SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
     FROM `Customer` AS `c`
     ORDER BY `c`.`Id`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
-WHERE `t`.`ShippingAddress_ZipCode` = 7728
+) AS `c0`
+WHERE `c0`.`ShippingAddress_ZipCode` = 7728
 """);
     }
 
@@ -70,14 +70,14 @@ public override async Task Filter_on_property_inside_nested_complex_type_after_s
 """
 @__p_0='1'
 
-SELECT DISTINCT `t`.`Id`, `t`.`Name`, `t`.`BillingAddress_AddressLine1`, `t`.`BillingAddress_AddressLine2`, `t`.`BillingAddress_ZipCode`, `t`.`BillingAddress_Country_Code`, `t`.`BillingAddress_Country_FullName`, `t`.`ShippingAddress_AddressLine1`, `t`.`ShippingAddress_AddressLine2`, `t`.`ShippingAddress_ZipCode`, `t`.`ShippingAddress_Country_Code`, `t`.`ShippingAddress_Country_FullName`
+SELECT DISTINCT `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_Tags`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM (
-    SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+    SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
     FROM `Customer` AS `c`
     ORDER BY `c`.`Id`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
-WHERE `t`.`ShippingAddress_Country_Code` = 'DE'
+) AS `c0`
+WHERE `c0`.`ShippingAddress_Country_Code` = 'DE'
 """);
     }
 
@@ -87,7 +87,7 @@ public override async Task Filter_on_required_property_inside_required_complex_t
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`OptionalCustomerId`, `c`.`RequiredCustomerId`, `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`, `c1`.`Id`, `c1`.`Name`, `c1`.`BillingAddress_AddressLine1`, `c1`.`BillingAddress_AddressLine2`, `c1`.`BillingAddress_ZipCode`, `c1`.`BillingAddress_Country_Code`, `c1`.`BillingAddress_Country_FullName`, `c1`.`ShippingAddress_AddressLine1`, `c1`.`ShippingAddress_AddressLine2`, `c1`.`ShippingAddress_ZipCode`, `c1`.`ShippingAddress_Country_Code`, `c1`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`OptionalCustomerId`, `c`.`RequiredCustomerId`, `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_Tags`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`, `c1`.`Id`, `c1`.`Name`, `c1`.`BillingAddress_AddressLine1`, `c1`.`BillingAddress_AddressLine2`, `c1`.`BillingAddress_Tags`, `c1`.`BillingAddress_ZipCode`, `c1`.`BillingAddress_Country_Code`, `c1`.`BillingAddress_Country_FullName`, `c1`.`ShippingAddress_AddressLine1`, `c1`.`ShippingAddress_AddressLine2`, `c1`.`ShippingAddress_Tags`, `c1`.`ShippingAddress_ZipCode`, `c1`.`ShippingAddress_Country_Code`, `c1`.`ShippingAddress_Country_FullName`
 FROM `CustomerGroup` AS `c`
 LEFT JOIN `Customer` AS `c0` ON `c`.`OptionalCustomerId` = `c0`.`Id`
 INNER JOIN `Customer` AS `c1` ON `c`.`RequiredCustomerId` = `c1`.`Id`
@@ -101,7 +101,7 @@ public override async Task Filter_on_required_property_inside_required_complex_t
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`OptionalCustomerId`, `c`.`RequiredCustomerId`, `c1`.`Id`, `c1`.`Name`, `c1`.`BillingAddress_AddressLine1`, `c1`.`BillingAddress_AddressLine2`, `c1`.`BillingAddress_ZipCode`, `c1`.`BillingAddress_Country_Code`, `c1`.`BillingAddress_Country_FullName`, `c1`.`ShippingAddress_AddressLine1`, `c1`.`ShippingAddress_AddressLine2`, `c1`.`ShippingAddress_ZipCode`, `c1`.`ShippingAddress_Country_Code`, `c1`.`ShippingAddress_Country_FullName`, `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`OptionalCustomerId`, `c`.`RequiredCustomerId`, `c1`.`Id`, `c1`.`Name`, `c1`.`BillingAddress_AddressLine1`, `c1`.`BillingAddress_AddressLine2`, `c1`.`BillingAddress_Tags`, `c1`.`BillingAddress_ZipCode`, `c1`.`BillingAddress_Country_Code`, `c1`.`BillingAddress_Country_FullName`, `c1`.`ShippingAddress_AddressLine1`, `c1`.`ShippingAddress_AddressLine2`, `c1`.`ShippingAddress_Tags`, `c1`.`ShippingAddress_ZipCode`, `c1`.`ShippingAddress_Country_Code`, `c1`.`ShippingAddress_Country_FullName`, `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_Tags`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM `CustomerGroup` AS `c`
 INNER JOIN `Customer` AS `c0` ON `c`.`RequiredCustomerId` = `c0`.`Id`
 LEFT JOIN `Customer` AS `c1` ON `c`.`OptionalCustomerId` = `c1`.`Id`
@@ -125,7 +125,7 @@ public override async Task Project_complex_type_via_required_navigation(bool asy
 
         AssertSql(
 """
-SELECT `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
+SELECT `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM `CustomerGroup` AS `c`
 INNER JOIN `Customer` AS `c0` ON `c`.`RequiredCustomerId` = `c0`.`Id`
 """);
@@ -139,13 +139,13 @@ public override async Task Load_complex_type_after_subquery_on_entity_type(bool
 """
 @__p_0='1'
 
-SELECT DISTINCT `t`.`Id`, `t`.`Name`, `t`.`BillingAddress_AddressLine1`, `t`.`BillingAddress_AddressLine2`, `t`.`BillingAddress_ZipCode`, `t`.`BillingAddress_Country_Code`, `t`.`BillingAddress_Country_FullName`, `t`.`ShippingAddress_AddressLine1`, `t`.`ShippingAddress_AddressLine2`, `t`.`ShippingAddress_ZipCode`, `t`.`ShippingAddress_Country_Code`, `t`.`ShippingAddress_Country_FullName`
+SELECT DISTINCT `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_Tags`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM (
-    SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+    SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
     FROM `Customer` AS `c`
     ORDER BY `c`.`Id`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
+) AS `c0`
 """);
     }
 
@@ -155,7 +155,7 @@ public override async Task Select_complex_type(bool async)
 
         AssertSql(
 """
-SELECT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 """);
     }
@@ -188,7 +188,7 @@ public override async Task Select_complex_type_Where(bool async)
 
         AssertSql(
 """
-SELECT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 WHERE `c`.`ShippingAddress_ZipCode` = 7728
 """);
@@ -200,7 +200,7 @@ public override async Task Select_complex_type_Distinct(bool async)
 
         AssertSql(
 """
-SELECT DISTINCT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT DISTINCT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 """);
     }
@@ -211,9 +211,9 @@ public override async Task Complex_type_equals_complex_type(bool async)
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
-WHERE ((`c`.`ShippingAddress_AddressLine1` = `c`.`BillingAddress_AddressLine1`) AND ((`c`.`ShippingAddress_AddressLine2` = `c`.`BillingAddress_AddressLine2`) OR (`c`.`ShippingAddress_AddressLine2` IS NULL AND (`c`.`BillingAddress_AddressLine2` IS NULL)))) AND (`c`.`ShippingAddress_ZipCode` = `c`.`BillingAddress_ZipCode`)
+WHERE (((`c`.`ShippingAddress_AddressLine1` = `c`.`BillingAddress_AddressLine1`) AND ((`c`.`ShippingAddress_AddressLine2` = `c`.`BillingAddress_AddressLine2`) OR (`c`.`ShippingAddress_AddressLine2` IS NULL AND (`c`.`BillingAddress_AddressLine2` IS NULL)))) AND (`c`.`ShippingAddress_Tags` = `c`.`BillingAddress_Tags`)) AND (`c`.`ShippingAddress_ZipCode` = `c`.`BillingAddress_ZipCode`)
 """);
     }
 
@@ -223,9 +223,9 @@ public override async Task Complex_type_equals_constant(bool async)
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
-WHERE ((((`c`.`ShippingAddress_AddressLine1` = '804 S. Lakeshore Road') AND `c`.`ShippingAddress_AddressLine2` IS NULL) AND (`c`.`ShippingAddress_ZipCode` = 38654)) AND (`c`.`ShippingAddress_Country_Code` = 'US')) AND (`c`.`ShippingAddress_Country_FullName` = 'United States')
+WHERE (((((`c`.`ShippingAddress_AddressLine1` = '804 S. Lakeshore Road') AND `c`.`ShippingAddress_AddressLine2` IS NULL) AND (`c`.`ShippingAddress_Tags` = '["foo","bar"]')) AND (`c`.`ShippingAddress_ZipCode` = 38654)) AND (`c`.`ShippingAddress_Country_Code` = 'US')) AND (`c`.`ShippingAddress_Country_FullName` = 'United States')
 """);
     }
 
@@ -236,13 +236,14 @@ public override async Task Complex_type_equals_parameter(bool async)
         AssertSql(
 """
 @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 4000)
+@__entity_equality_address_0_Tags='["foo","bar"]' (Size = 4000)
 @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
 @__entity_equality_address_0_Code='US' (Size = 4000)
 @__entity_equality_address_0_FullName='United States' (Size = 4000)
 
-SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
-WHERE ((((`c`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressLine1) AND `c`.`ShippingAddress_AddressLine2` IS NULL) AND (`c`.`ShippingAddress_ZipCode` = @__entity_equality_address_0_ZipCode)) AND (`c`.`ShippingAddress_Country_Code` = @__entity_equality_address_0_Code)) AND (`c`.`ShippingAddress_Country_FullName` = @__entity_equality_address_0_FullName)
+WHERE (((((`c`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressLine1) AND `c`.`ShippingAddress_AddressLine2` IS NULL) AND (`c`.`ShippingAddress_Tags` = @__entity_equality_address_0_Tags)) AND (`c`.`ShippingAddress_ZipCode` = @__entity_equality_address_0_ZipCode)) AND (`c`.`ShippingAddress_Country_Code` = @__entity_equality_address_0_Code)) AND (`c`.`ShippingAddress_Country_FullName` = @__entity_equality_address_0_FullName)
 """);
     }
 
@@ -261,16 +262,17 @@ public override async Task Contains_over_complex_type(bool async)
         AssertSql(
 """
 @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road' (Size = 4000)
+@__entity_equality_address_0_Tags='["foo","bar"]' (Size = 4000)
 @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
 @__entity_equality_address_0_Code='US' (Size = 4000)
 @__entity_equality_address_0_FullName='United States' (Size = 4000)
 
-SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 WHERE EXISTS (
     SELECT 1
     FROM `Customer` AS `c0`
-    WHERE ((((`c0`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressLine1) AND `c0`.`ShippingAddress_AddressLine2` IS NULL) AND (`c0`.`ShippingAddress_ZipCode` = @__entity_equality_address_0_ZipCode)) AND (`c0`.`ShippingAddress_Country_Code` = @__entity_equality_address_0_Code)) AND (`c0`.`ShippingAddress_Country_FullName` = @__entity_equality_address_0_FullName))
+    WHERE (((((`c0`.`ShippingAddress_AddressLine1` = @__entity_equality_address_0_AddressLine1) AND `c0`.`ShippingAddress_AddressLine2` IS NULL) AND (`c0`.`ShippingAddress_Tags` = @__entity_equality_address_0_Tags)) AND (`c0`.`ShippingAddress_ZipCode` = @__entity_equality_address_0_ZipCode)) AND (`c0`.`ShippingAddress_Country_Code` = @__entity_equality_address_0_Code)) AND (`c0`.`ShippingAddress_Country_FullName` = @__entity_equality_address_0_FullName))
 """);
     }
 
@@ -279,11 +281,11 @@ public override async Task Concat_complex_type(bool async)
         await base.Concat_complex_type(async);
         AssertSql(
 """
-SELECT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 WHERE `c`.`Id` = 1
 UNION ALL
-SELECT `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
+SELECT `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c0`
 WHERE `c0`.`Id` = 2
 """);
@@ -295,11 +297,11 @@ public override async Task Concat_entity_type_containing_complex_property(bool a
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 WHERE `c`.`Id` = 1
 UNION ALL
-SELECT `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
+SELECT `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_Tags`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c0`
 WHERE `c0`.`Id` = 2
 """);
@@ -311,11 +313,11 @@ public override async Task Union_entity_type_containing_complex_property(bool as
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`BillingAddress_AddressLine1`, `c`.`BillingAddress_AddressLine2`, `c`.`BillingAddress_Tags`, `c`.`BillingAddress_ZipCode`, `c`.`BillingAddress_Country_Code`, `c`.`BillingAddress_Country_FullName`, `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 WHERE `c`.`Id` = 1
 UNION
-SELECT `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
+SELECT `c0`.`Id`, `c0`.`Name`, `c0`.`BillingAddress_AddressLine1`, `c0`.`BillingAddress_AddressLine2`, `c0`.`BillingAddress_Tags`, `c0`.`BillingAddress_ZipCode`, `c0`.`BillingAddress_Country_Code`, `c0`.`BillingAddress_Country_FullName`, `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c0`
 WHERE `c0`.`Id` = 2
 """);
@@ -327,11 +329,11 @@ public override async Task Union_complex_type(bool async)
 
         AssertSql(
 """
-SELECT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
+SELECT `c`.`ShippingAddress_AddressLine1`, `c`.`ShippingAddress_AddressLine2`, `c`.`ShippingAddress_Tags`, `c`.`ShippingAddress_ZipCode`, `c`.`ShippingAddress_Country_Code`, `c`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c`
 WHERE `c`.`Id` = 1
 UNION
-SELECT `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
+SELECT `c0`.`ShippingAddress_AddressLine1`, `c0`.`ShippingAddress_AddressLine2`, `c0`.`ShippingAddress_Tags`, `c0`.`ShippingAddress_ZipCode`, `c0`.`ShippingAddress_Country_Code`, `c0`.`ShippingAddress_Country_FullName`
 FROM `Customer` AS `c0`
 WHERE `c0`.`Id` = 2
 """);
@@ -445,14 +447,14 @@ public override async Task Filter_on_property_inside_struct_complex_type_after_s
 """
 @__p_0='1'
 
-SELECT DISTINCT `t`.`Id`, `t`.`Name`, `t`.`BillingAddress_AddressLine1`, `t`.`BillingAddress_AddressLine2`, `t`.`BillingAddress_ZipCode`, `t`.`BillingAddress_Country_Code`, `t`.`BillingAddress_Country_FullName`, `t`.`ShippingAddress_AddressLine1`, `t`.`ShippingAddress_AddressLine2`, `t`.`ShippingAddress_ZipCode`, `t`.`ShippingAddress_Country_Code`, `t`.`ShippingAddress_Country_FullName`
+SELECT DISTINCT `v0`.`Id`, `v0`.`Name`, `v0`.`BillingAddress_AddressLine1`, `v0`.`BillingAddress_AddressLine2`, `v0`.`BillingAddress_ZipCode`, `v0`.`BillingAddress_Country_Code`, `v0`.`BillingAddress_Country_FullName`, `v0`.`ShippingAddress_AddressLine1`, `v0`.`ShippingAddress_AddressLine2`, `v0`.`ShippingAddress_ZipCode`, `v0`.`ShippingAddress_Country_Code`, `v0`.`ShippingAddress_Country_FullName`
 FROM (
     SELECT `v`.`Id`, `v`.`Name`, `v`.`BillingAddress_AddressLine1`, `v`.`BillingAddress_AddressLine2`, `v`.`BillingAddress_ZipCode`, `v`.`BillingAddress_Country_Code`, `v`.`BillingAddress_Country_FullName`, `v`.`ShippingAddress_AddressLine1`, `v`.`ShippingAddress_AddressLine2`, `v`.`ShippingAddress_ZipCode`, `v`.`ShippingAddress_Country_Code`, `v`.`ShippingAddress_Country_FullName`
     FROM `ValuedCustomer` AS `v`
     ORDER BY `v`.`Id`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
-WHERE `t`.`ShippingAddress_ZipCode` = 7728
+) AS `v0`
+WHERE `v0`.`ShippingAddress_ZipCode` = 7728
 """);
     }
 
@@ -464,14 +466,14 @@ public override async Task Filter_on_property_inside_nested_struct_complex_type_
 """
 @__p_0='1'
 
-SELECT DISTINCT `t`.`Id`, `t`.`Name`, `t`.`BillingAddress_AddressLine1`, `t`.`BillingAddress_AddressLine2`, `t`.`BillingAddress_ZipCode`, `t`.`BillingAddress_Country_Code`, `t`.`BillingAddress_Country_FullName`, `t`.`ShippingAddress_AddressLine1`, `t`.`ShippingAddress_AddressLine2`, `t`.`ShippingAddress_ZipCode`, `t`.`ShippingAddress_Country_Code`, `t`.`ShippingAddress_Country_FullName`
+SELECT DISTINCT `v0`.`Id`, `v0`.`Name`, `v0`.`BillingAddress_AddressLine1`, `v0`.`BillingAddress_AddressLine2`, `v0`.`BillingAddress_ZipCode`, `v0`.`BillingAddress_Country_Code`, `v0`.`BillingAddress_Country_FullName`, `v0`.`ShippingAddress_AddressLine1`, `v0`.`ShippingAddress_AddressLine2`, `v0`.`ShippingAddress_ZipCode`, `v0`.`ShippingAddress_Country_Code`, `v0`.`ShippingAddress_Country_FullName`
 FROM (
     SELECT `v`.`Id`, `v`.`Name`, `v`.`BillingAddress_AddressLine1`, `v`.`BillingAddress_AddressLine2`, `v`.`BillingAddress_ZipCode`, `v`.`BillingAddress_Country_Code`, `v`.`BillingAddress_Country_FullName`, `v`.`ShippingAddress_AddressLine1`, `v`.`ShippingAddress_AddressLine2`, `v`.`ShippingAddress_ZipCode`, `v`.`ShippingAddress_Country_Code`, `v`.`ShippingAddress_Country_FullName`
     FROM `ValuedCustomer` AS `v`
     ORDER BY `v`.`Id`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
-WHERE `t`.`ShippingAddress_Country_Code` = 'DE'
+) AS `v0`
+WHERE `v0`.`ShippingAddress_Country_Code` = 'DE'
 """);
     }
 
@@ -532,13 +534,13 @@ public override async Task Load_struct_complex_type_after_subquery_on_entity_typ
 """
 @__p_0='1'
 
-SELECT DISTINCT `t`.`Id`, `t`.`Name`, `t`.`BillingAddress_AddressLine1`, `t`.`BillingAddress_AddressLine2`, `t`.`BillingAddress_ZipCode`, `t`.`BillingAddress_Country_Code`, `t`.`BillingAddress_Country_FullName`, `t`.`ShippingAddress_AddressLine1`, `t`.`ShippingAddress_AddressLine2`, `t`.`ShippingAddress_ZipCode`, `t`.`ShippingAddress_Country_Code`, `t`.`ShippingAddress_Country_FullName`
+SELECT DISTINCT `v0`.`Id`, `v0`.`Name`, `v0`.`BillingAddress_AddressLine1`, `v0`.`BillingAddress_AddressLine2`, `v0`.`BillingAddress_ZipCode`, `v0`.`BillingAddress_Country_Code`, `v0`.`BillingAddress_Country_FullName`, `v0`.`ShippingAddress_AddressLine1`, `v0`.`ShippingAddress_AddressLine2`, `v0`.`ShippingAddress_ZipCode`, `v0`.`ShippingAddress_Country_Code`, `v0`.`ShippingAddress_Country_FullName`
 FROM (
     SELECT `v`.`Id`, `v`.`Name`, `v`.`BillingAddress_AddressLine1`, `v`.`BillingAddress_AddressLine2`, `v`.`BillingAddress_ZipCode`, `v`.`BillingAddress_Country_Code`, `v`.`BillingAddress_Country_FullName`, `v`.`ShippingAddress_AddressLine1`, `v`.`ShippingAddress_AddressLine2`, `v`.`ShippingAddress_ZipCode`, `v`.`ShippingAddress_Country_Code`, `v`.`ShippingAddress_Country_FullName`
     FROM `ValuedCustomer` AS `v`
     ORDER BY `v`.`Id`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
+) AS `v0`
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/CompositeKeysQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/CompositeKeysQueryMySqlTest.cs
index 02fbb5d28..5bfbf4660 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/CompositeKeysQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/CompositeKeysQueryMySqlTest.cs
@@ -70,99 +70,105 @@ public override async Task Projecting_collections_multi_level(bool async)
         {
             await base.Projecting_collections_multi_level(async);
 
-            AssertSql(
-                @"SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `t`.`Name`, `t`.`Id1`, `t`.`Id2`, `t`.`Id10`, `t`.`Id20`, `t`.`Level2_Optional_Id1`, `t`.`Level2_Optional_Id2`, `t`.`Level2_Required_Id1`, `t`.`Level2_Required_Id2`, `t`.`Name0`, `t`.`OneToMany_Optional_Inverse3Id1`, `t`.`OneToMany_Optional_Inverse3Id2`, `t`.`OneToMany_Optional_Self_Inverse3Id1`, `t`.`OneToMany_Optional_Self_Inverse3Id2`, `t`.`OneToMany_Required_Inverse3Id1`, `t`.`OneToMany_Required_Inverse3Id2`, `t`.`OneToMany_Required_Self_Inverse3Id1`, `t`.`OneToMany_Required_Self_Inverse3Id2`, `t`.`OneToOne_Optional_PK_Inverse3Id1`, `t`.`OneToOne_Optional_PK_Inverse3Id2`, `t`.`OneToOne_Optional_Self3Id1`, `t`.`OneToOne_Optional_Self3Id2`
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `s`.`Name`, `s`.`Id1`, `s`.`Id2`, `s`.`Id10`, `s`.`Id20`, `s`.`Level2_Optional_Id1`, `s`.`Level2_Optional_Id2`, `s`.`Level2_Required_Id1`, `s`.`Level2_Required_Id2`, `s`.`Name0`, `s`.`OneToMany_Optional_Inverse3Id1`, `s`.`OneToMany_Optional_Inverse3Id2`, `s`.`OneToMany_Optional_Self_Inverse3Id1`, `s`.`OneToMany_Optional_Self_Inverse3Id2`, `s`.`OneToMany_Required_Inverse3Id1`, `s`.`OneToMany_Required_Inverse3Id2`, `s`.`OneToMany_Required_Self_Inverse3Id1`, `s`.`OneToMany_Required_Self_Inverse3Id2`, `s`.`OneToOne_Optional_PK_Inverse3Id1`, `s`.`OneToOne_Optional_PK_Inverse3Id2`, `s`.`OneToOne_Optional_Self3Id1`, `s`.`OneToOne_Optional_Self3Id2`
 FROM `CompositeOnes` AS `c`
 LEFT JOIN (
     SELECT `c0`.`Name`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1` AS `Id10`, `c1`.`Id2` AS `Id20`, `c1`.`Level2_Optional_Id1`, `c1`.`Level2_Optional_Id2`, `c1`.`Level2_Required_Id1`, `c1`.`Level2_Required_Id2`, `c1`.`Name` AS `Name0`, `c1`.`OneToMany_Optional_Inverse3Id1`, `c1`.`OneToMany_Optional_Inverse3Id2`, `c1`.`OneToMany_Optional_Self_Inverse3Id1`, `c1`.`OneToMany_Optional_Self_Inverse3Id2`, `c1`.`OneToMany_Required_Inverse3Id1`, `c1`.`OneToMany_Required_Inverse3Id2`, `c1`.`OneToMany_Required_Self_Inverse3Id1`, `c1`.`OneToMany_Required_Self_Inverse3Id2`, `c1`.`OneToOne_Optional_PK_Inverse3Id1`, `c1`.`OneToOne_Optional_PK_Inverse3Id2`, `c1`.`OneToOne_Optional_Self3Id1`, `c1`.`OneToOne_Optional_Self3Id2`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`
     FROM `CompositeTwos` AS `c0`
     LEFT JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Required_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Required_Inverse3Id2`)
-) AS `t` ON (`c`.`Id1` = `t`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `t`.`OneToMany_Optional_Inverse2Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1`, `t`.`Id2`, `t`.`Id1`, `t`.`Id20` DESC");
+) AS `s` ON (`c`.`Id1` = `s`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `s`.`OneToMany_Optional_Inverse2Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1`, `s`.`Id2`, `s`.`Id1`, `s`.`Id20` DESC
+""");
         }
 
         public override async Task Projecting_multiple_collections_on_multiple_levels_no_explicit_ordering(bool async)
         {
             await base.Projecting_multiple_collections_on_multiple_levels_no_explicit_ordering(async);
 
-            AssertSql(
-                @"SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `t1`.`Name`, `t1`.`Id1`, `t1`.`Id2`, `t1`.`Name0`, `t1`.`Id10`, `t1`.`Id20`, `t1`.`Id100`, `t1`.`Id200`, `t1`.`Level3_Optional_Id1`, `t1`.`Level3_Optional_Id2`, `t1`.`Level3_Required_Id1`, `t1`.`Level3_Required_Id2`, `t1`.`Name00`, `t1`.`OneToMany_Optional_Inverse4Id1`, `t1`.`OneToMany_Optional_Inverse4Id2`, `t1`.`OneToMany_Optional_Self_Inverse4Id1`, `t1`.`OneToMany_Optional_Self_Inverse4Id2`, `t1`.`OneToMany_Required_Inverse4Id1`, `t1`.`OneToMany_Required_Inverse4Id2`, `t1`.`OneToMany_Required_Self_Inverse4Id1`, `t1`.`OneToMany_Required_Self_Inverse4Id2`, `t1`.`OneToOne_Optional_PK_Inverse4Id1`, `t1`.`OneToOne_Optional_PK_Inverse4Id2`, `t1`.`OneToOne_Optional_Self4Id1`, `t1`.`OneToOne_Optional_Self4Id2`, `t1`.`Id11`, `t1`.`Id21`, `t1`.`Level3_Optional_Id10`, `t1`.`Level3_Optional_Id20`, `t1`.`Level3_Required_Id10`, `t1`.`Level3_Required_Id20`, `t1`.`Name1`, `t1`.`OneToMany_Optional_Inverse4Id10`, `t1`.`OneToMany_Optional_Inverse4Id20`, `t1`.`OneToMany_Optional_Self_Inverse4Id10`, `t1`.`OneToMany_Optional_Self_Inverse4Id20`, `t1`.`OneToMany_Required_Inverse4Id10`, `t1`.`OneToMany_Required_Inverse4Id20`, `t1`.`OneToMany_Required_Self_Inverse4Id10`, `t1`.`OneToMany_Required_Self_Inverse4Id20`, `t1`.`OneToOne_Optional_PK_Inverse4Id10`, `t1`.`OneToOne_Optional_PK_Inverse4Id20`, `t1`.`OneToOne_Optional_Self4Id10`, `t1`.`OneToOne_Optional_Self4Id20`, `t1`.`Name2`, `t1`.`Id12`, `t1`.`Id22`, `t1`.`Id101`, `t1`.`Id201`, `t1`.`Level3_Optional_Id11`, `t1`.`Level3_Optional_Id21`, `t1`.`Level3_Required_Id11`, `t1`.`Level3_Required_Id21`, `t1`.`Name01`, `t1`.`OneToMany_Optional_Inverse4Id11`, `t1`.`OneToMany_Optional_Inverse4Id21`, `t1`.`OneToMany_Optional_Self_Inverse4Id11`, `t1`.`OneToMany_Optional_Self_Inverse4Id21`, `t1`.`OneToMany_Required_Inverse4Id11`, `t1`.`OneToMany_Required_Inverse4Id21`, `t1`.`OneToMany_Required_Self_Inverse4Id11`, `t1`.`OneToMany_Required_Self_Inverse4Id21`, `t1`.`OneToOne_Optional_PK_Inverse4Id11`, `t1`.`OneToOne_Optional_PK_Inverse4Id21`, `t1`.`OneToOne_Optional_Self4Id11`, `t1`.`OneToOne_Optional_Self4Id21`, `t1`.`Id110`, `t1`.`Id210`, `t1`.`Level3_Optional_Id100`, `t1`.`Level3_Optional_Id200`, `t1`.`Level3_Required_Id100`, `t1`.`Level3_Required_Id200`, `t1`.`Name10`, `t1`.`OneToMany_Optional_Inverse4Id100`, `t1`.`OneToMany_Optional_Inverse4Id200`, `t1`.`OneToMany_Optional_Self_Inverse4Id100`, `t1`.`OneToMany_Optional_Self_Inverse4Id200`, `t1`.`OneToMany_Required_Inverse4Id100`, `t1`.`OneToMany_Required_Inverse4Id200`, `t1`.`OneToMany_Required_Self_Inverse4Id100`, `t1`.`OneToMany_Required_Self_Inverse4Id200`, `t1`.`OneToOne_Optional_PK_Inverse4Id100`, `t1`.`OneToOne_Optional_PK_Inverse4Id200`, `t1`.`OneToOne_Optional_Self4Id100`, `t1`.`OneToOne_Optional_Self4Id200`, `t2`.`Name`, `t2`.`Id1`, `t2`.`Id2`, `t2`.`Name0`, `t2`.`Id10`, `t2`.`Id20`, `t2`.`Id100`, `t2`.`Id200`, `t2`.`Level3_Optional_Id1`, `t2`.`Level3_Optional_Id2`, `t2`.`Level3_Required_Id1`, `t2`.`Level3_Required_Id2`, `t2`.`Name00`, `t2`.`OneToMany_Optional_Inverse4Id1`, `t2`.`OneToMany_Optional_Inverse4Id2`, `t2`.`OneToMany_Optional_Self_Inverse4Id1`, `t2`.`OneToMany_Optional_Self_Inverse4Id2`, `t2`.`OneToMany_Required_Inverse4Id1`, `t2`.`OneToMany_Required_Inverse4Id2`, `t2`.`OneToMany_Required_Self_Inverse4Id1`, `t2`.`OneToMany_Required_Self_Inverse4Id2`, `t2`.`OneToOne_Optional_PK_Inverse4Id1`, `t2`.`OneToOne_Optional_PK_Inverse4Id2`, `t2`.`OneToOne_Optional_Self4Id1`, `t2`.`OneToOne_Optional_Self4Id2`, `t2`.`Id11`, `t2`.`Id21`, `t2`.`Level3_Optional_Id10`, `t2`.`Level3_Optional_Id20`, `t2`.`Level3_Required_Id10`, `t2`.`Level3_Required_Id20`, `t2`.`Name1`, `t2`.`OneToMany_Optional_Inverse4Id10`, `t2`.`OneToMany_Optional_Inverse4Id20`, `t2`.`OneToMany_Optional_Self_Inverse4Id10`, `t2`.`OneToMany_Optional_Self_Inverse4Id20`, `t2`.`OneToMany_Required_Inverse4Id10`, `t2`.`OneToMany_Required_Inverse4Id20`, `t2`.`OneToMany_Required_Self_Inverse4Id10`, `t2`.`OneToMany_Required_Self_Inverse4Id20`, `t2`.`OneToOne_Optional_PK_Inverse4Id10`, `t2`.`OneToOne_Optional_PK_Inverse4Id20`, `t2`.`OneToOne_Optional_Self4Id10`, `t2`.`OneToOne_Optional_Self4Id20`, `t2`.`Name2`, `t2`.`Id12`, `t2`.`Id22`, `t2`.`Id101`, `t2`.`Id201`, `t2`.`Level3_Optional_Id11`, `t2`.`Level3_Optional_Id21`, `t2`.`Level3_Required_Id11`, `t2`.`Level3_Required_Id21`, `t2`.`Name01`, `t2`.`OneToMany_Optional_Inverse4Id11`, `t2`.`OneToMany_Optional_Inverse4Id21`, `t2`.`OneToMany_Optional_Self_Inverse4Id11`, `t2`.`OneToMany_Optional_Self_Inverse4Id21`, `t2`.`OneToMany_Required_Inverse4Id11`, `t2`.`OneToMany_Required_Inverse4Id21`, `t2`.`OneToMany_Required_Self_Inverse4Id11`, `t2`.`OneToMany_Required_Self_Inverse4Id21`, `t2`.`OneToOne_Optional_PK_Inverse4Id11`, `t2`.`OneToOne_Optional_PK_Inverse4Id21`, `t2`.`OneToOne_Optional_Self4Id11`, `t2`.`OneToOne_Optional_Self4Id21`, `t2`.`Id110`, `t2`.`Id210`, `t2`.`Level3_Optional_Id100`, `t2`.`Level3_Optional_Id200`, `t2`.`Level3_Required_Id100`, `t2`.`Level3_Required_Id200`, `t2`.`Name10`, `t2`.`OneToMany_Optional_Inverse4Id100`, `t2`.`OneToMany_Optional_Inverse4Id200`, `t2`.`OneToMany_Optional_Self_Inverse4Id100`, `t2`.`OneToMany_Optional_Self_Inverse4Id200`, `t2`.`OneToMany_Required_Inverse4Id100`, `t2`.`OneToMany_Required_Inverse4Id200`, `t2`.`OneToMany_Required_Self_Inverse4Id100`, `t2`.`OneToMany_Required_Self_Inverse4Id200`, `t2`.`OneToOne_Optional_PK_Inverse4Id100`, `t2`.`OneToOne_Optional_PK_Inverse4Id200`, `t2`.`OneToOne_Optional_Self4Id100`, `t2`.`OneToOne_Optional_Self4Id200`
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `s1`.`Name`, `s1`.`Id1`, `s1`.`Id2`, `s1`.`Name0`, `s1`.`Id10`, `s1`.`Id20`, `s1`.`Id100`, `s1`.`Id200`, `s1`.`Level3_Optional_Id1`, `s1`.`Level3_Optional_Id2`, `s1`.`Level3_Required_Id1`, `s1`.`Level3_Required_Id2`, `s1`.`Name00`, `s1`.`OneToMany_Optional_Inverse4Id1`, `s1`.`OneToMany_Optional_Inverse4Id2`, `s1`.`OneToMany_Optional_Self_Inverse4Id1`, `s1`.`OneToMany_Optional_Self_Inverse4Id2`, `s1`.`OneToMany_Required_Inverse4Id1`, `s1`.`OneToMany_Required_Inverse4Id2`, `s1`.`OneToMany_Required_Self_Inverse4Id1`, `s1`.`OneToMany_Required_Self_Inverse4Id2`, `s1`.`OneToOne_Optional_PK_Inverse4Id1`, `s1`.`OneToOne_Optional_PK_Inverse4Id2`, `s1`.`OneToOne_Optional_Self4Id1`, `s1`.`OneToOne_Optional_Self4Id2`, `s1`.`Id11`, `s1`.`Id21`, `s1`.`Level3_Optional_Id10`, `s1`.`Level3_Optional_Id20`, `s1`.`Level3_Required_Id10`, `s1`.`Level3_Required_Id20`, `s1`.`Name1`, `s1`.`OneToMany_Optional_Inverse4Id10`, `s1`.`OneToMany_Optional_Inverse4Id20`, `s1`.`OneToMany_Optional_Self_Inverse4Id10`, `s1`.`OneToMany_Optional_Self_Inverse4Id20`, `s1`.`OneToMany_Required_Inverse4Id10`, `s1`.`OneToMany_Required_Inverse4Id20`, `s1`.`OneToMany_Required_Self_Inverse4Id10`, `s1`.`OneToMany_Required_Self_Inverse4Id20`, `s1`.`OneToOne_Optional_PK_Inverse4Id10`, `s1`.`OneToOne_Optional_PK_Inverse4Id20`, `s1`.`OneToOne_Optional_Self4Id10`, `s1`.`OneToOne_Optional_Self4Id20`, `s1`.`Name2`, `s1`.`Id12`, `s1`.`Id22`, `s1`.`Id101`, `s1`.`Id201`, `s1`.`Level3_Optional_Id11`, `s1`.`Level3_Optional_Id21`, `s1`.`Level3_Required_Id11`, `s1`.`Level3_Required_Id21`, `s1`.`Name01`, `s1`.`OneToMany_Optional_Inverse4Id11`, `s1`.`OneToMany_Optional_Inverse4Id21`, `s1`.`OneToMany_Optional_Self_Inverse4Id11`, `s1`.`OneToMany_Optional_Self_Inverse4Id21`, `s1`.`OneToMany_Required_Inverse4Id11`, `s1`.`OneToMany_Required_Inverse4Id21`, `s1`.`OneToMany_Required_Self_Inverse4Id11`, `s1`.`OneToMany_Required_Self_Inverse4Id21`, `s1`.`OneToOne_Optional_PK_Inverse4Id11`, `s1`.`OneToOne_Optional_PK_Inverse4Id21`, `s1`.`OneToOne_Optional_Self4Id11`, `s1`.`OneToOne_Optional_Self4Id21`, `s1`.`Id110`, `s1`.`Id210`, `s1`.`Level3_Optional_Id100`, `s1`.`Level3_Optional_Id200`, `s1`.`Level3_Required_Id100`, `s1`.`Level3_Required_Id200`, `s1`.`Name10`, `s1`.`OneToMany_Optional_Inverse4Id100`, `s1`.`OneToMany_Optional_Inverse4Id200`, `s1`.`OneToMany_Optional_Self_Inverse4Id100`, `s1`.`OneToMany_Optional_Self_Inverse4Id200`, `s1`.`OneToMany_Required_Inverse4Id100`, `s1`.`OneToMany_Required_Inverse4Id200`, `s1`.`OneToMany_Required_Self_Inverse4Id100`, `s1`.`OneToMany_Required_Self_Inverse4Id200`, `s1`.`OneToOne_Optional_PK_Inverse4Id100`, `s1`.`OneToOne_Optional_PK_Inverse4Id200`, `s1`.`OneToOne_Optional_Self4Id100`, `s1`.`OneToOne_Optional_Self4Id200`, `s4`.`Name`, `s4`.`Id1`, `s4`.`Id2`, `s4`.`Name0`, `s4`.`Id10`, `s4`.`Id20`, `s4`.`Id100`, `s4`.`Id200`, `s4`.`Level3_Optional_Id1`, `s4`.`Level3_Optional_Id2`, `s4`.`Level3_Required_Id1`, `s4`.`Level3_Required_Id2`, `s4`.`Name00`, `s4`.`OneToMany_Optional_Inverse4Id1`, `s4`.`OneToMany_Optional_Inverse4Id2`, `s4`.`OneToMany_Optional_Self_Inverse4Id1`, `s4`.`OneToMany_Optional_Self_Inverse4Id2`, `s4`.`OneToMany_Required_Inverse4Id1`, `s4`.`OneToMany_Required_Inverse4Id2`, `s4`.`OneToMany_Required_Self_Inverse4Id1`, `s4`.`OneToMany_Required_Self_Inverse4Id2`, `s4`.`OneToOne_Optional_PK_Inverse4Id1`, `s4`.`OneToOne_Optional_PK_Inverse4Id2`, `s4`.`OneToOne_Optional_Self4Id1`, `s4`.`OneToOne_Optional_Self4Id2`, `s4`.`Id11`, `s4`.`Id21`, `s4`.`Level3_Optional_Id10`, `s4`.`Level3_Optional_Id20`, `s4`.`Level3_Required_Id10`, `s4`.`Level3_Required_Id20`, `s4`.`Name1`, `s4`.`OneToMany_Optional_Inverse4Id10`, `s4`.`OneToMany_Optional_Inverse4Id20`, `s4`.`OneToMany_Optional_Self_Inverse4Id10`, `s4`.`OneToMany_Optional_Self_Inverse4Id20`, `s4`.`OneToMany_Required_Inverse4Id10`, `s4`.`OneToMany_Required_Inverse4Id20`, `s4`.`OneToMany_Required_Self_Inverse4Id10`, `s4`.`OneToMany_Required_Self_Inverse4Id20`, `s4`.`OneToOne_Optional_PK_Inverse4Id10`, `s4`.`OneToOne_Optional_PK_Inverse4Id20`, `s4`.`OneToOne_Optional_Self4Id10`, `s4`.`OneToOne_Optional_Self4Id20`, `s4`.`Name2`, `s4`.`Id12`, `s4`.`Id22`, `s4`.`Id101`, `s4`.`Id201`, `s4`.`Level3_Optional_Id11`, `s4`.`Level3_Optional_Id21`, `s4`.`Level3_Required_Id11`, `s4`.`Level3_Required_Id21`, `s4`.`Name01`, `s4`.`OneToMany_Optional_Inverse4Id11`, `s4`.`OneToMany_Optional_Inverse4Id21`, `s4`.`OneToMany_Optional_Self_Inverse4Id11`, `s4`.`OneToMany_Optional_Self_Inverse4Id21`, `s4`.`OneToMany_Required_Inverse4Id11`, `s4`.`OneToMany_Required_Inverse4Id21`, `s4`.`OneToMany_Required_Self_Inverse4Id11`, `s4`.`OneToMany_Required_Self_Inverse4Id21`, `s4`.`OneToOne_Optional_PK_Inverse4Id11`, `s4`.`OneToOne_Optional_PK_Inverse4Id21`, `s4`.`OneToOne_Optional_Self4Id11`, `s4`.`OneToOne_Optional_Self4Id21`, `s4`.`Id110`, `s4`.`Id210`, `s4`.`Level3_Optional_Id100`, `s4`.`Level3_Optional_Id200`, `s4`.`Level3_Required_Id100`, `s4`.`Level3_Required_Id200`, `s4`.`Name10`, `s4`.`OneToMany_Optional_Inverse4Id100`, `s4`.`OneToMany_Optional_Inverse4Id200`, `s4`.`OneToMany_Optional_Self_Inverse4Id100`, `s4`.`OneToMany_Optional_Self_Inverse4Id200`, `s4`.`OneToMany_Required_Inverse4Id100`, `s4`.`OneToMany_Required_Inverse4Id200`, `s4`.`OneToMany_Required_Self_Inverse4Id100`, `s4`.`OneToMany_Required_Self_Inverse4Id200`, `s4`.`OneToOne_Optional_PK_Inverse4Id100`, `s4`.`OneToOne_Optional_PK_Inverse4Id200`, `s4`.`OneToOne_Optional_Self4Id100`, `s4`.`OneToOne_Optional_Self4Id200`
 FROM `CompositeOnes` AS `c`
 LEFT JOIN (
-    SELECT `c0`.`Name`, `c0`.`Id1`, `c0`.`Id2`, `t`.`Name` AS `Name0`, `t`.`Id1` AS `Id10`, `t`.`Id2` AS `Id20`, `t`.`Id10` AS `Id100`, `t`.`Id20` AS `Id200`, `t`.`Level3_Optional_Id1`, `t`.`Level3_Optional_Id2`, `t`.`Level3_Required_Id1`, `t`.`Level3_Required_Id2`, `t`.`Name0` AS `Name00`, `t`.`OneToMany_Optional_Inverse4Id1`, `t`.`OneToMany_Optional_Inverse4Id2`, `t`.`OneToMany_Optional_Self_Inverse4Id1`, `t`.`OneToMany_Optional_Self_Inverse4Id2`, `t`.`OneToMany_Required_Inverse4Id1`, `t`.`OneToMany_Required_Inverse4Id2`, `t`.`OneToMany_Required_Self_Inverse4Id1`, `t`.`OneToMany_Required_Self_Inverse4Id2`, `t`.`OneToOne_Optional_PK_Inverse4Id1`, `t`.`OneToOne_Optional_PK_Inverse4Id2`, `t`.`OneToOne_Optional_Self4Id1`, `t`.`OneToOne_Optional_Self4Id2`, `t`.`Id11`, `t`.`Id21`, `t`.`Level3_Optional_Id10`, `t`.`Level3_Optional_Id20`, `t`.`Level3_Required_Id10`, `t`.`Level3_Required_Id20`, `t`.`Name1`, `t`.`OneToMany_Optional_Inverse4Id10`, `t`.`OneToMany_Optional_Inverse4Id20`, `t`.`OneToMany_Optional_Self_Inverse4Id10`, `t`.`OneToMany_Optional_Self_Inverse4Id20`, `t`.`OneToMany_Required_Inverse4Id10`, `t`.`OneToMany_Required_Inverse4Id20`, `t`.`OneToMany_Required_Self_Inverse4Id10`, `t`.`OneToMany_Required_Self_Inverse4Id20`, `t`.`OneToOne_Optional_PK_Inverse4Id10`, `t`.`OneToOne_Optional_PK_Inverse4Id20`, `t`.`OneToOne_Optional_Self4Id10`, `t`.`OneToOne_Optional_Self4Id20`, `t0`.`Name` AS `Name2`, `t0`.`Id1` AS `Id12`, `t0`.`Id2` AS `Id22`, `t0`.`Id10` AS `Id101`, `t0`.`Id20` AS `Id201`, `t0`.`Level3_Optional_Id1` AS `Level3_Optional_Id11`, `t0`.`Level3_Optional_Id2` AS `Level3_Optional_Id21`, `t0`.`Level3_Required_Id1` AS `Level3_Required_Id11`, `t0`.`Level3_Required_Id2` AS `Level3_Required_Id21`, `t0`.`Name0` AS `Name01`, `t0`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id11`, `t0`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id21`, `t0`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id11`, `t0`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id21`, `t0`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id11`, `t0`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id21`, `t0`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id11`, `t0`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id21`, `t0`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id11`, `t0`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id21`, `t0`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id11`, `t0`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id21`, `t0`.`Id11` AS `Id110`, `t0`.`Id21` AS `Id210`, `t0`.`Level3_Optional_Id10` AS `Level3_Optional_Id100`, `t0`.`Level3_Optional_Id20` AS `Level3_Optional_Id200`, `t0`.`Level3_Required_Id10` AS `Level3_Required_Id100`, `t0`.`Level3_Required_Id20` AS `Level3_Required_Id200`, `t0`.`Name1` AS `Name10`, `t0`.`OneToMany_Optional_Inverse4Id10` AS `OneToMany_Optional_Inverse4Id100`, `t0`.`OneToMany_Optional_Inverse4Id20` AS `OneToMany_Optional_Inverse4Id200`, `t0`.`OneToMany_Optional_Self_Inverse4Id10` AS `OneToMany_Optional_Self_Inverse4Id100`, `t0`.`OneToMany_Optional_Self_Inverse4Id20` AS `OneToMany_Optional_Self_Inverse4Id200`, `t0`.`OneToMany_Required_Inverse4Id10` AS `OneToMany_Required_Inverse4Id100`, `t0`.`OneToMany_Required_Inverse4Id20` AS `OneToMany_Required_Inverse4Id200`, `t0`.`OneToMany_Required_Self_Inverse4Id10` AS `OneToMany_Required_Self_Inverse4Id100`, `t0`.`OneToMany_Required_Self_Inverse4Id20` AS `OneToMany_Required_Self_Inverse4Id200`, `t0`.`OneToOne_Optional_PK_Inverse4Id10` AS `OneToOne_Optional_PK_Inverse4Id100`, `t0`.`OneToOne_Optional_PK_Inverse4Id20` AS `OneToOne_Optional_PK_Inverse4Id200`, `t0`.`OneToOne_Optional_Self4Id10` AS `OneToOne_Optional_Self4Id100`, `t0`.`OneToOne_Optional_Self4Id20` AS `OneToOne_Optional_Self4Id200`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`
+    SELECT `c0`.`Name`, `c0`.`Id1`, `c0`.`Id2`, `s`.`Name` AS `Name0`, `s`.`Id1` AS `Id10`, `s`.`Id2` AS `Id20`, `s`.`Id10` AS `Id100`, `s`.`Id20` AS `Id200`, `s`.`Level3_Optional_Id1`, `s`.`Level3_Optional_Id2`, `s`.`Level3_Required_Id1`, `s`.`Level3_Required_Id2`, `s`.`Name0` AS `Name00`, `s`.`OneToMany_Optional_Inverse4Id1`, `s`.`OneToMany_Optional_Inverse4Id2`, `s`.`OneToMany_Optional_Self_Inverse4Id1`, `s`.`OneToMany_Optional_Self_Inverse4Id2`, `s`.`OneToMany_Required_Inverse4Id1`, `s`.`OneToMany_Required_Inverse4Id2`, `s`.`OneToMany_Required_Self_Inverse4Id1`, `s`.`OneToMany_Required_Self_Inverse4Id2`, `s`.`OneToOne_Optional_PK_Inverse4Id1`, `s`.`OneToOne_Optional_PK_Inverse4Id2`, `s`.`OneToOne_Optional_Self4Id1`, `s`.`OneToOne_Optional_Self4Id2`, `s`.`Id11`, `s`.`Id21`, `s`.`Level3_Optional_Id10`, `s`.`Level3_Optional_Id20`, `s`.`Level3_Required_Id10`, `s`.`Level3_Required_Id20`, `s`.`Name1`, `s`.`OneToMany_Optional_Inverse4Id10`, `s`.`OneToMany_Optional_Inverse4Id20`, `s`.`OneToMany_Optional_Self_Inverse4Id10`, `s`.`OneToMany_Optional_Self_Inverse4Id20`, `s`.`OneToMany_Required_Inverse4Id10`, `s`.`OneToMany_Required_Inverse4Id20`, `s`.`OneToMany_Required_Self_Inverse4Id10`, `s`.`OneToMany_Required_Self_Inverse4Id20`, `s`.`OneToOne_Optional_PK_Inverse4Id10`, `s`.`OneToOne_Optional_PK_Inverse4Id20`, `s`.`OneToOne_Optional_Self4Id10`, `s`.`OneToOne_Optional_Self4Id20`, `s0`.`Name` AS `Name2`, `s0`.`Id1` AS `Id12`, `s0`.`Id2` AS `Id22`, `s0`.`Id10` AS `Id101`, `s0`.`Id20` AS `Id201`, `s0`.`Level3_Optional_Id1` AS `Level3_Optional_Id11`, `s0`.`Level3_Optional_Id2` AS `Level3_Optional_Id21`, `s0`.`Level3_Required_Id1` AS `Level3_Required_Id11`, `s0`.`Level3_Required_Id2` AS `Level3_Required_Id21`, `s0`.`Name0` AS `Name01`, `s0`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id11`, `s0`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id21`, `s0`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id11`, `s0`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id21`, `s0`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id11`, `s0`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id21`, `s0`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id11`, `s0`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id21`, `s0`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id11`, `s0`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id21`, `s0`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id11`, `s0`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id21`, `s0`.`Id11` AS `Id110`, `s0`.`Id21` AS `Id210`, `s0`.`Level3_Optional_Id10` AS `Level3_Optional_Id100`, `s0`.`Level3_Optional_Id20` AS `Level3_Optional_Id200`, `s0`.`Level3_Required_Id10` AS `Level3_Required_Id100`, `s0`.`Level3_Required_Id20` AS `Level3_Required_Id200`, `s0`.`Name1` AS `Name10`, `s0`.`OneToMany_Optional_Inverse4Id10` AS `OneToMany_Optional_Inverse4Id100`, `s0`.`OneToMany_Optional_Inverse4Id20` AS `OneToMany_Optional_Inverse4Id200`, `s0`.`OneToMany_Optional_Self_Inverse4Id10` AS `OneToMany_Optional_Self_Inverse4Id100`, `s0`.`OneToMany_Optional_Self_Inverse4Id20` AS `OneToMany_Optional_Self_Inverse4Id200`, `s0`.`OneToMany_Required_Inverse4Id10` AS `OneToMany_Required_Inverse4Id100`, `s0`.`OneToMany_Required_Inverse4Id20` AS `OneToMany_Required_Inverse4Id200`, `s0`.`OneToMany_Required_Self_Inverse4Id10` AS `OneToMany_Required_Self_Inverse4Id100`, `s0`.`OneToMany_Required_Self_Inverse4Id20` AS `OneToMany_Required_Self_Inverse4Id200`, `s0`.`OneToOne_Optional_PK_Inverse4Id10` AS `OneToOne_Optional_PK_Inverse4Id100`, `s0`.`OneToOne_Optional_PK_Inverse4Id20` AS `OneToOne_Optional_PK_Inverse4Id200`, `s0`.`OneToOne_Optional_Self4Id10` AS `OneToOne_Optional_Self4Id100`, `s0`.`OneToOne_Optional_Self4Id20` AS `OneToOne_Optional_Self4Id200`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`
     FROM `CompositeTwos` AS `c0`
     LEFT JOIN (
         SELECT `c1`.`Name`, `c1`.`Id1`, `c1`.`Id2`, `c2`.`Id1` AS `Id10`, `c2`.`Id2` AS `Id20`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name` AS `Name0`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c3`.`Id1` AS `Id11`, `c3`.`Id2` AS `Id21`, `c3`.`Level3_Optional_Id1` AS `Level3_Optional_Id10`, `c3`.`Level3_Optional_Id2` AS `Level3_Optional_Id20`, `c3`.`Level3_Required_Id1` AS `Level3_Required_Id10`, `c3`.`Level3_Required_Id2` AS `Level3_Required_Id20`, `c3`.`Name` AS `Name1`, `c3`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id10`, `c3`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id20`, `c3`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id10`, `c3`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id20`, `c3`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id10`, `c3`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id20`, `c3`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id10`, `c3`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id20`, `c3`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id10`, `c3`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id20`, `c3`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id10`, `c3`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id20`, `c1`.`OneToMany_Required_Inverse3Id1`, `c1`.`OneToMany_Required_Inverse3Id2`
         FROM `CompositeThrees` AS `c1`
         LEFT JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Optional_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Optional_Inverse4Id2`)
         LEFT JOIN `CompositeFours` AS `c3` ON (`c1`.`Id1` = `c3`.`OneToMany_Required_Inverse4Id1`) AND (`c1`.`Id2` = `c3`.`OneToMany_Required_Inverse4Id2`)
-    ) AS `t` ON (`c0`.`Id1` = `t`.`OneToMany_Required_Inverse3Id1`) AND (`c0`.`Id2` = `t`.`OneToMany_Required_Inverse3Id2`)
+    ) AS `s` ON (`c0`.`Id1` = `s`.`OneToMany_Required_Inverse3Id1`) AND (`c0`.`Id2` = `s`.`OneToMany_Required_Inverse3Id2`)
     LEFT JOIN (
         SELECT `c4`.`Name`, `c4`.`Id1`, `c4`.`Id2`, `c5`.`Id1` AS `Id10`, `c5`.`Id2` AS `Id20`, `c5`.`Level3_Optional_Id1`, `c5`.`Level3_Optional_Id2`, `c5`.`Level3_Required_Id1`, `c5`.`Level3_Required_Id2`, `c5`.`Name` AS `Name0`, `c5`.`OneToMany_Optional_Inverse4Id1`, `c5`.`OneToMany_Optional_Inverse4Id2`, `c5`.`OneToMany_Optional_Self_Inverse4Id1`, `c5`.`OneToMany_Optional_Self_Inverse4Id2`, `c5`.`OneToMany_Required_Inverse4Id1`, `c5`.`OneToMany_Required_Inverse4Id2`, `c5`.`OneToMany_Required_Self_Inverse4Id1`, `c5`.`OneToMany_Required_Self_Inverse4Id2`, `c5`.`OneToOne_Optional_PK_Inverse4Id1`, `c5`.`OneToOne_Optional_PK_Inverse4Id2`, `c5`.`OneToOne_Optional_Self4Id1`, `c5`.`OneToOne_Optional_Self4Id2`, `c6`.`Id1` AS `Id11`, `c6`.`Id2` AS `Id21`, `c6`.`Level3_Optional_Id1` AS `Level3_Optional_Id10`, `c6`.`Level3_Optional_Id2` AS `Level3_Optional_Id20`, `c6`.`Level3_Required_Id1` AS `Level3_Required_Id10`, `c6`.`Level3_Required_Id2` AS `Level3_Required_Id20`, `c6`.`Name` AS `Name1`, `c6`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id10`, `c6`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id20`, `c6`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id10`, `c6`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id20`, `c6`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id10`, `c6`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id20`, `c6`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id10`, `c6`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id20`, `c6`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id10`, `c6`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id20`, `c6`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id10`, `c6`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id20`, `c4`.`OneToMany_Optional_Inverse3Id1`, `c4`.`OneToMany_Optional_Inverse3Id2`
         FROM `CompositeThrees` AS `c4`
         LEFT JOIN `CompositeFours` AS `c5` ON (`c4`.`Id1` = `c5`.`OneToMany_Required_Inverse4Id1`) AND (`c4`.`Id2` = `c5`.`OneToMany_Required_Inverse4Id2`)
         LEFT JOIN `CompositeFours` AS `c6` ON (`c4`.`Id1` = `c6`.`OneToMany_Optional_Inverse4Id1`) AND (`c4`.`Id2` = `c6`.`OneToMany_Optional_Inverse4Id2`)
-    ) AS `t0` ON (`c0`.`Id1` = `t0`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `t0`.`OneToMany_Optional_Inverse3Id2`)
-) AS `t1` ON (`c`.`Id1` = `t1`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `t1`.`OneToMany_Optional_Inverse2Id2`)
+    ) AS `s0` ON (`c0`.`Id1` = `s0`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `s0`.`OneToMany_Optional_Inverse3Id2`)
+) AS `s1` ON (`c`.`Id1` = `s1`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `s1`.`OneToMany_Optional_Inverse2Id2`)
 LEFT JOIN (
-    SELECT `c7`.`Name`, `c7`.`Id1`, `c7`.`Id2`, `t3`.`Name` AS `Name0`, `t3`.`Id1` AS `Id10`, `t3`.`Id2` AS `Id20`, `t3`.`Id10` AS `Id100`, `t3`.`Id20` AS `Id200`, `t3`.`Level3_Optional_Id1`, `t3`.`Level3_Optional_Id2`, `t3`.`Level3_Required_Id1`, `t3`.`Level3_Required_Id2`, `t3`.`Name0` AS `Name00`, `t3`.`OneToMany_Optional_Inverse4Id1`, `t3`.`OneToMany_Optional_Inverse4Id2`, `t3`.`OneToMany_Optional_Self_Inverse4Id1`, `t3`.`OneToMany_Optional_Self_Inverse4Id2`, `t3`.`OneToMany_Required_Inverse4Id1`, `t3`.`OneToMany_Required_Inverse4Id2`, `t3`.`OneToMany_Required_Self_Inverse4Id1`, `t3`.`OneToMany_Required_Self_Inverse4Id2`, `t3`.`OneToOne_Optional_PK_Inverse4Id1`, `t3`.`OneToOne_Optional_PK_Inverse4Id2`, `t3`.`OneToOne_Optional_Self4Id1`, `t3`.`OneToOne_Optional_Self4Id2`, `t3`.`Id11`, `t3`.`Id21`, `t3`.`Level3_Optional_Id10`, `t3`.`Level3_Optional_Id20`, `t3`.`Level3_Required_Id10`, `t3`.`Level3_Required_Id20`, `t3`.`Name1`, `t3`.`OneToMany_Optional_Inverse4Id10`, `t3`.`OneToMany_Optional_Inverse4Id20`, `t3`.`OneToMany_Optional_Self_Inverse4Id10`, `t3`.`OneToMany_Optional_Self_Inverse4Id20`, `t3`.`OneToMany_Required_Inverse4Id10`, `t3`.`OneToMany_Required_Inverse4Id20`, `t3`.`OneToMany_Required_Self_Inverse4Id10`, `t3`.`OneToMany_Required_Self_Inverse4Id20`, `t3`.`OneToOne_Optional_PK_Inverse4Id10`, `t3`.`OneToOne_Optional_PK_Inverse4Id20`, `t3`.`OneToOne_Optional_Self4Id10`, `t3`.`OneToOne_Optional_Self4Id20`, `t4`.`Name` AS `Name2`, `t4`.`Id1` AS `Id12`, `t4`.`Id2` AS `Id22`, `t4`.`Id10` AS `Id101`, `t4`.`Id20` AS `Id201`, `t4`.`Level3_Optional_Id1` AS `Level3_Optional_Id11`, `t4`.`Level3_Optional_Id2` AS `Level3_Optional_Id21`, `t4`.`Level3_Required_Id1` AS `Level3_Required_Id11`, `t4`.`Level3_Required_Id2` AS `Level3_Required_Id21`, `t4`.`Name0` AS `Name01`, `t4`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id11`, `t4`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id21`, `t4`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id11`, `t4`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id21`, `t4`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id11`, `t4`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id21`, `t4`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id11`, `t4`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id21`, `t4`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id11`, `t4`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id21`, `t4`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id11`, `t4`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id21`, `t4`.`Id11` AS `Id110`, `t4`.`Id21` AS `Id210`, `t4`.`Level3_Optional_Id10` AS `Level3_Optional_Id100`, `t4`.`Level3_Optional_Id20` AS `Level3_Optional_Id200`, `t4`.`Level3_Required_Id10` AS `Level3_Required_Id100`, `t4`.`Level3_Required_Id20` AS `Level3_Required_Id200`, `t4`.`Name1` AS `Name10`, `t4`.`OneToMany_Optional_Inverse4Id10` AS `OneToMany_Optional_Inverse4Id100`, `t4`.`OneToMany_Optional_Inverse4Id20` AS `OneToMany_Optional_Inverse4Id200`, `t4`.`OneToMany_Optional_Self_Inverse4Id10` AS `OneToMany_Optional_Self_Inverse4Id100`, `t4`.`OneToMany_Optional_Self_Inverse4Id20` AS `OneToMany_Optional_Self_Inverse4Id200`, `t4`.`OneToMany_Required_Inverse4Id10` AS `OneToMany_Required_Inverse4Id100`, `t4`.`OneToMany_Required_Inverse4Id20` AS `OneToMany_Required_Inverse4Id200`, `t4`.`OneToMany_Required_Self_Inverse4Id10` AS `OneToMany_Required_Self_Inverse4Id100`, `t4`.`OneToMany_Required_Self_Inverse4Id20` AS `OneToMany_Required_Self_Inverse4Id200`, `t4`.`OneToOne_Optional_PK_Inverse4Id10` AS `OneToOne_Optional_PK_Inverse4Id100`, `t4`.`OneToOne_Optional_PK_Inverse4Id20` AS `OneToOne_Optional_PK_Inverse4Id200`, `t4`.`OneToOne_Optional_Self4Id10` AS `OneToOne_Optional_Self4Id100`, `t4`.`OneToOne_Optional_Self4Id20` AS `OneToOne_Optional_Self4Id200`, `c7`.`OneToMany_Required_Inverse2Id1`, `c7`.`OneToMany_Required_Inverse2Id2`
+    SELECT `c7`.`Name`, `c7`.`Id1`, `c7`.`Id2`, `s2`.`Name` AS `Name0`, `s2`.`Id1` AS `Id10`, `s2`.`Id2` AS `Id20`, `s2`.`Id10` AS `Id100`, `s2`.`Id20` AS `Id200`, `s2`.`Level3_Optional_Id1`, `s2`.`Level3_Optional_Id2`, `s2`.`Level3_Required_Id1`, `s2`.`Level3_Required_Id2`, `s2`.`Name0` AS `Name00`, `s2`.`OneToMany_Optional_Inverse4Id1`, `s2`.`OneToMany_Optional_Inverse4Id2`, `s2`.`OneToMany_Optional_Self_Inverse4Id1`, `s2`.`OneToMany_Optional_Self_Inverse4Id2`, `s2`.`OneToMany_Required_Inverse4Id1`, `s2`.`OneToMany_Required_Inverse4Id2`, `s2`.`OneToMany_Required_Self_Inverse4Id1`, `s2`.`OneToMany_Required_Self_Inverse4Id2`, `s2`.`OneToOne_Optional_PK_Inverse4Id1`, `s2`.`OneToOne_Optional_PK_Inverse4Id2`, `s2`.`OneToOne_Optional_Self4Id1`, `s2`.`OneToOne_Optional_Self4Id2`, `s2`.`Id11`, `s2`.`Id21`, `s2`.`Level3_Optional_Id10`, `s2`.`Level3_Optional_Id20`, `s2`.`Level3_Required_Id10`, `s2`.`Level3_Required_Id20`, `s2`.`Name1`, `s2`.`OneToMany_Optional_Inverse4Id10`, `s2`.`OneToMany_Optional_Inverse4Id20`, `s2`.`OneToMany_Optional_Self_Inverse4Id10`, `s2`.`OneToMany_Optional_Self_Inverse4Id20`, `s2`.`OneToMany_Required_Inverse4Id10`, `s2`.`OneToMany_Required_Inverse4Id20`, `s2`.`OneToMany_Required_Self_Inverse4Id10`, `s2`.`OneToMany_Required_Self_Inverse4Id20`, `s2`.`OneToOne_Optional_PK_Inverse4Id10`, `s2`.`OneToOne_Optional_PK_Inverse4Id20`, `s2`.`OneToOne_Optional_Self4Id10`, `s2`.`OneToOne_Optional_Self4Id20`, `s3`.`Name` AS `Name2`, `s3`.`Id1` AS `Id12`, `s3`.`Id2` AS `Id22`, `s3`.`Id10` AS `Id101`, `s3`.`Id20` AS `Id201`, `s3`.`Level3_Optional_Id1` AS `Level3_Optional_Id11`, `s3`.`Level3_Optional_Id2` AS `Level3_Optional_Id21`, `s3`.`Level3_Required_Id1` AS `Level3_Required_Id11`, `s3`.`Level3_Required_Id2` AS `Level3_Required_Id21`, `s3`.`Name0` AS `Name01`, `s3`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id11`, `s3`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id21`, `s3`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id11`, `s3`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id21`, `s3`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id11`, `s3`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id21`, `s3`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id11`, `s3`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id21`, `s3`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id11`, `s3`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id21`, `s3`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id11`, `s3`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id21`, `s3`.`Id11` AS `Id110`, `s3`.`Id21` AS `Id210`, `s3`.`Level3_Optional_Id10` AS `Level3_Optional_Id100`, `s3`.`Level3_Optional_Id20` AS `Level3_Optional_Id200`, `s3`.`Level3_Required_Id10` AS `Level3_Required_Id100`, `s3`.`Level3_Required_Id20` AS `Level3_Required_Id200`, `s3`.`Name1` AS `Name10`, `s3`.`OneToMany_Optional_Inverse4Id10` AS `OneToMany_Optional_Inverse4Id100`, `s3`.`OneToMany_Optional_Inverse4Id20` AS `OneToMany_Optional_Inverse4Id200`, `s3`.`OneToMany_Optional_Self_Inverse4Id10` AS `OneToMany_Optional_Self_Inverse4Id100`, `s3`.`OneToMany_Optional_Self_Inverse4Id20` AS `OneToMany_Optional_Self_Inverse4Id200`, `s3`.`OneToMany_Required_Inverse4Id10` AS `OneToMany_Required_Inverse4Id100`, `s3`.`OneToMany_Required_Inverse4Id20` AS `OneToMany_Required_Inverse4Id200`, `s3`.`OneToMany_Required_Self_Inverse4Id10` AS `OneToMany_Required_Self_Inverse4Id100`, `s3`.`OneToMany_Required_Self_Inverse4Id20` AS `OneToMany_Required_Self_Inverse4Id200`, `s3`.`OneToOne_Optional_PK_Inverse4Id10` AS `OneToOne_Optional_PK_Inverse4Id100`, `s3`.`OneToOne_Optional_PK_Inverse4Id20` AS `OneToOne_Optional_PK_Inverse4Id200`, `s3`.`OneToOne_Optional_Self4Id10` AS `OneToOne_Optional_Self4Id100`, `s3`.`OneToOne_Optional_Self4Id20` AS `OneToOne_Optional_Self4Id200`, `c7`.`OneToMany_Required_Inverse2Id1`, `c7`.`OneToMany_Required_Inverse2Id2`
     FROM `CompositeTwos` AS `c7`
     LEFT JOIN (
         SELECT `c8`.`Name`, `c8`.`Id1`, `c8`.`Id2`, `c9`.`Id1` AS `Id10`, `c9`.`Id2` AS `Id20`, `c9`.`Level3_Optional_Id1`, `c9`.`Level3_Optional_Id2`, `c9`.`Level3_Required_Id1`, `c9`.`Level3_Required_Id2`, `c9`.`Name` AS `Name0`, `c9`.`OneToMany_Optional_Inverse4Id1`, `c9`.`OneToMany_Optional_Inverse4Id2`, `c9`.`OneToMany_Optional_Self_Inverse4Id1`, `c9`.`OneToMany_Optional_Self_Inverse4Id2`, `c9`.`OneToMany_Required_Inverse4Id1`, `c9`.`OneToMany_Required_Inverse4Id2`, `c9`.`OneToMany_Required_Self_Inverse4Id1`, `c9`.`OneToMany_Required_Self_Inverse4Id2`, `c9`.`OneToOne_Optional_PK_Inverse4Id1`, `c9`.`OneToOne_Optional_PK_Inverse4Id2`, `c9`.`OneToOne_Optional_Self4Id1`, `c9`.`OneToOne_Optional_Self4Id2`, `c10`.`Id1` AS `Id11`, `c10`.`Id2` AS `Id21`, `c10`.`Level3_Optional_Id1` AS `Level3_Optional_Id10`, `c10`.`Level3_Optional_Id2` AS `Level3_Optional_Id20`, `c10`.`Level3_Required_Id1` AS `Level3_Required_Id10`, `c10`.`Level3_Required_Id2` AS `Level3_Required_Id20`, `c10`.`Name` AS `Name1`, `c10`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id10`, `c10`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id20`, `c10`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id10`, `c10`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id20`, `c10`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id10`, `c10`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id20`, `c10`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id10`, `c10`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id20`, `c10`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id10`, `c10`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id20`, `c10`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id10`, `c10`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id20`, `c8`.`OneToMany_Optional_Inverse3Id1`, `c8`.`OneToMany_Optional_Inverse3Id2`
         FROM `CompositeThrees` AS `c8`
         LEFT JOIN `CompositeFours` AS `c9` ON (`c8`.`Id1` = `c9`.`OneToMany_Required_Inverse4Id1`) AND (`c8`.`Id2` = `c9`.`OneToMany_Required_Inverse4Id2`)
         LEFT JOIN `CompositeFours` AS `c10` ON (`c8`.`Id1` = `c10`.`OneToMany_Optional_Inverse4Id1`) AND (`c8`.`Id2` = `c10`.`OneToMany_Optional_Inverse4Id2`)
-    ) AS `t3` ON (`c7`.`Id1` = `t3`.`OneToMany_Optional_Inverse3Id1`) AND (`c7`.`Id2` = `t3`.`OneToMany_Optional_Inverse3Id2`)
+    ) AS `s2` ON (`c7`.`Id1` = `s2`.`OneToMany_Optional_Inverse3Id1`) AND (`c7`.`Id2` = `s2`.`OneToMany_Optional_Inverse3Id2`)
     LEFT JOIN (
         SELECT `c11`.`Name`, `c11`.`Id1`, `c11`.`Id2`, `c12`.`Id1` AS `Id10`, `c12`.`Id2` AS `Id20`, `c12`.`Level3_Optional_Id1`, `c12`.`Level3_Optional_Id2`, `c12`.`Level3_Required_Id1`, `c12`.`Level3_Required_Id2`, `c12`.`Name` AS `Name0`, `c12`.`OneToMany_Optional_Inverse4Id1`, `c12`.`OneToMany_Optional_Inverse4Id2`, `c12`.`OneToMany_Optional_Self_Inverse4Id1`, `c12`.`OneToMany_Optional_Self_Inverse4Id2`, `c12`.`OneToMany_Required_Inverse4Id1`, `c12`.`OneToMany_Required_Inverse4Id2`, `c12`.`OneToMany_Required_Self_Inverse4Id1`, `c12`.`OneToMany_Required_Self_Inverse4Id2`, `c12`.`OneToOne_Optional_PK_Inverse4Id1`, `c12`.`OneToOne_Optional_PK_Inverse4Id2`, `c12`.`OneToOne_Optional_Self4Id1`, `c12`.`OneToOne_Optional_Self4Id2`, `c13`.`Id1` AS `Id11`, `c13`.`Id2` AS `Id21`, `c13`.`Level3_Optional_Id1` AS `Level3_Optional_Id10`, `c13`.`Level3_Optional_Id2` AS `Level3_Optional_Id20`, `c13`.`Level3_Required_Id1` AS `Level3_Required_Id10`, `c13`.`Level3_Required_Id2` AS `Level3_Required_Id20`, `c13`.`Name` AS `Name1`, `c13`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id10`, `c13`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id20`, `c13`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id10`, `c13`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id20`, `c13`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id10`, `c13`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id20`, `c13`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id10`, `c13`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id20`, `c13`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id10`, `c13`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id20`, `c13`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id10`, `c13`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id20`, `c11`.`OneToMany_Optional_Inverse3Id1`, `c11`.`OneToMany_Optional_Inverse3Id2`
         FROM `CompositeThrees` AS `c11`
         LEFT JOIN `CompositeFours` AS `c12` ON (`c11`.`Id1` = `c12`.`OneToMany_Optional_Inverse4Id1`) AND (`c11`.`Id2` = `c12`.`OneToMany_Optional_Inverse4Id2`)
         LEFT JOIN `CompositeFours` AS `c13` ON (`c11`.`Id1` = `c13`.`OneToMany_Required_Inverse4Id1`) AND (`c11`.`Id2` = `c13`.`OneToMany_Required_Inverse4Id2`)
-    ) AS `t4` ON (`c7`.`Id1` = `t4`.`OneToMany_Optional_Inverse3Id1`) AND (`c7`.`Id2` = `t4`.`OneToMany_Optional_Inverse3Id2`)
-) AS `t2` ON (`c`.`Id1` = `t2`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `t2`.`OneToMany_Required_Inverse2Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `t1`.`Id1`, `t1`.`Id2`, `t1`.`Id10`, `t1`.`Id20`, `t1`.`Id100`, `t1`.`Id200`, `t1`.`Id11`, `t1`.`Id21`, `t1`.`Id12`, `t1`.`Id22`, `t1`.`Id101`, `t1`.`Id201`, `t1`.`Id110`, `t1`.`Id210`, `t2`.`Id1`, `t2`.`Id2`, `t2`.`Id10`, `t2`.`Id20`, `t2`.`Id100`, `t2`.`Id200`, `t2`.`Id11`, `t2`.`Id21`, `t2`.`Id12`, `t2`.`Id22`, `t2`.`Id101`, `t2`.`Id201`, `t2`.`Id110`");
+    ) AS `s3` ON (`c7`.`Id1` = `s3`.`OneToMany_Optional_Inverse3Id1`) AND (`c7`.`Id2` = `s3`.`OneToMany_Optional_Inverse3Id2`)
+) AS `s4` ON (`c`.`Id1` = `s4`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `s4`.`OneToMany_Required_Inverse2Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `s1`.`Id1`, `s1`.`Id2`, `s1`.`Id10`, `s1`.`Id20`, `s1`.`Id100`, `s1`.`Id200`, `s1`.`Id11`, `s1`.`Id21`, `s1`.`Id12`, `s1`.`Id22`, `s1`.`Id101`, `s1`.`Id201`, `s1`.`Id110`, `s1`.`Id210`, `s4`.`Id1`, `s4`.`Id2`, `s4`.`Id10`, `s4`.`Id20`, `s4`.`Id100`, `s4`.`Id200`, `s4`.`Id11`, `s4`.`Id21`, `s4`.`Id12`, `s4`.`Id22`, `s4`.`Id101`, `s4`.`Id201`, `s4`.`Id110`
+""");
         }
 
         public override async Task Projecting_multiple_collections_on_multiple_levels_some_explicit_ordering(bool async)
         {
             await base.Projecting_multiple_collections_on_multiple_levels_some_explicit_ordering(async);
 
-            AssertSql(
-                @"SELECT `c`.`Id1`, `c`.`Id2`, `t1`.`Name`, `t1`.`Id1`, `t1`.`Id2`, `t1`.`Id10`, `t1`.`Id20`, `t1`.`Id100`, `t1`.`Id200`, `t1`.`Level3_Optional_Id1`, `t1`.`Level3_Optional_Id2`, `t1`.`Level3_Required_Id1`, `t1`.`Level3_Required_Id2`, `t1`.`Name0`, `t1`.`OneToMany_Optional_Inverse4Id1`, `t1`.`OneToMany_Optional_Inverse4Id2`, `t1`.`OneToMany_Optional_Self_Inverse4Id1`, `t1`.`OneToMany_Optional_Self_Inverse4Id2`, `t1`.`OneToMany_Required_Inverse4Id1`, `t1`.`OneToMany_Required_Inverse4Id2`, `t1`.`OneToMany_Required_Self_Inverse4Id1`, `t1`.`OneToMany_Required_Self_Inverse4Id2`, `t1`.`OneToOne_Optional_PK_Inverse4Id1`, `t1`.`OneToOne_Optional_PK_Inverse4Id2`, `t1`.`OneToOne_Optional_Self4Id1`, `t1`.`OneToOne_Optional_Self4Id2`, `t1`.`Id11`, `t1`.`Id21`, `t1`.`Level3_Optional_Id10`, `t1`.`Level3_Optional_Id20`, `t1`.`Level3_Required_Id10`, `t1`.`Level3_Required_Id20`, `t1`.`Name00`, `t1`.`OneToMany_Optional_Inverse4Id10`, `t1`.`OneToMany_Optional_Inverse4Id20`, `t1`.`OneToMany_Optional_Self_Inverse4Id10`, `t1`.`OneToMany_Optional_Self_Inverse4Id20`, `t1`.`OneToMany_Required_Inverse4Id10`, `t1`.`OneToMany_Required_Inverse4Id20`, `t1`.`OneToMany_Required_Self_Inverse4Id10`, `t1`.`OneToMany_Required_Self_Inverse4Id20`, `t1`.`OneToOne_Optional_PK_Inverse4Id10`, `t1`.`OneToOne_Optional_PK_Inverse4Id20`, `t1`.`OneToOne_Optional_Self4Id10`, `t1`.`OneToOne_Optional_Self4Id20`, `t1`.`Name1`, `t1`.`Id12`, `t1`.`Id22`, `t1`.`Id101`, `t1`.`Id201`, `t1`.`Level3_Optional_Id11`, `t1`.`Level3_Optional_Id21`, `t1`.`Level3_Required_Id11`, `t1`.`Level3_Required_Id21`, `t1`.`Name01`, `t1`.`OneToMany_Optional_Inverse4Id11`, `t1`.`OneToMany_Optional_Inverse4Id21`, `t1`.`OneToMany_Optional_Self_Inverse4Id11`, `t1`.`OneToMany_Optional_Self_Inverse4Id21`, `t1`.`OneToMany_Required_Inverse4Id11`, `t1`.`OneToMany_Required_Inverse4Id21`, `t1`.`OneToMany_Required_Self_Inverse4Id11`, `t1`.`OneToMany_Required_Self_Inverse4Id21`, `t1`.`OneToOne_Optional_PK_Inverse4Id11`, `t1`.`OneToOne_Optional_PK_Inverse4Id21`, `t1`.`OneToOne_Optional_Self4Id11`, `t1`.`OneToOne_Optional_Self4Id21`, `t1`.`Id110`, `t1`.`Id210`, `t1`.`Level3_Optional_Id100`, `t1`.`Level3_Optional_Id200`, `t1`.`Level3_Required_Id100`, `t1`.`Level3_Required_Id200`, `t1`.`Name10`, `t1`.`OneToMany_Optional_Inverse4Id100`, `t1`.`OneToMany_Optional_Inverse4Id200`, `t1`.`OneToMany_Optional_Self_Inverse4Id100`, `t1`.`OneToMany_Optional_Self_Inverse4Id200`, `t1`.`OneToMany_Required_Inverse4Id100`, `t1`.`OneToMany_Required_Inverse4Id200`, `t1`.`OneToMany_Required_Self_Inverse4Id100`, `t1`.`OneToMany_Required_Self_Inverse4Id200`, `t1`.`OneToOne_Optional_PK_Inverse4Id100`, `t1`.`OneToOne_Optional_PK_Inverse4Id200`, `t1`.`OneToOne_Optional_Self4Id100`, `t1`.`OneToOne_Optional_Self4Id200`, `t2`.`Name`, `t2`.`Id1`, `t2`.`Id2`, `t2`.`Name0`, `t2`.`Id10`, `t2`.`Id20`, `t2`.`Id100`, `t2`.`Id200`, `t2`.`Level3_Optional_Id1`, `t2`.`Level3_Optional_Id2`, `t2`.`Level3_Required_Id1`, `t2`.`Level3_Required_Id2`, `t2`.`Name00`, `t2`.`OneToMany_Optional_Inverse4Id1`, `t2`.`OneToMany_Optional_Inverse4Id2`, `t2`.`OneToMany_Optional_Self_Inverse4Id1`, `t2`.`OneToMany_Optional_Self_Inverse4Id2`, `t2`.`OneToMany_Required_Inverse4Id1`, `t2`.`OneToMany_Required_Inverse4Id2`, `t2`.`OneToMany_Required_Self_Inverse4Id1`, `t2`.`OneToMany_Required_Self_Inverse4Id2`, `t2`.`OneToOne_Optional_PK_Inverse4Id1`, `t2`.`OneToOne_Optional_PK_Inverse4Id2`, `t2`.`OneToOne_Optional_Self4Id1`, `t2`.`OneToOne_Optional_Self4Id2`, `t2`.`Id11`, `t2`.`Id21`, `t2`.`Level3_Optional_Id10`, `t2`.`Level3_Optional_Id20`, `t2`.`Level3_Required_Id10`, `t2`.`Level3_Required_Id20`, `t2`.`Name1`, `t2`.`OneToMany_Optional_Inverse4Id10`, `t2`.`OneToMany_Optional_Inverse4Id20`, `t2`.`OneToMany_Optional_Self_Inverse4Id10`, `t2`.`OneToMany_Optional_Self_Inverse4Id20`, `t2`.`OneToMany_Required_Inverse4Id10`, `t2`.`OneToMany_Required_Inverse4Id20`, `t2`.`OneToMany_Required_Self_Inverse4Id10`, `t2`.`OneToMany_Required_Self_Inverse4Id20`, `t2`.`OneToOne_Optional_PK_Inverse4Id10`, `t2`.`OneToOne_Optional_PK_Inverse4Id20`, `t2`.`OneToOne_Optional_Self4Id10`, `t2`.`OneToOne_Optional_Self4Id20`, `t2`.`Name2`, `t2`.`Id12`, `t2`.`Id22`, `t2`.`Id101`, `t2`.`Id201`, `t2`.`Level3_Optional_Id11`, `t2`.`Level3_Optional_Id21`, `t2`.`Level3_Required_Id11`, `t2`.`Level3_Required_Id21`, `t2`.`Name01`, `t2`.`OneToMany_Optional_Inverse4Id11`, `t2`.`OneToMany_Optional_Inverse4Id21`, `t2`.`OneToMany_Optional_Self_Inverse4Id11`, `t2`.`OneToMany_Optional_Self_Inverse4Id21`, `t2`.`OneToMany_Required_Inverse4Id11`, `t2`.`OneToMany_Required_Inverse4Id21`, `t2`.`OneToMany_Required_Self_Inverse4Id11`, `t2`.`OneToMany_Required_Self_Inverse4Id21`, `t2`.`OneToOne_Optional_PK_Inverse4Id11`, `t2`.`OneToOne_Optional_PK_Inverse4Id21`, `t2`.`OneToOne_Optional_Self4Id11`, `t2`.`OneToOne_Optional_Self4Id21`, `t2`.`Id110`, `t2`.`Id210`, `t2`.`Level3_Optional_Id100`, `t2`.`Level3_Optional_Id200`, `t2`.`Level3_Required_Id100`, `t2`.`Level3_Required_Id200`, `t2`.`Name10`, `t2`.`OneToMany_Optional_Inverse4Id100`, `t2`.`OneToMany_Optional_Inverse4Id200`, `t2`.`OneToMany_Optional_Self_Inverse4Id100`, `t2`.`OneToMany_Optional_Self_Inverse4Id200`, `t2`.`OneToMany_Required_Inverse4Id100`, `t2`.`OneToMany_Required_Inverse4Id200`, `t2`.`OneToMany_Required_Self_Inverse4Id100`, `t2`.`OneToMany_Required_Self_Inverse4Id200`, `t2`.`OneToOne_Optional_PK_Inverse4Id100`, `t2`.`OneToOne_Optional_PK_Inverse4Id200`, `t2`.`OneToOne_Optional_Self4Id100`, `t2`.`OneToOne_Optional_Self4Id200`
+        AssertSql(
+"""
+SELECT `c`.`Id1`, `c`.`Id2`, `s1`.`Name`, `s1`.`Id1`, `s1`.`Id2`, `s1`.`Id10`, `s1`.`Id20`, `s1`.`Id100`, `s1`.`Id200`, `s1`.`Level3_Optional_Id1`, `s1`.`Level3_Optional_Id2`, `s1`.`Level3_Required_Id1`, `s1`.`Level3_Required_Id2`, `s1`.`Name0`, `s1`.`OneToMany_Optional_Inverse4Id1`, `s1`.`OneToMany_Optional_Inverse4Id2`, `s1`.`OneToMany_Optional_Self_Inverse4Id1`, `s1`.`OneToMany_Optional_Self_Inverse4Id2`, `s1`.`OneToMany_Required_Inverse4Id1`, `s1`.`OneToMany_Required_Inverse4Id2`, `s1`.`OneToMany_Required_Self_Inverse4Id1`, `s1`.`OneToMany_Required_Self_Inverse4Id2`, `s1`.`OneToOne_Optional_PK_Inverse4Id1`, `s1`.`OneToOne_Optional_PK_Inverse4Id2`, `s1`.`OneToOne_Optional_Self4Id1`, `s1`.`OneToOne_Optional_Self4Id2`, `s1`.`Id11`, `s1`.`Id21`, `s1`.`Level3_Optional_Id10`, `s1`.`Level3_Optional_Id20`, `s1`.`Level3_Required_Id10`, `s1`.`Level3_Required_Id20`, `s1`.`Name00`, `s1`.`OneToMany_Optional_Inverse4Id10`, `s1`.`OneToMany_Optional_Inverse4Id20`, `s1`.`OneToMany_Optional_Self_Inverse4Id10`, `s1`.`OneToMany_Optional_Self_Inverse4Id20`, `s1`.`OneToMany_Required_Inverse4Id10`, `s1`.`OneToMany_Required_Inverse4Id20`, `s1`.`OneToMany_Required_Self_Inverse4Id10`, `s1`.`OneToMany_Required_Self_Inverse4Id20`, `s1`.`OneToOne_Optional_PK_Inverse4Id10`, `s1`.`OneToOne_Optional_PK_Inverse4Id20`, `s1`.`OneToOne_Optional_Self4Id10`, `s1`.`OneToOne_Optional_Self4Id20`, `s1`.`Name1`, `s1`.`Id12`, `s1`.`Id22`, `s1`.`Id101`, `s1`.`Id201`, `s1`.`Level3_Optional_Id11`, `s1`.`Level3_Optional_Id21`, `s1`.`Level3_Required_Id11`, `s1`.`Level3_Required_Id21`, `s1`.`Name01`, `s1`.`OneToMany_Optional_Inverse4Id11`, `s1`.`OneToMany_Optional_Inverse4Id21`, `s1`.`OneToMany_Optional_Self_Inverse4Id11`, `s1`.`OneToMany_Optional_Self_Inverse4Id21`, `s1`.`OneToMany_Required_Inverse4Id11`, `s1`.`OneToMany_Required_Inverse4Id21`, `s1`.`OneToMany_Required_Self_Inverse4Id11`, `s1`.`OneToMany_Required_Self_Inverse4Id21`, `s1`.`OneToOne_Optional_PK_Inverse4Id11`, `s1`.`OneToOne_Optional_PK_Inverse4Id21`, `s1`.`OneToOne_Optional_Self4Id11`, `s1`.`OneToOne_Optional_Self4Id21`, `s1`.`Id110`, `s1`.`Id210`, `s1`.`Level3_Optional_Id100`, `s1`.`Level3_Optional_Id200`, `s1`.`Level3_Required_Id100`, `s1`.`Level3_Required_Id200`, `s1`.`Name10`, `s1`.`OneToMany_Optional_Inverse4Id100`, `s1`.`OneToMany_Optional_Inverse4Id200`, `s1`.`OneToMany_Optional_Self_Inverse4Id100`, `s1`.`OneToMany_Optional_Self_Inverse4Id200`, `s1`.`OneToMany_Required_Inverse4Id100`, `s1`.`OneToMany_Required_Inverse4Id200`, `s1`.`OneToMany_Required_Self_Inverse4Id100`, `s1`.`OneToMany_Required_Self_Inverse4Id200`, `s1`.`OneToOne_Optional_PK_Inverse4Id100`, `s1`.`OneToOne_Optional_PK_Inverse4Id200`, `s1`.`OneToOne_Optional_Self4Id100`, `s1`.`OneToOne_Optional_Self4Id200`, `s4`.`Name`, `s4`.`Id1`, `s4`.`Id2`, `s4`.`Name0`, `s4`.`Id10`, `s4`.`Id20`, `s4`.`Id100`, `s4`.`Id200`, `s4`.`Level3_Optional_Id1`, `s4`.`Level3_Optional_Id2`, `s4`.`Level3_Required_Id1`, `s4`.`Level3_Required_Id2`, `s4`.`Name00`, `s4`.`OneToMany_Optional_Inverse4Id1`, `s4`.`OneToMany_Optional_Inverse4Id2`, `s4`.`OneToMany_Optional_Self_Inverse4Id1`, `s4`.`OneToMany_Optional_Self_Inverse4Id2`, `s4`.`OneToMany_Required_Inverse4Id1`, `s4`.`OneToMany_Required_Inverse4Id2`, `s4`.`OneToMany_Required_Self_Inverse4Id1`, `s4`.`OneToMany_Required_Self_Inverse4Id2`, `s4`.`OneToOne_Optional_PK_Inverse4Id1`, `s4`.`OneToOne_Optional_PK_Inverse4Id2`, `s4`.`OneToOne_Optional_Self4Id1`, `s4`.`OneToOne_Optional_Self4Id2`, `s4`.`Id11`, `s4`.`Id21`, `s4`.`Level3_Optional_Id10`, `s4`.`Level3_Optional_Id20`, `s4`.`Level3_Required_Id10`, `s4`.`Level3_Required_Id20`, `s4`.`Name1`, `s4`.`OneToMany_Optional_Inverse4Id10`, `s4`.`OneToMany_Optional_Inverse4Id20`, `s4`.`OneToMany_Optional_Self_Inverse4Id10`, `s4`.`OneToMany_Optional_Self_Inverse4Id20`, `s4`.`OneToMany_Required_Inverse4Id10`, `s4`.`OneToMany_Required_Inverse4Id20`, `s4`.`OneToMany_Required_Self_Inverse4Id10`, `s4`.`OneToMany_Required_Self_Inverse4Id20`, `s4`.`OneToOne_Optional_PK_Inverse4Id10`, `s4`.`OneToOne_Optional_PK_Inverse4Id20`, `s4`.`OneToOne_Optional_Self4Id10`, `s4`.`OneToOne_Optional_Self4Id20`, `s4`.`Name2`, `s4`.`Id12`, `s4`.`Id22`, `s4`.`Id101`, `s4`.`Id201`, `s4`.`Level3_Optional_Id11`, `s4`.`Level3_Optional_Id21`, `s4`.`Level3_Required_Id11`, `s4`.`Level3_Required_Id21`, `s4`.`Name01`, `s4`.`OneToMany_Optional_Inverse4Id11`, `s4`.`OneToMany_Optional_Inverse4Id21`, `s4`.`OneToMany_Optional_Self_Inverse4Id11`, `s4`.`OneToMany_Optional_Self_Inverse4Id21`, `s4`.`OneToMany_Required_Inverse4Id11`, `s4`.`OneToMany_Required_Inverse4Id21`, `s4`.`OneToMany_Required_Self_Inverse4Id11`, `s4`.`OneToMany_Required_Self_Inverse4Id21`, `s4`.`OneToOne_Optional_PK_Inverse4Id11`, `s4`.`OneToOne_Optional_PK_Inverse4Id21`, `s4`.`OneToOne_Optional_Self4Id11`, `s4`.`OneToOne_Optional_Self4Id21`, `s4`.`Id110`, `s4`.`Id210`, `s4`.`Level3_Optional_Id100`, `s4`.`Level3_Optional_Id200`, `s4`.`Level3_Required_Id100`, `s4`.`Level3_Required_Id200`, `s4`.`Name10`, `s4`.`OneToMany_Optional_Inverse4Id100`, `s4`.`OneToMany_Optional_Inverse4Id200`, `s4`.`OneToMany_Optional_Self_Inverse4Id100`, `s4`.`OneToMany_Optional_Self_Inverse4Id200`, `s4`.`OneToMany_Required_Inverse4Id100`, `s4`.`OneToMany_Required_Inverse4Id200`, `s4`.`OneToMany_Required_Self_Inverse4Id100`, `s4`.`OneToMany_Required_Self_Inverse4Id200`, `s4`.`OneToOne_Optional_PK_Inverse4Id100`, `s4`.`OneToOne_Optional_PK_Inverse4Id200`, `s4`.`OneToOne_Optional_Self4Id100`, `s4`.`OneToOne_Optional_Self4Id200`
 FROM `CompositeOnes` AS `c`
 LEFT JOIN (
-    SELECT `c0`.`Name`, `c0`.`Id1`, `c0`.`Id2`, `t`.`Id1` AS `Id10`, `t`.`Id2` AS `Id20`, `t`.`Id10` AS `Id100`, `t`.`Id20` AS `Id200`, `t`.`Level3_Optional_Id1`, `t`.`Level3_Optional_Id2`, `t`.`Level3_Required_Id1`, `t`.`Level3_Required_Id2`, `t`.`Name` AS `Name0`, `t`.`OneToMany_Optional_Inverse4Id1`, `t`.`OneToMany_Optional_Inverse4Id2`, `t`.`OneToMany_Optional_Self_Inverse4Id1`, `t`.`OneToMany_Optional_Self_Inverse4Id2`, `t`.`OneToMany_Required_Inverse4Id1`, `t`.`OneToMany_Required_Inverse4Id2`, `t`.`OneToMany_Required_Self_Inverse4Id1`, `t`.`OneToMany_Required_Self_Inverse4Id2`, `t`.`OneToOne_Optional_PK_Inverse4Id1`, `t`.`OneToOne_Optional_PK_Inverse4Id2`, `t`.`OneToOne_Optional_Self4Id1`, `t`.`OneToOne_Optional_Self4Id2`, `t`.`Id11`, `t`.`Id21`, `t`.`Level3_Optional_Id10`, `t`.`Level3_Optional_Id20`, `t`.`Level3_Required_Id10`, `t`.`Level3_Required_Id20`, `t`.`Name0` AS `Name00`, `t`.`OneToMany_Optional_Inverse4Id10`, `t`.`OneToMany_Optional_Inverse4Id20`, `t`.`OneToMany_Optional_Self_Inverse4Id10`, `t`.`OneToMany_Optional_Self_Inverse4Id20`, `t`.`OneToMany_Required_Inverse4Id10`, `t`.`OneToMany_Required_Inverse4Id20`, `t`.`OneToMany_Required_Self_Inverse4Id10`, `t`.`OneToMany_Required_Self_Inverse4Id20`, `t`.`OneToOne_Optional_PK_Inverse4Id10`, `t`.`OneToOne_Optional_PK_Inverse4Id20`, `t`.`OneToOne_Optional_Self4Id10`, `t`.`OneToOne_Optional_Self4Id20`, `t0`.`Name` AS `Name1`, `t0`.`Id1` AS `Id12`, `t0`.`Id2` AS `Id22`, `t0`.`Id10` AS `Id101`, `t0`.`Id20` AS `Id201`, `t0`.`Level3_Optional_Id1` AS `Level3_Optional_Id11`, `t0`.`Level3_Optional_Id2` AS `Level3_Optional_Id21`, `t0`.`Level3_Required_Id1` AS `Level3_Required_Id11`, `t0`.`Level3_Required_Id2` AS `Level3_Required_Id21`, `t0`.`Name0` AS `Name01`, `t0`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id11`, `t0`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id21`, `t0`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id11`, `t0`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id21`, `t0`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id11`, `t0`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id21`, `t0`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id11`, `t0`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id21`, `t0`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id11`, `t0`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id21`, `t0`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id11`, `t0`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id21`, `t0`.`Id11` AS `Id110`, `t0`.`Id21` AS `Id210`, `t0`.`Level3_Optional_Id10` AS `Level3_Optional_Id100`, `t0`.`Level3_Optional_Id20` AS `Level3_Optional_Id200`, `t0`.`Level3_Required_Id10` AS `Level3_Required_Id100`, `t0`.`Level3_Required_Id20` AS `Level3_Required_Id200`, `t0`.`Name1` AS `Name10`, `t0`.`OneToMany_Optional_Inverse4Id10` AS `OneToMany_Optional_Inverse4Id100`, `t0`.`OneToMany_Optional_Inverse4Id20` AS `OneToMany_Optional_Inverse4Id200`, `t0`.`OneToMany_Optional_Self_Inverse4Id10` AS `OneToMany_Optional_Self_Inverse4Id100`, `t0`.`OneToMany_Optional_Self_Inverse4Id20` AS `OneToMany_Optional_Self_Inverse4Id200`, `t0`.`OneToMany_Required_Inverse4Id10` AS `OneToMany_Required_Inverse4Id100`, `t0`.`OneToMany_Required_Inverse4Id20` AS `OneToMany_Required_Inverse4Id200`, `t0`.`OneToMany_Required_Self_Inverse4Id10` AS `OneToMany_Required_Self_Inverse4Id100`, `t0`.`OneToMany_Required_Self_Inverse4Id20` AS `OneToMany_Required_Self_Inverse4Id200`, `t0`.`OneToOne_Optional_PK_Inverse4Id10` AS `OneToOne_Optional_PK_Inverse4Id100`, `t0`.`OneToOne_Optional_PK_Inverse4Id20` AS `OneToOne_Optional_PK_Inverse4Id200`, `t0`.`OneToOne_Optional_Self4Id10` AS `OneToOne_Optional_Self4Id100`, `t0`.`OneToOne_Optional_Self4Id20` AS `OneToOne_Optional_Self4Id200`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`
+    SELECT `c0`.`Name`, `c0`.`Id1`, `c0`.`Id2`, `s`.`Id1` AS `Id10`, `s`.`Id2` AS `Id20`, `s`.`Id10` AS `Id100`, `s`.`Id20` AS `Id200`, `s`.`Level3_Optional_Id1`, `s`.`Level3_Optional_Id2`, `s`.`Level3_Required_Id1`, `s`.`Level3_Required_Id2`, `s`.`Name` AS `Name0`, `s`.`OneToMany_Optional_Inverse4Id1`, `s`.`OneToMany_Optional_Inverse4Id2`, `s`.`OneToMany_Optional_Self_Inverse4Id1`, `s`.`OneToMany_Optional_Self_Inverse4Id2`, `s`.`OneToMany_Required_Inverse4Id1`, `s`.`OneToMany_Required_Inverse4Id2`, `s`.`OneToMany_Required_Self_Inverse4Id1`, `s`.`OneToMany_Required_Self_Inverse4Id2`, `s`.`OneToOne_Optional_PK_Inverse4Id1`, `s`.`OneToOne_Optional_PK_Inverse4Id2`, `s`.`OneToOne_Optional_Self4Id1`, `s`.`OneToOne_Optional_Self4Id2`, `s`.`Id11`, `s`.`Id21`, `s`.`Level3_Optional_Id10`, `s`.`Level3_Optional_Id20`, `s`.`Level3_Required_Id10`, `s`.`Level3_Required_Id20`, `s`.`Name0` AS `Name00`, `s`.`OneToMany_Optional_Inverse4Id10`, `s`.`OneToMany_Optional_Inverse4Id20`, `s`.`OneToMany_Optional_Self_Inverse4Id10`, `s`.`OneToMany_Optional_Self_Inverse4Id20`, `s`.`OneToMany_Required_Inverse4Id10`, `s`.`OneToMany_Required_Inverse4Id20`, `s`.`OneToMany_Required_Self_Inverse4Id10`, `s`.`OneToMany_Required_Self_Inverse4Id20`, `s`.`OneToOne_Optional_PK_Inverse4Id10`, `s`.`OneToOne_Optional_PK_Inverse4Id20`, `s`.`OneToOne_Optional_Self4Id10`, `s`.`OneToOne_Optional_Self4Id20`, `s0`.`Name` AS `Name1`, `s0`.`Id1` AS `Id12`, `s0`.`Id2` AS `Id22`, `s0`.`Id10` AS `Id101`, `s0`.`Id20` AS `Id201`, `s0`.`Level3_Optional_Id1` AS `Level3_Optional_Id11`, `s0`.`Level3_Optional_Id2` AS `Level3_Optional_Id21`, `s0`.`Level3_Required_Id1` AS `Level3_Required_Id11`, `s0`.`Level3_Required_Id2` AS `Level3_Required_Id21`, `s0`.`Name0` AS `Name01`, `s0`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id11`, `s0`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id21`, `s0`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id11`, `s0`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id21`, `s0`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id11`, `s0`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id21`, `s0`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id11`, `s0`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id21`, `s0`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id11`, `s0`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id21`, `s0`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id11`, `s0`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id21`, `s0`.`Id11` AS `Id110`, `s0`.`Id21` AS `Id210`, `s0`.`Level3_Optional_Id10` AS `Level3_Optional_Id100`, `s0`.`Level3_Optional_Id20` AS `Level3_Optional_Id200`, `s0`.`Level3_Required_Id10` AS `Level3_Required_Id100`, `s0`.`Level3_Required_Id20` AS `Level3_Required_Id200`, `s0`.`Name1` AS `Name10`, `s0`.`OneToMany_Optional_Inverse4Id10` AS `OneToMany_Optional_Inverse4Id100`, `s0`.`OneToMany_Optional_Inverse4Id20` AS `OneToMany_Optional_Inverse4Id200`, `s0`.`OneToMany_Optional_Self_Inverse4Id10` AS `OneToMany_Optional_Self_Inverse4Id100`, `s0`.`OneToMany_Optional_Self_Inverse4Id20` AS `OneToMany_Optional_Self_Inverse4Id200`, `s0`.`OneToMany_Required_Inverse4Id10` AS `OneToMany_Required_Inverse4Id100`, `s0`.`OneToMany_Required_Inverse4Id20` AS `OneToMany_Required_Inverse4Id200`, `s0`.`OneToMany_Required_Self_Inverse4Id10` AS `OneToMany_Required_Self_Inverse4Id100`, `s0`.`OneToMany_Required_Self_Inverse4Id20` AS `OneToMany_Required_Self_Inverse4Id200`, `s0`.`OneToOne_Optional_PK_Inverse4Id10` AS `OneToOne_Optional_PK_Inverse4Id100`, `s0`.`OneToOne_Optional_PK_Inverse4Id20` AS `OneToOne_Optional_PK_Inverse4Id200`, `s0`.`OneToOne_Optional_Self4Id10` AS `OneToOne_Optional_Self4Id100`, `s0`.`OneToOne_Optional_Self4Id20` AS `OneToOne_Optional_Self4Id200`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`
     FROM `CompositeTwos` AS `c0`
     LEFT JOIN (
         SELECT `c1`.`Id1`, `c1`.`Id2`, `c2`.`Id1` AS `Id10`, `c2`.`Id2` AS `Id20`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c3`.`Id1` AS `Id11`, `c3`.`Id2` AS `Id21`, `c3`.`Level3_Optional_Id1` AS `Level3_Optional_Id10`, `c3`.`Level3_Optional_Id2` AS `Level3_Optional_Id20`, `c3`.`Level3_Required_Id1` AS `Level3_Required_Id10`, `c3`.`Level3_Required_Id2` AS `Level3_Required_Id20`, `c3`.`Name` AS `Name0`, `c3`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id10`, `c3`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id20`, `c3`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id10`, `c3`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id20`, `c3`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id10`, `c3`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id20`, `c3`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id10`, `c3`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id20`, `c3`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id10`, `c3`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id20`, `c3`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id10`, `c3`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id20`, `c1`.`OneToMany_Required_Inverse3Id1`, `c1`.`OneToMany_Required_Inverse3Id2`
         FROM `CompositeThrees` AS `c1`
         LEFT JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Optional_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Optional_Inverse4Id2`)
         LEFT JOIN `CompositeFours` AS `c3` ON (`c1`.`Id1` = `c3`.`OneToMany_Required_Inverse4Id1`) AND (`c1`.`Id2` = `c3`.`OneToMany_Required_Inverse4Id2`)
-    ) AS `t` ON (`c0`.`Id1` = `t`.`OneToMany_Required_Inverse3Id1`) AND (`c0`.`Id2` = `t`.`OneToMany_Required_Inverse3Id2`)
+    ) AS `s` ON (`c0`.`Id1` = `s`.`OneToMany_Required_Inverse3Id1`) AND (`c0`.`Id2` = `s`.`OneToMany_Required_Inverse3Id2`)
     LEFT JOIN (
         SELECT `c4`.`Name`, `c4`.`Id1`, `c4`.`Id2`, `c5`.`Id1` AS `Id10`, `c5`.`Id2` AS `Id20`, `c5`.`Level3_Optional_Id1`, `c5`.`Level3_Optional_Id2`, `c5`.`Level3_Required_Id1`, `c5`.`Level3_Required_Id2`, `c5`.`Name` AS `Name0`, `c5`.`OneToMany_Optional_Inverse4Id1`, `c5`.`OneToMany_Optional_Inverse4Id2`, `c5`.`OneToMany_Optional_Self_Inverse4Id1`, `c5`.`OneToMany_Optional_Self_Inverse4Id2`, `c5`.`OneToMany_Required_Inverse4Id1`, `c5`.`OneToMany_Required_Inverse4Id2`, `c5`.`OneToMany_Required_Self_Inverse4Id1`, `c5`.`OneToMany_Required_Self_Inverse4Id2`, `c5`.`OneToOne_Optional_PK_Inverse4Id1`, `c5`.`OneToOne_Optional_PK_Inverse4Id2`, `c5`.`OneToOne_Optional_Self4Id1`, `c5`.`OneToOne_Optional_Self4Id2`, `c6`.`Id1` AS `Id11`, `c6`.`Id2` AS `Id21`, `c6`.`Level3_Optional_Id1` AS `Level3_Optional_Id10`, `c6`.`Level3_Optional_Id2` AS `Level3_Optional_Id20`, `c6`.`Level3_Required_Id1` AS `Level3_Required_Id10`, `c6`.`Level3_Required_Id2` AS `Level3_Required_Id20`, `c6`.`Name` AS `Name1`, `c6`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id10`, `c6`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id20`, `c6`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id10`, `c6`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id20`, `c6`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id10`, `c6`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id20`, `c6`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id10`, `c6`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id20`, `c6`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id10`, `c6`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id20`, `c6`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id10`, `c6`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id20`, `c4`.`OneToMany_Optional_Inverse3Id1`, `c4`.`OneToMany_Optional_Inverse3Id2`
         FROM `CompositeThrees` AS `c4`
         LEFT JOIN `CompositeFours` AS `c5` ON (`c4`.`Id1` = `c5`.`OneToMany_Required_Inverse4Id1`) AND (`c4`.`Id2` = `c5`.`OneToMany_Required_Inverse4Id2`)
         LEFT JOIN `CompositeFours` AS `c6` ON (`c4`.`Id1` = `c6`.`OneToMany_Optional_Inverse4Id1`) AND (`c4`.`Id2` = `c6`.`OneToMany_Optional_Inverse4Id2`)
-    ) AS `t0` ON (`c0`.`Id1` = `t0`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `t0`.`OneToMany_Optional_Inverse3Id2`)
-) AS `t1` ON (`c`.`Id1` = `t1`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `t1`.`OneToMany_Optional_Inverse2Id2`)
+    ) AS `s0` ON (`c0`.`Id1` = `s0`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `s0`.`OneToMany_Optional_Inverse3Id2`)
+) AS `s1` ON (`c`.`Id1` = `s1`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `s1`.`OneToMany_Optional_Inverse2Id2`)
 LEFT JOIN (
-    SELECT `c7`.`Name`, `c7`.`Id1`, `c7`.`Id2`, `t3`.`Name` AS `Name0`, `t3`.`Id1` AS `Id10`, `t3`.`Id2` AS `Id20`, `t3`.`Id10` AS `Id100`, `t3`.`Id20` AS `Id200`, `t3`.`Level3_Optional_Id1`, `t3`.`Level3_Optional_Id2`, `t3`.`Level3_Required_Id1`, `t3`.`Level3_Required_Id2`, `t3`.`Name0` AS `Name00`, `t3`.`OneToMany_Optional_Inverse4Id1`, `t3`.`OneToMany_Optional_Inverse4Id2`, `t3`.`OneToMany_Optional_Self_Inverse4Id1`, `t3`.`OneToMany_Optional_Self_Inverse4Id2`, `t3`.`OneToMany_Required_Inverse4Id1`, `t3`.`OneToMany_Required_Inverse4Id2`, `t3`.`OneToMany_Required_Self_Inverse4Id1`, `t3`.`OneToMany_Required_Self_Inverse4Id2`, `t3`.`OneToOne_Optional_PK_Inverse4Id1`, `t3`.`OneToOne_Optional_PK_Inverse4Id2`, `t3`.`OneToOne_Optional_Self4Id1`, `t3`.`OneToOne_Optional_Self4Id2`, `t3`.`Id11`, `t3`.`Id21`, `t3`.`Level3_Optional_Id10`, `t3`.`Level3_Optional_Id20`, `t3`.`Level3_Required_Id10`, `t3`.`Level3_Required_Id20`, `t3`.`Name1`, `t3`.`OneToMany_Optional_Inverse4Id10`, `t3`.`OneToMany_Optional_Inverse4Id20`, `t3`.`OneToMany_Optional_Self_Inverse4Id10`, `t3`.`OneToMany_Optional_Self_Inverse4Id20`, `t3`.`OneToMany_Required_Inverse4Id10`, `t3`.`OneToMany_Required_Inverse4Id20`, `t3`.`OneToMany_Required_Self_Inverse4Id10`, `t3`.`OneToMany_Required_Self_Inverse4Id20`, `t3`.`OneToOne_Optional_PK_Inverse4Id10`, `t3`.`OneToOne_Optional_PK_Inverse4Id20`, `t3`.`OneToOne_Optional_Self4Id10`, `t3`.`OneToOne_Optional_Self4Id20`, `t4`.`Name` AS `Name2`, `t4`.`Id1` AS `Id12`, `t4`.`Id2` AS `Id22`, `t4`.`Id10` AS `Id101`, `t4`.`Id20` AS `Id201`, `t4`.`Level3_Optional_Id1` AS `Level3_Optional_Id11`, `t4`.`Level3_Optional_Id2` AS `Level3_Optional_Id21`, `t4`.`Level3_Required_Id1` AS `Level3_Required_Id11`, `t4`.`Level3_Required_Id2` AS `Level3_Required_Id21`, `t4`.`Name0` AS `Name01`, `t4`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id11`, `t4`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id21`, `t4`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id11`, `t4`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id21`, `t4`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id11`, `t4`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id21`, `t4`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id11`, `t4`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id21`, `t4`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id11`, `t4`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id21`, `t4`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id11`, `t4`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id21`, `t4`.`Id11` AS `Id110`, `t4`.`Id21` AS `Id210`, `t4`.`Level3_Optional_Id10` AS `Level3_Optional_Id100`, `t4`.`Level3_Optional_Id20` AS `Level3_Optional_Id200`, `t4`.`Level3_Required_Id10` AS `Level3_Required_Id100`, `t4`.`Level3_Required_Id20` AS `Level3_Required_Id200`, `t4`.`Name1` AS `Name10`, `t4`.`OneToMany_Optional_Inverse4Id10` AS `OneToMany_Optional_Inverse4Id100`, `t4`.`OneToMany_Optional_Inverse4Id20` AS `OneToMany_Optional_Inverse4Id200`, `t4`.`OneToMany_Optional_Self_Inverse4Id10` AS `OneToMany_Optional_Self_Inverse4Id100`, `t4`.`OneToMany_Optional_Self_Inverse4Id20` AS `OneToMany_Optional_Self_Inverse4Id200`, `t4`.`OneToMany_Required_Inverse4Id10` AS `OneToMany_Required_Inverse4Id100`, `t4`.`OneToMany_Required_Inverse4Id20` AS `OneToMany_Required_Inverse4Id200`, `t4`.`OneToMany_Required_Self_Inverse4Id10` AS `OneToMany_Required_Self_Inverse4Id100`, `t4`.`OneToMany_Required_Self_Inverse4Id20` AS `OneToMany_Required_Self_Inverse4Id200`, `t4`.`OneToOne_Optional_PK_Inverse4Id10` AS `OneToOne_Optional_PK_Inverse4Id100`, `t4`.`OneToOne_Optional_PK_Inverse4Id20` AS `OneToOne_Optional_PK_Inverse4Id200`, `t4`.`OneToOne_Optional_Self4Id10` AS `OneToOne_Optional_Self4Id100`, `t4`.`OneToOne_Optional_Self4Id20` AS `OneToOne_Optional_Self4Id200`, CHAR_LENGTH(`c7`.`Name`) AS `c`, `t4`.`c` AS `c0`, `c7`.`OneToMany_Required_Inverse2Id1`, `c7`.`OneToMany_Required_Inverse2Id2`
+    SELECT `c7`.`Name`, `c7`.`Id1`, `c7`.`Id2`, `s2`.`Name` AS `Name0`, `s2`.`Id1` AS `Id10`, `s2`.`Id2` AS `Id20`, `s2`.`Id10` AS `Id100`, `s2`.`Id20` AS `Id200`, `s2`.`Level3_Optional_Id1`, `s2`.`Level3_Optional_Id2`, `s2`.`Level3_Required_Id1`, `s2`.`Level3_Required_Id2`, `s2`.`Name0` AS `Name00`, `s2`.`OneToMany_Optional_Inverse4Id1`, `s2`.`OneToMany_Optional_Inverse4Id2`, `s2`.`OneToMany_Optional_Self_Inverse4Id1`, `s2`.`OneToMany_Optional_Self_Inverse4Id2`, `s2`.`OneToMany_Required_Inverse4Id1`, `s2`.`OneToMany_Required_Inverse4Id2`, `s2`.`OneToMany_Required_Self_Inverse4Id1`, `s2`.`OneToMany_Required_Self_Inverse4Id2`, `s2`.`OneToOne_Optional_PK_Inverse4Id1`, `s2`.`OneToOne_Optional_PK_Inverse4Id2`, `s2`.`OneToOne_Optional_Self4Id1`, `s2`.`OneToOne_Optional_Self4Id2`, `s2`.`Id11`, `s2`.`Id21`, `s2`.`Level3_Optional_Id10`, `s2`.`Level3_Optional_Id20`, `s2`.`Level3_Required_Id10`, `s2`.`Level3_Required_Id20`, `s2`.`Name1`, `s2`.`OneToMany_Optional_Inverse4Id10`, `s2`.`OneToMany_Optional_Inverse4Id20`, `s2`.`OneToMany_Optional_Self_Inverse4Id10`, `s2`.`OneToMany_Optional_Self_Inverse4Id20`, `s2`.`OneToMany_Required_Inverse4Id10`, `s2`.`OneToMany_Required_Inverse4Id20`, `s2`.`OneToMany_Required_Self_Inverse4Id10`, `s2`.`OneToMany_Required_Self_Inverse4Id20`, `s2`.`OneToOne_Optional_PK_Inverse4Id10`, `s2`.`OneToOne_Optional_PK_Inverse4Id20`, `s2`.`OneToOne_Optional_Self4Id10`, `s2`.`OneToOne_Optional_Self4Id20`, `s3`.`Name` AS `Name2`, `s3`.`Id1` AS `Id12`, `s3`.`Id2` AS `Id22`, `s3`.`Id10` AS `Id101`, `s3`.`Id20` AS `Id201`, `s3`.`Level3_Optional_Id1` AS `Level3_Optional_Id11`, `s3`.`Level3_Optional_Id2` AS `Level3_Optional_Id21`, `s3`.`Level3_Required_Id1` AS `Level3_Required_Id11`, `s3`.`Level3_Required_Id2` AS `Level3_Required_Id21`, `s3`.`Name0` AS `Name01`, `s3`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id11`, `s3`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id21`, `s3`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id11`, `s3`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id21`, `s3`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id11`, `s3`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id21`, `s3`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id11`, `s3`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id21`, `s3`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id11`, `s3`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id21`, `s3`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id11`, `s3`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id21`, `s3`.`Id11` AS `Id110`, `s3`.`Id21` AS `Id210`, `s3`.`Level3_Optional_Id10` AS `Level3_Optional_Id100`, `s3`.`Level3_Optional_Id20` AS `Level3_Optional_Id200`, `s3`.`Level3_Required_Id10` AS `Level3_Required_Id100`, `s3`.`Level3_Required_Id20` AS `Level3_Required_Id200`, `s3`.`Name1` AS `Name10`, `s3`.`OneToMany_Optional_Inverse4Id10` AS `OneToMany_Optional_Inverse4Id100`, `s3`.`OneToMany_Optional_Inverse4Id20` AS `OneToMany_Optional_Inverse4Id200`, `s3`.`OneToMany_Optional_Self_Inverse4Id10` AS `OneToMany_Optional_Self_Inverse4Id100`, `s3`.`OneToMany_Optional_Self_Inverse4Id20` AS `OneToMany_Optional_Self_Inverse4Id200`, `s3`.`OneToMany_Required_Inverse4Id10` AS `OneToMany_Required_Inverse4Id100`, `s3`.`OneToMany_Required_Inverse4Id20` AS `OneToMany_Required_Inverse4Id200`, `s3`.`OneToMany_Required_Self_Inverse4Id10` AS `OneToMany_Required_Self_Inverse4Id100`, `s3`.`OneToMany_Required_Self_Inverse4Id20` AS `OneToMany_Required_Self_Inverse4Id200`, `s3`.`OneToOne_Optional_PK_Inverse4Id10` AS `OneToOne_Optional_PK_Inverse4Id100`, `s3`.`OneToOne_Optional_PK_Inverse4Id20` AS `OneToOne_Optional_PK_Inverse4Id200`, `s3`.`OneToOne_Optional_Self4Id10` AS `OneToOne_Optional_Self4Id100`, `s3`.`OneToOne_Optional_Self4Id20` AS `OneToOne_Optional_Self4Id200`, CHAR_LENGTH(`c7`.`Name`) AS `c`, `s3`.`c` AS `c0`, `c7`.`OneToMany_Required_Inverse2Id1`, `c7`.`OneToMany_Required_Inverse2Id2`
     FROM `CompositeTwos` AS `c7`
     LEFT JOIN (
         SELECT `c8`.`Name`, `c8`.`Id1`, `c8`.`Id2`, `c9`.`Id1` AS `Id10`, `c9`.`Id2` AS `Id20`, `c9`.`Level3_Optional_Id1`, `c9`.`Level3_Optional_Id2`, `c9`.`Level3_Required_Id1`, `c9`.`Level3_Required_Id2`, `c9`.`Name` AS `Name0`, `c9`.`OneToMany_Optional_Inverse4Id1`, `c9`.`OneToMany_Optional_Inverse4Id2`, `c9`.`OneToMany_Optional_Self_Inverse4Id1`, `c9`.`OneToMany_Optional_Self_Inverse4Id2`, `c9`.`OneToMany_Required_Inverse4Id1`, `c9`.`OneToMany_Required_Inverse4Id2`, `c9`.`OneToMany_Required_Self_Inverse4Id1`, `c9`.`OneToMany_Required_Self_Inverse4Id2`, `c9`.`OneToOne_Optional_PK_Inverse4Id1`, `c9`.`OneToOne_Optional_PK_Inverse4Id2`, `c9`.`OneToOne_Optional_Self4Id1`, `c9`.`OneToOne_Optional_Self4Id2`, `c10`.`Id1` AS `Id11`, `c10`.`Id2` AS `Id21`, `c10`.`Level3_Optional_Id1` AS `Level3_Optional_Id10`, `c10`.`Level3_Optional_Id2` AS `Level3_Optional_Id20`, `c10`.`Level3_Required_Id1` AS `Level3_Required_Id10`, `c10`.`Level3_Required_Id2` AS `Level3_Required_Id20`, `c10`.`Name` AS `Name1`, `c10`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id10`, `c10`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id20`, `c10`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id10`, `c10`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id20`, `c10`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id10`, `c10`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id20`, `c10`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id10`, `c10`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id20`, `c10`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id10`, `c10`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id20`, `c10`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id10`, `c10`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id20`, `c8`.`OneToMany_Optional_Inverse3Id1`, `c8`.`OneToMany_Optional_Inverse3Id2`
         FROM `CompositeThrees` AS `c8`
         LEFT JOIN `CompositeFours` AS `c9` ON (`c8`.`Id1` = `c9`.`OneToMany_Required_Inverse4Id1`) AND (`c8`.`Id2` = `c9`.`OneToMany_Required_Inverse4Id2`)
         LEFT JOIN `CompositeFours` AS `c10` ON (`c8`.`Id1` = `c10`.`OneToMany_Optional_Inverse4Id1`) AND (`c8`.`Id2` = `c10`.`OneToMany_Optional_Inverse4Id2`)
-    ) AS `t3` ON (`c7`.`Id1` = `t3`.`OneToMany_Optional_Inverse3Id1`) AND (`c7`.`Id2` = `t3`.`OneToMany_Optional_Inverse3Id2`)
+    ) AS `s2` ON (`c7`.`Id1` = `s2`.`OneToMany_Optional_Inverse3Id1`) AND (`c7`.`Id2` = `s2`.`OneToMany_Optional_Inverse3Id2`)
     LEFT JOIN (
         SELECT `c11`.`Name`, `c11`.`Id1`, `c11`.`Id2`, `c12`.`Id1` AS `Id10`, `c12`.`Id2` AS `Id20`, `c12`.`Level3_Optional_Id1`, `c12`.`Level3_Optional_Id2`, `c12`.`Level3_Required_Id1`, `c12`.`Level3_Required_Id2`, `c12`.`Name` AS `Name0`, `c12`.`OneToMany_Optional_Inverse4Id1`, `c12`.`OneToMany_Optional_Inverse4Id2`, `c12`.`OneToMany_Optional_Self_Inverse4Id1`, `c12`.`OneToMany_Optional_Self_Inverse4Id2`, `c12`.`OneToMany_Required_Inverse4Id1`, `c12`.`OneToMany_Required_Inverse4Id2`, `c12`.`OneToMany_Required_Self_Inverse4Id1`, `c12`.`OneToMany_Required_Self_Inverse4Id2`, `c12`.`OneToOne_Optional_PK_Inverse4Id1`, `c12`.`OneToOne_Optional_PK_Inverse4Id2`, `c12`.`OneToOne_Optional_Self4Id1`, `c12`.`OneToOne_Optional_Self4Id2`, `c13`.`Id1` AS `Id11`, `c13`.`Id2` AS `Id21`, `c13`.`Level3_Optional_Id1` AS `Level3_Optional_Id10`, `c13`.`Level3_Optional_Id2` AS `Level3_Optional_Id20`, `c13`.`Level3_Required_Id1` AS `Level3_Required_Id10`, `c13`.`Level3_Required_Id2` AS `Level3_Required_Id20`, `c13`.`Name` AS `Name1`, `c13`.`OneToMany_Optional_Inverse4Id1` AS `OneToMany_Optional_Inverse4Id10`, `c13`.`OneToMany_Optional_Inverse4Id2` AS `OneToMany_Optional_Inverse4Id20`, `c13`.`OneToMany_Optional_Self_Inverse4Id1` AS `OneToMany_Optional_Self_Inverse4Id10`, `c13`.`OneToMany_Optional_Self_Inverse4Id2` AS `OneToMany_Optional_Self_Inverse4Id20`, `c13`.`OneToMany_Required_Inverse4Id1` AS `OneToMany_Required_Inverse4Id10`, `c13`.`OneToMany_Required_Inverse4Id2` AS `OneToMany_Required_Inverse4Id20`, `c13`.`OneToMany_Required_Self_Inverse4Id1` AS `OneToMany_Required_Self_Inverse4Id10`, `c13`.`OneToMany_Required_Self_Inverse4Id2` AS `OneToMany_Required_Self_Inverse4Id20`, `c13`.`OneToOne_Optional_PK_Inverse4Id1` AS `OneToOne_Optional_PK_Inverse4Id10`, `c13`.`OneToOne_Optional_PK_Inverse4Id2` AS `OneToOne_Optional_PK_Inverse4Id20`, `c13`.`OneToOne_Optional_Self4Id1` AS `OneToOne_Optional_Self4Id10`, `c13`.`OneToOne_Optional_Self4Id2` AS `OneToOne_Optional_Self4Id20`, CONCAT(`c13`.`Id1`, CAST(`c13`.`Id2` AS char)) AS `c`, `c11`.`OneToMany_Optional_Inverse3Id1`, `c11`.`OneToMany_Optional_Inverse3Id2`
         FROM `CompositeThrees` AS `c11`
         LEFT JOIN `CompositeFours` AS `c12` ON (`c11`.`Id1` = `c12`.`OneToMany_Optional_Inverse4Id1`) AND (`c11`.`Id2` = `c12`.`OneToMany_Optional_Inverse4Id2`)
         LEFT JOIN `CompositeFours` AS `c13` ON (`c11`.`Id1` = `c13`.`OneToMany_Required_Inverse4Id1`) AND (`c11`.`Id2` = `c13`.`OneToMany_Required_Inverse4Id2`)
-    ) AS `t4` ON (`c7`.`Id1` = `t4`.`OneToMany_Optional_Inverse3Id1`) AND (`c7`.`Id2` = `t4`.`OneToMany_Optional_Inverse3Id2`)
-) AS `t2` ON (`c`.`Id1` = `t2`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `t2`.`OneToMany_Required_Inverse2Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `t1`.`Id1`, `t1`.`Id2`, `t1`.`Id20` DESC, `t1`.`Id10` DESC, `t1`.`Id100`, `t1`.`Id200`, `t1`.`Id11`, `t1`.`Id21`, `t1`.`Id12`, `t1`.`Id22`, `t1`.`Id101`, `t1`.`Id201`, `t1`.`Id110`, `t1`.`Id210`, `t2`.`c`, `t2`.`Id1`, `t2`.`Id2`, `t2`.`Id10`, `t2`.`Id20`, `t2`.`Id100`, `t2`.`Id200`, `t2`.`Id11`, `t2`.`Id21`, `t2`.`Id12`, `t2`.`Id22`, `t2`.`Id101`, `t2`.`Id201`, `t2`.`c0` DESC, `t2`.`Id110`");
+    ) AS `s3` ON (`c7`.`Id1` = `s3`.`OneToMany_Optional_Inverse3Id1`) AND (`c7`.`Id2` = `s3`.`OneToMany_Optional_Inverse3Id2`)
+) AS `s4` ON (`c`.`Id1` = `s4`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `s4`.`OneToMany_Required_Inverse2Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `s1`.`Id1`, `s1`.`Id2`, `s1`.`Id20` DESC, `s1`.`Id10` DESC, `s1`.`Id100`, `s1`.`Id200`, `s1`.`Id11`, `s1`.`Id21`, `s1`.`Id12`, `s1`.`Id22`, `s1`.`Id101`, `s1`.`Id201`, `s1`.`Id110`, `s1`.`Id210`, `s4`.`c`, `s4`.`Id1`, `s4`.`Id2`, `s4`.`Id10`, `s4`.`Id20`, `s4`.`Id100`, `s4`.`Id200`, `s4`.`Id11`, `s4`.`Id21`, `s4`.`Id12`, `s4`.`Id22`, `s4`.`Id101`, `s4`.`Id201`, `s4`.`c0` DESC, `s4`.`Id110`
+""");
         }
 
         private void AssertSql(params string[] expected)
diff --git a/test/EFCore.MySql.FunctionalTests/Query/CompositeKeysSplitQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/CompositeKeysSplitQueryMySqlTest.cs
index 27da7e812..504d921ed 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/CompositeKeysSplitQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/CompositeKeysSplitQueryMySqlTest.cs
@@ -22,107 +22,139 @@ public override async Task Projecting_collections_multi_level(bool async)
         {
             await base.Projecting_collections_multi_level(async);
 
-            AssertSql(
-                @"SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-ORDER BY `c`.`Id2`, `c`.`Id1`",
+ORDER BY `c`.`Id2`, `c`.`Id1`
+""",
                 //
-                @"SELECT `c0`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`
+                """
+SELECT `c8`.`Name`, `c`.`Id1`, `c`.`Id2`, `c8`.`Id1`, `c8`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1`, `c0`.`Id2`, `c0`.`Id1`",
+INNER JOIN `CompositeTwos` AS `c8` ON (`c`.`Id1` = `c8`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c8`.`OneToMany_Optional_Inverse2Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1`, `c8`.`Id2`, `c8`.`Id1`
+""",
                 //
-                @"SELECT `c1`.`Id1`, `c1`.`Id2`, `c1`.`Level2_Optional_Id1`, `c1`.`Level2_Optional_Id2`, `c1`.`Level2_Required_Id1`, `c1`.`Level2_Required_Id2`, `c1`.`Name`, `c1`.`OneToMany_Optional_Inverse3Id1`, `c1`.`OneToMany_Optional_Inverse3Id2`, `c1`.`OneToMany_Optional_Self_Inverse3Id1`, `c1`.`OneToMany_Optional_Self_Inverse3Id2`, `c1`.`OneToMany_Required_Inverse3Id1`, `c1`.`OneToMany_Required_Inverse3Id2`, `c1`.`OneToMany_Required_Self_Inverse3Id1`, `c1`.`OneToMany_Required_Self_Inverse3Id2`, `c1`.`OneToOne_Optional_PK_Inverse3Id1`, `c1`.`OneToOne_Optional_PK_Inverse3Id2`, `c1`.`OneToOne_Optional_Self3Id1`, `c1`.`OneToOne_Optional_Self3Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`
+                """
+SELECT `c11`.`Id1`, `c11`.`Id2`, `c11`.`Level2_Optional_Id1`, `c11`.`Level2_Optional_Id2`, `c11`.`Level2_Required_Id1`, `c11`.`Level2_Required_Id2`, `c11`.`Name`, `c11`.`OneToMany_Optional_Inverse3Id1`, `c11`.`OneToMany_Optional_Inverse3Id2`, `c11`.`OneToMany_Optional_Self_Inverse3Id1`, `c11`.`OneToMany_Optional_Self_Inverse3Id2`, `c11`.`OneToMany_Required_Inverse3Id1`, `c11`.`OneToMany_Required_Inverse3Id2`, `c11`.`OneToMany_Required_Self_Inverse3Id1`, `c11`.`OneToMany_Required_Self_Inverse3Id2`, `c11`.`OneToOne_Optional_PK_Inverse3Id1`, `c11`.`OneToOne_Optional_PK_Inverse3Id2`, `c11`.`OneToOne_Optional_Self3Id1`, `c11`.`OneToOne_Optional_Self3Id2`, `c`.`Id1`, `c`.`Id2`, `c8`.`Id1`, `c8`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Required_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Required_Inverse3Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1`, `c0`.`Id2`, `c0`.`Id1`, `c1`.`Id2` DESC");
+INNER JOIN `CompositeTwos` AS `c8` ON (`c`.`Id1` = `c8`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c8`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c11` ON (`c8`.`Id1` = `c11`.`OneToMany_Required_Inverse3Id1`) AND (`c8`.`Id2` = `c11`.`OneToMany_Required_Inverse3Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1`, `c8`.`Id2`, `c8`.`Id1`, `c11`.`Id2` DESC
+""");
         }
 
         public override async Task Projecting_multiple_collections_on_multiple_levels_no_explicit_ordering(bool async)
         {
             await base.Projecting_multiple_collections_on_multiple_levels_no_explicit_ordering(async);
 
-            AssertSql(
-                @"SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
-FROM `CompositeOnes` AS `c`
-ORDER BY `c`.`Id1`, `c`.`Id2`",
-                //
-                @"SELECT `c0`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`",
-                //
-                @"SELECT `c1`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Required_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Required_Inverse3Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c1`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Required_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Required_Inverse4Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Optional_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Optional_Inverse4Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c0`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`",
-                //
-                @"SELECT `c1`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Required_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Required_Inverse4Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Optional_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Optional_Inverse4Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c1`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Optional_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Optional_Inverse4Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Required_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Required_Inverse4Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`");
+ORDER BY `c`.`Id1`, `c`.`Id2`
+""",
+                //
+                """
+SELECT `c62`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`
+""",
+                //
+                """
+SELECT `c75`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c75`.`Id1`, `c75`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c75` ON (`c62`.`Id1` = `c75`.`OneToMany_Required_Inverse3Id1`) AND (`c62`.`Id2` = `c75`.`OneToMany_Required_Inverse3Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c75`.`Id1`, `c75`.`Id2`
+""",
+                //
+                """
+SELECT `c87`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c87` ON (`c62`.`Id1` = `c87`.`OneToMany_Optional_Inverse3Id1`) AND (`c62`.`Id2` = `c87`.`OneToMany_Optional_Inverse3Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+""",
+                //
+                """
+SELECT `c90`.`Id1`, `c90`.`Id2`, `c90`.`Level3_Optional_Id1`, `c90`.`Level3_Optional_Id2`, `c90`.`Level3_Required_Id1`, `c90`.`Level3_Required_Id2`, `c90`.`Name`, `c90`.`OneToMany_Optional_Inverse4Id1`, `c90`.`OneToMany_Optional_Inverse4Id2`, `c90`.`OneToMany_Optional_Self_Inverse4Id1`, `c90`.`OneToMany_Optional_Self_Inverse4Id2`, `c90`.`OneToMany_Required_Inverse4Id1`, `c90`.`OneToMany_Required_Inverse4Id2`, `c90`.`OneToMany_Required_Self_Inverse4Id1`, `c90`.`OneToMany_Required_Self_Inverse4Id2`, `c90`.`OneToOne_Optional_PK_Inverse4Id1`, `c90`.`OneToOne_Optional_PK_Inverse4Id2`, `c90`.`OneToOne_Optional_Self4Id1`, `c90`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c87` ON (`c62`.`Id1` = `c87`.`OneToMany_Optional_Inverse3Id1`) AND (`c62`.`Id2` = `c87`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c90` ON (`c87`.`Id1` = `c90`.`OneToMany_Required_Inverse4Id1`) AND (`c87`.`Id2` = `c90`.`OneToMany_Required_Inverse4Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+""",
+                //
+                """
+SELECT `c92`.`Id1`, `c92`.`Id2`, `c92`.`Level3_Optional_Id1`, `c92`.`Level3_Optional_Id2`, `c92`.`Level3_Required_Id1`, `c92`.`Level3_Required_Id2`, `c92`.`Name`, `c92`.`OneToMany_Optional_Inverse4Id1`, `c92`.`OneToMany_Optional_Inverse4Id2`, `c92`.`OneToMany_Optional_Self_Inverse4Id1`, `c92`.`OneToMany_Optional_Self_Inverse4Id2`, `c92`.`OneToMany_Required_Inverse4Id1`, `c92`.`OneToMany_Required_Inverse4Id2`, `c92`.`OneToMany_Required_Self_Inverse4Id1`, `c92`.`OneToMany_Required_Self_Inverse4Id2`, `c92`.`OneToOne_Optional_PK_Inverse4Id1`, `c92`.`OneToOne_Optional_PK_Inverse4Id2`, `c92`.`OneToOne_Optional_Self4Id1`, `c92`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c87` ON (`c62`.`Id1` = `c87`.`OneToMany_Optional_Inverse3Id1`) AND (`c62`.`Id2` = `c87`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c92` ON (`c87`.`Id1` = `c92`.`OneToMany_Optional_Inverse4Id1`) AND (`c87`.`Id2` = `c92`.`OneToMany_Optional_Inverse4Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+""",
+                //
+                """
+SELECT `c124`.`Name`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`
+""",
+                //
+                """
+SELECT `c137`.`Name`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c137` ON (`c124`.`Id1` = `c137`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c137`.`OneToMany_Optional_Inverse3Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+""",
+                //
+                """
+SELECT `c140`.`Id1`, `c140`.`Id2`, `c140`.`Level3_Optional_Id1`, `c140`.`Level3_Optional_Id2`, `c140`.`Level3_Required_Id1`, `c140`.`Level3_Required_Id2`, `c140`.`Name`, `c140`.`OneToMany_Optional_Inverse4Id1`, `c140`.`OneToMany_Optional_Inverse4Id2`, `c140`.`OneToMany_Optional_Self_Inverse4Id1`, `c140`.`OneToMany_Optional_Self_Inverse4Id2`, `c140`.`OneToMany_Required_Inverse4Id1`, `c140`.`OneToMany_Required_Inverse4Id2`, `c140`.`OneToMany_Required_Self_Inverse4Id1`, `c140`.`OneToMany_Required_Self_Inverse4Id2`, `c140`.`OneToOne_Optional_PK_Inverse4Id1`, `c140`.`OneToOne_Optional_PK_Inverse4Id2`, `c140`.`OneToOne_Optional_Self4Id1`, `c140`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c137` ON (`c124`.`Id1` = `c137`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c137`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c140` ON (`c137`.`Id1` = `c140`.`OneToMany_Required_Inverse4Id1`) AND (`c137`.`Id2` = `c140`.`OneToMany_Required_Inverse4Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+""",
+                //
+                """
+SELECT `c142`.`Id1`, `c142`.`Id2`, `c142`.`Level3_Optional_Id1`, `c142`.`Level3_Optional_Id2`, `c142`.`Level3_Required_Id1`, `c142`.`Level3_Required_Id2`, `c142`.`Name`, `c142`.`OneToMany_Optional_Inverse4Id1`, `c142`.`OneToMany_Optional_Inverse4Id2`, `c142`.`OneToMany_Optional_Self_Inverse4Id1`, `c142`.`OneToMany_Optional_Self_Inverse4Id2`, `c142`.`OneToMany_Required_Inverse4Id1`, `c142`.`OneToMany_Required_Inverse4Id2`, `c142`.`OneToMany_Required_Self_Inverse4Id1`, `c142`.`OneToMany_Required_Self_Inverse4Id2`, `c142`.`OneToOne_Optional_PK_Inverse4Id1`, `c142`.`OneToOne_Optional_PK_Inverse4Id2`, `c142`.`OneToOne_Optional_Self4Id1`, `c142`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c137` ON (`c124`.`Id1` = `c137`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c137`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c142` ON (`c137`.`Id1` = `c142`.`OneToMany_Optional_Inverse4Id1`) AND (`c137`.`Id2` = `c142`.`OneToMany_Optional_Inverse4Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+""",
+                //
+                """
+SELECT `c149`.`Name`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c149` ON (`c124`.`Id1` = `c149`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c149`.`OneToMany_Optional_Inverse3Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+""",
+                //
+                """
+SELECT `c152`.`Id1`, `c152`.`Id2`, `c152`.`Level3_Optional_Id1`, `c152`.`Level3_Optional_Id2`, `c152`.`Level3_Required_Id1`, `c152`.`Level3_Required_Id2`, `c152`.`Name`, `c152`.`OneToMany_Optional_Inverse4Id1`, `c152`.`OneToMany_Optional_Inverse4Id2`, `c152`.`OneToMany_Optional_Self_Inverse4Id1`, `c152`.`OneToMany_Optional_Self_Inverse4Id2`, `c152`.`OneToMany_Required_Inverse4Id1`, `c152`.`OneToMany_Required_Inverse4Id2`, `c152`.`OneToMany_Required_Self_Inverse4Id1`, `c152`.`OneToMany_Required_Self_Inverse4Id2`, `c152`.`OneToOne_Optional_PK_Inverse4Id1`, `c152`.`OneToOne_Optional_PK_Inverse4Id2`, `c152`.`OneToOne_Optional_Self4Id1`, `c152`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c149` ON (`c124`.`Id1` = `c149`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c149`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c152` ON (`c149`.`Id1` = `c152`.`OneToMany_Optional_Inverse4Id1`) AND (`c149`.`Id2` = `c152`.`OneToMany_Optional_Inverse4Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+""",
+                //
+                """
+SELECT `c154`.`Id1`, `c154`.`Id2`, `c154`.`Level3_Optional_Id1`, `c154`.`Level3_Optional_Id2`, `c154`.`Level3_Required_Id1`, `c154`.`Level3_Required_Id2`, `c154`.`Name`, `c154`.`OneToMany_Optional_Inverse4Id1`, `c154`.`OneToMany_Optional_Inverse4Id2`, `c154`.`OneToMany_Optional_Self_Inverse4Id1`, `c154`.`OneToMany_Optional_Self_Inverse4Id2`, `c154`.`OneToMany_Required_Inverse4Id1`, `c154`.`OneToMany_Required_Inverse4Id2`, `c154`.`OneToMany_Required_Self_Inverse4Id1`, `c154`.`OneToMany_Required_Self_Inverse4Id2`, `c154`.`OneToOne_Optional_PK_Inverse4Id1`, `c154`.`OneToOne_Optional_PK_Inverse4Id2`, `c154`.`OneToOne_Optional_Self4Id1`, `c154`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c149` ON (`c124`.`Id1` = `c149`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c149`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c154` ON (`c149`.`Id1` = `c154`.`OneToMany_Required_Inverse4Id1`) AND (`c149`.`Id2` = `c154`.`OneToMany_Required_Inverse4Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+""");
         }
 
         public override async Task Projecting_multiple_collections_on_multiple_levels_some_explicit_ordering(bool async)
@@ -130,165 +162,215 @@ public override async Task Projecting_multiple_collections_on_multiple_levels_so
             await base.Projecting_multiple_collections_on_multiple_levels_some_explicit_ordering(async);
 
         AssertSql(
-            @"SELECT `c`.`Id1`, `c`.`Id2`
-FROM `CompositeOnes` AS `c`
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`",
-                //
-                @"SELECT `c0`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`",
-                //
-                @"SELECT `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Required_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Required_Inverse3Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id2` DESC, `c1`.`Id1` DESC",
-                //
-                @"SELECT `c1`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
+"""
+SELECT `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Required_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Required_Inverse4Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Optional_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Optional_Inverse4Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c0`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c0`.`Name`), `c0`.`Id1`, `c0`.`Id2`",
-                //
-                @"SELECT `c1`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c0`.`Name`), `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Required_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Required_Inverse4Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c0`.`Name`), `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Optional_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Optional_Inverse4Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c0`.`Name`), `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c1`.`Name`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c0`.`Name`), `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Optional_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Optional_Inverse4Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c0`.`Name`), `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`",
-                //
-                @"SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Level3_Optional_Id1`, `c2`.`Level3_Optional_Id2`, `c2`.`Level3_Required_Id1`, `c2`.`Level3_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse4Id1`, `c2`.`OneToMany_Optional_Inverse4Id2`, `c2`.`OneToMany_Optional_Self_Inverse4Id1`, `c2`.`OneToMany_Optional_Self_Inverse4Id2`, `c2`.`OneToMany_Required_Inverse4Id1`, `c2`.`OneToMany_Required_Inverse4Id2`, `c2`.`OneToMany_Required_Self_Inverse4Id1`, `c2`.`OneToMany_Required_Self_Inverse4Id2`, `c2`.`OneToOne_Optional_PK_Inverse4Id1`, `c2`.`OneToOne_Optional_PK_Inverse4Id2`, `c2`.`OneToOne_Optional_Self4Id1`, `c2`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`
-FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-INNER JOIN `CompositeThrees` AS `c1` ON (`c0`.`Id1` = `c1`.`OneToMany_Optional_Inverse3Id1`) AND (`c0`.`Id2` = `c1`.`OneToMany_Optional_Inverse3Id2`)
-INNER JOIN `CompositeFours` AS `c2` ON (`c1`.`Id1` = `c2`.`OneToMany_Required_Inverse4Id1`) AND (`c1`.`Id2` = `c2`.`OneToMany_Required_Inverse4Id2`)
-ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c0`.`Name`), `c0`.`Id1`, `c0`.`Id2`, `c1`.`Id1`, `c1`.`Id2`, CONCAT(`c2`.`Id1`, CAST(`c2`.`Id2` AS char)) DESC");
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`
+""",
+                //
+                """
+SELECT `c62`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`
+""",
+                //
+                """
+SELECT `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c75`.`Id1`, `c75`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c75` ON (`c62`.`Id1` = `c75`.`OneToMany_Required_Inverse3Id1`) AND (`c62`.`Id2` = `c75`.`OneToMany_Required_Inverse3Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c75`.`Id2` DESC, `c75`.`Id1` DESC
+""",
+                //
+                """
+SELECT `c87`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c87` ON (`c62`.`Id1` = `c87`.`OneToMany_Optional_Inverse3Id1`) AND (`c62`.`Id2` = `c87`.`OneToMany_Optional_Inverse3Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+""",
+                //
+                """
+SELECT `c90`.`Id1`, `c90`.`Id2`, `c90`.`Level3_Optional_Id1`, `c90`.`Level3_Optional_Id2`, `c90`.`Level3_Required_Id1`, `c90`.`Level3_Required_Id2`, `c90`.`Name`, `c90`.`OneToMany_Optional_Inverse4Id1`, `c90`.`OneToMany_Optional_Inverse4Id2`, `c90`.`OneToMany_Optional_Self_Inverse4Id1`, `c90`.`OneToMany_Optional_Self_Inverse4Id2`, `c90`.`OneToMany_Required_Inverse4Id1`, `c90`.`OneToMany_Required_Inverse4Id2`, `c90`.`OneToMany_Required_Self_Inverse4Id1`, `c90`.`OneToMany_Required_Self_Inverse4Id2`, `c90`.`OneToOne_Optional_PK_Inverse4Id1`, `c90`.`OneToOne_Optional_PK_Inverse4Id2`, `c90`.`OneToOne_Optional_Self4Id1`, `c90`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c87` ON (`c62`.`Id1` = `c87`.`OneToMany_Optional_Inverse3Id1`) AND (`c62`.`Id2` = `c87`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c90` ON (`c87`.`Id1` = `c90`.`OneToMany_Required_Inverse4Id1`) AND (`c87`.`Id2` = `c90`.`OneToMany_Required_Inverse4Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+""",
+                //
+                """
+SELECT `c92`.`Id1`, `c92`.`Id2`, `c92`.`Level3_Optional_Id1`, `c92`.`Level3_Optional_Id2`, `c92`.`Level3_Required_Id1`, `c92`.`Level3_Required_Id2`, `c92`.`Name`, `c92`.`OneToMany_Optional_Inverse4Id1`, `c92`.`OneToMany_Optional_Inverse4Id2`, `c92`.`OneToMany_Optional_Self_Inverse4Id1`, `c92`.`OneToMany_Optional_Self_Inverse4Id2`, `c92`.`OneToMany_Required_Inverse4Id1`, `c92`.`OneToMany_Required_Inverse4Id2`, `c92`.`OneToMany_Required_Self_Inverse4Id1`, `c92`.`OneToMany_Required_Self_Inverse4Id2`, `c92`.`OneToOne_Optional_PK_Inverse4Id1`, `c92`.`OneToOne_Optional_PK_Inverse4Id2`, `c92`.`OneToOne_Optional_Self4Id1`, `c92`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c62` ON (`c`.`Id1` = `c62`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c62`.`OneToMany_Optional_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c87` ON (`c62`.`Id1` = `c87`.`OneToMany_Optional_Inverse3Id1`) AND (`c62`.`Id2` = `c87`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c92` ON (`c87`.`Id1` = `c92`.`OneToMany_Optional_Inverse4Id1`) AND (`c87`.`Id2` = `c92`.`OneToMany_Optional_Inverse4Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, `c62`.`Id1`, `c62`.`Id2`, `c87`.`Id1`, `c87`.`Id2`
+""",
+                //
+                """
+SELECT `c124`.`Name`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c124`.`Name`), `c124`.`Id1`, `c124`.`Id2`
+""",
+                //
+                """
+SELECT `c137`.`Name`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c137` ON (`c124`.`Id1` = `c137`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c137`.`OneToMany_Optional_Inverse3Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c124`.`Name`), `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+""",
+                //
+                """
+SELECT `c140`.`Id1`, `c140`.`Id2`, `c140`.`Level3_Optional_Id1`, `c140`.`Level3_Optional_Id2`, `c140`.`Level3_Required_Id1`, `c140`.`Level3_Required_Id2`, `c140`.`Name`, `c140`.`OneToMany_Optional_Inverse4Id1`, `c140`.`OneToMany_Optional_Inverse4Id2`, `c140`.`OneToMany_Optional_Self_Inverse4Id1`, `c140`.`OneToMany_Optional_Self_Inverse4Id2`, `c140`.`OneToMany_Required_Inverse4Id1`, `c140`.`OneToMany_Required_Inverse4Id2`, `c140`.`OneToMany_Required_Self_Inverse4Id1`, `c140`.`OneToMany_Required_Self_Inverse4Id2`, `c140`.`OneToOne_Optional_PK_Inverse4Id1`, `c140`.`OneToOne_Optional_PK_Inverse4Id2`, `c140`.`OneToOne_Optional_Self4Id1`, `c140`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c137` ON (`c124`.`Id1` = `c137`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c137`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c140` ON (`c137`.`Id1` = `c140`.`OneToMany_Required_Inverse4Id1`) AND (`c137`.`Id2` = `c140`.`OneToMany_Required_Inverse4Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c124`.`Name`), `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+""",
+                //
+                """
+SELECT `c142`.`Id1`, `c142`.`Id2`, `c142`.`Level3_Optional_Id1`, `c142`.`Level3_Optional_Id2`, `c142`.`Level3_Required_Id1`, `c142`.`Level3_Required_Id2`, `c142`.`Name`, `c142`.`OneToMany_Optional_Inverse4Id1`, `c142`.`OneToMany_Optional_Inverse4Id2`, `c142`.`OneToMany_Optional_Self_Inverse4Id1`, `c142`.`OneToMany_Optional_Self_Inverse4Id2`, `c142`.`OneToMany_Required_Inverse4Id1`, `c142`.`OneToMany_Required_Inverse4Id2`, `c142`.`OneToMany_Required_Self_Inverse4Id1`, `c142`.`OneToMany_Required_Self_Inverse4Id2`, `c142`.`OneToOne_Optional_PK_Inverse4Id1`, `c142`.`OneToOne_Optional_PK_Inverse4Id2`, `c142`.`OneToOne_Optional_Self4Id1`, `c142`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c137` ON (`c124`.`Id1` = `c137`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c137`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c142` ON (`c137`.`Id1` = `c142`.`OneToMany_Optional_Inverse4Id1`) AND (`c137`.`Id2` = `c142`.`OneToMany_Optional_Inverse4Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c124`.`Name`), `c124`.`Id1`, `c124`.`Id2`, `c137`.`Id1`, `c137`.`Id2`
+""",
+                //
+                """
+SELECT `c149`.`Name`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c149` ON (`c124`.`Id1` = `c149`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c149`.`OneToMany_Optional_Inverse3Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c124`.`Name`), `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+""",
+                //
+                """
+SELECT `c152`.`Id1`, `c152`.`Id2`, `c152`.`Level3_Optional_Id1`, `c152`.`Level3_Optional_Id2`, `c152`.`Level3_Required_Id1`, `c152`.`Level3_Required_Id2`, `c152`.`Name`, `c152`.`OneToMany_Optional_Inverse4Id1`, `c152`.`OneToMany_Optional_Inverse4Id2`, `c152`.`OneToMany_Optional_Self_Inverse4Id1`, `c152`.`OneToMany_Optional_Self_Inverse4Id2`, `c152`.`OneToMany_Required_Inverse4Id1`, `c152`.`OneToMany_Required_Inverse4Id2`, `c152`.`OneToMany_Required_Self_Inverse4Id1`, `c152`.`OneToMany_Required_Self_Inverse4Id2`, `c152`.`OneToOne_Optional_PK_Inverse4Id1`, `c152`.`OneToOne_Optional_PK_Inverse4Id2`, `c152`.`OneToOne_Optional_Self4Id1`, `c152`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c149` ON (`c124`.`Id1` = `c149`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c149`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c152` ON (`c149`.`Id1` = `c152`.`OneToMany_Optional_Inverse4Id1`) AND (`c149`.`Id2` = `c152`.`OneToMany_Optional_Inverse4Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c124`.`Name`), `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+""",
+                //
+                """
+SELECT `c154`.`Id1`, `c154`.`Id2`, `c154`.`Level3_Optional_Id1`, `c154`.`Level3_Optional_Id2`, `c154`.`Level3_Required_Id1`, `c154`.`Level3_Required_Id2`, `c154`.`Name`, `c154`.`OneToMany_Optional_Inverse4Id1`, `c154`.`OneToMany_Optional_Inverse4Id2`, `c154`.`OneToMany_Optional_Self_Inverse4Id1`, `c154`.`OneToMany_Optional_Self_Inverse4Id2`, `c154`.`OneToMany_Required_Inverse4Id1`, `c154`.`OneToMany_Required_Inverse4Id2`, `c154`.`OneToMany_Required_Self_Inverse4Id1`, `c154`.`OneToMany_Required_Self_Inverse4Id2`, `c154`.`OneToOne_Optional_PK_Inverse4Id1`, `c154`.`OneToOne_Optional_PK_Inverse4Id2`, `c154`.`OneToOne_Optional_Self4Id1`, `c154`.`OneToOne_Optional_Self4Id2`, `c`.`Id1`, `c`.`Id2`, `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`
+FROM `CompositeOnes` AS `c`
+INNER JOIN `CompositeTwos` AS `c124` ON (`c`.`Id1` = `c124`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c124`.`OneToMany_Required_Inverse2Id2`)
+INNER JOIN `CompositeThrees` AS `c149` ON (`c124`.`Id1` = `c149`.`OneToMany_Optional_Inverse3Id1`) AND (`c124`.`Id2` = `c149`.`OneToMany_Optional_Inverse3Id2`)
+INNER JOIN `CompositeFours` AS `c154` ON (`c149`.`Id1` = `c154`.`OneToMany_Required_Inverse4Id1`) AND (`c149`.`Id2` = `c154`.`OneToMany_Required_Inverse4Id2`)
+ORDER BY `c`.`Name`, `c`.`Id1`, `c`.`Id2`, CHAR_LENGTH(`c124`.`Name`), `c124`.`Id1`, `c124`.`Id2`, `c149`.`Id1`, `c149`.`Id2`, CONCAT(`c154`.`Id1`, CAST(`c154`.`Id2` AS char)) DESC
+""");
         }
 
         public override async Task Projecting_multiple_collections_same_level_top_level_ordering(bool async)
         {
             await base.Projecting_multiple_collections_same_level_top_level_ordering(async);
 
-            AssertSql(
-                @"SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-ORDER BY `c`.`Id2`, `c`.`Id1`",
+ORDER BY `c`.`Id2`, `c`.`Id1`
+""",
                 //
-                @"SELECT `c0`.`Id1`, `c0`.`Id2`, `c0`.`Date`, `c0`.`Level1_Optional_Id1`, `c0`.`Level1_Optional_Id2`, `c0`.`Level1_Required_Id1`, `c0`.`Level1_Required_Id2`, `c0`.`Name`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`, `c0`.`OneToMany_Optional_Self_Inverse2Id1`, `c0`.`OneToMany_Optional_Self_Inverse2Id2`, `c0`.`OneToMany_Required_Inverse2Id1`, `c0`.`OneToMany_Required_Inverse2Id2`, `c0`.`OneToMany_Required_Self_Inverse2Id1`, `c0`.`OneToMany_Required_Self_Inverse2Id2`, `c0`.`OneToOne_Optional_PK_Inverse2Id1`, `c0`.`OneToOne_Optional_PK_Inverse2Id2`, `c0`.`OneToOne_Optional_Self2Id1`, `c0`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
+                """
+SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Date`, `c2`.`Level1_Optional_Id1`, `c2`.`Level1_Optional_Id2`, `c2`.`Level1_Required_Id1`, `c2`.`Level1_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse2Id1`, `c2`.`OneToMany_Optional_Inverse2Id2`, `c2`.`OneToMany_Optional_Self_Inverse2Id1`, `c2`.`OneToMany_Optional_Self_Inverse2Id2`, `c2`.`OneToMany_Required_Inverse2Id1`, `c2`.`OneToMany_Required_Inverse2Id2`, `c2`.`OneToMany_Required_Self_Inverse2Id1`, `c2`.`OneToMany_Required_Self_Inverse2Id2`, `c2`.`OneToOne_Optional_PK_Inverse2Id1`, `c2`.`OneToOne_Optional_PK_Inverse2Id2`, `c2`.`OneToOne_Optional_Self2Id1`, `c2`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1`",
+INNER JOIN `CompositeTwos` AS `c2` ON (`c`.`Id1` = `c2`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c2`.`OneToMany_Optional_Inverse2Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1`
+""",
                 //
-                @"SELECT `c0`.`Id1`, `c0`.`Id2`, `c0`.`Date`, `c0`.`Level1_Optional_Id1`, `c0`.`Level1_Optional_Id2`, `c0`.`Level1_Required_Id1`, `c0`.`Level1_Required_Id2`, `c0`.`Name`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`, `c0`.`OneToMany_Optional_Self_Inverse2Id1`, `c0`.`OneToMany_Optional_Self_Inverse2Id2`, `c0`.`OneToMany_Required_Inverse2Id1`, `c0`.`OneToMany_Required_Inverse2Id2`, `c0`.`OneToMany_Required_Self_Inverse2Id1`, `c0`.`OneToMany_Required_Self_Inverse2Id2`, `c0`.`OneToOne_Optional_PK_Inverse2Id1`, `c0`.`OneToOne_Optional_PK_Inverse2Id2`, `c0`.`OneToOne_Optional_Self2Id1`, `c0`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
+                """
+SELECT `c4`.`Id1`, `c4`.`Id2`, `c4`.`Date`, `c4`.`Level1_Optional_Id1`, `c4`.`Level1_Optional_Id2`, `c4`.`Level1_Required_Id1`, `c4`.`Level1_Required_Id2`, `c4`.`Name`, `c4`.`OneToMany_Optional_Inverse2Id1`, `c4`.`OneToMany_Optional_Inverse2Id2`, `c4`.`OneToMany_Optional_Self_Inverse2Id1`, `c4`.`OneToMany_Optional_Self_Inverse2Id2`, `c4`.`OneToMany_Required_Inverse2Id1`, `c4`.`OneToMany_Required_Inverse2Id2`, `c4`.`OneToMany_Required_Self_Inverse2Id1`, `c4`.`OneToMany_Required_Self_Inverse2Id2`, `c4`.`OneToOne_Optional_PK_Inverse2Id1`, `c4`.`OneToOne_Optional_PK_Inverse2Id2`, `c4`.`OneToOne_Optional_Self2Id1`, `c4`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1`");
+INNER JOIN `CompositeTwos` AS `c4` ON (`c`.`Id1` = `c4`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c4`.`OneToMany_Required_Inverse2Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1`
+""");
         }
 
         public override async Task Projecting_multiple_collections_same_level_top_level_ordering_using_entire_composite_key(bool async)
         {
             await base.Projecting_multiple_collections_same_level_top_level_ordering_using_entire_composite_key(async);
 
-            AssertSql(
-                @"SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-ORDER BY `c`.`Id2`, `c`.`Id1` DESC",
+ORDER BY `c`.`Id2`, `c`.`Id1` DESC
+""",
                 //
-                @"SELECT `c0`.`Id1`, `c0`.`Id2`, `c0`.`Date`, `c0`.`Level1_Optional_Id1`, `c0`.`Level1_Optional_Id2`, `c0`.`Level1_Required_Id1`, `c0`.`Level1_Required_Id2`, `c0`.`Name`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`, `c0`.`OneToMany_Optional_Self_Inverse2Id1`, `c0`.`OneToMany_Optional_Self_Inverse2Id2`, `c0`.`OneToMany_Required_Inverse2Id1`, `c0`.`OneToMany_Required_Inverse2Id2`, `c0`.`OneToMany_Required_Self_Inverse2Id1`, `c0`.`OneToMany_Required_Self_Inverse2Id2`, `c0`.`OneToOne_Optional_PK_Inverse2Id1`, `c0`.`OneToOne_Optional_PK_Inverse2Id2`, `c0`.`OneToOne_Optional_Self2Id1`, `c0`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
+                """
+SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Date`, `c2`.`Level1_Optional_Id1`, `c2`.`Level1_Optional_Id2`, `c2`.`Level1_Required_Id1`, `c2`.`Level1_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse2Id1`, `c2`.`OneToMany_Optional_Inverse2Id2`, `c2`.`OneToMany_Optional_Self_Inverse2Id1`, `c2`.`OneToMany_Optional_Self_Inverse2Id2`, `c2`.`OneToMany_Required_Inverse2Id1`, `c2`.`OneToMany_Required_Inverse2Id2`, `c2`.`OneToMany_Required_Self_Inverse2Id1`, `c2`.`OneToMany_Required_Self_Inverse2Id2`, `c2`.`OneToOne_Optional_PK_Inverse2Id1`, `c2`.`OneToOne_Optional_PK_Inverse2Id2`, `c2`.`OneToOne_Optional_Self2Id1`, `c2`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1` DESC",
+INNER JOIN `CompositeTwos` AS `c2` ON (`c`.`Id1` = `c2`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c2`.`OneToMany_Optional_Inverse2Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1` DESC
+""",
                 //
-                @"SELECT `c0`.`Id1`, `c0`.`Id2`, `c0`.`Date`, `c0`.`Level1_Optional_Id1`, `c0`.`Level1_Optional_Id2`, `c0`.`Level1_Required_Id1`, `c0`.`Level1_Required_Id2`, `c0`.`Name`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`, `c0`.`OneToMany_Optional_Self_Inverse2Id1`, `c0`.`OneToMany_Optional_Self_Inverse2Id2`, `c0`.`OneToMany_Required_Inverse2Id1`, `c0`.`OneToMany_Required_Inverse2Id2`, `c0`.`OneToMany_Required_Self_Inverse2Id1`, `c0`.`OneToMany_Required_Self_Inverse2Id2`, `c0`.`OneToOne_Optional_PK_Inverse2Id1`, `c0`.`OneToOne_Optional_PK_Inverse2Id2`, `c0`.`OneToOne_Optional_Self2Id1`, `c0`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
+                """
+SELECT `c4`.`Id1`, `c4`.`Id2`, `c4`.`Date`, `c4`.`Level1_Optional_Id1`, `c4`.`Level1_Optional_Id2`, `c4`.`Level1_Required_Id1`, `c4`.`Level1_Required_Id2`, `c4`.`Name`, `c4`.`OneToMany_Optional_Inverse2Id1`, `c4`.`OneToMany_Optional_Inverse2Id2`, `c4`.`OneToMany_Optional_Self_Inverse2Id1`, `c4`.`OneToMany_Optional_Self_Inverse2Id2`, `c4`.`OneToMany_Required_Inverse2Id1`, `c4`.`OneToMany_Required_Inverse2Id2`, `c4`.`OneToMany_Required_Self_Inverse2Id1`, `c4`.`OneToMany_Required_Self_Inverse2Id2`, `c4`.`OneToOne_Optional_PK_Inverse2Id1`, `c4`.`OneToOne_Optional_PK_Inverse2Id2`, `c4`.`OneToOne_Optional_Self2Id1`, `c4`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1` DESC");
+INNER JOIN `CompositeTwos` AS `c4` ON (`c`.`Id1` = `c4`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c4`.`OneToMany_Required_Inverse2Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1` DESC
+""");
         }
 
         public override async Task Projecting_multiple_collections_with_ordering_same_level(bool async)
         {
             await base.Projecting_multiple_collections_with_ordering_same_level(async);
 
-            AssertSql(
-                @"SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-ORDER BY `c`.`Id1`, `c`.`Id2`",
+ORDER BY `c`.`Id1`, `c`.`Id2`
+""",
                 //
-                @"SELECT `c0`.`Id1`, `c0`.`Id2`, `c0`.`Date`, `c0`.`Level1_Optional_Id1`, `c0`.`Level1_Optional_Id2`, `c0`.`Level1_Required_Id1`, `c0`.`Level1_Required_Id2`, `c0`.`Name`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`, `c0`.`OneToMany_Optional_Self_Inverse2Id1`, `c0`.`OneToMany_Optional_Self_Inverse2Id2`, `c0`.`OneToMany_Required_Inverse2Id1`, `c0`.`OneToMany_Required_Inverse2Id2`, `c0`.`OneToMany_Required_Self_Inverse2Id1`, `c0`.`OneToMany_Required_Self_Inverse2Id2`, `c0`.`OneToOne_Optional_PK_Inverse2Id1`, `c0`.`OneToOne_Optional_PK_Inverse2Id2`, `c0`.`OneToOne_Optional_Self2Id1`, `c0`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
+                """
+SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Date`, `c2`.`Level1_Optional_Id1`, `c2`.`Level1_Optional_Id2`, `c2`.`Level1_Required_Id1`, `c2`.`Level1_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse2Id1`, `c2`.`OneToMany_Optional_Inverse2Id2`, `c2`.`OneToMany_Optional_Self_Inverse2Id1`, `c2`.`OneToMany_Optional_Self_Inverse2Id2`, `c2`.`OneToMany_Required_Inverse2Id1`, `c2`.`OneToMany_Required_Inverse2Id2`, `c2`.`OneToMany_Required_Self_Inverse2Id1`, `c2`.`OneToMany_Required_Self_Inverse2Id2`, `c2`.`OneToOne_Optional_PK_Inverse2Id1`, `c2`.`OneToOne_Optional_PK_Inverse2Id2`, `c2`.`OneToOne_Optional_Self2Id1`, `c2`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Id2`",
+INNER JOIN `CompositeTwos` AS `c2` ON (`c`.`Id1` = `c2`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c2`.`OneToMany_Optional_Inverse2Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c2`.`Id2`
+""",
                 //
-                @"SELECT `c0`.`Id1`, `c0`.`Id2`, `c0`.`Date`, `c0`.`Level1_Optional_Id1`, `c0`.`Level1_Optional_Id2`, `c0`.`Level1_Required_Id1`, `c0`.`Level1_Required_Id2`, `c0`.`Name`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`, `c0`.`OneToMany_Optional_Self_Inverse2Id1`, `c0`.`OneToMany_Optional_Self_Inverse2Id2`, `c0`.`OneToMany_Required_Inverse2Id1`, `c0`.`OneToMany_Required_Inverse2Id2`, `c0`.`OneToMany_Required_Self_Inverse2Id1`, `c0`.`OneToMany_Required_Self_Inverse2Id2`, `c0`.`OneToOne_Optional_PK_Inverse2Id1`, `c0`.`OneToOne_Optional_PK_Inverse2Id2`, `c0`.`OneToOne_Optional_Self2Id1`, `c0`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
+                """
+SELECT `c4`.`Id1`, `c4`.`Id2`, `c4`.`Date`, `c4`.`Level1_Optional_Id1`, `c4`.`Level1_Optional_Id2`, `c4`.`Level1_Required_Id1`, `c4`.`Level1_Required_Id2`, `c4`.`Name`, `c4`.`OneToMany_Optional_Inverse2Id1`, `c4`.`OneToMany_Optional_Inverse2Id2`, `c4`.`OneToMany_Optional_Self_Inverse2Id1`, `c4`.`OneToMany_Optional_Self_Inverse2Id2`, `c4`.`OneToMany_Required_Inverse2Id1`, `c4`.`OneToMany_Required_Inverse2Id2`, `c4`.`OneToMany_Required_Self_Inverse2Id1`, `c4`.`OneToMany_Required_Self_Inverse2Id2`, `c4`.`OneToOne_Optional_PK_Inverse2Id1`, `c4`.`OneToOne_Optional_PK_Inverse2Id2`, `c4`.`OneToOne_Optional_Self2Id1`, `c4`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-ORDER BY `c`.`Id1`, `c`.`Id2`, `c0`.`Name` DESC");
+INNER JOIN `CompositeTwos` AS `c4` ON (`c`.`Id1` = `c4`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c4`.`OneToMany_Required_Inverse2Id2`)
+ORDER BY `c`.`Id1`, `c`.`Id2`, `c4`.`Name` DESC
+""");
         }
 
         public override async Task Projecting_multiple_collections_with_ordering_same_level_top_level_ordering(bool async)
         {
             await base.Projecting_multiple_collections_with_ordering_same_level_top_level_ordering(async);
 
-            AssertSql(
-                @"SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-ORDER BY `c`.`Id2`, `c`.`Id1`",
+ORDER BY `c`.`Id2`, `c`.`Id1`
+""",
                 //
-                @"SELECT `c0`.`Id1`, `c0`.`Id2`, `c0`.`Date`, `c0`.`Level1_Optional_Id1`, `c0`.`Level1_Optional_Id2`, `c0`.`Level1_Required_Id1`, `c0`.`Level1_Required_Id2`, `c0`.`Name`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`, `c0`.`OneToMany_Optional_Self_Inverse2Id1`, `c0`.`OneToMany_Optional_Self_Inverse2Id2`, `c0`.`OneToMany_Required_Inverse2Id1`, `c0`.`OneToMany_Required_Inverse2Id2`, `c0`.`OneToMany_Required_Self_Inverse2Id1`, `c0`.`OneToMany_Required_Self_Inverse2Id2`, `c0`.`OneToOne_Optional_PK_Inverse2Id1`, `c0`.`OneToOne_Optional_PK_Inverse2Id2`, `c0`.`OneToOne_Optional_Self2Id1`, `c0`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
+                """
+SELECT `c2`.`Id1`, `c2`.`Id2`, `c2`.`Date`, `c2`.`Level1_Optional_Id1`, `c2`.`Level1_Optional_Id2`, `c2`.`Level1_Required_Id1`, `c2`.`Level1_Required_Id2`, `c2`.`Name`, `c2`.`OneToMany_Optional_Inverse2Id1`, `c2`.`OneToMany_Optional_Inverse2Id2`, `c2`.`OneToMany_Optional_Self_Inverse2Id1`, `c2`.`OneToMany_Optional_Self_Inverse2Id2`, `c2`.`OneToMany_Required_Inverse2Id1`, `c2`.`OneToMany_Required_Inverse2Id2`, `c2`.`OneToMany_Required_Self_Inverse2Id1`, `c2`.`OneToMany_Required_Self_Inverse2Id2`, `c2`.`OneToOne_Optional_PK_Inverse2Id1`, `c2`.`OneToOne_Optional_PK_Inverse2Id2`, `c2`.`OneToOne_Optional_Self2Id1`, `c2`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Optional_Inverse2Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1`, `c0`.`Id2`",
+INNER JOIN `CompositeTwos` AS `c2` ON (`c`.`Id1` = `c2`.`OneToMany_Optional_Inverse2Id1`) AND (`c`.`Id2` = `c2`.`OneToMany_Optional_Inverse2Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1`, `c2`.`Id2`
+""",
                 //
-                @"SELECT `c0`.`Id1`, `c0`.`Id2`, `c0`.`Date`, `c0`.`Level1_Optional_Id1`, `c0`.`Level1_Optional_Id2`, `c0`.`Level1_Required_Id1`, `c0`.`Level1_Required_Id2`, `c0`.`Name`, `c0`.`OneToMany_Optional_Inverse2Id1`, `c0`.`OneToMany_Optional_Inverse2Id2`, `c0`.`OneToMany_Optional_Self_Inverse2Id1`, `c0`.`OneToMany_Optional_Self_Inverse2Id2`, `c0`.`OneToMany_Required_Inverse2Id1`, `c0`.`OneToMany_Required_Inverse2Id2`, `c0`.`OneToMany_Required_Self_Inverse2Id1`, `c0`.`OneToMany_Required_Self_Inverse2Id2`, `c0`.`OneToOne_Optional_PK_Inverse2Id1`, `c0`.`OneToOne_Optional_PK_Inverse2Id2`, `c0`.`OneToOne_Optional_Self2Id1`, `c0`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
+                """
+SELECT `c4`.`Id1`, `c4`.`Id2`, `c4`.`Date`, `c4`.`Level1_Optional_Id1`, `c4`.`Level1_Optional_Id2`, `c4`.`Level1_Required_Id1`, `c4`.`Level1_Required_Id2`, `c4`.`Name`, `c4`.`OneToMany_Optional_Inverse2Id1`, `c4`.`OneToMany_Optional_Inverse2Id2`, `c4`.`OneToMany_Optional_Self_Inverse2Id1`, `c4`.`OneToMany_Optional_Self_Inverse2Id2`, `c4`.`OneToMany_Required_Inverse2Id1`, `c4`.`OneToMany_Required_Inverse2Id2`, `c4`.`OneToMany_Required_Self_Inverse2Id1`, `c4`.`OneToMany_Required_Self_Inverse2Id2`, `c4`.`OneToOne_Optional_PK_Inverse2Id1`, `c4`.`OneToOne_Optional_PK_Inverse2Id2`, `c4`.`OneToOne_Optional_Self2Id1`, `c4`.`OneToOne_Optional_Self2Id2`, `c`.`Id1`, `c`.`Id2`
 FROM `CompositeOnes` AS `c`
-INNER JOIN `CompositeTwos` AS `c0` ON (`c`.`Id1` = `c0`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c0`.`OneToMany_Required_Inverse2Id2`)
-ORDER BY `c`.`Id2`, `c`.`Id1`, `c0`.`Name` DESC");
+INNER JOIN `CompositeTwos` AS `c4` ON (`c`.`Id1` = `c4`.`OneToMany_Required_Inverse2Id1`) AND (`c`.`Id2` = `c4`.`OneToMany_Required_Inverse2Id2`)
+ORDER BY `c`.`Id2`, `c`.`Id1`, `c4`.`Name` DESC
+""");
         }
 
         private void AssertSql(params string[] expected)
diff --git a/test/EFCore.MySql.FunctionalTests/Query/Ef6GroupByMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/Ef6GroupByMySqlTest.cs
index 1810b87fc..cbb747070 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/Ef6GroupByMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/Ef6GroupByMySqlTest.cs
@@ -487,15 +487,15 @@ public override async Task Group_Join_from_LINQ_101(bool async)
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`CompanyName`, `c`.`Region`, `t`.`Id`, `t`.`CustomerId`, `t`.`OrderDate`, `t`.`Total`, `t`.`Id0`
+SELECT `c`.`Id`, `c`.`CompanyName`, `c`.`Region`, `s`.`Id`, `s`.`CustomerId`, `s`.`OrderDate`, `s`.`Total`, `s`.`Id0`
 FROM `CustomerForLinq` AS `c`
 LEFT JOIN LATERAL (
     SELECT `o`.`Id`, `o`.`CustomerId`, `o`.`OrderDate`, `o`.`Total`, `c0`.`Id` AS `Id0`
     FROM `OrderForLinq` AS `o`
     LEFT JOIN `CustomerForLinq` AS `c0` ON `o`.`CustomerId` = `c0`.`Id`
     WHERE `c`.`Id` = `c0`.`Id`
-) AS `t` ON TRUE
-ORDER BY `c`.`Id`, `t`.`Id`
+) AS `s` ON TRUE
+ORDER BY `c`.`Id`, `s`.`Id`
 """);
     }
 
@@ -558,22 +558,22 @@ public override async Task Whats_new_2021_sample_15(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Age`, `t0`.`FirstName`, `t0`.`LastName`, `t0`.`MiddleInitial`
+SELECT `s1`.`Id`, `s1`.`Age`, `s1`.`FirstName`, `s1`.`LastName`, `s1`.`MiddleInitial`
 FROM (
     SELECT `f`.`Id`, `f`.`Size`
     FROM `Person` AS `p`
     LEFT JOIN `Feet` AS `f` ON `p`.`Id` = `f`.`Id`
     GROUP BY `f`.`Id`, `f`.`Size`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Age`, `t1`.`FirstName`, `t1`.`LastName`, `t1`.`MiddleInitial`, `t1`.`Id0`, `t1`.`Size`
+    SELECT `s0`.`Id`, `s0`.`Age`, `s0`.`FirstName`, `s0`.`LastName`, `s0`.`MiddleInitial`, `s0`.`Id0`, `s0`.`Size`
     FROM (
         SELECT `p0`.`Id`, `p0`.`Age`, `p0`.`FirstName`, `p0`.`LastName`, `p0`.`MiddleInitial`, `f0`.`Id` AS `Id0`, `f0`.`Size`, ROW_NUMBER() OVER(PARTITION BY `f0`.`Id`, `f0`.`Size` ORDER BY `p0`.`Id` DESC) AS `row`
         FROM `Person` AS `p0`
         LEFT JOIN `Feet` AS `f0` ON `p0`.`Id` = `f0`.`Id`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON ((`t`.`Id` = `t0`.`Id0`) OR (`t`.`Id` IS NULL AND (`t0`.`Id0` IS NULL))) AND ((`t`.`Size` = `t0`.`Size`) OR (`t`.`Size` IS NULL AND (`t0`.`Size` IS NULL)))
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON ((`s`.`Id` = `s1`.`Id0`) OR (`s`.`Id` IS NULL AND (`s1`.`Id0` IS NULL))) AND ((`s`.`Size` = `s1`.`Size`) OR (`s`.`Size` IS NULL AND (`s1`.`Size` IS NULL)))
 """);
     }
 
@@ -616,11 +616,11 @@ public override async Task Whats_new_2021_sample_8(bool async)
 """
 SELECT COUNT(*)
 FROM (
-    SELECT `f`.`Id`, `f`.`Size`
+    SELECT 1
     FROM `Person` AS `p`
     LEFT JOIN `Feet` AS `f` ON `p`.`Id` = `f`.`Id`
     GROUP BY `f`.`Id`, `f`.`Size`
-) AS `t`
+) AS `s`
 """);
     }
 
@@ -630,18 +630,18 @@ public override async Task Whats_new_2021_sample_12(bool async)
 
         AssertSql(
 """
-SELECT `t`.`FirstName`, `t0`.`Id`, `t0`.`Age`, `t0`.`FirstName`, `t0`.`LastName`, `t0`.`MiddleInitial`, `t0`.`Id0`, `t0`.`Age0`, `t0`.`PersonId`, `t0`.`Style`
+SELECT `p1`.`FirstName`, `s0`.`Id`, `s0`.`Age`, `s0`.`FirstName`, `s0`.`LastName`, `s0`.`MiddleInitial`, `s0`.`Id0`, `s0`.`Age0`, `s0`.`PersonId`, `s0`.`Style`
 FROM (
     SELECT `p`.`FirstName`
     FROM `Person` AS `p`
     GROUP BY `p`.`FirstName`
-) AS `t`
+) AS `p1`
 LEFT JOIN (
     SELECT `p0`.`Id`, `p0`.`Age`, `p0`.`FirstName`, `p0`.`LastName`, `p0`.`MiddleInitial`, `s`.`Id` AS `Id0`, `s`.`Age` AS `Age0`, `s`.`PersonId`, `s`.`Style`
     FROM `Person` AS `p0`
     LEFT JOIN `Shoes` AS `s` ON `p0`.`Id` = `s`.`PersonId`
-) AS `t0` ON `t`.`FirstName` = `t0`.`FirstName`
-ORDER BY `t`.`FirstName`, `t0`.`Id`
+) AS `s0` ON `p1`.`FirstName` = `s0`.`FirstName`
+ORDER BY `p1`.`FirstName`, `s0`.`Id`
 """);
     }
 
@@ -651,19 +651,19 @@ public override async Task Whats_new_2021_sample_10(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Age`, `t`.`Style`, `t0`.`Id`, `t0`.`Style`, `t0`.`Age`, `t0`.`Id0`
+SELECT `s1`.`Id`, `s1`.`Age`, `s1`.`Style`, `s2`.`Id`, `s2`.`Style`, `s2`.`Age`, `s2`.`Id0`
 FROM (
     SELECT `p`.`Id`, `s`.`Age`, `s`.`Style`
     FROM `Person` AS `p`
     INNER JOIN `Shoes` AS `s` ON `p`.`Age` = `s`.`Age`
     GROUP BY `p`.`Id`, `s`.`Style`, `s`.`Age`
-) AS `t`
+) AS `s1`
 LEFT JOIN (
     SELECT `s0`.`Id`, `s0`.`Style`, `s0`.`Age`, `p0`.`Id` AS `Id0`
     FROM `Person` AS `p0`
     INNER JOIN `Shoes` AS `s0` ON `p0`.`Age` = `s0`.`Age`
-) AS `t0` ON ((`t`.`Id` = `t0`.`Id0`) AND ((`t`.`Style` = `t0`.`Style`) OR (`t`.`Style` IS NULL AND (`t0`.`Style` IS NULL)))) AND (`t`.`Age` = `t0`.`Age`)
-ORDER BY `t`.`Id`, `t`.`Style`, `t`.`Age`, `t0`.`Id0`
+) AS `s2` ON ((`s1`.`Id` = `s2`.`Id0`) AND ((`s1`.`Style` = `s2`.`Style`) OR (`s1`.`Style` IS NULL AND (`s2`.`Style` IS NULL)))) AND (`s1`.`Age` = `s2`.`Age`)
+ORDER BY `s1`.`Id`, `s1`.`Style`, `s1`.`Age`, `s2`.`Id0`
 """);
     }
 
@@ -673,14 +673,14 @@ public override async Task Whats_new_2021_sample_13(bool async)
 
         AssertSql(
 """
-SELECT `t`.`FirstName`, `t`.`MiddleInitial`, `p0`.`Id`, `p0`.`Age`, `p0`.`FirstName`, `p0`.`LastName`, `p0`.`MiddleInitial`
+SELECT `p1`.`FirstName`, `p1`.`MiddleInitial`, `p0`.`Id`, `p0`.`Age`, `p0`.`FirstName`, `p0`.`LastName`, `p0`.`MiddleInitial`
 FROM (
     SELECT `p`.`FirstName`, `p`.`MiddleInitial`
     FROM `Person` AS `p`
     GROUP BY `p`.`FirstName`, `p`.`MiddleInitial`
-) AS `t`
-LEFT JOIN `Person` AS `p0` ON ((`t`.`FirstName` = `p0`.`FirstName`) OR (`t`.`FirstName` IS NULL AND (`p0`.`FirstName` IS NULL))) AND ((`t`.`MiddleInitial` = `p0`.`MiddleInitial`) OR (`t`.`MiddleInitial` IS NULL AND (`p0`.`MiddleInitial` IS NULL)))
-ORDER BY `t`.`FirstName`, `t`.`MiddleInitial`, `p0`.`Id`
+) AS `p1`
+LEFT JOIN `Person` AS `p0` ON ((`p1`.`FirstName` = `p0`.`FirstName`) OR (`p1`.`FirstName` IS NULL AND (`p0`.`FirstName` IS NULL))) AND ((`p1`.`MiddleInitial` = `p0`.`MiddleInitial`) OR (`p1`.`MiddleInitial` IS NULL AND (`p0`.`MiddleInitial` IS NULL)))
+ORDER BY `p1`.`FirstName`, `p1`.`MiddleInitial`, `p0`.`Id`
 """);
     }
 
@@ -690,13 +690,13 @@ public override async Task Cross_Join_with_Group_Join_from_LINQ_101(bool async)
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`CompanyName`, `c`.`Region`, `t`.`Id`
+SELECT `c`.`Id`, `c`.`CompanyName`, `c`.`Region`, `s`.`Id`
 FROM `CustomerForLinq` AS `c`
 INNER JOIN (
     SELECT `o`.`Id`, `c0`.`Id` AS `Id0`
     FROM `OrderForLinq` AS `o`
     LEFT JOIN `CustomerForLinq` AS `c0` ON `o`.`CustomerId` = `c0`.`Id`
-) AS `t` ON `c`.`Id` = `t`.`Id0`
+) AS `s` ON `c`.`Id` = `s`.`Id0`
 """);
     }
 
@@ -706,23 +706,23 @@ public override async Task Whats_new_2021_sample_2(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`FirstName`, `t0`.`FullName`, `t0`.`c`
+SELECT `p3`.`FirstName`, `p3`.`FullName`, `p3`.`c`
 FROM (
     SELECT `p`.`FirstName`
     FROM `Person` AS `p`
     GROUP BY `p`.`FirstName`
     ORDER BY `p`.`FirstName`
     LIMIT 1
-) AS `t`
+) AS `p1`
 LEFT JOIN (
-    SELECT `t1`.`FirstName`, `t1`.`FullName`, `t1`.`c`
+    SELECT `p2`.`FirstName`, `p2`.`FullName`, `p2`.`c`
     FROM (
         SELECT `p0`.`FirstName`, CONCAT(CONCAT(CONCAT(CONCAT(COALESCE(`p0`.`FirstName`, ''), ' '), COALESCE(`p0`.`MiddleInitial`, '')), ' '), COALESCE(`p0`.`LastName`, '')) AS `FullName`, 1 AS `c`, ROW_NUMBER() OVER(PARTITION BY `p0`.`FirstName` ORDER BY `p0`.`Id`) AS `row`
         FROM `Person` AS `p0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`FirstName` = `t0`.`FirstName`
-ORDER BY `t`.`FirstName`
+    ) AS `p2`
+    WHERE `p2`.`row` <= 1
+) AS `p3` ON `p1`.`FirstName` = `p3`.`FirstName`
+ORDER BY `p1`.`FirstName`
 """);
     }
 
@@ -732,22 +732,22 @@ public override async Task Whats_new_2021_sample_1(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Age`, `t0`.`FirstName`, `t0`.`LastName`, `t0`.`MiddleInitial`, `t`.`FirstName`, `s`.`Id`, `s`.`Age`, `s`.`PersonId`, `s`.`Style`
+SELECT `p3`.`Id`, `p3`.`Age`, `p3`.`FirstName`, `p3`.`LastName`, `p3`.`MiddleInitial`, `p1`.`FirstName`, `s`.`Id`, `s`.`Age`, `s`.`PersonId`, `s`.`Style`
 FROM (
     SELECT `p`.`FirstName`
     FROM `Person` AS `p`
     GROUP BY `p`.`FirstName`
-) AS `t`
+) AS `p1`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Age`, `t1`.`FirstName`, `t1`.`LastName`, `t1`.`MiddleInitial`
+    SELECT `p2`.`Id`, `p2`.`Age`, `p2`.`FirstName`, `p2`.`LastName`, `p2`.`MiddleInitial`
     FROM (
         SELECT `p0`.`Id`, `p0`.`Age`, `p0`.`FirstName`, `p0`.`LastName`, `p0`.`MiddleInitial`, ROW_NUMBER() OVER(PARTITION BY `p0`.`FirstName` ORDER BY `p0`.`FirstName`, `p0`.`LastName`) AS `row`
         FROM `Person` AS `p0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`FirstName` = `t0`.`FirstName`
-LEFT JOIN `Shoes` AS `s` ON `t0`.`Id` = `s`.`PersonId`
-ORDER BY `t`.`FirstName`, `t0`.`Id`
+    ) AS `p2`
+    WHERE `p2`.`row` <= 1
+) AS `p3` ON `p1`.`FirstName` = `p3`.`FirstName`
+LEFT JOIN `Shoes` AS `s` ON `p3`.`Id` = `s`.`PersonId`
+ORDER BY `p1`.`FirstName`, `p3`.`Id`
 """);
     }
 
@@ -850,18 +850,18 @@ public override async Task Left_Outer_Join_with_Group_Join_from_LINQ_101(bool as
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`CompanyName`, `c`.`Region`, `t`.`Id`, `t`.`Id0`, `o0`.`Id`, `o0`.`CustomerId`, `o0`.`OrderDate`, `o0`.`Total`, CASE
-    WHEN `t`.`Id` IS NULL THEN -1
-    ELSE `t`.`Id`
+SELECT `c`.`Id`, `c`.`CompanyName`, `c`.`Region`, `s`.`Id`, `s`.`Id0`, `o0`.`Id`, `o0`.`CustomerId`, `o0`.`OrderDate`, `o0`.`Total`, CASE
+    WHEN `s`.`Id` IS NULL THEN -1
+    ELSE `s`.`Id`
 END
 FROM `CustomerForLinq` AS `c`
 LEFT JOIN (
     SELECT `o`.`Id`, `c0`.`Id` AS `Id0`
     FROM `OrderForLinq` AS `o`
     LEFT JOIN `CustomerForLinq` AS `c0` ON `o`.`CustomerId` = `c0`.`Id`
-) AS `t` ON `c`.`Id` = `t`.`Id0`
+) AS `s` ON `c`.`Id` = `s`.`Id0`
 LEFT JOIN `OrderForLinq` AS `o0` ON `c`.`Id` = `o0`.`CustomerId`
-ORDER BY `c`.`Id`, `t`.`Id`, `t`.`Id0`
+ORDER BY `c`.`Id`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -883,29 +883,29 @@ public override async Task Whats_new_2021_sample_11(bool async)
 
         AssertSql(
 """
-SELECT `t`.`LastName`, `t`.`c`, `t0`.`Id`, `t2`.`Id`, `t2`.`Age`, `t2`.`FirstName`, `t2`.`LastName`, `t2`.`MiddleInitial`, `t0`.`Age`, `t0`.`FirstName`, `t0`.`LastName`, `t0`.`MiddleInitial`
+SELECT `p2`.`LastName`, `p2`.`c`, `p4`.`Id`, `p6`.`Id`, `p6`.`Age`, `p6`.`FirstName`, `p6`.`LastName`, `p6`.`MiddleInitial`, `p4`.`Age`, `p4`.`FirstName`, `p4`.`LastName`, `p4`.`MiddleInitial`
 FROM (
     SELECT `p`.`LastName`, COUNT(*) AS `c`
     FROM `Person` AS `p`
     GROUP BY `p`.`LastName`
-) AS `t`
+) AS `p2`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Age`, `t1`.`FirstName`, `t1`.`LastName`, `t1`.`MiddleInitial`
+    SELECT `p3`.`Id`, `p3`.`Age`, `p3`.`FirstName`, `p3`.`LastName`, `p3`.`MiddleInitial`
     FROM (
         SELECT `p0`.`Id`, `p0`.`Age`, `p0`.`FirstName`, `p0`.`LastName`, `p0`.`MiddleInitial`, ROW_NUMBER() OVER(PARTITION BY `p0`.`LastName` ORDER BY `p0`.`Id`) AS `row`
         FROM `Person` AS `p0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`LastName` = `t0`.`LastName`
+    ) AS `p3`
+    WHERE `p3`.`row` <= 1
+) AS `p4` ON `p2`.`LastName` = `p4`.`LastName`
 LEFT JOIN (
-    SELECT `t3`.`Id`, `t3`.`Age`, `t3`.`FirstName`, `t3`.`LastName`, `t3`.`MiddleInitial`
+    SELECT `p5`.`Id`, `p5`.`Age`, `p5`.`FirstName`, `p5`.`LastName`, `p5`.`MiddleInitial`
     FROM (
         SELECT `p1`.`Id`, `p1`.`Age`, `p1`.`FirstName`, `p1`.`LastName`, `p1`.`MiddleInitial`, ROW_NUMBER() OVER(PARTITION BY `p1`.`LastName` ORDER BY `p1`.`Id`) AS `row`
         FROM `Person` AS `p1`
-    ) AS `t3`
-    WHERE `t3`.`row` <= 2
-) AS `t2` ON `t`.`LastName` = `t2`.`LastName`
-ORDER BY `t`.`LastName` DESC, `t0`.`Id`, `t2`.`LastName`, `t2`.`Id`
+    ) AS `p5`
+    WHERE `p5`.`row` <= 2
+) AS `p6` ON `p2`.`LastName` = `p6`.`LastName`
+ORDER BY `p2`.`LastName` DESC, `p4`.`Id`, `p6`.`LastName`, `p6`.`Id`
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/EntitySplittingQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/EntitySplittingQueryMySqlTest.cs
index 16693507e..4240725e0 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/EntitySplittingQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/EntitySplittingQueryMySqlTest.cs
@@ -60,9 +60,9 @@ public override async Task Can_query_entity_which_is_split_selecting_only_part_2
 
         AssertSql(
 """
-SELECT `e`.`Id`, `s0`.`IntValue3`, `s0`.`StringValue3`
+SELECT `e`.`Id`, `s`.`IntValue3`, `s`.`StringValue3`
 FROM `EntityOne` AS `e`
-INNER JOIN `SplitEntityOnePart2` AS `s0` ON `e`.`Id` = `s0`.`Id`
+INNER JOIN `SplitEntityOnePart2` AS `s` ON `e`.`Id` = `s`.`Id`
 """);
     }
 
@@ -84,14 +84,14 @@ public override async Task Include_reference_to_split_entity(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`EntityOneId`, `e`.`Name`, `t`.`Id`, `t`.`EntityThreeId`, `t`.`IntValue1`, `t`.`IntValue2`, `t`.`IntValue3`, `t`.`IntValue4`, `t`.`StringValue1`, `t`.`StringValue2`, `t`.`StringValue3`, `t`.`StringValue4`
+SELECT `e`.`Id`, `e`.`EntityOneId`, `e`.`Name`, `s1`.`Id`, `s1`.`EntityThreeId`, `s1`.`IntValue1`, `s1`.`IntValue2`, `s1`.`IntValue3`, `s1`.`IntValue4`, `s1`.`StringValue1`, `s1`.`StringValue2`, `s1`.`StringValue3`, `s1`.`StringValue4`
 FROM `EntityTwo` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`EntityThreeId`, `e0`.`IntValue1`, `e0`.`IntValue2`, `s0`.`IntValue3`, `s`.`IntValue4`, `e0`.`StringValue1`, `e0`.`StringValue2`, `s0`.`StringValue3`, `s`.`StringValue4`
     FROM `EntityOne` AS `e0`
     INNER JOIN `SplitEntityOnePart3` AS `s` ON `e0`.`Id` = `s`.`Id`
     INNER JOIN `SplitEntityOnePart2` AS `s0` ON `e0`.`Id` = `s0`.`Id`
-) AS `t` ON `e`.`EntityOneId` = `t`.`Id`
+) AS `s1` ON `e`.`EntityOneId` = `s1`.`Id`
 """);
     }
 
@@ -101,14 +101,14 @@ public override async Task Include_collection_to_split_entity(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t`.`Id`, `t`.`EntityThreeId`, `t`.`IntValue1`, `t`.`IntValue2`, `t`.`IntValue3`, `t`.`IntValue4`, `t`.`StringValue1`, `t`.`StringValue2`, `t`.`StringValue3`, `t`.`StringValue4`
+SELECT `e`.`Id`, `e`.`Name`, `s1`.`Id`, `s1`.`EntityThreeId`, `s1`.`IntValue1`, `s1`.`IntValue2`, `s1`.`IntValue3`, `s1`.`IntValue4`, `s1`.`StringValue1`, `s1`.`StringValue2`, `s1`.`StringValue3`, `s1`.`StringValue4`
 FROM `EntityThree` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`EntityThreeId`, `e0`.`IntValue1`, `e0`.`IntValue2`, `s0`.`IntValue3`, `s`.`IntValue4`, `e0`.`StringValue1`, `e0`.`StringValue2`, `s0`.`StringValue3`, `s`.`StringValue4`
     FROM `EntityOne` AS `e0`
     INNER JOIN `SplitEntityOnePart3` AS `s` ON `e0`.`Id` = `s`.`Id`
     INNER JOIN `SplitEntityOnePart2` AS `s0` ON `e0`.`Id` = `s0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`EntityThreeId`
+) AS `s1` ON `e`.`Id` = `s1`.`EntityThreeId`
 ORDER BY `e`.`Id`
 """);
     }
@@ -119,15 +119,15 @@ public override async Task Include_reference_to_split_entity_including_reference
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`EntityOneId`, `e`.`Name`, `t`.`Id`, `t`.`EntityThreeId`, `t`.`IntValue1`, `t`.`IntValue2`, `t`.`IntValue3`, `t`.`IntValue4`, `t`.`StringValue1`, `t`.`StringValue2`, `t`.`StringValue3`, `t`.`StringValue4`, `e1`.`Id`, `e1`.`Name`
+SELECT `e`.`Id`, `e`.`EntityOneId`, `e`.`Name`, `s1`.`Id`, `s1`.`EntityThreeId`, `s1`.`IntValue1`, `s1`.`IntValue2`, `s1`.`IntValue3`, `s1`.`IntValue4`, `s1`.`StringValue1`, `s1`.`StringValue2`, `s1`.`StringValue3`, `s1`.`StringValue4`, `e1`.`Id`, `e1`.`Name`
 FROM `EntityTwo` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`EntityThreeId`, `e0`.`IntValue1`, `e0`.`IntValue2`, `s0`.`IntValue3`, `s`.`IntValue4`, `e0`.`StringValue1`, `e0`.`StringValue2`, `s0`.`StringValue3`, `s`.`StringValue4`
     FROM `EntityOne` AS `e0`
     INNER JOIN `SplitEntityOnePart3` AS `s` ON `e0`.`Id` = `s`.`Id`
     INNER JOIN `SplitEntityOnePart2` AS `s0` ON `e0`.`Id` = `s0`.`Id`
-) AS `t` ON `e`.`EntityOneId` = `t`.`Id`
-LEFT JOIN `EntityThree` AS `e1` ON `t`.`EntityThreeId` = `e1`.`Id`
+) AS `s1` ON `e`.`EntityOneId` = `s1`.`Id`
+LEFT JOIN `EntityThree` AS `e1` ON `s1`.`EntityThreeId` = `e1`.`Id`
 """);
     }
 
@@ -137,7 +137,7 @@ public override async Task Include_collection_to_split_entity_including_collecti
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t`.`Id`, `t`.`EntityThreeId`, `t`.`IntValue1`, `t`.`IntValue2`, `t`.`IntValue3`, `t`.`IntValue4`, `t`.`StringValue1`, `t`.`StringValue2`, `t`.`StringValue3`, `t`.`StringValue4`, `t`.`Id0`, `t`.`EntityOneId`, `t`.`Name`
+SELECT `e`.`Id`, `e`.`Name`, `s1`.`Id`, `s1`.`EntityThreeId`, `s1`.`IntValue1`, `s1`.`IntValue2`, `s1`.`IntValue3`, `s1`.`IntValue4`, `s1`.`StringValue1`, `s1`.`StringValue2`, `s1`.`StringValue3`, `s1`.`StringValue4`, `s1`.`Id0`, `s1`.`EntityOneId`, `s1`.`Name`
 FROM `EntityThree` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`EntityThreeId`, `e0`.`IntValue1`, `e0`.`IntValue2`, `s0`.`IntValue3`, `s`.`IntValue4`, `e0`.`StringValue1`, `e0`.`StringValue2`, `s0`.`StringValue3`, `s`.`StringValue4`, `e1`.`Id` AS `Id0`, `e1`.`EntityOneId`, `e1`.`Name`
@@ -145,8 +145,8 @@ LEFT JOIN (
     INNER JOIN `SplitEntityOnePart3` AS `s` ON `e0`.`Id` = `s`.`Id`
     INNER JOIN `SplitEntityOnePart2` AS `s0` ON `e0`.`Id` = `s0`.`Id`
     LEFT JOIN `EntityTwo` AS `e1` ON `e0`.`Id` = `e1`.`EntityOneId`
-) AS `t` ON `e`.`Id` = `t`.`EntityThreeId`
-ORDER BY `e`.`Id`, `t`.`Id`
+) AS `s1` ON `e`.`Id` = `s1`.`EntityThreeId`
+ORDER BY `e`.`Id`, `s1`.`Id`
 """);
     }
 
@@ -185,9 +185,9 @@ public override async Task Custom_projection_trim_when_multiple_tables(bool asyn
 
         AssertSql(
 """
-SELECT `e`.`IntValue1`, `s0`.`IntValue3`, `e0`.`Id`, `e0`.`Name`
+SELECT `e`.`IntValue1`, `s`.`IntValue3`, `e0`.`Id`, `e0`.`Name`
 FROM `EntityOne` AS `e`
-INNER JOIN `SplitEntityOnePart2` AS `s0` ON `e`.`Id` = `s0`.`Id`
+INNER JOIN `SplitEntityOnePart2` AS `s` ON `e`.`Id` = `s`.`Id`
 LEFT JOIN `EntityThree` AS `e0` ON `e`.`EntityThreeId` = `e0`.`Id`
 """);
     }
@@ -453,7 +453,7 @@ public override async Task Tpc_entity_owning_a_split_reference_on_leaf_with_tabl
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseValue`, `t`.`MiddleValue`, `t`.`SiblingValue`, `t`.`LeafValue`, `t`.`Discriminator`, `l`.`Id`, `l`.`OwnedReference_Id`, `l`.`OwnedReference_OwnedIntValue1`, `l`.`OwnedReference_OwnedIntValue2`, `o0`.`OwnedIntValue3`, `o`.`OwnedIntValue4`, `l`.`OwnedReference_OwnedStringValue1`, `l`.`OwnedReference_OwnedStringValue2`, `o0`.`OwnedStringValue3`, `o`.`OwnedStringValue4`
+SELECT `u`.`Id`, `u`.`BaseValue`, `u`.`MiddleValue`, `u`.`SiblingValue`, `u`.`LeafValue`, `u`.`Discriminator`, `l0`.`Id`, `l0`.`OwnedReference_Id`, `l0`.`OwnedReference_OwnedIntValue1`, `l0`.`OwnedReference_OwnedIntValue2`, `o0`.`OwnedIntValue3`, `o`.`OwnedIntValue4`, `l0`.`OwnedReference_OwnedStringValue1`, `l0`.`OwnedReference_OwnedStringValue2`, `o0`.`OwnedStringValue3`, `o`.`OwnedStringValue4`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseValue`, NULL AS `MiddleValue`, NULL AS `SiblingValue`, NULL AS `LeafValue`, 'BaseEntity' AS `Discriminator`
     FROM `BaseEntity` AS `b`
@@ -464,12 +464,12 @@ UNION ALL
     SELECT `s`.`Id`, `s`.`BaseValue`, NULL AS `MiddleValue`, `s`.`SiblingValue`, NULL AS `LeafValue`, 'SiblingEntity' AS `Discriminator`
     FROM `SiblingEntity` AS `s`
     UNION ALL
-    SELECT `l0`.`Id`, `l0`.`BaseValue`, `l0`.`MiddleValue`, NULL AS `SiblingValue`, `l0`.`LeafValue`, 'LeafEntity' AS `Discriminator`
-    FROM `LeafEntity` AS `l0`
-) AS `t`
-LEFT JOIN `LeafEntity` AS `l` ON `t`.`Id` = `l`.`Id`
-LEFT JOIN `OwnedReferencePart4` AS `o` ON `l`.`Id` = `o`.`LeafEntityId`
-LEFT JOIN `OwnedReferencePart3` AS `o0` ON `l`.`Id` = `o0`.`LeafEntityId`
+    SELECT `l`.`Id`, `l`.`BaseValue`, `l`.`MiddleValue`, NULL AS `SiblingValue`, `l`.`LeafValue`, 'LeafEntity' AS `Discriminator`
+    FROM `LeafEntity` AS `l`
+) AS `u`
+LEFT JOIN `LeafEntity` AS `l0` ON `u`.`Id` = `l0`.`Id`
+LEFT JOIN `OwnedReferencePart4` AS `o` ON `l0`.`Id` = `o`.`LeafEntityId`
+LEFT JOIN `OwnedReferencePart3` AS `o0` ON `l0`.`Id` = `o0`.`LeafEntityId`
 """);
     }
 
@@ -582,7 +582,7 @@ public override async Task Tpc_entity_owning_a_split_reference_on_base_without_t
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseValue`, `t`.`MiddleValue`, `t`.`SiblingValue`, `t`.`LeafValue`, `t`.`Discriminator`, `o`.`BaseEntityId`, `o`.`Id`, `o`.`OwnedIntValue1`, `o`.`OwnedIntValue2`, `o1`.`OwnedIntValue3`, `o0`.`OwnedIntValue4`, `o`.`OwnedStringValue1`, `o`.`OwnedStringValue2`, `o1`.`OwnedStringValue3`, `o0`.`OwnedStringValue4`
+SELECT `u`.`Id`, `u`.`BaseValue`, `u`.`MiddleValue`, `u`.`SiblingValue`, `u`.`LeafValue`, `u`.`Discriminator`, `o`.`BaseEntityId`, `o`.`Id`, `o`.`OwnedIntValue1`, `o`.`OwnedIntValue2`, `o1`.`OwnedIntValue3`, `o0`.`OwnedIntValue4`, `o`.`OwnedStringValue1`, `o`.`OwnedStringValue2`, `o1`.`OwnedStringValue3`, `o0`.`OwnedStringValue4`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseValue`, NULL AS `MiddleValue`, NULL AS `SiblingValue`, NULL AS `LeafValue`, 'BaseEntity' AS `Discriminator`
     FROM `BaseEntity` AS `b`
@@ -595,8 +595,8 @@ UNION ALL
     UNION ALL
     SELECT `l`.`Id`, `l`.`BaseValue`, `l`.`MiddleValue`, NULL AS `SiblingValue`, `l`.`LeafValue`, 'LeafEntity' AS `Discriminator`
     FROM `LeafEntity` AS `l`
-) AS `t`
-LEFT JOIN `OwnedReferencePart1` AS `o` ON `t`.`Id` = `o`.`BaseEntityId`
+) AS `u`
+LEFT JOIN `OwnedReferencePart1` AS `o` ON `u`.`Id` = `o`.`BaseEntityId`
 LEFT JOIN `OwnedReferencePart4` AS `o0` ON `o`.`BaseEntityId` = `o0`.`BaseEntityId`
 LEFT JOIN `OwnedReferencePart3` AS `o1` ON `o`.`BaseEntityId` = `o1`.`BaseEntityId`
 """);
@@ -624,7 +624,7 @@ public override async Task Tpc_entity_owning_a_split_reference_on_middle_without
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseValue`, `t`.`MiddleValue`, `t`.`SiblingValue`, `t`.`LeafValue`, `t`.`Discriminator`, `o`.`MiddleEntityId`, `o`.`Id`, `o`.`OwnedIntValue1`, `o`.`OwnedIntValue2`, `o1`.`OwnedIntValue3`, `o0`.`OwnedIntValue4`, `o`.`OwnedStringValue1`, `o`.`OwnedStringValue2`, `o1`.`OwnedStringValue3`, `o0`.`OwnedStringValue4`
+SELECT `u`.`Id`, `u`.`BaseValue`, `u`.`MiddleValue`, `u`.`SiblingValue`, `u`.`LeafValue`, `u`.`Discriminator`, `o`.`MiddleEntityId`, `o`.`Id`, `o`.`OwnedIntValue1`, `o`.`OwnedIntValue2`, `o1`.`OwnedIntValue3`, `o0`.`OwnedIntValue4`, `o`.`OwnedStringValue1`, `o`.`OwnedStringValue2`, `o1`.`OwnedStringValue3`, `o0`.`OwnedStringValue4`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseValue`, NULL AS `MiddleValue`, NULL AS `SiblingValue`, NULL AS `LeafValue`, 'BaseEntity' AS `Discriminator`
     FROM `BaseEntity` AS `b`
@@ -637,8 +637,8 @@ UNION ALL
     UNION ALL
     SELECT `l`.`Id`, `l`.`BaseValue`, `l`.`MiddleValue`, NULL AS `SiblingValue`, `l`.`LeafValue`, 'LeafEntity' AS `Discriminator`
     FROM `LeafEntity` AS `l`
-) AS `t`
-LEFT JOIN `OwnedReferencePart1` AS `o` ON `t`.`Id` = `o`.`MiddleEntityId`
+) AS `u`
+LEFT JOIN `OwnedReferencePart1` AS `o` ON `u`.`Id` = `o`.`MiddleEntityId`
 LEFT JOIN `OwnedReferencePart4` AS `o0` ON `o`.`MiddleEntityId` = `o0`.`MiddleEntityId`
 LEFT JOIN `OwnedReferencePart3` AS `o1` ON `o`.`MiddleEntityId` = `o1`.`MiddleEntityId`
 """);
@@ -690,7 +690,7 @@ public override async Task Tpc_entity_owning_a_split_collection_on_base(bool asy
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseValue`, `t`.`MiddleValue`, `t`.`SiblingValue`, `t`.`LeafValue`, `t`.`Discriminator`, `t0`.`BaseEntityId`, `t0`.`Id`, `t0`.`OwnedIntValue1`, `t0`.`OwnedIntValue2`, `t0`.`OwnedIntValue3`, `t0`.`OwnedIntValue4`, `t0`.`OwnedStringValue1`, `t0`.`OwnedStringValue2`, `t0`.`OwnedStringValue3`, `t0`.`OwnedStringValue4`
+SELECT `u`.`Id`, `u`.`BaseValue`, `u`.`MiddleValue`, `u`.`SiblingValue`, `u`.`LeafValue`, `u`.`Discriminator`, `s0`.`BaseEntityId`, `s0`.`Id`, `s0`.`OwnedIntValue1`, `s0`.`OwnedIntValue2`, `s0`.`OwnedIntValue3`, `s0`.`OwnedIntValue4`, `s0`.`OwnedStringValue1`, `s0`.`OwnedStringValue2`, `s0`.`OwnedStringValue3`, `s0`.`OwnedStringValue4`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseValue`, NULL AS `MiddleValue`, NULL AS `SiblingValue`, NULL AS `LeafValue`, 'BaseEntity' AS `Discriminator`
     FROM `BaseEntity` AS `b`
@@ -703,14 +703,14 @@ UNION ALL
     UNION ALL
     SELECT `l`.`Id`, `l`.`BaseValue`, `l`.`MiddleValue`, NULL AS `SiblingValue`, `l`.`LeafValue`, 'LeafEntity' AS `Discriminator`
     FROM `LeafEntity` AS `l`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `o`.`BaseEntityId`, `o`.`Id`, `o`.`OwnedIntValue1`, `o`.`OwnedIntValue2`, `o1`.`OwnedIntValue3`, `o0`.`OwnedIntValue4`, `o`.`OwnedStringValue1`, `o`.`OwnedStringValue2`, `o1`.`OwnedStringValue3`, `o0`.`OwnedStringValue4`
     FROM `OwnedReferencePart1` AS `o`
     INNER JOIN `OwnedReferencePart4` AS `o0` ON (`o`.`BaseEntityId` = `o0`.`BaseEntityId`) AND (`o`.`Id` = `o0`.`Id`)
     INNER JOIN `OwnedReferencePart3` AS `o1` ON (`o`.`BaseEntityId` = `o1`.`BaseEntityId`) AND (`o`.`Id` = `o1`.`Id`)
-) AS `t0` ON `t`.`Id` = `t0`.`BaseEntityId`
-ORDER BY `t`.`Id`, `t0`.`BaseEntityId`
+) AS `s0` ON `u`.`Id` = `s0`.`BaseEntityId`
+ORDER BY `u`.`Id`, `s0`.`BaseEntityId`
 """);
     }
 
@@ -736,7 +736,7 @@ public override async Task Tpc_entity_owning_a_split_collection_on_middle(bool a
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseValue`, `t`.`MiddleValue`, `t`.`SiblingValue`, `t`.`LeafValue`, `t`.`Discriminator`, `t0`.`MiddleEntityId`, `t0`.`Id`, `t0`.`OwnedIntValue1`, `t0`.`OwnedIntValue2`, `t0`.`OwnedIntValue3`, `t0`.`OwnedIntValue4`, `t0`.`OwnedStringValue1`, `t0`.`OwnedStringValue2`, `t0`.`OwnedStringValue3`, `t0`.`OwnedStringValue4`
+SELECT `u`.`Id`, `u`.`BaseValue`, `u`.`MiddleValue`, `u`.`SiblingValue`, `u`.`LeafValue`, `u`.`Discriminator`, `s0`.`MiddleEntityId`, `s0`.`Id`, `s0`.`OwnedIntValue1`, `s0`.`OwnedIntValue2`, `s0`.`OwnedIntValue3`, `s0`.`OwnedIntValue4`, `s0`.`OwnedStringValue1`, `s0`.`OwnedStringValue2`, `s0`.`OwnedStringValue3`, `s0`.`OwnedStringValue4`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseValue`, NULL AS `MiddleValue`, NULL AS `SiblingValue`, NULL AS `LeafValue`, 'BaseEntity' AS `Discriminator`
     FROM `BaseEntity` AS `b`
@@ -749,14 +749,14 @@ UNION ALL
     UNION ALL
     SELECT `l`.`Id`, `l`.`BaseValue`, `l`.`MiddleValue`, NULL AS `SiblingValue`, `l`.`LeafValue`, 'LeafEntity' AS `Discriminator`
     FROM `LeafEntity` AS `l`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `o`.`MiddleEntityId`, `o`.`Id`, `o`.`OwnedIntValue1`, `o`.`OwnedIntValue2`, `o1`.`OwnedIntValue3`, `o0`.`OwnedIntValue4`, `o`.`OwnedStringValue1`, `o`.`OwnedStringValue2`, `o1`.`OwnedStringValue3`, `o0`.`OwnedStringValue4`
     FROM `OwnedReferencePart1` AS `o`
     INNER JOIN `OwnedReferencePart4` AS `o0` ON (`o`.`MiddleEntityId` = `o0`.`MiddleEntityId`) AND (`o`.`Id` = `o0`.`Id`)
     INNER JOIN `OwnedReferencePart3` AS `o1` ON (`o`.`MiddleEntityId` = `o1`.`MiddleEntityId`) AND (`o`.`Id` = `o1`.`Id`)
-) AS `t0` ON `t`.`Id` = `t0`.`MiddleEntityId`
-ORDER BY `t`.`Id`, `t0`.`MiddleEntityId`
+) AS `s0` ON `u`.`Id` = `s0`.`MiddleEntityId`
+ORDER BY `u`.`Id`, `s0`.`MiddleEntityId`
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/FunkyDataQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/FunkyDataQueryMySqlTest.cs
index 970054c16..bc3fd0740 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/FunkyDataQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/FunkyDataQueryMySqlTest.cs
@@ -1,6 +1,8 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
 using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.TestModels.FunkyDataModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -175,6 +177,18 @@ WHERE FALSE
 """);
     }
 
+    public override Task String_Contains_and_StartsWith_with_same_parameter(bool async)
+    {
+        var s = "B";
+
+        return AssertQuery(
+            async,
+            ss => ss.Set<FunkyCustomer>().Where(
+                c => c.FirstName.Contains(s) || c.LastName.StartsWith(s)),
+            ss => ss.Set<FunkyCustomer>().Where(
+                c => c.FirstName.MaybeScalar(f => f.Contains(s)) == true || c.LastName.MaybeScalar(l => l.StartsWith(s)) == true));
+    }
+
     protected override void ClearLog()
         => Fixture.TestSqlLoggerFactory.Clear();
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs
index 71fa11047..61da8c51d 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs
@@ -242,14 +242,14 @@ public override async Task Group_by_on_StartsWith_with_null_parameter_as_argumen
         {
             await base.Group_by_on_StartsWith_with_null_parameter_as_argument(async);
 
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`Key`
+SELECT `g0`.`Key`
 FROM (
     SELECT FALSE AS `Key`
     FROM `Gears` AS `g`
-) AS `t`
-GROUP BY `t`.`Key`
+) AS `g0`
+GROUP BY `g0`.`Key`
 """);
         }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/ManyToManyHeterogeneousQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ManyToManyHeterogeneousQueryMySqlTest.cs
deleted file mode 100644
index 50bd7e9fd..000000000
--- a/test/EFCore.MySql.FunctionalTests/Query/ManyToManyHeterogeneousQueryMySqlTest.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
-
-namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query
-{
-    public class ManyToManyHeterogeneousQueryMySqlTest : ManyToManyHeterogeneousQueryRelationalTestBase
-    {
-        protected override ITestStoreFactory TestStoreFactory => MySqlTestStoreFactory.Instance;
-
-        public override async Task Many_to_many_load_works_when_join_entity_has_custom_key(bool async)
-        {
-            await base.Many_to_many_load_works_when_join_entity_has_custom_key(async);
-
-            AssertSql(
-                @"@__p_0='1'
-
-SELECT `m`.`Id`
-FROM `ManyM_DB` AS `m`
-WHERE `m`.`Id` = @__p_0
-LIMIT 1",
-                //
-                @"@__p_0='1'
-
-SELECT `t`.`Id`, `m`.`Id`, `t`.`Id0`, `t0`.`Id`, `t0`.`ManyM_Id`, `t0`.`ManyN_Id`, `t0`.`Id0`
-FROM `ManyM_DB` AS `m`
-INNER JOIN (
-    SELECT `m1`.`Id`, `m0`.`Id` AS `Id0`, `m0`.`ManyM_Id`
-    FROM `ManyMN_DB` AS `m0`
-    LEFT JOIN `ManyN_DB` AS `m1` ON `m0`.`ManyN_Id` = `m1`.`Id`
-) AS `t` ON `m`.`Id` = `t`.`ManyM_Id`
-LEFT JOIN (
-    SELECT `m2`.`Id`, `m2`.`ManyM_Id`, `m2`.`ManyN_Id`, `m3`.`Id` AS `Id0`
-    FROM `ManyMN_DB` AS `m2`
-    INNER JOIN `ManyM_DB` AS `m3` ON `m2`.`ManyM_Id` = `m3`.`Id`
-    WHERE `m3`.`Id` = @__p_0
-) AS `t0` ON `t`.`Id` = `t0`.`ManyN_Id`
-WHERE `m`.`Id` = @__p_0
-ORDER BY `m`.`Id`, `t`.`Id0`, `t`.`Id`, `t0`.`Id`",
-                //
-                @"@__p_0='1'
-
-SELECT `m`.`Id`
-FROM `ManyN_DB` AS `m`
-WHERE `m`.`Id` = @__p_0
-LIMIT 1",
-                //
-                @"@__p_0='1'
-
-SELECT `t`.`Id`, `m`.`Id`, `t`.`Id0`, `t0`.`Id`, `t0`.`ManyM_Id`, `t0`.`ManyN_Id`, `t0`.`Id0`
-FROM `ManyN_DB` AS `m`
-INNER JOIN (
-    SELECT `m1`.`Id`, `m0`.`Id` AS `Id0`, `m0`.`ManyN_Id`
-    FROM `ManyMN_DB` AS `m0`
-    INNER JOIN `ManyM_DB` AS `m1` ON `m0`.`ManyM_Id` = `m1`.`Id`
-) AS `t` ON `m`.`Id` = `t`.`ManyN_Id`
-LEFT JOIN (
-    SELECT `m2`.`Id`, `m2`.`ManyM_Id`, `m2`.`ManyN_Id`, `m3`.`Id` AS `Id0`
-    FROM `ManyMN_DB` AS `m2`
-    INNER JOIN `ManyN_DB` AS `m3` ON `m2`.`ManyN_Id` = `m3`.`Id`
-    WHERE `m3`.`Id` = @__p_0
-) AS `t0` ON `t`.`Id` = `t0`.`ManyM_Id`
-WHERE `m`.`Id` = @__p_0
-ORDER BY `m`.`Id`, `t`.`Id0`, `t`.`Id`, `t0`.`Id`");
-        }
-    }
-}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindAggregateOperatorsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindAggregateOperatorsQueryMySqlTest.cs
index 47b6e521f..33169eb8d 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindAggregateOperatorsQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindAggregateOperatorsQueryMySqlTest.cs
@@ -35,6 +35,21 @@ public override Task Average_over_nested_subquery_is_client_eval(bool async)
                 selector: c => (decimal)c.Orders.Average(o => 5 + o.OrderDetails.Average(od => od.ProductID)),
                 asserter: (a, b) => Assert.Equal(a, b, 12)); // added flouting point precision tolerance
 
+        public override async Task Type_casting_inside_sum(bool async)
+        {
+            await AssertSum(
+                async,
+                ss => ss.Set<OrderDetail>(),
+                x => (decimal)x.Discount,
+                asserter: (a, b) => Assert.Equal(a, b, 3)); // added flouting point precision tolerance
+
+            AssertSql(
+"""
+SELECT COALESCE(SUM(CAST(`o`.`Discount` AS decimal(65,30))), 0.0)
+FROM `Order Details` AS `o`
+""");
+        }
+
         // TODO: Implement TranslatePrimitiveCollection.
         public override async Task Contains_with_local_anonymous_type_array_closure(bool async)
         {
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindEFPropertyIncludeQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindEFPropertyIncludeQueryMySqlTest.cs
index e4df2d8d6..a6e805d69 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindEFPropertyIncludeQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindEFPropertyIncludeQueryMySqlTest.cs
@@ -56,15 +56,15 @@ public override async Task Include_collection_order_by_non_key_with_first_or_def
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`CompanyName` DESC
     LIMIT 1
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CompanyName` DESC, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CompanyName` DESC, `c0`.`CustomerID`
 """);
     }
 
@@ -117,7 +117,7 @@ public override async Task Include_collection_order_by_collection_column(bool as
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, (
         SELECT `o`.`OrderDate`
@@ -134,9 +134,9 @@ ORDER BY (
         ORDER BY `o`.`OrderDate` DESC
         LIMIT 1) DESC
     LIMIT 1
-) AS `t`
-LEFT JOIN `Orders` AS `o0` ON `t`.`CustomerID` = `o0`.`CustomerID`
-ORDER BY `t`.`c` DESC, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o0` ON `c0`.`CustomerID` = `o0`.`CustomerID`
+ORDER BY `c0`.`c` DESC, `c0`.`CustomerID`
 """);
     }
 
@@ -163,14 +163,14 @@ public override async Task Include_collection_skip_take_no_order_by(bool async)
 @__p_1='5'
 @__p_0='10'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """);
     }
 
@@ -180,17 +180,17 @@ public override async Task Include_collection_with_cross_join_clause_with_filter
 
         AssertSql(
 """
-SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t`.`OrderID`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o0`.`OrderID`, `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
 FROM `Customers` AS `c`
 CROSS JOIN (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     ORDER BY `o`.`OrderID`
     LIMIT 5
-) AS `t`
-LEFT JOIN `Orders` AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
+) AS `o0`
+LEFT JOIN `Orders` AS `o1` ON `c`.`CustomerID` = `o1`.`CustomerID`
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t`.`OrderID`
+ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
 """);
     }
 
@@ -200,23 +200,23 @@ public override async Task Join_Include_reference_GroupBy_Select(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`CustomerID0`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`
+SELECT `s1`.`OrderID`, `s1`.`CustomerID`, `s1`.`EmployeeID`, `s1`.`OrderDate`, `s1`.`CustomerID0`, `s1`.`Address`, `s1`.`City`, `s1`.`CompanyName`, `s1`.`ContactName`, `s1`.`ContactTitle`, `s1`.`Country`, `s1`.`Fax`, `s1`.`Phone`, `s1`.`PostalCode`, `s1`.`Region`
 FROM (
     SELECT `o0`.`OrderID`
     FROM `Order Details` AS `o`
     INNER JOIN `Orders` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
     GROUP BY `o0`.`OrderID`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`CustomerID0`, `t1`.`Address`, `t1`.`City`, `t1`.`CompanyName`, `t1`.`ContactName`, `t1`.`ContactTitle`, `t1`.`Country`, `t1`.`Fax`, `t1`.`Phone`, `t1`.`PostalCode`, `t1`.`Region`
+    SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`CustomerID0`, `s0`.`Address`, `s0`.`City`, `s0`.`CompanyName`, `s0`.`ContactName`, `s0`.`ContactTitle`, `s0`.`Country`, `s0`.`Fax`, `s0`.`Phone`, `s0`.`PostalCode`, `s0`.`Region`
     FROM (
         SELECT `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, ROW_NUMBER() OVER(PARTITION BY `o2`.`OrderID` ORDER BY `o2`.`OrderID`) AS `row`
         FROM `Order Details` AS `o1`
         INNER JOIN `Orders` AS `o2` ON `o1`.`OrderID` = `o2`.`OrderID`
         LEFT JOIN `Customers` AS `c` ON `o2`.`CustomerID` = `c`.`CustomerID`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
 """);
     }
 
@@ -226,16 +226,16 @@ public override async Task Include_multi_level_reference_and_collection_predicat
 
         AssertSql(
 """
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `t`.`CustomerID0`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`CustomerID0`, `s`.`Address`, `s`.`City`, `s`.`CompanyName`, `s`.`ContactName`, `s`.`ContactTitle`, `s`.`Country`, `s`.`Fax`, `s`.`Phone`, `s`.`PostalCode`, `s`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
 FROM (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Orders` AS `o`
     LEFT JOIN `Customers` AS `c` ON `o`.`CustomerID` = `c`.`CustomerID`
     WHERE `o`.`OrderID` = 10248
     LIMIT 2
-) AS `t`
-LEFT JOIN `Orders` AS `o0` ON `t`.`CustomerID0` = `o0`.`CustomerID`
-ORDER BY `t`.`OrderID`, `t`.`CustomerID0`
+) AS `s`
+LEFT JOIN `Orders` AS `o0` ON `s`.`CustomerID0` = `o0`.`CustomerID`
+ORDER BY `s`.`OrderID`, `s`.`CustomerID0`
 """);
     }
 
@@ -260,15 +260,15 @@ public override async Task Include_collection_on_additional_from_clause_with_fil
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `c`.`CustomerID`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`, `c`.`CustomerID`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM `Customers` AS `c`
 CROSS JOIN (
     SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
     FROM `Customers` AS `c0`
     WHERE `c0`.`CustomerID` = 'ALFKI'
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `c`.`CustomerID`, `t`.`CustomerID`
+) AS `c1`
+LEFT JOIN `Orders` AS `o` ON `c1`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c`.`CustomerID`, `c1`.`CustomerID`
 """);
     }
 
@@ -280,21 +280,21 @@ public override async Task Include_duplicate_reference3(bool async)
 """
 @__p_0='2'
 
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`, `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
     FROM `Orders` AS `o`
     ORDER BY `o`.`OrderID`
     LIMIT @__p_0
-) AS `t`
+) AS `o1`
 CROSS JOIN (
     SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
     FROM `Orders` AS `o0`
     ORDER BY `o0`.`OrderID`
     LIMIT 2 OFFSET 2
-) AS `t0`
-LEFT JOIN `Customers` AS `c` ON `t0`.`CustomerID` = `c`.`CustomerID`
-ORDER BY `t`.`OrderID`
+) AS `o2`
+LEFT JOIN `Customers` AS `c` ON `o2`.`CustomerID` = `c`.`CustomerID`
+ORDER BY `o1`.`OrderID`
 """);
     }
 
@@ -306,15 +306,15 @@ public override async Task Include_collection_order_by_non_key_with_take(bool as
 """
 @__p_0='10'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`ContactTitle`
     LIMIT @__p_0
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`ContactTitle`, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`ContactTitle`, `c0`.`CustomerID`
 """);
     }
 
@@ -324,19 +324,19 @@ public override async Task Include_collection_then_include_collection_predicate(
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`OrderID0`, `t0`.`ProductID`, `t0`.`Discount`, `t0`.`Quantity`, `t0`.`UnitPrice`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`OrderID0`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` = 'ALFKI'
     LIMIT 2
-) AS `t`
+) AS `c0`
 LEFT JOIN (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `o0`.`OrderID` AS `OrderID0`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
     FROM `Orders` AS `o`
     LEFT JOIN `Order Details` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
-) AS `t0` ON `t`.`CustomerID` = `t0`.`CustomerID`
-ORDER BY `t`.`CustomerID`, `t0`.`OrderID`, `t0`.`OrderID0`
+) AS `s` ON `c0`.`CustomerID` = `s`.`CustomerID`
+ORDER BY `c0`.`CustomerID`, `s`.`OrderID`, `s`.`OrderID0`
 """);
     }
 
@@ -348,14 +348,14 @@ public override async Task Include_collection_take_no_order_by(bool async)
 """
 @__p_0='10'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     LIMIT @__p_0
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """);
     }
 
@@ -372,15 +372,15 @@ LIMIT 2
 """,
                 //
                 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` = 'ALFKI'
     LIMIT 2
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """);
     }
 
@@ -420,9 +420,9 @@ from c2 in ss.Set<Customer>().OrderBy(c => c.CustomerID).Skip(2).Take(2)
 @__p_0='2'
 @__p_1='1'
 
-SELECT `t1`.`CustomerID`, `t1`.`Address`, `t1`.`City`, `t1`.`CompanyName`, `t1`.`ContactName`, `t1`.`ContactTitle`, `t1`.`Country`, `t1`.`Fax`, `t1`.`Phone`, `t1`.`PostalCode`, `t1`.`Region`, `t1`.`CustomerID0`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `t1`.`Address0`, `t1`.`City0`, `t1`.`CompanyName0`, `t1`.`ContactName0`, `t1`.`ContactTitle0`, `t1`.`Country0`, `t1`.`Fax0`, `t1`.`Phone0`, `t1`.`PostalCode0`, `t1`.`Region0`
+SELECT `s`.`CustomerID`, `s`.`Address`, `s`.`City`, `s`.`CompanyName`, `s`.`ContactName`, `s`.`ContactTitle`, `s`.`Country`, `s`.`Fax`, `s`.`Phone`, `s`.`PostalCode`, `s`.`Region`, `s`.`CustomerID0`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `s`.`Address0`, `s`.`City0`, `s`.`CompanyName0`, `s`.`ContactName0`, `s`.`ContactTitle0`, `s`.`Country0`, `s`.`Fax0`, `s`.`Phone0`, `s`.`PostalCode0`, `s`.`Region0`
 FROM (
-    SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `t0`.`CustomerID` AS `CustomerID0`, `t0`.`Address` AS `Address0`, `t0`.`City` AS `City0`, `t0`.`CompanyName` AS `CompanyName0`, `t0`.`ContactName` AS `ContactName0`, `t0`.`ContactTitle` AS `ContactTitle0`, `t0`.`Country` AS `Country0`, `t0`.`Fax` AS `Fax0`, `t0`.`Phone` AS `Phone0`, `t0`.`PostalCode` AS `PostalCode0`, `t0`.`Region` AS `Region0`
+    SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`, `c2`.`CustomerID` AS `CustomerID0`, `c2`.`Address` AS `Address0`, `c2`.`City` AS `City0`, `c2`.`CompanyName` AS `CompanyName0`, `c2`.`ContactName` AS `ContactName0`, `c2`.`ContactTitle` AS `ContactTitle0`, `c2`.`Country` AS `Country0`, `c2`.`Fax` AS `Fax0`, `c2`.`Phone` AS `Phone0`, `c2`.`PostalCode` AS `PostalCode0`, `c2`.`Region` AS `Region0`
     FROM (
         SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
         FROM `Customers` AS `c`
@@ -432,18 +432,18 @@ from c2 in ss.Set<Customer>().OrderBy(c => c.CustomerID).Skip(2).Take(2)
             WHERE `c`.`CustomerID` = `o`.`CustomerID`
             LIMIT 1)
         LIMIT @__p_0
-    ) AS `t`
+    ) AS `c1`
     CROSS JOIN (
         SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
         FROM `Customers` AS `c0`
         ORDER BY `c0`.`CustomerID`
         LIMIT 2 OFFSET 2
-    ) AS `t0`
-    ORDER BY `t`.`CustomerID`, `t0`.`CustomerID`
+    ) AS `c2`
+    ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
     LIMIT @__p_1
-) AS `t1`
-LEFT JOIN `Orders` AS `o0` ON `t1`.`CustomerID` = `o0`.`CustomerID`
-ORDER BY `t1`.`CustomerID`, `t1`.`CustomerID0`
+) AS `s`
+LEFT JOIN `Orders` AS `o0` ON `s`.`CustomerID` = `o0`.`CustomerID`
+ORDER BY `s`.`CustomerID`, `s`.`CustomerID0`
 """);
     }
 
@@ -462,7 +462,7 @@ await AssertQuery(
 """
 @__p_0='2'
 
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `t`.`CustomerID0`, `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
+SELECT `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`CustomerID0`, `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
 FROM (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `c`.`CustomerID` IS NOT NULL AS `c`, CASE
         WHEN `c`.`CustomerID` IS NOT NULL THEN `c`.`CustomerID`
@@ -475,9 +475,9 @@ END AS `c0`
         ELSE ''
     END, `o`.`EmployeeID`
     LIMIT @__p_0
-) AS `t`
-LEFT JOIN `Order Details` AS `o0` ON `t`.`OrderID` = `o0`.`OrderID`
-ORDER BY `t`.`c`, `t`.`c0`, `t`.`EmployeeID`, `t`.`OrderID`, `t`.`CustomerID0`, `o0`.`OrderID`
+) AS `s`
+LEFT JOIN `Order Details` AS `o0` ON `s`.`OrderID` = `o0`.`OrderID`
+ORDER BY `s`.`c`, `s`.`c0`, `s`.`EmployeeID`, `s`.`OrderID`, `s`.`CustomerID0`, `o0`.`OrderID`
 """);
     }
 
@@ -487,15 +487,15 @@ public override async Task Include_collection_single_or_default_no_result(bool a
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` = 'ALFKI ?'
     LIMIT 2
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """);
     }
 
@@ -505,7 +505,7 @@ public override async Task Include_collection_with_cross_apply_with_filter(bool
 
         AssertSql(
 """
-SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t`.`OrderID`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o0`.`OrderID`, `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
 FROM `Customers` AS `c`
 JOIN LATERAL (
     SELECT `o`.`OrderID`
@@ -513,10 +513,10 @@ JOIN LATERAL (
     WHERE `o`.`CustomerID` = `c`.`CustomerID`
     ORDER BY `c`.`CustomerID`
     LIMIT 5
-) AS `t` ON TRUE
-LEFT JOIN `Orders` AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
+) AS `o0` ON TRUE
+LEFT JOIN `Orders` AS `o1` ON `c`.`CustomerID` = `o1`.`CustomerID`
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t`.`OrderID`
+ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
 """);
     }
 
@@ -543,22 +543,22 @@ public override async Task Include_duplicate_collection(bool async)
 """
 @__p_0='2'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `t0`.`CustomerID`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`, `c2`.`CustomerID`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c2`.`Address`, `c2`.`City`, `c2`.`CompanyName`, `c2`.`ContactName`, `c2`.`ContactTitle`, `c2`.`Country`, `c2`.`Fax`, `c2`.`Phone`, `c2`.`PostalCode`, `c2`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`CustomerID`
     LIMIT @__p_0
-) AS `t`
+) AS `c1`
 CROSS JOIN (
     SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
     FROM `Customers` AS `c0`
     ORDER BY `c0`.`CustomerID`
     LIMIT 2 OFFSET 2
-) AS `t0`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-LEFT JOIN `Orders` AS `o0` ON `t0`.`CustomerID` = `o0`.`CustomerID`
-ORDER BY `t`.`CustomerID`, `t0`.`CustomerID`, `o`.`OrderID`
+) AS `c2`
+LEFT JOIN `Orders` AS `o` ON `c1`.`CustomerID` = `o`.`CustomerID`
+LEFT JOIN `Orders` AS `o0` ON `c2`.`CustomerID` = `o0`.`CustomerID`
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`, `o`.`OrderID`
 """);
     }
 
@@ -582,19 +582,19 @@ public override async Task Include_collection_then_include_collection_then_inclu
 
         AssertSql(
 """
-SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`OrderID0`, `t0`.`ProductID`, `t0`.`Discount`, `t0`.`Quantity`, `t0`.`UnitPrice`, `t0`.`ProductID0`, `t0`.`Discontinued`, `t0`.`ProductName`, `t0`.`SupplierID`, `t0`.`UnitPrice0`, `t0`.`UnitsInStock`
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`OrderID0`, `s0`.`ProductID`, `s0`.`Discount`, `s0`.`Quantity`, `s0`.`UnitPrice`, `s0`.`ProductID0`, `s0`.`Discontinued`, `s0`.`ProductName`, `s0`.`SupplierID`, `s0`.`UnitPrice0`, `s0`.`UnitsInStock`
 FROM `Customers` AS `c`
 LEFT JOIN (
-    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `t`.`OrderID` AS `OrderID0`, `t`.`ProductID`, `t`.`Discount`, `t`.`Quantity`, `t`.`UnitPrice`, `t`.`ProductID0`, `t`.`Discontinued`, `t`.`ProductName`, `t`.`SupplierID`, `t`.`UnitPrice0`, `t`.`UnitsInStock`
+    SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `s`.`OrderID` AS `OrderID0`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`, `s`.`ProductID0`, `s`.`Discontinued`, `s`.`ProductName`, `s`.`SupplierID`, `s`.`UnitPrice0`, `s`.`UnitsInStock`
     FROM `Orders` AS `o`
     LEFT JOIN (
         SELECT `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`, `p`.`ProductID` AS `ProductID0`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice` AS `UnitPrice0`, `p`.`UnitsInStock`
         FROM `Order Details` AS `o0`
         INNER JOIN `Products` AS `p` ON `o0`.`ProductID` = `p`.`ProductID`
-    ) AS `t` ON `o`.`OrderID` = `t`.`OrderID`
-) AS `t0` ON `c`.`CustomerID` = `t0`.`CustomerID`
+    ) AS `s` ON `o`.`OrderID` = `s`.`OrderID`
+) AS `s0` ON `c`.`CustomerID` = `s0`.`CustomerID`
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t0`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`
+ORDER BY `c`.`CustomerID`, `s0`.`OrderID`, `s0`.`OrderID0`, `s0`.`ProductID`
 """);
     }
 
@@ -604,23 +604,23 @@ public override async Task Include_reference_GroupBy_Select(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`CustomerID0`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`
+SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`CustomerID0`, `s0`.`Address`, `s0`.`City`, `s0`.`CompanyName`, `s0`.`ContactName`, `s0`.`ContactTitle`, `s0`.`Country`, `s0`.`Fax`, `s0`.`Phone`, `s0`.`PostalCode`, `s0`.`Region`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o`.`OrderID`
-) AS `t`
+) AS `o1`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`CustomerID0`, `t1`.`Address`, `t1`.`City`, `t1`.`CompanyName`, `t1`.`ContactName`, `t1`.`ContactTitle`, `t1`.`Country`, `t1`.`Fax`, `t1`.`Phone`, `t1`.`PostalCode`, `t1`.`Region`
+    SELECT `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`CustomerID0`, `s`.`Address`, `s`.`City`, `s`.`CompanyName`, `s`.`ContactName`, `s`.`ContactTitle`, `s`.`Country`, `s`.`Fax`, `s`.`Phone`, `s`.`PostalCode`, `s`.`Region`
     FROM (
         SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, ROW_NUMBER() OVER(PARTITION BY `o0`.`OrderID` ORDER BY `o0`.`OrderID`) AS `row`
         FROM `Orders` AS `o0`
         LEFT JOIN `Customers` AS `c` ON `o0`.`CustomerID` = `c`.`CustomerID`
         WHERE `o0`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `o1`.`OrderID` = `s0`.`OrderID`
 """);
     }
 
@@ -690,20 +690,20 @@ LIMIT 18446744073709551610 OFFSET @__p_1
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 @__p_1='1'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `c`.`CustomerID` <> 'ALFKI' AS `c`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` LIKE 'A%'
     ORDER BY `c`.`CustomerID` <> 'ALFKI'
     LIMIT 18446744073709551610 OFFSET @__p_1
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`c`, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`c`, `c0`.`CustomerID`
 """);
         }
     }
@@ -749,22 +749,22 @@ public override async Task Include_duplicate_reference(bool async)
 """
 @__p_0='2'
 
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
+SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`, `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
 FROM (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
     FROM `Orders` AS `o`
     ORDER BY `o`.`CustomerID`, `o`.`OrderID`
     LIMIT @__p_0
-) AS `t`
+) AS `o1`
 CROSS JOIN (
     SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
     FROM `Orders` AS `o0`
     ORDER BY `o0`.`CustomerID`, `o0`.`OrderID`
     LIMIT 2 OFFSET 2
-) AS `t0`
-LEFT JOIN `Customers` AS `c` ON `t`.`CustomerID` = `c`.`CustomerID`
-LEFT JOIN `Customers` AS `c0` ON `t0`.`CustomerID` = `c0`.`CustomerID`
-ORDER BY `t`.`CustomerID`, `t`.`OrderID`
+) AS `o2`
+LEFT JOIN `Customers` AS `c` ON `o1`.`CustomerID` = `c`.`CustomerID`
+LEFT JOIN `Customers` AS `c0` ON `o2`.`CustomerID` = `c0`.`CustomerID`
+ORDER BY `o1`.`CustomerID`, `o1`.`OrderID`
 """);
     }
 
@@ -788,16 +788,16 @@ public override async Task Include_collection_order_by_non_key_with_skip(bool as
 """
 @__p_0='2'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` LIKE 'F%'
     ORDER BY `c`.`ContactTitle`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`ContactTitle`, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`ContactTitle`, `c0`.`CustomerID`
 """);
     }
 
@@ -824,25 +824,25 @@ public override async Task Multi_level_includes_are_applied_with_take(bool async
 """
 @__p_0='1'
 
-SELECT `t0`.`CustomerID`, `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`OrderID0`, `t1`.`ProductID`, `t1`.`Discount`, `t1`.`Quantity`, `t1`.`UnitPrice`
+SELECT `c1`.`CustomerID`, `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`OrderID0`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`
 FROM (
-    SELECT `t`.`CustomerID`
+    SELECT `c0`.`CustomerID`
     FROM (
         SELECT `c`.`CustomerID`
         FROM `Customers` AS `c`
         WHERE `c`.`CustomerID` LIKE 'A%'
         ORDER BY `c`.`CustomerID`
         LIMIT @__p_0
-    ) AS `t`
-    ORDER BY `t`.`CustomerID`
+    ) AS `c0`
+    ORDER BY `c0`.`CustomerID`
     LIMIT 1
-) AS `t0`
+) AS `c1`
 LEFT JOIN (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `o0`.`OrderID` AS `OrderID0`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
     FROM `Orders` AS `o`
     LEFT JOIN `Order Details` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
-) AS `t1` ON `t0`.`CustomerID` = `t1`.`CustomerID`
-ORDER BY `t0`.`CustomerID`, `t1`.`OrderID`, `t1`.`OrderID0`
+) AS `s` ON `c1`.`CustomerID` = `s`.`CustomerID`
+ORDER BY `c1`.`CustomerID`, `s`.`OrderID`, `s`.`OrderID0`
 """);
     }
 
@@ -869,15 +869,15 @@ public override async Task Include_collection_then_reference(bool async)
 
         AssertSql(
 """
-SELECT `p`.`ProductID`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice`, `p`.`UnitsInStock`, `t`.`OrderID`, `t`.`ProductID`, `t`.`Discount`, `t`.`Quantity`, `t`.`UnitPrice`, `t`.`OrderID0`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`
+SELECT `p`.`ProductID`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice`, `p`.`UnitsInStock`, `s`.`OrderID`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`, `s`.`OrderID0`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`
 FROM `Products` AS `p`
 LEFT JOIN (
     SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`, `o0`.`OrderID` AS `OrderID0`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
     FROM `Order Details` AS `o`
     INNER JOIN `Orders` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
-) AS `t` ON `p`.`ProductID` = `t`.`ProductID`
+) AS `s` ON `p`.`ProductID` = `s`.`ProductID`
 WHERE (`p`.`ProductID` % 17) = 5
-ORDER BY `p`.`ProductID`, `t`.`OrderID`, `t`.`ProductID`
+ORDER BY `p`.`ProductID`, `s`.`OrderID`, `s`.`ProductID`
 """);
     }
 
@@ -901,7 +901,7 @@ public override async Task Include_collection_with_outer_apply_with_filter(bool
 
         AssertSql(
 """
-SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t`.`OrderID`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o0`.`OrderID`, `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
 FROM `Customers` AS `c`
 LEFT JOIN LATERAL (
     SELECT `o`.`OrderID`
@@ -909,10 +909,10 @@ LEFT JOIN LATERAL (
     WHERE `o`.`CustomerID` = `c`.`CustomerID`
     ORDER BY `c`.`CustomerID`
     LIMIT 5
-) AS `t` ON TRUE
-LEFT JOIN `Orders` AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
+) AS `o0` ON TRUE
+LEFT JOIN `Orders` AS `o1` ON `c`.`CustomerID` = `o1`.`CustomerID`
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t`.`OrderID`
+ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
 """);
     }
 
@@ -924,15 +924,15 @@ public override async Task Include_collection_on_additional_from_clause2(bool as
 """
 @__p_0='5'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`
+SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`CustomerID`
     LIMIT @__p_0
-) AS `t`
+) AS `c1`
 CROSS JOIN `Customers` AS `c0`
-ORDER BY `t`.`CustomerID`
+ORDER BY `c1`.`CustomerID`
 """);
     }
 
@@ -948,15 +948,15 @@ public override async Task Include_collection_dependent_already_tracked(bool asy
 """,
                 //
                 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` = 'ALFKI'
     LIMIT 2
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """);
     }
 
@@ -985,19 +985,19 @@ public override async Task Include_multi_level_collection_and_then_include_refer
 
         AssertSql(
 """
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `t0`.`OrderID`, `t0`.`ProductID`, `t0`.`Discount`, `t0`.`Quantity`, `t0`.`UnitPrice`, `t0`.`ProductID0`, `t0`.`Discontinued`, `t0`.`ProductName`, `t0`.`SupplierID`, `t0`.`UnitPrice0`, `t0`.`UnitsInStock`
+SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `s`.`OrderID`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`, `s`.`ProductID0`, `s`.`Discontinued`, `s`.`ProductName`, `s`.`SupplierID`, `s`.`UnitPrice0`, `s`.`UnitsInStock`
 FROM (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` = 10248
     LIMIT 2
-) AS `t`
+) AS `o1`
 LEFT JOIN (
     SELECT `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`, `p`.`ProductID` AS `ProductID0`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice` AS `UnitPrice0`, `p`.`UnitsInStock`
     FROM `Order Details` AS `o0`
     INNER JOIN `Products` AS `p` ON `o0`.`ProductID` = `p`.`ProductID`
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
-ORDER BY `t`.`OrderID`, `t0`.`OrderID`, `t0`.`ProductID`
+) AS `s` ON `o1`.`OrderID` = `s`.`OrderID`
+ORDER BY `o1`.`OrderID`, `s`.`OrderID`, `s`.`ProductID`
 """);
     }
 
@@ -1009,25 +1009,25 @@ public override async Task Multi_level_includes_are_applied_with_skip_take(bool
 """
 @__p_0='1'
 
-SELECT `t0`.`CustomerID`, `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`OrderID0`, `t1`.`ProductID`, `t1`.`Discount`, `t1`.`Quantity`, `t1`.`UnitPrice`
+SELECT `c1`.`CustomerID`, `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`OrderID0`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`
 FROM (
-    SELECT `t`.`CustomerID`
+    SELECT `c0`.`CustomerID`
     FROM (
         SELECT `c`.`CustomerID`
         FROM `Customers` AS `c`
         WHERE `c`.`CustomerID` LIKE 'A%'
         ORDER BY `c`.`CustomerID`
         LIMIT @__p_0 OFFSET @__p_0
-    ) AS `t`
-    ORDER BY `t`.`CustomerID`
+    ) AS `c0`
+    ORDER BY `c0`.`CustomerID`
     LIMIT 1
-) AS `t0`
+) AS `c1`
 LEFT JOIN (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `o0`.`OrderID` AS `OrderID0`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
     FROM `Orders` AS `o`
     LEFT JOIN `Order Details` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
-) AS `t1` ON `t0`.`CustomerID` = `t1`.`CustomerID`
-ORDER BY `t0`.`CustomerID`, `t1`.`OrderID`, `t1`.`OrderID0`
+) AS `s` ON `c1`.`CustomerID` = `s`.`CustomerID`
+ORDER BY `c1`.`CustomerID`, `s`.`OrderID`, `s`.`OrderID0`
 """);
     }
 
@@ -1067,20 +1067,20 @@ LIMIT 18446744073709551610 OFFSET @__p_1
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 @__p_1='1'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, FALSE AS `c`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` LIKE 'A%'
     ORDER BY 1
     LIMIT 18446744073709551610 OFFSET @__p_1
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`c`, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`c`, `c0`.`CustomerID`
 """);
         }
     }
@@ -1120,7 +1120,7 @@ public override async Task Include_collection_with_outer_apply_with_filter_non_e
         await base.Include_collection_with_outer_apply_with_filter_non_equality(async);
         AssertSql(
 """
-SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t`.`OrderID`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o0`.`OrderID`, `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
 FROM `Customers` AS `c`
 LEFT JOIN LATERAL (
     SELECT `o`.`OrderID`
@@ -1128,10 +1128,10 @@ LEFT JOIN LATERAL (
     WHERE (`o`.`CustomerID` <> `c`.`CustomerID`) OR `o`.`CustomerID` IS NULL
     ORDER BY `c`.`CustomerID`
     LIMIT 5
-) AS `t` ON TRUE
-LEFT JOIN `Orders` AS `o0` ON `c`.`CustomerID` = `o0`.`CustomerID`
+) AS `o0` ON TRUE
+LEFT JOIN `Orders` AS `o1` ON `c`.`CustomerID` = `o1`.`CustomerID`
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t`.`OrderID`
+ORDER BY `c`.`CustomerID`, `o0`.`OrderID`
 """);
     }
 
@@ -1141,19 +1141,19 @@ public override async Task Include_in_let_followed_by_FirstOrDefault(bool async)
 
         AssertSql(
 """
-SELECT `c`.`CustomerID`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
+SELECT `c`.`CustomerID`, `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`, `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
 FROM `Customers` AS `c`
 LEFT JOIN (
-    SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`
+    SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
     FROM (
         SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, ROW_NUMBER() OVER(PARTITION BY `o`.`CustomerID` ORDER BY `o`.`OrderDate`) AS `row`
         FROM `Orders` AS `o`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `c`.`CustomerID` = `t0`.`CustomerID`
-LEFT JOIN `Order Details` AS `o0` ON `t0`.`OrderID` = `o0`.`OrderID`
+    ) AS `o1`
+    WHERE `o1`.`row` <= 1
+) AS `o2` ON `c`.`CustomerID` = `o2`.`CustomerID`
+LEFT JOIN `Order Details` AS `o0` ON `o2`.`OrderID` = `o0`.`OrderID`
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t0`.`OrderID`, `o0`.`OrderID`
+ORDER BY `c`.`CustomerID`, `o2`.`OrderID`, `o0`.`OrderID`
 """);
     }
 
@@ -1177,15 +1177,15 @@ public override async Task Include_collection_then_include_collection(bool async
 
         AssertSql(
 """
-SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `t`.`OrderID0`, `t`.`ProductID`, `t`.`Discount`, `t`.`Quantity`, `t`.`UnitPrice`
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`OrderID0`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`
 FROM `Customers` AS `c`
 LEFT JOIN (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `o0`.`OrderID` AS `OrderID0`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
     FROM `Orders` AS `o`
     LEFT JOIN `Order Details` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
-) AS `t` ON `c`.`CustomerID` = `t`.`CustomerID`
+) AS `s` ON `c`.`CustomerID` = `s`.`CustomerID`
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t`.`OrderID`, `t`.`OrderID0`
+ORDER BY `c`.`CustomerID`, `s`.`OrderID`, `s`.`OrderID0`
 """);
     }
 
@@ -1207,7 +1207,7 @@ await AssertQuery(
 """
 @__p_0='5'
 
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `t`.`CustomerID0`, `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
+SELECT `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`CustomerID0`, `o0`.`OrderID`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
 FROM (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `o`.`OrderID` > 0 AS `c`, CASE
         WHEN `c`.`CustomerID` IS NOT NULL THEN `c`.`City`
@@ -1220,9 +1220,9 @@ END AS `c0`
         ELSE ''
     END, `o`.`OrderID`
     LIMIT @__p_0
-) AS `t`
-LEFT JOIN `Order Details` AS `o0` ON `t`.`OrderID` = `o0`.`OrderID`
-ORDER BY `t`.`c`, `t`.`c0`, `t`.`OrderID`, `t`.`CustomerID0`, `o0`.`OrderID`
+) AS `s`
+LEFT JOIN `Order Details` AS `o0` ON `s`.`OrderID` = `o0`.`OrderID`
+ORDER BY `s`.`c`, `s`.`c0`, `s`.`OrderID`, `s`.`CustomerID0`, `o0`.`OrderID`
 """);
     }
 
@@ -1303,25 +1303,25 @@ public override async Task Include_reference_Join_GroupBy_Select(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`CustomerID0`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`
+SELECT `s1`.`OrderID`, `s1`.`CustomerID`, `s1`.`EmployeeID`, `s1`.`OrderDate`, `s1`.`CustomerID0`, `s1`.`Address`, `s1`.`City`, `s1`.`CompanyName`, `s1`.`ContactName`, `s1`.`ContactTitle`, `s1`.`Country`, `s1`.`Fax`, `s1`.`Phone`, `s1`.`PostalCode`, `s1`.`Region`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     INNER JOIN `Order Details` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o`.`OrderID`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`CustomerID0`, `t1`.`Address`, `t1`.`City`, `t1`.`CompanyName`, `t1`.`ContactName`, `t1`.`ContactTitle`, `t1`.`Country`, `t1`.`Fax`, `t1`.`Phone`, `t1`.`PostalCode`, `t1`.`Region`
+    SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`CustomerID0`, `s0`.`Address`, `s0`.`City`, `s0`.`CompanyName`, `s0`.`ContactName`, `s0`.`ContactTitle`, `s0`.`Country`, `s0`.`Fax`, `s0`.`Phone`, `s0`.`PostalCode`, `s0`.`Region`
     FROM (
         SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, ROW_NUMBER() OVER(PARTITION BY `o1`.`OrderID` ORDER BY `o1`.`OrderID`) AS `row`
         FROM `Orders` AS `o1`
         INNER JOIN `Order Details` AS `o2` ON `o1`.`OrderID` = `o2`.`OrderID`
         LEFT JOIN `Customers` AS `c` ON `o1`.`CustomerID` = `c`.`CustomerID`
         WHERE `o1`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
 """);
     }
 
@@ -1342,25 +1342,25 @@ public override async Task Include_reference_SelectMany_GroupBy_Select(bool asyn
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`CustomerID0`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`
+SELECT `s1`.`OrderID`, `s1`.`CustomerID`, `s1`.`EmployeeID`, `s1`.`OrderDate`, `s1`.`CustomerID0`, `s1`.`Address`, `s1`.`City`, `s1`.`CompanyName`, `s1`.`ContactName`, `s1`.`ContactTitle`, `s1`.`Country`, `s1`.`Fax`, `s1`.`Phone`, `s1`.`PostalCode`, `s1`.`Region`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     CROSS JOIN `Order Details` AS `o0`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o`.`OrderID`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`CustomerID0`, `t1`.`Address`, `t1`.`City`, `t1`.`CompanyName`, `t1`.`ContactName`, `t1`.`ContactTitle`, `t1`.`Country`, `t1`.`Fax`, `t1`.`Phone`, `t1`.`PostalCode`, `t1`.`Region`
+    SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`CustomerID0`, `s0`.`Address`, `s0`.`City`, `s0`.`CompanyName`, `s0`.`ContactName`, `s0`.`ContactTitle`, `s0`.`Country`, `s0`.`Fax`, `s0`.`Phone`, `s0`.`PostalCode`, `s0`.`Region`
     FROM (
         SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, ROW_NUMBER() OVER(PARTITION BY `o1`.`OrderID` ORDER BY `o1`.`OrderID`) AS `row`
         FROM `Orders` AS `o1`
         CROSS JOIN `Order Details` AS `o2`
         LEFT JOIN `Customers` AS `c` ON `o1`.`CustomerID` = `c`.`CustomerID`
         WHERE `o1`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
 """);
     }
 
@@ -1387,25 +1387,25 @@ public override async Task SelectMany_Include_reference_GroupBy_Select(bool asyn
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`CustomerID0`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`
+SELECT `s1`.`OrderID`, `s1`.`CustomerID`, `s1`.`EmployeeID`, `s1`.`OrderDate`, `s1`.`CustomerID0`, `s1`.`Address`, `s1`.`City`, `s1`.`CompanyName`, `s1`.`ContactName`, `s1`.`ContactTitle`, `s1`.`Country`, `s1`.`Fax`, `s1`.`Phone`, `s1`.`PostalCode`, `s1`.`Region`
 FROM (
     SELECT `o0`.`OrderID`
     FROM `Order Details` AS `o`
     CROSS JOIN `Orders` AS `o0`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o0`.`OrderID`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`CustomerID0`, `t1`.`Address`, `t1`.`City`, `t1`.`CompanyName`, `t1`.`ContactName`, `t1`.`ContactTitle`, `t1`.`Country`, `t1`.`Fax`, `t1`.`Phone`, `t1`.`PostalCode`, `t1`.`Region`
+    SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`CustomerID0`, `s0`.`Address`, `s0`.`City`, `s0`.`CompanyName`, `s0`.`ContactName`, `s0`.`ContactTitle`, `s0`.`Country`, `s0`.`Fax`, `s0`.`Phone`, `s0`.`PostalCode`, `s0`.`Region`
     FROM (
         SELECT `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, ROW_NUMBER() OVER(PARTITION BY `o2`.`OrderID` ORDER BY `o2`.`OrderID`) AS `row`
         FROM `Order Details` AS `o1`
         CROSS JOIN `Orders` AS `o2`
         LEFT JOIN `Customers` AS `c` ON `o2`.`CustomerID` = `c`.`CustomerID`
         WHERE `o1`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
 """);
     }
 
@@ -1415,26 +1415,26 @@ public override async Task Include_collection_SelectMany_GroupBy_Select(bool asy
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`, `o3`.`OrderID`, `o3`.`ProductID`, `o3`.`Discount`, `o3`.`Quantity`, `o3`.`UnitPrice`
+SELECT `s1`.`OrderID`, `s1`.`CustomerID`, `s1`.`EmployeeID`, `s1`.`OrderDate`, `s`.`OrderID`, `s1`.`OrderID0`, `s1`.`ProductID`, `o3`.`OrderID`, `o3`.`ProductID`, `o3`.`Discount`, `o3`.`Quantity`, `o3`.`UnitPrice`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     CROSS JOIN `Order Details` AS `o0`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o`.`OrderID`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`OrderID0`, `t1`.`ProductID`
+    SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`OrderID0`, `s0`.`ProductID`
     FROM (
         SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `o2`.`OrderID` AS `OrderID0`, `o2`.`ProductID`, ROW_NUMBER() OVER(PARTITION BY `o1`.`OrderID` ORDER BY `o1`.`OrderID`) AS `row`
         FROM `Orders` AS `o1`
         CROSS JOIN `Order Details` AS `o2`
         WHERE `o1`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
-LEFT JOIN `Order Details` AS `o3` ON `t0`.`OrderID` = `o3`.`OrderID`
-ORDER BY `t`.`OrderID`, `t0`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`, `o3`.`OrderID`
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
+LEFT JOIN `Order Details` AS `o3` ON `s1`.`OrderID` = `o3`.`OrderID`
+ORDER BY `s`.`OrderID`, `s1`.`OrderID`, `s1`.`OrderID0`, `s1`.`ProductID`, `o3`.`OrderID`
 """);
     }
 
@@ -1474,20 +1474,20 @@ LIMIT 18446744073709551610 OFFSET @__p_1
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 @__p_1='1'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `c`.`CustomerID` = 'ALFKI' AS `c`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` LIKE 'A%'
     ORDER BY `c`.`CustomerID` = 'ALFKI'
     LIMIT 18446744073709551610 OFFSET @__p_1
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`c`, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`c`, `c0`.`CustomerID`
 """);
         }
     }
@@ -1500,20 +1500,20 @@ public override async Task Multi_level_includes_are_applied_with_skip(bool async
 """
 @__p_0='1'
 
-SELECT `t`.`CustomerID`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`OrderID0`, `t0`.`ProductID`, `t0`.`Discount`, `t0`.`Quantity`, `t0`.`UnitPrice`
+SELECT `c0`.`CustomerID`, `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`OrderID0`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`
 FROM (
     SELECT `c`.`CustomerID`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` LIKE 'A%'
     ORDER BY `c`.`CustomerID`
     LIMIT 1 OFFSET @__p_0
-) AS `t`
+) AS `c0`
 LEFT JOIN (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `o0`.`OrderID` AS `OrderID0`, `o0`.`ProductID`, `o0`.`Discount`, `o0`.`Quantity`, `o0`.`UnitPrice`
     FROM `Orders` AS `o`
     LEFT JOIN `Order Details` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
-) AS `t0` ON `t`.`CustomerID` = `t0`.`CustomerID`
-ORDER BY `t`.`CustomerID`, `t0`.`OrderID`, `t0`.`OrderID0`
+) AS `s` ON `c0`.`CustomerID` = `s`.`CustomerID`
+ORDER BY `c0`.`CustomerID`, `s`.`OrderID`, `s`.`OrderID0`
 """);
     }
 
@@ -1525,20 +1525,20 @@ public override async Task Include_collection_on_additional_from_clause(bool asy
 """
 @__p_0='5'
 
-SELECT `t0`.`CustomerID`, `t0`.`Address`, `t0`.`City`, `t0`.`CompanyName`, `t0`.`ContactName`, `t0`.`ContactTitle`, `t0`.`Country`, `t0`.`Fax`, `t0`.`Phone`, `t0`.`PostalCode`, `t0`.`Region`, `t`.`CustomerID`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c2`.`CustomerID`, `c2`.`Address`, `c2`.`City`, `c2`.`CompanyName`, `c2`.`ContactName`, `c2`.`ContactTitle`, `c2`.`Country`, `c2`.`Fax`, `c2`.`Phone`, `c2`.`PostalCode`, `c2`.`Region`, `c1`.`CustomerID`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`
     FROM `Customers` AS `c`
     ORDER BY `c`.`CustomerID`
     LIMIT @__p_0
-) AS `t`
+) AS `c1`
 CROSS JOIN (
     SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
     FROM `Customers` AS `c0`
     WHERE `c0`.`CustomerID` LIKE 'F%'
-) AS `t0`
-LEFT JOIN `Orders` AS `o` ON `t0`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`, `t0`.`CustomerID`
+) AS `c2`
+LEFT JOIN `Orders` AS `o` ON `c2`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
 """);
     }
 
@@ -1548,13 +1548,13 @@ public override async Task Include_reference_distinct_is_server_evaluated(bool a
 
         AssertSql(
 """
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
+SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM (
     SELECT DISTINCT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10250
-) AS `t`
-LEFT JOIN `Customers` AS `c` ON `t`.`CustomerID` = `c`.`CustomerID`
+) AS `o0`
+LEFT JOIN `Customers` AS `c` ON `o0`.`CustomerID` = `c`.`CustomerID`
 """);
     }
 
@@ -1564,14 +1564,14 @@ public override async Task Include_collection_distinct_is_server_evaluated(bool
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT DISTINCT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` LIKE 'A%'
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """);
     }
 
@@ -1608,9 +1608,9 @@ from c2 in ss.Set<Customer>().Include(c => c.Orders).OrderBy(c => c.CustomerID).
 @__p_0='2'
 @__p_1='1'
 
-SELECT `t1`.`CustomerID`, `t1`.`Address`, `t1`.`City`, `t1`.`CompanyName`, `t1`.`ContactName`, `t1`.`ContactTitle`, `t1`.`Country`, `t1`.`Fax`, `t1`.`Phone`, `t1`.`PostalCode`, `t1`.`Region`, `t1`.`CustomerID0`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `t1`.`Address0`, `t1`.`City0`, `t1`.`CompanyName0`, `t1`.`ContactName0`, `t1`.`ContactTitle0`, `t1`.`Country0`, `t1`.`Fax0`, `t1`.`Phone0`, `t1`.`PostalCode0`, `t1`.`Region0`, `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
+SELECT `s`.`CustomerID`, `s`.`Address`, `s`.`City`, `s`.`CompanyName`, `s`.`ContactName`, `s`.`ContactTitle`, `s`.`Country`, `s`.`Fax`, `s`.`Phone`, `s`.`PostalCode`, `s`.`Region`, `s`.`CustomerID0`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `s`.`Address0`, `s`.`City0`, `s`.`CompanyName0`, `s`.`ContactName0`, `s`.`ContactTitle0`, `s`.`Country0`, `s`.`Fax0`, `s`.`Phone0`, `s`.`PostalCode0`, `s`.`Region0`, `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
 FROM (
-    SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `t0`.`CustomerID` AS `CustomerID0`, `t0`.`Address` AS `Address0`, `t0`.`City` AS `City0`, `t0`.`CompanyName` AS `CompanyName0`, `t0`.`ContactName` AS `ContactName0`, `t0`.`ContactTitle` AS `ContactTitle0`, `t0`.`Country` AS `Country0`, `t0`.`Fax` AS `Fax0`, `t0`.`Phone` AS `Phone0`, `t0`.`PostalCode` AS `PostalCode0`, `t0`.`Region` AS `Region0`
+    SELECT `c1`.`CustomerID`, `c1`.`Address`, `c1`.`City`, `c1`.`CompanyName`, `c1`.`ContactName`, `c1`.`ContactTitle`, `c1`.`Country`, `c1`.`Fax`, `c1`.`Phone`, `c1`.`PostalCode`, `c1`.`Region`, `c2`.`CustomerID` AS `CustomerID0`, `c2`.`Address` AS `Address0`, `c2`.`City` AS `City0`, `c2`.`CompanyName` AS `CompanyName0`, `c2`.`ContactName` AS `ContactName0`, `c2`.`ContactTitle` AS `ContactTitle0`, `c2`.`Country` AS `Country0`, `c2`.`Fax` AS `Fax0`, `c2`.`Phone` AS `Phone0`, `c2`.`PostalCode` AS `PostalCode0`, `c2`.`Region` AS `Region0`
     FROM (
         SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
         FROM `Customers` AS `c`
@@ -1620,19 +1620,19 @@ from c2 in ss.Set<Customer>().Include(c => c.Orders).OrderBy(c => c.CustomerID).
             WHERE `c`.`CustomerID` = `o`.`CustomerID`
             LIMIT 1)
         LIMIT @__p_0
-    ) AS `t`
+    ) AS `c1`
     CROSS JOIN (
         SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
         FROM `Customers` AS `c0`
         ORDER BY `c0`.`CustomerID`
         LIMIT 2 OFFSET 2
-    ) AS `t0`
-    ORDER BY `t`.`CustomerID`, `t0`.`CustomerID`
+    ) AS `c2`
+    ORDER BY `c1`.`CustomerID`, `c2`.`CustomerID`
     LIMIT @__p_1
-) AS `t1`
-LEFT JOIN `Orders` AS `o0` ON `t1`.`CustomerID` = `o0`.`CustomerID`
-LEFT JOIN `Orders` AS `o1` ON `t1`.`CustomerID0` = `o1`.`CustomerID`
-ORDER BY `t1`.`CustomerID`, `t1`.`CustomerID0`, `o0`.`OrderID`
+) AS `s`
+LEFT JOIN `Orders` AS `o0` ON `s`.`CustomerID` = `o0`.`CustomerID`
+LEFT JOIN `Orders` AS `o1` ON `s`.`CustomerID0` = `o1`.`CustomerID`
+ORDER BY `s`.`CustomerID`, `s`.`CustomerID0`, `o0`.`OrderID`
 """);
     }
 
@@ -1672,14 +1672,14 @@ public override async Task Include_closes_reader(bool async)
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     LIMIT 1
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """,
                 //
                 """
@@ -1696,15 +1696,15 @@ public override async Task Include_with_skip(bool async)
 """
 @__p_0='80'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`ContactName`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`ContactName`, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`ContactName`, `c0`.`CustomerID`
 """);
     }
 
@@ -1714,26 +1714,26 @@ public override async Task Include_collection_Join_GroupBy_Select(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`, `o3`.`OrderID`, `o3`.`ProductID`, `o3`.`Discount`, `o3`.`Quantity`, `o3`.`UnitPrice`
+SELECT `s1`.`OrderID`, `s1`.`CustomerID`, `s1`.`EmployeeID`, `s1`.`OrderDate`, `s`.`OrderID`, `s1`.`OrderID0`, `s1`.`ProductID`, `o3`.`OrderID`, `o3`.`ProductID`, `o3`.`Discount`, `o3`.`Quantity`, `o3`.`UnitPrice`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     INNER JOIN `Order Details` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o`.`OrderID`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`OrderID0`, `t1`.`ProductID`
+    SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`OrderID0`, `s0`.`ProductID`
     FROM (
         SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `o2`.`OrderID` AS `OrderID0`, `o2`.`ProductID`, ROW_NUMBER() OVER(PARTITION BY `o1`.`OrderID` ORDER BY `o1`.`OrderID`) AS `row`
         FROM `Orders` AS `o1`
         INNER JOIN `Order Details` AS `o2` ON `o1`.`OrderID` = `o2`.`OrderID`
         WHERE `o1`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
-LEFT JOIN `Order Details` AS `o3` ON `t0`.`OrderID` = `o3`.`OrderID`
-ORDER BY `t`.`OrderID`, `t0`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`, `o3`.`OrderID`
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
+LEFT JOIN `Order Details` AS `o3` ON `s1`.`OrderID` = `o3`.`OrderID`
+ORDER BY `s`.`OrderID`, `s1`.`OrderID`, `s1`.`OrderID0`, `s1`.`ProductID`, `o3`.`OrderID`
 """);
     }
 
@@ -1743,24 +1743,24 @@ public override async Task Include_collection_GroupBy_Select(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t`.`OrderID`, `o1`.`OrderID`, `o1`.`ProductID`, `o1`.`Discount`, `o1`.`Quantity`, `o1`.`UnitPrice`
+SELECT `o4`.`OrderID`, `o4`.`CustomerID`, `o4`.`EmployeeID`, `o4`.`OrderDate`, `o2`.`OrderID`, `o1`.`OrderID`, `o1`.`ProductID`, `o1`.`Discount`, `o1`.`Quantity`, `o1`.`UnitPrice`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o`.`OrderID`
-) AS `t`
+) AS `o2`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`
+    SELECT `o3`.`OrderID`, `o3`.`CustomerID`, `o3`.`EmployeeID`, `o3`.`OrderDate`
     FROM (
         SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, ROW_NUMBER() OVER(PARTITION BY `o0`.`OrderID` ORDER BY `o0`.`OrderID`) AS `row`
         FROM `Orders` AS `o0`
         WHERE `o0`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
-LEFT JOIN `Order Details` AS `o1` ON `t0`.`OrderID` = `o1`.`OrderID`
-ORDER BY `t`.`OrderID`, `t0`.`OrderID`, `o1`.`OrderID`
+    ) AS `o3`
+    WHERE `o3`.`row` <= 1
+) AS `o4` ON `o2`.`OrderID` = `o4`.`OrderID`
+LEFT JOIN `Order Details` AS `o1` ON `o4`.`OrderID` = `o1`.`OrderID`
+ORDER BY `o2`.`OrderID`, `o4`.`OrderID`, `o1`.`OrderID`
 """);
     }
 
@@ -1772,15 +1772,15 @@ public override async Task Include_collection_orderby_take(bool async)
 """
 @__p_0='5'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`CustomerID`
     LIMIT @__p_0
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """);
     }
 
@@ -1790,26 +1790,26 @@ public override async Task Join_Include_collection_GroupBy_Select(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`, `o3`.`OrderID`, `o3`.`ProductID`, `o3`.`Discount`, `o3`.`Quantity`, `o3`.`UnitPrice`
+SELECT `s1`.`OrderID`, `s1`.`CustomerID`, `s1`.`EmployeeID`, `s1`.`OrderDate`, `s`.`OrderID`, `s1`.`OrderID0`, `s1`.`ProductID`, `o3`.`OrderID`, `o3`.`ProductID`, `o3`.`Discount`, `o3`.`Quantity`, `o3`.`UnitPrice`
 FROM (
     SELECT `o0`.`OrderID`
     FROM `Order Details` AS `o`
     INNER JOIN `Orders` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o0`.`OrderID`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`OrderID0`, `t1`.`ProductID`
+    SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`OrderID0`, `s0`.`ProductID`
     FROM (
         SELECT `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`, `o1`.`OrderID` AS `OrderID0`, `o1`.`ProductID`, ROW_NUMBER() OVER(PARTITION BY `o2`.`OrderID` ORDER BY `o2`.`OrderID`) AS `row`
         FROM `Order Details` AS `o1`
         INNER JOIN `Orders` AS `o2` ON `o1`.`OrderID` = `o2`.`OrderID`
         WHERE `o1`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
-LEFT JOIN `Order Details` AS `o3` ON `t0`.`OrderID` = `o3`.`OrderID`
-ORDER BY `t`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`, `t0`.`OrderID`, `o3`.`OrderID`
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
+LEFT JOIN `Order Details` AS `o3` ON `s1`.`OrderID` = `o3`.`OrderID`
+ORDER BY `s`.`OrderID`, `s1`.`OrderID0`, `s1`.`ProductID`, `s1`.`OrderID`, `o3`.`OrderID`
 """);
     }
 
@@ -1847,21 +1847,21 @@ public override async Task Include_duplicate_reference2(bool async)
 """
 @__p_0='2'
 
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`
+SELECT `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`, `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`
 FROM (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
     FROM `Orders` AS `o`
     ORDER BY `o`.`OrderID`
     LIMIT @__p_0
-) AS `t`
+) AS `o1`
 CROSS JOIN (
     SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
     FROM `Orders` AS `o0`
     ORDER BY `o0`.`OrderID`
     LIMIT 2 OFFSET 2
-) AS `t0`
-LEFT JOIN `Customers` AS `c` ON `t`.`CustomerID` = `c`.`CustomerID`
-ORDER BY `t`.`OrderID`
+) AS `o2`
+LEFT JOIN `Customers` AS `c` ON `o1`.`CustomerID` = `c`.`CustomerID`
+ORDER BY `o1`.`OrderID`
 """);
     }
 
@@ -1917,26 +1917,26 @@ public override async Task SelectMany_Include_collection_GroupBy_Select(bool asy
 
         AssertSql(
 """
-SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`, `o3`.`OrderID`, `o3`.`ProductID`, `o3`.`Discount`, `o3`.`Quantity`, `o3`.`UnitPrice`
+SELECT `s1`.`OrderID`, `s1`.`CustomerID`, `s1`.`EmployeeID`, `s1`.`OrderDate`, `s`.`OrderID`, `s1`.`OrderID0`, `s1`.`ProductID`, `o3`.`OrderID`, `o3`.`ProductID`, `o3`.`Discount`, `o3`.`Quantity`, `o3`.`UnitPrice`
 FROM (
     SELECT `o0`.`OrderID`
     FROM `Order Details` AS `o`
     CROSS JOIN `Orders` AS `o0`
     WHERE `o`.`OrderID` = 10248
     GROUP BY `o0`.`OrderID`
-) AS `t`
+) AS `s`
 LEFT JOIN (
-    SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`, `t1`.`OrderID0`, `t1`.`ProductID`
+    SELECT `s0`.`OrderID`, `s0`.`CustomerID`, `s0`.`EmployeeID`, `s0`.`OrderDate`, `s0`.`OrderID0`, `s0`.`ProductID`
     FROM (
         SELECT `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`, `o1`.`OrderID` AS `OrderID0`, `o1`.`ProductID`, ROW_NUMBER() OVER(PARTITION BY `o2`.`OrderID` ORDER BY `o2`.`OrderID`) AS `row`
         FROM `Order Details` AS `o1`
         CROSS JOIN `Orders` AS `o2`
         WHERE `o1`.`OrderID` = 10248
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`OrderID` = `t0`.`OrderID`
-LEFT JOIN `Order Details` AS `o3` ON `t0`.`OrderID` = `o3`.`OrderID`
-ORDER BY `t`.`OrderID`, `t0`.`OrderID0`, `t0`.`ProductID`, `t0`.`OrderID`, `o3`.`OrderID`
+    ) AS `s0`
+    WHERE `s0`.`row` <= 1
+) AS `s1` ON `s`.`OrderID` = `s1`.`OrderID`
+LEFT JOIN `Order Details` AS `o3` ON `s1`.`OrderID` = `o3`.`OrderID`
+ORDER BY `s`.`OrderID`, `s1`.`OrderID0`, `s1`.`ProductID`, `s1`.`OrderID`, `o3`.`OrderID`
 """);
     }
 
@@ -1946,15 +1946,15 @@ public override async Task Include_collection_with_last(bool async)
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`CompanyName` DESC
     LIMIT 1
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CompanyName` DESC, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CompanyName` DESC, `c0`.`CustomerID`
 """);
     }
 
@@ -1994,20 +1994,20 @@ LIMIT 18446744073709551610 OFFSET @__p_1
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 @__p_1='1'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, TRUE AS `c`
     FROM `Customers` AS `c`
     WHERE `c`.`CustomerID` LIKE 'A%'
     ORDER BY 1
     LIMIT 18446744073709551610 OFFSET @__p_1
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`c`, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`c`, `c0`.`CustomerID`
 """);
         }
     }
@@ -2075,7 +2075,7 @@ public override async Task Include_collection_order_by_subquery(bool async)
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, (
         SELECT `o`.`OrderDate`
@@ -2092,9 +2092,9 @@ ORDER BY (
         ORDER BY `o`.`EmployeeID`
         LIMIT 1)
     LIMIT 1
-) AS `t`
-LEFT JOIN `Orders` AS `o0` ON `t`.`CustomerID` = `o0`.`CustomerID`
-ORDER BY `t`.`c`, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o0` ON `c0`.`CustomerID` = `o0`.`CustomerID`
+ORDER BY `c0`.`c`, `c0`.`CustomerID`
 """);
     }
 
@@ -2119,7 +2119,7 @@ public override async Task Then_include_collection_order_by_collection_column(bo
 
         AssertSql(
 """
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t0`.`OrderID0`, `t0`.`ProductID`, `t0`.`Discount`, `t0`.`Quantity`, `t0`.`UnitPrice`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`OrderID0`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, (
         SELECT `o`.`OrderDate`
@@ -2136,13 +2136,13 @@ ORDER BY (
         ORDER BY `o`.`OrderDate` DESC
         LIMIT 1) DESC
     LIMIT 1
-) AS `t`
+) AS `c0`
 LEFT JOIN (
     SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, `o1`.`OrderID` AS `OrderID0`, `o1`.`ProductID`, `o1`.`Discount`, `o1`.`Quantity`, `o1`.`UnitPrice`
     FROM `Orders` AS `o0`
     LEFT JOIN `Order Details` AS `o1` ON `o0`.`OrderID` = `o1`.`OrderID`
-) AS `t0` ON `t`.`CustomerID` = `t0`.`CustomerID`
-ORDER BY `t`.`c` DESC, `t`.`CustomerID`, `t0`.`OrderID`, `t0`.`OrderID0`
+) AS `s` ON `c0`.`CustomerID` = `s`.`CustomerID`
+ORDER BY `c0`.`c` DESC, `c0`.`CustomerID`, `s`.`OrderID`, `s`.`OrderID0`
 """);
     }
 
@@ -2169,14 +2169,14 @@ public override async Task Include_collection_skip_no_order_by(bool async)
 """
 @__p_0='10'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`CustomerID`
 """);
     }
 
@@ -2186,16 +2186,16 @@ public override async Task Include_multi_level_reference_then_include_collection
 
         AssertSql(
 """
-SELECT `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`, `t`.`CustomerID0`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`CustomerID0`, `s`.`Address`, `s`.`City`, `s`.`CompanyName`, `s`.`ContactName`, `s`.`ContactTitle`, `s`.`Country`, `s`.`Fax`, `s`.`Phone`, `s`.`PostalCode`, `s`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
 FROM (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, `c`.`CustomerID` AS `CustomerID0`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Orders` AS `o`
     LEFT JOIN `Customers` AS `c` ON `o`.`CustomerID` = `c`.`CustomerID`
     WHERE `o`.`OrderID` = 10248
     LIMIT 2
-) AS `t`
-LEFT JOIN `Orders` AS `o0` ON `t`.`CustomerID0` = `o0`.`CustomerID`
-ORDER BY `t`.`OrderID`, `t`.`CustomerID0`
+) AS `s`
+LEFT JOIN `Orders` AS `o0` ON `s`.`CustomerID0` = `o0`.`CustomerID`
+ORDER BY `s`.`OrderID`, `s`.`CustomerID0`
 """);
     }
 
@@ -2232,9 +2232,9 @@ public override async Task Include_where_skip_take_projection(bool async)
     WHERE `o`.`Quantity` = 10
     ORDER BY `o`.`OrderID`, `o`.`ProductID`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-INNER JOIN `Orders` AS `o0` ON `t`.`OrderID` = `o0`.`OrderID`
-ORDER BY `t`.`OrderID`, `t`.`ProductID`
+) AS `o1`
+INNER JOIN `Orders` AS `o0` ON `o1`.`OrderID` = `o0`.`OrderID`
+ORDER BY `o1`.`OrderID`, `o1`.`ProductID`
 """);
     }
 
@@ -2246,15 +2246,15 @@ public override async Task Include_with_take(bool async)
 """
 @__p_0='10'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`, `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`ContactName` DESC
     LIMIT @__p_0
-) AS `t`
-LEFT JOIN `Orders` AS `o` ON `t`.`CustomerID` = `o`.`CustomerID`
-ORDER BY `t`.`ContactName` DESC, `t`.`CustomerID`
+) AS `c0`
+LEFT JOIN `Orders` AS `o` ON `c0`.`CustomerID` = `o`.`CustomerID`
+ORDER BY `c0`.`ContactName` DESC, `c0`.`CustomerID`
 """);
     }
 
@@ -2278,15 +2278,15 @@ public override async Task Include_list(bool async)
 
         AssertSql(
 """
-SELECT `p`.`ProductID`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice`, `p`.`UnitsInStock`, `t`.`OrderID`, `t`.`ProductID`, `t`.`Discount`, `t`.`Quantity`, `t`.`UnitPrice`, `t`.`OrderID0`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`
+SELECT `p`.`ProductID`, `p`.`Discontinued`, `p`.`ProductName`, `p`.`SupplierID`, `p`.`UnitPrice`, `p`.`UnitsInStock`, `s`.`OrderID`, `s`.`ProductID`, `s`.`Discount`, `s`.`Quantity`, `s`.`UnitPrice`, `s`.`OrderID0`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`
 FROM `Products` AS `p`
 LEFT JOIN (
     SELECT `o`.`OrderID`, `o`.`ProductID`, `o`.`Discount`, `o`.`Quantity`, `o`.`UnitPrice`, `o0`.`OrderID` AS `OrderID0`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
     FROM `Order Details` AS `o`
     INNER JOIN `Orders` AS `o0` ON `o`.`OrderID` = `o0`.`OrderID`
-) AS `t` ON `p`.`ProductID` = `t`.`ProductID`
+) AS `s` ON `p`.`ProductID` = `s`.`ProductID`
 WHERE ((`p`.`ProductID` % 17) = 5) AND (`p`.`UnitPrice` < 20.0)
-ORDER BY `p`.`ProductID`, `t`.`OrderID`, `t`.`ProductID`
+ORDER BY `p`.`ProductID`, `s`.`OrderID`, `s`.`ProductID`
 """);
     }
 
@@ -2378,7 +2378,7 @@ public override async Task Filtered_include_with_multiple_ordering(bool async)
 
         AssertSql(
 """
-SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t`.`OrderID`, `t`.`CustomerID`, `t`.`EmployeeID`, `t`.`OrderDate`
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
 FROM `Customers` AS `c`
 LEFT JOIN LATERAL (
     SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
@@ -2386,9 +2386,9 @@ LEFT JOIN LATERAL (
     WHERE `c`.`CustomerID` = `o`.`CustomerID`
     ORDER BY `o`.`OrderID`
     LIMIT 18446744073709551610 OFFSET 1
-) AS `t` ON TRUE
+) AS `o0` ON TRUE
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t`.`OrderDate` DESC
+ORDER BY `c`.`CustomerID`, `o0`.`OrderDate` DESC
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindFunctionsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindFunctionsQueryMySqlTest.cs
index ff8e5def8..580d38e55 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindFunctionsQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindFunctionsQueryMySqlTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.TestUtilities;
@@ -528,13 +528,13 @@ public override async Task String_Contains_parameter_with_whitespace(bool async)
         {
             await base.String_Contains_parameter_with_whitespace(async);
 
-            AssertSql(
+        AssertSql(
 """
-@__pattern_0_rewritten='%     %' (Size = 30)
+@__pattern_0_contains='%     %' (Size = 30)
 
 SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-WHERE `c`.`ContactName` LIKE @__pattern_0_rewritten
+WHERE `c`.`ContactName` LIKE @__pattern_0_contains
 """);
         }
 
@@ -1806,13 +1806,13 @@ public override async Task String_StartsWith_Parameter(bool async)
         {
             await base.String_StartsWith_Parameter(async);
 
-            AssertSql(
+        AssertSql(
 """
-@__pattern_0_rewritten='M%' (Size = 30)
+@__pattern_0_startswith='M%' (Size = 30)
 
 SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-WHERE `c`.`ContactName` LIKE @__pattern_0_rewritten
+WHERE `c`.`ContactName` LIKE @__pattern_0_startswith
 """);
         }
 
@@ -1820,13 +1820,13 @@ public override async Task String_EndsWith_Parameter(bool async)
         {
             await base.String_EndsWith_Parameter(async);
 
-            AssertSql(
+        AssertSql(
 """
-@__pattern_0_rewritten='%b' (Size = 30)
+@__pattern_0_endswith='%b' (Size = 30)
 
 SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
 FROM `Customers` AS `c`
-WHERE `c`.`ContactName` LIKE @__pattern_0_rewritten
+WHERE `c`.`ContactName` LIKE @__pattern_0_endswith
 """);
         }
 
@@ -1834,16 +1834,16 @@ public override async Task String_Join_over_non_nullable_column(bool async)
         {
             await base.String_Join_over_non_nullable_column(async);
 
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`City`, `c0`.`CustomerID`
+SELECT `c1`.`City`, `c0`.`CustomerID`
 FROM (
     SELECT `c`.`City`
     FROM `Customers` AS `c`
     GROUP BY `c`.`City`
-) AS `t`
-LEFT JOIN `Customers` AS `c0` ON `t`.`City` = `c0`.`City`
-ORDER BY `t`.`City`
+) AS `c1`
+LEFT JOIN `Customers` AS `c0` ON `c1`.`City` = `c0`.`City`
+ORDER BY `c1`.`City`
 """);
         }
 
@@ -1851,20 +1851,20 @@ public override async Task String_Join_with_predicate(bool async)
         {
             await base.String_Join_with_predicate(async);
 
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`City`, `t0`.`CustomerID`
+SELECT `c1`.`City`, `c2`.`CustomerID`
 FROM (
     SELECT `c`.`City`
     FROM `Customers` AS `c`
     GROUP BY `c`.`City`
-) AS `t`
+) AS `c1`
 LEFT JOIN (
     SELECT `c0`.`CustomerID`, `c0`.`City`
     FROM `Customers` AS `c0`
     WHERE CHAR_LENGTH(`c0`.`ContactName`) > 10
-) AS `t0` ON `t`.`City` = `t0`.`City`
-ORDER BY `t`.`City`
+) AS `c2` ON `c1`.`City` = `c2`.`City`
+ORDER BY `c1`.`City`
 """);
         }
 
@@ -1872,16 +1872,16 @@ public override async Task String_Join_with_ordering(bool async)
         {
             await base.String_Join_with_ordering(async);
 
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`City`, `c0`.`CustomerID`
+SELECT `c1`.`City`, `c0`.`CustomerID`
 FROM (
     SELECT `c`.`City`
     FROM `Customers` AS `c`
     GROUP BY `c`.`City`
-) AS `t`
-LEFT JOIN `Customers` AS `c0` ON `t`.`City` = `c0`.`City`
-ORDER BY `t`.`City`, `c0`.`CustomerID` DESC
+) AS `c1`
+LEFT JOIN `Customers` AS `c0` ON `c1`.`City` = `c0`.`City`
+ORDER BY `c1`.`City`, `c0`.`CustomerID` DESC
 """);
         }
 
@@ -1889,16 +1889,16 @@ public override async Task String_Join_over_nullable_column(bool async)
         {
             await base.String_Join_over_nullable_column(async);
 
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`City`, `c0`.`Region`, `c0`.`CustomerID`
+SELECT `c1`.`City`, `c0`.`Region`, `c0`.`CustomerID`
 FROM (
     SELECT `c`.`City`
     FROM `Customers` AS `c`
     GROUP BY `c`.`City`
-) AS `t`
-LEFT JOIN `Customers` AS `c0` ON `t`.`City` = `c0`.`City`
-ORDER BY `t`.`City`
+) AS `c1`
+LEFT JOIN `Customers` AS `c0` ON `c1`.`City` = `c0`.`City`
+ORDER BY `c1`.`City`
 """);
         }
 
@@ -1906,16 +1906,16 @@ public override async Task String_Concat(bool async)
         {
             await base.String_Concat(async);
 
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`City`, `c0`.`CustomerID`
+SELECT `c1`.`City`, `c0`.`CustomerID`
 FROM (
     SELECT `c`.`City`
     FROM `Customers` AS `c`
     GROUP BY `c`.`City`
-) AS `t`
-LEFT JOIN `Customers` AS `c0` ON `t`.`City` = `c0`.`City`
-ORDER BY `t`.`City`
+) AS `c1`
+LEFT JOIN `Customers` AS `c0` ON `c1`.`City` = `c0`.`City`
+ORDER BY `c1`.`City`
 """);
         }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindGroupByQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindGroupByQueryMySqlTest.cs
index 637ae56eb..e53d3002c 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindGroupByQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindGroupByQueryMySqlTest.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
@@ -27,96 +27,106 @@ public override async Task AsEnumerable_in_subquery_for_GroupBy(bool async)
         {
             await base.AsEnumerable_in_subquery_for_GroupBy(async);
 
-            AssertSql(
-                @"SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `t2`.`OrderID`, `t2`.`CustomerID`, `t2`.`EmployeeID`, `t2`.`OrderDate`, `t2`.`CustomerID0`
+        AssertSql(
+"""
+SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`, `s`.`OrderID`, `s`.`CustomerID`, `s`.`EmployeeID`, `s`.`OrderDate`, `s`.`CustomerID0`
 FROM `Customers` AS `c`
 LEFT JOIN LATERAL (
-    SELECT `t0`.`OrderID`, `t0`.`CustomerID`, `t0`.`EmployeeID`, `t0`.`OrderDate`, `t`.`CustomerID` AS `CustomerID0`
+    SELECT `o3`.`OrderID`, `o3`.`CustomerID`, `o3`.`EmployeeID`, `o3`.`OrderDate`, `o1`.`CustomerID` AS `CustomerID0`
     FROM (
         SELECT `o`.`CustomerID`
         FROM `Orders` AS `o`
         WHERE `o`.`CustomerID` = `c`.`CustomerID`
         GROUP BY `o`.`CustomerID`
-    ) AS `t`
+    ) AS `o1`
     LEFT JOIN (
-        SELECT `t1`.`OrderID`, `t1`.`CustomerID`, `t1`.`EmployeeID`, `t1`.`OrderDate`
+        SELECT `o2`.`OrderID`, `o2`.`CustomerID`, `o2`.`EmployeeID`, `o2`.`OrderDate`
         FROM (
             SELECT `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`, ROW_NUMBER() OVER(PARTITION BY `o0`.`CustomerID` ORDER BY `o0`.`OrderDate` DESC) AS `row`
             FROM `Orders` AS `o0`
             WHERE `o0`.`CustomerID` = `c`.`CustomerID`
-        ) AS `t1`
-        WHERE `t1`.`row` <= 1
-    ) AS `t0` ON `t`.`CustomerID` = `t0`.`CustomerID`
-) AS `t2` ON TRUE
+        ) AS `o2`
+        WHERE `o2`.`row` <= 1
+    ) AS `o3` ON `o1`.`CustomerID` = `o3`.`CustomerID`
+) AS `s` ON TRUE
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`, `t2`.`CustomerID0`");
+ORDER BY `c`.`CustomerID`, `s`.`CustomerID0`
+""");
         }
 
         public override async Task Complex_query_with_groupBy_in_subquery1(bool async)
         {
             await base.Complex_query_with_groupBy_in_subquery1(async);
 
-            AssertSql(
-                @"SELECT `c`.`CustomerID`, `t`.`Sum`, `t`.`CustomerID`
+        AssertSql(
+"""
+SELECT `c`.`CustomerID`, `o0`.`Sum`, `o0`.`CustomerID`
 FROM `Customers` AS `c`
 LEFT JOIN LATERAL (
     SELECT COALESCE(SUM(`o`.`OrderID`), 0) AS `Sum`, `o`.`CustomerID`
     FROM `Orders` AS `o`
     WHERE `c`.`CustomerID` = `o`.`CustomerID`
     GROUP BY `o`.`CustomerID`
-) AS `t` ON TRUE
-ORDER BY `c`.`CustomerID`");
+) AS `o0` ON TRUE
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         public override async Task Complex_query_with_groupBy_in_subquery2(bool async)
         {
             await base.Complex_query_with_groupBy_in_subquery2(async);
 
-            AssertSql(
-                @"SELECT `c`.`CustomerID`, `t`.`Max`, `t`.`Sum`, `t`.`CustomerID`
+        AssertSql(
+"""
+SELECT `c`.`CustomerID`, `o0`.`Max`, `o0`.`Sum`, `o0`.`CustomerID`
 FROM `Customers` AS `c`
 LEFT JOIN LATERAL (
     SELECT MAX(CHAR_LENGTH(`o`.`CustomerID`)) AS `Max`, COALESCE(SUM(`o`.`OrderID`), 0) AS `Sum`, `o`.`CustomerID`
     FROM `Orders` AS `o`
     WHERE `c`.`CustomerID` = `o`.`CustomerID`
     GROUP BY `o`.`CustomerID`
-) AS `t` ON TRUE
-ORDER BY `c`.`CustomerID`");
+) AS `o0` ON TRUE
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         public override async Task Complex_query_with_groupBy_in_subquery3(bool async)
         {
             await base.Complex_query_with_groupBy_in_subquery3(async);
 
-            AssertSql(
-                @"SELECT `c`.`CustomerID`, `t`.`Max`, `t`.`Sum`, `t`.`CustomerID`
+        AssertSql(
+"""
+SELECT `c`.`CustomerID`, `o0`.`Max`, `o0`.`Sum`, `o0`.`CustomerID`
 FROM `Customers` AS `c`
 LEFT JOIN LATERAL (
     SELECT MAX(CHAR_LENGTH(`o`.`CustomerID`)) AS `Max`, COALESCE(SUM(`o`.`OrderID`), 0) AS `Sum`, `o`.`CustomerID`
     FROM `Orders` AS `o`
     GROUP BY `o`.`CustomerID`
-) AS `t` ON TRUE
-ORDER BY `c`.`CustomerID`");
+) AS `o0` ON TRUE
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         public override async Task Select_nested_collection_with_groupby(bool async)
         {
             await base.Select_nested_collection_with_groupby(async);
 
-            AssertSql(
-                @"SELECT EXISTS (
+        AssertSql(
+"""
+SELECT EXISTS (
     SELECT 1
     FROM `Orders` AS `o`
-    WHERE `c`.`CustomerID` = `o`.`CustomerID`), `c`.`CustomerID`, `t`.`OrderID`
+    WHERE `c`.`CustomerID` = `o`.`CustomerID`), `c`.`CustomerID`, `o1`.`OrderID`
 FROM `Customers` AS `c`
 LEFT JOIN LATERAL (
     SELECT `o0`.`OrderID`
     FROM `Orders` AS `o0`
     WHERE `c`.`CustomerID` = `o0`.`CustomerID`
     GROUP BY `o0`.`OrderID`
-) AS `t` ON TRUE
+) AS `o1` ON TRUE
 WHERE `c`.`CustomerID` LIKE 'F%'
-ORDER BY `c`.`CustomerID`");
+ORDER BY `c`.`CustomerID`
+""");
         }
 
         [SupportedServerVersionCondition(nameof(ServerVersionSupport.OuterReferenceInMultiLevelSubquery))]
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindMiscellaneousQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindMiscellaneousQueryMySqlTest.cs
index bf037e684..5039792ac 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindMiscellaneousQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindMiscellaneousQueryMySqlTest.cs
@@ -170,19 +170,21 @@ public override async Task Take_Skip(bool async)
         {
             await base.Take_Skip(async);
 
-            AssertSql(
-                @"@__p_0='10'
+        AssertSql(
+"""
+@__p_0='10'
 @__p_1='5'
 
-SELECT `t`.`CustomerID`, `t`.`Address`, `t`.`City`, `t`.`CompanyName`, `t`.`ContactName`, `t`.`ContactTitle`, `t`.`Country`, `t`.`Fax`, `t`.`Phone`, `t`.`PostalCode`, `t`.`Region`
+SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     ORDER BY `c`.`ContactName`
     LIMIT @__p_0
-) AS `t`
-ORDER BY `t`.`ContactName`
-LIMIT 18446744073709551610 OFFSET @__p_1");
+) AS `c0`
+ORDER BY `c0`.`ContactName`
+LIMIT 18446744073709551610 OFFSET @__p_1
+""");
         }
 
         [ConditionalTheory]
@@ -247,19 +249,21 @@ await AssertQuery(
                     AssertCollection(e.ProductIds, a.ProductIds, ordered: true, elementAsserter: (ie, ia) => Assert.Equal(ie, ia));
                 });
 
-            AssertSql(
-                @"@__p_0='5'
+        AssertSql(
+"""
+@__p_0='5'
 
-SELECT `t`.`OrderID`, `o0`.`ProductID`, `o0`.`OrderID`
+SELECT `o1`.`OrderID`, `o0`.`ProductID`, `o0`.`OrderID`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10300
     ORDER BY `o`.`OrderID`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `Order Details` AS `o0` ON `t`.`OrderID` = `o0`.`OrderID`
-ORDER BY `t`.`OrderID`, `o0`.`ProductID`");
+) AS `o1`
+LEFT JOIN `Order Details` AS `o0` ON `o1`.`OrderID` = `o0`.`OrderID`
+ORDER BY `o1`.`OrderID`, `o0`.`ProductID`
+""");
         }
 
         /// <summary>
@@ -284,20 +288,22 @@ await AssertQuery(
                     AssertCollection(e.ProductIds, a.ProductIds, ordered: true, elementAsserter: (ie, ia) => Assert.Equal(ie, ia));
                 });
 
-            AssertSql(
-                @"@__p_1='10'
+        AssertSql(
+"""
+@__p_1='10'
 @__p_0='5'
 
-SELECT `t`.`OrderID`, `o0`.`ProductID`, `o0`.`OrderID`
+SELECT `o1`.`OrderID`, `o0`.`ProductID`, `o0`.`OrderID`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10300
     ORDER BY `o`.`OrderID`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t`
-LEFT JOIN `Order Details` AS `o0` ON `t`.`OrderID` = `o0`.`OrderID`
-ORDER BY `t`.`OrderID`, `o0`.`ProductID`");
+) AS `o1`
+LEFT JOIN `Order Details` AS `o0` ON `o1`.`OrderID` = `o0`.`OrderID`
+ORDER BY `o1`.`OrderID`, `o0`.`ProductID`
+""");
         }
 
         /// <summary>
@@ -321,19 +327,21 @@ await AssertQuery(
                     AssertCollection(e.ProductIds, a.ProductIds, ordered: true, elementAsserter: (ie, ia) => Assert.Equal(ie, ia));
                 });
 
-            AssertSql(
-                @"@__p_0='10'
+        AssertSql(
+"""
+@__p_0='10'
 
-SELECT `t`.`OrderID`, `o0`.`ProductID`, `o0`.`OrderID`
+SELECT `o1`.`OrderID`, `o0`.`ProductID`, `o0`.`OrderID`
 FROM (
     SELECT `o`.`OrderID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10300
     ORDER BY `o`.`OrderID`
     LIMIT @__p_0
-) AS `t`
-LEFT JOIN `Order Details` AS `o0` ON `t`.`OrderID` = `o0`.`OrderID`
-ORDER BY `t`.`OrderID`, `o0`.`ProductID`");
+) AS `o1`
+LEFT JOIN `Order Details` AS `o0` ON `o1`.`OrderID` = `o0`.`OrderID`
+ORDER BY `o1`.`OrderID`, `o0`.`ProductID`
+""");
         }
 
         public override Task Complex_nested_query_doesnt_try_binding_to_grandparent_when_parent_returns_complex_result(bool async)
@@ -454,19 +462,27 @@ public override async Task
                 Assert.True(expected[i].Orders?.SequenceEqual(actual[i].Orders) ?? true);
             }
 
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`CustomerID`, `o0`.`OrderID`, `o0`.`CustomerID`, `o0`.`EmployeeID`, `o0`.`OrderDate`
+SELECT `o0`.`CustomerID`, `o1`.`OrderID`, `o1`.`CustomerID`, `o1`.`EmployeeID`, `o1`.`OrderDate`
 FROM (
     SELECT DISTINCT `o`.`CustomerID`
     FROM `Orders` AS `o`
     WHERE `o`.`OrderID` < 10300
-) AS `t`
-LEFT JOIN `Orders` AS `o0` ON `t`.`CustomerID` = `o0`.`CustomerID`
-ORDER BY `t`.`CustomerID`, `o0`.`OrderID`
+) AS `o0`
+LEFT JOIN `Orders` AS `o1` ON `o0`.`CustomerID` = `o1`.`CustomerID`
+ORDER BY `o0`.`CustomerID`, `o1`.`OrderID`
 """);
         }
 
+        [SupportedServerVersionCondition(nameof(ServerVersionSupport.WhereSubqueryReferencesOuterQuery))]
+        public override async Task Subquery_with_navigation_inside_inline_collection(bool async)
+        {
+            await base.Subquery_with_navigation_inside_inline_collection(async);
+
+            AssertSql("");
+        }
+
         [SupportedServerVersionCondition(nameof(ServerVersionSupport.OuterReferenceInMultiLevelSubquery))]
         public override Task DefaultIfEmpty_Sum_over_collection_navigation(bool async)
         {
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindQueryFiltersQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindQueryFiltersQueryMySqlTest.cs
index fcc5eff90..5c0c8e84d 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindQueryFiltersQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindQueryFiltersQueryMySqlTest.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Query;
 using Xunit.Abstractions;
 
@@ -22,11 +22,11 @@ public override async Task Count_query(bool async)
 
         AssertSql(
 """
-@__ef_filter__TenantPrefix_0_rewritten='B%' (Size = 40)
+@__ef_filter__TenantPrefix_0_startswith='B%' (Size = 40)
 
 SELECT COUNT(*)
 FROM `Customers` AS `c`
-WHERE `c`.`CompanyName` LIKE @__ef_filter__TenantPrefix_0_rewritten
+WHERE `c`.`CompanyName` LIKE @__ef_filter__TenantPrefix_0_startswith
 """);
         }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindSelectQueryMySqlTest.MySql.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindSelectQueryMySqlTest.MySql.cs
index d8e699cb5..3b12c1b10 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindSelectQueryMySqlTest.MySql.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindSelectQueryMySqlTest.MySql.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.TestModels.Northwind;
@@ -40,19 +40,21 @@ await AssertQuery(
                 assertOrder: true,
                 assertEmpty: true); // TODO: Use a linq query that does not return an empty result.
 
-            AssertSql(
-                @"SELECT `t`.`Year`, `t`.`Count`
+        AssertSql(
+"""
+SELECT `o3`.`Year`, `o3`.`Count`
 FROM (
-    SELECT `t`.`Year`, COUNT(*) AS `Count`, `t`.`CustomerID`, `t`.`Year` = 1995 AS `c`
+    SELECT `o0`.`Year`, COUNT(*) AS `Count`, `o0`.`CustomerID`, `o0`.`Year` = 1995 AS `c`
     FROM (
         SELECT `o`.`CustomerID`, EXTRACT(year FROM `o`.`OrderDate`) AS `Year`
         FROM `Orders` AS `o`
         WHERE (`o`.`CustomerID` = 'ALFKI') AND `o`.`OrderDate` IS NOT NULL
-    ) AS `t`
-    GROUP BY `t`.`CustomerID`, `t`.`Year`, `c`
+    ) AS `o0`
+    GROUP BY `o0`.`CustomerID`, `o0`.`Year`, `c`
     HAVING `c`
-) AS `t`
-ORDER BY `t`.`Year`");
+) AS `o3`
+ORDER BY `o3`.`Year`
+""");
         }
 
         [ConditionalTheory]
@@ -76,27 +78,29 @@ await AssertQueryScalar(
                         .Select(k => k.Year)),
                 assertOrder: true);
 
-            AssertSql(
-                @"SELECT `t`.`Year`
+        AssertSql(
+"""
+SELECT `o7`.`Year`
 FROM (
-    SELECT `t`.`Year`, `t`.`CustomerID`, `t`.`Year` = 1995 AS `c`
+    SELECT `o0`.`Year`, `o0`.`CustomerID`, `o0`.`Year` = 1995 AS `c`
     FROM (
         SELECT `o`.`CustomerID`, EXTRACT(year FROM `o`.`OrderDate`) AS `Year`
         FROM `Orders` AS `o`
         WHERE (`o`.`CustomerID` = 'ALFKI') AND `o`.`OrderDate` IS NOT NULL
-    ) AS `t`
-    GROUP BY `t`.`CustomerID`, `t`.`Year`, `c`
+    ) AS `o0`
+    GROUP BY `o0`.`CustomerID`, `o0`.`Year`, `c`
     HAVING `c`
-) AS `t`
+) AS `o7`
 UNION ALL
-SELECT `t1`.`Key` AS `Year`
+SELECT `o2`.`Key` AS `Year`
 FROM (
-    SELECT EXTRACT(year FROM `o0`.`OrderDate`) AS `Key`
-    FROM `Orders` AS `o0`
-    WHERE `o0`.`OrderDate` IS NOT NULL
-) AS `t1`
-GROUP BY `t1`.`Key`
-HAVING COUNT(*) > 0");
+    SELECT EXTRACT(year FROM `o1`.`OrderDate`) AS `Key`
+    FROM `Orders` AS `o1`
+    WHERE `o1`.`OrderDate` IS NOT NULL
+) AS `o2`
+GROUP BY `o2`.`Key`
+HAVING COUNT(*) > 0
+""");
         }
     }
 }
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindSelectQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindSelectQueryMySqlTest.cs
index 21e53f7d4..ec6db87b8 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindSelectQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindSelectQueryMySqlTest.cs
@@ -1,9 +1,13 @@
 using System;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
 using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
+using Pomelo.EntityFrameworkCore.MySql.Tests;
 using Pomelo.EntityFrameworkCore.MySql.Tests.TestUtilities.Attributes;
 using Xunit;
 using Xunit.Abstractions;
@@ -40,9 +44,11 @@ public override async Task Select_datetime_month_component(bool async)
         {
             await base.Select_datetime_month_component(async);
 
-            AssertSql(
-                @"SELECT EXTRACT(month FROM `o`.`OrderDate`)
-FROM `Orders` AS `o`");
+        AssertSql(
+"""
+SELECT EXTRACT(month FROM `o`.`OrderDate`)
+FROM `Orders` AS `o`
+""");
         }
 
         [ConditionalTheory]
@@ -170,7 +176,14 @@ public override async Task Correlated_collection_after_distinct_with_complex_pro
                     () => base.Correlated_collection_after_distinct_with_complex_projection_not_containing_original_identifier(async)))
                 .Message;
 
-            Assert.Equal(RelationalStrings.InsufficientInformationToIdentifyElementOfCollectionJoin, message);
+            if (MySqlTestHelpers.HasPrimitiveCollectionsSupport(Fixture))
+            {
+                Assert.Equal(RelationalStrings.InsufficientInformationToIdentifyElementOfCollectionJoin, message);
+            }
+            else
+            {
+                Assert.Contains("Primitive collections support has not been enabled.", message);
+            }
 
             AssertSql();
         }
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindSetOperationsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindSetOperationsQueryMySqlTest.cs
index f94055d63..50ea0c948 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindSetOperationsQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindSetOperationsQueryMySqlTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Query;
@@ -126,15 +126,17 @@ public override async Task Except_simple_followed_by_projecting_constant(bool as
         {
             await base.Except_simple_followed_by_projecting_constant(async);
 
-            AssertSql(
-                @"SELECT 1
+        AssertSql(
+"""
+SELECT 1
 FROM (
     SELECT `c`.`CustomerID`, `c`.`Address`, `c`.`City`, `c`.`CompanyName`, `c`.`ContactName`, `c`.`ContactTitle`, `c`.`Country`, `c`.`Fax`, `c`.`Phone`, `c`.`PostalCode`, `c`.`Region`
     FROM `Customers` AS `c`
     EXCEPT
     SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
     FROM `Customers` AS `c0`
-) AS `t`");
+) AS `e`
+""");
         }
 
         [SupportedServerVersionCondition(nameof(ServerVersionSupport.ExceptIntercept))]
@@ -201,7 +203,7 @@ public override async Task Union_Select_scalar(bool async)
         {
             await base.Union_Select_scalar(async);
 
-            AssertSql(
+        AssertSql(
 """
 SELECT 1
 FROM (
@@ -210,7 +212,7 @@ SELECT 1
     UNION
     SELECT `c0`.`CustomerID`, `c0`.`Address`, `c0`.`City`, `c0`.`CompanyName`, `c0`.`ContactName`, `c0`.`ContactTitle`, `c0`.`Country`, `c0`.`Fax`, `c0`.`Phone`, `c0`.`PostalCode`, `c0`.`Region`
     FROM `Customers` AS `c0`
-) AS `t`
+) AS `u`
 """);
         }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindSqlQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindSqlQueryMySqlTest.cs
index fe827d4bc..0166febd2 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindSqlQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindSqlQueryMySqlTest.cs
@@ -39,10 +39,10 @@ public override async Task SqlQuery_composed_Contains(bool async)
 SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`
 FROM `Orders` AS `o`
 WHERE `o`.`OrderID` IN (
-    SELECT `t`.`Value`
+    SELECT `s`.`Value`
     FROM (
         SELECT `ProductID` AS `Value` FROM `Products`
-    ) AS `t`
+    ) AS `s`
 )
 """);
     }
@@ -53,11 +53,11 @@ public override async Task SqlQuery_composed_Join(bool async)
 
         AssertSql(
 """
-SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, CAST(`t`.`Value` AS signed) AS `p`
+SELECT `o`.`OrderID`, `o`.`CustomerID`, `o`.`EmployeeID`, `o`.`OrderDate`, CAST(`s`.`Value` AS signed) AS `p`
 FROM `Orders` AS `o`
 INNER JOIN (
     SELECT `ProductID` AS `Value` FROM `Products`
-) AS `t` ON `o`.`OrderID` = CAST(`t`.`Value` AS signed)
+) AS `s` ON `o`.`OrderID` = CAST(`s`.`Value` AS signed)
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/OwnedEntityQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/OwnedEntityQueryMySqlTest.cs
index 8cf4894ee..418e77c76 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/OwnedEntityQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/OwnedEntityQueryMySqlTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
@@ -17,27 +17,29 @@ public override async Task Multiple_single_result_in_projection_containing_owned
         {
             await base.Multiple_single_result_in_projection_containing_owned_types(async);
 
-            AssertSql(
-                @"SELECT `e`.`Id`, `t0`.`Id`, `t0`.`Entity20277Id`, `t0`.`Owned_IsDeleted`, `t0`.`Owned_Value`, `t0`.`Type`, `t0`.`c`, `t1`.`Id`, `t1`.`Entity20277Id`, `t1`.`Owned_IsDeleted`, `t1`.`Owned_Value`, `t1`.`Type`, `t1`.`c`
+        AssertSql(
+"""
+SELECT `e`.`Id`, `c2`.`Id`, `c2`.`EntityId`, `c2`.`Owned_IsDeleted`, `c2`.`Owned_Value`, `c2`.`Type`, `c2`.`c`, `c4`.`Id`, `c4`.`EntityId`, `c4`.`Owned_IsDeleted`, `c4`.`Owned_Value`, `c4`.`Type`, `c4`.`c`
 FROM `Entities` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Entity20277Id`, `t`.`Owned_IsDeleted`, `t`.`Owned_Value`, `t`.`Type`, `t`.`c`
+    SELECT `c1`.`Id`, `c1`.`EntityId`, `c1`.`Owned_IsDeleted`, `c1`.`Owned_Value`, `c1`.`Type`, `c1`.`c`
     FROM (
-        SELECT `c`.`Id`, `c`.`Entity20277Id`, `c`.`Owned_IsDeleted`, `c`.`Owned_Value`, `c`.`Type`, 1 AS `c`, ROW_NUMBER() OVER(PARTITION BY `c`.`Entity20277Id` ORDER BY `c`.`Entity20277Id`, `c`.`Id`) AS `row`
-        FROM `Child20277` AS `c`
+        SELECT `c`.`Id`, `c`.`EntityId`, `c`.`Owned_IsDeleted`, `c`.`Owned_Value`, `c`.`Type`, 1 AS `c`, ROW_NUMBER() OVER(PARTITION BY `c`.`EntityId` ORDER BY `c`.`EntityId`, `c`.`Id`) AS `row`
+        FROM `Child` AS `c`
         WHERE `c`.`Type` = 1
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `e`.`Id` = `t0`.`Entity20277Id`
+    ) AS `c1`
+    WHERE `c1`.`row` <= 1
+) AS `c2` ON `e`.`Id` = `c2`.`EntityId`
 LEFT JOIN (
-    SELECT `t2`.`Id`, `t2`.`Entity20277Id`, `t2`.`Owned_IsDeleted`, `t2`.`Owned_Value`, `t2`.`Type`, `t2`.`c`
+    SELECT `c3`.`Id`, `c3`.`EntityId`, `c3`.`Owned_IsDeleted`, `c3`.`Owned_Value`, `c3`.`Type`, `c3`.`c`
     FROM (
-        SELECT `c0`.`Id`, `c0`.`Entity20277Id`, `c0`.`Owned_IsDeleted`, `c0`.`Owned_Value`, `c0`.`Type`, 1 AS `c`, ROW_NUMBER() OVER(PARTITION BY `c0`.`Entity20277Id` ORDER BY `c0`.`Entity20277Id`, `c0`.`Id`) AS `row`
-        FROM `Child20277` AS `c0`
+        SELECT `c0`.`Id`, `c0`.`EntityId`, `c0`.`Owned_IsDeleted`, `c0`.`Owned_Value`, `c0`.`Type`, 1 AS `c`, ROW_NUMBER() OVER(PARTITION BY `c0`.`EntityId` ORDER BY `c0`.`EntityId`, `c0`.`Id`) AS `row`
+        FROM `Child` AS `c0`
         WHERE `c0`.`Type` = 2
-    ) AS `t2`
-    WHERE `t2`.`row` <= 1
-) AS `t1` ON `e`.`Id` = `t1`.`Entity20277Id`");
+    ) AS `c3`
+    WHERE `c3`.`row` <= 1
+) AS `c4` ON `e`.`Id` = `c4`.`EntityId`
+""");
         }
 
         public override async Task Owned_collection_basic_split_query(bool async)
@@ -63,26 +65,29 @@ public override async Task Owned_collection_basic_split_query(bool async)
                 : query.FirstOrDefault();
         }
 
-        public override async Task Projecting_correlated_collection_property_for_owned_entity(bool async)
+        [ConditionalTheory(Skip = "https://github.com/dotnet/efcore/pull/32509#issuecomment-1948812777")]
+        public override /*async*/ Task Projecting_correlated_collection_property_for_owned_entity(bool async)
         {
-            var contextFactory = await InitializeAsync<MyContext18582>(seed: c => c.Seed());
-
-            using var context = contextFactory.CreateContext();
-            var query = context.Warehouses.Select(x => new WarehouseModel
-            {
-                WarehouseCode = x.WarehouseCode,
-                DestinationCountryCodes = x.DestinationCountries.Select(c => c.CountryCode)
-                    .OrderByDescending(c => c) // <-- explicitly order
-                    .ToArray()
-            }).AsNoTracking();
-
-            var result = async
-                ? await query.ToListAsync()
-                : query.ToList();
-
-            var warehouseModel = Assert.Single(result);
-            Assert.Equal("W001", warehouseModel.WarehouseCode);
-            Assert.True(new[] { "US", "CA" }.SequenceEqual(warehouseModel.DestinationCountryCodes));
+            return Task.CompletedTask;
+            // var contextFactory = await InitializeAsync<Context18582>(seed: c => c.Seed());
+            //
+            // using var context = contextFactory.CreateContext();
+            // var query = context.Warehouses.Select(
+            //     x => new Context18582.WarehouseModel
+            //     {
+            //         WarehouseCode = x.WarehouseCode,
+            //         DestinationCountryCodes = x.DestinationCountries.Select(c => c.CountryCode)
+            //             .OrderByDescending(c => c) // <-- explicitly order
+            //             .ToArray()
+            //     }).AsNoTracking();
+            //
+            // var result = async
+            //     ? await query.ToListAsync()
+            //     : query.ToList();
+            //
+            // var warehouseModel = Assert.Single(result);
+            // Assert.Equal("W001", warehouseModel.WarehouseCode);
+            // Assert.True(new[] { "US", "CA" }.SequenceEqual(warehouseModel.DestinationCountryCodes));
         }
     }
 }
diff --git a/test/EFCore.MySql.FunctionalTests/Query/PrimitiveCollectionsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/PrimitiveCollectionsQueryMySqlTest.cs
index ccfec4814..069631c2d 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/PrimitiveCollectionsQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/PrimitiveCollectionsQueryMySqlTest.cs
@@ -61,10 +61,12 @@ public override async Task Inline_collection_of_nullable_ints_Contains_null(bool
 """);
     }
 
-    public override Task Inline_collection_Count_with_zero_values(bool async)
-        => AssertTranslationFailedWithDetails(
-            () => base.Inline_collection_Count_with_zero_values(async),
-            RelationalStrings.EmptyCollectionNotSupportedAsInlineQueryRoot);
+    public override async Task Inline_collection_Count_with_zero_values(bool async)
+    {
+        await base.Inline_collection_Count_with_zero_values(async);
+
+        AssertSql();
+    }
 
     public override async Task Inline_collection_Count_with_one_value(bool async)
     {
@@ -148,10 +150,17 @@ SELECT COUNT(*)
         }
     }
 
-    public override Task Inline_collection_Contains_with_zero_values(bool async)
-        => AssertTranslationFailedWithDetails(
-            () => base.Inline_collection_Contains_with_zero_values(async),
-            RelationalStrings.EmptyCollectionNotSupportedAsInlineQueryRoot);
+    public override async Task Inline_collection_Contains_with_zero_values(bool async)
+    {
+        await base.Inline_collection_Contains_with_zero_values(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE FALSE
+""");
+    }
 
     public override async Task Inline_collection_Contains_with_one_value(bool async)
     {
@@ -262,36 +271,6 @@ FROM JSON_TABLE('[2,999]', '$[*]' COLUMNS (
 """);
     }
 
-    public override async Task Parameter_collection_of_ints_Contains(bool async)
-    {
-        await base.Parameter_collection_of_ints_Contains(async);
-
-        if (MySqlTestHelpers.HasPrimitiveCollectionsSupport(Fixture))
-        {
-            AssertSql(
-"""
-SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
-FROM `PrimitiveCollectionsEntity` AS `p`
-WHERE `p`.`Int` IN (
-    SELECT `i`.`value`
-    FROM JSON_TABLE('[10,999]', '$[*]' COLUMNS (
-        `key` FOR ORDINALITY,
-        `value` int PATH '$[0]'
-    )) AS `i`
-)
-""");
-        }
-        else
-        {
-            AssertSql(
-"""
-SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
-FROM `PrimitiveCollectionsEntity` AS `p`
-WHERE `p`.`Int` IN (10, 999)
-""");
-        }
-    }
-
     public override async Task Parameter_collection_of_nullable_ints_Contains_int(bool async)
     {
         await base.Parameter_collection_of_nullable_ints_Contains_int(async);
@@ -313,11 +292,17 @@ FROM JSON_TABLE('[10,999]', '$[*]' COLUMNS (
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
 FROM `PrimitiveCollectionsEntity` AS `p`
 WHERE `p`.`Int` IN (10, 999)
+""",
+                //
+                """
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`Int` NOT IN (10, 999)
 """);
         }
     }
@@ -343,11 +328,17 @@ FROM JSON_TABLE('[null,999]', '$[*]' COLUMNS (
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
 FROM `PrimitiveCollectionsEntity` AS `p`
 WHERE `p`.`NullableInt` IS NULL OR (`p`.`NullableInt` = 999)
+""",
+                //
+                """
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`NullableInt` IS NOT NULL AND (`p`.`NullableInt` <> 999)
 """);
         }
     }
@@ -373,41 +364,17 @@ FROM JSON_TABLE('["999",null]', '$[*]' COLUMNS (
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
 FROM `PrimitiveCollectionsEntity` AS `p`
-WHERE `p`.`NullableString` IS NULL OR (`p`.`NullableString` = '999')
-""");
-        }
-    }
-
-    public override async Task Parameter_collection_of_strings_Contains_non_nullable_string(bool async)
-    {
-        await base.Parameter_collection_of_strings_Contains_non_nullable_string(async);
-
-        if (MySqlTestHelpers.HasPrimitiveCollectionsSupport(Fixture))
-        {
-            AssertSql(
-"""
+WHERE `p`.`NullableString` IN ('10', '999')
+""",
+                //
+                """
 SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
 FROM `PrimitiveCollectionsEntity` AS `p`
-WHERE `p`.`String` IN (
-    SELECT `s`.`value`
-    FROM JSON_TABLE('["10","999"]', '$[*]' COLUMNS (
-        `key` FOR ORDINALITY,
-        `value` longtext PATH '$[0]'
-    )) AS `s`
-)
-""");
-        }
-        else
-        {
-            AssertSql(
-"""
-SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
-FROM `PrimitiveCollectionsEntity` AS `p`
-WHERE `p`.`String` IN ('10', '999')
+WHERE `p`.`NullableString` NOT IN ('10', '999') OR (`p`.`NullableString` IS NULL)
 """);
         }
     }
@@ -794,7 +761,7 @@ public override async Task Non_nullable_reference_column_collection_index_equals
         }
     }
 
-    [SupportedServerVersionCondition(nameof(ServerVersionSupport.OffsetReferencesOuterQuery))]
+    [SupportedServerVersionCondition(nameof(ServerVersionSupport.WhereSubqueryReferencesOuterQuery))]
     public override async Task Inline_collection_index_Column(bool async)
     {
         await base.Inline_collection_index_Column(async);
@@ -1688,6 +1655,180 @@ END IN ('one', 'two', 'three')
 """);
     }
 
+    public override async Task Inline_collection_Contains_with_EF_Constant(bool async)
+    {
+        await base.Inline_collection_Contains_with_EF_Constant(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`Id` IN (2, 999, 1000)
+""");
+    }
+
+    public override async Task Inline_collection_Min_with_two_values(bool async)
+    {
+        await base.Inline_collection_Min_with_two_values(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE LEAST(30, `p`.`Int`) = 30
+""");
+    }
+
+    public override async Task Inline_collection_Max_with_two_values(bool async)
+    {
+        await base.Inline_collection_Max_with_two_values(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE GREATEST(30, `p`.`Int`) = 30
+""");
+    }
+
+    public override async Task Inline_collection_Min_with_three_values(bool async)
+    {
+        await base.Inline_collection_Min_with_three_values(async);
+
+        AssertSql(
+"""
+@__i_0='25'
+
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE LEAST(30, `p`.`Int`, @__i_0) = 25
+""");
+    }
+
+    public override async Task Inline_collection_Max_with_three_values(bool async)
+    {
+        await base.Inline_collection_Max_with_three_values(async);
+
+        AssertSql(
+"""
+@__i_0='35'
+
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE GREATEST(30, `p`.`Int`, @__i_0) = 35
+""");
+    }
+
+    public override async Task Parameter_collection_of_ints_Contains_int(bool async)
+    {
+        await base.Parameter_collection_of_ints_Contains_int(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`Int` IN (10, 999)
+""",
+                //
+                """
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`Int` NOT IN (10, 999)
+""");
+    }
+
+    public override async Task Parameter_collection_of_ints_Contains_nullable_int(bool async)
+    {
+        await base.Parameter_collection_of_ints_Contains_nullable_int(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`NullableInt` IN (10, 999)
+""",
+                //
+                """
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`NullableInt` NOT IN (10, 999) OR (`p`.`NullableInt` IS NULL)
+""");
+    }
+
+    public override async Task Parameter_collection_of_strings_Contains_string(bool async)
+    {
+        await base.Parameter_collection_of_strings_Contains_string(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`String` IN ('10', '999')
+""",
+                //
+                """
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`String` NOT IN ('10', '999')
+""");
+    }
+
+    public override async Task Parameter_collection_of_nullable_strings_Contains_string(bool async)
+    {
+        await base.Parameter_collection_of_nullable_strings_Contains_string(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`String` = '10'
+""",
+                //
+                """
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`String` <> '10'
+""");
+    }
+
+    public override async Task Parameter_collection_of_nullable_strings_Contains_nullable_string(bool async)
+    {
+        await base.Parameter_collection_of_nullable_strings_Contains_nullable_string(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`NullableString` IS NULL OR (`p`.`NullableString` = '999')
+""",
+                //
+                """
+SELECT `p`.`Id`, `p`.`Bool`, `p`.`Bools`, `p`.`DateTime`, `p`.`DateTimes`, `p`.`Enum`, `p`.`Enums`, `p`.`Int`, `p`.`Ints`, `p`.`NullableInt`, `p`.`NullableInts`, `p`.`NullableString`, `p`.`NullableStrings`, `p`.`String`, `p`.`Strings`
+FROM `PrimitiveCollectionsEntity` AS `p`
+WHERE `p`.`NullableString` IS NOT NULL AND (`p`.`NullableString` <> '999')
+""");
+    }
+
+    public override async Task Column_collection_SelectMany(bool async)
+    {
+        await base.Column_collection_SelectMany(async);
+
+        AssertSql("");
+    }
+
+    public override async Task Project_collection_of_ints_with_ToList_and_FirstOrDefault(bool async)
+    {
+        await base.Project_collection_of_ints_with_ToList_and_FirstOrDefault(async);
+
+        AssertSql(
+"""
+SELECT `p`.`Ints`
+FROM `PrimitiveCollectionsEntity` AS `p`
+ORDER BY `p`.`Id`
+LIMIT 1
+""");
+    }
+
     [ConditionalFact]
     public virtual void Check_all_tests_overridden()
         => TestHelpers.AssertAllMethodsOverridden(GetType());
diff --git a/test/EFCore.MySql.FunctionalTests/Query/SimpleQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/SimpleQueryMySqlTest.cs
deleted file mode 100644
index 5c8f5b440..000000000
--- a/test/EFCore.MySql.FunctionalTests/Query/SimpleQueryMySqlTest.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.EntityFrameworkCore.TestUtilities;
-using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
-using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
-using Pomelo.EntityFrameworkCore.MySql.Tests.TestUtilities.Attributes;
-
-// ReSharper disable InconsistentNaming
-namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query
-{
-    public class SimpleQueryMySqlTest : SimpleQueryRelationalTestBase
-    {
-        protected override ITestStoreFactory TestStoreFactory => MySqlTestStoreFactory.Instance;
-
-        public override async Task Multiple_nested_reference_navigations(bool async)
-        {
-            await base.Multiple_nested_reference_navigations(async);
-
-            AssertSql(
-                @"@__p_0='3'
-
-SELECT `s`.`Id`, `s`.`Email`, `s`.`Logon`, `s`.`ManagerId`, `s`.`Name`, `s`.`SecondaryManagerId`
-FROM `Staff` AS `s`
-WHERE `s`.`Id` = @__p_0
-LIMIT 1",
-                //
-                @"@__id_0='1'
-
-SELECT `a`.`Id`, `a`.`Complete`, `a`.`Deleted`, `a`.`PeriodEnd`, `a`.`PeriodStart`, `a`.`StaffId`, `s`.`Id`, `s`.`Email`, `s`.`Logon`, `s`.`ManagerId`, `s`.`Name`, `s`.`SecondaryManagerId`, `s0`.`Id`, `s0`.`Email`, `s0`.`Logon`, `s0`.`ManagerId`, `s0`.`Name`, `s0`.`SecondaryManagerId`, `s1`.`Id`, `s1`.`Email`, `s1`.`Logon`, `s1`.`ManagerId`, `s1`.`Name`, `s1`.`SecondaryManagerId`
-FROM `Appraisals` AS `a`
-INNER JOIN `Staff` AS `s` ON `a`.`StaffId` = `s`.`Id`
-LEFT JOIN `Staff` AS `s0` ON `s`.`ManagerId` = `s0`.`Id`
-LEFT JOIN `Staff` AS `s1` ON `s`.`SecondaryManagerId` = `s1`.`Id`
-WHERE `a`.`Id` = @__id_0
-LIMIT 2");
-        }
-
-        public override async Task Multiple_different_entity_type_from_different_namespaces(bool async)
-        {
-            var contextFactory = await InitializeAsync<Context23981>();
-            using var context = contextFactory.CreateContext();
-            var bad = context.Set<NameSpace1.TestQuery>().FromSqlRaw(@"SELECT cast(null as signed) AS MyValue").ToList(); // <-- MySQL uses `signed` instead of `int` in CAST() expressions
-        }
-
-        [SupportedServerVersionCondition(nameof(ServerVersionSupport.OuterReferenceInMultiLevelSubquery))]
-        public override Task Group_by_multiple_aggregate_joining_different_tables(bool async)
-        {
-            return base.Group_by_multiple_aggregate_joining_different_tables(async);
-        }
-
-        [SupportedServerVersionCondition(nameof(ServerVersionSupport.OuterReferenceInMultiLevelSubquery))]
-        public override Task Group_by_multiple_aggregate_joining_different_tables_with_query_filter(bool async)
-        {
-            return base.Group_by_multiple_aggregate_joining_different_tables_with_query_filter(async);
-        }
-    }
-}
diff --git a/test/EFCore.MySql.FunctionalTests/Query/TPCFiltersInheritanceQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/TPCFiltersInheritanceQueryMySqlTest.cs
index 4558291e8..0428cf979 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/TPCFiltersInheritanceQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/TPCFiltersInheritanceQueryMySqlTest.cs
@@ -27,16 +27,16 @@ public override async Task Can_use_of_type_animal(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`Group`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
-ORDER BY `t`.`Species`
+) AS `u`
+WHERE `u`.`CountryId` = 1
+ORDER BY `u`.`Species`
 """);
     }
 
@@ -46,12 +46,12 @@ public override async Task Can_use_is_kiwi(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`Group`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
+) AS `u`
+WHERE `u`.`CountryId` = 1
 """);
     }
 
@@ -61,15 +61,15 @@ public override async Task Can_use_is_kiwi_with_other_predicate(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`Group`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE (`t`.`CountryId` = 1) AND ((`t`.`Discriminator` = 'Kiwi') AND (`t`.`CountryId` = 1))
+) AS `u`
+WHERE (`u`.`CountryId` = 1) AND ((`u`.`Discriminator` = 'Kiwi') AND (`u`.`CountryId` = 1))
 """);
     }
 
@@ -79,15 +79,15 @@ public override async Task Can_use_is_kiwi_in_projection(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Discriminator` = 'Kiwi'
+SELECT `u`.`Discriminator` = 'Kiwi'
 FROM (
     SELECT `e`.`CountryId`, 'Eagle' AS `Discriminator`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`CountryId`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
+) AS `u`
+WHERE `u`.`CountryId` = 1
 """);
     }
 
@@ -97,16 +97,16 @@ public override async Task Can_use_of_type_bird(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`Group`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
-ORDER BY `t`.`Species`
+) AS `u`
+WHERE `u`.`CountryId` = 1
+ORDER BY `u`.`Species`
 """);
     }
 
@@ -116,16 +116,16 @@ public override async Task Can_use_of_type_bird_predicate(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`Group`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
-ORDER BY `t`.`Species`
+) AS `u`
+WHERE `u`.`CountryId` = 1
+ORDER BY `u`.`Species`
 """);
     }
 
@@ -135,15 +135,15 @@ public override async Task Can_use_of_type_bird_with_projection(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Name`
+SELECT `u`.`Name`
 FROM (
     SELECT `e`.`CountryId`, `e`.`Name`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`CountryId`, `k`.`Name`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
+) AS `u`
+WHERE `u`.`CountryId` = 1
 """);
     }
 
@@ -153,16 +153,16 @@ public override async Task Can_use_of_type_bird_first(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`Group`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`Group`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `e`.`Id`, `e`.`CountryId`, `e`.`Name`, `e`.`Species`, `e`.`EagleId`, `e`.`IsFlightless`, `e`.`Group`, NULL AS `FoundOn`, 'Eagle' AS `Discriminator`
     FROM `Eagle` AS `e`
     UNION ALL
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, NULL AS `Group`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
-ORDER BY `t`.`Species`
+) AS `u`
+WHERE `u`.`CountryId` = 1
+ORDER BY `u`.`Species`
 LIMIT 1
 """);
     }
@@ -173,12 +173,12 @@ public override async Task Can_use_of_type_kiwi(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CountryId`, `t`.`Name`, `t`.`Species`, `t`.`EagleId`, `t`.`IsFlightless`, `t`.`FoundOn`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`CountryId`, `u`.`Name`, `u`.`Species`, `u`.`EagleId`, `u`.`IsFlightless`, `u`.`FoundOn`, `u`.`Discriminator`
 FROM (
     SELECT `k`.`Id`, `k`.`CountryId`, `k`.`Name`, `k`.`Species`, `k`.`EagleId`, `k`.`IsFlightless`, `k`.`FoundOn`, 'Kiwi' AS `Discriminator`
     FROM `Kiwi` AS `k`
-) AS `t`
-WHERE `t`.`CountryId` = 1
+) AS `u`
+WHERE `u`.`CountryId` = 1
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Query/TPCGearsOfWarQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/TPCGearsOfWarQueryMySqlTest.cs
index 878e31a31..af075ae32 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/TPCGearsOfWarQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/TPCGearsOfWarQueryMySqlTest.cs
@@ -37,14 +37,14 @@ public override async Task Entity_equality_empty(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE FALSE
 """);
     }
@@ -55,7 +55,7 @@ public override async Task Include_multiple_one_to_one_and_one_to_many(bool asyn
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -63,9 +63,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -75,7 +75,7 @@ public override async Task Include_multiple_one_to_one_optional_and_one_to_one_r
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
+SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -83,8 +83,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 """);
     }
 
@@ -94,23 +94,23 @@ public override async Task Include_multiple_circular(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `c`.`Name` = `t0`.`AssignedCityName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `c`.`Name`, `t0`.`Nickname`
+) AS `u0` ON `c`.`Name` = `u0`.`AssignedCityName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `c`.`Name`, `u0`.`Nickname`
 """);
     }
 
@@ -120,24 +120,24 @@ public override async Task Include_multiple_circular_with_filter(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `c`.`Name` = `t0`.`AssignedCityName`
-WHERE `t`.`Nickname` = 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `c`.`Name`, `t0`.`Nickname`
+) AS `u0` ON `c`.`Name` = `u0`.`AssignedCityName`
+WHERE `u`.`Nickname` = 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `c`.`Name`, `u0`.`Nickname`
 """);
     }
 
@@ -147,17 +147,17 @@ public override async Task Include_using_alternate_key(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-WHERE `t`.`Nickname` = 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+WHERE `u`.`Nickname` = 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -167,19 +167,19 @@ public override async Task Include_navigation_on_derived_type(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -189,19 +189,19 @@ public override async Task String_based_Include_navigation_on_derived_type(bool
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -211,7 +211,7 @@ public override async Task Select_Where_Navigation_Included(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -219,8 +219,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE `t0`.`Nickname` = 'Marcus'
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE `u`.`Nickname` = 'Marcus'
 """);
     }
 
@@ -230,16 +230,16 @@ public override async Task Include_with_join_reference1(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Tags` AS `t0` ON (`t`.`SquadId` = `t0`.`GearSquadId`) AND (`t`.`Nickname` = `t0`.`GearNickName`)
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Tags` AS `t` ON (`u`.`SquadId` = `t`.`GearSquadId`) AND (`u`.`Nickname` = `t`.`GearNickName`)
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 """);
     }
 
@@ -249,7 +249,7 @@ public override async Task Include_with_join_reference2(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
 FROM `Tags` AS `t`
 INNER JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -257,8 +257,8 @@ INNER JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearSquadId` = `t0`.`SquadId`) AND (`t`.`GearNickName` = `t0`.`Nickname`)
-INNER JOIN `Cities` AS `c` ON `t0`.`CityOfBirthName` = `c`.`Name`
+) AS `u` ON (`t`.`GearSquadId` = `u`.`SquadId`) AND (`t`.`GearNickName` = `u`.`Nickname`)
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 """);
     }
 
@@ -268,17 +268,17 @@ public override async Task Include_with_join_collection1(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Tags` AS `t0` ON (`t`.`SquadId` = `t0`.`GearSquadId`) AND (`t`.`Nickname` = `t0`.`GearNickName`)
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`
+) AS `u`
+INNER JOIN `Tags` AS `t` ON (`u`.`SquadId` = `t`.`GearSquadId`) AND (`u`.`Nickname` = `t`.`GearNickName`)
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`
 """);
     }
 
@@ -288,7 +288,7 @@ public override async Task Include_with_join_collection2(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Id`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM `Tags` AS `t`
 INNER JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -296,9 +296,9 @@ INNER JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearSquadId` = `t0`.`SquadId`) AND (`t`.`GearNickName` = `t0`.`Nickname`)
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u` ON (`t`.`GearSquadId` = `u`.`SquadId`) AND (`t`.`GearNickName` = `u`.`Nickname`)
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -335,23 +335,23 @@ FROM JSON_TABLE('["b39a6fba-9026-4d69-828e-fd7068673e57","70534e05-782c-4052-872
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 SELECT `t`.`Id`
 FROM `Tags` AS `t`
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`GearNickName`, `t0`.`GearSquadId`, `t0`.`IssueDate`, `t0`.`Note`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE `t0`.`Id` IS NOT NULL AND `t0`.`Id` IN ('b39a6fba-9026-4d69-828e-fd7068673e57', '70534e05-782c-4052-8720-c2c54481ce5f', 'a8ad98f9-e023-4e2a-9a70-c2728455bd34', 'df36f493-463f-4123-83f9-6b135deeb7ba', '34c8d86e-a4ac-4be5-827f-584dda348a07', 'a7be028a-0cf2-448f-ab55-ce8bc5d8cf69')
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE `t`.`Id` IS NOT NULL AND `t`.`Id` IN ('b39a6fba-9026-4d69-828e-fd7068673e57', '70534e05-782c-4052-8720-c2c54481ce5f', 'a8ad98f9-e023-4e2a-9a70-c2728455bd34', 'df36f493-463f-4123-83f9-6b135deeb7ba', '34c8d86e-a4ac-4be5-827f-584dda348a07', 'a7be028a-0cf2-448f-ab55-ce8bc5d8cf69')
 """);
         }
     }
@@ -390,24 +390,24 @@ FROM JSON_TABLE('["b39a6fba-9026-4d69-828e-fd7068673e57","70534e05-782c-4052-872
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 SELECT `t`.`Id`
 FROM `Tags` AS `t`
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`GearNickName`, `t0`.`GearSquadId`, `t0`.`IssueDate`, `t0`.`Note`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE `c`.`Location` IS NOT NULL AND `t0`.`Id` IN ('b39a6fba-9026-4d69-828e-fd7068673e57', '70534e05-782c-4052-8720-c2c54481ce5f', 'a8ad98f9-e023-4e2a-9a70-c2728455bd34', 'df36f493-463f-4123-83f9-6b135deeb7ba', '34c8d86e-a4ac-4be5-827f-584dda348a07', 'a7be028a-0cf2-448f-ab55-ce8bc5d8cf69')
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE `c`.`Location` IS NOT NULL AND `t`.`Id` IN ('b39a6fba-9026-4d69-828e-fd7068673e57', '70534e05-782c-4052-8720-c2c54481ce5f', 'a8ad98f9-e023-4e2a-9a70-c2728455bd34', 'df36f493-463f-4123-83f9-6b135deeb7ba', '34c8d86e-a4ac-4be5-827f-584dda348a07', 'a7be028a-0cf2-448f-ab55-ce8bc5d8cf69')
 """);
         }
     }
@@ -445,23 +445,23 @@ FROM JSON_TABLE('["b39a6fba-9026-4d69-828e-fd7068673e57","70534e05-782c-4052-872
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
 SELECT `t`.`Id`
 FROM `Tags` AS `t`
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE `t0`.`Id` IS NOT NULL AND `t0`.`Id` IN ('b39a6fba-9026-4d69-828e-fd7068673e57', '70534e05-782c-4052-8720-c2c54481ce5f', 'a8ad98f9-e023-4e2a-9a70-c2728455bd34', 'df36f493-463f-4123-83f9-6b135deeb7ba', '34c8d86e-a4ac-4be5-827f-584dda348a07', 'a7be028a-0cf2-448f-ab55-ce8bc5d8cf69')
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE `t`.`Id` IS NOT NULL AND `t`.`Id` IN ('b39a6fba-9026-4d69-828e-fd7068673e57', '70534e05-782c-4052-8720-c2c54481ce5f', 'a8ad98f9-e023-4e2a-9a70-c2728455bd34', 'df36f493-463f-4123-83f9-6b135deeb7ba', '34c8d86e-a4ac-4be5-827f-584dda348a07', 'a7be028a-0cf2-448f-ab55-ce8bc5d8cf69')
 """);
         }
     }
@@ -472,24 +472,24 @@ public override async Task Include_with_join_multi_level(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, `t0`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, `t`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Tags` AS `t0` ON (`t`.`SquadId` = `t0`.`GearSquadId`) AND (`t`.`Nickname` = `t0`.`GearNickName`)
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Tags` AS `t` ON (`u`.`SquadId` = `t`.`GearSquadId`) AND (`u`.`Nickname` = `t`.`GearNickName`)
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t1` ON `c`.`Name` = `t1`.`AssignedCityName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `c`.`Name`, `t1`.`Nickname`
+) AS `u0` ON `c`.`Name` = `u0`.`AssignedCityName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `c`.`Name`, `u0`.`Nickname`
 """);
     }
 
@@ -499,13 +499,13 @@ public override async Task Include_with_join_and_inheritance1(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
 FROM `Tags` AS `t`
 INNER JOIN (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearSquadId` = `t0`.`SquadId`) AND (`t`.`GearNickName` = `t0`.`Nickname`)
-INNER JOIN `Cities` AS `c` ON `t0`.`CityOfBirthName` = `c`.`Name`
+) AS `u` ON (`t`.`GearSquadId` = `u`.`SquadId`) AND (`t`.`GearNickName` = `u`.`Nickname`)
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 """);
     }
 
@@ -515,20 +515,20 @@ public override async Task Include_with_join_and_inheritance_with_orderby_before
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM `Tags` AS `t`
 INNER JOIN (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearSquadId` = `t0`.`SquadId`) AND (`t`.`GearNickName` = `t0`.`Nickname`)
+) AS `u` ON (`t`.`GearSquadId` = `u`.`SquadId`) AND (`t`.`GearNickName` = `u`.`Nickname`)
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t1` ON (`t0`.`Nickname` = `t1`.`LeaderNickname`) AND (`t0`.`SquadId` = `t1`.`LeaderSquadId`)
-ORDER BY `t0`.`HasSoulPatch`, `t0`.`Nickname` DESC, `t`.`Id`, `t0`.`SquadId`, `t1`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`HasSoulPatch`, `u`.`Nickname` DESC, `t`.`Id`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -538,14 +538,14 @@ public override async Task Include_with_join_and_inheritance2(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Tags` AS `t0` ON (`t`.`SquadId` = `t0`.`GearSquadId`) AND (`t`.`Nickname` = `t0`.`GearNickName`)
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`
+) AS `u`
+INNER JOIN `Tags` AS `t` ON (`u`.`SquadId` = `t`.`GearSquadId`) AND (`u`.`Nickname` = `t`.`GearNickName`)
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`
 """);
     }
 
@@ -555,20 +555,20 @@ public override async Task Include_with_join_and_inheritance3(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM `Tags` AS `t`
 INNER JOIN (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearSquadId` = `t0`.`SquadId`) AND (`t`.`GearNickName` = `t0`.`Nickname`)
+) AS `u` ON (`t`.`GearSquadId` = `u`.`SquadId`) AND (`t`.`GearNickName` = `u`.`Nickname`)
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t1` ON (`t0`.`Nickname` = `t1`.`LeaderNickname`) AND (`t0`.`SquadId` = `t1`.`LeaderSquadId`)
-ORDER BY `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -578,7 +578,7 @@ public override async Task Include_with_nested_navigation_in_order_by(bool async
 
         AssertSql(
 """
-SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM `Weapons` AS `w`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -586,9 +586,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t` ON `w`.`OwnerFullName` = `t`.`FullName`
-LEFT JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
-WHERE (`t`.`Nickname` <> 'Paduk') OR `t`.`Nickname` IS NULL
+) AS `u` ON `w`.`OwnerFullName` = `u`.`FullName`
+LEFT JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
+WHERE (`u`.`Nickname` <> 'Paduk') OR `u`.`Nickname` IS NULL
 ORDER BY `c`.`Name`, `w`.`Id`
 """);
     }
@@ -599,15 +599,15 @@ public override async Task Where_enum(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`Rank` = 4
+) AS `u`
+WHERE `u`.`Rank` = 4
 """);
     }
 
@@ -675,27 +675,27 @@ public override async Task Where_bitwise_and_enum(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 2) > 0
+) AS `u`
+WHERE (`u`.`Rank` & 2) > 0
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 2) = 2
+) AS `u`
+WHERE (`u`.`Rank` & 2) = 2
 """);
     }
 
@@ -705,39 +705,39 @@ public override async Task Where_bitwise_and_integral(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 1) = 1
+) AS `u`
+WHERE (`u`.`Rank` & 1) = 1
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (CAST(`t`.`Rank` AS signed) & 1) = 1
+) AS `u`
+WHERE (CAST(`u`.`Rank` AS signed) & 1) = 1
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (CAST(`t`.`Rank` AS signed) & 1) = 1
+) AS `u`
+WHERE (CAST(`u`.`Rank` AS signed) & 1) = 1
 """);
     }
 
@@ -805,15 +805,15 @@ public override async Task Where_bitwise_or_enum(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` | 2) > 0
+) AS `u`
+WHERE (`u`.`Rank` | 2) > 0
 """);
     }
 
@@ -823,15 +823,15 @@ public override async Task Bitwise_projects_values_in_select(bool async)
 
         AssertSql(
 """
-SELECT (`t`.`Rank` & 2) = 2 AS `BitwiseTrue`, (`t`.`Rank` & 2) = 4 AS `BitwiseFalse`, `t`.`Rank` & 2 AS `BitwiseValue`
+SELECT (`u`.`Rank` & 2) = 2 AS `BitwiseTrue`, (`u`.`Rank` & 2) = 4 AS `BitwiseFalse`, `u`.`Rank` & 2 AS `BitwiseValue`
 FROM (
     SELECT `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 2) = 2
+) AS `u`
+WHERE (`u`.`Rank` & 2) = 2
 LIMIT 1
 """);
     }
@@ -842,63 +842,63 @@ public override async Task Where_enum_has_flag(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 2) = 2
+) AS `u`
+WHERE (`u`.`Rank` & 2) = 2
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 18) = 18
+) AS `u`
+WHERE (`u`.`Rank` & 18) = 18
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 1) = 1
+) AS `u`
+WHERE (`u`.`Rank` & 1) = 1
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 1) = 1
+) AS `u`
+WHERE (`u`.`Rank` & 1) = 1
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (2 & `t`.`Rank`) = `t`.`Rank`
+) AS `u`
+WHERE (2 & `u`.`Rank`) = `u`.`Rank`
 """);
     }
 
@@ -908,66 +908,66 @@ public override async Task Where_enum_has_flag_subquery(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & COALESCE((
-    SELECT `t0`.`Rank`
+) AS `u`
+WHERE (`u`.`Rank` & COALESCE((
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1), 0)) = COALESCE((
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1), 0)
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE (2 & COALESCE((
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1), 0)) = COALESCE((
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1), 0)
 """);
     }
@@ -978,86 +978,86 @@ public override async Task Where_enum_has_flag_subquery_with_pushdown(bool async
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE ((`t`.`Rank` & (
-    SELECT `t0`.`Rank`
+) AS `u`
+WHERE ((`u`.`Rank` & (
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1)) = (
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1)) OR (
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1) IS NULL
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE ((2 & (
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1)) = (
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1)) OR (
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1) IS NULL
 """);
     }
@@ -1068,44 +1068,44 @@ public override async Task Where_enum_has_flag_subquery_client_eval(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE ((`t`.`Rank` & (
-    SELECT `t0`.`Rank`
+) AS `u`
+WHERE ((`u`.`Rank` & (
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1)) = (
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1)) OR (
-    SELECT `t0`.`Rank`
+    SELECT `u0`.`Rank`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+    ) AS `u0`
+    ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
     LIMIT 1) IS NULL
 """);
     }
@@ -1118,15 +1118,15 @@ public override async Task Where_enum_has_flag_with_non_nullable_parameter(bool
 """
 @__parameter_0='2'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & @__parameter_0) = @__parameter_0
+) AS `u`
+WHERE (`u`.`Rank` & @__parameter_0) = @__parameter_0
 """);
     }
 
@@ -1138,15 +1138,15 @@ public override async Task Where_has_flag_with_nullable_parameter(bool async)
 """
 @__parameter_0='2' (Nullable = true)
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & @__parameter_0) = @__parameter_0
+) AS `u`
+WHERE (`u`.`Rank` & @__parameter_0) = @__parameter_0
 """);
     }
 
@@ -1156,15 +1156,15 @@ public override async Task Select_enum_has_flag(bool async)
 
         AssertSql(
 """
-SELECT (`t`.`Rank` & 2) = 2 AS `hasFlagTrue`, (`t`.`Rank` & 4) = 4 AS `hasFlagFalse`
+SELECT (`u`.`Rank` & 2) = 2 AS `hasFlagTrue`, (`u`.`Rank` & 4) = 4 AS `hasFlagFalse`
 FROM (
     SELECT `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & 2) = 2
+) AS `u`
+WHERE (`u`.`Rank` & 2) = 2
 LIMIT 1
 """);
     }
@@ -1175,18 +1175,18 @@ public override async Task Where_count_subquery_without_collision(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE (
     SELECT COUNT(*)
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`) = 2
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`) = 2
 """);
     }
 
@@ -1196,18 +1196,18 @@ public override async Task Where_any_subquery_without_collision(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE EXISTS (
     SELECT 1
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`)
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`)
 """);
     }
 
@@ -1378,15 +1378,15 @@ public override async Task Null_propagation_optimization1(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`LeaderNickname` = 'Marcus') AND `t`.`LeaderNickname` IS NOT NULL
+) AS `u`
+WHERE (`u`.`LeaderNickname` = 'Marcus') AND `u`.`LeaderNickname` IS NOT NULL
 """);
     }
 
@@ -1397,17 +1397,17 @@ public override async Task Null_propagation_optimization2(bool async)
         // issue #16050
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE CASE
-    WHEN `t`.`LeaderNickname` IS NULL THEN NULL
-    ELSE (`t`.`LeaderNickname` LIKE '%us') AND `t`.`LeaderNickname` IS NOT NULL
+    WHEN `u`.`LeaderNickname` IS NULL THEN NULL
+    ELSE (`u`.`LeaderNickname` LIKE '%us') AND `u`.`LeaderNickname` IS NOT NULL
 END = TRUE
 """);
     }
@@ -1419,16 +1419,16 @@ public override async Task Null_propagation_optimization3(bool async)
         // issue #16050
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN `t`.`LeaderNickname` LIKE '%us'
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN `u`.`LeaderNickname` LIKE '%us'
     ELSE NULL
 END = TRUE
 """);
@@ -1441,20 +1441,20 @@ public override async Task Null_propagation_optimization4(bool async)
         // issue #16050
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE (CASE
-    WHEN `t`.`LeaderNickname` IS NULL THEN NULL
-    ELSE CHAR_LENGTH(`t`.`LeaderNickname`)
+    WHEN `u`.`LeaderNickname` IS NULL THEN NULL
+    ELSE CHAR_LENGTH(`u`.`LeaderNickname`)
 END = 5) AND CASE
-    WHEN `t`.`LeaderNickname` IS NULL THEN NULL
-    ELSE CHAR_LENGTH(`t`.`LeaderNickname`)
+    WHEN `u`.`LeaderNickname` IS NULL THEN NULL
+    ELSE CHAR_LENGTH(`u`.`LeaderNickname`)
 END IS NOT NULL
 """);
     }
@@ -1466,19 +1466,19 @@ public override async Task Null_propagation_optimization5(bool async)
         // issue #16050
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE (CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`t`.`LeaderNickname`)
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`u`.`LeaderNickname`)
     ELSE NULL
 END = 5) AND CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`t`.`LeaderNickname`)
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`u`.`LeaderNickname`)
     ELSE NULL
 END IS NOT NULL
 """);
@@ -1491,19 +1491,19 @@ public override async Task Null_propagation_optimization6(bool async)
         // issue #16050
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE (CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`t`.`LeaderNickname`)
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`u`.`LeaderNickname`)
     ELSE NULL
 END = 5) AND CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`t`.`LeaderNickname`)
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`u`.`LeaderNickname`)
     ELSE NULL
 END IS NOT NULL
 """);
@@ -1517,7 +1517,7 @@ public override async Task Select_null_propagation_optimization7(bool async)
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CONCAT(`t`.`LeaderNickname`, `t`.`LeaderNickname`)
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CONCAT(`u`.`LeaderNickname`, `u`.`LeaderNickname`)
     ELSE NULL
 END
 FROM (
@@ -1526,7 +1526,7 @@ ELSE NULL
     UNION ALL
     SELECT `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -1536,14 +1536,14 @@ public override async Task Select_null_propagation_optimization8(bool async)
 
         AssertSql(
 """
-SELECT CONCAT(COALESCE(`t`.`LeaderNickname`, ''), COALESCE(`t`.`LeaderNickname`, ''))
+SELECT CONCAT(COALESCE(`u`.`LeaderNickname`, ''), COALESCE(`u`.`LeaderNickname`, ''))
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -1553,14 +1553,14 @@ public override async Task Select_null_propagation_optimization9(bool async)
 
         AssertSql(
 """
-SELECT CHAR_LENGTH(`t`.`FullName`)
+SELECT CHAR_LENGTH(`u`.`FullName`)
 FROM (
     SELECT `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -1571,7 +1571,7 @@ public override async Task Select_null_propagation_negative1(bool async)
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`t`.`Nickname`) = 5
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`u`.`Nickname`) = 5
     ELSE NULL
 END
 FROM (
@@ -1580,7 +1580,7 @@ ELSE NULL
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -1591,7 +1591,7 @@ public override async Task Select_null_propagation_negative2(bool async)
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN `t0`.`LeaderNickname`
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN `u0`.`LeaderNickname`
     ELSE NULL
 END
 FROM (
@@ -1600,14 +1600,14 @@ ELSE NULL
     UNION ALL
     SELECT `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN (
     SELECT `g0`.`LeaderNickname`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`LeaderNickname`
     FROM `Officers` AS `o0`
-) AS `t0`
+) AS `u0`
 """);
     }
 
@@ -1617,8 +1617,8 @@ public override async Task Select_null_propagation_negative3(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, CASE
-    WHEN `t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL) THEN `t0`.`LeaderNickname` IS NOT NULL
+SELECT `u0`.`Nickname`, CASE
+    WHEN `u0`.`Nickname` IS NOT NULL AND (`u0`.`SquadId` IS NOT NULL) THEN `u0`.`LeaderNickname` IS NOT NULL
     ELSE NULL
 END AS `Condition`
 FROM (
@@ -1627,15 +1627,15 @@ END AS `Condition`
     UNION ALL
     SELECT `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`LeaderNickname`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`LeaderNickname`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`HasSoulPatch` = TRUE
-ORDER BY `t0`.`Nickname`
+) AS `u0` ON `u`.`HasSoulPatch` = TRUE
+ORDER BY `u0`.`Nickname`
 """);
     }
 
@@ -1645,22 +1645,22 @@ public override async Task Select_null_propagation_negative4(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL), `t0`.`Nickname`
+SELECT `u0`.`Nickname` IS NOT NULL AND (`u0`.`SquadId` IS NOT NULL), `u0`.`Nickname`
 FROM (
     SELECT `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`HasSoulPatch` = TRUE
-ORDER BY `t0`.`Nickname`
+) AS `u0` ON `u`.`HasSoulPatch` = TRUE
+ORDER BY `u0`.`Nickname`
 """);
     }
 
@@ -1670,22 +1670,22 @@ public override async Task Select_null_propagation_negative5(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL), `t0`.`Nickname`
+SELECT `u0`.`Nickname` IS NOT NULL AND (`u0`.`SquadId` IS NOT NULL), `u0`.`Nickname`
 FROM (
     SELECT `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`HasSoulPatch` = TRUE
-ORDER BY `t0`.`Nickname`
+) AS `u0` ON `u`.`HasSoulPatch` = TRUE
+ORDER BY `u0`.`Nickname`
 """);
     }
 
@@ -1696,7 +1696,7 @@ public override async Task Select_null_propagation_negative6(bool async)
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`t`.`LeaderNickname`) <> CHAR_LENGTH(`t`.`LeaderNickname`)
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`u`.`LeaderNickname`) <> CHAR_LENGTH(`u`.`LeaderNickname`)
     ELSE NULL
 END
 FROM (
@@ -1705,7 +1705,7 @@ ELSE NULL
     UNION ALL
     SELECT `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -1716,7 +1716,7 @@ public override async Task Select_null_propagation_negative7(bool async)
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN TRUE
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN TRUE
     ELSE NULL
 END
 FROM (
@@ -1725,7 +1725,7 @@ ELSE NULL
     UNION ALL
     SELECT `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -1746,9 +1746,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
-LEFT JOIN `Cities` AS `c` ON `t0`.`AssignedCityName` = `c`.`Name`
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
+LEFT JOIN `Cities` AS `c` ON `u`.`AssignedCityName` = `c`.`Name`
 """);
     }
 
@@ -1759,7 +1759,7 @@ public override async Task Select_null_propagation_negative9(bool async)
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN COALESCE(CHAR_LENGTH(`t`.`Nickname`) = 5, FALSE)
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN COALESCE(CHAR_LENGTH(`u`.`Nickname`) = 5, FALSE)
     ELSE NULL
 END
 FROM (
@@ -1768,7 +1768,7 @@ ELSE NULL
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -1778,7 +1778,7 @@ public override async Task Select_null_propagation_works_for_navigations_with_co
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`
+SELECT `u`.`Nickname`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -1786,7 +1786,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 """);
     }
 
@@ -1807,16 +1807,16 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-LEFT JOIN `Tags` AS `t1` ON ((`t0`.`Nickname` = `t1`.`GearNickName`) OR (`t0`.`Nickname` IS NULL AND (`t1`.`GearNickName` IS NULL))) AND ((`t0`.`SquadId` = `t1`.`GearSquadId`) OR (`t0`.`SquadId` IS NULL AND (`t1`.`GearSquadId` IS NULL)))
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+LEFT JOIN `Tags` AS `t0` ON ((`u`.`Nickname` = `t0`.`GearNickName`) OR (`u`.`Nickname` IS NULL AND (`t0`.`GearNickName` IS NULL))) AND ((`u`.`SquadId` = `t0`.`GearSquadId`) OR (`u`.`SquadId` IS NULL AND (`t0`.`GearSquadId` IS NULL)))
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`
     FROM `Officers` AS `o0`
-) AS `t2` ON (`t1`.`GearNickName` = `t2`.`Nickname`) AND (`t1`.`GearSquadId` = `t2`.`SquadId`)
-LEFT JOIN `Cities` AS `c` ON `t2`.`AssignedCityName` = `c`.`Name`
+) AS `u0` ON (`t0`.`GearNickName` = `u0`.`Nickname`) AND (`t0`.`GearSquadId` = `u0`.`SquadId`)
+LEFT JOIN `Cities` AS `c` ON `u0`.`AssignedCityName` = `c`.`Name`
 """);
     }
 
@@ -1826,15 +1826,15 @@ public override async Task Select_conditional_with_anonymous_type_and_null_const
 
         AssertSql(
 """
-SELECT `t`.`LeaderNickname` IS NOT NULL, `t`.`HasSoulPatch`
+SELECT `u`.`LeaderNickname` IS NOT NULL, `u`.`HasSoulPatch`
 FROM (
     SELECT `g`.`Nickname`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`Nickname`
+) AS `u`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -1844,15 +1844,15 @@ public override async Task Select_conditional_with_anonymous_types(bool async)
 
         AssertSql(
 """
-SELECT `t`.`LeaderNickname` IS NOT NULL, `t`.`Nickname`, `t`.`FullName`
+SELECT `u`.`LeaderNickname` IS NOT NULL, `u`.`Nickname`, `u`.`FullName`
 FROM (
     SELECT `g`.`Nickname`, `g`.`FullName`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`FullName`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`Nickname`
+) AS `u`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -1862,16 +1862,16 @@ public override async Task Where_conditional_equality_1(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`LeaderNickname` IS NULL
-ORDER BY `t`.`Nickname`
+) AS `u`
+WHERE `u`.`LeaderNickname` IS NULL
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -1881,16 +1881,16 @@ public override async Task Where_conditional_equality_2(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`LeaderNickname` IS NULL
-ORDER BY `t`.`Nickname`
+) AS `u`
+WHERE `u`.`LeaderNickname` IS NULL
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -1900,15 +1900,15 @@ public override async Task Where_conditional_equality_3(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`Nickname`
+) AS `u`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -1918,15 +1918,15 @@ public override async Task Select_coalesce_with_anonymous_types(bool async)
 
         AssertSql(
 """
-SELECT `t`.`LeaderNickname`, `t`.`FullName`
+SELECT `u`.`LeaderNickname`, `u`.`FullName`
 FROM (
     SELECT `g`.`Nickname`, `g`.`FullName`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`FullName`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`Nickname`
+) AS `u`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -1943,15 +1943,15 @@ public override async Task Where_member_access_on_anonymous_type(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`LeaderNickname` = 'Marcus'
+) AS `u`
+WHERE `u`.`LeaderNickname` = 'Marcus'
 """);
     }
 
@@ -1960,14 +1960,14 @@ public override async Task Where_compare_anonymous_types_with_uncorrelated_membe
         await base.Where_compare_anonymous_types_with_uncorrelated_members(async);
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE FALSE
 """);
     }
@@ -1987,15 +1987,15 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t1` ON (`t`.`GearNickName` = `t1`.`Nickname`) AND (`t`.`GearSquadId` = `t1`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`
     FROM `Officers` AS `o0`
-) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
-WHERE (`t1`.`Nickname` = `t2`.`Nickname`) OR (`t1`.`Nickname` IS NULL AND (`t2`.`Nickname` IS NULL))
+) AS `u0` ON (`t0`.`GearNickName` = `u0`.`Nickname`) AND (`t0`.`GearSquadId` = `u0`.`SquadId`)
+WHERE (`u`.`Nickname` = `u0`.`Nickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`Nickname` IS NULL))
 """);
     }
 
@@ -2005,7 +2005,7 @@ public override async Task Select_Singleton_Navigation_With_Member_Access(bool a
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -2013,8 +2013,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE (`t0`.`Nickname` = 'Marcus') AND ((`t0`.`CityOfBirthName` <> 'Ephyra') OR `t0`.`CityOfBirthName` IS NULL)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE (`u`.`Nickname` = 'Marcus') AND ((`u`.`CityOfBirthName` <> 'Ephyra') OR `u`.`CityOfBirthName` IS NULL)
 """);
     }
 
@@ -2032,8 +2032,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE `t0`.`Nickname` = 'Marcus'
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE `u`.`Nickname` = 'Marcus'
 """);
     }
 
@@ -2052,15 +2052,15 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t1` ON (`t`.`GearNickName` = `t1`.`Nickname`) AND (`t`.`GearSquadId` = `t1`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`
     FROM `Officers` AS `o0`
-) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
-WHERE ((`t1`.`Nickname` = `t2`.`Nickname`) OR (`t1`.`Nickname` IS NULL AND (`t2`.`Nickname` IS NULL))) AND ((`t1`.`SquadId` = `t2`.`SquadId`) OR (`t1`.`SquadId` IS NULL AND (`t2`.`SquadId` IS NULL)))
+) AS `u0` ON (`t0`.`GearNickName` = `u0`.`Nickname`) AND (`t0`.`GearSquadId` = `u0`.`SquadId`)
+WHERE ((`u`.`Nickname` = `u0`.`Nickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`Nickname` IS NULL))) AND ((`u`.`SquadId` = `u0`.`SquadId`) OR (`u`.`SquadId` IS NULL AND (`u0`.`SquadId` IS NULL)))
 """);
     }
 
@@ -2078,8 +2078,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE `t0`.`Nickname` IS NULL OR (`t0`.`SquadId` IS NULL)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE `u`.`Nickname` IS NULL OR (`u`.`SquadId` IS NULL)
 """);
     }
 
@@ -2097,8 +2097,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE `t0`.`Nickname` IS NULL OR (`t0`.`SquadId` IS NULL)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE `u`.`Nickname` IS NULL OR (`u`.`SquadId` IS NULL)
 """);
     }
 
@@ -2117,15 +2117,15 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t1` ON (`t`.`GearNickName` = `t1`.`Nickname`) AND (`t`.`GearSquadId` = `t1`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`
     FROM `Officers` AS `o0`
-) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
-WHERE (`t1`.`Nickname` = `t2`.`Nickname`) OR (`t1`.`Nickname` IS NULL AND (`t2`.`Nickname` IS NULL))
+) AS `u0` ON (`t0`.`GearNickName` = `u0`.`Nickname`) AND (`t0`.`GearSquadId` = `u0`.`SquadId`)
+WHERE (`u`.`Nickname` = `u0`.`Nickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`Nickname` IS NULL))
 """);
     }
 
@@ -2149,18 +2149,18 @@ public override async Task Where_subquery_boolean(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE COALESCE((
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1), FALSE)
 """);
@@ -2172,18 +2172,18 @@ public override async Task Where_subquery_boolean_with_pushdown(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE (
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1)
 """);
@@ -2196,22 +2196,22 @@ public override async Task Where_subquery_distinct_firstordefault_boolean(bool a
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND COALESCE((
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND COALESCE((
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
+    ) AS `w0`
+    ORDER BY `w0`.`Id`
     LIMIT 1), FALSE)
 """);
     }
@@ -2223,22 +2223,22 @@ public override async Task Where_subquery_distinct_firstordefault_boolean_with_p
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
+    ) AS `w0`
+    ORDER BY `w0`.`Id`
     LIMIT 1)
 """);
     }
@@ -2250,24 +2250,24 @@ public override async Task Where_subquery_distinct_first_boolean(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
+    ) AS `w0`
+    ORDER BY `w0`.`Id`
     LIMIT 1)
-ORDER BY `t`.`Nickname`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -2278,23 +2278,23 @@ public override async Task Where_subquery_distinct_singleordefault_boolean1(bool
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND COALESCE((
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND COALESCE((
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
-    ) AS `t0`
+        WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
+    ) AS `w0`
     LIMIT 1), FALSE)
-ORDER BY `t`.`Nickname`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -2304,20 +2304,20 @@ public override async Task Where_subquery_distinct_singleordefault_boolean2(bool
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND COALESCE((
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND COALESCE((
     SELECT DISTINCT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
     LIMIT 1), FALSE)
-ORDER BY `t`.`Nickname`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -2328,23 +2328,23 @@ public override async Task Where_subquery_distinct_singleordefault_boolean_with_
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
-    ) AS `t0`
+        WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
+    ) AS `w0`
     LIMIT 1)
-ORDER BY `t`.`Nickname`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -2355,24 +2355,24 @@ public override async Task Where_subquery_distinct_lastordefault_boolean(bool as
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE NOT ((
-    SELECT `t0`.`IsAutomatic`
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id` DESC
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
+    ) AS `w0`
+    ORDER BY `w0`.`Id` DESC
     LIMIT 1))
-ORDER BY `t`.`Nickname`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -2383,24 +2383,24 @@ public override async Task Where_subquery_distinct_last_boolean(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = FALSE) AND (
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = FALSE) AND (
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id` DESC
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
+    ) AS `w0`
+    ORDER BY `w0`.`Id` DESC
     LIMIT 1)
-ORDER BY `t`.`Nickname`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -2411,22 +2411,22 @@ public override async Task Where_subquery_distinct_orderby_firstordefault_boolea
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND COALESCE((
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND COALESCE((
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
+    ) AS `w0`
+    ORDER BY `w0`.`Id`
     LIMIT 1), FALSE)
 """);
     }
@@ -2438,22 +2438,22 @@ public override async Task Where_subquery_distinct_orderby_firstordefault_boolea
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
+    ) AS `w0`
+    ORDER BY `w0`.`Id`
     LIMIT 1)
 """);
     }
@@ -2465,26 +2465,26 @@ public override async Task Where_subquery_union_firstordefault_boolean(bool asyn
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (
+    SELECT `u0`.`IsAutomatic`
     FROM (
         SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
         UNION
         SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
         FROM `Weapons` AS `w0`
-        WHERE `t`.`FullName` = `w0`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id`
+        WHERE `u`.`FullName` = `w0`.`OwnerFullName`
+    ) AS `u0`
+    ORDER BY `u0`.`Id`
     LIMIT 1)
 """);
     }
@@ -2496,23 +2496,23 @@ public override async Task Where_subquery_join_firstordefault_boolean(bool async
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
     INNER JOIN (
-        SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+        SELECT `w0`.`Id`
         FROM `Weapons` AS `w0`
-        WHERE `t`.`FullName` = `w0`.`OwnerFullName`
-    ) AS `t0` ON `w`.`Id` = `t0`.`Id`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+        WHERE `u`.`FullName` = `w0`.`OwnerFullName`
+    ) AS `w1` ON `w`.`Id` = `w1`.`Id`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1)
 """);
@@ -2525,23 +2525,23 @@ public override async Task Where_subquery_left_join_firstordefault_boolean(bool
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
     LEFT JOIN (
-        SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+        SELECT `w0`.`Id`
         FROM `Weapons` AS `w0`
-        WHERE `t`.`FullName` = `w0`.`OwnerFullName`
-    ) AS `t0` ON `w`.`Id` = `t0`.`Id`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+        WHERE `u`.`FullName` = `w0`.`OwnerFullName`
+    ) AS `w1` ON `w`.`Id` = `w1`.`Id`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1)
 """);
@@ -2554,26 +2554,26 @@ public override async Task Where_subquery_concat_firstordefault_boolean(bool asy
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (
-    SELECT `t0`.`IsAutomatic`
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (
+    SELECT `u0`.`IsAutomatic`
     FROM (
-        SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+        SELECT `w`.`Id`, `w`.`IsAutomatic`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
         UNION ALL
-        SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+        SELECT `w0`.`Id`, `w0`.`IsAutomatic`
         FROM `Weapons` AS `w0`
-        WHERE `t`.`FullName` = `w0`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id`
+        WHERE `u`.`FullName` = `w0`.`OwnerFullName`
+    ) AS `u0`
+    ORDER BY `u0`.`Id`
     LIMIT 1)
 """);
     }
@@ -2586,18 +2586,18 @@ public override async Task Concat_with_count(bool async)
 """
 SELECT COUNT(*)
 FROM (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT 1
     FROM `Gears` AS `g`
     UNION ALL
-    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT 1
     FROM `Officers` AS `o`
     UNION ALL
-    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT 1
     FROM `Gears` AS `g0`
     UNION ALL
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT 1
     FROM `Officers` AS `o0`
-) AS `t0`
+) AS `u1`
 """);
     }
 
@@ -2609,18 +2609,18 @@ public override async Task Concat_scalars_with_count(bool async)
 """
 SELECT COUNT(*)
 FROM (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT 1
     FROM `Gears` AS `g`
     UNION ALL
-    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT 1
     FROM `Officers` AS `o`
     UNION ALL
-    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT 1
     FROM `Gears` AS `g0`
     UNION ALL
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT 1
     FROM `Officers` AS `o0`
-) AS `t0`
+) AS `u1`
 """);
     }
 
@@ -2632,24 +2632,24 @@ public override async Task Concat_anonymous_with_count(bool async)
 """
 SELECT COUNT(*)
 FROM (
-    SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t`.`Nickname` AS `Name`
+    SELECT 1
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT 1
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT 1
         FROM `Officers` AS `o`
-    ) AS `t`
+    ) AS `u`
     UNION ALL
-    SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`, `t1`.`FullName` AS `Name`
+    SELECT 1
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT 1
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT 1
         FROM `Officers` AS `o0`
-    ) AS `t1`
-) AS `t0`
+    ) AS `u0`
+) AS `u1`
 """);
     }
 
@@ -2683,22 +2683,22 @@ public override async Task Select_navigation_with_concat_and_count(bool async)
 SELECT (
     SELECT COUNT(*)
     FROM (
-        SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+        SELECT 1
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
         UNION ALL
-        SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+        SELECT 1
         FROM `Weapons` AS `w0`
-        WHERE `t`.`FullName` = `w0`.`OwnerFullName`
-    ) AS `t0`)
+        WHERE `u`.`FullName` = `w0`.`OwnerFullName`
+    ) AS `u0`)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = FALSE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = FALSE
 """);
     }
 
@@ -2714,20 +2714,20 @@ SELECT COUNT(*)
     FROM (
         SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
         UNION
         SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
         FROM `Weapons` AS `w0`
-        WHERE `t`.`FullName` = `w0`.`OwnerFullName`
-    ) AS `t0`)
+        WHERE `u`.`FullName` = `w0`.`OwnerFullName`
+    ) AS `u0`)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -2741,30 +2741,30 @@ public override async Task Union_with_collection_navigations(bool async)
 SELECT (
     SELECT COUNT(*)
     FROM (
-        SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+        SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
             FROM `Officers` AS `o0`
-        ) AS `t1`
-        WHERE (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)
+        ) AS `u0`
+        WHERE (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
         UNION
-        SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator`
+        SELECT `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
         FROM (
             SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
             FROM `Gears` AS `g0`
             UNION ALL
             SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`AssignedCityName`, `o1`.`CityOfBirthName`, `o1`.`FullName`, `o1`.`HasSoulPatch`, `o1`.`LeaderNickname`, `o1`.`LeaderSquadId`, `o1`.`Rank`, 'Officer' AS `Discriminator`
             FROM `Officers` AS `o1`
-        ) AS `t2`
-        WHERE (`t`.`Nickname` = `t2`.`LeaderNickname`) AND (`t`.`SquadId` = `t2`.`LeaderSquadId`)
-    ) AS `t0`)
+        ) AS `u1`
+        WHERE (`u`.`Nickname` = `u1`.`LeaderNickname`) AND (`u`.`SquadId` = `u1`.`LeaderSquadId`)
+    ) AS `u2`)
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -2776,13 +2776,13 @@ public override async Task Select_subquery_distinct_firstordefault(bool async)
         AssertSql(
 """
 SELECT (
-    SELECT `t0`.`Name`
+    SELECT `w0`.`Name`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`
-    ) AS `t0`
-    ORDER BY `t0`.`Id`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`
+    ) AS `w0`
+    ORDER BY `w0`.`Id`
     LIMIT 1)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
@@ -2790,8 +2790,8 @@ ORDER BY `t0`.`Id`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -2801,7 +2801,7 @@ public override async Task Singleton_Navigation_With_Member_Access(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`CityOfBirthName` AS `B`
+SELECT `u`.`CityOfBirthName` AS `B`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`CityOfBirthName`
@@ -2809,8 +2809,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`CityOfBirthName`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE (`t0`.`Nickname` = 'Marcus') AND ((`t0`.`CityOfBirthName` <> 'Ephyra') OR `t0`.`CityOfBirthName` IS NULL)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE (`u`.`Nickname` = 'Marcus') AND ((`u`.`CityOfBirthName` <> 'Ephyra') OR `u`.`CityOfBirthName` IS NULL)
 """);
     }
 
@@ -2820,7 +2820,7 @@ public override async Task GroupJoin_Composite_Key(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM `Tags` AS `t`
 INNER JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -2828,7 +2828,7 @@ INNER JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 """);
     }
 
@@ -2838,25 +2838,25 @@ public override async Task Join_navigation_translated_to_subquery_composite_key(
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t1`.`Note`
+SELECT `u`.`FullName`, `s`.`Note`
 FROM (
     SELECT `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN (
-    SELECT `t0`.`Note`, `t2`.`FullName`
-    FROM `Tags` AS `t0`
+    SELECT `t`.`Note`, `u0`.`FullName`
+    FROM `Tags` AS `t`
     LEFT JOIN (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
         FROM `Gears` AS `g0`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
-) AS `t1` ON `t`.`FullName` = `t1`.`FullName`
+    ) AS `u0` ON (`t`.`GearNickName` = `u0`.`Nickname`) AND (`t`.`GearSquadId` = `u0`.`SquadId`)
+) AS `s` ON `u`.`FullName` = `s`.`FullName`
 """);
     }
 
@@ -2866,25 +2866,25 @@ public override async Task Join_with_order_by_on_inner_sequence_navigation_trans
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t1`.`Note`
+SELECT `u`.`FullName`, `s`.`Note`
 FROM (
     SELECT `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN (
-    SELECT `t0`.`Note`, `t2`.`FullName`
-    FROM `Tags` AS `t0`
+    SELECT `t`.`Note`, `u0`.`FullName`
+    FROM `Tags` AS `t`
     LEFT JOIN (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
         FROM `Gears` AS `g0`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
-) AS `t1` ON `t`.`FullName` = `t1`.`FullName`
+    ) AS `u0` ON (`t`.`GearNickName` = `u0`.`Nickname`) AND (`t`.`GearSquadId` = `u0`.`SquadId`)
+) AS `s` ON `u`.`FullName` = `s`.`FullName`
 """);
     }
 
@@ -2894,15 +2894,15 @@ public override async Task Join_with_order_by_without_skip_or_take(bool async)
 
         AssertSql(
 """
-SELECT `w`.`Name`, `t`.`FullName`
+SELECT `w`.`Name`, `u`.`FullName`
 FROM (
     SELECT `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
+) AS `u`
+INNER JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
 """);
     }
 
@@ -2912,7 +2912,7 @@ public override async Task Join_with_order_by_without_skip_or_take_nested(bool a
 
         AssertSql(
 """
-SELECT `w`.`Name`, `t`.`FullName`
+SELECT `w`.`Name`, `u`.`FullName`
 FROM `Squads` AS `s`
 INNER JOIN (
     SELECT `g`.`SquadId`, `g`.`FullName`
@@ -2920,8 +2920,8 @@ INNER JOIN (
     UNION ALL
     SELECT `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t` ON `s`.`Id` = `t`.`SquadId`
-INNER JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
+) AS `u` ON `s`.`Id` = `u`.`SquadId`
+INNER JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
 """);
     }
 
@@ -2931,13 +2931,13 @@ public override async Task Collection_with_inheritance_and_join_include_joined(b
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`GearNickName`, `t1`.`GearSquadId`, `t1`.`IssueDate`, `t1`.`Note`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t0`.`Id`, `t0`.`GearNickName`, `t0`.`GearSquadId`, `t0`.`IssueDate`, `t0`.`Note`
 FROM `Tags` AS `t`
 INNER JOIN (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearSquadId` = `t0`.`SquadId`) AND (`t`.`GearNickName` = `t0`.`Nickname`)
-LEFT JOIN `Tags` AS `t1` ON (`t0`.`Nickname` = `t1`.`GearNickName`) AND (`t0`.`SquadId` = `t1`.`GearSquadId`)
+) AS `u` ON (`t`.`GearSquadId` = `u`.`SquadId`) AND (`t`.`GearNickName` = `u`.`Nickname`)
+LEFT JOIN `Tags` AS `t0` ON (`u`.`Nickname` = `t0`.`GearNickName`) AND (`u`.`SquadId` = `t0`.`GearSquadId`)
 """);
     }
 
@@ -2947,13 +2947,13 @@ public override async Task Collection_with_inheritance_and_join_include_source(b
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t1`.`Id`, `t1`.`GearNickName`, `t1`.`GearSquadId`, `t1`.`IssueDate`, `t1`.`Note`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t0`.`Id`, `t0`.`GearNickName`, `t0`.`GearSquadId`, `t0`.`IssueDate`, `t0`.`Note`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Tags` AS `t0` ON (`t`.`SquadId` = `t0`.`GearSquadId`) AND (`t`.`Nickname` = `t0`.`GearNickName`)
-LEFT JOIN `Tags` AS `t1` ON (`t`.`Nickname` = `t1`.`GearNickName`) AND (`t`.`SquadId` = `t1`.`GearSquadId`)
+) AS `u`
+INNER JOIN `Tags` AS `t` ON (`u`.`SquadId` = `t`.`GearSquadId`) AND (`u`.`Nickname` = `t`.`GearNickName`)
+LEFT JOIN `Tags` AS `t0` ON (`u`.`Nickname` = `t0`.`GearNickName`) AND (`u`.`SquadId` = `t0`.`GearSquadId`)
 """);
     }
 
@@ -3036,13 +3036,13 @@ public override async Task Non_unicode_string_literals_is_used_for_non_unicode_c
 WHERE (`c`.`Location` = 'Unknown') AND ((
     SELECT COUNT(*)
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`CityOfBirthName`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`CityOfBirthName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`c`.`Name` = `t`.`CityOfBirthName`) AND (`t`.`Nickname` = 'Paduk')) = 1)
+    ) AS `u`
+    WHERE (`c`.`Name` = `u`.`CityOfBirthName`) AND (`u`.`Nickname` = 'Paduk')) = 1)
 """);
     }
 
@@ -3052,16 +3052,16 @@ public override async Task Non_unicode_string_literals_is_used_for_non_unicode_c
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
-WHERE (`t`.`Nickname` = 'Marcus') AND (`c`.`Location` = 'Jacinto''s location')
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
+WHERE (`u`.`Nickname` = 'Marcus') AND (`c`.`Location` = 'Jacinto''s location')
 """);
     }
 
@@ -3077,18 +3077,6 @@ public override async Task Non_unicode_string_literals_is_used_for_non_unicode_c
 """);
     }
 
-    public override async Task Non_unicode_string_literals_is_used_for_non_unicode_column_with_concat(bool async)
-    {
-        await base.Non_unicode_string_literals_is_used_for_non_unicode_column_with_concat(async);
-
-        AssertSql(
-"""
-SELECT `c`.`Name`, `c`.`Location`, `c`.`Nation`
-FROM `Cities` AS `c`
-WHERE CONCAT(COALESCE(`c`.`Location`, ''), 'Added') LIKE '%Add%'
-""");
-    }
-
     public override void Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_coalesce_result1()
     {
         base.Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_coalesce_result1();
@@ -3096,23 +3084,23 @@ public override void Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_coalesc
         // Issue#16897
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`
 """);
     }
 
@@ -3123,23 +3111,23 @@ public override void Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_coalesc
         // Issue#16897
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`
 """);
     }
 
@@ -3150,24 +3138,24 @@ public override async Task Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_c
         // Issue#16897
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w0` ON `t`.`FullName` = `w0`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`
 """);
     }
 
@@ -3178,26 +3166,26 @@ public override async Task Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_c
         // Issue#16897
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `w2`.`Id`, `w2`.`AmmunitionType`, `w2`.`IsAutomatic`, `w2`.`Name`, `w2`.`OwnerFullName`, `w2`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `w2`.`Id`, `w2`.`AmmunitionType`, `w2`.`IsAutomatic`, `w2`.`Name`, `w2`.`OwnerFullName`, `w2`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w0` ON `t0`.`FullName` = `w0`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w1` ON `t0`.`FullName` = `w1`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w2` ON `t`.`FullName` = `w2`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`, `w0`.`Id`, `w1`.`Id`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w0` ON `u0`.`FullName` = `w0`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w1` ON `u0`.`FullName` = `w1`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w2` ON `u`.`FullName` = `w2`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`, `w0`.`Id`, `w1`.`Id`
 """);
     }
 
@@ -3207,22 +3195,22 @@ public override async Task Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_i
 
         // Issue#16897
         AssertSql(
-$"""
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+"""
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w0` ON `t`.`FullName` = `w0`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`
 """);
     }
 
@@ -3233,24 +3221,24 @@ public override async Task Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_c
         // Issue#16897
         AssertSql(
 """
-SELECT `t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL), `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+SELECT `u0`.`Nickname` IS NOT NULL AND (`u0`.`SquadId` IS NOT NULL), `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w0` ON `t`.`FullName` = `w0`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`
 """);
     }
 
@@ -3260,28 +3248,28 @@ public override async Task Include_on_GroupJoin_SelectMany_DefaultIfEmpty_with_c
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `w2`.`Id`, `w2`.`AmmunitionType`, `w2`.`IsAutomatic`, `w2`.`Name`, `w2`.`OwnerFullName`, `w2`.`SynergyWithId`, `t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL), `w3`.`Id`, `w3`.`AmmunitionType`, `w3`.`IsAutomatic`, `w3`.`Name`, `w3`.`OwnerFullName`, `w3`.`SynergyWithId`, `w4`.`Id`, `w4`.`AmmunitionType`, `w4`.`IsAutomatic`, `w4`.`Name`, `w4`.`OwnerFullName`, `w4`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `w2`.`Id`, `w2`.`AmmunitionType`, `w2`.`IsAutomatic`, `w2`.`Name`, `w2`.`OwnerFullName`, `w2`.`SynergyWithId`, `u0`.`Nickname` IS NOT NULL AND (`u0`.`SquadId` IS NOT NULL), `w3`.`Id`, `w3`.`AmmunitionType`, `w3`.`IsAutomatic`, `w3`.`Name`, `w3`.`OwnerFullName`, `w3`.`SynergyWithId`, `w4`.`Id`, `w4`.`AmmunitionType`, `w4`.`IsAutomatic`, `w4`.`Name`, `w4`.`OwnerFullName`, `w4`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w0` ON `t0`.`FullName` = `w0`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w1` ON `t0`.`FullName` = `w1`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w2` ON `t`.`FullName` = `w2`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w3` ON `t0`.`FullName` = `w3`.`OwnerFullName`
-LEFT JOIN `Weapons` AS `w4` ON `t`.`FullName` = `w4`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`, `w0`.`Id`, `w1`.`Id`, `w2`.`Id`, `w3`.`Id`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w0` ON `u0`.`FullName` = `w0`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w1` ON `u0`.`FullName` = `w1`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w2` ON `u`.`FullName` = `w2`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w3` ON `u0`.`FullName` = `w3`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w4` ON `u`.`FullName` = `w4`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`, `w0`.`Id`, `w1`.`Id`, `w2`.`Id`, `w3`.`Id`
 """);
     }
 
@@ -3334,8 +3322,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE ((`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL) AND (`t0`.`HasSoulPatch` = TRUE)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE ((`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL) AND (`u`.`HasSoulPatch` = TRUE)
 """);
     }
 
@@ -3353,8 +3341,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE `t0`.`HasSoulPatch` = TRUE
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -3372,8 +3360,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE `t0`.`HasSoulPatch` = FALSE
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE `u`.`HasSoulPatch` = FALSE
 """);
     }
 
@@ -3391,10 +3379,10 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE NOT (CASE
-    WHEN `t0`.`HasSoulPatch` = TRUE THEN TRUE
-    ELSE `t0`.`HasSoulPatch`
+    WHEN `u`.`HasSoulPatch` = TRUE THEN TRUE
+    ELSE `u`.`HasSoulPatch`
 END)
 """);
     }
@@ -3413,10 +3401,10 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE NOT (CASE
-    WHEN `t0`.`HasSoulPatch` = FALSE THEN FALSE
-    ELSE `t0`.`HasSoulPatch`
+    WHEN `u`.`HasSoulPatch` = FALSE THEN FALSE
+    ELSE `u`.`HasSoulPatch`
 END)
 """);
     }
@@ -3435,9 +3423,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t0`.`HasSoulPatch` = TRUE THEN TRUE
+    WHEN `u`.`HasSoulPatch` = TRUE THEN TRUE
     ELSE FALSE
 END
 """);
@@ -3457,8 +3445,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE (`t0`.`HasSoulPatch` = TRUE) OR (`t`.`Note` LIKE '%Cole%')
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE (`u`.`HasSoulPatch` = TRUE) OR (`t`.`Note` LIKE '%Cole%')
 """);
     }
 
@@ -3468,7 +3456,7 @@ public override async Task Optional_navigation_type_compensation_works_with_bina
 
         AssertSql(
 """
-SELECT (`t0`.`HasSoulPatch` = TRUE) AND ((`t`.`Note` LIKE '%Cole%') AND `t`.`Note` IS NOT NULL)
+SELECT (`u`.`HasSoulPatch` = TRUE) AND ((`t`.`Note` LIKE '%Cole%') AND `t`.`Note` IS NOT NULL)
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
@@ -3476,7 +3464,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 """);
     }
 
@@ -3486,7 +3474,7 @@ public override async Task Optional_navigation_type_compensation_works_with_proj
 
         AssertSql(
 """
-SELECT `t0`.`SquadId`
+SELECT `u`.`SquadId`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -3494,7 +3482,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE (`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL
 """);
     }
@@ -3505,7 +3493,7 @@ public override async Task Optional_navigation_type_compensation_works_with_proj
 
         AssertSql(
 """
-SELECT `t0`.`SquadId`
+SELECT `u`.`SquadId`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -3513,7 +3501,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE (`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL
 """);
     }
@@ -3524,7 +3512,7 @@ public override async Task Optional_navigation_type_compensation_works_with_DTOs
 
         AssertSql(
 """
-SELECT `t0`.`SquadId` AS `Id`
+SELECT `u`.`SquadId` AS `Id`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -3532,7 +3520,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE (`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL
 """);
     }
@@ -3543,7 +3531,7 @@ public override async Task Optional_navigation_type_compensation_works_with_list
 
         AssertSql(
 """
-SELECT `t0`.`SquadId`, `t0`.`SquadId` + 1
+SELECT `u`.`SquadId`, `u`.`SquadId` + 1
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -3551,7 +3539,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE (`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL
 ORDER BY `t`.`Note`
 """);
@@ -3563,7 +3551,7 @@ public override async Task Optional_navigation_type_compensation_works_with_arra
 
         AssertSql(
 """
-SELECT `t0`.`SquadId`
+SELECT `u`.`SquadId`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -3571,7 +3559,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE (`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL
 """);
     }
@@ -3590,9 +3578,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE (`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL
-ORDER BY `t0`.`SquadId`
+ORDER BY `u`.`SquadId`
 """);
     }
 
@@ -3606,13 +3594,13 @@ SELECT NOT EXISTS (
     SELECT 1
     FROM `Tags` AS `t`
     LEFT JOIN (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-    WHERE ((`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL) AND (`t0`.`HasSoulPatch` = FALSE))
+    ) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+    WHERE ((`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL) AND (`u`.`HasSoulPatch` = FALSE))
 """);
     }
 
@@ -3630,8 +3618,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE ((`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL) AND (`t0`.`HasSoulPatch` = FALSE)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE ((`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL) AND (`u`.`HasSoulPatch` = FALSE)
 """);
     }
 
@@ -3649,8 +3637,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE ((`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL) AND `t0`.`SquadId` IN (
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE ((`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL) AND `u`.`SquadId` IN (
     SELECT `g0`.`SquadId`
     FROM `Gears` AS `g0`
     UNION ALL
@@ -3680,22 +3668,22 @@ public override async Task Select_correlated_filtered_collection(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `c`.`Name`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `c`.`Name`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`CityOfBirthName`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`CityOfBirthName`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE (`w`.`Name` <> 'Lancer') OR `w`.`Name` IS NULL
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
 WHERE `c`.`Name` IN ('Ephyra', 'Hanover')
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `c`.`Name`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `c`.`Name`
 """);
     }
 
@@ -3704,24 +3692,24 @@ public override async Task Select_correlated_filtered_collection_with_composite_
         await base.Select_correlated_filtered_collection_with_composite_key(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+"""
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    WHERE `t1`.`Nickname` <> 'Dom'
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    ) AS `u0`
+    WHERE `u0`.`Nickname` <> 'Dom'
+) AS `u1` ON (`u`.`Nickname` = `u1`.`LeaderNickname`) AND (`u`.`SquadId` = `u1`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`
 """);
     }
 
@@ -3731,7 +3719,7 @@ public override async Task Select_correlated_filtered_collection_works_with_cach
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -3739,8 +3727,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON `t`.`GearNickName` = `t0`.`Nickname`
-ORDER BY `t`.`Note`, `t`.`Id`, `t0`.`Nickname`
+) AS `u` ON `t`.`GearNickName` = `u`.`Nickname`
+ORDER BY `t`.`Note`, `t`.`Id`, `u`.`Nickname`
 """);
     }
 
@@ -3750,14 +3738,14 @@ public override async Task Join_predicate_value_equals_condition(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN `Weapons` AS `w` ON `w`.`SynergyWithId` IS NOT NULL
 """);
     }
@@ -3768,15 +3756,15 @@ public override async Task Join_predicate_value(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Weapons` AS `w` ON `t`.`HasSoulPatch` = TRUE
+) AS `u`
+INNER JOIN `Weapons` AS `w` ON `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -3786,14 +3774,14 @@ public override async Task Join_predicate_condition_equals_condition(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN `Weapons` AS `w` ON `w`.`SynergyWithId` IS NOT NULL
 """);
     }
@@ -3804,14 +3792,14 @@ public override async Task Left_join_predicate_value_equals_condition(bool async
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN `Weapons` AS `w` ON `w`.`SynergyWithId` IS NOT NULL
 """);
     }
@@ -3822,15 +3810,15 @@ public override async Task Left_join_predicate_value(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON `t`.`HasSoulPatch` = TRUE
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -3840,14 +3828,14 @@ public override async Task Left_join_predicate_condition_equals_condition(bool a
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN `Weapons` AS `w` ON `w`.`SynergyWithId` IS NOT NULL
 """);
     }
@@ -4103,8 +4091,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t` ON `w`.`OwnerFullName` = `t`.`FullName`
-WHERE (`w`.`Id` <> 50) AND (`t`.`HasSoulPatch` = FALSE)
+) AS `u` ON `w`.`OwnerFullName` = `u`.`FullName`
+WHERE (`w`.`Id` <> 50) AND (`u`.`HasSoulPatch` = FALSE)
 """);
     }
 
@@ -4114,16 +4102,16 @@ public override async Task Distinct_with_optional_navigation_is_translated_to_sq
 
         AssertSql(
 """
-SELECT DISTINCT `t`.`HasSoulPatch`
+SELECT DISTINCT `u`.`HasSoulPatch`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE (`t0`.`Note` <> 'Foo') OR `t0`.`Note` IS NULL
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE (`t`.`Note` <> 'Foo') OR `t`.`Note` IS NULL
 """);
     }
 
@@ -4133,16 +4121,16 @@ public override async Task Sum_with_optional_navigation_is_translated_to_sql(boo
 
         AssertSql(
 """
-SELECT COALESCE(SUM(`t`.`SquadId`), 0)
+SELECT COALESCE(SUM(`u`.`SquadId`), 0)
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE (`t0`.`Note` <> 'Foo') OR `t0`.`Note` IS NULL
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE (`t`.`Note` <> 'Foo') OR `t`.`Note` IS NULL
 """);
     }
 
@@ -4159,9 +4147,9 @@ SELECT COUNT(*)
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE (`t0`.`Note` <> 'Foo') OR `t0`.`Note` IS NULL
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE (`t`.`Note` <> 'Foo') OR `t`.`Note` IS NULL
 """);
     }
 
@@ -4174,12 +4162,12 @@ public override async Task FirstOrDefault_with_manually_created_groupjoin_is_tra
 SELECT `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT `g`.`SquadId`
     FROM `Gears` AS `g`
     UNION ALL
-    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t` ON `s`.`Id` = `t`.`SquadId`
+) AS `u` ON `s`.`Id` = `u`.`SquadId`
 WHERE `s`.`Name` = 'Kilo'
 LIMIT 1
 """);
@@ -4196,14 +4184,14 @@ public override async Task Any_with_optional_navigation_as_subquery_predicate_is
 WHERE NOT EXISTS (
     SELECT 1
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`SquadId`
         FROM `Officers` AS `o`
-    ) AS `t`
-    LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t0`.`Note` = 'Dom''s Tag'))
+    ) AS `u`
+    LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`t`.`Note` = 'Dom''s Tag'))
 """);
     }
 
@@ -4216,14 +4204,14 @@ public override async Task All_with_optional_navigation_is_translated_to_sql(boo
 SELECT NOT EXISTS (
     SELECT 1
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`SquadId`
         FROM `Officers` AS `o`
-    ) AS `t`
-    LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-    WHERE (`t0`.`Note` = 'Foo') AND `t0`.`Note` IS NOT NULL)
+    ) AS `u`
+    LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+    WHERE (`t`.`Note` = 'Foo') AND `t`.`Note` IS NOT NULL)
 """);
     }
 
@@ -4263,16 +4251,16 @@ public override async Task Unnecessary_include_doesnt_get_added_complex_when_pro
 
         AssertSql(
 """
-SELECT `t`.`FullName`
+SELECT `u`.`FullName`
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
-ORDER BY `t`.`Rank`
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
+ORDER BY `u`.`Rank`
 """);
     }
 
@@ -4282,16 +4270,16 @@ public override async Task Multiple_order_bys_are_properly_lifted_from_subquery_
 
         AssertSql(
 """
-SELECT `t`.`FullName`
+SELECT `u`.`FullName`
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = FALSE
-ORDER BY `t`.`FullName`
+) AS `u`
+WHERE `u`.`HasSoulPatch` = FALSE
+ORDER BY `u`.`FullName`
 """);
     }
 
@@ -4301,16 +4289,16 @@ public override async Task Order_by_is_properly_lifted_from_subquery_with_same_o
 
         AssertSql(
 """
-SELECT `t`.`FullName`
+SELECT `u`.`FullName`
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = FALSE
-ORDER BY `t`.`FullName`
+) AS `u`
+WHERE `u`.`HasSoulPatch` = FALSE
+ORDER BY `u`.`FullName`
 """);
     }
 
@@ -4320,17 +4308,17 @@ public override async Task Where_is_properly_lifted_from_subquery_created_by_inc
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`GearNickName`, `t0`.`GearSquadId`, `t0`.`IssueDate`, `t0`.`Note`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE (`t`.`FullName` <> 'Augustus Cole') AND (`t`.`HasSoulPatch` = FALSE)
-ORDER BY `t`.`FullName`
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE (`u`.`FullName` <> 'Augustus Cole') AND (`u`.`HasSoulPatch` = FALSE)
+ORDER BY `u`.`FullName`
 """);
     }
 
@@ -4340,23 +4328,23 @@ public override async Task Subquery_is_lifted_from_main_from_clause_of_SelectMan
 
         AssertSql(
 """
-SELECT `t`.`FullName` AS `Name1`, `t0`.`FullName` AS `Name2`
+SELECT `u`.`FullName` AS `Name1`, `u0`.`FullName` AS `Name2`
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN (
     SELECT `g0`.`FullName`, `g0`.`HasSoulPatch`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`FullName`, `o0`.`HasSoulPatch`
     FROM `Officers` AS `o0`
-) AS `t0`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (`t0`.`HasSoulPatch` = FALSE)
-ORDER BY `t`.`FullName`
+) AS `u0`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (`u0`.`HasSoulPatch` = FALSE)
+ORDER BY `u`.`FullName`
 """);
     }
 
@@ -4366,17 +4354,17 @@ public override async Task Subquery_containing_SelectMany_projecting_main_from_c
 
         AssertSql(
 """
-SELECT `t`.`FullName`
+SELECT `u`.`FullName`
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-CROSS JOIN `Tags` AS `t0`
-WHERE `t`.`HasSoulPatch` = TRUE
-ORDER BY `t`.`FullName`
+) AS `u`
+CROSS JOIN `Tags` AS `t`
+WHERE `u`.`HasSoulPatch` = TRUE
+ORDER BY `u`.`FullName`
 """);
     }
 
@@ -4386,16 +4374,16 @@ public override async Task Subquery_containing_join_projecting_main_from_clause_
 
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Tags` AS `t0` ON `t`.`Nickname` = `t0`.`GearNickName`
-ORDER BY `t`.`Nickname`
+) AS `u`
+INNER JOIN `Tags` AS `t` ON `u`.`Nickname` = `t`.`GearNickName`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -4405,16 +4393,16 @@ public override async Task Subquery_containing_left_join_projecting_main_from_cl
 
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON `t`.`Nickname` = `t0`.`GearNickName`
-ORDER BY `t`.`Nickname`
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON `u`.`Nickname` = `t`.`GearNickName`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -4424,18 +4412,18 @@ public override async Task Subquery_containing_join_gets_lifted_clashing_names(b
 
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Tags` AS `t0` ON `t`.`Nickname` = `t0`.`GearNickName`
-INNER JOIN `Tags` AS `t1` ON `t`.`Nickname` = `t1`.`GearNickName`
-WHERE (`t0`.`GearNickName` <> 'Cole Train') OR `t0`.`GearNickName` IS NULL
-ORDER BY `t`.`Nickname`, `t1`.`Id`
+) AS `u`
+INNER JOIN `Tags` AS `t` ON `u`.`Nickname` = `t`.`GearNickName`
+INNER JOIN `Tags` AS `t0` ON `u`.`Nickname` = `t0`.`GearNickName`
+WHERE (`t`.`GearNickName` <> 'Cole Train') OR `t`.`GearNickName` IS NULL
+ORDER BY `u`.`Nickname`, `t0`.`Id`
 """);
     }
 
@@ -4445,20 +4433,20 @@ public override async Task Subquery_created_by_include_gets_lifted_nested(bool a
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 WHERE EXISTS (
     SELECT 1
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`) AND (`t`.`HasSoulPatch` = FALSE)
-ORDER BY `t`.`Nickname`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`) AND (`u`.`HasSoulPatch` = FALSE)
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -4468,23 +4456,23 @@ public override async Task Subquery_is_lifted_from_additional_from_clause(bool a
 
         AssertSql(
 """
-SELECT `t`.`FullName` AS `Name1`, `t0`.`FullName` AS `Name2`
+SELECT `u`.`FullName` AS `Name1`, `u0`.`FullName` AS `Name2`
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN (
     SELECT `g0`.`FullName`, `g0`.`HasSoulPatch`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`FullName`, `o0`.`HasSoulPatch`
     FROM `Officers` AS `o0`
-) AS `t0`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND (`t0`.`HasSoulPatch` = FALSE)
-ORDER BY `t`.`FullName`
+) AS `u0`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND (`u0`.`HasSoulPatch` = FALSE)
+ORDER BY `u`.`FullName`
 """);
     }
 
@@ -4496,21 +4484,21 @@ public override async Task Subquery_with_result_operator_is_not_lifted(bool asyn
 """
 @__p_0='2'
 
-SELECT `t0`.`FullName`
+SELECT `u0`.`FullName`
 FROM (
-    SELECT `t`.`FullName`, `t`.`Rank`
+    SELECT `u`.`FullName`, `u`.`Rank`
     FROM (
         SELECT `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`Rank`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`Rank`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE `t`.`HasSoulPatch` = FALSE
-    ORDER BY `t`.`FullName`
+    ) AS `u`
+    WHERE `u`.`HasSoulPatch` = FALSE
+    ORDER BY `u`.`FullName`
     LIMIT @__p_0
-) AS `t0`
-ORDER BY `t0`.`Rank`
+) AS `u0`
+ORDER BY `u0`.`Rank`
 """);
     }
 
@@ -4522,21 +4510,21 @@ public override async Task Skip_with_orderby_followed_by_orderBy_is_pushed_down(
 """
 @__p_0='1'
 
-SELECT `t0`.`FullName`
+SELECT `u0`.`FullName`
 FROM (
-    SELECT `t`.`FullName`, `t`.`Rank`
+    SELECT `u`.`FullName`, `u`.`Rank`
     FROM (
         SELECT `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`Rank`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`Rank`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE `t`.`HasSoulPatch` = FALSE
-    ORDER BY `t`.`FullName`
+    ) AS `u`
+    WHERE `u`.`HasSoulPatch` = FALSE
+    ORDER BY `u`.`FullName`
     LIMIT 18446744073709551610 OFFSET @__p_0
-) AS `t0`
-ORDER BY `t0`.`Rank`
+) AS `u0`
+ORDER BY `u0`.`Rank`
 """);
     }
 
@@ -4745,13 +4733,13 @@ public override async Task Collection_navigation_access_on_derived_entity_using_
 SELECT `l`.`Name`, (
     SELECT COUNT(*)
     FROM (
-        SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
+        SELECT `l0`.`LocustHordeId`
         FROM `LocustLeaders` AS `l0`
         UNION ALL
-        SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
+        SELECT `l1`.`LocustHordeId`
         FROM `LocustCommanders` AS `l1`
-    ) AS `t`
-    WHERE `l`.`Id` = `t`.`LocustHordeId`) AS `LeadersCount`
+    ) AS `u`
+    WHERE `l`.`Id` = `u`.`LocustHordeId`) AS `LeadersCount`
 FROM `LocustHordes` AS `l`
 ORDER BY `l`.`Name`
 """);
@@ -4763,7 +4751,7 @@ public override async Task Collection_navigation_access_on_derived_entity_using_
 
         AssertSql(
 """
-SELECT `l`.`Name`, `t`.`Name` AS `LeaderName`
+SELECT `l`.`Name`, `u`.`Name` AS `LeaderName`
 FROM `LocustHordes` AS `l`
 INNER JOIN (
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`
@@ -4771,8 +4759,8 @@ INNER JOIN (
     UNION ALL
     SELECT `l1`.`Name`, `l1`.`LocustHordeId`
     FROM `LocustCommanders` AS `l1`
-) AS `t` ON `l`.`Id` = `t`.`LocustHordeId`
-ORDER BY `t`.`Name`
+) AS `u` ON `l`.`Id` = `u`.`LocustHordeId`
+ORDER BY `u`.`Name`
 """);
     }
 
@@ -4782,7 +4770,7 @@ public override async Task Include_on_derived_entity_using_OfType(bool async)
 
         AssertSql(
 """
-SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM `LocustHordes` AS `l`
 LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
 LEFT JOIN (
@@ -4791,7 +4779,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `l2`.`Name`, `l2`.`LocustHordeId`, `l2`.`ThreatLevel`, `l2`.`ThreatLevelByte`, `l2`.`ThreatLevelNullableByte`, `l2`.`DefeatedByNickname`, `l2`.`DefeatedBySquadId`, `l2`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l2`
-) AS `t` ON `l`.`Id` = `t`.`LocustHordeId`
+) AS `u` ON `l`.`Id` = `u`.`LocustHordeId`
 ORDER BY `l`.`Name`, `l`.`Id`, `l0`.`Name`
 """);
     }
@@ -4802,17 +4790,17 @@ public override async Task Distinct_on_subquery_doesnt_get_lifted(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`HasSoulPatch`
+SELECT `u0`.`HasSoulPatch`
 FROM (
-    SELECT DISTINCT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+    SELECT DISTINCT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t`
-) AS `t0`
+    ) AS `u`
+) AS `u0`
 """);
     }
 
@@ -4833,23 +4821,23 @@ public override async Task Comparing_two_collection_navigations_composite_key(bo
 
         AssertSql(
 """
-SELECT `t`.`Nickname` AS `Nickname1`, `t0`.`Nickname` AS `Nickname2`
+SELECT `u`.`Nickname` AS `Nickname1`, `u0`.`Nickname` AS `Nickname2`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`
     FROM `Officers` AS `o0`
-) AS `t0`
-WHERE (`t`.`Nickname` = `t0`.`Nickname`) AND (`t`.`SquadId` = `t0`.`SquadId`)
-ORDER BY `t`.`Nickname`
+) AS `u0`
+WHERE (`u`.`Nickname` = `u0`.`Nickname`) AND (`u`.`SquadId` = `u0`.`SquadId`)
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -4859,12 +4847,12 @@ public override async Task Comparing_two_collection_navigations_inheritance(bool
 
         AssertSql(
 """
-SELECT `l`.`Name`, `t`.`Nickname`
+SELECT `l`.`Name`, `u`.`Nickname`
 FROM `LocustHordes` AS `l`
 CROSS JOIN (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -4872,8 +4860,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`l0`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `t0`.`SquadId`)
-WHERE (`t`.`HasSoulPatch` = TRUE) AND ((`t0`.`Nickname` = `t`.`Nickname`) AND (`t0`.`SquadId` = `t`.`SquadId`))
+) AS `u0` ON (`l0`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `u0`.`SquadId`)
+WHERE (`u`.`HasSoulPatch` = TRUE) AND ((`u0`.`Nickname` = `u`.`Nickname`) AND (`u0`.`SquadId` = `u`.`SquadId`))
 """);
     }
 
@@ -4883,20 +4871,20 @@ public override async Task Comparing_entities_using_Equals_inheritance(bool asyn
 
         AssertSql(
 """
-SELECT `t`.`Nickname` AS `Nickname1`, `t0`.`Nickname` AS `Nickname2`
+SELECT `u`.`Nickname` AS `Nickname1`, `u0`.`Nickname` AS `Nickname2`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN (
     SELECT `o0`.`Nickname`, `o0`.`SquadId`
     FROM `Officers` AS `o0`
-) AS `t0`
-WHERE (`t`.`Nickname` = `t0`.`Nickname`) AND (`t`.`SquadId` = `t0`.`SquadId`)
-ORDER BY `t`.`Nickname`, `t0`.`Nickname`
+) AS `u0`
+WHERE (`u`.`Nickname` = `u0`.`Nickname`) AND (`u`.`SquadId` = `u0`.`SquadId`)
+ORDER BY `u`.`Nickname`, `u0`.`Nickname`
 """);
     }
 
@@ -4928,18 +4916,18 @@ FROM JSON_TABLE('["Ephyra",null]', '$[*]' COLUMNS (
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Cities` AS `c` ON `t`.`AssignedCityName` = `c`.`Name`
-WHERE (`t`.`SquadId` < 2) AND (`c`.`Name` IS NULL OR (`c`.`Name` = 'Ephyra'))
+) AS `u`
+LEFT JOIN `Cities` AS `c` ON `u`.`AssignedCityName` = `c`.`Name`
+WHERE (`u`.`SquadId` < 2) AND (`c`.`Name` IS NULL OR (`c`.`Name` = 'Ephyra'))
 """);
         }
     }
@@ -4958,17 +4946,17 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE (`t0`.`Discriminator` = 'Officer') AND ((
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE (`u`.`Discriminator` = 'Officer') AND ((
     SELECT COUNT(*)
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    WHERE ((`t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL)) AND ((`t0`.`Nickname` = `t1`.`LeaderNickname`) AND (`t0`.`SquadId` = `t1`.`LeaderSquadId`))) AND (`t1`.`Nickname` = 'Dom')) > 0)
+    ) AS `u0`
+    WHERE ((`u`.`Nickname` IS NOT NULL AND (`u`.`SquadId` IS NOT NULL)) AND ((`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`))) AND (`u0`.`Nickname` = 'Dom')) > 0)
 """);
     }
 
@@ -5006,7 +4994,7 @@ public override async Task Project_collection_navigation_with_inheritance1(bool
 
         AssertSql(
 """
-SELECT `l`.`Id`, `l0`.`Name`, `l1`.`Id`, `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `l`.`Id`, `l0`.`Name`, `l1`.`Id`, `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM `LocustHordes` AS `l`
 LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
 LEFT JOIN `LocustHordes` AS `l1` ON `l0`.`Name` = `l1`.`CommanderName`
@@ -5016,7 +5004,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `l3`.`Name`, `l3`.`LocustHordeId`, `l3`.`ThreatLevel`, `l3`.`ThreatLevelByte`, `l3`.`ThreatLevelNullableByte`, `l3`.`DefeatedByNickname`, `l3`.`DefeatedBySquadId`, `l3`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l3`
-) AS `t` ON `l1`.`Id` = `t`.`LocustHordeId`
+) AS `u` ON `l1`.`Id` = `u`.`LocustHordeId`
 ORDER BY `l`.`Id`, `l0`.`Name`, `l1`.`Id`
 """);
     }
@@ -5027,7 +5015,7 @@ public override async Task Project_collection_navigation_with_inheritance2(bool
 
         AssertSql(
 """
-SELECT `l`.`Id`, `l0`.`Name`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `l`.`Id`, `l0`.`Name`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM `LocustHordes` AS `l`
 LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
 LEFT JOIN (
@@ -5036,15 +5024,15 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t` ON (`l0`.`DefeatedByNickname` = `t`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `t`.`SquadId`)
+) AS `u` ON (`l0`.`DefeatedByNickname` = `u`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `u`.`SquadId`)
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON ((`t`.`Nickname` = `t0`.`LeaderNickname`) OR (`t`.`Nickname` IS NULL AND (`t0`.`LeaderNickname` IS NULL))) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `l`.`Id`, `l0`.`Name`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON ((`u`.`Nickname` = `u0`.`LeaderNickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`LeaderNickname` IS NULL))) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `l`.`Id`, `l0`.`Name`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -5054,7 +5042,7 @@ public override async Task Project_collection_navigation_with_inheritance3(bool
 
         AssertSql(
 """
-SELECT `l`.`Id`, `l0`.`Name`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `l`.`Id`, `l0`.`Name`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM `LocustHordes` AS `l`
 LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
 LEFT JOIN (
@@ -5063,15 +5051,15 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t` ON (`l0`.`DefeatedByNickname` = `t`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `t`.`SquadId`)
+) AS `u` ON (`l0`.`DefeatedByNickname` = `u`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `u`.`SquadId`)
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON ((`t`.`Nickname` = `t0`.`LeaderNickname`) OR (`t`.`Nickname` IS NULL AND (`t0`.`LeaderNickname` IS NULL))) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `l`.`Id`, `l0`.`Name`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON ((`u`.`Nickname` = `u0`.`LeaderNickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`LeaderNickname` IS NULL))) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `l`.`Id`, `l0`.`Name`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -5081,21 +5069,21 @@ public override async Task Include_reference_on_derived_type_using_string(bool a
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
 """);
     }
 
@@ -5105,22 +5093,22 @@ public override async Task Include_reference_on_derived_type_using_string_nested
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
-LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
+LEFT JOIN `Squads` AS `s` ON `u0`.`SquadId` = `s`.`Id`
 """);
     }
 
@@ -5129,34 +5117,34 @@ public override async Task Include_reference_on_derived_type_using_string_nested
         await base.Include_reference_on_derived_type_using_string_nested2(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`, `t1`.`Name`, `t1`.`Location`, `t1`.`Nation`
+"""
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `s`.`Nickname`, `s`.`SquadId`, `s`.`AssignedCityName`, `s`.`CityOfBirthName`, `s`.`FullName`, `s`.`HasSoulPatch`, `s`.`LeaderNickname`, `s`.`LeaderSquadId`, `s`.`Rank`, `s`.`Discriminator`, `s`.`Name`, `s`.`Location`, `s`.`Nation`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
 LEFT JOIN (
-    SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
+    SELECT `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o0`
-    ) AS `t2`
-    INNER JOIN `Cities` AS `c` ON `t2`.`CityOfBirthName` = `c`.`Name`
-) AS `t1` ON ((`t0`.`Nickname` = `t1`.`LeaderNickname`) OR (`t0`.`Nickname` IS NULL AND (`t1`.`LeaderNickname` IS NULL))) AND (`t0`.`SquadId` = `t1`.`LeaderSquadId`)
-ORDER BY `t`.`Name`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Nickname`, `t1`.`SquadId`
+    ) AS `u1`
+    INNER JOIN `Cities` AS `c` ON `u1`.`CityOfBirthName` = `c`.`Name`
+) AS `s` ON ((`u0`.`Nickname` = `s`.`LeaderNickname`) OR (`u0`.`Nickname` IS NULL AND (`s`.`LeaderNickname` IS NULL))) AND (`u0`.`SquadId` = `s`.`LeaderSquadId`)
+ORDER BY `u`.`Name`, `u0`.`Nickname`, `u0`.`SquadId`, `s`.`Nickname`, `s`.`SquadId`
 """);
     }
 
@@ -5166,21 +5154,21 @@ public override async Task Include_reference_on_derived_type_using_lambda(bool a
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
 """);
     }
 
@@ -5190,21 +5178,21 @@ public override async Task Include_reference_on_derived_type_using_lambda_with_s
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
 """);
     }
 
@@ -5214,21 +5202,21 @@ public override async Task Include_reference_on_derived_type_using_lambda_with_t
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
 """);
     }
 
@@ -5238,22 +5226,22 @@ public override async Task Include_collection_on_derived_type_using_string(bool
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -5263,22 +5251,22 @@ public override async Task Include_collection_on_derived_type_using_lambda(bool
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -5288,22 +5276,22 @@ public override async Task Include_collection_on_derived_type_using_lambda_with_
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -5313,17 +5301,17 @@ public override async Task Include_base_navigation_on_derived_entity(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`GearNickName`, `t0`.`GearSquadId`, `t0`.`IssueDate`, `t0`.`Note`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`
 """);
     }
 
@@ -5333,7 +5321,7 @@ public override async Task ThenInclude_collection_on_derived_after_base_referenc
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -5341,9 +5329,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5353,7 +5341,7 @@ public override async Task ThenInclude_collection_on_derived_after_derived_refer
 
         AssertSql(
 """
-SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM `LocustHordes` AS `l`
 LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
 LEFT JOIN (
@@ -5362,15 +5350,15 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t` ON (`l0`.`DefeatedByNickname` = `t`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `t`.`SquadId`)
+) AS `u` ON (`l0`.`DefeatedByNickname` = `u`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `u`.`SquadId`)
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON ((`t`.`Nickname` = `t0`.`LeaderNickname`) OR (`t`.`Nickname` IS NULL AND (`t0`.`LeaderNickname` IS NULL))) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `l`.`Id`, `l0`.`Name`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON ((`u`.`Nickname` = `u0`.`LeaderNickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`LeaderNickname` IS NULL))) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `l`.`Id`, `l0`.`Name`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -5379,33 +5367,33 @@ public override async Task ThenInclude_collection_on_derived_after_derived_colle
         await base.ThenInclude_collection_on_derived_after_derived_collection(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`, `t1`.`Nickname0`, `t1`.`SquadId0`, `t1`.`AssignedCityName0`, `t1`.`CityOfBirthName0`, `t1`.`FullName0`, `t1`.`HasSoulPatch0`, `t1`.`LeaderNickname0`, `t1`.`LeaderSquadId0`, `t1`.`Rank0`, `t1`.`Discriminator0`
+"""
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Nickname`, `s`.`SquadId`, `s`.`AssignedCityName`, `s`.`CityOfBirthName`, `s`.`FullName`, `s`.`HasSoulPatch`, `s`.`LeaderNickname`, `s`.`LeaderSquadId`, `s`.`Rank`, `s`.`Discriminator`, `s`.`Nickname0`, `s`.`SquadId0`, `s`.`AssignedCityName0`, `s`.`CityOfBirthName0`, `s`.`FullName0`, `s`.`HasSoulPatch0`, `s`.`LeaderNickname0`, `s`.`LeaderSquadId0`, `s`.`Rank0`, `s`.`Discriminator0`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t2`.`Nickname` AS `Nickname0`, `t2`.`SquadId` AS `SquadId0`, `t2`.`AssignedCityName` AS `AssignedCityName0`, `t2`.`CityOfBirthName` AS `CityOfBirthName0`, `t2`.`FullName` AS `FullName0`, `t2`.`HasSoulPatch` AS `HasSoulPatch0`, `t2`.`LeaderNickname` AS `LeaderNickname0`, `t2`.`LeaderSquadId` AS `LeaderSquadId0`, `t2`.`Rank` AS `Rank0`, `t2`.`Discriminator` AS `Discriminator0`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u1`.`Nickname` AS `Nickname0`, `u1`.`SquadId` AS `SquadId0`, `u1`.`AssignedCityName` AS `AssignedCityName0`, `u1`.`CityOfBirthName` AS `CityOfBirthName0`, `u1`.`FullName` AS `FullName0`, `u1`.`HasSoulPatch` AS `HasSoulPatch0`, `u1`.`LeaderNickname` AS `LeaderNickname0`, `u1`.`LeaderSquadId` AS `LeaderSquadId0`, `u1`.`Rank` AS `Rank0`, `u1`.`Discriminator` AS `Discriminator0`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o0`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN (
-        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`AssignedCityName`, `g1`.`CityOfBirthName`, `g1`.`FullName`, `g1`.`HasSoulPatch`, `g1`.`LeaderNickname`, `g1`.`LeaderSquadId`, `g1`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`AssignedCityName`, `g1`.`CityOfBirthName`, `g1`.`FullName`, `g1`.`HasSoulPatch`, `g1`.`LeaderNickname`, `g1`.`LeaderSquadId`, `g1`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g1`
         UNION ALL
-        SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`AssignedCityName`, `o1`.`CityOfBirthName`, `o1`.`FullName`, `o1`.`HasSoulPatch`, `o1`.`LeaderNickname`, `o1`.`LeaderSquadId`, `o1`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`AssignedCityName`, `o1`.`CityOfBirthName`, `o1`.`FullName`, `o1`.`HasSoulPatch`, `o1`.`LeaderNickname`, `o1`.`LeaderSquadId`, `o1`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o1`
-    ) AS `t2` ON (`t0`.`Nickname` = `t2`.`LeaderNickname`) AND (`t0`.`SquadId` = `t2`.`LeaderSquadId`)
-) AS `t1` ON (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Nickname0`
+    ) AS `u1` ON (`u0`.`Nickname` = `u1`.`LeaderNickname`) AND (`u0`.`SquadId` = `u1`.`LeaderSquadId`)
+) AS `s` ON (`u`.`Nickname` = `s`.`LeaderNickname`) AND (`u`.`SquadId` = `s`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Nickname`, `s`.`SquadId`, `s`.`Nickname0`
 """);
     }
 
@@ -5414,27 +5402,27 @@ public override async Task ThenInclude_reference_on_derived_after_derived_collec
         await base.ThenInclude_reference_on_derived_after_derived_collection(async);
 
         AssertSql(
-$"""
-SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `t1`.`Name`, `t1`.`LocustHordeId`, `t1`.`ThreatLevel`, `t1`.`ThreatLevelByte`, `t1`.`ThreatLevelNullableByte`, `t1`.`DefeatedByNickname`, `t1`.`DefeatedBySquadId`, `t1`.`HighCommandId`, `t1`.`Discriminator`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator0`
+"""
+SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `s`.`Name`, `s`.`LocustHordeId`, `s`.`ThreatLevel`, `s`.`ThreatLevelByte`, `s`.`ThreatLevelNullableByte`, `s`.`DefeatedByNickname`, `s`.`DefeatedBySquadId`, `s`.`HighCommandId`, `s`.`Discriminator`, `s`.`Nickname`, `s`.`SquadId`, `s`.`AssignedCityName`, `s`.`CityOfBirthName`, `s`.`FullName`, `s`.`HasSoulPatch`, `s`.`LeaderNickname`, `s`.`LeaderSquadId`, `s`.`Rank`, `s`.`Discriminator0`
 FROM `LocustHordes` AS `l`
 LEFT JOIN (
-    SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator` AS `Discriminator0`
+    SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator` AS `Discriminator0`
     FROM (
-        SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL")} AS `DefeatedByNickname`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `DefeatedBySquadId`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `HighCommandId`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'LocustLeader'")} AS `Discriminator`
+        SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
         FROM `LocustLeaders` AS `l0`
         UNION ALL
-        SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'LocustCommander'")} AS `Discriminator`
+        SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
         FROM `LocustCommanders` AS `l1`
-    ) AS `t`
+    ) AS `u`
     LEFT JOIN (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
-) AS `t1` ON `l`.`Id` = `t1`.`LocustHordeId`
-ORDER BY `l`.`Id`, `t1`.`Name`, `t1`.`Nickname`
+    ) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
+) AS `s` ON `l`.`Id` = `s`.`LocustHordeId`
+ORDER BY `l`.`Id`, `s`.`Name`, `s`.`Nickname`
 """);
     }
 
@@ -5444,7 +5432,7 @@ public override async Task Multiple_derived_included_on_one_method(bool async)
 
         AssertSql(
 """
-SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM `LocustHordes` AS `l`
 LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
 LEFT JOIN (
@@ -5453,15 +5441,15 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t` ON (`l0`.`DefeatedByNickname` = `t`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `t`.`SquadId`)
+) AS `u` ON (`l0`.`DefeatedByNickname` = `u`.`Nickname`) AND (`l0`.`DefeatedBySquadId` = `u`.`SquadId`)
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON ((`t`.`Nickname` = `t0`.`LeaderNickname`) OR (`t`.`Nickname` IS NULL AND (`t0`.`LeaderNickname` IS NULL))) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `l`.`Id`, `l0`.`Name`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON ((`u`.`Nickname` = `u0`.`LeaderNickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`LeaderNickname` IS NULL))) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `l`.`Id`, `l0`.`Name`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -5470,28 +5458,28 @@ public override async Task Include_on_derived_multi_level(bool async)
         await base.Include_on_derived_multi_level(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t0`.`Id`, `t0`.`Banner`, `t0`.`Banner5`, `t0`.`InternalNumber`, `t0`.`Name`, `t0`.`SquadId0`, `t0`.`MissionId`
+"""
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`AssignedCityName`, `s1`.`CityOfBirthName`, `s1`.`FullName`, `s1`.`HasSoulPatch`, `s1`.`LeaderNickname`, `s1`.`LeaderSquadId`, `s1`.`Rank`, `s1`.`Discriminator`, `s1`.`Id`, `s1`.`Banner`, `s1`.`Banner5`, `s1`.`InternalNumber`, `s1`.`Name`, `s1`.`SquadId0`, `s1`.`MissionId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s0`.`SquadId` AS `SquadId0`, `s0`.`MissionId`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s0`.`SquadId` AS `SquadId0`, `s0`.`MissionId`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    INNER JOIN `Squads` AS `s` ON `t1`.`SquadId` = `s`.`Id`
+    ) AS `u0`
+    INNER JOIN `Squads` AS `s` ON `u0`.`SquadId` = `s`.`Id`
     LEFT JOIN `SquadMissions` AS `s0` ON `s`.`Id` = `s0`.`SquadId`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`Id`, `t0`.`SquadId0`
+) AS `s1` ON (`u`.`Nickname` = `s1`.`LeaderNickname`) AND (`u`.`SquadId` = `s1`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`Id`, `s1`.`SquadId0`
 """);
     }
 
@@ -5502,7 +5490,7 @@ public override async Task Projecting_nullable_bool_in_conditional_works(bool as
         AssertSql(
 """
 SELECT CASE
-    WHEN `t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL) THEN `t0`.`HasSoulPatch`
+    WHEN `u`.`Nickname` IS NOT NULL AND (`u`.`SquadId` IS NOT NULL) THEN `u`.`HasSoulPatch`
     ELSE FALSE
 END AS `Prop`
 FROM `Tags` AS `t`
@@ -5512,7 +5500,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 """);
     }
 
@@ -5522,15 +5510,15 @@ public override async Task Enum_ToString_is_client_eval(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Rank`
+SELECT `u`.`Rank`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`SquadId`, `t`.`Nickname`
+) AS `u`
+ORDER BY `u`.`SquadId`, `u`.`Nickname`
 """);
     }
 
@@ -5540,17 +5528,17 @@ public override async Task Correlated_collections_naked_navigation_with_ToList(b
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5563,16 +5551,16 @@ public override async Task Correlated_collections_naked_navigation_with_ToList_f
 SELECT (
     SELECT COUNT(*)
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`)
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`)
 FROM (
     SELECT `g`.`Nickname`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`
+) AS `u`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -5582,17 +5570,17 @@ public override async Task Correlated_collections_naked_navigation_with_ToArray(
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5602,21 +5590,21 @@ public override async Task Correlated_collections_basic_projection(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE (`w`.`IsAutomatic` = TRUE) OR ((`w`.`Name` <> 'foo') OR `w`.`Name` IS NULL)
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5626,21 +5614,21 @@ public override async Task Correlated_collections_basic_projection_explicit_to_l
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE (`w`.`IsAutomatic` = TRUE) OR ((`w`.`Name` <> 'foo') OR `w`.`Name` IS NULL)
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5650,21 +5638,21 @@ public override async Task Correlated_collections_basic_projection_explicit_to_a
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE (`w`.`IsAutomatic` = TRUE) OR ((`w`.`Name` <> 'foo') OR `w`.`Name` IS NULL)
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5674,21 +5662,21 @@ public override async Task Correlated_collections_basic_projection_ordered(bool
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE (`w`.`IsAutomatic` = TRUE) OR ((`w`.`Name` <> 'foo') OR `w`.`Name` IS NULL)
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Name` DESC
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `w0`.`Name` DESC
 """);
     }
 
@@ -5698,24 +5686,24 @@ public override async Task Correlated_collections_basic_projection_composite_key
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`FullName`, `t0`.`SquadId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`, `u1`.`FullName`, `u1`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t1`.`Nickname`, `t1`.`FullName`, `t1`.`SquadId`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`
+    SELECT `u0`.`Nickname`, `u0`.`FullName`, `u0`.`SquadId`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    WHERE `t1`.`HasSoulPatch` = FALSE
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-WHERE `t`.`Nickname` <> 'Foo'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    ) AS `u0`
+    WHERE `u0`.`HasSoulPatch` = FALSE
+) AS `u1` ON (`u`.`Nickname` = `u1`.`LeaderNickname`) AND (`u`.`SquadId` = `u1`.`LeaderSquadId`)
+WHERE `u`.`Nickname` <> 'Foo'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`
 """);
     }
 
@@ -5725,21 +5713,21 @@ public override async Task Correlated_collections_basic_projecting_single_proper
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Name`, `t0`.`Id`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Name`, `w0`.`Id`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Name`, `w`.`Id`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     WHERE (`w`.`IsAutomatic` = TRUE) OR ((`w`.`Name` <> 'foo') OR `w`.`Name` IS NULL)
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5748,22 +5736,22 @@ public override async Task Correlated_collections_basic_projecting_constant(bool
         await base.Correlated_collections_basic_projecting_constant(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`c`, `t0`.`Id`
+"""
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`c`, `w0`.`Id`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT {MySqlTestHelpers.MySqlBug96947Workaround(@"'BFG'")} AS `c`, `w`.`Id`, `w`.`OwnerFullName`
+    SELECT 'BFG' AS `c`, `w`.`Id`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     WHERE (`w`.`IsAutomatic` = TRUE) OR ((`w`.`Name` <> 'foo') OR `w`.`Name` IS NULL)
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5772,22 +5760,22 @@ public override async Task Correlated_collections_basic_projecting_constant_bool
         await base.Correlated_collections_basic_projecting_constant_bool(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`c`, `t0`.`Id`
+"""
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`c`, `w0`.`Id`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT {MySqlTestHelpers.MySqlBug96947Workaround(@"TRUE", "signed")} AS `c`, `w`.`Id`, `w`.`OwnerFullName`
+    SELECT TRUE AS `c`, `w`.`Id`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     WHERE (`w`.`IsAutomatic` = TRUE) OR ((`w`.`Name` <> 'foo') OR `w`.`Name` IS NULL)
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -5797,22 +5785,22 @@ public override async Task Correlated_collections_projection_of_collection_thru_
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `s`.`Id`, `t0`.`SquadId`, `t0`.`MissionId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s1`.`SquadId`, `s1`.`MissionId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+) AS `u`
+INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 LEFT JOIN (
     SELECT `s0`.`SquadId`, `s0`.`MissionId`
     FROM `SquadMissions` AS `s0`
     WHERE `s0`.`MissionId` <> 17
-) AS `t0` ON `s`.`Id` = `t0`.`SquadId`
-WHERE `t`.`Nickname` <> 'Marcus'
-ORDER BY `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `s`.`Id`, `t0`.`SquadId`
+) AS `s1` ON `s`.`Id` = `s1`.`SquadId`
+WHERE `u`.`Nickname` <> 'Marcus'
+ORDER BY `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
 """);
     }
 
@@ -5822,7 +5810,7 @@ public override async Task Correlated_collections_project_anonymous_collection_r
 
         AssertSql(
 """
-SELECT `s`.`Name`, `s`.`Id`, `t`.`FullName`, `t`.`Rank`, `t`.`Nickname`, `t`.`SquadId`
+SELECT `s`.`Name`, `s`.`Id`, `u`.`FullName`, `u`.`Rank`, `u`.`Nickname`, `u`.`SquadId`
 FROM `Squads` AS `s`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`Rank`
@@ -5830,9 +5818,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t` ON `s`.`Id` = `t`.`SquadId`
+) AS `u` ON `s`.`Id` = `u`.`SquadId`
 WHERE `s`.`Id` < 20
-ORDER BY `s`.`Id`, `t`.`Nickname`
+ORDER BY `s`.`Id`, `u`.`Nickname`
 """);
     }
 
@@ -5842,20 +5830,20 @@ public override async Task Correlated_collections_nested(bool async)
 
         AssertSql(
 """
-SELECT `s`.`Id`, `t0`.`SquadId`, `t0`.`MissionId`, `t0`.`Id`, `t0`.`SquadId0`, `t0`.`MissionId0`
+SELECT `s`.`Id`, `s3`.`SquadId`, `s3`.`MissionId`, `s3`.`Id`, `s3`.`SquadId0`, `s3`.`MissionId0`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `s0`.`SquadId`, `s0`.`MissionId`, `m`.`Id`, `t`.`SquadId` AS `SquadId0`, `t`.`MissionId` AS `MissionId0`
+    SELECT `s0`.`SquadId`, `s0`.`MissionId`, `m`.`Id`, `s2`.`SquadId` AS `SquadId0`, `s2`.`MissionId` AS `MissionId0`
     FROM `SquadMissions` AS `s0`
     INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
     LEFT JOIN (
         SELECT `s1`.`SquadId`, `s1`.`MissionId`
         FROM `SquadMissions` AS `s1`
         WHERE `s1`.`SquadId` < 7
-    ) AS `t` ON `m`.`Id` = `t`.`MissionId`
+    ) AS `s2` ON `m`.`Id` = `s2`.`MissionId`
     WHERE `s0`.`MissionId` < 42
-) AS `t0` ON `s`.`Id` = `t0`.`SquadId`
-ORDER BY `s`.`Id`, `t0`.`SquadId`, `t0`.`MissionId`, `t0`.`Id`, `t0`.`SquadId0`
+) AS `s3` ON `s`.`Id` = `s3`.`SquadId`
+ORDER BY `s`.`Id`, `s3`.`SquadId`, `s3`.`MissionId`, `s3`.`Id`, `s3`.`SquadId0`
 """);
     }
 
@@ -5865,20 +5853,20 @@ public override async Task Correlated_collections_nested_mixed_streaming_with_bu
 
         AssertSql(
 """
-SELECT `s`.`Id`, `t0`.`SquadId`, `t0`.`MissionId`, `t0`.`Id`, `t0`.`SquadId0`, `t0`.`MissionId0`
+SELECT `s`.`Id`, `s3`.`SquadId`, `s3`.`MissionId`, `s3`.`Id`, `s3`.`SquadId0`, `s3`.`MissionId0`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `s0`.`SquadId`, `s0`.`MissionId`, `m`.`Id`, `t`.`SquadId` AS `SquadId0`, `t`.`MissionId` AS `MissionId0`
+    SELECT `s0`.`SquadId`, `s0`.`MissionId`, `m`.`Id`, `s2`.`SquadId` AS `SquadId0`, `s2`.`MissionId` AS `MissionId0`
     FROM `SquadMissions` AS `s0`
     INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
     LEFT JOIN (
         SELECT `s1`.`SquadId`, `s1`.`MissionId`
         FROM `SquadMissions` AS `s1`
         WHERE `s1`.`SquadId` < 2
-    ) AS `t` ON `m`.`Id` = `t`.`MissionId`
+    ) AS `s2` ON `m`.`Id` = `s2`.`MissionId`
     WHERE `s0`.`MissionId` < 3
-) AS `t0` ON `s`.`Id` = `t0`.`SquadId`
-ORDER BY `s`.`Id`, `t0`.`SquadId`, `t0`.`MissionId`, `t0`.`Id`, `t0`.`SquadId0`
+) AS `s3` ON `s`.`Id` = `s3`.`SquadId`
+ORDER BY `s`.`Id`, `s3`.`SquadId`, `s3`.`MissionId`, `s3`.`Id`, `s3`.`SquadId0`
 """);
     }
 
@@ -5888,20 +5876,20 @@ public override async Task Correlated_collections_nested_mixed_streaming_with_bu
 
         AssertSql(
 """
-SELECT `s`.`Id`, `t0`.`SquadId`, `t0`.`MissionId`, `t0`.`Id`, `t0`.`SquadId0`, `t0`.`MissionId0`
+SELECT `s`.`Id`, `s3`.`SquadId`, `s3`.`MissionId`, `s3`.`Id`, `s3`.`SquadId0`, `s3`.`MissionId0`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `s0`.`SquadId`, `s0`.`MissionId`, `m`.`Id`, `t`.`SquadId` AS `SquadId0`, `t`.`MissionId` AS `MissionId0`
+    SELECT `s0`.`SquadId`, `s0`.`MissionId`, `m`.`Id`, `s2`.`SquadId` AS `SquadId0`, `s2`.`MissionId` AS `MissionId0`
     FROM `SquadMissions` AS `s0`
     INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
     LEFT JOIN (
         SELECT `s1`.`SquadId`, `s1`.`MissionId`
         FROM `SquadMissions` AS `s1`
         WHERE `s1`.`SquadId` < 7
-    ) AS `t` ON `m`.`Id` = `t`.`MissionId`
+    ) AS `s2` ON `m`.`Id` = `s2`.`MissionId`
     WHERE `s0`.`MissionId` < 42
-) AS `t0` ON `s`.`Id` = `t0`.`SquadId`
-ORDER BY `s`.`Id`, `t0`.`SquadId`, `t0`.`MissionId`, `t0`.`Id`, `t0`.`SquadId0`
+) AS `s3` ON `s`.`Id` = `s3`.`SquadId`
+ORDER BY `s`.`Id`, `s3`.`SquadId`, `s3`.`MissionId`, `s3`.`Id`, `s3`.`SquadId0`
 """);
     }
 
@@ -5911,28 +5899,28 @@ public override async Task Correlated_collections_nested_with_custom_ordering(bo
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t1`.`FullName`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s`.`FullName`, `s`.`Nickname`, `s`.`SquadId`, `s`.`Id`, `s`.`AmmunitionType`, `s`.`IsAutomatic`, `s`.`Name`, `s`.`OwnerFullName`, `s`.`SynergyWithId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t0`.`FullName`, `t0`.`Nickname`, `t0`.`SquadId`, `t2`.`Id`, `t2`.`AmmunitionType`, `t2`.`IsAutomatic`, `t2`.`Name`, `t2`.`OwnerFullName`, `t2`.`SynergyWithId`, `t0`.`Rank`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`
+    SELECT `u0`.`FullName`, `u0`.`Nickname`, `u0`.`SquadId`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`, `u0`.`Rank`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN (
         SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
         WHERE (`w`.`Name` <> 'Bar') OR `w`.`Name` IS NULL
-    ) AS `t2` ON `t0`.`FullName` = `t2`.`OwnerFullName`
-    WHERE `t0`.`FullName` <> 'Foo'
-) AS `t1` ON (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)
-ORDER BY `t`.`HasSoulPatch` DESC, `t`.`Nickname`, `t`.`SquadId`, `t1`.`Rank`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`IsAutomatic`
+    ) AS `w0` ON `u0`.`FullName` = `w0`.`OwnerFullName`
+    WHERE `u0`.`FullName` <> 'Foo'
+) AS `s` ON (`u`.`Nickname` = `s`.`LeaderNickname`) AND (`u`.`SquadId` = `s`.`LeaderSquadId`)
+ORDER BY `u`.`HasSoulPatch` DESC, `u`.`Nickname`, `u`.`SquadId`, `s`.`Rank`, `s`.`Nickname`, `s`.`SquadId`, `s`.`IsAutomatic`
 """);
     }
 
@@ -5942,25 +5930,25 @@ public override async Task Correlated_collections_same_collection_projected_mult
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`, `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `w2`.`Id`, `w2`.`AmmunitionType`, `w2`.`IsAutomatic`, `w2`.`Name`, `w2`.`OwnerFullName`, `w2`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE `w`.`IsAutomatic` = TRUE
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
+) AS `w1` ON `u`.`FullName` = `w1`.`OwnerFullName`
 LEFT JOIN (
     SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
     FROM `Weapons` AS `w0`
     WHERE `w0`.`IsAutomatic` = TRUE
-) AS `t1` ON `t`.`FullName` = `t1`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`
+) AS `w2` ON `u`.`FullName` = `w2`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `w1`.`Id`
 """);
     }
 
@@ -5970,25 +5958,25 @@ public override async Task Correlated_collections_similar_collection_projected_m
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`, `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `w2`.`Id`, `w2`.`AmmunitionType`, `w2`.`IsAutomatic`, `w2`.`Name`, `w2`.`OwnerFullName`, `w2`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE `w`.`IsAutomatic` = TRUE
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
+) AS `w1` ON `u`.`FullName` = `w1`.`OwnerFullName`
 LEFT JOIN (
     SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
     FROM `Weapons` AS `w0`
     WHERE `w0`.`IsAutomatic` = FALSE
-) AS `t1` ON `t`.`FullName` = `t1`.`OwnerFullName`
-ORDER BY `t`.`Rank`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`OwnerFullName`, `t0`.`Id`, `t1`.`IsAutomatic`
+) AS `w2` ON `u`.`FullName` = `w2`.`OwnerFullName`
+ORDER BY `u`.`Rank`, `u`.`Nickname`, `u`.`SquadId`, `w1`.`OwnerFullName`, `w1`.`Id`, `w2`.`IsAutomatic`
 """);
     }
 
@@ -5998,24 +5986,24 @@ public override async Task Correlated_collections_different_collections_projecte
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Name`, `t0`.`IsAutomatic`, `t0`.`Id`, `t1`.`Nickname`, `t1`.`Rank`, `t1`.`SquadId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Name`, `w0`.`IsAutomatic`, `w0`.`Id`, `u0`.`Nickname`, `u0`.`Rank`, `u0`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Name`, `w`.`IsAutomatic`, `w`.`Id`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     WHERE `w`.`IsAutomatic` = TRUE
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`
     FROM `Officers` AS `o0`
-) AS `t1` ON (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)
-ORDER BY `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t1`.`FullName`, `t1`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `w0`.`Id`, `u0`.`FullName`, `u0`.`Nickname`
 """);
     }
 
@@ -6024,24 +6012,24 @@ public override async Task Multiple_orderby_with_navigation_expansion_on_one_of_
         await base.Multiple_orderby_with_navigation_expansion_on_one_of_the_order_bys(async);
 
         AssertSql(
-$"""
-SELECT `t`.`FullName`
+"""
+SELECT `u`.`FullName`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    WHERE (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`))
-ORDER BY `t`.`HasSoulPatch` DESC, `t0`.`Note`
+    ) AS `u0`
+    WHERE (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`))
+ORDER BY `u`.`HasSoulPatch` DESC, `t`.`Note`
 """);
     }
 
@@ -6051,41 +6039,41 @@ public override async Task Multiple_orderby_with_navigation_expansion_on_one_of_
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`Id`, `t3`.`AmmunitionType`, `t3`.`IsAutomatic`, `t3`.`Name`, `t3`.`OwnerFullName`, `t3`.`SynergyWithId`, `t3`.`Nickname`, `t3`.`SquadId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s`.`Id`, `s`.`AmmunitionType`, `s`.`IsAutomatic`, `s`.`Name`, `s`.`OwnerFullName`, `s`.`SynergyWithId`, `s`.`Nickname`, `s`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
 LEFT JOIN (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
-    FROM `Gears` AS `g`
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
+    FROM `Gears` AS `g0`
     UNION ALL
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
-    FROM `Officers` AS `o0`
-) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
+    SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
+    FROM `Officers` AS `o1`
+) AS `u1` ON (`t`.`GearNickName` = `u1`.`Nickname`) AND (`t`.`GearSquadId` = `u1`.`SquadId`)
 LEFT JOIN (
-    SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t4`.`Nickname`, `t4`.`SquadId`
+    SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u2`.`Nickname`, `u2`.`SquadId`
     FROM `Weapons` AS `w`
     LEFT JOIN (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
-        FROM `Gears` AS `g0`
+        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`FullName`
+        FROM `Gears` AS `g1`
         UNION ALL
-        SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
-        FROM `Officers` AS `o1`
-    ) AS `t4` ON `w`.`OwnerFullName` = `t4`.`FullName`
-) AS `t3` ON `t2`.`FullName` = `t3`.`OwnerFullName`
+        SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`FullName`
+        FROM `Officers` AS `o2`
+    ) AS `u2` ON `w`.`OwnerFullName` = `u2`.`FullName`
+) AS `s` ON `u1`.`FullName` = `s`.`OwnerFullName`
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`AssignedCityName`, `g1`.`CityOfBirthName`, `g1`.`FullName`, `g1`.`HasSoulPatch`, `g1`.`LeaderNickname`, `g1`.`LeaderSquadId`, `g1`.`Rank`, 'Gear' AS `Discriminator`
-        FROM `Gears` AS `g1`
+        SELECT `g`.`LeaderNickname`, `g`.`LeaderSquadId`
+        FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`AssignedCityName`, `o2`.`CityOfBirthName`, `o2`.`FullName`, `o2`.`HasSoulPatch`, `o2`.`LeaderNickname`, `o2`.`LeaderSquadId`, `o2`.`Rank`, 'Officer' AS `Discriminator`
-        FROM `Officers` AS `o2`
-    ) AS `t1`
-    WHERE (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`))
-ORDER BY `t`.`HasSoulPatch` DESC, `t0`.`Note`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`IsAutomatic`, `t3`.`Nickname` DESC, `t3`.`Id`
+        SELECT `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
+        FROM `Officers` AS `o0`
+    ) AS `u0`
+    WHERE (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`))
+ORDER BY `u`.`HasSoulPatch` DESC, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s`.`IsAutomatic`, `s`.`Nickname` DESC, `s`.`Id`
 """);
     }
 
@@ -6096,41 +6084,41 @@ public override async Task Multiple_orderby_with_navigation_expansion_on_one_of_
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`Id`, `t3`.`AmmunitionType`, `t3`.`IsAutomatic`, `t3`.`Name`, `t3`.`OwnerFullName`, `t3`.`SynergyWithId`, `t3`.`Nickname`, `t3`.`SquadId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s`.`Id`, `s`.`AmmunitionType`, `s`.`IsAutomatic`, `s`.`Name`, `s`.`OwnerFullName`, `s`.`SynergyWithId`, `s`.`Nickname`, `s`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
 LEFT JOIN (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
-    FROM `Gears` AS `g`
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
+    FROM `Gears` AS `g0`
     UNION ALL
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
-    FROM `Officers` AS `o0`
-) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
+    SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
+    FROM `Officers` AS `o1`
+) AS `u1` ON (`t`.`GearNickName` = `u1`.`Nickname`) AND (`t`.`GearSquadId` = `u1`.`SquadId`)
 LEFT JOIN (
-    SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t4`.`Nickname`, `t4`.`SquadId`
+    SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u2`.`Nickname`, `u2`.`SquadId`
     FROM `Weapons` AS `w`
     LEFT JOIN (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
-        FROM `Gears` AS `g0`
+        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`FullName`
+        FROM `Gears` AS `g1`
         UNION ALL
-        SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
-        FROM `Officers` AS `o1`
-    ) AS `t4` ON `w`.`OwnerFullName` = `t4`.`FullName`
-) AS `t3` ON `t2`.`FullName` = `t3`.`OwnerFullName`
+        SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`FullName`
+        FROM `Officers` AS `o2`
+    ) AS `u2` ON `w`.`OwnerFullName` = `u2`.`FullName`
+) AS `s` ON `u1`.`FullName` = `s`.`OwnerFullName`
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`AssignedCityName`, `g1`.`CityOfBirthName`, `g1`.`FullName`, `g1`.`HasSoulPatch`, `g1`.`LeaderNickname`, `g1`.`LeaderSquadId`, `g1`.`Rank`, 'Gear' AS `Discriminator`
-        FROM `Gears` AS `g1`
+        SELECT `g`.`LeaderNickname`, `g`.`LeaderSquadId`
+        FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`AssignedCityName`, `o2`.`CityOfBirthName`, `o2`.`FullName`, `o2`.`HasSoulPatch`, `o2`.`LeaderNickname`, `o2`.`LeaderSquadId`, `o2`.`Rank`, 'Officer' AS `Discriminator`
-        FROM `Officers` AS `o2`
-    ) AS `t1`
-    WHERE (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`))
-ORDER BY `t`.`HasSoulPatch` DESC, `t0`.`Note`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`IsAutomatic`, `t3`.`Nickname` DESC, `t3`.`Id`
+        SELECT `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
+        FROM `Officers` AS `o0`
+    ) AS `u0`
+    WHERE (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`))
+ORDER BY `u`.`HasSoulPatch` DESC, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s`.`IsAutomatic`, `s`.`Nickname` DESC, `s`.`Id`
 """);
     }
 
@@ -6141,44 +6129,44 @@ public override async Task Multiple_orderby_with_navigation_expansion_on_one_of_
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`Id`, `t3`.`AmmunitionType`, `t3`.`IsAutomatic`, `t3`.`Name`, `t3`.`OwnerFullName`, `t3`.`SynergyWithId`, `t3`.`Nickname`, `t3`.`SquadId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s`.`Id`, `s`.`AmmunitionType`, `s`.`IsAutomatic`, `s`.`Name`, `s`.`OwnerFullName`, `s`.`SynergyWithId`, `s`.`Nickname`, `s`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
 LEFT JOIN (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
-    FROM `Gears` AS `g`
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
+    FROM `Gears` AS `g0`
     UNION ALL
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
-    FROM `Officers` AS `o0`
-) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
+    SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
+    FROM `Officers` AS `o1`
+) AS `u1` ON (`t`.`GearNickName` = `u1`.`Nickname`) AND (`t`.`GearSquadId` = `u1`.`SquadId`)
 LEFT JOIN (
-    SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t4`.`Nickname`, `t4`.`SquadId`, (
+    SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u2`.`Nickname`, `u2`.`SquadId`, (
         SELECT COUNT(*)
         FROM `Weapons` AS `w0`
-        WHERE `t4`.`FullName` IS NOT NULL AND (`t4`.`FullName` = `w0`.`OwnerFullName`)) AS `c`
+        WHERE `u2`.`FullName` IS NOT NULL AND (`u2`.`FullName` = `w0`.`OwnerFullName`)) AS `c`
     FROM `Weapons` AS `w`
     LEFT JOIN (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
-        FROM `Gears` AS `g0`
+        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`FullName`
+        FROM `Gears` AS `g1`
         UNION ALL
-        SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
-        FROM `Officers` AS `o1`
-    ) AS `t4` ON `w`.`OwnerFullName` = `t4`.`FullName`
-) AS `t3` ON `t2`.`FullName` = `t3`.`OwnerFullName`
+        SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`FullName`
+        FROM `Officers` AS `o2`
+    ) AS `u2` ON `w`.`OwnerFullName` = `u2`.`FullName`
+) AS `s` ON `u1`.`FullName` = `s`.`OwnerFullName`
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`AssignedCityName`, `g1`.`CityOfBirthName`, `g1`.`FullName`, `g1`.`HasSoulPatch`, `g1`.`LeaderNickname`, `g1`.`LeaderSquadId`, `g1`.`Rank`, 'Gear' AS `Discriminator`
-        FROM `Gears` AS `g1`
+        SELECT `g`.`LeaderNickname`, `g`.`LeaderSquadId`
+        FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`AssignedCityName`, `o2`.`CityOfBirthName`, `o2`.`FullName`, `o2`.`HasSoulPatch`, `o2`.`LeaderNickname`, `o2`.`LeaderSquadId`, `o2`.`Rank`, 'Officer' AS `Discriminator`
-        FROM `Officers` AS `o2`
-    ) AS `t1`
-    WHERE (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`))
-ORDER BY `t`.`HasSoulPatch` DESC, `t0`.`Note`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`Id` DESC, `t3`.`c`, `t3`.`Nickname`
+        SELECT `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
+        FROM `Officers` AS `o0`
+    ) AS `u0`
+    WHERE (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`))
+ORDER BY `u`.`HasSoulPatch` DESC, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s`.`Id` DESC, `s`.`c`, `s`.`Nickname`
 """);
     }
 
@@ -6188,73 +6176,73 @@ public override async Task Correlated_collections_multiple_nested_complex_collec
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`FullName`, `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`Id`, `t3`.`Nickname0`, `t3`.`SquadId0`, `t3`.`Id0`, `t3`.`Name`, `t3`.`IsAutomatic`, `t3`.`Id1`, `t3`.`Nickname00`, `t3`.`HasSoulPatch`, `t3`.`SquadId00`, `t8`.`Id`, `t8`.`AmmunitionType`, `t8`.`IsAutomatic`, `t8`.`Name`, `t8`.`OwnerFullName`, `t8`.`SynergyWithId`, `t8`.`Nickname`, `t8`.`SquadId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s1`.`FullName`, `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`Id`, `s1`.`Nickname0`, `s1`.`SquadId0`, `s1`.`Id0`, `s1`.`Name`, `s1`.`IsAutomatic`, `s1`.`Id1`, `s1`.`Nickname00`, `s1`.`HasSoulPatch`, `s1`.`SquadId00`, `s2`.`Id`, `s2`.`AmmunitionType`, `s2`.`IsAutomatic`, `s2`.`Name`, `s2`.`OwnerFullName`, `s2`.`SynergyWithId`, `s2`.`Nickname`, `s2`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
 LEFT JOIN (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
-    FROM `Gears` AS `g`
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
+    FROM `Gears` AS `g0`
     UNION ALL
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
-    FROM `Officers` AS `o0`
-) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
+    SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
+    FROM `Officers` AS `o1`
+) AS `u1` ON (`t`.`GearNickName` = `u1`.`Nickname`) AND (`t`.`GearSquadId` = `u1`.`SquadId`)
 LEFT JOIN (
-    SELECT `t4`.`FullName`, `t4`.`Nickname`, `t4`.`SquadId`, `t5`.`Id`, `t5`.`Nickname` AS `Nickname0`, `t5`.`SquadId` AS `SquadId0`, `t5`.`Id0`, `t5`.`Name`, `t5`.`IsAutomatic`, `t5`.`Id1`, `t5`.`Nickname0` AS `Nickname00`, `t5`.`HasSoulPatch`, `t5`.`SquadId0` AS `SquadId00`, `t4`.`Rank`, `t5`.`IsAutomatic0`, `t4`.`LeaderNickname`, `t4`.`LeaderSquadId`
+    SELECT `u2`.`FullName`, `u2`.`Nickname`, `u2`.`SquadId`, `s0`.`Id`, `s0`.`Nickname` AS `Nickname0`, `s0`.`SquadId` AS `SquadId0`, `s0`.`Id0`, `s0`.`Name`, `s0`.`IsAutomatic`, `s0`.`Id1`, `s0`.`Nickname0` AS `Nickname00`, `s0`.`HasSoulPatch`, `s0`.`SquadId0` AS `SquadId00`, `u2`.`Rank`, `s0`.`IsAutomatic0`, `u2`.`LeaderNickname`, `u2`.`LeaderSquadId`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`
-        FROM `Gears` AS `g0`
+        SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`FullName`, `g1`.`LeaderNickname`, `g1`.`LeaderSquadId`, `g1`.`Rank`
+        FROM `Gears` AS `g1`
         UNION ALL
-        SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`, `o1`.`LeaderNickname`, `o1`.`LeaderSquadId`, `o1`.`Rank`
-        FROM `Officers` AS `o1`
-    ) AS `t4`
+        SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`FullName`, `o2`.`LeaderNickname`, `o2`.`LeaderSquadId`, `o2`.`Rank`
+        FROM `Officers` AS `o2`
+    ) AS `u2`
     LEFT JOIN (
-        SELECT `w`.`Id`, `t6`.`Nickname`, `t6`.`SquadId`, `s`.`Id` AS `Id0`, `w0`.`Name`, `w0`.`IsAutomatic`, `w0`.`Id` AS `Id1`, `t7`.`Nickname` AS `Nickname0`, `t7`.`HasSoulPatch`, `t7`.`SquadId` AS `SquadId0`, `w`.`IsAutomatic` AS `IsAutomatic0`, `w`.`OwnerFullName`
+        SELECT `w`.`Id`, `u3`.`Nickname`, `u3`.`SquadId`, `s`.`Id` AS `Id0`, `w0`.`Name`, `w0`.`IsAutomatic`, `w0`.`Id` AS `Id1`, `u4`.`Nickname` AS `Nickname0`, `u4`.`HasSoulPatch`, `u4`.`SquadId` AS `SquadId0`, `w`.`IsAutomatic` AS `IsAutomatic0`, `w`.`OwnerFullName`
         FROM `Weapons` AS `w`
         LEFT JOIN (
-            SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`FullName`
-            FROM `Gears` AS `g1`
-            UNION ALL
-            SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`FullName`
-            FROM `Officers` AS `o2`
-        ) AS `t6` ON `w`.`OwnerFullName` = `t6`.`FullName`
-        LEFT JOIN `Squads` AS `s` ON `t6`.`SquadId` = `s`.`Id`
-        LEFT JOIN `Weapons` AS `w0` ON `t6`.`FullName` = `w0`.`OwnerFullName`
-        LEFT JOIN (
-            SELECT `g2`.`Nickname`, `g2`.`SquadId`, `g2`.`HasSoulPatch`
+            SELECT `g2`.`Nickname`, `g2`.`SquadId`, `g2`.`FullName`
             FROM `Gears` AS `g2`
             UNION ALL
-            SELECT `o3`.`Nickname`, `o3`.`SquadId`, `o3`.`HasSoulPatch`
+            SELECT `o3`.`Nickname`, `o3`.`SquadId`, `o3`.`FullName`
             FROM `Officers` AS `o3`
-        ) AS `t7` ON `s`.`Id` = `t7`.`SquadId`
+        ) AS `u3` ON `w`.`OwnerFullName` = `u3`.`FullName`
+        LEFT JOIN `Squads` AS `s` ON `u3`.`SquadId` = `s`.`Id`
+        LEFT JOIN `Weapons` AS `w0` ON `u3`.`FullName` = `w0`.`OwnerFullName`
+        LEFT JOIN (
+            SELECT `g3`.`Nickname`, `g3`.`SquadId`, `g3`.`HasSoulPatch`
+            FROM `Gears` AS `g3`
+            UNION ALL
+            SELECT `o4`.`Nickname`, `o4`.`SquadId`, `o4`.`HasSoulPatch`
+            FROM `Officers` AS `o4`
+        ) AS `u4` ON `s`.`Id` = `u4`.`SquadId`
         WHERE (`w`.`Name` <> 'Bar') OR `w`.`Name` IS NULL
-    ) AS `t5` ON `t4`.`FullName` = `t5`.`OwnerFullName`
-    WHERE `t4`.`FullName` <> 'Foo'
-) AS `t3` ON (`t`.`Nickname` = `t3`.`LeaderNickname`) AND (`t`.`SquadId` = `t3`.`LeaderSquadId`)
+    ) AS `s0` ON `u2`.`FullName` = `s0`.`OwnerFullName`
+    WHERE `u2`.`FullName` <> 'Foo'
+) AS `s1` ON (`u`.`Nickname` = `s1`.`LeaderNickname`) AND (`u`.`SquadId` = `s1`.`LeaderSquadId`)
 LEFT JOIN (
-    SELECT `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `t9`.`Nickname`, `t9`.`SquadId`
+    SELECT `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `u5`.`Nickname`, `u5`.`SquadId`
     FROM `Weapons` AS `w1`
     LEFT JOIN (
-        SELECT `g3`.`Nickname`, `g3`.`SquadId`, `g3`.`FullName`
-        FROM `Gears` AS `g3`
+        SELECT `g4`.`Nickname`, `g4`.`SquadId`, `g4`.`FullName`
+        FROM `Gears` AS `g4`
         UNION ALL
-        SELECT `o4`.`Nickname`, `o4`.`SquadId`, `o4`.`FullName`
-        FROM `Officers` AS `o4`
-    ) AS `t9` ON `w1`.`OwnerFullName` = `t9`.`FullName`
-) AS `t8` ON `t2`.`FullName` = `t8`.`OwnerFullName`
+        SELECT `o5`.`Nickname`, `o5`.`SquadId`, `o5`.`FullName`
+        FROM `Officers` AS `o5`
+    ) AS `u5` ON `w1`.`OwnerFullName` = `u5`.`FullName`
+) AS `s2` ON `u1`.`FullName` = `s2`.`OwnerFullName`
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `g4`.`Nickname`, `g4`.`SquadId`, `g4`.`AssignedCityName`, `g4`.`CityOfBirthName`, `g4`.`FullName`, `g4`.`HasSoulPatch`, `g4`.`LeaderNickname`, `g4`.`LeaderSquadId`, `g4`.`Rank`, 'Gear' AS `Discriminator`
-        FROM `Gears` AS `g4`
+        SELECT `g`.`LeaderNickname`, `g`.`LeaderSquadId`
+        FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o5`.`Nickname`, `o5`.`SquadId`, `o5`.`AssignedCityName`, `o5`.`CityOfBirthName`, `o5`.`FullName`, `o5`.`HasSoulPatch`, `o5`.`LeaderNickname`, `o5`.`LeaderSquadId`, `o5`.`Rank`, 'Officer' AS `Discriminator`
-        FROM `Officers` AS `o5`
-    ) AS `t1`
-    WHERE (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`))
-ORDER BY `t`.`HasSoulPatch` DESC, `t0`.`Note`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`Rank`, `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`IsAutomatic0`, `t3`.`Id`, `t3`.`Nickname0`, `t3`.`SquadId0`, `t3`.`Id0`, `t3`.`Id1`, `t3`.`Nickname00`, `t3`.`SquadId00`, `t8`.`IsAutomatic`, `t8`.`Nickname` DESC, `t8`.`Id`
+        SELECT `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
+        FROM `Officers` AS `o0`
+    ) AS `u0`
+    WHERE (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`))
+ORDER BY `u`.`HasSoulPatch` DESC, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `t`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s1`.`Rank`, `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`IsAutomatic0`, `s1`.`Id`, `s1`.`Nickname0`, `s1`.`SquadId0`, `s1`.`Id0`, `s1`.`Id1`, `s1`.`Nickname00`, `s1`.`SquadId00`, `s2`.`IsAutomatic`, `s2`.`Nickname` DESC, `s2`.`Id`
 """);
     }
 
@@ -6264,23 +6252,23 @@ public override async Task Correlated_collections_inner_subquery_selector_refere
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`ReportName`, `t0`.`OfficerName`, `t0`.`Nickname`, `t0`.`SquadId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `u1`.`ReportName`, `u1`.`OfficerName`, `u1`.`Nickname`, `u1`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`FullName` AS `ReportName`, `t`.`FullName` AS `OfficerName`, `t1`.`Nickname`, `t1`.`SquadId`
+    SELECT `u0`.`FullName` AS `ReportName`, `u`.`FullName` AS `OfficerName`, `u0`.`Nickname`, `u0`.`SquadId`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    WHERE (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    ) AS `u0`
+    WHERE (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+) AS `u1` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`
 """);
     }
 
@@ -6290,23 +6278,23 @@ public override async Task Correlated_collections_inner_subquery_predicate_refer
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`ReportName`, `t0`.`Nickname`, `t0`.`SquadId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `u1`.`ReportName`, `u1`.`Nickname`, `u1`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`FullName` AS `ReportName`, `t1`.`Nickname`, `t1`.`SquadId`
+    SELECT `u0`.`FullName` AS `ReportName`, `u0`.`Nickname`, `u0`.`SquadId`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    WHERE ((`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)) AND (`t`.`FullName` <> 'Foo')
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    ) AS `u0`
+    WHERE ((`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)) AND (`u`.`FullName` <> 'Foo')
+) AS `u1` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`
 """);
     }
 
@@ -6316,28 +6304,28 @@ public override async Task Correlated_collections_nested_inner_subquery_referenc
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t1`.`FullName`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Name`, `t1`.`Nickname0`, `t1`.`Id`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s`.`FullName`, `s`.`Nickname`, `s`.`SquadId`, `s`.`Name`, `s`.`Nickname0`, `s`.`Id`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t0`.`FullName`, `t0`.`Nickname`, `t0`.`SquadId`, `t2`.`Name`, `t2`.`Nickname` AS `Nickname0`, `t2`.`Id`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`
+    SELECT `u0`.`FullName`, `u0`.`Nickname`, `u0`.`SquadId`, `w0`.`Name`, `w0`.`Nickname` AS `Nickname0`, `w0`.`Id`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN LATERAL (
-        SELECT `w`.`Name`, `t0`.`Nickname`, `w`.`Id`
+        SELECT `w`.`Name`, `u0`.`Nickname`, `w`.`Id`
         FROM `Weapons` AS `w`
-        WHERE (`t0`.`FullName` = `w`.`OwnerFullName`) AND ((`w`.`Name` <> 'Bar') OR `w`.`Name` IS NULL)
-    ) AS `t2` ON TRUE
-    WHERE `t0`.`FullName` <> 'Foo'
-) AS `t1` ON (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t1`.`Nickname`, `t1`.`SquadId`
+        WHERE (`u0`.`FullName` = `w`.`OwnerFullName`) AND ((`w`.`Name` <> 'Bar') OR `w`.`Name` IS NULL)
+    ) AS `w0` ON TRUE
+    WHERE `u0`.`FullName` <> 'Foo'
+) AS `s` ON (`u`.`Nickname` = `s`.`LeaderNickname`) AND (`u`.`SquadId` = `s`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Nickname`, `s`.`SquadId`
 """);
     }
 
@@ -6347,28 +6335,28 @@ public override async Task Correlated_collections_nested_inner_subquery_referenc
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t1`.`FullName`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Name`, `t1`.`Nickname0`, `t1`.`Id`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s`.`FullName`, `s`.`Nickname`, `s`.`SquadId`, `s`.`Name`, `s`.`Nickname0`, `s`.`Id`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
-    SELECT `t0`.`FullName`, `t0`.`Nickname`, `t0`.`SquadId`, `t2`.`Name`, `t2`.`Nickname` AS `Nickname0`, `t2`.`Id`
+    SELECT `u0`.`FullName`, `u0`.`Nickname`, `u0`.`SquadId`, `w0`.`Name`, `w0`.`Nickname` AS `Nickname0`, `w0`.`Id`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN (
-        SELECT `w`.`Name`, `t`.`Nickname`, `w`.`Id`, `w`.`OwnerFullName`
+        SELECT `w`.`Name`, `u`.`Nickname`, `w`.`Id`, `w`.`OwnerFullName`
         FROM `Weapons` AS `w`
         WHERE (`w`.`Name` <> 'Bar') OR `w`.`Name` IS NULL
-    ) AS `t2` ON `t0`.`FullName` = `t2`.`OwnerFullName`
-    WHERE ((`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)) AND (`t0`.`FullName` <> 'Foo')
-) AS `t1` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t1`.`Nickname`, `t1`.`SquadId`
+    ) AS `w0` ON `u0`.`FullName` = `w0`.`OwnerFullName`
+    WHERE ((`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)) AND (`u0`.`FullName` <> 'Foo')
+) AS `s` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Nickname`, `s`.`SquadId`
 """);
     }
 
@@ -6377,34 +6365,34 @@ public override async Task Correlated_collections_on_select_many(bool async)
         await base.Correlated_collections_on_select_many(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Nickname`, `s`.`Name`, `t`.`SquadId`, `s`.`Id`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+"""
+SELECT `u`.`Nickname`, `s`.`Name`, `u`.`SquadId`, `s`.`Id`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`, `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN `Squads` AS `s`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE (`w`.`IsAutomatic` = TRUE) OR ((`w`.`Name` <> 'foo') OR `w`.`Name` IS NULL)
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
 LEFT JOIN (
-    SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o0`
-    ) AS `t2`
-    WHERE `t2`.`HasSoulPatch` = FALSE
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
-WHERE `t`.`HasSoulPatch` = TRUE
-ORDER BY `t`.`Nickname`, `s`.`Id` DESC, `t`.`SquadId`, `t0`.`Id`, `t1`.`Nickname`
+    ) AS `u0`
+    WHERE `u0`.`HasSoulPatch` = FALSE
+) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
+WHERE `u`.`HasSoulPatch` = TRUE
+ORDER BY `u`.`Nickname`, `s`.`Id` DESC, `u`.`SquadId`, `w0`.`Id`, `u1`.`Nickname`
 """);
     }
 
@@ -6414,23 +6402,23 @@ public override async Task Correlated_collections_with_Skip(bool async)
 
         AssertSql(
 """
-SELECT `s`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `s`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
-        SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, ROW_NUMBER() OVER(PARTITION BY `t`.`SquadId` ORDER BY `t`.`Nickname`) AS `row`
+        SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, ROW_NUMBER() OVER(PARTITION BY `u`.`SquadId` ORDER BY `u`.`Nickname`) AS `row`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
             FROM `Officers` AS `o`
-        ) AS `t`
-    ) AS `t0`
-    WHERE 1 < `t0`.`row`
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
-ORDER BY `s`.`Name`, `s`.`Id`, `t1`.`SquadId`, `t1`.`Nickname`
+        ) AS `u`
+    ) AS `u0`
+    WHERE 1 < `u0`.`row`
+) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
+ORDER BY `s`.`Name`, `s`.`Id`, `u1`.`SquadId`, `u1`.`Nickname`
 """);
     }
 
@@ -6440,23 +6428,23 @@ public override async Task Correlated_collections_with_Take(bool async)
 
         AssertSql(
 """
-SELECT `s`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `s`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
-        SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, ROW_NUMBER() OVER(PARTITION BY `t`.`SquadId` ORDER BY `t`.`Nickname`) AS `row`
+        SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, ROW_NUMBER() OVER(PARTITION BY `u`.`SquadId` ORDER BY `u`.`Nickname`) AS `row`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
             FROM `Officers` AS `o`
-        ) AS `t`
-    ) AS `t0`
-    WHERE `t0`.`row` <= 2
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
-ORDER BY `s`.`Name`, `s`.`Id`, `t1`.`SquadId`, `t1`.`Nickname`
+        ) AS `u`
+    ) AS `u0`
+    WHERE `u0`.`row` <= 2
+) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
+ORDER BY `s`.`Name`, `s`.`Id`, `u1`.`SquadId`, `u1`.`Nickname`
 """);
     }
 
@@ -6466,25 +6454,25 @@ public override async Task Correlated_collections_with_Distinct(bool async)
 
         AssertSql(
 """
-SELECT `s`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `s`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
 FROM `Squads` AS `s`
 LEFT JOIN LATERAL (
-    SELECT DISTINCT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+    SELECT DISTINCT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
-        SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+        SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
             FROM `Officers` AS `o`
-        ) AS `t`
-        WHERE `s`.`Id` = `t`.`SquadId`
-        ORDER BY `t`.`Nickname`
+        ) AS `u`
+        WHERE `s`.`Id` = `u`.`SquadId`
+        ORDER BY `u`.`Nickname`
         LIMIT 18446744073709551610 OFFSET 0
-    ) AS `t0`
-) AS `t1` ON TRUE
-ORDER BY `s`.`Name`, `s`.`Id`, `t1`.`Nickname`
+    ) AS `u0`
+) AS `u1` ON TRUE
+ORDER BY `s`.`Name`, `s`.`Id`, `u1`.`Nickname`
 """);
     }
 
@@ -6495,16 +6483,16 @@ public override async Task Correlated_collections_with_FirstOrDefault(bool async
         AssertSql(
 """
 SELECT (
-    SELECT `t`.`FullName`
+    SELECT `u`.`FullName`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE `s`.`Id` = `t`.`SquadId`
-    ORDER BY `t`.`Nickname`
+    ) AS `u`
+    WHERE `s`.`Id` = `u`.`SquadId`
+    ORDER BY `u`.`Nickname`
     LIMIT 1)
 FROM `Squads` AS `s`
 ORDER BY `s`.`Name`
@@ -6517,7 +6505,7 @@ public override async Task Correlated_collections_on_left_join_with_predicate(bo
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t`.`Id`, `t0`.`SquadId`, `w`.`Name`, `w`.`Id`
+SELECT `u`.`Nickname`, `t`.`Id`, `u`.`SquadId`, `w`.`Name`, `w`.`Id`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`HasSoulPatch`
@@ -6525,10 +6513,10 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON `t`.`GearNickName` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-WHERE `t0`.`HasSoulPatch` = FALSE
-ORDER BY `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u` ON `t`.`GearNickName` = `u`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+WHERE `u`.`HasSoulPatch` = FALSE
+ORDER BY `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -6538,7 +6526,7 @@ public override async Task Correlated_collections_on_left_join_with_null_value(b
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Name`, `w`.`Id`
+SELECT `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `w`.`Name`, `w`.`Id`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
@@ -6546,9 +6534,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t0` ON `t`.`GearNickName` = `t0`.`Nickname`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Note`, `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u` ON `t`.`GearNickName` = `u`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `t`.`Note`, `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -6558,20 +6546,20 @@ public override async Task Correlated_collections_left_join_with_self_reference(
 
         AssertSql(
 """
-SELECT `t`.`Note`, `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`FullName`, `t1`.`Nickname`, `t1`.`SquadId`
+SELECT `t`.`Note`, `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`FullName`, `u0`.`Nickname`, `u0`.`SquadId`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON `t`.`GearNickName` = `t0`.`Nickname`
+) AS `u` ON `t`.`GearNickName` = `u`.`Nickname`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
     FROM `Officers` AS `o0`
-) AS `t1` ON ((`t0`.`Nickname` = `t1`.`LeaderNickname`) OR (`t0`.`Nickname` IS NULL AND (`t1`.`LeaderNickname` IS NULL))) AND (`t0`.`SquadId` = `t1`.`LeaderSquadId`)
-ORDER BY `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Nickname`
+) AS `u0` ON ((`u`.`Nickname` = `u0`.`LeaderNickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`LeaderNickname` IS NULL))) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -6581,7 +6569,7 @@ public override async Task Correlated_collections_deeply_nested_left_join(bool a
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `s`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`
+SELECT `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`Id`, `s0`.`AmmunitionType`, `s0`.`IsAutomatic`, `s0`.`Name`, `s0`.`OwnerFullName`, `s0`.`SynergyWithId`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
@@ -6589,25 +6577,25 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON `t`.`GearNickName` = `t0`.`Nickname`
-LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
+) AS `u` ON `t`.`GearNickName` = `u`.`Nickname`
+LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 LEFT JOIN (
-    SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t3`.`Id`, `t3`.`AmmunitionType`, `t3`.`IsAutomatic`, `t3`.`Name`, `t3`.`OwnerFullName`, `t3`.`SynergyWithId`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
     FROM (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`, `g0`.`HasSoulPatch`
         FROM `Gears` AS `g0`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`HasSoulPatch`
         FROM `Officers` AS `o0`
-    ) AS `t2`
+    ) AS `u0`
     LEFT JOIN (
         SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
         WHERE `w`.`IsAutomatic` = TRUE
-    ) AS `t3` ON `t2`.`FullName` = `t3`.`OwnerFullName`
-    WHERE `t2`.`HasSoulPatch` = TRUE
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
-ORDER BY `t`.`Note`, `t0`.`Nickname` DESC, `t`.`Id`, `t0`.`SquadId`, `s`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`
+    ) AS `w0` ON `u0`.`FullName` = `w0`.`OwnerFullName`
+    WHERE `u0`.`HasSoulPatch` = TRUE
+) AS `s0` ON `s`.`Id` = `s0`.`SquadId`
+ORDER BY `t`.`Note`, `u`.`Nickname` DESC, `t`.`Id`, `u`.`SquadId`, `s`.`Id`, `s0`.`Nickname`, `s0`.`SquadId`
 """);
     }
 
@@ -6617,7 +6605,7 @@ public override async Task Correlated_collections_from_left_join_with_additional
 
         AssertSql(
 """
-SELECT `w`.`Id`, `t`.`Nickname`, `t`.`SquadId`, `s`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`, `t1`.`Rank`
+SELECT `w`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`Id`, `s0`.`AmmunitionType`, `s0`.`IsAutomatic`, `s0`.`Name`, `s0`.`OwnerFullName`, `s0`.`SynergyWithId`, `s0`.`Rank`
 FROM `Weapons` AS `w`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
@@ -6625,24 +6613,24 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t` ON `w`.`OwnerFullName` = `t`.`FullName`
-LEFT JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+) AS `u` ON `w`.`OwnerFullName` = `u`.`FullName`
+LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 LEFT JOIN (
-    SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t2`.`Id`, `t2`.`AmmunitionType`, `t2`.`IsAutomatic`, `t2`.`Name`, `t2`.`OwnerFullName`, `t2`.`SynergyWithId`, `t0`.`Rank`, `t0`.`FullName`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `u0`.`Rank`, `u0`.`FullName`
     FROM (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`, `g0`.`Rank`
         FROM `Gears` AS `g0`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`Rank`
         FROM `Officers` AS `o0`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN (
         SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
         FROM `Weapons` AS `w0`
         WHERE `w0`.`IsAutomatic` = FALSE
-    ) AS `t2` ON `t0`.`FullName` = `t2`.`OwnerFullName`
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
-ORDER BY `w`.`Name`, `w`.`Id`, `t`.`Nickname`, `t`.`SquadId`, `s`.`Id`, `t1`.`FullName` DESC, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Id`
+    ) AS `w1` ON `u0`.`FullName` = `w1`.`OwnerFullName`
+) AS `s0` ON `s`.`Id` = `s0`.`SquadId`
+ORDER BY `w`.`Name`, `w`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s0`.`FullName` DESC, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`Id`
 """);
     }
 
@@ -6652,16 +6640,16 @@ public override async Task Correlated_collections_complex_scenario1(bool async)
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t1`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Id0`, `t1`.`Nickname0`, `t1`.`HasSoulPatch`, `t1`.`SquadId0`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s0`.`Id`, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`Id0`, `s0`.`Nickname0`, `s0`.`HasSoulPatch`, `s0`.`SquadId0`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `w`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `s`.`Id` AS `Id0`, `t2`.`Nickname` AS `Nickname0`, `t2`.`HasSoulPatch`, `t2`.`SquadId` AS `SquadId0`, `w`.`OwnerFullName`
+    SELECT `w`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`, `s`.`Id` AS `Id0`, `u1`.`Nickname` AS `Nickname0`, `u1`.`HasSoulPatch`, `u1`.`SquadId` AS `SquadId0`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     LEFT JOIN (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
@@ -6669,17 +6657,17 @@ LEFT JOIN (
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t0` ON `w`.`OwnerFullName` = `t0`.`FullName`
-    LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
+    ) AS `u0` ON `w`.`OwnerFullName` = `u0`.`FullName`
+    LEFT JOIN `Squads` AS `s` ON `u0`.`SquadId` = `s`.`Id`
     LEFT JOIN (
         SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`HasSoulPatch`
         FROM `Gears` AS `g1`
         UNION ALL
         SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`HasSoulPatch`
         FROM `Officers` AS `o1`
-    ) AS `t2` ON `s`.`Id` = `t2`.`SquadId`
-) AS `t1` ON `t`.`FullName` = `t1`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t1`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Id0`, `t1`.`Nickname0`
+    ) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
+) AS `s0` ON `u`.`FullName` = `s0`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s0`.`Id`, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`Id0`, `s0`.`Nickname0`
 """);
     }
 
@@ -6689,22 +6677,22 @@ public override async Task Correlated_collections_complex_scenario2(bool async)
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t3`.`FullName`, `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`Id`, `t3`.`Nickname0`, `t3`.`SquadId0`, `t3`.`Id0`, `t3`.`Nickname00`, `t3`.`HasSoulPatch`, `t3`.`SquadId00`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s1`.`FullName`, `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`Id`, `s1`.`Nickname0`, `s1`.`SquadId0`, `s1`.`Id0`, `s1`.`Nickname00`, `s1`.`HasSoulPatch`, `s1`.`SquadId00`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t0`.`FullName`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Id`, `t1`.`Nickname` AS `Nickname0`, `t1`.`SquadId` AS `SquadId0`, `t1`.`Id0`, `t1`.`Nickname0` AS `Nickname00`, `t1`.`HasSoulPatch`, `t1`.`SquadId0` AS `SquadId00`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`
+    SELECT `u0`.`FullName`, `u0`.`Nickname`, `u0`.`SquadId`, `s0`.`Id`, `s0`.`Nickname` AS `Nickname0`, `s0`.`SquadId` AS `SquadId0`, `s0`.`Id0`, `s0`.`Nickname0` AS `Nickname00`, `s0`.`HasSoulPatch`, `s0`.`SquadId0` AS `SquadId00`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN (
-        SELECT `w`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `s`.`Id` AS `Id0`, `t4`.`Nickname` AS `Nickname0`, `t4`.`HasSoulPatch`, `t4`.`SquadId` AS `SquadId0`, `w`.`OwnerFullName`
+        SELECT `w`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s`.`Id` AS `Id0`, `u2`.`Nickname` AS `Nickname0`, `u2`.`HasSoulPatch`, `u2`.`SquadId` AS `SquadId0`, `w`.`OwnerFullName`
         FROM `Weapons` AS `w`
         LEFT JOIN (
             SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
@@ -6712,18 +6700,18 @@ LEFT JOIN (
             UNION ALL
             SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
             FROM `Officers` AS `o1`
-        ) AS `t2` ON `w`.`OwnerFullName` = `t2`.`FullName`
-        LEFT JOIN `Squads` AS `s` ON `t2`.`SquadId` = `s`.`Id`
+        ) AS `u1` ON `w`.`OwnerFullName` = `u1`.`FullName`
+        LEFT JOIN `Squads` AS `s` ON `u1`.`SquadId` = `s`.`Id`
         LEFT JOIN (
             SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`HasSoulPatch`
             FROM `Gears` AS `g1`
             UNION ALL
             SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`HasSoulPatch`
             FROM `Officers` AS `o2`
-        ) AS `t4` ON `s`.`Id` = `t4`.`SquadId`
-    ) AS `t1` ON `t0`.`FullName` = `t1`.`OwnerFullName`
-) AS `t3` ON (`t`.`Nickname` = `t3`.`LeaderNickname`) AND (`t`.`SquadId` = `t3`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`Id`, `t3`.`Nickname0`, `t3`.`SquadId0`, `t3`.`Id0`, `t3`.`Nickname00`
+        ) AS `u2` ON `s`.`Id` = `u2`.`SquadId`
+    ) AS `s0` ON `u0`.`FullName` = `s0`.`OwnerFullName`
+) AS `s1` ON (`u`.`Nickname` = `s1`.`LeaderNickname`) AND (`u`.`SquadId` = `s1`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`Id`, `s1`.`Nickname0`, `s1`.`SquadId0`, `s1`.`Id0`, `s1`.`Nickname00`
 """);
     }
 
@@ -6733,16 +6721,16 @@ public override async Task Correlated_collections_with_funky_orderby_complex_sce
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t1`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Id0`, `t1`.`Nickname0`, `t1`.`HasSoulPatch`, `t1`.`SquadId0`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s0`.`Id`, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`Id0`, `s0`.`Nickname0`, `s0`.`HasSoulPatch`, `s0`.`SquadId0`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `w`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `s`.`Id` AS `Id0`, `t2`.`Nickname` AS `Nickname0`, `t2`.`HasSoulPatch`, `t2`.`SquadId` AS `SquadId0`, `w`.`OwnerFullName`
+    SELECT `w`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`, `s`.`Id` AS `Id0`, `u1`.`Nickname` AS `Nickname0`, `u1`.`HasSoulPatch`, `u1`.`SquadId` AS `SquadId0`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     LEFT JOIN (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
@@ -6750,17 +6738,17 @@ LEFT JOIN (
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t0` ON `w`.`OwnerFullName` = `t0`.`FullName`
-    LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
+    ) AS `u0` ON `w`.`OwnerFullName` = `u0`.`FullName`
+    LEFT JOIN `Squads` AS `s` ON `u0`.`SquadId` = `s`.`Id`
     LEFT JOIN (
         SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`HasSoulPatch`
         FROM `Gears` AS `g1`
         UNION ALL
         SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`HasSoulPatch`
         FROM `Officers` AS `o1`
-    ) AS `t2` ON `s`.`Id` = `t2`.`SquadId`
-) AS `t1` ON `t`.`FullName` = `t1`.`OwnerFullName`
-ORDER BY `t`.`FullName`, `t`.`Nickname` DESC, `t`.`SquadId`, `t1`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`Id0`, `t1`.`Nickname0`
+    ) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
+) AS `s0` ON `u`.`FullName` = `s0`.`OwnerFullName`
+ORDER BY `u`.`FullName`, `u`.`Nickname` DESC, `u`.`SquadId`, `s0`.`Id`, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`Id0`, `s0`.`Nickname0`
 """);
     }
 
@@ -6770,22 +6758,22 @@ public override async Task Correlated_collections_with_funky_orderby_complex_sce
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t3`.`FullName`, `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`Id`, `t3`.`Nickname0`, `t3`.`SquadId0`, `t3`.`Id0`, `t3`.`Nickname00`, `t3`.`HasSoulPatch`, `t3`.`SquadId00`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s1`.`FullName`, `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`Id`, `s1`.`Nickname0`, `s1`.`SquadId0`, `s1`.`Id0`, `s1`.`Nickname00`, `s1`.`HasSoulPatch`, `s1`.`SquadId00`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t0`.`FullName`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Id`, `t1`.`Nickname` AS `Nickname0`, `t1`.`SquadId` AS `SquadId0`, `t1`.`Id0`, `t1`.`Nickname0` AS `Nickname00`, `t1`.`HasSoulPatch`, `t1`.`SquadId0` AS `SquadId00`, `t0`.`HasSoulPatch` AS `HasSoulPatch0`, `t1`.`IsAutomatic`, `t1`.`Name`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`
+    SELECT `u0`.`FullName`, `u0`.`Nickname`, `u0`.`SquadId`, `s0`.`Id`, `s0`.`Nickname` AS `Nickname0`, `s0`.`SquadId` AS `SquadId0`, `s0`.`Id0`, `s0`.`Nickname0` AS `Nickname00`, `s0`.`HasSoulPatch`, `s0`.`SquadId0` AS `SquadId00`, `u0`.`HasSoulPatch` AS `HasSoulPatch0`, `s0`.`IsAutomatic`, `s0`.`Name`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN (
-        SELECT `w`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`, `s`.`Id` AS `Id0`, `t4`.`Nickname` AS `Nickname0`, `t4`.`HasSoulPatch`, `t4`.`SquadId` AS `SquadId0`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`
+        SELECT `w`.`Id`, `u1`.`Nickname`, `u1`.`SquadId`, `s`.`Id` AS `Id0`, `u2`.`Nickname` AS `Nickname0`, `u2`.`HasSoulPatch`, `u2`.`SquadId` AS `SquadId0`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`
         FROM `Weapons` AS `w`
         LEFT JOIN (
             SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
@@ -6793,18 +6781,18 @@ LEFT JOIN (
             UNION ALL
             SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`FullName`
             FROM `Officers` AS `o1`
-        ) AS `t2` ON `w`.`OwnerFullName` = `t2`.`FullName`
-        LEFT JOIN `Squads` AS `s` ON `t2`.`SquadId` = `s`.`Id`
+        ) AS `u1` ON `w`.`OwnerFullName` = `u1`.`FullName`
+        LEFT JOIN `Squads` AS `s` ON `u1`.`SquadId` = `s`.`Id`
         LEFT JOIN (
             SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`HasSoulPatch`
             FROM `Gears` AS `g1`
             UNION ALL
             SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`HasSoulPatch`
             FROM `Officers` AS `o2`
-        ) AS `t4` ON `s`.`Id` = `t4`.`SquadId`
-    ) AS `t1` ON `t0`.`FullName` = `t1`.`OwnerFullName`
-) AS `t3` ON (`t`.`Nickname` = `t3`.`LeaderNickname`) AND (`t`.`SquadId` = `t3`.`LeaderSquadId`)
-ORDER BY `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t3`.`FullName`, `t3`.`HasSoulPatch0` DESC, `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`IsAutomatic`, `t3`.`Name` DESC, `t3`.`Id`, `t3`.`Nickname0`, `t3`.`SquadId0`, `t3`.`Id0`, `t3`.`Nickname00`
+        ) AS `u2` ON `s`.`Id` = `u2`.`SquadId`
+    ) AS `s0` ON `u0`.`FullName` = `s0`.`OwnerFullName`
+) AS `s1` ON (`u`.`Nickname` = `s1`.`LeaderNickname`) AND (`u`.`SquadId` = `s1`.`LeaderSquadId`)
+ORDER BY `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `s1`.`FullName`, `s1`.`HasSoulPatch0` DESC, `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`IsAutomatic`, `s1`.`Name` DESC, `s1`.`Id`, `s1`.`Nickname0`, `s1`.`SquadId0`, `s1`.`Id0`, `s1`.`Nickname00`
 """);
     }
 
@@ -6814,21 +6802,21 @@ public override async Task Correlated_collection_with_top_level_FirstOrDefault(b
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
-    SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`FullName`
+    SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`FullName`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    ORDER BY `t`.`Nickname`
+    ) AS `u`
+    ORDER BY `u`.`Nickname`
     LIMIT 1
-) AS `t0`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u0`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u0`.`Nickname`, `u0`.`SquadId`
 """);
     }
 
@@ -6840,12 +6828,12 @@ public override async Task Correlated_collection_with_top_level_Count(bool async
 """
 SELECT COUNT(*)
 FROM (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT 1
     FROM `Gears` AS `g`
     UNION ALL
-    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT 1
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -6855,21 +6843,21 @@ public override async Task Correlated_collection_with_top_level_Last_with_orderb
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
-    SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`FullName`
+    SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`FullName`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    ORDER BY `t`.`FullName`
+    ) AS `u`
+    ORDER BY `u`.`FullName`
     LIMIT 1
-) AS `t0`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t0`.`FullName`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u0`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u0`.`FullName`, `u0`.`Nickname`, `u0`.`SquadId`
 """);
     }
 
@@ -6879,21 +6867,21 @@ public override async Task Correlated_collection_with_top_level_Last_with_order_
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
-    SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`FullName`
+    SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`FullName`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    ORDER BY `t`.`FullName` DESC
+    ) AS `u`
+    ORDER BY `u`.`FullName` DESC
     LIMIT 1
-) AS `t0`
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t0`.`FullName` DESC, `t0`.`Nickname`, `t0`.`SquadId`, `w`.`Name`
+) AS `u0`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u0`.`FullName` DESC, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Name`
 """);
     }
 
@@ -6903,20 +6891,20 @@ public override async Task Null_semantics_on_nullable_bool_from_inner_join_subqu
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CapitalName`, `t0`.`Name`, `t0`.`ServerAddress`, `t0`.`CommanderName`, `t0`.`Eradicated`
+SELECT `l2`.`Id`, `l2`.`CapitalName`, `l2`.`Name`, `l2`.`ServerAddress`, `l2`.`CommanderName`, `l2`.`Eradicated`
 FROM (
-    SELECT `l0`.`Name`
-    FROM `LocustLeaders` AS `l0`
+    SELECT `l`.`Name`
+    FROM `LocustLeaders` AS `l`
     UNION ALL
-    SELECT `l1`.`Name`
-    FROM `LocustCommanders` AS `l1`
-) AS `t`
+    SELECT `l0`.`Name`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
 INNER JOIN (
-    SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`
-    FROM `LocustHordes` AS `l`
-    WHERE `l`.`Name` = 'Swarm'
-) AS `t0` ON `t`.`Name` = `t0`.`CommanderName`
-WHERE (`t0`.`Eradicated` <> TRUE) OR (`t0`.`Eradicated` IS NULL)
+    SELECT `l1`.`Id`, `l1`.`CapitalName`, `l1`.`Name`, `l1`.`ServerAddress`, `l1`.`CommanderName`, `l1`.`Eradicated`
+    FROM `LocustHordes` AS `l1`
+    WHERE `l1`.`Name` = 'Swarm'
+) AS `l2` ON `u`.`Name` = `l2`.`CommanderName`
+WHERE (`l2`.`Eradicated` <> TRUE) OR (`l2`.`Eradicated` IS NULL)
 """);
     }
 
@@ -6926,20 +6914,20 @@ public override async Task Null_semantics_on_nullable_bool_from_left_join_subque
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CapitalName`, `t0`.`Name`, `t0`.`ServerAddress`, `t0`.`CommanderName`, `t0`.`Eradicated`
+SELECT `l2`.`Id`, `l2`.`CapitalName`, `l2`.`Name`, `l2`.`ServerAddress`, `l2`.`CommanderName`, `l2`.`Eradicated`
 FROM (
-    SELECT `l0`.`Name`
-    FROM `LocustLeaders` AS `l0`
+    SELECT `l`.`Name`
+    FROM `LocustLeaders` AS `l`
     UNION ALL
-    SELECT `l1`.`Name`
-    FROM `LocustCommanders` AS `l1`
-) AS `t`
+    SELECT `l0`.`Name`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
 LEFT JOIN (
-    SELECT `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`
-    FROM `LocustHordes` AS `l`
-    WHERE `l`.`Name` = 'Swarm'
-) AS `t0` ON `t`.`Name` = `t0`.`CommanderName`
-WHERE (`t0`.`Eradicated` <> TRUE) OR (`t0`.`Eradicated` IS NULL)
+    SELECT `l1`.`Id`, `l1`.`CapitalName`, `l1`.`Name`, `l1`.`ServerAddress`, `l1`.`CommanderName`, `l1`.`Eradicated`
+    FROM `LocustHordes` AS `l1`
+    WHERE `l1`.`Name` = 'Swarm'
+) AS `l2` ON `u`.`Name` = `l2`.`CommanderName`
+WHERE (`l2`.`Eradicated` <> TRUE) OR (`l2`.`Eradicated` IS NULL)
 """);
     }
 
@@ -6951,29 +6939,29 @@ public override async Task Include_on_derived_type_with_order_by_and_paging(bool
 """
 @__p_0='10'
 
-SELECT `t2`.`Name`, `t2`.`LocustHordeId`, `t2`.`ThreatLevel`, `t2`.`ThreatLevelByte`, `t2`.`ThreatLevelNullableByte`, `t2`.`DefeatedByNickname`, `t2`.`DefeatedBySquadId`, `t2`.`HighCommandId`, `t2`.`Discriminator`, `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator0` AS `Discriminator`, `t2`.`Id`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `s`.`Name`, `s`.`LocustHordeId`, `s`.`ThreatLevel`, `s`.`ThreatLevelByte`, `s`.`ThreatLevelNullableByte`, `s`.`DefeatedByNickname`, `s`.`DefeatedBySquadId`, `s`.`HighCommandId`, `s`.`Discriminator`, `s`.`Nickname`, `s`.`SquadId`, `s`.`AssignedCityName`, `s`.`CityOfBirthName`, `s`.`FullName`, `s`.`HasSoulPatch`, `s`.`LeaderNickname`, `s`.`LeaderSquadId`, `s`.`Rank`, `s`.`Discriminator0` AS `Discriminator`, `s`.`Id`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
-    SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator` AS `Discriminator0`, `t1`.`Id`, `t1`.`Note`
+    SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator` AS `Discriminator0`, `t`.`Id`, `t`.`Note`
     FROM (
         SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
         FROM `LocustLeaders` AS `l`
         UNION ALL
         SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
         FROM `LocustCommanders` AS `l0`
-    ) AS `t`
+    ) AS `u`
     LEFT JOIN (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
-    LEFT JOIN `Tags` AS `t1` ON ((`t0`.`Nickname` = `t1`.`GearNickName`) OR (`t0`.`Nickname` IS NULL AND (`t1`.`GearNickName` IS NULL))) AND ((`t0`.`SquadId` = `t1`.`GearSquadId`) OR (`t0`.`SquadId` IS NULL AND (`t1`.`GearSquadId` IS NULL)))
-    ORDER BY `t1`.`Note`
+    ) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
+    LEFT JOIN `Tags` AS `t` ON ((`u0`.`Nickname` = `t`.`GearNickName`) OR (`u0`.`Nickname` IS NULL AND (`t`.`GearNickName` IS NULL))) AND ((`u0`.`SquadId` = `t`.`GearSquadId`) OR (`u0`.`SquadId` IS NULL AND (`t`.`GearSquadId` IS NULL)))
+    ORDER BY `t`.`Note`
     LIMIT @__p_0
-) AS `t2`
-LEFT JOIN `Weapons` AS `w` ON `t2`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t2`.`Note`, `t2`.`Name`, `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`Id`
+) AS `s`
+LEFT JOIN `Weapons` AS `w` ON `s`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `s`.`Note`, `s`.`Name`, `s`.`Nickname`, `s`.`SquadId`, `s`.`Id`
 """);
     }
 
@@ -6983,15 +6971,15 @@ public override async Task Select_required_navigation_on_derived_type(bool async
 
         AssertSql(
 """
-SELECT `l`.`Name`
+SELECT `l1`.`Name`
 FROM (
     SELECT NULL AS `HighCommandId`
-    FROM `LocustLeaders` AS `l0`
+    FROM `LocustLeaders` AS `l`
     UNION ALL
-    SELECT `l1`.`HighCommandId`
-    FROM `LocustCommanders` AS `l1`
-) AS `t`
-LEFT JOIN `LocustHighCommands` AS `l` ON `t`.`HighCommandId` = `l`.`Id`
+    SELECT `l0`.`HighCommandId`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
+LEFT JOIN `LocustHighCommands` AS `l1` ON `u`.`HighCommandId` = `l1`.`Id`
 """);
     }
 
@@ -7008,8 +6996,8 @@ public override async Task Select_required_navigation_on_the_same_type_with_cast
     UNION ALL
     SELECT `o`.`CityOfBirthName`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 """);
     }
 
@@ -7019,16 +7007,16 @@ public override async Task Where_required_navigation_on_derived_type(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
-    SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
-    FROM `LocustLeaders` AS `l0`
+    SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
+    FROM `LocustLeaders` AS `l`
     UNION ALL
-    SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
-    FROM `LocustCommanders` AS `l1`
-) AS `t`
-LEFT JOIN `LocustHighCommands` AS `l` ON `t`.`HighCommandId` = `l`.`Id`
-WHERE `l`.`IsOperational` = TRUE
+    SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
+LEFT JOIN `LocustHighCommands` AS `l1` ON `u`.`HighCommandId` = `l1`.`Id`
+WHERE `l1`.`IsOperational` = TRUE
 """);
     }
 
@@ -7038,23 +7026,23 @@ public override async Task Outer_parameter_in_join_key(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t1`.`Note`, `t1`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `s`.`Note`, `s`.`Id`, `s`.`Nickname`, `s`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
-    SELECT `t0`.`Note`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`
-    FROM `Tags` AS `t0`
+    SELECT `t`.`Note`, `t`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`
+    FROM `Tags` AS `t`
     INNER JOIN (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t2` ON `t`.`FullName` = `t2`.`FullName`
-) AS `t1` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t1`.`Id`, `t1`.`Nickname`
+    ) AS `u0` ON `u`.`FullName` = `u0`.`FullName`
+) AS `s` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s`.`Nickname`
 """);
     }
 
@@ -7064,23 +7052,23 @@ public override async Task Outer_parameter_in_join_key_inner_and_outer(bool asyn
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t1`.`Note`, `t1`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `s`.`Note`, `s`.`Id`, `s`.`Nickname`, `s`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
-    SELECT `t0`.`Note`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`
-    FROM `Tags` AS `t0`
+    SELECT `t`.`Note`, `t`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`
+    FROM `Tags` AS `t`
     INNER JOIN (
         SELECT `g`.`Nickname`, `g`.`SquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`
         FROM `Officers` AS `o0`
-    ) AS `t2` ON `t`.`FullName` = `t`.`Nickname`
-) AS `t1` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t1`.`Id`, `t1`.`Nickname`
+    ) AS `u0` ON `u`.`FullName` = `u`.`Nickname`
+) AS `s` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s`.`Nickname`
 """);
     }
 
@@ -7090,23 +7078,23 @@ public override async Task Outer_parameter_in_group_join_with_DefaultIfEmpty(boo
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t1`.`Note`, `t1`.`Id`, `t1`.`Nickname`, `t1`.`SquadId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `s`.`Note`, `s`.`Id`, `s`.`Nickname`, `s`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
-    SELECT `t0`.`Note`, `t0`.`Id`, `t2`.`Nickname`, `t2`.`SquadId`
-    FROM `Tags` AS `t0`
+    SELECT `t`.`Note`, `t`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`
+    FROM `Tags` AS `t`
     LEFT JOIN (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t2` ON `t`.`FullName` = `t2`.`FullName`
-) AS `t1` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t1`.`Id`, `t1`.`Nickname`
+    ) AS `u0` ON `u`.`FullName` = `u0`.`FullName`
+) AS `s` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s`.`Nickname`
 """);
     }
 
@@ -7117,8 +7105,8 @@ public override async Task Negated_bool_ternary_inside_anonymous_type_in_project
         AssertSql(
 """
 SELECT NOT (CASE
-    WHEN `t0`.`HasSoulPatch` = TRUE THEN TRUE
-    ELSE COALESCE(`t0`.`HasSoulPatch`, TRUE)
+    WHEN `u`.`HasSoulPatch` = TRUE THEN TRUE
+    ELSE COALESCE(`u`.`HasSoulPatch`, TRUE)
 END) AS `c`
 FROM `Tags` AS `t`
 LEFT JOIN (
@@ -7127,7 +7115,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 """);
     }
 
@@ -7137,16 +7125,16 @@ public override async Task Order_by_entity_qsre(bool async)
 
         AssertSql(
 """
-SELECT `t`.`FullName`
+SELECT `u`.`FullName`
 FROM (
     SELECT `g`.`Nickname`, `g`.`AssignedCityName`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`AssignedCityName`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Cities` AS `c` ON `t`.`AssignedCityName` = `c`.`Name`
-ORDER BY `c`.`Name`, `t`.`Nickname` DESC
+) AS `u`
+LEFT JOIN `Cities` AS `c` ON `u`.`AssignedCityName` = `c`.`Name`
+ORDER BY `c`.`Name`, `u`.`Nickname` DESC
 """);
     }
 
@@ -7156,13 +7144,13 @@ public override async Task Order_by_entity_qsre_with_inheritance(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Name`
+SELECT `u`.`Name`
 FROM (
-    SELECT `l0`.`Name`, `l0`.`HighCommandId`
-    FROM `LocustCommanders` AS `l0`
-) AS `t`
-INNER JOIN `LocustHighCommands` AS `l` ON `t`.`HighCommandId` = `l`.`Id`
-ORDER BY `l`.`Id`, `t`.`Name`
+    SELECT `l`.`Name`, `l`.`HighCommandId`
+    FROM `LocustCommanders` AS `l`
+) AS `u`
+INNER JOIN `LocustHighCommands` AS `l0` ON `u`.`HighCommandId` = `l0`.`Id`
+ORDER BY `l0`.`Id`, `u`.`Name`
 """);
     }
 
@@ -7180,8 +7168,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t` ON `w`.`OwnerFullName` = `t`.`FullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`
+) AS `u` ON `w`.`OwnerFullName` = `u`.`FullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`
 """);
     }
 
@@ -7199,9 +7187,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t` ON `w`.`OwnerFullName` = `t`.`FullName`
+) AS `u` ON `w`.`OwnerFullName` = `u`.`FullName`
 LEFT JOIN `Weapons` AS `w0` ON `w`.`SynergyWithId` = `w0`.`Id`
-ORDER BY `w`.`IsAutomatic`, `t`.`Nickname` DESC, `t`.`SquadId` DESC, `w0`.`Id`, `w`.`Name`
+ORDER BY `w`.`IsAutomatic`, `u`.`Nickname` DESC, `u`.`SquadId` DESC, `w0`.`Id`, `w`.`Name`
 """);
     }
 
@@ -7223,21 +7211,21 @@ public override async Task Join_on_entity_qsre_keys_composite_key(bool async)
 
         AssertSql(
 """
-SELECT `t`.`FullName` AS `GearName1`, `t0`.`FullName` AS `GearName2`
+SELECT `u`.`FullName` AS `GearName1`, `u0`.`FullName` AS `GearName2`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`Nickname`) AND (`t`.`SquadId` = `t0`.`SquadId`)
+) AS `u0` ON (`u`.`Nickname` = `u0`.`Nickname`) AND (`u`.`SquadId` = `u0`.`SquadId`)
 """);
     }
 
@@ -7247,18 +7235,18 @@ public override async Task Join_on_entity_qsre_keys_inheritance(bool async)
 
         AssertSql(
 """
-SELECT `t`.`FullName` AS `GearName`, `t0`.`FullName` AS `OfficerName`
+SELECT `u`.`FullName` AS `GearName`, `u0`.`FullName` AS `OfficerName`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`Nickname`) AND (`t`.`SquadId` = `t0`.`SquadId`)
+) AS `u0` ON (`u`.`Nickname` = `u0`.`Nickname`) AND (`u`.`SquadId` = `u0`.`SquadId`)
 """);
     }
 
@@ -7281,19 +7269,19 @@ public override async Task Join_on_entity_qsre_keys_inner_key_is_navigation(bool
 
         AssertSql(
 """
-SELECT `c`.`Name` AS `CityName`, `t0`.`Nickname` AS `GearNickname`
+SELECT `c`.`Name` AS `CityName`, `s`.`Nickname` AS `GearNickname`
 FROM `Cities` AS `c`
 INNER JOIN (
-    SELECT `t`.`Nickname`, `c0`.`Name`
+    SELECT `u`.`Nickname`, `c0`.`Name`
     FROM (
         SELECT `g`.`Nickname`, `g`.`AssignedCityName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`AssignedCityName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    LEFT JOIN `Cities` AS `c0` ON `t`.`AssignedCityName` = `c0`.`Name`
-) AS `t0` ON `c`.`Name` = `t0`.`Name`
+    ) AS `u`
+    LEFT JOIN `Cities` AS `c0` ON `u`.`AssignedCityName` = `c0`.`Name`
+) AS `s` ON `c`.`Name` = `s`.`Name`
 """);
     }
 
@@ -7303,26 +7291,26 @@ public override async Task Join_on_entity_qsre_keys_inner_key_is_navigation_comp
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t1`.`Note`
+SELECT `u`.`Nickname`, `s`.`Note`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN (
-    SELECT `t0`.`Note`, `t2`.`Nickname`, `t2`.`SquadId`
-    FROM `Tags` AS `t0`
+    SELECT `t`.`Note`, `u0`.`Nickname`, `u0`.`SquadId`
+    FROM `Tags` AS `t`
     LEFT JOIN (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`
         FROM `Gears` AS `g0`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`
         FROM `Officers` AS `o0`
-    ) AS `t2` ON (`t0`.`GearNickName` = `t2`.`Nickname`) AND (`t0`.`GearSquadId` = `t2`.`SquadId`)
-    WHERE `t0`.`Note` IN ('Cole''s Tag', 'Dom''s Tag')
-) AS `t1` ON (`t`.`Nickname` = `t1`.`Nickname`) AND (`t`.`SquadId` = `t1`.`SquadId`)
+    ) AS `u0` ON (`t`.`GearNickName` = `u0`.`Nickname`) AND (`t`.`GearSquadId` = `u0`.`SquadId`)
+    WHERE `t`.`Note` IN ('Cole''s Tag', 'Dom''s Tag')
+) AS `s` ON (`u`.`Nickname` = `s`.`Nickname`) AND (`u`.`SquadId` = `s`.`SquadId`)
 """);
     }
 
@@ -7332,7 +7320,7 @@ public override async Task Join_on_entity_qsre_keys_inner_key_is_nested_navigati
 
         AssertSql(
 """
-SELECT `s`.`Name` AS `SquadName`, `t0`.`Name` AS `WeaponName`
+SELECT `s`.`Name` AS `SquadName`, `s1`.`Name` AS `WeaponName`
 FROM `Squads` AS `s`
 INNER JOIN (
     SELECT `w`.`Name`, `s0`.`Id` AS `Id0`
@@ -7343,10 +7331,10 @@ LEFT JOIN (
         UNION ALL
         SELECT `o`.`SquadId`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t` ON `w`.`OwnerFullName` = `t`.`FullName`
-    LEFT JOIN `Squads` AS `s0` ON `t`.`SquadId` = `s0`.`Id`
+    ) AS `u` ON `w`.`OwnerFullName` = `u`.`FullName`
+    LEFT JOIN `Squads` AS `s0` ON `u`.`SquadId` = `s0`.`Id`
     WHERE `w`.`IsAutomatic` = TRUE
-) AS `t0` ON `s`.`Id` = `t0`.`Id0`
+) AS `s1` ON `s`.`Id` = `s1`.`Id0`
 """);
     }
 
@@ -7356,7 +7344,7 @@ public override async Task GroupJoin_on_entity_qsre_keys_inner_key_is_nested_nav
 
         AssertSql(
 """
-SELECT `s`.`Name` AS `SquadName`, `t0`.`Name` AS `WeaponName`
+SELECT `s`.`Name` AS `SquadName`, `s1`.`Name` AS `WeaponName`
 FROM `Squads` AS `s`
 LEFT JOIN (
     SELECT `w`.`Name`, `s0`.`Id` AS `Id0`
@@ -7367,9 +7355,9 @@ LEFT JOIN (
         UNION ALL
         SELECT `o`.`SquadId`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t` ON `w`.`OwnerFullName` = `t`.`FullName`
-    LEFT JOIN `Squads` AS `s0` ON `t`.`SquadId` = `s0`.`Id`
-) AS `t0` ON `s`.`Id` = `t0`.`Id0`
+    ) AS `u` ON `w`.`OwnerFullName` = `u`.`FullName`
+    LEFT JOIN `Squads` AS `s0` ON `u`.`SquadId` = `s0`.`Id`
+) AS `s1` ON `s`.`Id` = `s1`.`Id0`
 """);
     }
 
@@ -7379,25 +7367,25 @@ public override async Task Streaming_correlated_collection_issue_11403(bool asyn
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
-    SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`FullName`
+    SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`FullName`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    ORDER BY `t`.`Nickname`
+    ) AS `u`
+    ORDER BY `u`.`Nickname`
     LIMIT 1
-) AS `t0`
+) AS `u0`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
     WHERE `w`.`IsAutomatic` = FALSE
-) AS `t1` ON `t0`.`FullName` = `t1`.`OwnerFullName`
-ORDER BY `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Id`
+) AS `w0` ON `u0`.`FullName` = `w0`.`OwnerFullName`
+ORDER BY `u0`.`Nickname`, `u0`.`SquadId`, `w0`.`Id`
 """);
     }
 
@@ -7408,15 +7396,15 @@ public override async Task Project_one_value_type_from_empty_collection(bool asy
         AssertSql(
 """
 SELECT `s`.`Name`, COALESCE((
-    SELECT `t`.`SquadId`
+    SELECT `u`.`SquadId`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t`.`HasSoulPatch` = TRUE)
+    ) AS `u`
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`u`.`HasSoulPatch` = TRUE)
     LIMIT 1), 0) AS `SquadId`
 FROM `Squads` AS `s`
 WHERE `s`.`Name` = 'Kilo'
@@ -7430,15 +7418,15 @@ public override async Task Project_one_value_type_converted_to_nullable_from_emp
         AssertSql(
 """
 SELECT `s`.`Name`, (
-    SELECT `t`.`SquadId`
+    SELECT `u`.`SquadId`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t`.`HasSoulPatch` = TRUE)
+    ) AS `u`
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`u`.`HasSoulPatch` = TRUE)
     LIMIT 1) AS `SquadId`
 FROM `Squads` AS `s`
 WHERE `s`.`Name` = 'Kilo'
@@ -7451,23 +7439,23 @@ public override async Task Project_one_value_type_with_client_projection_from_em
 
         AssertSql(
 """
-SELECT `s`.`Name`, `t1`.`SquadId`, `t1`.`LeaderSquadId`, `t1`.`c`
+SELECT `s`.`Name`, `u1`.`SquadId`, `u1`.`LeaderSquadId`, `u1`.`c`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `t0`.`SquadId`, `t0`.`LeaderSquadId`, `t0`.`c`
+    SELECT `u0`.`SquadId`, `u0`.`LeaderSquadId`, `u0`.`c`
     FROM (
-        SELECT `t`.`SquadId`, `t`.`LeaderSquadId`, 1 AS `c`, ROW_NUMBER() OVER(PARTITION BY `t`.`SquadId` ORDER BY `t`.`Nickname`, `t`.`SquadId`) AS `row`
+        SELECT `u`.`SquadId`, `u`.`LeaderSquadId`, 1 AS `c`, ROW_NUMBER() OVER(PARTITION BY `u`.`SquadId` ORDER BY `u`.`Nickname`, `u`.`SquadId`) AS `row`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`, `g`.`LeaderSquadId`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`, `o`.`LeaderSquadId`
             FROM `Officers` AS `o`
-        ) AS `t`
-        WHERE `t`.`HasSoulPatch` = TRUE
-    ) AS `t0`
-    WHERE `t0`.`row` <= 1
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
+        ) AS `u`
+        WHERE `u`.`HasSoulPatch` = TRUE
+    ) AS `u0`
+    WHERE `u0`.`row` <= 1
+) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
 WHERE `s`.`Name` = 'Kilo'
 """);
     }
@@ -7481,15 +7469,15 @@ public override async Task Filter_on_subquery_projecting_one_value_type_from_emp
 SELECT `s`.`Name`
 FROM `Squads` AS `s`
 WHERE (`s`.`Name` = 'Kilo') AND (COALESCE((
-    SELECT `t`.`SquadId`
+    SELECT `u`.`SquadId`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t`.`HasSoulPatch` = TRUE)
+    ) AS `u`
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`u`.`HasSoulPatch` = TRUE)
     LIMIT 1), 0) <> 0)
 """);
     }
@@ -7503,13 +7491,13 @@ public override async Task Select_subquery_projecting_single_constant_int(bool a
 SELECT `s`.`Name`, COALESCE((
     SELECT 42
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t`.`HasSoulPatch` = TRUE)
+    ) AS `u`
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`u`.`HasSoulPatch` = TRUE)
     LIMIT 1), 0) AS `Gear`
 FROM `Squads` AS `s`
 """);
@@ -7524,13 +7512,13 @@ public override async Task Select_subquery_projecting_single_constant_string(boo
 SELECT `s`.`Name`, (
     SELECT 'Foo'
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t`.`HasSoulPatch` = TRUE)
+    ) AS `u`
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`u`.`HasSoulPatch` = TRUE)
     LIMIT 1) AS `Gear`
 FROM `Squads` AS `s`
 """);
@@ -7545,13 +7533,13 @@ public override async Task Select_subquery_projecting_single_constant_bool(bool
 SELECT `s`.`Name`, COALESCE((
     SELECT TRUE
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t`.`HasSoulPatch` = TRUE)
+    ) AS `u`
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`u`.`HasSoulPatch` = TRUE)
     LIMIT 1), FALSE) AS `Gear`
 FROM `Squads` AS `s`
 """);
@@ -7563,23 +7551,23 @@ public override async Task Select_subquery_projecting_single_constant_inside_ano
 
         AssertSql(
 """
-SELECT `s`.`Name`, `t1`.`One`
+SELECT `s`.`Name`, `u1`.`One`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `t0`.`One`, `t0`.`SquadId`
+    SELECT `u0`.`One`, `u0`.`SquadId`
     FROM (
-        SELECT 1 AS `One`, `t`.`SquadId`, ROW_NUMBER() OVER(PARTITION BY `t`.`SquadId` ORDER BY `t`.`Nickname`, `t`.`SquadId`) AS `row`
+        SELECT 1 AS `One`, `u`.`SquadId`, ROW_NUMBER() OVER(PARTITION BY `u`.`SquadId` ORDER BY `u`.`Nickname`, `u`.`SquadId`) AS `row`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
             FROM `Officers` AS `o`
-        ) AS `t`
-        WHERE `t`.`HasSoulPatch` = TRUE
-    ) AS `t0`
-    WHERE `t0`.`row` <= 1
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
+        ) AS `u`
+        WHERE `u`.`HasSoulPatch` = TRUE
+    ) AS `u0`
+    WHERE `u0`.`row` <= 1
+) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
 """);
     }
 
@@ -7589,23 +7577,23 @@ public override async Task Select_subquery_projecting_multiple_constants_inside_
 
         AssertSql(
 """
-SELECT `s`.`Name`, `t1`.`True1`, `t1`.`False1`, `t1`.`c`
+SELECT `s`.`Name`, `u1`.`True1`, `u1`.`False1`, `u1`.`c`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `t0`.`True1`, `t0`.`False1`, `t0`.`c`, `t0`.`SquadId`
+    SELECT `u0`.`True1`, `u0`.`False1`, `u0`.`c`, `u0`.`SquadId`
     FROM (
-        SELECT TRUE AS `True1`, FALSE AS `False1`, 1 AS `c`, `t`.`SquadId`, ROW_NUMBER() OVER(PARTITION BY `t`.`SquadId` ORDER BY `t`.`Nickname`, `t`.`SquadId`) AS `row`
+        SELECT TRUE AS `True1`, FALSE AS `False1`, 1 AS `c`, `u`.`SquadId`, ROW_NUMBER() OVER(PARTITION BY `u`.`SquadId` ORDER BY `u`.`Nickname`, `u`.`SquadId`) AS `row`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
             FROM `Officers` AS `o`
-        ) AS `t`
-        WHERE `t`.`HasSoulPatch` = TRUE
-    ) AS `t0`
-    WHERE `t0`.`row` <= 1
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
+        ) AS `u`
+        WHERE `u`.`HasSoulPatch` = TRUE
+    ) AS `u0`
+    WHERE `u0`.`row` <= 1
+) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
 """);
     }
 
@@ -7615,7 +7603,7 @@ public override async Task Include_with_order_by_constant(bool async)
 
         AssertSql(
 """
-SELECT `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM `Squads` AS `s`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -7623,8 +7611,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t` ON `s`.`Id` = `t`.`SquadId`
-ORDER BY `s`.`Id`, `t`.`Nickname`
+) AS `u` ON `s`.`Id` = `u`.`SquadId`
+ORDER BY `s`.`Id`, `u`.`Nickname`
 """);
     }
 
@@ -7634,16 +7622,16 @@ public override async Task Correlated_collection_order_by_constant(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `w`.`Name`, `w`.`Id`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w`.`Name`, `w`.`Id`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -7653,23 +7641,23 @@ public override async Task Select_subquery_projecting_single_constant_null_of_no
 
         AssertSql(
 """
-SELECT `s`.`Name`, `t1`.`c`
+SELECT `s`.`Name`, `u1`.`c`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `t0`.`c`, `t0`.`SquadId`
+    SELECT `u0`.`c`, `u0`.`SquadId`
     FROM (
-        SELECT 1 AS `c`, `t`.`SquadId`, ROW_NUMBER() OVER(PARTITION BY `t`.`SquadId` ORDER BY `t`.`Nickname`, `t`.`SquadId`) AS `row`
+        SELECT 1 AS `c`, `u`.`SquadId`, ROW_NUMBER() OVER(PARTITION BY `u`.`SquadId` ORDER BY `u`.`Nickname`, `u`.`SquadId`) AS `row`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
             FROM `Officers` AS `o`
-        ) AS `t`
-        WHERE `t`.`HasSoulPatch` = TRUE
-    ) AS `t0`
-    WHERE `t0`.`row` <= 1
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
+        ) AS `u`
+        WHERE `u`.`HasSoulPatch` = TRUE
+    ) AS `u0`
+    WHERE `u0`.`row` <= 1
+) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
 """);
     }
 
@@ -7679,23 +7667,23 @@ public override async Task Select_subquery_projecting_single_constant_of_non_map
 
         AssertSql(
 """
-SELECT `s`.`Name`, `t1`.`c`
+SELECT `s`.`Name`, `u1`.`c`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `t0`.`c`, `t0`.`SquadId`
+    SELECT `u0`.`c`, `u0`.`SquadId`
     FROM (
-        SELECT 1 AS `c`, `t`.`SquadId`, ROW_NUMBER() OVER(PARTITION BY `t`.`SquadId` ORDER BY `t`.`Nickname`, `t`.`SquadId`) AS `row`
+        SELECT 1 AS `c`, `u`.`SquadId`, ROW_NUMBER() OVER(PARTITION BY `u`.`SquadId` ORDER BY `u`.`Nickname`, `u`.`SquadId`) AS `row`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
             FROM `Officers` AS `o`
-        ) AS `t`
-        WHERE `t`.`HasSoulPatch` = TRUE
-    ) AS `t0`
-    WHERE `t0`.`row` <= 1
-) AS `t1` ON `s`.`Id` = `t1`.`SquadId`
+        ) AS `u`
+        WHERE `u`.`HasSoulPatch` = TRUE
+    ) AS `u0`
+    WHERE `u0`.`row` <= 1
+) AS `u1` ON `s`.`Id` = `u1`.`SquadId`
 """);
     }
 
@@ -7705,22 +7693,22 @@ public override async Task Include_collection_OrderBy_aggregate(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
 ORDER BY (
     SELECT COUNT(*)
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`), `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`), `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -7730,24 +7718,24 @@ public override async Task Include_collection_with_complex_OrderBy2(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
 ORDER BY (
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
-    LIMIT 1), `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    LIMIT 1), `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -7757,24 +7745,24 @@ public override async Task Include_collection_with_complex_OrderBy3(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
 ORDER BY COALESCE((
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
-    LIMIT 1), FALSE), `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    LIMIT 1), FALSE), `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -7783,27 +7771,27 @@ public override async Task Correlated_collection_with_complex_OrderBy(bool async
         await base.Correlated_collection_with_complex_OrderBy(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+"""
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    WHERE `t1`.`HasSoulPatch` = FALSE
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
+    ) AS `u0`
+    WHERE `u0`.`HasSoulPatch` = FALSE
+) AS `u1` ON (`u`.`Nickname` = `u1`.`LeaderNickname`) AND (`u`.`SquadId` = `u1`.`LeaderSquadId`)
 ORDER BY (
     SELECT COUNT(*)
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`), `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`), `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`
 """);
     }
 
@@ -7812,37 +7800,37 @@ public override async Task Correlated_collection_with_very_complex_order_by(bool
         await base.Correlated_collection_with_very_complex_order_by(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+"""
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u2`.`Nickname`, `u2`.`SquadId`, `u2`.`AssignedCityName`, `u2`.`CityOfBirthName`, `u2`.`FullName`, `u2`.`HasSoulPatch`, `u2`.`LeaderNickname`, `u2`.`LeaderSquadId`, `u2`.`Rank`, `u2`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator`
+    SELECT `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
-        FROM `Gears` AS `g`
+        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
-        FROM `Officers` AS `o0`
-    ) AS `t2`
-    WHERE `t2`.`HasSoulPatch` = FALSE
-) AS `t1` ON (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)
+        SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`AssignedCityName`, `o1`.`CityOfBirthName`, `o1`.`FullName`, `o1`.`HasSoulPatch`, `o1`.`LeaderNickname`, `o1`.`LeaderSquadId`, `o1`.`Rank`, 'Officer' AS `Discriminator`
+        FROM `Officers` AS `o1`
+    ) AS `u1`
+    WHERE `u1`.`HasSoulPatch` = FALSE
+) AS `u2` ON (`u`.`Nickname` = `u2`.`LeaderNickname`) AND (`u`.`SquadId` = `u2`.`LeaderSquadId`)
 ORDER BY (
     SELECT COUNT(*)
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`IsAutomatic` = COALESCE((
-        SELECT `t0`.`HasSoulPatch`
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`IsAutomatic` = COALESCE((
+        SELECT `u0`.`HasSoulPatch`
         FROM (
-            SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
-            FROM `Gears` AS `g0`
+            SELECT `g`.`Nickname`, `g`.`HasSoulPatch`
+            FROM `Gears` AS `g`
             UNION ALL
-            SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`AssignedCityName`, `o1`.`CityOfBirthName`, `o1`.`FullName`, `o1`.`HasSoulPatch`, `o1`.`LeaderNickname`, `o1`.`LeaderSquadId`, `o1`.`Rank`, 'Officer' AS `Discriminator`
-            FROM `Officers` AS `o1`
-        ) AS `t0`
-        WHERE `t0`.`Nickname` = 'Marcus'
-        LIMIT 1), FALSE))), `t`.`Nickname`, `t`.`SquadId`, `t1`.`Nickname`
+            SELECT `o0`.`Nickname`, `o0`.`HasSoulPatch`
+            FROM `Officers` AS `o0`
+        ) AS `u0`
+        WHERE `u0`.`Nickname` = 'Marcus'
+        LIMIT 1), FALSE))), `u`.`Nickname`, `u`.`SquadId`, `u2`.`Nickname`
 """);
     }
 
@@ -7866,7 +7854,7 @@ public override async Task Select_subquery_boolean(bool async)
 SELECT COALESCE((
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1), FALSE)
 FROM (
@@ -7875,7 +7863,7 @@ ORDER BY `w`.`Id`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -7888,7 +7876,7 @@ public override async Task Select_subquery_boolean_with_pushdown(bool async)
 SELECT (
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1)
 FROM (
@@ -7897,7 +7885,7 @@ ORDER BY `w`.`Id`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -7910,7 +7898,7 @@ public override async Task Select_subquery_int_with_inside_cast_and_coalesce(boo
 SELECT COALESCE((
     SELECT `w`.`Id`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1), 42)
 FROM (
@@ -7919,7 +7907,7 @@ ORDER BY `w`.`Id`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -7932,7 +7920,7 @@ public override async Task Select_subquery_int_with_outside_cast_and_coalesce(bo
 SELECT COALESCE((
     SELECT `w`.`Id`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1), 0, 42)
 FROM (
@@ -7941,7 +7929,7 @@ ORDER BY `w`.`Id`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -7954,7 +7942,7 @@ public override async Task Select_subquery_int_with_pushdown_and_coalesce(bool a
 SELECT COALESCE((
     SELECT `w`.`Id`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1), 42)
 FROM (
@@ -7963,7 +7951,7 @@ ORDER BY `w`.`Id`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -7976,12 +7964,12 @@ public override async Task Select_subquery_int_with_pushdown_and_coalesce2(bool
 SELECT COALESCE((
     SELECT `w`.`Id`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     ORDER BY `w`.`Id`
     LIMIT 1), (
     SELECT `w0`.`Id`
     FROM `Weapons` AS `w0`
-    WHERE `t`.`FullName` = `w0`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w0`.`OwnerFullName`
     ORDER BY `w0`.`Id`
     LIMIT 1))
 FROM (
@@ -7990,7 +7978,7 @@ ORDER BY `w0`.`Id`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -8003,7 +7991,7 @@ public override async Task Select_subquery_boolean_empty(bool async)
 SELECT COALESCE((
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
     ORDER BY `w`.`Id`
     LIMIT 1), FALSE)
 FROM (
@@ -8012,7 +8000,7 @@ ORDER BY `w`.`Id`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -8025,7 +8013,7 @@ public override async Task Select_subquery_boolean_empty_with_pushdown(bool asyn
 SELECT (
     SELECT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
     ORDER BY `w`.`Id`
     LIMIT 1)
 FROM (
@@ -8034,7 +8022,7 @@ ORDER BY `w`.`Id`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -8046,12 +8034,12 @@ public override async Task Select_subquery_distinct_singleordefault_boolean1(boo
         AssertSql(
 """
 SELECT COALESCE((
-    SELECT `t0`.`IsAutomatic`
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
-    ) AS `t0`
+        WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
+    ) AS `w0`
     LIMIT 1), FALSE)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
@@ -8059,8 +8047,8 @@ SELECT COALESCE((
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -8073,7 +8061,7 @@ public override async Task Select_subquery_distinct_singleordefault_boolean2(boo
 SELECT COALESCE((
     SELECT DISTINCT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
     LIMIT 1), FALSE)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
@@ -8081,8 +8069,8 @@ SELECT DISTINCT `w`.`IsAutomatic`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -8094,12 +8082,12 @@ public override async Task Select_subquery_distinct_singleordefault_boolean_with
         AssertSql(
 """
 SELECT (
-    SELECT `t0`.`IsAutomatic`
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
-    ) AS `t0`
+        WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Lancer%')
+    ) AS `w0`
     LIMIT 1)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
@@ -8107,8 +8095,8 @@ public override async Task Select_subquery_distinct_singleordefault_boolean_with
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -8120,12 +8108,12 @@ public override async Task Select_subquery_distinct_singleordefault_boolean_empt
         AssertSql(
 """
 SELECT COALESCE((
-    SELECT `t0`.`IsAutomatic`
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
-    ) AS `t0`
+        WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
+    ) AS `w0`
     LIMIT 1), FALSE)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
@@ -8133,8 +8121,8 @@ SELECT COALESCE((
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -8147,7 +8135,7 @@ public override async Task Select_subquery_distinct_singleordefault_boolean_empt
 SELECT COALESCE((
     SELECT DISTINCT `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
     LIMIT 1), FALSE)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
@@ -8155,8 +8143,8 @@ SELECT DISTINCT `w`.`IsAutomatic`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -8168,12 +8156,12 @@ public override async Task Select_subquery_distinct_singleordefault_boolean_empt
         AssertSql(
 """
 SELECT (
-    SELECT `t0`.`IsAutomatic`
+    SELECT `w0`.`IsAutomatic`
     FROM (
         SELECT DISTINCT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
         FROM `Weapons` AS `w`
-        WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
-    ) AS `t0`
+        WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'BFG')
+    ) AS `w0`
     LIMIT 1)
 FROM (
     SELECT `g`.`FullName`, `g`.`HasSoulPatch`
@@ -8181,8 +8169,8 @@ public override async Task Select_subquery_distinct_singleordefault_boolean_empt
     UNION ALL
     SELECT `o`.`FullName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` = TRUE
+) AS `u`
+WHERE `u`.`HasSoulPatch` = TRUE
 """);
     }
 
@@ -8192,7 +8180,7 @@ public override async Task Cast_subquery_to_base_type_using_typed_ToList(bool as
 
         AssertSql(
 """
-SELECT `c`.`Name`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Nickname`, `t`.`Rank`, `t`.`SquadId`
+SELECT `c`.`Name`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Nickname`, `u`.`Rank`, `u`.`SquadId`
 FROM `Cities` AS `c`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`
@@ -8200,9 +8188,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t` ON `c`.`Name` = `t`.`AssignedCityName`
+) AS `u` ON `c`.`Name` = `u`.`AssignedCityName`
 WHERE `c`.`Name` = 'Ephyra'
-ORDER BY `c`.`Name`, `t`.`Nickname`
+ORDER BY `c`.`Name`, `u`.`Nickname`
 """);
     }
 
@@ -8212,7 +8200,7 @@ public override async Task Cast_ordered_subquery_to_base_type_using_typed_ToArra
 
         AssertSql(
 """
-SELECT `c`.`Name`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Nickname`, `t`.`Rank`, `t`.`SquadId`
+SELECT `c`.`Name`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Nickname`, `u`.`Rank`, `u`.`SquadId`
 FROM `Cities` AS `c`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`
@@ -8220,9 +8208,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t` ON `c`.`Name` = `t`.`AssignedCityName`
+) AS `u` ON `c`.`Name` = `u`.`AssignedCityName`
 WHERE `c`.`Name` = 'Ephyra'
-ORDER BY `c`.`Name`, `t`.`Nickname` DESC
+ORDER BY `c`.`Name`, `u`.`Nickname` DESC
 """);
     }
 
@@ -8254,18 +8242,18 @@ FROM JSON_TABLE('[]', '$[*]' COLUMNS (
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `w`.`Name`, `w`.`Id`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w`.`Name`, `w`.`Id`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
         }
     }
@@ -8391,16 +8379,16 @@ public override async Task String_concat_on_various_types(bool async)
 
         AssertSql(
 """
-SELECT CONCAT(CONCAT('HasSoulPatch ', CAST(`t`.`HasSoulPatch` AS char)), ' HasSoulPatch') AS `HasSoulPatch`, CONCAT(CONCAT('Rank ', CAST(`t`.`Rank` AS char)), ' Rank') AS `Rank`, CONCAT(CONCAT('SquadId ', CAST(`t`.`SquadId` AS char)), ' SquadId') AS `SquadId`, CONCAT(CONCAT('Rating ', COALESCE(CAST(`m`.`Rating` AS char), '')), ' Rating') AS `Rating`, CONCAT(CONCAT('Timeline ', CAST(`m`.`Timeline` AS char)), ' Timeline') AS `Timeline`
+SELECT CONCAT(CONCAT('HasSoulPatch ', CAST(`u`.`HasSoulPatch` AS char)), ' HasSoulPatch') AS `HasSoulPatch`, CONCAT(CONCAT('Rank ', CAST(`u`.`Rank` AS char)), ' Rank') AS `Rank`, CONCAT(CONCAT('SquadId ', CAST(`u`.`SquadId` AS char)), ' SquadId') AS `SquadId`, CONCAT(CONCAT('Rating ', COALESCE(CAST(`m`.`Rating` AS char), '')), ' Rating') AS `Rating`, CONCAT(CONCAT('Timeline ', CAST(`m`.`Timeline` AS char)), ' Timeline') AS `Timeline`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN `Missions` AS `m`
-ORDER BY `t`.`Nickname`, `m`.`Id`
+ORDER BY `u`.`Nickname`, `m`.`Id`
 """);
     }
 
@@ -8420,16 +8408,16 @@ public override async Task GroupBy_Property_Include_Select_Average(bool async)
         await base.GroupBy_Property_Include_Select_Average(async);
 
         AssertSql(
-$"""
-SELECT AVG({MySqlTestHelpers.CastAsDouble(@"`t`.`SquadId`")})
+"""
+SELECT AVG(CAST(`u`.`SquadId` AS double))
 FROM (
     SELECT `g`.`SquadId`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`SquadId`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-GROUP BY `t`.`Rank`
+) AS `u`
+GROUP BY `u`.`Rank`
 """);
     }
 
@@ -8439,15 +8427,15 @@ public override async Task GroupBy_Property_Include_Select_Sum(bool async)
 
         AssertSql(
 """
-SELECT COALESCE(SUM(`t`.`SquadId`), 0)
+SELECT COALESCE(SUM(`u`.`SquadId`), 0)
 FROM (
     SELECT `g`.`SquadId`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`SquadId`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-GROUP BY `t`.`Rank`
+) AS `u`
+GROUP BY `u`.`Rank`
 """);
     }
 
@@ -8464,8 +8452,8 @@ SELECT COUNT(*)
     UNION ALL
     SELECT `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-GROUP BY `t`.`Rank`
+) AS `u`
+GROUP BY `u`.`Rank`
 """);
     }
 
@@ -8482,8 +8470,8 @@ SELECT COUNT(*)
     UNION ALL
     SELECT `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-GROUP BY `t`.`Rank`
+) AS `u`
+GROUP BY `u`.`Rank`
 """);
     }
 
@@ -8493,15 +8481,15 @@ public override async Task GroupBy_Property_Include_Select_Min(bool async)
 
         AssertSql(
 """
-SELECT MIN(`t`.`SquadId`)
+SELECT MIN(`u`.`SquadId`)
 FROM (
     SELECT `g`.`SquadId`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`SquadId`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-GROUP BY `t`.`Rank`
+) AS `u`
+GROUP BY `u`.`Rank`
 """);
     }
 
@@ -8511,16 +8499,16 @@ public override async Task GroupBy_Property_Include_Aggregate_with_anonymous_sel
 
         AssertSql(
 """
-SELECT `t`.`Nickname` AS `Key`, COUNT(*) AS `c`
+SELECT `u`.`Nickname` AS `Key`, COUNT(*) AS `c`
 FROM (
     SELECT `g`.`Nickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`
     FROM `Officers` AS `o`
-) AS `t`
-GROUP BY `t`.`Nickname`
-ORDER BY `t`.`Nickname`
+) AS `u`
+GROUP BY `u`.`Nickname`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -8530,34 +8518,34 @@ public override async Task Group_by_with_include_with_entity_in_result_selector(
 
         AssertSql(
 """
-SELECT `t0`.`Rank`, `t0`.`c`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`, `t1`.`Name`, `t1`.`Location`, `t1`.`Nation`
+SELECT `u1`.`Rank`, `u1`.`c`, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`AssignedCityName`, `s0`.`CityOfBirthName`, `s0`.`FullName`, `s0`.`HasSoulPatch`, `s0`.`LeaderNickname`, `s0`.`LeaderSquadId`, `s0`.`Rank`, `s0`.`Discriminator`, `s0`.`Name`, `s0`.`Location`, `s0`.`Nation`
 FROM (
-    SELECT `t`.`Rank`, COUNT(*) AS `c`
+    SELECT `u`.`Rank`, COUNT(*) AS `c`
     FROM (
         SELECT `g`.`Rank`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Rank`
         FROM `Officers` AS `o`
-    ) AS `t`
-    GROUP BY `t`.`Rank`
-) AS `t0`
+    ) AS `u`
+    GROUP BY `u`.`Rank`
+) AS `u1`
 LEFT JOIN (
-    SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator`, `t2`.`Name`, `t2`.`Location`, `t2`.`Nation`
+    SELECT `s`.`Nickname`, `s`.`SquadId`, `s`.`AssignedCityName`, `s`.`CityOfBirthName`, `s`.`FullName`, `s`.`HasSoulPatch`, `s`.`LeaderNickname`, `s`.`LeaderSquadId`, `s`.`Rank`, `s`.`Discriminator`, `s`.`Name`, `s`.`Location`, `s`.`Nation`
     FROM (
-        SELECT `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`AssignedCityName`, `t3`.`CityOfBirthName`, `t3`.`FullName`, `t3`.`HasSoulPatch`, `t3`.`LeaderNickname`, `t3`.`LeaderSquadId`, `t3`.`Rank`, `t3`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, ROW_NUMBER() OVER(PARTITION BY `t3`.`Rank` ORDER BY `t3`.`Nickname`) AS `row`
+        SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, ROW_NUMBER() OVER(PARTITION BY `u0`.`Rank` ORDER BY `u0`.`Nickname`) AS `row`
         FROM (
             SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
             FROM `Gears` AS `g0`
             UNION ALL
             SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
             FROM `Officers` AS `o0`
-        ) AS `t3`
-        INNER JOIN `Cities` AS `c` ON `t3`.`CityOfBirthName` = `c`.`Name`
-    ) AS `t2`
-    WHERE `t2`.`row` <= 1
-) AS `t1` ON `t0`.`Rank` = `t1`.`Rank`
-ORDER BY `t0`.`Rank`
+        ) AS `u0`
+        INNER JOIN `Cities` AS `c` ON `u0`.`CityOfBirthName` = `c`.`Name`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `u1`.`Rank` = `s0`.`Rank`
+ORDER BY `u1`.`Rank`
 """);
     }
 
@@ -8567,15 +8555,15 @@ public override async Task GroupBy_Property_Include_Select_Max(bool async)
 
         AssertSql(
 """
-SELECT MAX(`t`.`SquadId`)
+SELECT MAX(`u`.`SquadId`)
 FROM (
     SELECT `g`.`SquadId`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`SquadId`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-GROUP BY `t`.`Rank`
+) AS `u`
+GROUP BY `u`.`Rank`
 """);
     }
 
@@ -8585,34 +8573,34 @@ public override async Task Include_with_group_by_and_FirstOrDefault_gets_properl
 
         AssertSql(
 """
-SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`, `t1`.`Name`, `t1`.`Location`, `t1`.`Nation`
+SELECT `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`AssignedCityName`, `s0`.`CityOfBirthName`, `s0`.`FullName`, `s0`.`HasSoulPatch`, `s0`.`LeaderNickname`, `s0`.`LeaderSquadId`, `s0`.`Rank`, `s0`.`Discriminator`, `s0`.`Name`, `s0`.`Location`, `s0`.`Nation`
 FROM (
-    SELECT `t`.`Rank`
+    SELECT `u`.`Rank`
     FROM (
         SELECT `g`.`Rank`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Rank`
         FROM `Officers` AS `o`
-    ) AS `t`
-    GROUP BY `t`.`Rank`
-) AS `t0`
+    ) AS `u`
+    GROUP BY `u`.`Rank`
+) AS `u1`
 LEFT JOIN (
-    SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator`, `t2`.`Name`, `t2`.`Location`, `t2`.`Nation`
+    SELECT `s`.`Nickname`, `s`.`SquadId`, `s`.`AssignedCityName`, `s`.`CityOfBirthName`, `s`.`FullName`, `s`.`HasSoulPatch`, `s`.`LeaderNickname`, `s`.`LeaderSquadId`, `s`.`Rank`, `s`.`Discriminator`, `s`.`Name`, `s`.`Location`, `s`.`Nation`
     FROM (
-        SELECT `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`AssignedCityName`, `t3`.`CityOfBirthName`, `t3`.`FullName`, `t3`.`HasSoulPatch`, `t3`.`LeaderNickname`, `t3`.`LeaderSquadId`, `t3`.`Rank`, `t3`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, ROW_NUMBER() OVER(PARTITION BY `t3`.`Rank` ORDER BY `t3`.`Nickname`, `t3`.`SquadId`, `c`.`Name`) AS `row`
+        SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, ROW_NUMBER() OVER(PARTITION BY `u0`.`Rank` ORDER BY `u0`.`Nickname`, `u0`.`SquadId`, `c`.`Name`) AS `row`
         FROM (
             SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
             FROM `Gears` AS `g0`
             UNION ALL
             SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
             FROM `Officers` AS `o0`
-        ) AS `t3`
-        INNER JOIN `Cities` AS `c` ON `t3`.`CityOfBirthName` = `c`.`Name`
-        WHERE `t3`.`HasSoulPatch` = TRUE
-    ) AS `t2`
-    WHERE `t2`.`row` <= 1
-) AS `t1` ON `t0`.`Rank` = `t1`.`Rank`
+        ) AS `u0`
+        INNER JOIN `Cities` AS `c` ON `u0`.`CityOfBirthName` = `c`.`Name`
+        WHERE `u0`.`HasSoulPatch` = TRUE
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `u1`.`Rank` = `s0`.`Rank`
 """);
     }
 
@@ -8622,13 +8610,13 @@ public override async Task Include_collection_with_Cast_to_base(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -8638,15 +8626,15 @@ public override async Task Include_with_client_method_and_member_access_still_ap
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`GearNickName`, `t0`.`GearSquadId`, `t0`.`IssueDate`, `t0`.`Note`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
 """);
     }
 
@@ -8656,16 +8644,16 @@ public override async Task Include_with_projection_of_unmapped_property_still_ge
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -8674,22 +8662,22 @@ public override async Task Multiple_includes_with_client_method_around_entity_an
         await base.Multiple_includes_with_client_method_around_entity_and_also_projecting_included_collection();
 
         AssertSql(
-$"""
-SELECT `s`.`Name`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+"""
+SELECT `s`.`Name`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s0`.`Nickname`, `s0`.`SquadId`, `s0`.`AssignedCityName`, `s0`.`CityOfBirthName`, `s0`.`FullName`, `s0`.`HasSoulPatch`, `s0`.`LeaderNickname`, `s0`.`LeaderSquadId`, `s0`.`Rank`, `s0`.`Discriminator`, `s0`.`Id`, `s0`.`AmmunitionType`, `s0`.`IsAutomatic`, `s0`.`Name`, `s0`.`OwnerFullName`, `s0`.`SynergyWithId`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+    SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Gear'")} AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'Officer'")} AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t`
-    LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-) AS `t0` ON `s`.`Id` = `t0`.`SquadId`
+    ) AS `u`
+    LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+) AS `s0` ON `s`.`Id` = `s0`.`SquadId`
 WHERE `s`.`Name` = 'Delta'
-ORDER BY `s`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`
+ORDER BY `s`.`Id`, `s0`.`Nickname`, `s0`.`SquadId`
 """);
     }
 
@@ -8700,7 +8688,7 @@ public override async Task OrderBy_same_expression_containing_IsNull_correctly_d
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`t`.`Nickname`) = 5
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`u`.`Nickname`) = 5
     ELSE NULL
 END
 FROM (
@@ -8709,9 +8697,9 @@ ELSE NULL
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 ORDER BY CASE
-    WHEN `t`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`t`.`Nickname`) = 5
+    WHEN `u`.`LeaderNickname` IS NOT NULL THEN CHAR_LENGTH(`u`.`Nickname`) = 5
     ELSE NULL
 END IS NOT NULL
 """);
@@ -8794,18 +8782,18 @@ public override async Task Filter_with_complex_predicate_containing_subquery(boo
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`FullName` <> 'Dom') AND EXISTS (
+) AS `u`
+WHERE (`u`.`FullName` <> 'Dom') AND EXISTS (
     SELECT 1
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`IsAutomatic` = TRUE))
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`IsAutomatic` = TRUE))
 """);
     }
 
@@ -8816,10 +8804,10 @@ public override async Task Query_with_complex_let_containing_ordering_and_filter
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, (
+SELECT `u`.`Nickname`, (
     SELECT `w`.`Name`
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`IsAutomatic` = TRUE)
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`IsAutomatic` = TRUE)
     ORDER BY `w`.`AmmunitionType` DESC
     LIMIT 1) AS `WeaponName`
 FROM (
@@ -8828,8 +8816,8 @@ ORDER BY `w`.`AmmunitionType` DESC
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`Nickname` <> 'Dom'
+) AS `u`
+WHERE `u`.`Nickname` <> 'Dom'
 """);
     }
 
@@ -8848,8 +8836,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-WHERE (SUBSTRING(`t`.`Note`, 0 + 1, `t0`.`SquadId`) = `t`.`GearNickName`) OR ((`t`.`Note` IS NULL OR (`t0`.`SquadId` IS NULL)) AND `t`.`GearNickName` IS NULL)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+WHERE (SUBSTRING(`t`.`Note`, 0 + 1, `u`.`SquadId`) = `t`.`GearNickName`) OR ((`t`.`Note` IS NULL OR (`u`.`SquadId` IS NULL)) AND `t`.`GearNickName` IS NULL)
 """);
     }
 
@@ -8869,8 +8857,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 WHERE (SUBSTRING(`t`.`Note`, 0 + 1, CHAR_LENGTH(`s`.`Name`)) = `t`.`GearNickName`) OR ((`t`.`Note` IS NULL OR (`s`.`Name` IS NULL)) AND `t`.`GearNickName` IS NULL)
 """);
     }
@@ -8900,14 +8888,14 @@ public override async Task OfTypeNav1(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-LEFT JOIN `Tags` AS `t1` ON (`t`.`Nickname` = `t1`.`GearNickName`) AND (`t`.`SquadId` = `t1`.`GearSquadId`)
-WHERE ((`t0`.`Note` <> 'Foo') OR `t0`.`Note` IS NULL) AND ((`t1`.`Note` <> 'Bar') OR `t1`.`Note` IS NULL)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+LEFT JOIN `Tags` AS `t0` ON (`u`.`Nickname` = `t0`.`GearNickName`) AND (`u`.`SquadId` = `t0`.`GearSquadId`)
+WHERE ((`t`.`Note` <> 'Foo') OR `t`.`Note` IS NULL) AND ((`t0`.`Note` <> 'Bar') OR `t0`.`Note` IS NULL)
 """);
     }
 
@@ -8917,14 +8905,14 @@ public override async Task OfTypeNav2(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-LEFT JOIN `Cities` AS `c` ON `t`.`AssignedCityName` = `c`.`Name`
-WHERE ((`t0`.`Note` <> 'Foo') OR `t0`.`Note` IS NULL) AND ((`c`.`Location` <> 'Bar') OR `c`.`Location` IS NULL)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+LEFT JOIN `Cities` AS `c` ON `u`.`AssignedCityName` = `c`.`Name`
+WHERE ((`t`.`Note` <> 'Foo') OR `t`.`Note` IS NULL) AND ((`c`.`Location` <> 'Bar') OR `c`.`Location` IS NULL)
 """);
     }
 
@@ -8934,15 +8922,15 @@ public override async Task OfTypeNav3(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-INNER JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
-LEFT JOIN `Tags` AS `t1` ON (`t`.`Nickname` = `t1`.`GearNickName`) AND (`t`.`SquadId` = `t1`.`GearSquadId`)
-WHERE ((`t0`.`Note` <> 'Foo') OR `t0`.`Note` IS NULL) AND ((`t1`.`Note` <> 'Bar') OR `t1`.`Note` IS NULL)
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+INNER JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+LEFT JOIN `Tags` AS `t0` ON (`u`.`Nickname` = `t0`.`GearNickName`) AND (`u`.`SquadId` = `t0`.`GearSquadId`)
+WHERE ((`t`.`Note` <> 'Foo') OR `t`.`Note` IS NULL) AND ((`t0`.`Note` <> 'Bar') OR `t0`.`Note` IS NULL)
 """);
     }
 
@@ -9008,27 +8996,27 @@ public override async Task Where_contains_on_navigation_with_composite_keys(bool
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE EXISTS (
     SELECT 1
     FROM `Cities` AS `c`
     WHERE EXISTS (
         SELECT 1
         FROM (
-            SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+            SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`CityOfBirthName`
             FROM `Gears` AS `g0`
             UNION ALL
-            SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+            SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`CityOfBirthName`
             FROM `Officers` AS `o0`
-        ) AS `t0`
-        WHERE (`c`.`Name` = `t0`.`CityOfBirthName`) AND ((`t0`.`Nickname` = `t`.`Nickname`) AND (`t0`.`SquadId` = `t`.`SquadId`))))
+        ) AS `u0`
+        WHERE (`c`.`Name` = `u0`.`CityOfBirthName`) AND ((`u0`.`Nickname` = `u`.`Nickname`) AND (`u0`.`SquadId` = `u`.`SquadId`))))
 """);
     }
 
@@ -9038,20 +9026,20 @@ public override async Task Include_with_complex_order_by(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w0` ON `t`.`FullName` = `w0`.`OwnerFullName`
+) AS `u`
+LEFT JOIN `Weapons` AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
 ORDER BY (
     SELECT `w`.`Name`
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Gnasher%')
-    LIMIT 1), `t`.`Nickname`, `t`.`SquadId`
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` LIKE '%Gnasher%')
+    LIMIT 1), `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -9063,26 +9051,26 @@ public override async Task Anonymous_projection_take_followed_by_projecting_sing
 """
 @__p_0='25'
 
-SELECT `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`
+SELECT `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`
 FROM (
-    SELECT `t`.`FullName`
+    SELECT `u`.`FullName`
     FROM (
         SELECT `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
+    ) AS `u`
     LIMIT @__p_0
-) AS `t0`
+) AS `u0`
 LEFT JOIN (
-    SELECT `t2`.`Id`, `t2`.`AmmunitionType`, `t2`.`IsAutomatic`, `t2`.`Name`, `t2`.`OwnerFullName`, `t2`.`SynergyWithId`
+    SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
     FROM (
         SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, ROW_NUMBER() OVER(PARTITION BY `w`.`OwnerFullName` ORDER BY `w`.`Id`) AS `row`
         FROM `Weapons` AS `w`
-    ) AS `t2`
-    WHERE `t2`.`row` <= 1
-) AS `t1` ON `t0`.`FullName` = `t1`.`OwnerFullName`
+    ) AS `w0`
+    WHERE `w0`.`row` <= 1
+) AS `w1` ON `u0`.`FullName` = `w1`.`OwnerFullName`
 """);
     }
 
@@ -9095,15 +9083,15 @@ public override async Task Bool_projection_from_subquery_treated_appropriately_i
 SELECT `c`.`Name`, `c`.`Location`, `c`.`Nation`
 FROM `Cities` AS `c`
 WHERE (
-    SELECT `t`.`HasSoulPatch`
+    SELECT `u`.`HasSoulPatch`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-    ORDER BY `t`.`Nickname`, `t`.`SquadId`
+    ) AS `u`
+    ORDER BY `u`.`Nickname`, `u`.`SquadId`
     LIMIT 1)
 """);
     }
@@ -9189,21 +9177,21 @@ public override async Task Left_join_projection_using_coalesce_tracking(bool asy
 
         AssertSql(
 """
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
 """);
     }
 
@@ -9213,21 +9201,21 @@ public override async Task Left_join_projection_using_conditional_tracking(bool
 
         AssertSql(
 """
-SELECT `t0`.`Nickname` IS NULL OR (`t0`.`SquadId` IS NULL), `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u0`.`Nickname` IS NULL OR (`u0`.`SquadId` IS NULL), `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`LeaderNickname` = `t0`.`Nickname`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
 """);
     }
 
@@ -9237,7 +9225,7 @@ public override async Task Project_collection_navigation_nested_with_take_compos
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u2`.`Nickname`, `u2`.`SquadId`, `u2`.`AssignedCityName`, `u2`.`CityOfBirthName`, `u2`.`FullName`, `u2`.`HasSoulPatch`, `u2`.`LeaderNickname`, `u2`.`LeaderSquadId`, `u2`.`Rank`, `u2`.`Discriminator`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, 'Gear' AS `Discriminator`
@@ -9245,23 +9233,23 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 LEFT JOIN (
-    SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator`
+    SELECT `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
     FROM (
-        SELECT `t3`.`Nickname`, `t3`.`SquadId`, `t3`.`AssignedCityName`, `t3`.`CityOfBirthName`, `t3`.`FullName`, `t3`.`HasSoulPatch`, `t3`.`LeaderNickname`, `t3`.`LeaderSquadId`, `t3`.`Rank`, `t3`.`Discriminator`, ROW_NUMBER() OVER(PARTITION BY `t3`.`LeaderNickname`, `t3`.`LeaderSquadId` ORDER BY `t3`.`Nickname`, `t3`.`SquadId`) AS `row`
+        SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, ROW_NUMBER() OVER(PARTITION BY `u0`.`LeaderNickname`, `u0`.`LeaderSquadId` ORDER BY `u0`.`Nickname`, `u0`.`SquadId`) AS `row`
         FROM (
             SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
             FROM `Gears` AS `g0`
             UNION ALL
             SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
             FROM `Officers` AS `o0`
-        ) AS `t3`
-    ) AS `t2`
-    WHERE `t2`.`row` <= 50
-) AS `t1` ON ((`t0`.`Nickname` = `t1`.`LeaderNickname`) OR (`t0`.`Nickname` IS NULL AND (`t1`.`LeaderNickname` IS NULL))) AND (`t0`.`SquadId` = `t1`.`LeaderSquadId`)
-WHERE `t0`.`Discriminator` = 'Officer'
-ORDER BY `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Nickname`
+        ) AS `u0`
+    ) AS `u1`
+    WHERE `u1`.`row` <= 50
+) AS `u2` ON ((`u`.`Nickname` = `u2`.`LeaderNickname`) OR (`u`.`Nickname` IS NULL AND (`u2`.`LeaderNickname` IS NULL))) AND (`u`.`SquadId` = `u2`.`LeaderSquadId`)
+WHERE `u`.`Discriminator` = 'Officer'
+ORDER BY `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u2`.`Nickname`
 """);
     }
 
@@ -9271,7 +9259,7 @@ public override async Task Project_collection_navigation_nested_composite_key(bo
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, 'Gear' AS `Discriminator`
@@ -9279,16 +9267,16 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t1` ON ((`t0`.`Nickname` = `t1`.`LeaderNickname`) OR (`t0`.`Nickname` IS NULL AND (`t1`.`LeaderNickname` IS NULL))) AND (`t0`.`SquadId` = `t1`.`LeaderSquadId`)
-WHERE `t0`.`Discriminator` = 'Officer'
-ORDER BY `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Nickname`
+) AS `u0` ON ((`u`.`Nickname` = `u0`.`LeaderNickname`) OR (`u`.`Nickname` IS NULL AND (`u0`.`LeaderNickname` IS NULL))) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+WHERE `u`.`Discriminator` = 'Officer'
+ORDER BY `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -9298,7 +9286,7 @@ public override async Task Null_checks_in_correlated_predicate_are_correctly_tra
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -9306,8 +9294,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON ((`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)) AND `t`.`Note` IS NOT NULL
-ORDER BY `t`.`Id`, `t0`.`Nickname`
+) AS `u` ON ((`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)) AND `t`.`Note` IS NOT NULL
+ORDER BY `t`.`Id`, `u`.`Nickname`
 """);
     }
 
@@ -9319,19 +9307,19 @@ public override async Task SelectMany_Where_DefaultIfEmpty_with_navigation_in_th
 """
 @__isAutomatic_0='True'
 
-SELECT `t`.`Nickname`, `t`.`FullName`, `t0`.`Id` IS NOT NULL AS `Collection`
+SELECT `u`.`Nickname`, `u`.`FullName`, `w0`.`Id` IS NOT NULL AS `Collection`
 FROM (
     SELECT `g`.`Nickname`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     WHERE `w`.`IsAutomatic` = @__isAutomatic_0
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
 """);
     }
 
@@ -9341,21 +9329,21 @@ public override async Task Join_with_inner_being_a_subquery_projecting_single_pr
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN (
-    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT `g0`.`Nickname`
     FROM `Gears` AS `g0`
     UNION ALL
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT `o0`.`Nickname`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`Nickname` = `t0`.`Nickname`
+) AS `u0` ON `u`.`Nickname` = `u0`.`Nickname`
 """);
     }
 
@@ -9365,21 +9353,21 @@ public override async Task Join_with_inner_being_a_subquery_projecting_anonymous
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 INNER JOIN (
-    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT `g0`.`Nickname`
     FROM `Gears` AS `g0`
     UNION ALL
-    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT `o0`.`Nickname`
     FROM `Officers` AS `o0`
-) AS `t0` ON `t`.`Nickname` = `t0`.`Nickname`
+) AS `u0` ON `u`.`Nickname` = `u0`.`Nickname`
 """);
     }
 
@@ -9427,13 +9415,13 @@ public override async Task Navigation_based_on_complex_expression4(bool async)
 
         AssertSql(
 """
-SELECT TRUE, `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT TRUE, `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM `LocustHordes` AS `l`
 CROSS JOIN (
-    SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
-    FROM `LocustCommanders` AS `l1`
-) AS `t`
-LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
+    SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
+LEFT JOIN `LocustCommanders` AS `l1` ON `l`.`CommanderName` = `l1`.`Name`
 """);
     }
 
@@ -9443,13 +9431,13 @@ public override async Task Navigation_based_on_complex_expression5(bool async)
 
         AssertSql(
 """
-SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM `LocustHordes` AS `l`
 CROSS JOIN (
-    SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
-    FROM `LocustCommanders` AS `l1`
-) AS `t`
-LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
+    SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
+LEFT JOIN `LocustCommanders` AS `l1` ON `l`.`CommanderName` = `l1`.`Name`
 """);
     }
 
@@ -9459,13 +9447,13 @@ public override async Task Navigation_based_on_complex_expression6(bool async)
 
         AssertSql(
 """
-SELECT (`l0`.`Name` = 'Queen Myrrah') AND `l0`.`Name` IS NOT NULL, `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT (`l1`.`Name` = 'Queen Myrrah') AND `l1`.`Name` IS NOT NULL, `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM `LocustHordes` AS `l`
 CROSS JOIN (
-    SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, `l1`.`DefeatedByNickname`, `l1`.`DefeatedBySquadId`, `l1`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
-    FROM `LocustCommanders` AS `l1`
-) AS `t`
-LEFT JOIN `LocustCommanders` AS `l0` ON `l`.`CommanderName` = `l0`.`Name`
+    SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
+LEFT JOIN `LocustCommanders` AS `l1` ON `l`.`CommanderName` = `l1`.`Name`
 """);
     }
 
@@ -9500,16 +9488,16 @@ public override async Task OfType_in_subquery_works(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Name`, `t0`.`Location`, `t0`.`Nation`
+SELECT `s`.`Name`, `s`.`Location`, `s`.`Nation`
 FROM `Officers` AS `o`
 INNER JOIN (
-    SELECT `c`.`Name`, `c`.`Location`, `c`.`Nation`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`
+    SELECT `c`.`Name`, `c`.`Location`, `c`.`Nation`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`
     FROM (
         SELECT `o0`.`AssignedCityName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t`
-    LEFT JOIN `Cities` AS `c` ON `t`.`AssignedCityName` = `c`.`Name`
-) AS `t0` ON (`o`.`Nickname` = `t0`.`LeaderNickname`) AND (`o`.`SquadId` = `t0`.`LeaderSquadId`)
+    ) AS `u`
+    LEFT JOIN `Cities` AS `c` ON `u`.`AssignedCityName` = `c`.`Name`
+) AS `s` ON (`o`.`Nickname` = `s`.`LeaderNickname`) AND (`o`.`SquadId` = `s`.`LeaderSquadId`)
 """);
     }
 
@@ -9530,20 +9518,20 @@ public override async Task Accessing_reference_navigation_collection_composition
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`Id0`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s`.`IsAutomatic`, `s`.`Name`, `s`.`Id0`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`IsAutomatic`, `w0`.`Name`, `w0`.`Id` AS `Id0`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     LEFT JOIN `Weapons` AS `w0` ON `w`.`SynergyWithId` = `w0`.`Id`
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`
+) AS `s` ON `u`.`FullName` = `s`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`
 """);
     }
 
@@ -9553,7 +9541,7 @@ public override async Task Reference_include_chain_loads_correctly_when_middle_i
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
+SELECT `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
@@ -9561,8 +9549,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 ORDER BY `t`.`Note`
 """);
     }
@@ -9573,7 +9561,7 @@ public override async Task Accessing_property_of_optional_navigation_in_child_pr
 
         AssertSql(
 """
-SELECT `t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL), `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Nickname`, `t1`.`Id`, `t1`.`SquadId`
+SELECT `u`.`Nickname` IS NOT NULL AND (`u`.`SquadId` IS NOT NULL), `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `s`.`Nickname`, `s`.`Id`, `s`.`SquadId`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
@@ -9581,9 +9569,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 LEFT JOIN (
-    SELECT `t2`.`Nickname`, `w`.`Id`, `t2`.`SquadId`, `w`.`OwnerFullName`
+    SELECT `u0`.`Nickname`, `w`.`Id`, `u0`.`SquadId`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     LEFT JOIN (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`FullName`
@@ -9591,9 +9579,9 @@ LEFT JOIN (
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t2` ON `w`.`OwnerFullName` = `t2`.`FullName`
-) AS `t1` ON `t0`.`FullName` = `t1`.`OwnerFullName`
-ORDER BY `t`.`Note`, `t`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t1`.`Id`, `t1`.`Nickname`
+    ) AS `u0` ON `w`.`OwnerFullName` = `u0`.`FullName`
+) AS `s` ON `u`.`FullName` = `s`.`OwnerFullName`
+ORDER BY `t`.`Note`, `t`.`Id`, `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s`.`Nickname`
 """);
     }
 
@@ -9608,10 +9596,10 @@ public override async Task Collection_navigation_ofType_filter_works(bool async)
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`CityOfBirthName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`c`.`Name` = `t`.`CityOfBirthName`) AND (`t`.`Nickname` = 'Marcus'))
+    ) AS `u`
+    WHERE (`c`.`Name` = `u`.`CityOfBirthName`) AND (`u`.`Nickname` = 'Marcus'))
 """);
     }
 
@@ -9623,19 +9611,19 @@ public override async Task Query_reusing_parameter_doesnt_declare_duplicate_para
 """
 @__prm_Inner_Nickname_0='Marcus' (Size = 255)
 
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
-    SELECT DISTINCT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+    SELECT DISTINCT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`t`.`Nickname` <> @__prm_Inner_Nickname_0) AND (`t`.`Nickname` <> @__prm_Inner_Nickname_0)
-) AS `t0`
-ORDER BY `t0`.`FullName`
+    ) AS `u`
+    WHERE (`u`.`Nickname` <> @__prm_Inner_Nickname_0) AND (`u`.`Nickname` <> @__prm_Inner_Nickname_0)
+) AS `u0`
+ORDER BY `u0`.`FullName`
 """);
     }
 
@@ -9647,39 +9635,39 @@ public override async Task Query_reusing_parameter_with_inner_query_doesnt_decla
 """
 @__squadId_0='1'
 
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u1`.`Nickname`, `u1`.`SquadId`, `u1`.`AssignedCityName`, `u1`.`CityOfBirthName`, `u1`.`FullName`, `u1`.`HasSoulPatch`, `u1`.`LeaderNickname`, `u1`.`LeaderSquadId`, `u1`.`Rank`, `u1`.`Discriminator`
 FROM (
-    SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+    SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t`
-    INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+    ) AS `u`
+    INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
     WHERE `s`.`Id` IN (
         SELECT `s0`.`Id`
         FROM `Squads` AS `s0`
         WHERE `s0`.`Id` = @__squadId_0
     )
     UNION ALL
-    SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
         SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g0`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    INNER JOIN `Squads` AS `s1` ON `t1`.`SquadId` = `s1`.`Id`
+    ) AS `u0`
+    INNER JOIN `Squads` AS `s1` ON `u0`.`SquadId` = `s1`.`Id`
     WHERE `s1`.`Id` IN (
         SELECT `s2`.`Id`
         FROM `Squads` AS `s2`
         WHERE `s2`.`Id` = @__squadId_0
     )
-) AS `t0`
-ORDER BY `t0`.`FullName`
+) AS `u1`
+ORDER BY `u1`.`FullName`
 """);
     }
 
@@ -9696,13 +9684,13 @@ public override async Task Query_reusing_parameter_with_inner_query_expression_d
 WHERE EXISTS (
     SELECT 1
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE ((`s`.`Id` = `t`.`SquadId`) AND (`t`.`SquadId` = @__gearId_0)) AND (`t`.`SquadId` = @__gearId_0))
+    ) AS `u`
+    WHERE ((`s`.`Id` = `u`.`SquadId`) AND (`u`.`SquadId` = @__gearId_0)) AND (`u`.`SquadId` = @__gearId_0))
 """);
     }
 
@@ -9714,22 +9702,22 @@ public override async Task Query_reusing_parameter_doesnt_declare_duplicate_para
 """
 @__entity_equality_prm_Inner_Squad_0_Id='1' (Nullable = true)
 
-SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `s1`.`Nickname`, `s1`.`SquadId`, `s1`.`AssignedCityName`, `s1`.`CityOfBirthName`, `s1`.`FullName`, `s1`.`HasSoulPatch`, `s1`.`LeaderNickname`, `s1`.`LeaderSquadId`, `s1`.`Rank`, `s1`.`Discriminator`
 FROM (
-    SELECT DISTINCT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+    SELECT DISTINCT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t`
-    INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+    ) AS `u`
+    INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
     WHERE `s`.`Id` = @__entity_equality_prm_Inner_Squad_0_Id
-) AS `t0`
-INNER JOIN `Squads` AS `s0` ON `t0`.`SquadId` = `s0`.`Id`
+) AS `s1`
+INNER JOIN `Squads` AS `s0` ON `s1`.`SquadId` = `s0`.`Id`
 WHERE `s0`.`Id` = @__entity_equality_prm_Inner_Squad_0_Id
-ORDER BY `t0`.`FullName`
+ORDER BY `s1`.`FullName`
 """);
     }
 
@@ -9739,35 +9727,35 @@ public override async Task Complex_GroupBy_after_set_operator(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Name`, `t0`.`Count`, COALESCE(SUM(`t0`.`Count`), 0) AS `Sum`
+SELECT `u1`.`Name`, `u1`.`Count`, COALESCE(SUM(`u1`.`Count`), 0) AS `Sum`
 FROM (
     SELECT `c`.`Name`, (
         SELECT COUNT(*)
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`) AS `Count`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`) AS `Count`
     FROM (
         SELECT `g`.`AssignedCityName`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`AssignedCityName`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    LEFT JOIN `Cities` AS `c` ON `t`.`AssignedCityName` = `c`.`Name`
+    ) AS `u`
+    LEFT JOIN `Cities` AS `c` ON `u`.`AssignedCityName` = `c`.`Name`
     UNION ALL
     SELECT `c0`.`Name`, (
         SELECT COUNT(*)
         FROM `Weapons` AS `w0`
-        WHERE `t1`.`FullName` = `w0`.`OwnerFullName`) AS `Count`
+        WHERE `u0`.`FullName` = `w0`.`OwnerFullName`) AS `Count`
     FROM (
         SELECT `g0`.`CityOfBirthName`, `g0`.`FullName`
         FROM `Gears` AS `g0`
         UNION ALL
         SELECT `o0`.`CityOfBirthName`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    INNER JOIN `Cities` AS `c0` ON `t1`.`CityOfBirthName` = `c0`.`Name`
-) AS `t0`
-GROUP BY `t0`.`Name`, `t0`.`Count`
+    ) AS `u0`
+    INNER JOIN `Cities` AS `c0` ON `u0`.`CityOfBirthName` = `c0`.`Name`
+) AS `u1`
+GROUP BY `u1`.`Name`, `u1`.`Count`
 """);
     }
 
@@ -9777,35 +9765,35 @@ public override async Task Complex_GroupBy_after_set_operator_using_result_selec
 
         AssertSql(
 """
-SELECT `t0`.`Name`, `t0`.`Count`, COALESCE(SUM(`t0`.`Count`), 0) AS `Sum`
+SELECT `u1`.`Name`, `u1`.`Count`, COALESCE(SUM(`u1`.`Count`), 0) AS `Sum`
 FROM (
     SELECT `c`.`Name`, (
         SELECT COUNT(*)
         FROM `Weapons` AS `w`
-        WHERE `t`.`FullName` = `w`.`OwnerFullName`) AS `Count`
+        WHERE `u`.`FullName` = `w`.`OwnerFullName`) AS `Count`
     FROM (
         SELECT `g`.`AssignedCityName`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`AssignedCityName`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    LEFT JOIN `Cities` AS `c` ON `t`.`AssignedCityName` = `c`.`Name`
+    ) AS `u`
+    LEFT JOIN `Cities` AS `c` ON `u`.`AssignedCityName` = `c`.`Name`
     UNION ALL
     SELECT `c0`.`Name`, (
         SELECT COUNT(*)
         FROM `Weapons` AS `w0`
-        WHERE `t1`.`FullName` = `w0`.`OwnerFullName`) AS `Count`
+        WHERE `u0`.`FullName` = `w0`.`OwnerFullName`) AS `Count`
     FROM (
         SELECT `g0`.`CityOfBirthName`, `g0`.`FullName`
         FROM `Gears` AS `g0`
         UNION ALL
         SELECT `o0`.`CityOfBirthName`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    INNER JOIN `Cities` AS `c0` ON `t1`.`CityOfBirthName` = `c0`.`Name`
-) AS `t0`
-GROUP BY `t0`.`Name`, `t0`.`Count`
+    ) AS `u0`
+    INNER JOIN `Cities` AS `c0` ON `u0`.`CityOfBirthName` = `c0`.`Name`
+) AS `u1`
+GROUP BY `u1`.`Name`, `u1`.`Count`
 """);
     }
 
@@ -9815,17 +9803,17 @@ public override async Task Left_join_with_GroupBy_with_composite_group_key(bool
 
         AssertSql(
 """
-SELECT `t`.`CityOfBirthName`, `t`.`HasSoulPatch`
+SELECT `u`.`CityOfBirthName`, `u`.`HasSoulPatch`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`CityOfBirthName`, `g`.`HasSoulPatch`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`CityOfBirthName`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
-LEFT JOIN `Tags` AS `t0` ON `t`.`Nickname` = `t0`.`GearNickName`
-GROUP BY `t`.`CityOfBirthName`, `t`.`HasSoulPatch`
+) AS `u`
+INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
+LEFT JOIN `Tags` AS `t` ON `u`.`Nickname` = `t`.`GearNickName`
+GROUP BY `u`.`CityOfBirthName`, `u`.`HasSoulPatch`
 """);
     }
 
@@ -9835,18 +9823,18 @@ public override async Task GroupBy_with_boolean_grouping_key(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`CityOfBirthName`, `t0`.`HasSoulPatch`, `t0`.`IsMarcus`, COUNT(*) AS `Count`
+SELECT `u0`.`CityOfBirthName`, `u0`.`HasSoulPatch`, `u0`.`IsMarcus`, COUNT(*) AS `Count`
 FROM (
-    SELECT `t`.`CityOfBirthName`, `t`.`HasSoulPatch`, `t`.`Nickname` = 'Marcus' AS `IsMarcus`
+    SELECT `u`.`CityOfBirthName`, `u`.`HasSoulPatch`, `u`.`Nickname` = 'Marcus' AS `IsMarcus`
     FROM (
         SELECT `g`.`Nickname`, `g`.`CityOfBirthName`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`CityOfBirthName`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-) AS `t0`
-GROUP BY `t0`.`CityOfBirthName`, `t0`.`HasSoulPatch`, `t0`.`IsMarcus`
+    ) AS `u`
+) AS `u0`
+GROUP BY `u0`.`CityOfBirthName`, `u0`.`HasSoulPatch`, `u0`.`IsMarcus`
 """);
     }
 
@@ -9856,7 +9844,7 @@ public override async Task GroupBy_with_boolean_groupin_key_thru_navigation_acce
 
         AssertSql(
 """
-SELECT `t0`.`HasSoulPatch`, LOWER(`s`.`Name`) AS `Name`
+SELECT `u`.`HasSoulPatch`, LOWER(`s`.`Name`) AS `Name`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
@@ -9864,9 +9852,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
-LEFT JOIN `Squads` AS `s` ON `t0`.`SquadId` = `s`.`Id`
-GROUP BY `t0`.`HasSoulPatch`, `s`.`Name`
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
+LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
+GROUP BY `u`.`HasSoulPatch`, `s`.`Name`
 """);
     }
 
@@ -9883,8 +9871,8 @@ public override async Task Group_by_over_projection_with_multiple_properties_acc
     UNION ALL
     SELECT `o`.`CityOfBirthName`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 GROUP BY `c`.`Name`
 """);
     }
@@ -9895,7 +9883,7 @@ public override async Task Group_by_on_StartsWith_with_null_parameter_as_argumen
 
         AssertSql(
 """
-SELECT `t0`.`Key`
+SELECT `u0`.`Key`
 FROM (
     SELECT FALSE AS `Key`
     FROM (
@@ -9904,9 +9892,9 @@ SELECT FALSE AS `Key`
         UNION ALL
         SELECT `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-) AS `t0`
-GROUP BY `t0`.`Key`
+    ) AS `u`
+) AS `u0`
+GROUP BY `u0`.`Key`
 """);
     }
 
@@ -9916,15 +9904,15 @@ public override async Task Group_by_with_having_StartsWith_with_null_parameter_a
 
         AssertSql(
 """
-SELECT `t`.`FullName`
+SELECT `u`.`FullName`
 FROM (
     SELECT `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-GROUP BY `t`.`FullName`
+) AS `u`
+GROUP BY `u`.`FullName`
 HAVING FALSE
 """);
     }
@@ -9942,7 +9930,7 @@ SELECT FALSE
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -9956,12 +9944,12 @@ public override async Task Select_null_parameter_is_not_null(bool async)
 
 SELECT @__p_0
 FROM (
-    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    SELECT 1
     FROM `Gears` AS `g`
     UNION ALL
-    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    SELECT 1
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -9973,14 +9961,14 @@ public override async Task Where_null_parameter_is_not_null(bool async)
 """
 @__p_0='False'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE @__p_0
 """);
     }
@@ -9991,15 +9979,15 @@ public override async Task OrderBy_StartsWith_with_null_parameter_as_argument(bo
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`Nickname`
+) AS `u`
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -10030,16 +10018,16 @@ FROM JSON_TABLE('[]', '$[*]' COLUMNS (
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
         }
     }
@@ -10052,51 +10040,51 @@ public override async Task Where_with_enum_flags_parameter(bool async)
 """
 @__rank_0='1' (Nullable = true)
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & @__rank_0) = @__rank_0
+) AS `u`
+WHERE (`u`.`Rank` & @__rank_0) = @__rank_0
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """,
                 //
                 """
 @__rank_0='2' (Nullable = true)
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` | @__rank_0) <> @__rank_0
+) AS `u`
+WHERE (`u`.`Rank` | @__rank_0) <> @__rank_0
 """,
                 //
                 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE FALSE
 """);
     }
@@ -10107,37 +10095,37 @@ public override async Task FirstOrDefault_navigation_access_entity_equality_in_w
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Cities` AS `c` ON `t`.`AssignedCityName` = `c`.`Name`
+) AS `u`
+LEFT JOIN `Cities` AS `c` ON `u`.`AssignedCityName` = `c`.`Name`
 WHERE (`c`.`Name` = (
     SELECT `c0`.`Name`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`CityOfBirthName`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`CityOfBirthName`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    INNER JOIN `Cities` AS `c0` ON `t0`.`CityOfBirthName` = `c0`.`Name`
-    ORDER BY `t0`.`Nickname`
+    ) AS `u0`
+    INNER JOIN `Cities` AS `c0` ON `u0`.`CityOfBirthName` = `c0`.`Name`
+    ORDER BY `u0`.`Nickname`
     LIMIT 1)) OR (`c`.`Name` IS NULL AND ((
     SELECT `c0`.`Name`
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g0`.`Nickname`, `g0`.`CityOfBirthName`
         FROM `Gears` AS `g0`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o0`.`Nickname`, `o0`.`CityOfBirthName`
         FROM `Officers` AS `o0`
-    ) AS `t0`
-    INNER JOIN `Cities` AS `c0` ON `t0`.`CityOfBirthName` = `c0`.`Name`
-    ORDER BY `t0`.`Nickname`
+    ) AS `u0`
+    INNER JOIN `Cities` AS `c0` ON `u0`.`CityOfBirthName` = `c0`.`Name`
+    ORDER BY `u0`.`Nickname`
     LIMIT 1) IS NULL))
 """);
     }
@@ -10150,41 +10138,41 @@ public override async Task Bitwise_operation_with_non_null_parameter_optimizes_n
 """
 @__ranks_0='134'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`Rank` & @__ranks_0) <> 0
+) AS `u`
+WHERE (`u`.`Rank` & @__ranks_0) <> 0
 """,
                 //
                 """
 @__ranks_0='134'
 
-SELECT (`t`.`Rank` | @__ranks_0) = @__ranks_0
+SELECT (`u`.`Rank` | @__ranks_0) = @__ranks_0
 FROM (
     SELECT `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """,
                 //
                 """
 @__ranks_0='134'
 
-SELECT (`t`.`Rank` | (`t`.`Rank` | (@__ranks_0 | (`t`.`Rank` | @__ranks_0)))) = @__ranks_0
+SELECT (`u`.`Rank` | (`u`.`Rank` | (@__ranks_0 | (`u`.`Rank` | @__ranks_0)))) = @__ranks_0
 FROM (
     SELECT `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -10241,29 +10229,29 @@ public override async Task Logical_operation_with_non_null_parameter_optimizes_n
 """
 @__prm_0='True'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` <> @__prm_0
+) AS `u`
+WHERE `u`.`HasSoulPatch` <> @__prm_0
 """,
                 //
                 """
 @__prm_0='False'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE `t`.`HasSoulPatch` <> @__prm_0
+) AS `u`
+WHERE `u`.`HasSoulPatch` <> @__prm_0
 """);
     }
 
@@ -10285,22 +10273,22 @@ public override async Task Join_inner_source_custom_projection_followed_by_filte
         AssertSql(
 """
 SELECT CASE
-    WHEN `l`.`Name` = 'Locust' THEN TRUE
+    WHEN `l1`.`Name` = 'Locust' THEN TRUE
     ELSE NULL
-END AS `IsEradicated`, `l`.`CommanderName`, `l`.`Name`
+END AS `IsEradicated`, `l1`.`CommanderName`, `l1`.`Name`
 FROM (
-    SELECT `l0`.`Name`
-    FROM `LocustLeaders` AS `l0`
+    SELECT `l`.`Name`
+    FROM `LocustLeaders` AS `l`
     UNION ALL
-    SELECT `l1`.`Name`
-    FROM `LocustCommanders` AS `l1`
-) AS `t`
-INNER JOIN `LocustHordes` AS `l` ON `t`.`Name` = `l`.`CommanderName`
+    SELECT `l0`.`Name`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
+INNER JOIN `LocustHordes` AS `l1` ON `u`.`Name` = `l1`.`CommanderName`
 WHERE (CASE
-    WHEN `l`.`Name` = 'Locust' THEN TRUE
+    WHEN `l1`.`Name` = 'Locust' THEN TRUE
     ELSE NULL
 END <> TRUE) OR (CASE
-    WHEN `l`.`Name` = 'Locust' THEN TRUE
+    WHEN `l1`.`Name` = 'Locust' THEN TRUE
     ELSE NULL
 END IS NULL)
 """);
@@ -10392,16 +10380,16 @@ public override async Task Conditional_expression_with_test_being_simplified_to_
 """
 @__prm_0='True'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE CASE
-    WHEN `t`.`HasSoulPatch` = @__prm_0 THEN TRUE
+    WHEN `u`.`HasSoulPatch` = @__prm_0 THEN TRUE
     ELSE FALSE
 END
 """);
@@ -10416,23 +10404,23 @@ public override async Task Conditional_expression_with_test_being_simplified_to_
 @__prm_0='True'
 @__prm2_1='Marcus' Lancer' (Size = 4000)
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE CASE
-    WHEN `t`.`HasSoulPatch` = @__prm_0 THEN ((
+    WHEN `u`.`HasSoulPatch` = @__prm_0 THEN ((
         SELECT `w`.`Name`
         FROM `Weapons` AS `w`
-        WHERE `w`.`Id` = `t`.`SquadId`
+        WHERE `w`.`Id` = `u`.`SquadId`
         LIMIT 1) = @__prm2_1) AND (
         SELECT `w`.`Name`
         FROM `Weapons` AS `w`
-        WHERE `w`.`Id` = `t`.`SquadId`
+        WHERE `w`.`Id` = `u`.`SquadId`
         LIMIT 1) IS NOT NULL
     ELSE FALSE
 END
@@ -10472,14 +10460,14 @@ public override async Task Conditional_with_conditions_evaluating_to_false_gets_
 
         AssertSql(
 """
-SELECT `t`.`FullName`
+SELECT `u`.`FullName`
 FROM (
     SELECT `g`.`Nickname`, `g`.`CityOfBirthName`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`CityOfBirthName`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -10489,14 +10477,14 @@ public override async Task Conditional_with_conditions_evaluating_to_true_gets_o
 
         AssertSql(
 """
-SELECT `t`.`CityOfBirthName`
+SELECT `u`.`CityOfBirthName`
 FROM (
     SELECT `g`.`Nickname`, `g`.`CityOfBirthName`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`CityOfBirthName`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -10513,7 +10501,7 @@ SELECT FALSE
     UNION ALL
     SELECT `o`.`Nickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -10537,12 +10525,12 @@ public override async Task Group_by_nullable_property_HasValue_and_project_the_g
 
         AssertSql(
 """
-SELECT `t`.`Key`
+SELECT `w0`.`Key`
 FROM (
     SELECT `w`.`SynergyWithId` IS NOT NULL AS `Key`
     FROM `Weapons` AS `w`
-) AS `t`
-GROUP BY `t`.`Key`
+) AS `w0`
+GROUP BY `w0`.`Key`
 """);
     }
 
@@ -10564,15 +10552,15 @@ public override async Task Checked_context_with_cast_does_not_fail(bool isAsync)
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
-WHERE CAST(`t`.`ThreatLevel` AS unsigned) >= 5
+) AS `u`
+WHERE CAST(`u`.`ThreatLevel` AS unsigned) >= 5
 """);
     }
 
@@ -10582,15 +10570,15 @@ public override async Task Checked_context_with_addition_does_not_fail(bool isAs
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
-WHERE CAST(`t`.`ThreatLevel` AS signed) <= (5 + CAST(`t`.`ThreatLevel` AS signed))
+) AS `u`
+WHERE CAST(`u`.`ThreatLevel` AS signed) <= (5 + CAST(`u`.`ThreatLevel` AS signed))
 """);
     }
 
@@ -10692,15 +10680,15 @@ public override async Task Contains_on_collection_of_byte_subquery(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
-WHERE `t`.`ThreatLevelByte` IN (
+) AS `u`
+WHERE `u`.`ThreatLevelByte` IN (
     SELECT `l1`.`ThreatLevelByte`
     FROM `LocustLeaders` AS `l1`
     UNION ALL
@@ -10716,14 +10704,14 @@ public override async Task Contains_on_collection_of_nullable_byte_subquery(bool
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 WHERE EXISTS (
     SELECT 1
     FROM (
@@ -10732,8 +10720,8 @@ SELECT 1
         UNION ALL
         SELECT `l2`.`ThreatLevelNullableByte`
         FROM `LocustCommanders` AS `l2`
-    ) AS `t0`
-    WHERE (`t0`.`ThreatLevelNullableByte` = `t`.`ThreatLevelNullableByte`) OR (`t0`.`ThreatLevelNullableByte` IS NULL AND (`t`.`ThreatLevelNullableByte` IS NULL)))
+    ) AS `u0`
+    WHERE (`u0`.`ThreatLevelNullableByte` = `u`.`ThreatLevelNullableByte`) OR (`u0`.`ThreatLevelNullableByte` IS NULL AND (`u`.`ThreatLevelNullableByte` IS NULL)))
 """);
     }
 
@@ -10743,14 +10731,14 @@ public override async Task Contains_on_collection_of_nullable_byte_subquery_null
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 WHERE EXISTS (
     SELECT 1
     FROM (
@@ -10759,8 +10747,8 @@ SELECT 1
         UNION ALL
         SELECT `l2`.`ThreatLevelNullableByte`
         FROM `LocustCommanders` AS `l2`
-    ) AS `t0`
-    WHERE `t0`.`ThreatLevelNullableByte` IS NULL)
+    ) AS `u0`
+    WHERE `u0`.`ThreatLevelNullableByte` IS NULL)
 """);
     }
 
@@ -10770,14 +10758,14 @@ public override async Task Contains_on_collection_of_nullable_byte_subquery_null
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 WHERE EXISTS (
     SELECT 1
     FROM (
@@ -10786,8 +10774,8 @@ SELECT 1
         UNION ALL
         SELECT `l2`.`ThreatLevelNullableByte`
         FROM `LocustCommanders` AS `l2`
-    ) AS `t0`
-    WHERE `t0`.`ThreatLevelNullableByte` IS NULL)
+    ) AS `u0`
+    WHERE `u0`.`ThreatLevelNullableByte` IS NULL)
 """);
     }
 
@@ -10797,7 +10785,7 @@ public override async Task Contains_on_byte_array_property_using_byte_column(boo
 
         AssertSql(
 """
-SELECT `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM `Squads` AS `s`
 CROSS JOIN (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
@@ -10805,8 +10793,8 @@ CROSS JOIN (
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
-WHERE LOCATE(UNHEX(HEX(`t`.`ThreatLevelByte`)), `s`.`Banner`) > 0
+) AS `u`
+WHERE LOCATE(UNHEX(HEX(`u`.`ThreatLevelByte`)), `s`.`Banner`) > 0
 """);
     }
 
@@ -10817,31 +10805,31 @@ public override async Task Subquery_projecting_non_nullable_scalar_contains_non_
 
         AssertSql(
 """
-SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `u2`.`Nickname`, `u2`.`SquadId`, `u2`.`AssignedCityName`, `u2`.`CityOfBirthName`, `u2`.`FullName`, `u2`.`HasSoulPatch`, `u2`.`LeaderNickname`, `u2`.`LeaderSquadId`, `u2`.`Rank`, `u2`.`Discriminator`
 FROM (
     SELECT `l`.`ThreatLevelByte`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`ThreatLevelByte`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 JOIN LATERAL (
-    SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t0`
-    WHERE `t`.`ThreatLevelByte` IN (
+    ) AS `u0`
+    WHERE `u`.`ThreatLevelByte` IN (
         SELECT `l1`.`ThreatLevelByte`
         FROM `LocustLeaders` AS `l1`
         UNION ALL
         SELECT `l2`.`ThreatLevelByte`
         FROM `LocustCommanders` AS `l2`
     )
-) AS `t1` ON TRUE
+) AS `u2` ON TRUE
 """);
     }
 
@@ -10852,31 +10840,31 @@ public override async Task Subquery_projecting_non_nullable_scalar_contains_non_
 
         AssertSql(
 """
-SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `u2`.`Nickname`, `u2`.`SquadId`, `u2`.`AssignedCityName`, `u2`.`CityOfBirthName`, `u2`.`FullName`, `u2`.`HasSoulPatch`, `u2`.`LeaderNickname`, `u2`.`LeaderSquadId`, `u2`.`Rank`, `u2`.`Discriminator`
 FROM (
     SELECT `l`.`ThreatLevelByte`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`ThreatLevelByte`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 JOIN LATERAL (
-    SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t0`
-    WHERE `t`.`ThreatLevelByte` NOT IN (
+    ) AS `u0`
+    WHERE `u`.`ThreatLevelByte` NOT IN (
         SELECT `l1`.`ThreatLevelByte`
         FROM `LocustLeaders` AS `l1`
         UNION ALL
         SELECT `l2`.`ThreatLevelByte`
         FROM `LocustCommanders` AS `l2`
     )
-) AS `t1` ON TRUE
+) AS `u2` ON TRUE
 """);
     }
 
@@ -10886,23 +10874,23 @@ public override async Task Subquery_projecting_nullable_scalar_contains_nullable
 
         AssertSql(
 """
-SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `u2`.`Nickname`, `u2`.`SquadId`, `u2`.`AssignedCityName`, `u2`.`CityOfBirthName`, `u2`.`FullName`, `u2`.`HasSoulPatch`, `u2`.`LeaderNickname`, `u2`.`LeaderSquadId`, `u2`.`Rank`, `u2`.`Discriminator`
 FROM (
     SELECT `l`.`ThreatLevelNullableByte`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`ThreatLevelNullableByte`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 JOIN LATERAL (
-    SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t0`
+    ) AS `u0`
     WHERE EXISTS (
         SELECT 1
         FROM (
@@ -10911,9 +10899,9 @@ SELECT 1
             UNION ALL
             SELECT `l2`.`ThreatLevelNullableByte`
             FROM `LocustCommanders` AS `l2`
-        ) AS `t2`
-        WHERE (`t2`.`ThreatLevelNullableByte` = `t`.`ThreatLevelNullableByte`) OR (`t2`.`ThreatLevelNullableByte` IS NULL AND (`t`.`ThreatLevelNullableByte` IS NULL)))
-) AS `t1` ON TRUE
+        ) AS `u1`
+        WHERE (`u1`.`ThreatLevelNullableByte` = `u`.`ThreatLevelNullableByte`) OR (`u1`.`ThreatLevelNullableByte` IS NULL AND (`u`.`ThreatLevelNullableByte` IS NULL)))
+) AS `u2` ON TRUE
 """);
     }
 
@@ -10923,23 +10911,23 @@ public override async Task Subquery_projecting_nullable_scalar_contains_nullable
 
         AssertSql(
 """
-SELECT `t1`.`Nickname`, `t1`.`SquadId`, `t1`.`AssignedCityName`, `t1`.`CityOfBirthName`, `t1`.`FullName`, `t1`.`HasSoulPatch`, `t1`.`LeaderNickname`, `t1`.`LeaderSquadId`, `t1`.`Rank`, `t1`.`Discriminator`
+SELECT `u2`.`Nickname`, `u2`.`SquadId`, `u2`.`AssignedCityName`, `u2`.`CityOfBirthName`, `u2`.`FullName`, `u2`.`HasSoulPatch`, `u2`.`LeaderNickname`, `u2`.`LeaderSquadId`, `u2`.`Rank`, `u2`.`Discriminator`
 FROM (
     SELECT `l`.`ThreatLevelNullableByte`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`ThreatLevelNullableByte`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 JOIN LATERAL (
-    SELECT `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+    SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t0`
+    ) AS `u0`
     WHERE NOT EXISTS (
         SELECT 1
         FROM (
@@ -10948,9 +10936,9 @@ SELECT 1
             UNION ALL
             SELECT `l2`.`ThreatLevelNullableByte`
             FROM `LocustCommanders` AS `l2`
-        ) AS `t2`
-        WHERE (`t2`.`ThreatLevelNullableByte` = `t`.`ThreatLevelNullableByte`) OR (`t2`.`ThreatLevelNullableByte` IS NULL AND (`t`.`ThreatLevelNullableByte` IS NULL)))
-) AS `t1` ON TRUE
+        ) AS `u1`
+        WHERE (`u1`.`ThreatLevelNullableByte` = `u`.`ThreatLevelNullableByte`) OR (`u1`.`ThreatLevelNullableByte` IS NULL AND (`u`.`ThreatLevelNullableByte` IS NULL)))
+) AS `u2` ON TRUE
 """);
     }
 
@@ -10976,15 +10964,15 @@ public override async Task Enum_flags_closure_typed_as_underlying_type_generates
 """
 @__prm_0='133'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (@__prm_0 & `t`.`Rank`) = `t`.`Rank`
+) AS `u`
+WHERE (@__prm_0 & `u`.`Rank`) = `u`.`Rank`
 """);
     }
 
@@ -10996,15 +10984,15 @@ public override async Task Enum_flags_closure_typed_as_different_type_generates_
 """
 @__prm_0='5'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (@__prm_0 & CAST(`t`.`Rank` AS signed)) = CAST(`t`.`Rank` AS signed)
+) AS `u`
+WHERE (@__prm_0 & CAST(`u`.`Rank` AS signed)) = CAST(`u`.`Rank` AS signed)
 """);
     }
 
@@ -11016,15 +11004,15 @@ public override async Task Constant_enum_with_same_underlying_value_as_previousl
 """
 @__p_0='1'
 
-SELECT `t`.`Rank` & 1
+SELECT `u`.`Rank` & 1
 FROM (
     SELECT `g`.`Nickname`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`Nickname`
+) AS `u`
+ORDER BY `u`.`Nickname`
 LIMIT @__p_0
 """);
     }
@@ -11098,8 +11086,8 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`CityOfBirthName`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t` ON `w`.`OwnerFullName` = `t`.`FullName`
-LEFT JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u` ON `w`.`OwnerFullName` = `u`.`FullName`
+LEFT JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 GROUP BY `c`.`Name`, `c`.`Location`
 ORDER BY `c`.`Location`
 """);
@@ -11111,16 +11099,16 @@ public override async Task SelectMany_predicate_with_non_equality_comparison_con
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Weapons` AS `w` ON (`t`.`FullName` <> `w`.`OwnerFullName`) OR `w`.`OwnerFullName` IS NULL
-ORDER BY `t`.`Nickname`, `w`.`Id`
+) AS `u`
+INNER JOIN `Weapons` AS `w` ON (`u`.`FullName` <> `w`.`OwnerFullName`) OR `w`.`OwnerFullName` IS NULL
+ORDER BY `u`.`Nickname`, `w`.`Id`
 """);
     }
 
@@ -11130,16 +11118,16 @@ public override async Task SelectMany_predicate_with_non_equality_comparison_Def
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON (`t`.`FullName` <> `w`.`OwnerFullName`) OR `w`.`OwnerFullName` IS NULL
-ORDER BY `t`.`Nickname`, `w`.`Id`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON (`u`.`FullName` <> `w`.`OwnerFullName`) OR `w`.`OwnerFullName` IS NULL
+ORDER BY `u`.`Nickname`, `w`.`Id`
 """);
     }
 
@@ -11150,20 +11138,20 @@ public override async Task SelectMany_predicate_after_navigation_with_non_equali
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`AmmunitionType`, `s`.`IsAutomatic`, `s`.`Name`, `s`.`OwnerFullName`, `s`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
     FROM `Weapons` AS `w`
     LEFT JOIN `Weapons` AS `w0` ON `w`.`SynergyWithId` = `w0`.`Id`
-) AS `t0` ON (`t`.`FullName` <> `t0`.`OwnerFullName`) OR `t0`.`OwnerFullName` IS NULL
-ORDER BY `t`.`Nickname`, `t0`.`Id`
+) AS `s` ON (`u`.`FullName` <> `s`.`OwnerFullName`) OR `s`.`OwnerFullName` IS NULL
+ORDER BY `u`.`Nickname`, `s`.`Id`
 """);
     }
 
@@ -11180,8 +11168,8 @@ public override async Task SelectMany_without_result_selector_and_non_equality_c
     UNION ALL
     SELECT `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON (`t`.`FullName` <> `w`.`OwnerFullName`) OR `w`.`OwnerFullName` IS NULL
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON (`u`.`FullName` <> `w`.`OwnerFullName`) OR `w`.`OwnerFullName` IS NULL
 """);
     }
 
@@ -11191,16 +11179,16 @@ public override async Task Filtered_collection_projection_with_order_comparison_
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON (`t`.`FullName` = `w`.`OwnerFullName`) AND (`t`.`SquadId` < `w`.`Id`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON (`u`.`FullName` = `w`.`OwnerFullName`) AND (`u`.`SquadId` < `w`.`Id`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -11210,16 +11198,16 @@ public override async Task Filtered_collection_projection_with_order_comparison_
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON (`t`.`FullName` = `w`.`OwnerFullName`) AND (`t`.`SquadId` <= `w`.`Id`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON (`u`.`FullName` = `w`.`OwnerFullName`) AND (`u`.`SquadId` <= `w`.`Id`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -11229,16 +11217,16 @@ public override async Task Filtered_collection_projection_with_order_comparison_
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Weapons` AS `w` ON (`t`.`FullName` = `w`.`OwnerFullName`) AND (`t`.`SquadId` >= `w`.`Id`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON (`u`.`FullName` = `w`.`OwnerFullName`) AND (`u`.`SquadId` >= `w`.`Id`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -11248,22 +11236,22 @@ public override async Task SelectMany_predicate_with_non_equality_comparison_wit
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 JOIN LATERAL (
     SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
     FROM `Weapons` AS `w`
-    WHERE (`w`.`OwnerFullName` <> `t`.`FullName`) OR `w`.`OwnerFullName` IS NULL
+    WHERE (`w`.`OwnerFullName` <> `u`.`FullName`) OR `w`.`OwnerFullName` IS NULL
     ORDER BY `w`.`Id`
     LIMIT 3
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t0`.`Id`
+) AS `w0` ON TRUE
+ORDER BY `u`.`Nickname`, `w0`.`Id`
 """);
     }
 
@@ -11276,16 +11264,16 @@ public override async Task FirstOrDefault_over_int_compared_to_zero(bool async)
 SELECT `s`.`Name`
 FROM `Squads` AS `s`
 WHERE (`s`.`Name` = 'Delta') AND (COALESCE((
-    SELECT `t`.`SquadId`
+    SELECT `u`.`SquadId`
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`, `g`.`FullName`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t`.`HasSoulPatch` = TRUE)
-    ORDER BY `t`.`FullName`
+    ) AS `u`
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`u`.`HasSoulPatch` = TRUE)
+    ORDER BY `u`.`FullName`
     LIMIT 1), 0) <> 0)
 """);
     }
@@ -11296,23 +11284,23 @@ public override async Task Correlated_collection_with_inner_collection_reference
 
         AssertSql(
 """
-SELECT `t`.`FullName`, `t`.`Nickname`, `t`.`SquadId`, `t0`.`ReportName`, `t0`.`OfficerName`, `t0`.`Nickname`, `t0`.`SquadId`
+SELECT `u`.`FullName`, `u`.`Nickname`, `u`.`SquadId`, `u1`.`ReportName`, `u1`.`OfficerName`, `u1`.`Nickname`, `u1`.`SquadId`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
-    SELECT `t1`.`FullName` AS `ReportName`, `t`.`FullName` AS `OfficerName`, `t1`.`Nickname`, `t1`.`SquadId`
+    SELECT `u0`.`FullName` AS `ReportName`, `u`.`FullName` AS `OfficerName`, `u0`.`Nickname`, `u0`.`SquadId`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`FullName`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`
         FROM `Officers` AS `o0`
-    ) AS `t1`
-    WHERE (`t`.`Nickname` = `t1`.`LeaderNickname`) AND (`t`.`SquadId` = `t1`.`LeaderSquadId`)
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+    ) AS `u0`
+    WHERE (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+) AS `u1` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u1`.`Nickname`
 """);
     }
 
@@ -11322,27 +11310,27 @@ public override async Task Accessing_derived_property_using_hard_and_soft_cast(b
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
-WHERE (`t`.`Discriminator` = 'LocustCommander') AND ((`t`.`HighCommandId` <> 0) OR `t`.`HighCommandId` IS NULL)
+) AS `u`
+WHERE (`u`.`Discriminator` = 'LocustCommander') AND ((`u`.`HighCommandId` <> 0) OR `u`.`HighCommandId` IS NULL)
 """,
                 //
                 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
-WHERE (`t`.`Discriminator` = 'LocustCommander') AND ((`t`.`HighCommandId` <> 0) OR `t`.`HighCommandId` IS NULL)
+) AS `u`
+WHERE (`u`.`Discriminator` = 'LocustCommander') AND ((`u`.`HighCommandId` <> 0) OR `u`.`HighCommandId` IS NULL)
 """);
     }
 
@@ -11352,22 +11340,22 @@ public override async Task Cast_to_derived_followed_by_include_and_FirstOrDefaul
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
-WHERE `t`.`Name` LIKE '%Queen%'
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
+WHERE `u`.`Name` LIKE '%Queen%'
 LIMIT 1
 """);
     }
@@ -11378,24 +11366,24 @@ public override async Task Correlated_collection_take(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `c`.`Name`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`, `c`.`Location`, `c`.`Nation`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `c`.`Name`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`, `c`.`Location`, `c`.`Nation`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`CityOfBirthName`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`CityOfBirthName`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
+) AS `u`
+INNER JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`
+    SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
     FROM (
         SELECT `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, ROW_NUMBER() OVER(PARTITION BY `w`.`OwnerFullName` ORDER BY `w`.`Id`) AS `row`
         FROM `Weapons` AS `w`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 10
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `c`.`Name`
+    ) AS `w0`
+    WHERE `w0`.`row` <= 10
+) AS `w1` ON `u`.`FullName` = `w1`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `c`.`Name`
 """);
     }
 
@@ -11443,22 +11431,22 @@ public override async Task Composite_key_entity_equal(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0`
-WHERE (`t`.`Nickname` = `t0`.`Nickname`) AND (`t`.`SquadId` = `t0`.`SquadId`)
+) AS `u0`
+WHERE (`u`.`Nickname` = `u0`.`Nickname`) AND (`u`.`SquadId` = `u0`.`SquadId`)
 """);
     }
 
@@ -11468,22 +11456,22 @@ public override async Task Composite_key_entity_not_equal(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 CROSS JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0`
-WHERE (`t`.`Nickname` <> `t0`.`Nickname`) OR (`t`.`SquadId` <> `t0`.`SquadId`)
+) AS `u0`
+WHERE (`u`.`Nickname` <> `u0`.`Nickname`) OR (`u`.`SquadId` <> `u0`.`SquadId`)
 """);
     }
 
@@ -11493,19 +11481,19 @@ public override async Task Composite_key_entity_equal_null(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, `l`.`DefeatedByNickname`, `l`.`DefeatedBySquadId`, `l`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
-WHERE `t0`.`Nickname` IS NULL OR (`t0`.`SquadId` IS NULL)
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
+WHERE `u0`.`Nickname` IS NULL OR (`u0`.`SquadId` IS NULL)
 """);
     }
 
@@ -11515,19 +11503,19 @@ public override async Task Composite_key_entity_not_equal_null(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, `l`.`DefeatedByNickname`, `l`.`DefeatedBySquadId`, `l`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
-WHERE `t0`.`Nickname` IS NOT NULL AND (`t0`.`SquadId` IS NOT NULL)
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
+WHERE `u0`.`Nickname` IS NOT NULL AND (`u0`.`SquadId` IS NOT NULL)
 """);
     }
 
@@ -11537,7 +11525,7 @@ public override async Task Projecting_property_converted_to_nullable_with_compar
 
         AssertSql(
 """
-SELECT `t`.`Note`, `t`.`GearNickName` IS NOT NULL, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`HasSoulPatch`
+SELECT `t`.`Note`, `t`.`GearNickName` IS NOT NULL, `u`.`Nickname`, `u`.`SquadId`, `u`.`HasSoulPatch`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
@@ -11545,9 +11533,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END = 1
 """);
@@ -11559,7 +11547,7 @@ public override async Task Projecting_property_converted_to_nullable_with_additi
 
         AssertSql(
 """
-SELECT `t`.`Note`, `t`.`GearNickName` IS NOT NULL, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`HasSoulPatch`
+SELECT `t`.`Note`, `t`.`GearNickName` IS NOT NULL, `u`.`Nickname`, `u`.`SquadId`, `u`.`HasSoulPatch`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
@@ -11567,9 +11555,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE (CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END + 1) = 2
 """);
@@ -11582,7 +11570,7 @@ public override async Task Projecting_property_converted_to_nullable_with_additi
         AssertSql(
 """
 SELECT `t`.`Note`, CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END + 1 AS `Value`
 FROM `Tags` AS `t`
@@ -11592,9 +11580,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`Nickname`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`Nickname`
     ELSE NULL
 END IS NOT NULL
 """);
@@ -11608,7 +11596,7 @@ public override async Task Projecting_property_converted_to_nullable_with_condit
 """
 SELECT CASE
     WHEN (`t`.`Note` <> 'K.I.A.') OR `t`.`Note` IS NULL THEN CASE
-        WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+        WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
         ELSE NULL
     END
     ELSE -1
@@ -11620,7 +11608,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 """);
     }
 
@@ -11631,7 +11619,7 @@ public override async Task Projecting_property_converted_to_nullable_with_functi
         AssertSql(
 """
 SELECT SUBSTRING(CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`Nickname`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`Nickname`
     ELSE NULL
 END, 0 + 1, 3)
 FROM `Tags` AS `t`
@@ -11641,7 +11629,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 """);
     }
 
@@ -11652,7 +11640,7 @@ public override async Task Projecting_property_converted_to_nullable_with_functi
         AssertSql(
 """
 SELECT `t`.`Note`, SUBSTRING(`t`.`Note`, 0 + 1, CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END) AS `Function`
 FROM `Tags` AS `t`
@@ -11662,9 +11650,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`Nickname`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`Nickname`
     ELSE NULL
 END IS NOT NULL
 """);
@@ -11677,13 +11665,13 @@ public override async Task Projecting_property_converted_to_nullable_into_elemen
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN CHAR_LENGTH(`t0`.`Nickname`)
+    WHEN `t`.`GearNickName` IS NOT NULL THEN CHAR_LENGTH(`u`.`Nickname`)
     ELSE NULL
 END, CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END, CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END + 1
 FROM `Tags` AS `t`
@@ -11693,9 +11681,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`Nickname`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`Nickname`
     ELSE NULL
 END IS NOT NULL
 ORDER BY `t`.`Note`
@@ -11709,7 +11697,7 @@ public override async Task Projecting_property_converted_to_nullable_into_member
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END AS `Id`
 FROM `Tags` AS `t`
@@ -11719,9 +11707,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`Nickname`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`Nickname`
     ELSE NULL
 END IS NOT NULL
 ORDER BY `t`.`Note`
@@ -11735,13 +11723,13 @@ public override async Task Projecting_property_converted_to_nullable_into_new_ar
         AssertSql(
 """
 SELECT CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN CHAR_LENGTH(`t0`.`Nickname`)
+    WHEN `t`.`GearNickName` IS NOT NULL THEN CHAR_LENGTH(`u`.`Nickname`)
     ELSE NULL
 END, CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END, CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END + 1
 FROM `Tags` AS `t`
@@ -11751,9 +11739,9 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`Nickname`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`Nickname`
     ELSE NULL
 END IS NOT NULL
 ORDER BY `t`.`Note`
@@ -11774,12 +11762,12 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`Nickname`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`Nickname`
     ELSE NULL
 END IS NOT NULL AND NOT (CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`HasSoulPatch`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`HasSoulPatch`
     ELSE NULL
 END)
 ORDER BY `t`.`Note`
@@ -11792,17 +11780,17 @@ public override async Task Projecting_property_converted_to_nullable_into_member
 
         AssertSql(
 """
-SELECT `t`.`Nickname`
+SELECT `u`.`Nickname`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`CityOfBirthName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`CityOfBirthName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE (EXTRACT(month FROM `t0`.`IssueDate`) <> 5) OR EXTRACT(month FROM `t0`.`IssueDate`) IS NULL
-ORDER BY `t`.`Nickname`
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE (EXTRACT(month FROM `t`.`IssueDate`) <> 5) OR EXTRACT(month FROM `t`.`IssueDate`) IS NULL
+ORDER BY `u`.`Nickname`
 """);
     }
 
@@ -11812,7 +11800,7 @@ public override async Task Projecting_property_converted_to_nullable_and_use_it_
 
         AssertSql(
 """
-SELECT `t`.`Note`, `t`.`GearNickName` IS NOT NULL, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`HasSoulPatch`
+SELECT `t`.`Note`, `t`.`GearNickName` IS NOT NULL, `u`.`Nickname`, `u`.`SquadId`, `u`.`HasSoulPatch`
 FROM `Tags` AS `t`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
@@ -11820,13 +11808,13 @@ LEFT JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`GearNickName` = `t0`.`Nickname`) AND (`t`.`GearSquadId` = `t0`.`SquadId`)
+) AS `u` ON (`t`.`GearNickName` = `u`.`Nickname`) AND (`t`.`GearSquadId` = `u`.`SquadId`)
 WHERE CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`Nickname`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`Nickname`
     ELSE NULL
 END IS NOT NULL
 ORDER BY CASE
-    WHEN `t`.`GearNickName` IS NOT NULL THEN `t0`.`SquadId`
+    WHEN `t`.`GearNickName` IS NOT NULL THEN `u`.`SquadId`
     ELSE NULL
 END, `t`.`Note`
 """);
@@ -12042,17 +12030,17 @@ public override async Task Project_navigation_defined_on_base_from_entity_with_i
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`GearNickName`, `t0`.`GearSquadId`, `t0`.`IssueDate`, `t0`.`Note`, `t0`.`Id` IS NULL AS `IsNull`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, `c`.`Name` IS NULL AS `IsNull`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s`.`Id` IS NULL AS `IsNull`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `t`.`Id`, `t`.`GearNickName`, `t`.`GearSquadId`, `t`.`IssueDate`, `t`.`Note`, `t`.`Id` IS NULL AS `IsNull`, `c`.`Name`, `c`.`Location`, `c`.`Nation`, `c`.`Name` IS NULL AS `IsNull`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s`.`Id` IS NULL AS `IsNull`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-LEFT JOIN `Cities` AS `c` ON `t`.`CityOfBirthName` = `c`.`Name`
-LEFT JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+LEFT JOIN `Cities` AS `c` ON `u`.`CityOfBirthName` = `c`.`Name`
+LEFT JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 """);
     }
 
@@ -12062,23 +12050,23 @@ public override async Task Project_navigation_defined_on_derived_from_entity_wit
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `t0`.`Nickname` IS NULL OR (`t0`.`SquadId` IS NULL) AS `IsNull`, `l`.`Id`, `l`.`CapitalName`, `l`.`Name`, `l`.`ServerAddress`, `l`.`CommanderName`, `l`.`Eradicated`, `l`.`Id` IS NULL AS `IsNull`, `l0`.`Id`, `l0`.`IsOperational`, `l0`.`Name`, `l0`.`Id` IS NULL AS `IsNull`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u0`.`Nickname` IS NULL OR (`u0`.`SquadId` IS NULL) AS `IsNull`, `l1`.`Id`, `l1`.`CapitalName`, `l1`.`Name`, `l1`.`ServerAddress`, `l1`.`CommanderName`, `l1`.`Eradicated`, `l1`.`Id` IS NULL AS `IsNull`, `l2`.`Id`, `l2`.`IsOperational`, `l2`.`Name`, `l2`.`Id` IS NULL AS `IsNull`
 FROM (
-    SELECT `l1`.`Name`, `l1`.`LocustHordeId`, `l1`.`ThreatLevel`, `l1`.`ThreatLevelByte`, `l1`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
-    FROM `LocustLeaders` AS `l1`
+    SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
+    FROM `LocustLeaders` AS `l`
     UNION ALL
-    SELECT `l2`.`Name`, `l2`.`LocustHordeId`, `l2`.`ThreatLevel`, `l2`.`ThreatLevelByte`, `l2`.`ThreatLevelNullableByte`, `l2`.`DefeatedByNickname`, `l2`.`DefeatedBySquadId`, `l2`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
-    FROM `LocustCommanders` AS `l2`
-) AS `t`
+    SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
-LEFT JOIN `LocustHordes` AS `l` ON `t`.`Name` = `l`.`CommanderName`
-LEFT JOIN `LocustHighCommands` AS `l0` ON `t`.`HighCommandId` = `l0`.`Id`
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
+LEFT JOIN `LocustHordes` AS `l1` ON `u`.`Name` = `l1`.`CommanderName`
+LEFT JOIN `LocustHighCommands` AS `l2` ON `u`.`HighCommandId` = `l2`.`Id`
 """);
     }
 
@@ -12091,33 +12079,33 @@ public override async Task Join_entity_with_itself_grouped_by_key_followed_by_in
 @__p_1='10'
 @__p_0='0'
 
-SELECT `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`AssignedCityName`, `t2`.`CityOfBirthName`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`LeaderNickname`, `t2`.`LeaderSquadId`, `t2`.`Rank`, `t2`.`Discriminator`, `t2`.`HasSoulPatch0`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `s`.`Nickname`, `s`.`SquadId`, `s`.`AssignedCityName`, `s`.`CityOfBirthName`, `s`.`FullName`, `s`.`HasSoulPatch`, `s`.`LeaderNickname`, `s`.`LeaderSquadId`, `s`.`Rank`, `s`.`Discriminator`, `s`.`HasSoulPatch0`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
-    SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`HasSoulPatch` AS `HasSoulPatch0`
+    SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u1`.`HasSoulPatch` AS `HasSoulPatch0`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
         FROM `Officers` AS `o`
-    ) AS `t`
+    ) AS `u`
     INNER JOIN (
-        SELECT MIN(CHAR_LENGTH(`t1`.`Nickname`)) AS `c`, `t1`.`HasSoulPatch`
+        SELECT MIN(CHAR_LENGTH(`u0`.`Nickname`)) AS `c`, `u0`.`HasSoulPatch`
         FROM (
             SELECT `g0`.`Nickname`, `g0`.`HasSoulPatch`
             FROM `Gears` AS `g0`
             UNION ALL
             SELECT `o0`.`Nickname`, `o0`.`HasSoulPatch`
             FROM `Officers` AS `o0`
-        ) AS `t1`
-        WHERE `t1`.`Nickname` <> 'Dom'
-        GROUP BY `t1`.`HasSoulPatch`
-    ) AS `t0` ON CHAR_LENGTH(`t`.`Nickname`) = `t0`.`c`
-    ORDER BY `t`.`Nickname`
+        ) AS `u0`
+        WHERE `u0`.`Nickname` <> 'Dom'
+        GROUP BY `u0`.`HasSoulPatch`
+    ) AS `u1` ON CHAR_LENGTH(`u`.`Nickname`) = `u1`.`c`
+    ORDER BY `u`.`Nickname`
     LIMIT @__p_1 OFFSET @__p_0
-) AS `t2`
-LEFT JOIN `Weapons` AS `w` ON `t2`.`FullName` = `w`.`OwnerFullName`
-ORDER BY `t2`.`Nickname`, `t2`.`SquadId`, `t2`.`HasSoulPatch0`
+) AS `s`
+LEFT JOIN `Weapons` AS `w` ON `s`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `s`.`Nickname`, `s`.`SquadId`, `s`.`HasSoulPatch0`
 """);
     }
 
@@ -12148,17 +12136,17 @@ FROM JSON_TABLE('[false,true]', '$[*]' COLUMNS (
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND `t`.`HasSoulPatch` IN (FALSE, TRUE)
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND `u`.`HasSoulPatch` IN (FALSE, TRUE)
 """);
         }
     }
@@ -12190,17 +12178,17 @@ FROM JSON_TABLE('[false,true]', '$[*]' COLUMNS (
         }
         else
         {
-            AssertSql(
+        AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-WHERE (`t`.`HasSoulPatch` = TRUE) AND `t`.`HasSoulPatch` IN (FALSE, TRUE)
+) AS `u`
+WHERE (`u`.`HasSoulPatch` = TRUE) AND `u`.`HasSoulPatch` IN (FALSE, TRUE)
 """);
         }
     }
@@ -12228,15 +12216,15 @@ public override async Task Enum_matching_take_value_gets_different_type_mapping(
 @__value_1='1'
 @__p_0='1'
 
-SELECT `t`.`Rank` & @__value_1
+SELECT `u`.`Rank` & @__value_1
 FROM (
     SELECT `g`.`Nickname`, `g`.`Rank`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`Rank`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`Nickname`
+) AS `u`
+ORDER BY `u`.`Nickname`
 LIMIT @__p_0
 """);
     }
@@ -12249,19 +12237,19 @@ public override async Task SelectMany_Where_DefaultIfEmpty_with_navigation_in_th
 """
 @__prm_0='1'
 
-SELECT `t`.`Nickname`, `t`.`FullName`, `t0`.`Id` IS NOT NULL AS `Collection`
+SELECT `u`.`Nickname`, `u`.`FullName`, `w0`.`Id` IS NOT NULL AS `Collection`
 FROM (
     SELECT `g`.`Nickname`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     WHERE `w`.`Id` > @__prm_0
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
 """);
     }
 
@@ -12271,25 +12259,25 @@ public override async Task Project_entity_and_collection_element(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `t0`.`Id`, `t0`.`AmmunitionType`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`OwnerFullName`, `t0`.`SynergyWithId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `w2`.`Id`, `w2`.`AmmunitionType`, `w2`.`IsAutomatic`, `w2`.`Name`, `w2`.`OwnerFullName`, `w2`.`SynergyWithId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
-LEFT JOIN `Weapons` AS `w` ON `t`.`FullName` = `w`.`OwnerFullName`
+) AS `u`
+INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`AmmunitionType`, `t1`.`IsAutomatic`, `t1`.`Name`, `t1`.`OwnerFullName`, `t1`.`SynergyWithId`
+    SELECT `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`
     FROM (
         SELECT `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`, ROW_NUMBER() OVER(PARTITION BY `w0`.`OwnerFullName` ORDER BY `w0`.`Id`) AS `row`
         FROM `Weapons` AS `w0`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `s`.`Id`
+    ) AS `w1`
+    WHERE `w1`.`row` <= 1
+) AS `w2` ON `u`.`FullName` = `w2`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`
 """);
     }
 
@@ -12310,16 +12298,16 @@ public override async Task Correlated_collection_via_SelectMany_with_Distinct_mi
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t1`.`HasSoulPatch`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `s`.`HasSoulPatch`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
-    SELECT DISTINCT `t2`.`HasSoulPatch`
+    SELECT DISTINCT `u1`.`HasSoulPatch`
     FROM `Weapons` AS `w`
     LEFT JOIN (
         SELECT `g0`.`AssignedCityName`, `g0`.`FullName`
@@ -12327,18 +12315,18 @@ LEFT JOIN (
         UNION ALL
         SELECT `o0`.`AssignedCityName`, `o0`.`FullName`
         FROM `Officers` AS `o0`
-    ) AS `t0` ON `w`.`OwnerFullName` = `t0`.`FullName`
-    LEFT JOIN `Cities` AS `c` ON `t0`.`AssignedCityName` = `c`.`Name`
+    ) AS `u0` ON `w`.`OwnerFullName` = `u0`.`FullName`
+    LEFT JOIN `Cities` AS `c` ON `u0`.`AssignedCityName` = `c`.`Name`
     INNER JOIN (
         SELECT `g1`.`CityOfBirthName`, `g1`.`HasSoulPatch`
         FROM `Gears` AS `g1`
         UNION ALL
         SELECT `o1`.`CityOfBirthName`, `o1`.`HasSoulPatch`
         FROM `Officers` AS `o1`
-    ) AS `t2` ON `c`.`Name` = `t2`.`CityOfBirthName`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
-) AS `t1` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+    ) AS `u1` ON `c`.`Name` = `u1`.`CityOfBirthName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
+) AS `s` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -12376,19 +12364,19 @@ public override async Task SelectMany_Where_DefaultIfEmpty_with_navigation_in_th
 """
 @__isAutomatic_0='True'
 
-SELECT `t`.`Nickname`, `t`.`FullName`, `t0`.`Id` IS NOT NULL AS `Collection`
+SELECT `u`.`Nickname`, `u`.`FullName`, `w0`.`Id` IS NOT NULL AS `Collection`
 FROM (
     SELECT `g`.`Nickname`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `w`.`Id`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
     WHERE `w`.`IsAutomatic` <> @__isAutomatic_0
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
 """);
     }
 
@@ -12438,11 +12426,11 @@ public override async Task FirstOrDefault_on_empty_collection_of_DateTime_in_sub
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, COALESCE((
-    SELECT `t2`.`IssueDate`
-    FROM `Tags` AS `t2`
-    WHERE `t2`.`GearNickName` = `t`.`FullName`
-    ORDER BY `t2`.`Id`
+SELECT `u`.`Nickname`, COALESCE((
+    SELECT `t1`.`IssueDate`
+    FROM `Tags` AS `t1`
+    WHERE `t1`.`GearNickName` = `u`.`FullName`
+    ORDER BY `t1`.`Id`
     LIMIT 1), TIMESTAMP '0001-01-01 00:00:00') AS `invalidTagIssueDate`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
@@ -12450,13 +12438,13 @@ ORDER BY `t2`.`Id`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
-LEFT JOIN `Tags` AS `t0` ON (`t`.`Nickname` = `t0`.`GearNickName`) AND (`t`.`SquadId` = `t0`.`GearSquadId`)
-WHERE `t0`.`IssueDate` > COALESCE((
-    SELECT `t1`.`IssueDate`
-    FROM `Tags` AS `t1`
-    WHERE `t1`.`GearNickName` = `t`.`FullName`
-    ORDER BY `t1`.`Id`
+) AS `u`
+LEFT JOIN `Tags` AS `t` ON (`u`.`Nickname` = `t`.`GearNickName`) AND (`u`.`SquadId` = `t`.`GearSquadId`)
+WHERE `t`.`IssueDate` > COALESCE((
+    SELECT `t0`.`IssueDate`
+    FROM `Tags` AS `t0`
+    WHERE `t0`.`GearNickName` = `u`.`FullName`
+    ORDER BY `t0`.`Id`
     LIMIT 1), TIMESTAMP '0001-01-01 00:00:00')
 """);
     }
@@ -12471,21 +12459,21 @@ await base
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`IsAutomatic`, `t0`.`Name`, `t0`.`Count`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`Count`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
     SELECT `w`.`IsAutomatic`, `w`.`Name`, COUNT(*) AS `Count`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     GROUP BY `w`.`IsAutomatic`, `w`.`Name`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`IsAutomatic`
+) AS `w0` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `w0`.`IsAutomatic`
 """);
     }
 
@@ -12518,20 +12506,20 @@ public override async Task Correlated_collection_with_distinct_not_projecting_id
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Name`, `t0`.`IsAutomatic`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Name`, `w0`.`IsAutomatic`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
     SELECT DISTINCT `w`.`Name`, `w`.`IsAutomatic`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Name`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
+) AS `w0` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `w0`.`Name`
 """);
     }
 
@@ -12553,24 +12541,24 @@ public override async Task Cast_to_derived_followed_by_multiple_includes(bool as
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
-LEFT JOIN `Weapons` AS `w` ON `t0`.`FullName` = `w`.`OwnerFullName`
-WHERE `t`.`Name` LIKE '%Queen%'
-ORDER BY `t`.`Name`, `t0`.`Nickname`, `t0`.`SquadId`
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+WHERE `u`.`Name` LIKE '%Queen%'
+ORDER BY `u`.`Name`, `u0`.`Nickname`, `u0`.`SquadId`
 """);
     }
 
@@ -12580,20 +12568,20 @@ public override async Task Correlated_collection_with_distinct_projecting_identi
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`Name`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Id`, `w0`.`Name`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
     SELECT DISTINCT `w`.`Id`, `w`.`Name`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
+) AS `w0` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -12616,21 +12604,21 @@ public override async Task
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Key`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Key`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
     SELECT `w`.`IsAutomatic` AS `Key`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     GROUP BY `w`.`IsAutomatic`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -12651,7 +12639,7 @@ public override async Task Include_after_SelectMany_throws(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`
 FROM `LocustHordes` AS `l`
 LEFT JOIN `Cities` AS `c` ON `l`.`CapitalName` = `c`.`Name`
 INNER JOIN (
@@ -12660,8 +12648,8 @@ INNER JOIN (
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t` ON `c`.`Name` = `t`.`CityOfBirthName`
-INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+) AS `u` ON `c`.`Name` = `u`.`CityOfBirthName`
+INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 """);
     }
 
@@ -12671,19 +12659,19 @@ public override async Task Correlated_collection_with_distinct_projecting_identi
 
         AssertSql(
 """
-SELECT `s`.`Id`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`HasSoulPatch`
+SELECT `s`.`Id`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`HasSoulPatch`
 FROM `Squads` AS `s`
 LEFT JOIN (
-    SELECT DISTINCT `t`.`Nickname`, `t`.`SquadId`, `t`.`HasSoulPatch`
+    SELECT DISTINCT `u`.`Nickname`, `u`.`SquadId`, `u`.`HasSoulPatch`
     FROM (
         SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`HasSoulPatch`
         FROM `Gears` AS `g`
         UNION ALL
         SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`HasSoulPatch`
         FROM `Officers` AS `o`
-    ) AS `t`
-) AS `t0` ON `s`.`Id` = `t0`.`SquadId`
-ORDER BY `s`.`Id`, `t0`.`Nickname`
+    ) AS `u`
+) AS `u0` ON `s`.`Id` = `u0`.`SquadId`
+ORDER BY `s`.`Id`, `u0`.`Nickname`
 """);
     }
 
@@ -12693,14 +12681,14 @@ public override async Task Include_on_entity_that_is_not_present_in_final_projec
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`Discriminator` = 'Officer' AS `IsOfficer`
+SELECT `u`.`Nickname`, `u`.`Discriminator` = 'Officer' AS `IsOfficer`
 FROM (
     SELECT `g`.`Nickname`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -12737,31 +12725,31 @@ public override async Task Correlated_collection_after_distinct_3_levels(bool as
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t2`.`Nickname`, `t2`.`FullName`, `t2`.`HasSoulPatch`, `t2`.`Id`, `t2`.`Name`, `t2`.`Nickname0`, `t2`.`FullName0`, `t2`.`HasSoulPatch0`, `t2`.`Id0`
+SELECT `s0`.`Id`, `s0`.`Name`, `s1`.`Nickname`, `s1`.`FullName`, `s1`.`HasSoulPatch`, `s1`.`Id`, `s1`.`Name`, `s1`.`Nickname0`, `s1`.`FullName0`, `s1`.`HasSoulPatch0`, `s1`.`Id0`
 FROM (
     SELECT DISTINCT `s`.`Id`, `s`.`Name`
     FROM `Squads` AS `s`
-) AS `t`
+) AS `s0`
 LEFT JOIN LATERAL (
-    SELECT `t0`.`Nickname`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t1`.`Id`, `t1`.`Name`, `t1`.`Nickname` AS `Nickname0`, `t1`.`FullName` AS `FullName0`, `t1`.`HasSoulPatch` AS `HasSoulPatch0`, `t1`.`Id0`
+    SELECT `u0`.`Nickname`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `w0`.`Id`, `w0`.`Name`, `w0`.`Nickname` AS `Nickname0`, `w0`.`FullName` AS `FullName0`, `w0`.`HasSoulPatch` AS `HasSoulPatch0`, `w0`.`Id0`
     FROM (
-        SELECT DISTINCT `t3`.`Nickname`, `t3`.`FullName`, `t3`.`HasSoulPatch`
+        SELECT DISTINCT `u`.`Nickname`, `u`.`FullName`, `u`.`HasSoulPatch`
         FROM (
             SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`, `g`.`HasSoulPatch`
             FROM `Gears` AS `g`
             UNION ALL
             SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`, `o`.`HasSoulPatch`
             FROM `Officers` AS `o`
-        ) AS `t3`
-        WHERE `t3`.`SquadId` = `t`.`Id`
-    ) AS `t0`
+        ) AS `u`
+        WHERE `u`.`SquadId` = `s0`.`Id`
+    ) AS `u0`
     LEFT JOIN LATERAL (
-        SELECT `t`.`Id`, `t`.`Name`, `t0`.`Nickname`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `w`.`Id` AS `Id0`
+        SELECT `s0`.`Id`, `s0`.`Name`, `u0`.`Nickname`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `w`.`Id` AS `Id0`
         FROM `Weapons` AS `w`
-        WHERE `w`.`OwnerFullName` = `t0`.`FullName`
-    ) AS `t1` ON TRUE
-) AS `t2` ON TRUE
-ORDER BY `t`.`Id`, `t2`.`Nickname`, `t2`.`FullName`, `t2`.`HasSoulPatch`
+        WHERE `w`.`OwnerFullName` = `u0`.`FullName`
+    ) AS `w0` ON TRUE
+) AS `s1` ON TRUE
+ORDER BY `s0`.`Id`, `s1`.`Nickname`, `s1`.`FullName`, `s1`.`HasSoulPatch`
 """);
     }
 
@@ -12798,14 +12786,14 @@ public override async Task String_concat_nullable_expressions_are_coalesced(bool
 
         AssertSql(
 """
-SELECT CONCAT(CONCAT(CONCAT(`t`.`FullName`, ''), COALESCE(`t`.`LeaderNickname`, '')), '')
+SELECT CONCAT(CONCAT(CONCAT(`u`.`FullName`, ''), COALESCE(`u`.`LeaderNickname`, '')), '')
 FROM (
     SELECT `g`.`FullName`, `g`.`LeaderNickname`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`FullName`, `o`.`LeaderNickname`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 """);
     }
 
@@ -12815,19 +12803,19 @@ public override async Task Correlated_collection_with_distinct_projecting_identi
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Id`, `t0`.`Name`, `t0`.`OwnerFullName`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Id`, `w0`.`Name`, `w0`.`OwnerFullName`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT DISTINCT `w`.`Id`, `w`.`Name`, `w`.`OwnerFullName`
     FROM `Weapons` AS `w`
-) AS `t0` ON `t`.`FullName` = `t0`.`OwnerFullName`
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -12838,21 +12826,21 @@ public override async Task Correlated_collection_with_groupby_not_projecting_ide
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t0`.`Key`, `t0`.`Count`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `w0`.`Key`, `w0`.`Count`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`FullName`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`FullName`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN LATERAL (
     SELECT `w`.`IsAutomatic` AS `Key`, COUNT(*) AS `Count`
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`
     GROUP BY `w`.`IsAutomatic`
-) AS `t0` ON TRUE
-ORDER BY `t`.`Nickname`, `t`.`SquadId`
+) AS `w0` ON TRUE
+ORDER BY `u`.`Nickname`, `u`.`SquadId`
 """);
     }
 
@@ -13157,13 +13145,13 @@ public override async Task Where_subquery_equality_to_null_with_composite_key(bo
 WHERE NOT EXISTS (
     SELECT 1
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE `s`.`Id` = `t`.`SquadId`)
+    ) AS `u`
+    WHERE `s`.`Id` = `u`.`SquadId`)
 """);
     }
 
@@ -13173,18 +13161,18 @@ public override async Task Where_subquery_equality_to_null_without_composite_key
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE NOT EXISTS (
     SELECT 1
     FROM `Weapons` AS `w`
-    WHERE `t`.`FullName` = `w`.`OwnerFullName`)
+    WHERE `u`.`FullName` = `w`.`OwnerFullName`)
 """);
     }
 
@@ -13194,21 +13182,21 @@ public override async Task Include_reference_on_derived_type_using_EF_Property(b
 
         AssertSql(
 """
-SELECT `t`.`Name`, `t`.`LocustHordeId`, `t`.`ThreatLevel`, `t`.`ThreatLevelByte`, `t`.`ThreatLevelNullableByte`, `t`.`DefeatedByNickname`, `t`.`DefeatedBySquadId`, `t`.`HighCommandId`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
     FROM `LocustLeaders` AS `l`
     UNION ALL
     SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
     FROM `LocustCommanders` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t0` ON (`t`.`DefeatedByNickname` = `t0`.`Nickname`) AND (`t`.`DefeatedBySquadId` = `t0`.`SquadId`)
+) AS `u0` ON (`u`.`DefeatedByNickname` = `u0`.`Nickname`) AND (`u`.`DefeatedBySquadId` = `u0`.`SquadId`)
 """);
     }
 
@@ -13218,22 +13206,22 @@ public override async Task Include_collection_on_derived_type_using_EF_Property(
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g0`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -13243,19 +13231,19 @@ public override async Task EF_Property_based_Include_navigation_on_derived_type(
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `t0`.`Nickname`, `t0`.`SquadId`, `t0`.`AssignedCityName`, `t0`.`CityOfBirthName`, `t0`.`FullName`, `t0`.`HasSoulPatch`, `t0`.`LeaderNickname`, `t0`.`LeaderSquadId`, `t0`.`Rank`, `t0`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`
 FROM (
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o0`
-) AS `t0` ON (`t`.`Nickname` = `t0`.`LeaderNickname`) AND (`t`.`SquadId` = `t0`.`LeaderSquadId`)
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `t0`.`Nickname`
+) AS `u0` ON (`u`.`Nickname` = `u0`.`LeaderNickname`) AND (`u`.`SquadId` = `u0`.`LeaderSquadId`)
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`
 """);
     }
 
@@ -13278,15 +13266,15 @@ public override async Task ElementAt_basic_with_OrderBy(bool async)
 """
 @__p_0='0'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`FullName`
+) AS `u`
+ORDER BY `u`.`FullName`
 LIMIT 1 OFFSET @__p_0
 """);
     }
@@ -13299,15 +13287,15 @@ public override async Task ElementAtOrDefault_basic_with_OrderBy(bool async)
 """
 @__p_0='1'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`FullName`
+) AS `u`
+ORDER BY `u`.`FullName`
 LIMIT 1 OFFSET @__p_0
 """);
     }
@@ -13320,15 +13308,15 @@ public override async Task ElementAtOrDefault_basic_with_OrderBy_parameter(bool
 """
 @__p_0='2'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-ORDER BY `t`.`FullName`
+) AS `u`
+ORDER BY `u`.`FullName`
 LIMIT 1 OFFSET @__p_0
 """);
     }
@@ -13344,14 +13332,14 @@ public override async Task Where_subquery_with_ElementAtOrDefault_equality_to_nu
 WHERE NOT EXISTS (
     SELECT 1
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`Nickname`, `g`.`SquadId`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`Nickname`, `o`.`SquadId`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE `s`.`Id` = `t`.`SquadId`
-    ORDER BY `t`.`Nickname`
+    ) AS `u`
+    WHERE `s`.`Id` = `u`.`SquadId`
+    ORDER BY `u`.`Nickname`
     LIMIT 18446744073709551610 OFFSET 2)
 """);
     }
@@ -13383,22 +13371,22 @@ public override async Task DateTimeOffset_to_unix_time_milliseconds(bool async)
 """
 @__unixEpochMilliseconds_0='0'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+) AS `u`
+INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 LEFT JOIN `SquadMissions` AS `s1` ON `s`.`Id` = `s1`.`SquadId`
 WHERE NOT EXISTS (
     SELECT 1
     FROM `SquadMissions` AS `s0`
     INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
     WHERE (`s`.`Id` = `s0`.`SquadId`) AND (@__unixEpochMilliseconds_0 = (TIMESTAMPDIFF(microsecond, TIMESTAMP '1970-01-01 00:00:00', `m`.`Timeline`)) DIV (1000)))
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
 """);
     }
 
@@ -13410,22 +13398,22 @@ public override async Task DateTimeOffset_to_unix_time_seconds(bool async)
 """
 @__unixEpochSeconds_0='0'
 
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `s`.`Id`, `s`.`Banner`, `s`.`Banner5`, `s`.`InternalNumber`, `s`.`Name`, `s1`.`SquadId`, `s1`.`MissionId`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+) AS `u`
+INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 LEFT JOIN `SquadMissions` AS `s1` ON `s`.`Id` = `s1`.`SquadId`
 WHERE NOT EXISTS (
     SELECT 1
     FROM `SquadMissions` AS `s0`
     INNER JOIN `Missions` AS `m` ON `s0`.`MissionId` = `m`.`Id`
     WHERE (`s`.`Id` = `s0`.`SquadId`) AND (@__unixEpochSeconds_0 = TIMESTAMPDIFF(second, TIMESTAMP '1970-01-01 00:00:00', `m`.`Timeline`)))
-ORDER BY `t`.`Nickname`, `t`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `s`.`Id`, `s1`.`SquadId`
 """);
     }
 
@@ -13438,29 +13426,26 @@ public override async Task Set_operator_with_navigation_in_projection_groupby_ag
 SELECT `s`.`Name`, (
     SELECT COALESCE(SUM(CHAR_LENGTH(`c`.`Location`)), 0)
     FROM (
-        SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
-        FROM `Gears` AS `g0`
+        SELECT `g2`.`SquadId`, `g2`.`CityOfBirthName`
+        FROM `Gears` AS `g2`
         UNION ALL
-        SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
-        FROM `Officers` AS `o0`
-    ) AS `t3`
-    INNER JOIN `Squads` AS `s0` ON `t3`.`SquadId` = `s0`.`Id`
-    INNER JOIN `Cities` AS `c` ON `t3`.`CityOfBirthName` = `c`.`Name`
+        SELECT `o2`.`SquadId`, `o2`.`CityOfBirthName`
+        FROM `Officers` AS `o2`
+    ) AS `u3`
+    INNER JOIN `Squads` AS `s0` ON `u3`.`SquadId` = `s0`.`Id`
+    INNER JOIN `Cities` AS `c` ON `u3`.`CityOfBirthName` = `c`.`Name`
     WHERE 'Marcus' IN (
-        SELECT `t4`.`Nickname`
-        FROM (
-            SELECT `g1`.`Nickname`, `g1`.`SquadId`, `g1`.`AssignedCityName`, `g1`.`CityOfBirthName`, `g1`.`FullName`, `g1`.`HasSoulPatch`, `g1`.`LeaderNickname`, `g1`.`LeaderSquadId`, `g1`.`Rank`, 'Gear' AS `Discriminator`
-            FROM `Gears` AS `g1`
-            UNION ALL
-            SELECT `o1`.`Nickname`, `o1`.`SquadId`, `o1`.`AssignedCityName`, `o1`.`CityOfBirthName`, `o1`.`FullName`, `o1`.`HasSoulPatch`, `o1`.`LeaderNickname`, `o1`.`LeaderSquadId`, `o1`.`Rank`, 'Officer' AS `Discriminator`
-            FROM `Officers` AS `o1`
-            UNION ALL
-            SELECT `g2`.`Nickname`, `g2`.`SquadId`, `g2`.`AssignedCityName`, `g2`.`CityOfBirthName`, `g2`.`FullName`, `g2`.`HasSoulPatch`, `g2`.`LeaderNickname`, `g2`.`LeaderSquadId`, `g2`.`Rank`, 'Gear' AS `Discriminator`
-            FROM `Gears` AS `g2`
-            UNION ALL
-            SELECT `o2`.`Nickname`, `o2`.`SquadId`, `o2`.`AssignedCityName`, `o2`.`CityOfBirthName`, `o2`.`FullName`, `o2`.`HasSoulPatch`, `o2`.`LeaderNickname`, `o2`.`LeaderSquadId`, `o2`.`Rank`, 'Officer' AS `Discriminator`
-            FROM `Officers` AS `o2`
-        ) AS `t4`
+        SELECT `g3`.`Nickname`
+        FROM `Gears` AS `g3`
+        UNION ALL
+        SELECT `o3`.`Nickname`
+        FROM `Officers` AS `o3`
+        UNION ALL
+        SELECT `g4`.`Nickname`
+        FROM `Gears` AS `g4`
+        UNION ALL
+        SELECT `o4`.`Nickname`
+        FROM `Officers` AS `o4`
     ) AND ((`s`.`Name` = `s0`.`Name`) OR (`s`.`Name` IS NULL AND (`s0`.`Name` IS NULL)))) AS `SumOfLengths`
 FROM (
     SELECT `g`.`SquadId`
@@ -13468,23 +13453,20 @@ UNION ALL
     UNION ALL
     SELECT `o`.`SquadId`
     FROM `Officers` AS `o`
-) AS `t`
-INNER JOIN `Squads` AS `s` ON `t`.`SquadId` = `s`.`Id`
+) AS `u`
+INNER JOIN `Squads` AS `s` ON `u`.`SquadId` = `s`.`Id`
 WHERE 'Marcus' IN (
-    SELECT `t0`.`Nickname`
-    FROM (
-        SELECT `g3`.`Nickname`, `g3`.`SquadId`, `g3`.`AssignedCityName`, `g3`.`CityOfBirthName`, `g3`.`FullName`, `g3`.`HasSoulPatch`, `g3`.`LeaderNickname`, `g3`.`LeaderSquadId`, `g3`.`Rank`, 'Gear' AS `Discriminator`
-        FROM `Gears` AS `g3`
-        UNION ALL
-        SELECT `o3`.`Nickname`, `o3`.`SquadId`, `o3`.`AssignedCityName`, `o3`.`CityOfBirthName`, `o3`.`FullName`, `o3`.`HasSoulPatch`, `o3`.`LeaderNickname`, `o3`.`LeaderSquadId`, `o3`.`Rank`, 'Officer' AS `Discriminator`
-        FROM `Officers` AS `o3`
-        UNION ALL
-        SELECT `g4`.`Nickname`, `g4`.`SquadId`, `g4`.`AssignedCityName`, `g4`.`CityOfBirthName`, `g4`.`FullName`, `g4`.`HasSoulPatch`, `g4`.`LeaderNickname`, `g4`.`LeaderSquadId`, `g4`.`Rank`, 'Gear' AS `Discriminator`
-        FROM `Gears` AS `g4`
-        UNION ALL
-        SELECT `o4`.`Nickname`, `o4`.`SquadId`, `o4`.`AssignedCityName`, `o4`.`CityOfBirthName`, `o4`.`FullName`, `o4`.`HasSoulPatch`, `o4`.`LeaderNickname`, `o4`.`LeaderSquadId`, `o4`.`Rank`, 'Officer' AS `Discriminator`
-        FROM `Officers` AS `o4`
-    ) AS `t0`
+    SELECT `g0`.`Nickname`
+    FROM `Gears` AS `g0`
+    UNION ALL
+    SELECT `o0`.`Nickname`
+    FROM `Officers` AS `o0`
+    UNION ALL
+    SELECT `g1`.`Nickname`
+    FROM `Gears` AS `g1`
+    UNION ALL
+    SELECT `o1`.`Nickname`
+    FROM `Officers` AS `o1`
 )
 GROUP BY `s`.`Name`
 """);
@@ -13501,13 +13483,13 @@ public override async Task Where_subquery_equality_to_null_with_composite_key_sh
 WHERE NOT EXISTS (
     SELECT 1
     FROM (
-        SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+        SELECT `g`.`SquadId`, `g`.`FullName`
         FROM `Gears` AS `g`
         UNION ALL
-        SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+        SELECT `o`.`SquadId`, `o`.`FullName`
         FROM `Officers` AS `o`
-    ) AS `t`
-    WHERE (`s`.`Id` = `t`.`SquadId`) AND (`t`.`FullName` = 'Anthony Carmine'))
+    ) AS `u`
+    WHERE (`s`.`Id` = `u`.`SquadId`) AND (`u`.`FullName` = 'Anthony Carmine'))
 """);
     }
 
@@ -13517,18 +13499,18 @@ public override async Task Where_subquery_equality_to_null_without_composite_key
 
         AssertSql(
 """
-SELECT `t`.`Nickname`, `t`.`SquadId`, `t`.`AssignedCityName`, `t`.`CityOfBirthName`, `t`.`FullName`, `t`.`HasSoulPatch`, `t`.`LeaderNickname`, `t`.`LeaderSquadId`, `t`.`Rank`, `t`.`Discriminator`
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
 FROM (
     SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
     FROM `Gears` AS `g`
     UNION ALL
     SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
     FROM `Officers` AS `o`
-) AS `t`
+) AS `u`
 WHERE NOT EXISTS (
     SELECT 1
     FROM `Weapons` AS `w`
-    WHERE (`t`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'Hammer of Dawn'))
+    WHERE (`u`.`FullName` = `w`.`OwnerFullName`) AND (`w`.`Name` = 'Hammer of Dawn'))
 """);
     }
 
@@ -13614,6 +13596,224 @@ public override async Task Nav_expansion_inside_ElementAt_correlated_to_source(b
         AssertSql("");
     }
 
+    public override async Task Unicode_string_literals_is_used_for_non_unicode_column_with_concat(bool async)
+    {
+        await base.Unicode_string_literals_is_used_for_non_unicode_column_with_concat(async);
+
+        AssertSql(
+"""
+SELECT `c`.`Name`, `c`.`Location`, `c`.`Nation`
+FROM `Cities` AS `c`
+WHERE CONCAT(COALESCE(`c`.`Location`, ''), 'Added') LIKE '%Add%'
+""");
+    }
+
+    public override async Task Include_one_to_many_on_composite_key_then_orderby_key_properties(bool async)
+    {
+        await base.Include_one_to_many_on_composite_key_then_orderby_key_properties(async);
+
+        AssertSql(
+"""
+SELECT `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`
+FROM (
+    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g`
+    UNION ALL
+    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o`
+) AS `u`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`SquadId`, `u`.`Nickname`
+""");
+    }
+
+    public override async Task Find_underlying_property_after_GroupJoin_DefaultIfEmpty(bool async)
+    {
+        await base.Find_underlying_property_after_GroupJoin_DefaultIfEmpty(async);
+
+        AssertSql(
+"""
+SELECT `u`.`FullName`, CAST(`u0`.`ThreatLevel` AS signed) AS `ThreatLevel`
+FROM (
+    SELECT `g`.`Nickname`, `g`.`FullName`
+    FROM `Gears` AS `g`
+    UNION ALL
+    SELECT `o`.`Nickname`, `o`.`FullName`
+    FROM `Officers` AS `o`
+) AS `u`
+LEFT JOIN (
+    SELECT `l`.`ThreatLevel`, `l`.`DefeatedByNickname`
+    FROM `LocustCommanders` AS `l`
+) AS `u0` ON `u`.`Nickname` = `u0`.`DefeatedByNickname`
+""");
+    }
+
+    public override async Task Join_include_coalesce_simple(bool async)
+    {
+        await base.Join_include_coalesce_simple(async);
+
+        AssertSql(
+"""
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`Nickname` = 'Marcus'
+FROM (
+    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g`
+    UNION ALL
+    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o`
+) AS `u`
+LEFT JOIN (
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g0`
+    UNION ALL
+    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o0`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`
+""",
+                //
+                """
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`
+FROM (
+    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g`
+    UNION ALL
+    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o`
+) AS `u`
+LEFT JOIN (
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g0`
+    UNION ALL
+    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o0`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`
+""",
+                //
+                """
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`
+FROM (
+    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g`
+    UNION ALL
+    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o`
+) AS `u`
+LEFT JOIN (
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g0`
+    UNION ALL
+    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o0`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w0` ON `u`.`FullName` = `w0`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`
+""");
+    }
+
+    public override async Task Join_include_coalesce_nested(bool async)
+    {
+        await base.Join_include_coalesce_nested(async);
+
+        AssertSql(
+"""
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`Nickname` = 'Marcus'
+FROM (
+    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g`
+    UNION ALL
+    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o`
+) AS `u`
+LEFT JOIN (
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g0`
+    UNION ALL
+    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o0`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`
+""",
+                //
+                """
+SELECT `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `w0`.`Id`, `w0`.`AmmunitionType`, `w0`.`IsAutomatic`, `w0`.`Name`, `w0`.`OwnerFullName`, `w0`.`SynergyWithId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w1`.`Id`, `w1`.`AmmunitionType`, `w1`.`IsAutomatic`, `w1`.`Name`, `w1`.`OwnerFullName`, `w1`.`SynergyWithId`
+FROM (
+    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g`
+    UNION ALL
+    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o`
+) AS `u`
+LEFT JOIN (
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g0`
+    UNION ALL
+    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o0`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u0`.`FullName` = `w`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w0` ON `u0`.`FullName` = `w0`.`OwnerFullName`
+LEFT JOIN `Weapons` AS `w1` ON `u0`.`FullName` = `w1`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`, `w`.`Id`, `w0`.`Id`
+""");
+    }
+
+    public override async Task Join_include_conditional(bool async)
+    {
+        await base.Join_include_conditional(async);
+
+        AssertSql(
+"""
+SELECT `u0`.`Nickname` IS NOT NULL AND (`u0`.`SquadId` IS NOT NULL), `u0`.`Nickname`, `u0`.`SquadId`, `u0`.`AssignedCityName`, `u0`.`CityOfBirthName`, `u0`.`FullName`, `u0`.`HasSoulPatch`, `u0`.`LeaderNickname`, `u0`.`LeaderSquadId`, `u0`.`Rank`, `u0`.`Discriminator`, `u`.`Nickname`, `u`.`SquadId`, `u`.`AssignedCityName`, `u`.`CityOfBirthName`, `u`.`FullName`, `u`.`HasSoulPatch`, `u`.`LeaderNickname`, `u`.`LeaderSquadId`, `u`.`Rank`, `u`.`Discriminator`, `w`.`Id`, `w`.`AmmunitionType`, `w`.`IsAutomatic`, `w`.`Name`, `w`.`OwnerFullName`, `w`.`SynergyWithId`, `u`.`Nickname` = 'Marcus'
+FROM (
+    SELECT `g`.`Nickname`, `g`.`SquadId`, `g`.`AssignedCityName`, `g`.`CityOfBirthName`, `g`.`FullName`, `g`.`HasSoulPatch`, `g`.`LeaderNickname`, `g`.`LeaderSquadId`, `g`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g`
+    UNION ALL
+    SELECT `o`.`Nickname`, `o`.`SquadId`, `o`.`AssignedCityName`, `o`.`CityOfBirthName`, `o`.`FullName`, `o`.`HasSoulPatch`, `o`.`LeaderNickname`, `o`.`LeaderSquadId`, `o`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o`
+) AS `u`
+LEFT JOIN (
+    SELECT `g0`.`Nickname`, `g0`.`SquadId`, `g0`.`AssignedCityName`, `g0`.`CityOfBirthName`, `g0`.`FullName`, `g0`.`HasSoulPatch`, `g0`.`LeaderNickname`, `g0`.`LeaderSquadId`, `g0`.`Rank`, 'Gear' AS `Discriminator`
+    FROM `Gears` AS `g0`
+    UNION ALL
+    SELECT `o0`.`Nickname`, `o0`.`SquadId`, `o0`.`AssignedCityName`, `o0`.`CityOfBirthName`, `o0`.`FullName`, `o0`.`HasSoulPatch`, `o0`.`LeaderNickname`, `o0`.`LeaderSquadId`, `o0`.`Rank`, 'Officer' AS `Discriminator`
+    FROM `Officers` AS `o0`
+) AS `u0` ON `u`.`LeaderNickname` = `u0`.`Nickname`
+LEFT JOIN `Weapons` AS `w` ON `u`.`FullName` = `w`.`OwnerFullName`
+ORDER BY `u`.`Nickname`, `u`.`SquadId`, `u0`.`Nickname`, `u0`.`SquadId`
+""");
+    }
+
+    public override async Task Derived_reference_is_skipped_when_base_type(bool async)
+    {
+        await base.Derived_reference_is_skipped_when_base_type(async);
+
+        AssertSql(
+"""
+SELECT `u`.`Name`, `u`.`LocustHordeId`, `u`.`ThreatLevel`, `u`.`ThreatLevelByte`, `u`.`ThreatLevelNullableByte`, `u`.`DefeatedByNickname`, `u`.`DefeatedBySquadId`, `u`.`HighCommandId`, `u`.`Discriminator`, `l1`.`Id`, `l1`.`IsOperational`, `l1`.`Name`
+FROM (
+    SELECT `l`.`Name`, `l`.`LocustHordeId`, `l`.`ThreatLevel`, `l`.`ThreatLevelByte`, `l`.`ThreatLevelNullableByte`, NULL AS `DefeatedByNickname`, NULL AS `DefeatedBySquadId`, NULL AS `HighCommandId`, 'LocustLeader' AS `Discriminator`
+    FROM `LocustLeaders` AS `l`
+    UNION ALL
+    SELECT `l0`.`Name`, `l0`.`LocustHordeId`, `l0`.`ThreatLevel`, `l0`.`ThreatLevelByte`, `l0`.`ThreatLevelNullableByte`, `l0`.`DefeatedByNickname`, `l0`.`DefeatedBySquadId`, `l0`.`HighCommandId`, 'LocustCommander' AS `Discriminator`
+    FROM `LocustCommanders` AS `l0`
+) AS `u`
+LEFT JOIN `LocustHighCommands` AS `l1` ON `u`.`HighCommandId` = `l1`.`Id`
+""");
+    }
+
+    public override async Task Nested_contains_with_enum(bool async)
+    {
+        await base.Nested_contains_with_enum(async);
+
+        AssertSql("");
+    }
+
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 }
diff --git a/test/EFCore.MySql.FunctionalTests/Query/TPCManyToManyNoTrackingQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/TPCManyToManyNoTrackingQueryMySqlTest.cs
index 8bf8f708b..b9c3f443c 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/TPCManyToManyNoTrackingQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/TPCManyToManyNoTrackingQueryMySqlTest.cs
@@ -115,13 +115,13 @@ ORDER BY (
     SELECT COUNT(*)
     FROM `JoinOneToBranch` AS `j`
     INNER JOIN (
-        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
+        SELECT `b`.`Id`, `b`.`Name`
         FROM `Branches` AS `b`
         UNION ALL
-        SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
+        SELECT `l`.`Id`, `l`.`Name`
         FROM `Leaves` AS `l`
-    ) AS `t` ON `j`.`EntityBranchId` = `t`.`Id`
-    WHERE (`e`.`Id` = `j`.`EntityOneId`) AND (`t`.`Name` LIKE 'L%')), `e`.`Id`
+    ) AS `u` ON `j`.`EntityBranchId` = `u`.`Id`
+    WHERE (`e`.`Id` = `j`.`EntityOneId`) AND (`u`.`Name` LIKE 'L%')), `e`.`Id`
 """);
     }
 
@@ -162,14 +162,14 @@ public override async Task Skip_navigation_select_many_average(bool async)
         await base.Skip_navigation_select_many_average(async);
 
         AssertSql(
-$"""
-SELECT AVG({MySqlTestHelpers.CastAsDouble(@"`t`.`Key1`")})
+"""
+SELECT AVG(CAST(`s`.`Key1` AS double))
 FROM `EntityTwos` AS `e`
 INNER JOIN (
     SELECT `e1`.`Key1`, `e0`.`TwoSkipSharedId`
     FROM `EntityCompositeKeyEntityTwo` AS `e0`
     INNER JOIN `EntityCompositeKeys` AS `e1` ON ((`e0`.`CompositeKeySkipSharedKey1` = `e1`.`Key1`) AND (`e0`.`CompositeKeySkipSharedKey2` = `e1`.`Key2`)) AND (`e0`.`CompositeKeySkipSharedKey3` = `e1`.`Key3`)
-) AS `t` ON `e`.`Id` = `t`.`TwoSkipSharedId`
+) AS `s` ON `e`.`Id` = `s`.`TwoSkipSharedId`
 """);
     }
 
@@ -179,13 +179,13 @@ public override async Task Skip_navigation_select_many_max(bool async)
 
         AssertSql(
 """
-SELECT MAX(`t`.`Key1`)
+SELECT MAX(`s`.`Key1`)
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Key1`, `j`.`ThreeId`
     FROM `JoinThreeToCompositeKeyFull` AS `j`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`j`.`CompositeId1` = `e0`.`Key1`) AND (`j`.`CompositeId2` = `e0`.`Key2`)) AND (`j`.`CompositeId3` = `e0`.`Key3`)
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 """);
     }
 
@@ -195,10 +195,10 @@ public override async Task Skip_navigation_select_many_min(bool async)
 
         AssertSql(
 """
-SELECT MIN(`t0`.`Id`)
+SELECT MIN(`s`.`Id`)
 FROM `EntityThrees` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `e0`.`ThreeSkipSharedId`
+    SELECT `u`.`Id`, `e0`.`ThreeSkipSharedId`
     FROM `EntityRootEntityThree` AS `e0`
     INNER JOIN (
         SELECT `r`.`Id`
@@ -212,8 +212,8 @@ UNION ALL
         UNION ALL
         SELECT `l0`.`Id`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeSkipSharedId`
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeSkipSharedId`
 """);
     }
 
@@ -223,7 +223,7 @@ public override async Task Skip_navigation_select_many_sum(bool async)
 
         AssertSql(
 """
-SELECT COALESCE(SUM(`t0`.`Key1`), 0)
+SELECT COALESCE(SUM(`s`.`Key1`), 0)
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -236,12 +236,12 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e0`.`Key1`, `e`.`RootSkipSharedId`
     FROM `EntityCompositeKeyEntityRoot` AS `e`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1`) AND (`e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2`)) AND (`e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`)
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
 """);
     }
 
@@ -311,17 +311,17 @@ public override async Task Skip_navigation_order_by_first_or_default(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`
+SELECT `s0`.`Id`, `s0`.`Name`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`ThreeId`
+    SELECT `s`.`Id`, `s`.`Name`, `s`.`ThreeId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`Name`, `j`.`ThreeId`, ROW_NUMBER() OVER(PARTITION BY `j`.`ThreeId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToThreePayloadFullShared` AS `j`
         INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
 """);
     }
 
@@ -331,10 +331,10 @@ public override async Task Skip_navigation_order_by_single_or_default(bool async
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`
+SELECT `s0`.`Id`, `s0`.`Name`
 FROM `EntityOnes` AS `e`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Name`
+    SELECT `s`.`Id`, `s`.`Name`
     FROM (
         SELECT `e0`.`Id`, `e0`.`Name`
         FROM `JoinOneSelfPayload` AS `j`
@@ -342,10 +342,10 @@ LEFT JOIN LATERAL (
         WHERE `e`.`Id` = `j`.`LeftId`
         ORDER BY `e0`.`Id`
         LIMIT 1
-    ) AS `t`
-    ORDER BY `t`.`Id`
+    ) AS `s`
+    ORDER BY `s`.`Id`
     LIMIT 1
-) AS `t0` ON TRUE
+) AS `s0` ON TRUE
 """);
     }
 
@@ -355,23 +355,23 @@ public override async Task Skip_navigation_order_by_last_or_default(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`
+SELECT `s0`.`Id`, `s0`.`Name`
 FROM (
     SELECT `b`.`Id`
     FROM `Branches` AS `b`
     UNION ALL
     SELECT `l`.`Id`
     FROM `Leaves` AS `l`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`EntityBranchId`
+    SELECT `s`.`Id`, `s`.`Name`, `s`.`EntityBranchId`
     FROM (
         SELECT `e`.`Id`, `e`.`Name`, `j`.`EntityBranchId`, ROW_NUMBER() OVER(PARTITION BY `j`.`EntityBranchId` ORDER BY `e`.`Id` DESC) AS `row`
         FROM `JoinOneToBranch` AS `j`
         INNER JOIN `EntityOnes` AS `e` ON `j`.`EntityOneId` = `e`.`Id`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Id` = `t0`.`EntityBranchId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `u`.`Id` = `s0`.`EntityBranchId`
 """);
     }
 
@@ -381,17 +381,17 @@ public override async Task Skip_navigation_order_by_reverse_first_or_default(boo
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`ThreeId`, ROW_NUMBER() OVER(PARTITION BY `j`.`ThreeId` ORDER BY `e0`.`Id` DESC) AS `row`
         FROM `JoinTwoToThree` AS `j`
         INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
 """);
     }
 
@@ -401,14 +401,14 @@ public override async Task Skip_navigation_cast(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
     SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `Leaves` AS `l` ON `j`.`LeafId` = `l`.`Id`
-) AS `t` ON ((`e`.`Key1` = `t`.`CompositeId1`) AND (`e`.`Key2` = `t`.`CompositeId2`)) AND (`e`.`Key3` = `t`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeId1`) AND (`e`.`Key2` = `s`.`CompositeId2`)) AND (`e`.`Key3` = `s`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
 """);
     }
 
@@ -417,28 +417,28 @@ public override async Task Skip_navigation_of_type(bool async)
         await base.Skip_navigation_of_type(async);
 
         AssertSql(
-$"""
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+"""
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`, `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityRoot` AS `e0`
     INNER JOIN (
-        SELECT `r`.`Id`, `r`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityRoot'")} AS `Discriminator`
+        SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'EntityRoot' AS `Discriminator`
         FROM `Roots` AS `r`
         UNION ALL
-        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityBranch'")} AS `Discriminator`
+        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
         FROM `Branches` AS `b`
         UNION ALL
         SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
         FROM `Leaves` AS `l`
         UNION ALL
-        SELECT `l0`.`Id`, `l0`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityLeaf2'")} AS `Discriminator`
+        SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'EntityLeaf2' AS `Discriminator`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-    WHERE `t`.`Discriminator` = 'EntityLeaf'
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+    WHERE `u`.`Discriminator` = 'EntityLeaf'
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
 """);
     }
 
@@ -491,7 +491,7 @@ public override async Task Select_many_over_skip_navigation(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -504,12 +504,12 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `e`.`RootSkipSharedId`
     FROM `EntityRootEntityThree` AS `e`
     INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
 """);
     }
 
@@ -519,13 +519,13 @@ public override async Task Select_many_over_skip_navigation_where(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`OneId`
+) AS `s` ON `e`.`Id` = `s`.`OneId`
 """);
     }
 
@@ -535,17 +535,17 @@ public override async Task Select_many_over_skip_navigation_order_by_skip(bool a
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, ROW_NUMBER() OVER(PARTITION BY `j`.`OneId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToThreePayloadFull` AS `j`
         INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-    ) AS `t`
-    WHERE 2 < `t`.`row`
-) AS `t0` ON `e`.`Id` = `t0`.`OneId`
+    ) AS `s`
+    WHERE 2 < `s`.`row`
+) AS `s0` ON `e`.`Id` = `s0`.`OneId`
 """);
     }
 
@@ -555,17 +555,17 @@ public override async Task Select_many_over_skip_navigation_order_by_take(bool a
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneSkipSharedId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneSkipSharedId`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`OneSkipSharedId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`OneSkipSharedId` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityOneEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON `e`.`Id` = `t0`.`OneSkipSharedId`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON `e`.`Id` = `s0`.`OneSkipSharedId`
 """);
     }
 
@@ -575,17 +575,17 @@ public override async Task Select_many_over_skip_navigation_order_by_skip_take(b
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, ROW_NUMBER() OVER(PARTITION BY `j`.`OneId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToThreePayloadFullShared` AS `j`
         INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (2 < `t`.`row`) AND (`t`.`row` <= 5)
-) AS `t0` ON `e`.`Id` = `t0`.`OneId`
+    ) AS `s`
+    WHERE (2 < `s`.`row`) AND (`s`.`row` <= 5)
+) AS `s0` ON `e`.`Id` = `s0`.`OneId`
 """);
     }
 
@@ -595,10 +595,10 @@ public override async Task Select_many_over_skip_navigation_of_type(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `e0`.`ThreeSkipSharedId`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`, `e0`.`ThreeSkipSharedId`
     FROM `EntityRootEntityThree` AS `e0`
     INNER JOIN (
         SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'EntityRoot' AS `Discriminator`
@@ -612,9 +612,9 @@ UNION ALL
         UNION ALL
         SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'EntityLeaf2' AS `Discriminator`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-    WHERE `t`.`Discriminator` IN ('EntityBranch', 'EntityLeaf')
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeSkipSharedId`
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+    WHERE `u`.`Discriminator` IN ('EntityBranch', 'EntityLeaf')
+) AS `s` ON `e`.`Id` = `s`.`ThreeSkipSharedId`
 """);
     }
 
@@ -624,10 +624,10 @@ public override async Task Select_many_over_skip_navigation_cast(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `j`.`EntityOneId`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`, `j`.`EntityOneId`
     FROM `JoinOneToBranch` AS `j`
     INNER JOIN (
         SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
@@ -635,8 +635,8 @@ INNER JOIN (
         UNION ALL
         SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
         FROM `Leaves` AS `l`
-    ) AS `t` ON `j`.`EntityBranchId` = `t`.`Id`
-) AS `t0` ON `e`.`Id` = `t0`.`EntityOneId`
+    ) AS `u` ON `j`.`EntityBranchId` = `u`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`EntityOneId`
 """);
     }
 
@@ -646,14 +646,14 @@ public override async Task Select_skip_navigation(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `t`.`Id`, `t`.`Name`, `t`.`LeftId`, `t`.`RightId`
+SELECT `e`.`Id`, `s`.`Id`, `s`.`Name`, `s`.`LeftId`, `s`.`RightId`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `j`.`LeftId`, `j`.`RightId`
     FROM `JoinOneSelfPayload` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`LeftId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`RightId`
-ORDER BY `e`.`Id`, `t`.`LeftId`, `t`.`RightId`
+) AS `s` ON `e`.`Id` = `s`.`RightId`
+ORDER BY `e`.`Id`, `s`.`LeftId`, `s`.`RightId`
 """);
     }
 
@@ -663,24 +663,24 @@ public override async Task Select_skip_navigation_multiple(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`, `t`.`TwoId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`SelfSkipSharedLeftId`, `t0`.`SelfSkipSharedRightId`, `t1`.`Key1`, `t1`.`Key2`, `t1`.`Key3`, `t1`.`Name`, `t1`.`TwoSkipSharedId`, `t1`.`CompositeKeySkipSharedKey1`, `t1`.`CompositeKeySkipSharedKey2`, `t1`.`CompositeKeySkipSharedKey3`
+SELECT `e`.`Id`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`, `s`.`TwoId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`SelfSkipSharedLeftId`, `s0`.`SelfSkipSharedRightId`, `s1`.`Key1`, `s1`.`Key2`, `s1`.`Key3`, `s1`.`Name`, `s1`.`TwoSkipSharedId`, `s1`.`CompositeKeySkipSharedKey1`, `s1`.`CompositeKeySkipSharedKey2`, `s1`.`CompositeKeySkipSharedKey3`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`ThreeId`, `j`.`TwoId`
     FROM `JoinTwoToThree` AS `j`
     INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
 LEFT JOIN (
     SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e1`.`SelfSkipSharedLeftId`, `e1`.`SelfSkipSharedRightId`
     FROM `EntityTwoEntityTwo` AS `e1`
     INNER JOIN `EntityTwos` AS `e2` ON `e1`.`SelfSkipSharedLeftId` = `e2`.`Id`
-) AS `t0` ON `e`.`Id` = `t0`.`SelfSkipSharedRightId`
+) AS `s0` ON `e`.`Id` = `s0`.`SelfSkipSharedRightId`
 LEFT JOIN (
     SELECT `e4`.`Key1`, `e4`.`Key2`, `e4`.`Key3`, `e4`.`Name`, `e3`.`TwoSkipSharedId`, `e3`.`CompositeKeySkipSharedKey1`, `e3`.`CompositeKeySkipSharedKey2`, `e3`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityTwo` AS `e3`
     INNER JOIN `EntityCompositeKeys` AS `e4` ON ((`e3`.`CompositeKeySkipSharedKey1` = `e4`.`Key1`) AND (`e3`.`CompositeKeySkipSharedKey2` = `e4`.`Key2`)) AND (`e3`.`CompositeKeySkipSharedKey3` = `e4`.`Key3`)
-) AS `t1` ON `e`.`Id` = `t1`.`TwoSkipSharedId`
-ORDER BY `e`.`Id`, `t`.`ThreeId`, `t`.`TwoId`, `t`.`Id`, `t0`.`SelfSkipSharedLeftId`, `t0`.`SelfSkipSharedRightId`, `t0`.`Id`, `t1`.`TwoSkipSharedId`, `t1`.`CompositeKeySkipSharedKey1`, `t1`.`CompositeKeySkipSharedKey2`, `t1`.`CompositeKeySkipSharedKey3`, `t1`.`Key1`, `t1`.`Key2`
+) AS `s1` ON `e`.`Id` = `s1`.`TwoSkipSharedId`
+ORDER BY `e`.`Id`, `s`.`ThreeId`, `s`.`TwoId`, `s`.`Id`, `s0`.`SelfSkipSharedLeftId`, `s0`.`SelfSkipSharedRightId`, `s0`.`Id`, `s1`.`TwoSkipSharedId`, `s1`.`CompositeKeySkipSharedKey1`, `s1`.`CompositeKeySkipSharedKey2`, `s1`.`CompositeKeySkipSharedKey3`, `s1`.`Key1`, `s1`.`Key2`
 """);
     }
 
@@ -690,17 +690,17 @@ public override async Task Select_skip_navigation_first_or_default(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`Name`
+SELECT `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`Name`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Key1`, `t`.`Key2`, `t`.`Key3`, `t`.`Name`, `t`.`ThreeId`
+    SELECT `s`.`Key1`, `s`.`Key2`, `s`.`Key3`, `s`.`Name`, `s`.`ThreeId`
     FROM (
         SELECT `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e0`.`Name`, `j`.`ThreeId`, ROW_NUMBER() OVER(PARTITION BY `j`.`ThreeId` ORDER BY `e0`.`Key1`, `e0`.`Key2`) AS `row`
         FROM `JoinThreeToCompositeKeyFull` AS `j`
         INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`j`.`CompositeId1` = `e0`.`Key1`) AND (`j`.`CompositeId2` = `e0`.`Key2`)) AND (`j`.`CompositeId3` = `e0`.`Key3`)
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
 ORDER BY `e`.`Id`
 """);
     }
@@ -710,27 +710,27 @@ public override async Task Include_skip_navigation(bool async)
         await base.Include_skip_navigation(async);
 
         AssertSql(
-$"""
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`Slumber`, `t0`.`IsGreen`, `t0`.`IsBrown`, `t0`.`Discriminator`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+"""
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`Slumber`, `s`.`IsGreen`, `s`.`IsBrown`, `s`.`Discriminator`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`, `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`, `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityRoot` AS `e0`
     INNER JOIN (
-        SELECT `r`.`Id`, `r`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Slumber`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsBrown`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityRoot'")} AS `Discriminator`
+        SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
         FROM `Roots` AS `r`
         UNION ALL
-        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Slumber`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsBrown`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityBranch'")} AS `Discriminator`
+        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityBranch' AS `Discriminator`
         FROM `Branches` AS `b`
         UNION ALL
         SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, NULL AS `Slumber`, `l`.`IsGreen`, NULL AS `IsBrown`, 'EntityLeaf' AS `Discriminator`
         FROM `Leaves` AS `l`
         UNION ALL
-        SELECT `l0`.`Id`, `l0`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Number`, `l0`.`Slumber`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, `l0`.`IsBrown`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityLeaf2'")} AS `Discriminator`
+        SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
 """);
     }
 
@@ -740,15 +740,15 @@ public override async Task Include_skip_navigation_then_reference(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
 """);
     }
 
@@ -758,19 +758,19 @@ public override async Task Include_skip_navigation_then_include_skip_navigation(
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id0`, `t0`.`Name0`, `t0`.`EntityBranchId`, `t0`.`EntityOneId`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s0`.`Id`, `s0`.`Name`, `s0`.`Number`, `s0`.`IsGreen`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id0`, `s0`.`Name0`, `s0`.`EntityBranchId`, `s0`.`EntityOneId`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `t`.`Id` AS `Id0`, `t`.`Name` AS `Name0`, `t`.`EntityBranchId`, `t`.`EntityOneId`
+    SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `s`.`Id` AS `Id0`, `s`.`Name` AS `Name0`, `s`.`EntityBranchId`, `s`.`EntityOneId`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `Leaves` AS `l` ON `j`.`LeafId` = `l`.`Id`
     LEFT JOIN (
         SELECT `e0`.`Id`, `e0`.`Name`, `j0`.`EntityBranchId`, `j0`.`EntityOneId`
         FROM `JoinOneToBranch` AS `j0`
         INNER JOIN `EntityOnes` AS `e0` ON `j0`.`EntityOneId` = `e0`.`Id`
-    ) AS `t` ON `l`.`Id` = `t`.`EntityBranchId`
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeId1`) AND (`e`.`Key2` = `t0`.`CompositeId2`)) AND (`e`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`, `t0`.`EntityBranchId`, `t0`.`EntityOneId`
+    ) AS `s` ON `l`.`Id` = `s`.`EntityBranchId`
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeId1`) AND (`e`.`Key2` = `s0`.`CompositeId2`)) AND (`e`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`, `s0`.`EntityBranchId`, `s0`.`EntityOneId`
 """);
     }
 
@@ -780,10 +780,10 @@ public override async Task Include_skip_navigation_then_include_reference_and_sk
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t0`.`Id`, `t0`.`Name`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id1`, `t0`.`Name1`, `t0`.`LeftId`, `t0`.`RightId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s0`.`Id`, `s0`.`Name`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Id1`, `s0`.`Name1`, `s0`.`LeftId`, `s0`.`RightId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `j`.`OneId`, `j`.`ThreeId`, `t`.`Id` AS `Id1`, `t`.`Name` AS `Name1`, `t`.`LeftId`, `t`.`RightId`
+    SELECT `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `j`.`OneId`, `j`.`ThreeId`, `s`.`Id` AS `Id1`, `s`.`Name` AS `Name1`, `s`.`LeftId`, `s`.`RightId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
@@ -791,9 +791,9 @@ LEFT JOIN (
         SELECT `e2`.`Id`, `e2`.`Name`, `j0`.`LeftId`, `j0`.`RightId`
         FROM `JoinOneSelfPayload` AS `j0`
         INNER JOIN `EntityOnes` AS `e2` ON `j0`.`RightId` = `e2`.`Id`
-    ) AS `t` ON `e0`.`Id` = `t`.`LeftId`
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id`, `t0`.`Id0`, `t0`.`LeftId`, `t0`.`RightId`
+    ) AS `s` ON `e0`.`Id` = `s`.`LeftId`
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
+ORDER BY `e`.`Id`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Id`, `s0`.`Id0`, `s0`.`LeftId`, `s0`.`RightId`
 """);
     }
 
@@ -803,15 +803,15 @@ public override async Task Include_skip_navigation_and_reference(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `e0`.`Id`, `t`.`Id`, `t`.`Name`, `t`.`OneSkipSharedId`, `t`.`TwoSkipSharedId`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `e0`.`Id`, `s`.`Id`, `s`.`Name`, `s`.`OneSkipSharedId`, `s`.`TwoSkipSharedId`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
 FROM `EntityTwos` AS `e`
 LEFT JOIN `EntityThrees` AS `e0` ON `e`.`Id` = `e0`.`ReferenceInverseId`
 LEFT JOIN (
     SELECT `e2`.`Id`, `e2`.`Name`, `e1`.`OneSkipSharedId`, `e1`.`TwoSkipSharedId`
     FROM `EntityOneEntityTwo` AS `e1`
     INNER JOIN `EntityOnes` AS `e2` ON `e1`.`OneSkipSharedId` = `e2`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`TwoSkipSharedId`
-ORDER BY `e`.`Id`, `e0`.`Id`, `t`.`OneSkipSharedId`, `t`.`TwoSkipSharedId`
+) AS `s` ON `e`.`Id` = `s`.`TwoSkipSharedId`
+ORDER BY `e`.`Id`, `e0`.`Id`, `s`.`OneSkipSharedId`, `s`.`TwoSkipSharedId`
 """);
     }
 
@@ -821,15 +821,15 @@ public override async Task Filtered_include_skip_navigation_where(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`Id`, `t`.`Name`, `t`.`OneId`, `t`.`ThreeId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`Id`, `s`.`Name`, `s`.`OneId`, `s`.`ThreeId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`
 """);
     }
 
@@ -839,14 +839,14 @@ public override async Task Filtered_include_skip_navigation_order_by(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`, `t`.`TwoId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`, `s`.`TwoId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`ThreeId`, `j`.`TwoId`
     FROM `JoinTwoToThree` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`Id`, `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`Id`, `s`.`ThreeId`
 """);
     }
 
@@ -856,18 +856,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip(bool a
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`SelfSkipSharedLeftId`, `t0`.`SelfSkipSharedRightId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`SelfSkipSharedLeftId`, `s0`.`SelfSkipSharedRightId`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`SelfSkipSharedLeftId`, `t`.`SelfSkipSharedRightId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`SelfSkipSharedLeftId`, `s`.`SelfSkipSharedRightId`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`SelfSkipSharedLeftId`, `e0`.`SelfSkipSharedRightId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`SelfSkipSharedLeftId` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityTwoEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`SelfSkipSharedRightId` = `e1`.`Id`
-    ) AS `t`
-    WHERE 2 < `t`.`row`
-) AS `t0` ON `e`.`Id` = `t0`.`SelfSkipSharedLeftId`
-ORDER BY `e`.`Id`, `t0`.`SelfSkipSharedLeftId`, `t0`.`Id`
+    ) AS `s`
+    WHERE 2 < `s`.`row`
+) AS `s0` ON `e`.`Id` = `s0`.`SelfSkipSharedLeftId`
+ORDER BY `e`.`Id`, `s0`.`SelfSkipSharedLeftId`, `s0`.`Id`
 """);
     }
 
@@ -877,18 +877,18 @@ public override async Task Filtered_include_skip_navigation_order_by_take(bool a
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`TwoSkipSharedId`, `t`.`CompositeKeySkipSharedKey1`, `t`.`CompositeKeySkipSharedKey2`, `t`.`CompositeKeySkipSharedKey3`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`TwoSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`TwoSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, ROW_NUMBER() OVER(PARTITION BY `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityCompositeKeyEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s0`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`
 """);
     }
 
@@ -898,18 +898,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take(b
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`Id0`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`Id0`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`Id0`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`Id0`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`Id` AS `Id0`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, ROW_NUMBER() OVER(PARTITION BY `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinThreeToCompositeKeyFull` AS `j`
         INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeId1`) AND (`e`.`Key2` = `t0`.`CompositeId2`)) AND (`e`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeId1`) AND (`e`.`Key2` = `s0`.`CompositeId2`)) AND (`e`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`
 """);
     }
 
@@ -919,7 +919,7 @@ public override async Task Filtered_then_include_skip_navigation_where(bool asyn
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id0`, `t0`.`Name0`, `t0`.`OneId`, `t0`.`ThreeId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`RootSkipSharedId`, `s0`.`ThreeSkipSharedId`, `s0`.`Id0`, `s0`.`Name0`, `s0`.`OneId`, `s0`.`ThreeId`
 FROM (
     SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
     FROM `Roots` AS `r`
@@ -932,9 +932,9 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `e`.`RootSkipSharedId`, `e`.`ThreeSkipSharedId`, `t1`.`Id` AS `Id0`, `t1`.`Name` AS `Name0`, `t1`.`OneId`, `t1`.`ThreeId`
+    SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `e`.`RootSkipSharedId`, `e`.`ThreeSkipSharedId`, `s`.`Id` AS `Id0`, `s`.`Name` AS `Name0`, `s`.`OneId`, `s`.`ThreeId`
     FROM `EntityRootEntityThree` AS `e`
     INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
     LEFT JOIN (
@@ -942,9 +942,9 @@ LEFT JOIN (
         FROM `JoinOneToThreePayloadFullShared` AS `j`
         INNER JOIN `EntityOnes` AS `e1` ON `j`.`OneId` = `e1`.`Id`
         WHERE `e1`.`Id` < 10
-    ) AS `t1` ON `e0`.`Id` = `t1`.`ThreeId`
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`
+    ) AS `s` ON `e0`.`Id` = `s`.`ThreeId`
+) AS `s0` ON `u`.`Id` = `s0`.`RootSkipSharedId`
+ORDER BY `u`.`Id`, `s0`.`RootSkipSharedId`, `s0`.`ThreeSkipSharedId`, `s0`.`Id`, `s0`.`OneId`, `s0`.`ThreeId`
 """);
     }
 
@@ -954,7 +954,7 @@ public override async Task Filtered_then_include_skip_navigation_order_by_skip_t
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`, `t1`.`Key1`, `t1`.`Key2`, `t1`.`Key3`, `t1`.`Name`, `t1`.`RootSkipSharedId`, `t1`.`CompositeKeySkipSharedKey1`, `t1`.`CompositeKeySkipSharedKey2`, `t1`.`CompositeKeySkipSharedKey3`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`Name0`, `t1`.`ReferenceInverseId`, `t1`.`Id0`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`, `s1`.`Key1`, `s1`.`Key2`, `s1`.`Key3`, `s1`.`Name`, `s1`.`RootSkipSharedId`, `s1`.`CompositeKeySkipSharedKey1`, `s1`.`CompositeKeySkipSharedKey2`, `s1`.`CompositeKeySkipSharedKey3`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`Name0`, `s1`.`ReferenceInverseId`, `s1`.`Id0`
 FROM (
     SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
     FROM `Roots` AS `r`
@@ -967,22 +967,22 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e0`.`Name`, `e`.`RootSkipSharedId`, `e`.`CompositeKeySkipSharedKey1`, `e`.`CompositeKeySkipSharedKey2`, `e`.`CompositeKeySkipSharedKey3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId`, `t0`.`Id0`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`
+    SELECT `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e0`.`Name`, `e`.`RootSkipSharedId`, `e`.`CompositeKeySkipSharedKey1`, `e`.`CompositeKeySkipSharedKey2`, `e`.`CompositeKeySkipSharedKey3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId`, `s0`.`Id0`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`
     FROM `EntityCompositeKeyEntityRoot` AS `e`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1`) AND (`e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2`)) AND (`e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`)
     LEFT JOIN (
-        SELECT `t2`.`Id`, `t2`.`CollectionInverseId`, `t2`.`Name`, `t2`.`ReferenceInverseId`, `t2`.`Id0`, `t2`.`CompositeId1`, `t2`.`CompositeId2`, `t2`.`CompositeId3`
+        SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`Id0`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
         FROM (
             SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j`.`Id` AS `Id0`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, ROW_NUMBER() OVER(PARTITION BY `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3` ORDER BY `e1`.`Id`) AS `row`
             FROM `JoinThreeToCompositeKeyFull` AS `j`
             INNER JOIN `EntityThrees` AS `e1` ON `j`.`ThreeId` = `e1`.`Id`
-        ) AS `t2`
-        WHERE (1 < `t2`.`row`) AND (`t2`.`row` <= 3)
-    ) AS `t0` ON ((`e0`.`Key1` = `t0`.`CompositeId1`) AND (`e0`.`Key2` = `t0`.`CompositeId2`)) AND (`e0`.`Key3` = `t0`.`CompositeId3`)
-) AS `t1` ON `t`.`Id` = `t1`.`RootSkipSharedId`
-ORDER BY `t`.`Id`, `t1`.`RootSkipSharedId`, `t1`.`CompositeKeySkipSharedKey1`, `t1`.`CompositeKeySkipSharedKey2`, `t1`.`CompositeKeySkipSharedKey3`, `t1`.`Key1`, `t1`.`Key2`, `t1`.`Key3`, `t1`.`CompositeId1`, `t1`.`CompositeId2`, `t1`.`CompositeId3`, `t1`.`Id`
+        ) AS `s`
+        WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+    ) AS `s0` ON ((`e0`.`Key1` = `s0`.`CompositeId1`) AND (`e0`.`Key2` = `s0`.`CompositeId2`)) AND (`e0`.`Key3` = `s0`.`CompositeId3`)
+) AS `s1` ON `u`.`Id` = `s1`.`RootSkipSharedId`
+ORDER BY `u`.`Id`, `s1`.`RootSkipSharedId`, `s1`.`CompositeKeySkipSharedKey1`, `s1`.`CompositeKeySkipSharedKey2`, `s1`.`CompositeKeySkipSharedKey3`, `s1`.`Key1`, `s1`.`Key2`, `s1`.`Key3`, `s1`.`CompositeId1`, `s1`.`CompositeId2`, `s1`.`CompositeId3`, `s1`.`Id`
 """);
     }
 
@@ -992,20 +992,20 @@ public override async Task Filtered_include_skip_navigation_where_then_include_s
 
         AssertSql(
 """
-SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`Name`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`, `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`Name`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`, `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`
 FROM `Leaves` AS `l`
 LEFT JOIN (
-    SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId`, `t`.`TwoSkipSharedId`, `t`.`CompositeKeySkipSharedKey1`, `t`.`CompositeKeySkipSharedKey2`, `t`.`CompositeKeySkipSharedKey3`
+    SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name` AS `Name0`, `s`.`ReferenceInverseId`, `s`.`TwoSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `EntityCompositeKeys` AS `e` ON ((`j`.`CompositeId1` = `e`.`Key1`) AND (`j`.`CompositeId2` = `e`.`Key2`)) AND (`j`.`CompositeId3` = `e`.`Key3`)
     LEFT JOIN (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`TwoSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
         FROM `EntityCompositeKeyEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t` ON ((`e`.`Key1` = `t`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t`.`CompositeKeySkipSharedKey3`)
+    ) AS `s` ON ((`e`.`Key1` = `s`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s`.`CompositeKeySkipSharedKey3`)
     WHERE `e`.`Key1` < 5
-) AS `t0` ON `l`.`Id` = `t0`.`LeafId`
-ORDER BY `l`.`Id`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+) AS `s0` ON `l`.`Id` = `s0`.`LeafId`
+ORDER BY `l`.`Id`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`
 """);
     }
 
@@ -1015,10 +1015,10 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take_t
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`ExtraId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`Id0`, `t1`.`CollectionInverseId0`, `t1`.`Name0`, `t1`.`ReferenceInverseId0`, `t1`.`ThreeId`, `t1`.`TwoId0`
+SELECT `e`.`Id`, `e`.`Name`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`ExtraId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`Id0`, `s1`.`CollectionInverseId0`, `s1`.`Name0`, `s1`.`ReferenceInverseId0`, `s1`.`ThreeId`, `s1`.`TwoId0`
 FROM `EntityOnes` AS `e`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`, `t0`.`Id` AS `Id0`, `t0`.`CollectionInverseId` AS `CollectionInverseId0`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId` AS `ReferenceInverseId0`, `t0`.`ThreeId`, `t0`.`TwoId` AS `TwoId0`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`, `s0`.`Id` AS `Id0`, `s0`.`CollectionInverseId` AS `CollectionInverseId0`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId` AS `ReferenceInverseId0`, `s0`.`ThreeId`, `s0`.`TwoId` AS `TwoId0`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`
         FROM `JoinOneToTwo` AS `j`
@@ -1026,15 +1026,15 @@ LEFT JOIN LATERAL (
         WHERE `e`.`Id` = `j`.`OneId`
         ORDER BY `e0`.`Id`
         LIMIT 2 OFFSET 1
-    ) AS `t`
+    ) AS `s`
     LEFT JOIN (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j0`.`ThreeId`, `j0`.`TwoId`
         FROM `JoinTwoToThree` AS `j0`
         INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
         WHERE `e1`.`Id` < 10
-    ) AS `t0` ON `t`.`Id` = `t0`.`TwoId`
-) AS `t1` ON TRUE
-ORDER BY `e`.`Id`, `t1`.`Id`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`ThreeId`, `t1`.`TwoId0`
+    ) AS `s0` ON `s`.`Id` = `s0`.`TwoId`
+) AS `s1` ON TRUE
+ORDER BY `e`.`Id`, `s1`.`Id`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`ThreeId`, `s1`.`TwoId0`
 """);
     }
 
@@ -1044,24 +1044,24 @@ public override async Task Filtered_include_skip_navigation_where_then_include_s
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`ExtraId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`Id0`, `t1`.`CollectionInverseId0`, `t1`.`Name0`, `t1`.`ReferenceInverseId0`, `t1`.`ThreeId`, `t1`.`TwoId0`
+SELECT `e`.`Id`, `e`.`Name`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`ExtraId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`Id0`, `s1`.`CollectionInverseId0`, `s1`.`Name0`, `s1`.`ReferenceInverseId0`, `s1`.`ThreeId`, `s1`.`TwoId0`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
-    SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`, `t0`.`Id` AS `Id0`, `t0`.`CollectionInverseId` AS `CollectionInverseId0`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId` AS `ReferenceInverseId0`, `t0`.`ThreeId`, `t0`.`TwoId` AS `TwoId0`
+    SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`, `s0`.`Id` AS `Id0`, `s0`.`CollectionInverseId` AS `CollectionInverseId0`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId` AS `ReferenceInverseId0`, `s0`.`ThreeId`, `s0`.`TwoId` AS `TwoId0`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
     LEFT JOIN (
-        SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`, `t`.`TwoId`
+        SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`, `s`.`TwoId`
         FROM (
             SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j0`.`ThreeId`, `j0`.`TwoId`, ROW_NUMBER() OVER(PARTITION BY `j0`.`TwoId` ORDER BY `e1`.`Id`) AS `row`
             FROM `JoinTwoToThree` AS `j0`
             INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
-        ) AS `t`
-        WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-    ) AS `t0` ON `e0`.`Id` = `t0`.`TwoId`
+        ) AS `s`
+        WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+    ) AS `s0` ON `e0`.`Id` = `s0`.`TwoId`
     WHERE `e0`.`Id` < 10
-) AS `t1` ON `e`.`Id` = `t1`.`OneId`
-ORDER BY `e`.`Id`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`Id`, `t1`.`TwoId0`, `t1`.`Id0`
+) AS `s1` ON `e`.`Id` = `s1`.`OneId`
+ORDER BY `e`.`Id`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`Id`, `s1`.`TwoId0`, `s1`.`Id0`
 """);
     }
 
@@ -1071,7 +1071,7 @@ public override async Task Filter_include_on_skip_navigation_combined(bool async
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id1`, `t`.`CollectionInverseId0`, `t`.`ExtraId0`, `t`.`Name1`, `t`.`ReferenceInverseId0`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id1`, `s`.`CollectionInverseId0`, `s`.`ExtraId0`, `s`.`Name1`, `s`.`ReferenceInverseId0`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`, `e2`.`Id` AS `Id1`, `e2`.`CollectionInverseId` AS `CollectionInverseId0`, `e2`.`ExtraId` AS `ExtraId0`, `e2`.`Name` AS `Name1`, `e2`.`ReferenceInverseId` AS `ReferenceInverseId0`
@@ -1080,8 +1080,8 @@ LEFT JOIN (
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
     LEFT JOIN `EntityTwos` AS `e2` ON `e0`.`Id` = `e2`.`CollectionInverseId`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -1091,23 +1091,23 @@ public override async Task Filter_include_on_skip_navigation_combined_with_filte
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t3`.`Id`, `t3`.`Name`, `t3`.`OneId`, `t3`.`ThreeId`, `t3`.`Id0`, `t3`.`CollectionInverseId`, `t3`.`ExtraId`, `t3`.`Name0`, `t3`.`ReferenceInverseId`, `t3`.`OneId0`, `t3`.`TwoId`, `t3`.`Id1`, `t3`.`Name1`, `t3`.`Number`, `t3`.`IsGreen`, `t3`.`Discriminator`, `t3`.`EntityBranchId`, `t3`.`EntityOneId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s2`.`Id`, `s2`.`Name`, `s2`.`OneId`, `s2`.`ThreeId`, `s2`.`Id0`, `s2`.`CollectionInverseId`, `s2`.`ExtraId`, `s2`.`Name0`, `s2`.`ReferenceInverseId`, `s2`.`OneId0`, `s2`.`TwoId`, `s2`.`Id1`, `s2`.`Name1`, `s2`.`Number`, `s2`.`IsGreen`, `s2`.`Discriminator`, `s2`.`EntityBranchId`, `s2`.`EntityOneId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `e0`.`Id`, `e0`.`Name`, `j`.`OneId`, `j`.`ThreeId`, `t0`.`Id` AS `Id0`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId`, `t0`.`OneId` AS `OneId0`, `t0`.`TwoId`, `t1`.`Id` AS `Id1`, `t1`.`Name` AS `Name1`, `t1`.`Number`, `t1`.`IsGreen`, `t1`.`Discriminator`, `t1`.`EntityBranchId`, `t1`.`EntityOneId`
+    SELECT `e0`.`Id`, `e0`.`Name`, `j`.`OneId`, `j`.`ThreeId`, `s0`.`Id` AS `Id0`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId`, `s0`.`OneId` AS `OneId0`, `s0`.`TwoId`, `s1`.`Id` AS `Id1`, `s1`.`Name` AS `Name1`, `s1`.`Number`, `s1`.`IsGreen`, `s1`.`Discriminator`, `s1`.`EntityBranchId`, `s1`.`EntityOneId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN (
-        SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`
+        SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`
         FROM (
             SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j0`.`OneId`, `j0`.`TwoId`, ROW_NUMBER() OVER(PARTITION BY `j0`.`OneId` ORDER BY `e1`.`Id`) AS `row`
             FROM `JoinOneToTwo` AS `j0`
             INNER JOIN `EntityTwos` AS `e1` ON `j0`.`TwoId` = `e1`.`Id`
-        ) AS `t`
-        WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-    ) AS `t0` ON `e0`.`Id` = `t0`.`OneId`
+        ) AS `s`
+        WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+    ) AS `s0` ON `e0`.`Id` = `s0`.`OneId`
     LEFT JOIN (
-        SELECT `t2`.`Id`, `t2`.`Name`, `t2`.`Number`, `t2`.`IsGreen`, `t2`.`Discriminator`, `j1`.`EntityBranchId`, `j1`.`EntityOneId`
+        SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`, `j1`.`EntityBranchId`, `j1`.`EntityOneId`
         FROM `JoinOneToBranch` AS `j1`
         INNER JOIN (
             SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
@@ -1115,12 +1115,12 @@ INNER JOIN (
             UNION ALL
             SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
             FROM `Leaves` AS `l`
-        ) AS `t2` ON `j1`.`EntityBranchId` = `t2`.`Id`
-        WHERE `t2`.`Id` < 20
-    ) AS `t1` ON `e0`.`Id` = `t1`.`EntityOneId`
+        ) AS `u` ON `j1`.`EntityBranchId` = `u`.`Id`
+        WHERE `u`.`Id` < 20
+    ) AS `s1` ON `e0`.`Id` = `s1`.`EntityOneId`
     WHERE `e0`.`Id` < 10
-) AS `t3` ON `e`.`Id` = `t3`.`ThreeId`
-ORDER BY `e`.`Id`, `t3`.`OneId`, `t3`.`ThreeId`, `t3`.`Id`, `t3`.`OneId0`, `t3`.`Id0`, `t3`.`TwoId`, `t3`.`EntityBranchId`, `t3`.`EntityOneId`
+) AS `s2` ON `e`.`Id` = `s2`.`ThreeId`
+ORDER BY `e`.`Id`, `s2`.`OneId`, `s2`.`ThreeId`, `s2`.`Id`, `s2`.`OneId0`, `s2`.`Id0`, `s2`.`TwoId`, `s2`.`EntityBranchId`, `s2`.`EntityOneId`
 """);
     }
 
@@ -1130,20 +1130,20 @@ public override async Task Filtered_include_on_skip_navigation_then_filtered_inc
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t0`.`Id`, `t0`.`Name`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`Id`, `s`.`Name`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `e0`.`Id`, `e0`.`Name`, `j`.`OneId`, `j`.`ThreeId`, `t`.`Id` AS `Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId`
+    SELECT `e0`.`Id`, `e0`.`Name`, `j`.`OneId`, `j`.`ThreeId`, `e2`.`Id` AS `Id0`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name` AS `Name0`, `e2`.`ReferenceInverseId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
         FROM `EntityTwos` AS `e1`
         WHERE `e1`.`Id` < 5
-    ) AS `t` ON `e0`.`Id` = `t`.`CollectionInverseId`
+    ) AS `e2` ON `e0`.`Id` = `e2`.`CollectionInverseId`
     WHERE `e0`.`Id` > 15
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """);
     }
 
@@ -1153,20 +1153,20 @@ public override async Task Filtered_include_on_navigation_then_filtered_include_
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`Id0`, `t0`.`CollectionInverseId0`, `t0`.`Name0`, `t0`.`ReferenceInverseId0`, `t0`.`ThreeId`, `t0`.`TwoId`
+SELECT `e`.`Id`, `e`.`Name`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`Id0`, `s0`.`CollectionInverseId0`, `s0`.`Name0`, `s0`.`ReferenceInverseId0`, `s0`.`ThreeId`, `s0`.`TwoId`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
-    SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `t`.`Id` AS `Id0`, `t`.`CollectionInverseId` AS `CollectionInverseId0`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId` AS `ReferenceInverseId0`, `t`.`ThreeId`, `t`.`TwoId`
+    SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `s`.`Id` AS `Id0`, `s`.`CollectionInverseId` AS `CollectionInverseId0`, `s`.`Name` AS `Name0`, `s`.`ReferenceInverseId` AS `ReferenceInverseId0`, `s`.`ThreeId`, `s`.`TwoId`
     FROM `EntityTwos` AS `e0`
     LEFT JOIN (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j`.`ThreeId`, `j`.`TwoId`
         FROM `JoinTwoToThree` AS `j`
         INNER JOIN `EntityThrees` AS `e1` ON `j`.`ThreeId` = `e1`.`Id`
         WHERE `e1`.`Id` < 5
-    ) AS `t` ON `e0`.`Id` = `t`.`TwoId`
+    ) AS `s` ON `e0`.`Id` = `s`.`TwoId`
     WHERE `e0`.`Id` > 15
-) AS `t0` ON `e`.`Id` = `t0`.`CollectionInverseId`
-ORDER BY `e`.`Id`, `t0`.`Id`, `t0`.`ThreeId`, `t0`.`TwoId`
+) AS `s0` ON `e`.`Id` = `s0`.`CollectionInverseId`
+ORDER BY `e`.`Id`, `s0`.`Id`, `s0`.`ThreeId`, `s0`.`TwoId`
 """);
     }
 
@@ -1196,10 +1196,10 @@ public override async Task Include_skip_navigation_split(bool async)
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`Slumber`, `t0`.`IsGreen`, `t0`.`IsBrown`, `t0`.`Discriminator`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`Slumber`, `s`.`IsGreen`, `s`.`IsBrown`, `s`.`Discriminator`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityRoot` AS `e0`
     INNER JOIN (
         SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
@@ -1213,8 +1213,8 @@ UNION ALL
         UNION ALL
         SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s`.`CompositeKeySkipSharedKey3`)
 ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 """);
     }
@@ -1231,14 +1231,14 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityTwos` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `j`.`TwoId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
 ORDER BY `e`.`Id`
 """);
     }
@@ -1255,30 +1255,30 @@ public override async Task Include_skip_navigation_then_include_skip_navigation_
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
     SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `Leaves` AS `l` ON `j`.`LeafId` = `l`.`Id`
-) AS `t` ON ((`e`.`Key1` = `t`.`CompositeId1`) AND (`e`.`Key2` = `t`.`CompositeId2`)) AND (`e`.`Key3` = `t`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Id`
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeId1`) AND (`e`.`Key2` = `s`.`CompositeId2`)) AND (`e`.`Key3` = `s`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`Name`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Id`
+SELECT `s0`.`Id`, `s0`.`Name`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Id`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
     SELECT `l`.`Id`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `Leaves` AS `l` ON `j`.`LeafId` = `l`.`Id`
-) AS `t` ON ((`e`.`Key1` = `t`.`CompositeId1`) AND (`e`.`Key2` = `t`.`CompositeId2`)) AND (`e`.`Key3` = `t`.`CompositeId3`)
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeId1`) AND (`e`.`Key2` = `s`.`CompositeId2`)) AND (`e`.`Key3` = `s`.`CompositeId3`)
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `j0`.`EntityBranchId`
     FROM `JoinOneToBranch` AS `j0`
     INNER JOIN `EntityOnes` AS `e0` ON `j0`.`EntityOneId` = `e0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`EntityBranchId`
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Id`
+) AS `s0` ON `s`.`Id` = `s0`.`EntityBranchId`
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Id`
 """);
     }
 
@@ -1294,32 +1294,32 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`, `s`.`Id0`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`Name`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`, `t`.`Id0`
+SELECT `s0`.`Id`, `s0`.`Name`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`, `s`.`Id0`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e1`.`Id` AS `Id0`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 INNER JOIN (
     SELECT `e2`.`Id`, `e2`.`Name`, `j0`.`LeftId`
     FROM `JoinOneSelfPayload` AS `j0`
     INNER JOIN `EntityOnes` AS `e2` ON `j0`.`RightId` = `e2`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`LeftId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`, `t`.`Id0`
+) AS `s0` ON `s`.`Id` = `s0`.`LeftId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -1336,14 +1336,14 @@ public override async Task Include_skip_navigation_and_reference_split(bool asyn
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `e`.`Id`, `e0`.`Id`
+SELECT `s`.`Id`, `s`.`Name`, `e`.`Id`, `e0`.`Id`
 FROM `EntityTwos` AS `e`
 LEFT JOIN `EntityThrees` AS `e0` ON `e`.`Id` = `e0`.`ReferenceInverseId`
 INNER JOIN (
     SELECT `e2`.`Id`, `e2`.`Name`, `e1`.`TwoSkipSharedId`
     FROM `EntityOneEntityTwo` AS `e1`
     INNER JOIN `EntityOnes` AS `e2` ON `e1`.`OneSkipSharedId` = `e2`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`TwoSkipSharedId`
+) AS `s` ON `e`.`Id` = `s`.`TwoSkipSharedId`
 ORDER BY `e`.`Id`, `e0`.`Id`
 """);
     }
@@ -1360,14 +1360,14 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `e`.`Id`
+SELECT `s`.`Id`, `s`.`Name`, `e`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 ORDER BY `e`.`Id`
 """);
     }
@@ -1384,14 +1384,14 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`ThreeId`
     FROM `JoinTwoToThree` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`Id`
 """);
     }
 
@@ -1407,18 +1407,18 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityTwos` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`SelfSkipSharedLeftId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`SelfSkipSharedLeftId`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`SelfSkipSharedLeftId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`SelfSkipSharedLeftId` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityTwoEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`SelfSkipSharedRightId` = `e1`.`Id`
-    ) AS `t`
-    WHERE 2 < `t`.`row`
-) AS `t0` ON `e`.`Id` = `t0`.`SelfSkipSharedLeftId`
-ORDER BY `e`.`Id`, `t0`.`SelfSkipSharedLeftId`, `t0`.`Id`
+    ) AS `s`
+    WHERE 2 < `s`.`row`
+) AS `s0` ON `e`.`Id` = `s0`.`SelfSkipSharedLeftId`
+ORDER BY `e`.`Id`, `s0`.`SelfSkipSharedLeftId`, `s0`.`Id`
 """);
     }
 
@@ -1434,18 +1434,18 @@ public override async Task Filtered_include_skip_navigation_order_by_take_split(
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`CompositeKeySkipSharedKey1`, `t`.`CompositeKeySkipSharedKey2`, `t`.`CompositeKeySkipSharedKey3`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, ROW_NUMBER() OVER(PARTITION BY `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityCompositeKeyEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s0`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`
 """);
     }
 
@@ -1461,18 +1461,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take_s
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, ROW_NUMBER() OVER(PARTITION BY `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinThreeToCompositeKeyFull` AS `j`
         INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeId1`) AND (`e`.`Key2` = `t0`.`CompositeId2`)) AND (`e`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeId1`) AND (`e`.`Key2` = `s0`.`CompositeId2`)) AND (`e`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`
 """);
     }
 
@@ -1482,7 +1482,7 @@ public override async Task Filtered_then_include_skip_navigation_where_split(boo
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`
 FROM (
     SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
     FROM `Roots` AS `r`
@@ -1495,12 +1495,12 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
     FROM `Leaf2s` AS `l0`
-) AS `t`
-ORDER BY `t`.`Id`
+) AS `u`
+ORDER BY `u`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`ThreeSkipSharedId`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -1513,17 +1513,17 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `e`.`RootSkipSharedId`, `e`.`ThreeSkipSharedId`
     FROM `EntityRootEntityThree` AS `e`
     INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
+ORDER BY `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`ThreeSkipSharedId`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t1`.`Id`, `t1`.`Name`, `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`
+SELECT `s0`.`Id`, `s0`.`Name`, `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`ThreeSkipSharedId`, `s`.`Id`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -1536,19 +1536,19 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e0`.`Id`, `e`.`RootSkipSharedId`, `e`.`ThreeSkipSharedId`
     FROM `EntityRootEntityThree` AS `e`
     INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
 INNER JOIN (
     SELECT `e1`.`Id`, `e1`.`Name`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e1` ON `j`.`OneId` = `e1`.`Id`
     WHERE `e1`.`Id` < 10
-) AS `t1` ON `t0`.`Id` = `t1`.`ThreeId`
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`
+) AS `s0` ON `s`.`Id` = `s0`.`ThreeId`
+ORDER BY `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`ThreeSkipSharedId`, `s`.`Id`
 """);
     }
 
@@ -1558,7 +1558,7 @@ public override async Task Filtered_then_include_skip_navigation_order_by_skip_t
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`
 FROM (
     SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
     FROM `Roots` AS `r`
@@ -1571,12 +1571,12 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
     FROM `Leaf2s` AS `l0`
-) AS `t`
-ORDER BY `t`.`Id`
+) AS `u`
+ORDER BY `u`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`Name`, `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+SELECT `s`.`Key1`, `s`.`Key2`, `s`.`Key3`, `s`.`Name`, `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -1589,17 +1589,17 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e0`.`Name`, `e`.`RootSkipSharedId`, `e`.`CompositeKeySkipSharedKey1`, `e`.`CompositeKeySkipSharedKey2`, `e`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityRoot` AS `e`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1`) AND (`e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2`)) AND (`e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`)
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
+ORDER BY `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 """,
                 //
                 """
-SELECT `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`
+SELECT `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -1612,22 +1612,22 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e`.`RootSkipSharedId`, `e`.`CompositeKeySkipSharedKey1`, `e`.`CompositeKeySkipSharedKey2`, `e`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityRoot` AS `e`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1`) AND (`e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2`)) AND (`e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`)
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
 INNER JOIN (
-    SELECT `t2`.`Id`, `t2`.`CollectionInverseId`, `t2`.`Name`, `t2`.`ReferenceInverseId`, `t2`.`CompositeId1`, `t2`.`CompositeId2`, `t2`.`CompositeId3`
+    SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, ROW_NUMBER() OVER(PARTITION BY `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3` ORDER BY `e1`.`Id`) AS `row`
         FROM `JoinThreeToCompositeKeyFull` AS `j`
         INNER JOIN `EntityThrees` AS `e1` ON `j`.`ThreeId` = `e1`.`Id`
-    ) AS `t2`
-    WHERE (1 < `t2`.`row`) AND (`t2`.`row` <= 3)
-) AS `t1` ON ((`t0`.`Key1` = `t1`.`CompositeId1`) AND (`t0`.`Key2` = `t1`.`CompositeId2`)) AND (`t0`.`Key3` = `t1`.`CompositeId3`)
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t1`.`CompositeId1`, `t1`.`CompositeId2`, `t1`.`CompositeId3`, `t1`.`Id`
+    ) AS `s0`
+    WHERE (1 < `s0`.`row`) AND (`s0`.`row` <= 3)
+) AS `s1` ON ((`s`.`Key1` = `s1`.`CompositeId1`) AND (`s`.`Key2` = `s1`.`CompositeId2`)) AND (`s`.`Key3` = `s1`.`CompositeId3`)
+ORDER BY `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`, `s1`.`CompositeId1`, `s1`.`CompositeId2`, `s1`.`CompositeId3`, `s1`.`Id`
 """);
     }
 
@@ -1643,32 +1643,32 @@ ORDER BY `l`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Key1`, `t`.`Key2`, `t`.`Key3`, `t`.`Name`, `l`.`Id`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+SELECT `s`.`Key1`, `s`.`Key2`, `s`.`Key3`, `s`.`Name`, `l`.`Id`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
 FROM `Leaves` AS `l`
 INNER JOIN (
     SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `EntityCompositeKeys` AS `e` ON ((`j`.`CompositeId1` = `e`.`Key1`) AND (`j`.`CompositeId2` = `e`.`Key2`)) AND (`j`.`CompositeId3` = `e`.`Key3`)
     WHERE `e`.`Key1` < 5
-) AS `t` ON `l`.`Id` = `t`.`LeafId`
-ORDER BY `l`.`Id`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Key1`, `t`.`Key2`, `t`.`Key3`
+) AS `s` ON `l`.`Id` = `s`.`LeafId`
+ORDER BY `l`.`Id`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `l`.`Id`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Key1`, `t`.`Key2`, `t`.`Key3`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `l`.`Id`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 FROM `Leaves` AS `l`
 INNER JOIN (
     SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `EntityCompositeKeys` AS `e` ON ((`j`.`CompositeId1` = `e`.`Key1`) AND (`j`.`CompositeId2` = `e`.`Key2`)) AND (`j`.`CompositeId3` = `e`.`Key3`)
     WHERE `e`.`Key1` < 5
-) AS `t` ON `l`.`Id` = `t`.`LeafId`
+) AS `s` ON `l`.`Id` = `s`.`LeafId`
 INNER JOIN (
     SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityTwo` AS `e0`
     INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-) AS `t0` ON ((`t`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`t`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`t`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `l`.`Id`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Key1`, `t`.`Key2`, `t`.`Key3`
+) AS `s0` ON ((`s`.`Key1` = `s0`.`CompositeKeySkipSharedKey1`) AND (`s`.`Key2` = `s0`.`CompositeKeySkipSharedKey2`)) AND (`s`.`Key3` = `s0`.`CompositeKeySkipSharedKey3`)
+ORDER BY `l`.`Id`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 """);
     }
 
@@ -1684,39 +1684,39 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t0`.`OneId`, `t0`.`TwoId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `e`.`Id`, `s0`.`OneId`, `s0`.`TwoId`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`, ROW_NUMBER() OVER(PARTITION BY `j`.`OneId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToTwo` AS `j`
         INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON `e`.`Id` = `t0`.`OneId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`Id`, `t0`.`TwoId`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON `e`.`Id` = `s0`.`OneId`
+ORDER BY `e`.`Id`, `s0`.`OneId`, `s0`.`Id`, `s0`.`TwoId`
 """,
                 //
                 """
-SELECT `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `e`.`Id`, `t0`.`OneId`, `t0`.`TwoId`, `t0`.`Id`
+SELECT `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `e`.`Id`, `s0`.`OneId`, `s0`.`TwoId`, `s0`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`OneId`, `t`.`TwoId`
+    SELECT `s`.`Id`, `s`.`OneId`, `s`.`TwoId`
     FROM (
         SELECT `e0`.`Id`, `j`.`OneId`, `j`.`TwoId`, ROW_NUMBER() OVER(PARTITION BY `j`.`OneId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToTwo` AS `j`
         INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON `e`.`Id` = `t0`.`OneId`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON `e`.`Id` = `s0`.`OneId`
 INNER JOIN (
     SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j0`.`TwoId`
     FROM `JoinTwoToThree` AS `j0`
     INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
     WHERE `e1`.`Id` < 10
-) AS `t1` ON `t0`.`Id` = `t1`.`TwoId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`Id`, `t0`.`TwoId`
+) AS `s1` ON `s0`.`Id` = `s1`.`TwoId`
+ORDER BY `e`.`Id`, `s0`.`OneId`, `s0`.`Id`, `s0`.`TwoId`
 """);
     }
 
@@ -1732,36 +1732,36 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`TwoId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`TwoId`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`OneId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`OneId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+SELECT `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `j`.`OneId`, `j`.`TwoId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`OneId`
+) AS `s` ON `e`.`Id` = `s`.`OneId`
 INNER JOIN (
-    SELECT `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t1`.`TwoId`
+    SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`TwoId`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j0`.`TwoId`, ROW_NUMBER() OVER(PARTITION BY `j0`.`TwoId` ORDER BY `e1`.`Id`) AS `row`
         FROM `JoinTwoToThree` AS `j0`
         INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
-    ) AS `t1`
-    WHERE (1 < `t1`.`row`) AND (`t1`.`row` <= 3)
-) AS `t0` ON `t`.`Id` = `t0`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t0`.`TwoId`, `t0`.`Id`
+    ) AS `s0`
+    WHERE (1 < `s0`.`row`) AND (`s0`.`row` <= 3)
+) AS `s1` ON `s`.`Id` = `s1`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s1`.`TwoId`, `s1`.`Id`
 """);
     }
 
@@ -1777,7 +1777,7 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`TwoId`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`TwoId`
 FROM `EntityTwos` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`
@@ -1785,12 +1785,12 @@ INNER JOIN (
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 """,
                 //
                 """
-SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 FROM `EntityTwos` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e1`.`Id` AS `Id0`, `j`.`OneId`, `j`.`TwoId`
@@ -1798,9 +1798,9 @@ INNER JOIN (
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-INNER JOIN `EntityTwos` AS `e2` ON `t`.`Id` = `e2`.`CollectionInverseId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+INNER JOIN `EntityTwos` AS `e2` ON `s`.`Id` = `e2`.`CollectionInverseId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -1816,60 +1816,60 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`
+SELECT `s`.`Id`, `s`.`Name`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+SELECT `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`ExtraId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 INNER JOIN (
-    SELECT `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`ExtraId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t1`.`OneId`
+    SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`OneId`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j0`.`OneId`, ROW_NUMBER() OVER(PARTITION BY `j0`.`OneId` ORDER BY `e1`.`Id`) AS `row`
         FROM `JoinOneToTwo` AS `j0`
         INNER JOIN `EntityTwos` AS `e1` ON `j0`.`TwoId` = `e1`.`Id`
-    ) AS `t1`
-    WHERE (1 < `t1`.`row`) AND (`t1`.`row` <= 3)
-) AS `t0` ON `t`.`Id` = `t0`.`OneId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`, `t0`.`OneId`, `t0`.`Id`
+    ) AS `s0`
+    WHERE (1 < `s0`.`row`) AND (`s0`.`row` <= 3)
+) AS `s1` ON `s`.`Id` = `s1`.`OneId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`, `s1`.`OneId`, `s1`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+SELECT `s2`.`Id`, `s2`.`Name`, `s2`.`Number`, `s2`.`IsGreen`, `s2`.`Discriminator`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 INNER JOIN (
-    SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`Number`, `t1`.`IsGreen`, `t1`.`Discriminator`, `j0`.`EntityOneId`
-    FROM `JoinOneToBranch` AS `j0`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`, `j1`.`EntityOneId`
+    FROM `JoinOneToBranch` AS `j1`
     INNER JOIN (
         SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
         FROM `Branches` AS `b`
         UNION ALL
         SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
         FROM `Leaves` AS `l`
-    ) AS `t1` ON `j0`.`EntityBranchId` = `t1`.`Id`
-    WHERE `t1`.`Id` < 20
-) AS `t0` ON `t`.`Id` = `t0`.`EntityOneId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+    ) AS `u` ON `j1`.`EntityBranchId` = `u`.`Id`
+    WHERE `u`.`Id` < 20
+) AS `s2` ON `s`.`Id` = `s2`.`EntityOneId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """);
     }
 
@@ -1885,32 +1885,32 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`
+SELECT `s`.`Id`, `s`.`Name`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` > 15
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` > 15
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 INNER JOIN (
     SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
     FROM `EntityTwos` AS `e1`
     WHERE `e1`.`Id` < 5
-) AS `t0` ON `t`.`Id` = `t0`.`CollectionInverseId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+) AS `e2` ON `s`.`Id` = `e2`.`CollectionInverseId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """);
     }
 
@@ -1926,31 +1926,31 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
     FROM `EntityTwos` AS `e0`
     WHERE `e0`.`Id` > 15
-) AS `t` ON `e`.`Id` = `t`.`CollectionInverseId`
-ORDER BY `e`.`Id`, `t`.`Id`
+) AS `e2` ON `e`.`Id` = `e2`.`CollectionInverseId`
+ORDER BY `e`.`Id`, `e2`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t`.`Id`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `e`.`Id`, `e2`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`
     FROM `EntityTwos` AS `e0`
     WHERE `e0`.`Id` > 15
-) AS `t` ON `e`.`Id` = `t`.`CollectionInverseId`
+) AS `e2` ON `e`.`Id` = `e2`.`CollectionInverseId`
 INNER JOIN (
     SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j`.`TwoId`
     FROM `JoinTwoToThree` AS `j`
     INNER JOIN `EntityThrees` AS `e1` ON `j`.`ThreeId` = `e1`.`Id`
     WHERE `e1`.`Id` < 5
-) AS `t0` ON `t`.`Id` = `t0`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`Id`
+) AS `s` ON `e2`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `e2`.`Id`
 """);
     }
 
@@ -1995,13 +1995,13 @@ public override async Task Select_many_over_skip_navigation_where_non_equality(b
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-) AS `t` ON (`e`.`Id` = `t`.`OneId`) AND (`e`.`Id` <> `t`.`Id`)
+) AS `s` ON (`e`.`Id` = `s`.`OneId`) AND (`e`.`Id` <> `s`.`Id`)
 """);
     }
 
@@ -2062,14 +2062,14 @@ public override async Task GetType_in_hierarchy_in_querying_base_type(bool async
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
     FROM `Branches` AS `b`
     UNION ALL
     SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
     FROM `Leaves` AS `l`
-) AS `t`
+) AS `u`
 WHERE FALSE
 """);
     }
@@ -2080,18 +2080,18 @@ public override async Task Filtered_include_skip_navigation_order_by_take_EF_Pro
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`TwoSkipSharedId`, `t`.`CompositeKeySkipSharedKey1`, `t`.`CompositeKeySkipSharedKey2`, `t`.`CompositeKeySkipSharedKey3`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`TwoSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`TwoSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, ROW_NUMBER() OVER(PARTITION BY `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityCompositeKeyEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s0`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`
 """);
     }
 
@@ -2102,10 +2102,10 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take_t
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`ExtraId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`Id0`, `t1`.`CollectionInverseId0`, `t1`.`Name0`, `t1`.`ReferenceInverseId0`, `t1`.`ThreeId`, `t1`.`TwoId0`
+SELECT `e`.`Id`, `e`.`Name`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`ExtraId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`Id0`, `s1`.`CollectionInverseId0`, `s1`.`Name0`, `s1`.`ReferenceInverseId0`, `s1`.`ThreeId`, `s1`.`TwoId0`
 FROM `EntityOnes` AS `e`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`, `t0`.`Id` AS `Id0`, `t0`.`CollectionInverseId` AS `CollectionInverseId0`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId` AS `ReferenceInverseId0`, `t0`.`ThreeId`, `t0`.`TwoId` AS `TwoId0`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`, `s0`.`Id` AS `Id0`, `s0`.`CollectionInverseId` AS `CollectionInverseId0`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId` AS `ReferenceInverseId0`, `s0`.`ThreeId`, `s0`.`TwoId` AS `TwoId0`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`
         FROM `JoinOneToTwo` AS `j`
@@ -2113,15 +2113,15 @@ LEFT JOIN LATERAL (
         WHERE `e`.`Id` = `j`.`OneId`
         ORDER BY `e0`.`Id`
         LIMIT 2 OFFSET 1
-    ) AS `t`
+    ) AS `s`
     LEFT JOIN (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `j0`.`ThreeId`, `j0`.`TwoId`
         FROM `JoinTwoToThree` AS `j0`
         INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
         WHERE `e1`.`Id` < 10
-    ) AS `t0` ON `t`.`Id` = `t0`.`TwoId`
-) AS `t1` ON TRUE
-ORDER BY `e`.`Id`, `t1`.`Id`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`ThreeId`, `t1`.`TwoId0`
+    ) AS `s0` ON `s`.`Id` = `s0`.`TwoId`
+) AS `s1` ON TRUE
+ORDER BY `e`.`Id`, `s1`.`Id`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`ThreeId`, `s1`.`TwoId0`
 """);
     }
 
@@ -2208,13 +2208,13 @@ ORDER BY (
     SELECT COUNT(*)
     FROM `UnidirectionalJoinOneToBranch` AS `u0`
     INNER JOIN (
-        SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
+        SELECT `u1`.`Id`, `u1`.`Name`
         FROM `UnidirectionalBranches` AS `u1`
         UNION ALL
-        SELECT `u2`.`Id`, `u2`.`Name`, `u2`.`Number`, `u2`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
+        SELECT `u2`.`Id`, `u2`.`Name`
         FROM `UnidirectionalLeaves` AS `u2`
-    ) AS `t` ON `u0`.`UnidirectionalEntityBranchId` = `t`.`Id`
-    WHERE (`u`.`Id` = `u0`.`UnidirectionalEntityOneId`) AND (`t`.`Name` LIKE 'L%')), `u`.`Id`
+    ) AS `u3` ON `u0`.`UnidirectionalEntityBranchId` = `u3`.`Id`
+    WHERE (`u`.`Id` = `u0`.`UnidirectionalEntityOneId`) AND (`u3`.`Name` LIKE 'L%')), `u`.`Id`
 """);
     }
 
@@ -2239,17 +2239,17 @@ public override async Task Skip_navigation_order_by_reverse_first_or_default_uni
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityThrees` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`ThreeId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`ThreeId` ORDER BY `u1`.`Id` DESC) AS `row`
         FROM `UnidirectionalJoinTwoToThree` AS `u0`
         INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoId` = `u1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `u`.`Id` = `t0`.`ThreeId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `u`.`Id` = `s0`.`ThreeId`
 """);
     }
 
@@ -2258,11 +2258,11 @@ public override async Task Skip_navigation_of_type_unidirectional(bool async)
         await base.Skip_navigation_of_type_unidirectional(async);
 
         AssertSql(
-$"""
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`, `t0`.`RootSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+"""
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`, `s`.`RootSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `u0`.`RootSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`
+    SELECT `u4`.`Id`, `u4`.`Name`, `u4`.`Number`, `u4`.`IsGreen`, `u4`.`Discriminator`, `u0`.`RootSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`
     FROM `UnidirectionalEntityCompositeKeyUnidirectionalEntityRoot` AS `u0`
     INNER JOIN (
         SELECT `u1`.`Id`, `u1`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'UnidirectionalEntityRoot' AS `Discriminator`
@@ -2271,12 +2271,12 @@ UNION ALL
         SELECT `u2`.`Id`, `u2`.`Name`, `u2`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
         FROM `UnidirectionalBranches` AS `u2`
         UNION ALL
-        SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'UnidirectionalEntityLeaf'")} AS `Discriminator`
+        SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
         FROM `UnidirectionalLeaves` AS `u3`
-    ) AS `t` ON `u0`.`RootSkipSharedId` = `t`.`Id`
-    WHERE `t`.`Discriminator` = 'UnidirectionalEntityLeaf'
-) AS `t0` ON ((`u`.`Key1` = `t0`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `t0`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `t0`.`UnidirectionalEntityCompositeKeyKey3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`RootSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+    ) AS `u4` ON `u0`.`RootSkipSharedId` = `u4`.`Id`
+    WHERE `u4`.`Discriminator` = 'UnidirectionalEntityLeaf'
+) AS `s` ON ((`u`.`Key1` = `s`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `s`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `s`.`UnidirectionalEntityCompositeKeyKey3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s`.`RootSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
 """);
     }
 
@@ -2329,22 +2329,22 @@ public override async Task Select_many_over_skip_navigation_unidirectional(bool
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM (
-    SELECT `u1`.`Id`
-    FROM `UnidirectionalRoots` AS `u1`
+    SELECT `u`.`Id`
+    FROM `UnidirectionalRoots` AS `u`
     UNION ALL
-    SELECT `u2`.`Id`
-    FROM `UnidirectionalBranches` AS `u2`
+    SELECT `u0`.`Id`
+    FROM `UnidirectionalBranches` AS `u0`
     UNION ALL
-    SELECT `u3`.`Id`
-    FROM `UnidirectionalLeaves` AS `u3`
-) AS `t`
+    SELECT `u1`.`Id`
+    FROM `UnidirectionalLeaves` AS `u1`
+) AS `u2`
 INNER JOIN (
-    SELECT `u0`.`Id`, `u0`.`CollectionInverseId`, `u0`.`Name`, `u0`.`ReferenceInverseId`, `u`.`UnidirectionalEntityRootId`
-    FROM `UnidirectionalEntityRootUnidirectionalEntityThree` AS `u`
-    INNER JOIN `UnidirectionalEntityThrees` AS `u0` ON `u`.`ThreeSkipSharedId` = `u0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`UnidirectionalEntityRootId`
+    SELECT `u4`.`Id`, `u4`.`CollectionInverseId`, `u4`.`Name`, `u4`.`ReferenceInverseId`, `u3`.`UnidirectionalEntityRootId`
+    FROM `UnidirectionalEntityRootUnidirectionalEntityThree` AS `u3`
+    INNER JOIN `UnidirectionalEntityThrees` AS `u4` ON `u3`.`ThreeSkipSharedId` = `u4`.`Id`
+) AS `s` ON `u2`.`Id` = `s`.`UnidirectionalEntityRootId`
 """);
     }
 
@@ -2354,13 +2354,13 @@ public override async Task Select_many_over_skip_navigation_where_unidirectional
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `UnidirectionalEntityOnes` AS `u`
 LEFT JOIN (
     SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`OneId`
     FROM `UnidirectionalJoinOneToTwo` AS `u0`
     INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoId` = `u1`.`Id`
-) AS `t` ON `u`.`Id` = `t`.`OneId`
+) AS `s` ON `u`.`Id` = `s`.`OneId`
 """);
     }
 
@@ -2370,17 +2370,17 @@ public override async Task Select_many_over_skip_navigation_order_by_take_unidir
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityOnes` AS `u`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`UnidirectionalEntityOneId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`UnidirectionalEntityOneId`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`UnidirectionalEntityOneId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`UnidirectionalEntityOneId` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalEntityOneUnidirectionalEntityTwo` AS `u0`
         INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoSkipSharedId` = `u1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON `u`.`Id` = `t0`.`UnidirectionalEntityOneId`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON `u`.`Id` = `s0`.`UnidirectionalEntityOneId`
 """);
     }
 
@@ -2390,17 +2390,17 @@ public override async Task Select_many_over_skip_navigation_order_by_skip_take_u
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityOnes` AS `u`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`OneId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`OneId` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalJoinOneToThreePayloadFullShared` AS `u0`
         INNER JOIN `UnidirectionalEntityThrees` AS `u1` ON `u0`.`ThreeId` = `u1`.`Id`
-    ) AS `t`
-    WHERE (2 < `t`.`row`) AND (`t`.`row` <= 5)
-) AS `t0` ON `u`.`Id` = `t0`.`OneId`
+    ) AS `s`
+    WHERE (2 < `s`.`row`) AND (`s`.`row` <= 5)
+) AS `s0` ON `u`.`Id` = `s0`.`OneId`
 """);
     }
 
@@ -2410,10 +2410,10 @@ public override async Task Select_many_over_skip_navigation_cast_unidirectional(
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`
 FROM `UnidirectionalEntityOnes` AS `u`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `u0`.`UnidirectionalEntityOneId`
+    SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, `u3`.`Discriminator`, `u0`.`UnidirectionalEntityOneId`
     FROM `UnidirectionalJoinOneToBranch` AS `u0`
     INNER JOIN (
         SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
@@ -2421,8 +2421,8 @@ INNER JOIN (
         UNION ALL
         SELECT `u2`.`Id`, `u2`.`Name`, `u2`.`Number`, `u2`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
         FROM `UnidirectionalLeaves` AS `u2`
-    ) AS `t` ON `u0`.`UnidirectionalEntityBranchId` = `t`.`Id`
-) AS `t0` ON `u`.`Id` = `t0`.`UnidirectionalEntityOneId`
+    ) AS `u3` ON `u0`.`UnidirectionalEntityBranchId` = `u3`.`Id`
+) AS `s` ON `u`.`Id` = `s`.`UnidirectionalEntityOneId`
 """);
     }
 
@@ -2432,14 +2432,14 @@ public override async Task Select_skip_navigation_unidirectional(bool async)
 
         AssertSql(
 """
-SELECT `u`.`Id`, `t`.`Id`, `t`.`Name`, `t`.`LeftId`, `t`.`RightId`
+SELECT `u`.`Id`, `s`.`Id`, `s`.`Name`, `s`.`LeftId`, `s`.`RightId`
 FROM `UnidirectionalEntityOnes` AS `u`
 LEFT JOIN (
     SELECT `u1`.`Id`, `u1`.`Name`, `u0`.`LeftId`, `u0`.`RightId`
     FROM `UnidirectionalJoinOneSelfPayload` AS `u0`
     INNER JOIN `UnidirectionalEntityOnes` AS `u1` ON `u0`.`LeftId` = `u1`.`Id`
-) AS `t` ON `u`.`Id` = `t`.`RightId`
-ORDER BY `u`.`Id`, `t`.`LeftId`, `t`.`RightId`
+) AS `s` ON `u`.`Id` = `s`.`RightId`
+ORDER BY `u`.`Id`, `s`.`LeftId`, `s`.`RightId`
 """);
     }
 
@@ -2448,11 +2448,11 @@ public override async Task Include_skip_navigation_unidirectional(bool async)
         await base.Include_skip_navigation_unidirectional(async);
 
         AssertSql(
-$"""
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`, `t0`.`RootSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+"""
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`, `s`.`RootSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `u0`.`RootSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`
+    SELECT `u4`.`Id`, `u4`.`Name`, `u4`.`Number`, `u4`.`IsGreen`, `u4`.`Discriminator`, `u0`.`RootSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`
     FROM `UnidirectionalEntityCompositeKeyUnidirectionalEntityRoot` AS `u0`
     INNER JOIN (
         SELECT `u1`.`Id`, `u1`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'UnidirectionalEntityRoot' AS `Discriminator`
@@ -2461,11 +2461,11 @@ UNION ALL
         SELECT `u2`.`Id`, `u2`.`Name`, `u2`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
         FROM `UnidirectionalBranches` AS `u2`
         UNION ALL
-        SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'UnidirectionalEntityLeaf'")} AS `Discriminator`
+        SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
         FROM `UnidirectionalLeaves` AS `u3`
-    ) AS `t` ON `u0`.`RootSkipSharedId` = `t`.`Id`
-) AS `t0` ON ((`u`.`Key1` = `t0`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `t0`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `t0`.`UnidirectionalEntityCompositeKeyKey3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`RootSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+    ) AS `u4` ON `u0`.`RootSkipSharedId` = `u4`.`Id`
+) AS `s` ON ((`u`.`Key1` = `s`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `s`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `s`.`UnidirectionalEntityCompositeKeyKey3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s`.`RootSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
 """);
     }
 
@@ -2475,15 +2475,15 @@ public override async Task Include_skip_navigation_then_reference_unidirectional
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`
 FROM `UnidirectionalEntityTwos` AS `u`
 LEFT JOIN (
     SELECT `u1`.`Id`, `u1`.`Name`, `u2`.`Id` AS `Id0`, `u2`.`CollectionInverseId`, `u2`.`ExtraId`, `u2`.`Name` AS `Name0`, `u2`.`ReferenceInverseId`, `u0`.`OneId`, `u0`.`TwoId`
     FROM `UnidirectionalJoinOneToTwo` AS `u0`
     INNER JOIN `UnidirectionalEntityOnes` AS `u1` ON `u0`.`OneId` = `u1`.`Id`
     LEFT JOIN `UnidirectionalEntityTwos` AS `u2` ON `u1`.`Id` = `u2`.`ReferenceInverseId`
-) AS `t` ON `u`.`Id` = `t`.`TwoId`
-ORDER BY `u`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+) AS `s` ON `u`.`Id` = `s`.`TwoId`
+ORDER BY `u`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
 """);
     }
 
@@ -2493,19 +2493,19 @@ public override async Task Include_skip_navigation_then_include_skip_navigation_
 
         AssertSql(
 """
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id0`, `t0`.`Name0`, `t0`.`UnidirectionalEntityBranchId`, `t0`.`UnidirectionalEntityOneId`
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `s0`.`Id`, `s0`.`Name`, `s0`.`Number`, `s0`.`IsGreen`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id0`, `s0`.`Name0`, `s0`.`UnidirectionalEntityBranchId`, `s0`.`UnidirectionalEntityOneId`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, `u1`.`IsGreen`, `u0`.`LeafId`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `t`.`Id` AS `Id0`, `t`.`Name` AS `Name0`, `t`.`UnidirectionalEntityBranchId`, `t`.`UnidirectionalEntityOneId`
+    SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, `u1`.`IsGreen`, `u0`.`LeafId`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `s`.`Id` AS `Id0`, `s`.`Name` AS `Name0`, `s`.`UnidirectionalEntityBranchId`, `s`.`UnidirectionalEntityOneId`
     FROM `UnidirectionalJoinCompositeKeyToLeaf` AS `u0`
     INNER JOIN `UnidirectionalLeaves` AS `u1` ON `u0`.`LeafId` = `u1`.`Id`
     LEFT JOIN (
         SELECT `u3`.`Id`, `u3`.`Name`, `u2`.`UnidirectionalEntityBranchId`, `u2`.`UnidirectionalEntityOneId`
         FROM `UnidirectionalJoinOneToBranch` AS `u2`
         INNER JOIN `UnidirectionalEntityOnes` AS `u3` ON `u2`.`UnidirectionalEntityOneId` = `u3`.`Id`
-    ) AS `t` ON `u1`.`Id` = `t`.`UnidirectionalEntityBranchId`
-) AS `t0` ON ((`u`.`Key1` = `t0`.`CompositeId1`) AND (`u`.`Key2` = `t0`.`CompositeId2`)) AND (`u`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`, `t0`.`UnidirectionalEntityBranchId`, `t0`.`UnidirectionalEntityOneId`
+    ) AS `s` ON `u1`.`Id` = `s`.`UnidirectionalEntityBranchId`
+) AS `s0` ON ((`u`.`Key1` = `s0`.`CompositeId1`) AND (`u`.`Key2` = `s0`.`CompositeId2`)) AND (`u`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`, `s0`.`UnidirectionalEntityBranchId`, `s0`.`UnidirectionalEntityOneId`
 """);
     }
 
@@ -2515,10 +2515,10 @@ public override async Task Include_skip_navigation_then_include_reference_and_sk
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t0`.`Id`, `t0`.`Name`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id1`, `t0`.`Name1`, `t0`.`LeftId`, `t0`.`RightId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s0`.`Id`, `s0`.`Name`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Id1`, `s0`.`Name1`, `s0`.`LeftId`, `s0`.`RightId`
 FROM `UnidirectionalEntityThrees` AS `u`
 LEFT JOIN (
-    SELECT `u1`.`Id`, `u1`.`Name`, `u2`.`Id` AS `Id0`, `u2`.`CollectionInverseId`, `u2`.`ExtraId`, `u2`.`Name` AS `Name0`, `u2`.`ReferenceInverseId`, `u0`.`OneId`, `u0`.`ThreeId`, `t`.`Id` AS `Id1`, `t`.`Name` AS `Name1`, `t`.`LeftId`, `t`.`RightId`
+    SELECT `u1`.`Id`, `u1`.`Name`, `u2`.`Id` AS `Id0`, `u2`.`CollectionInverseId`, `u2`.`ExtraId`, `u2`.`Name` AS `Name0`, `u2`.`ReferenceInverseId`, `u0`.`OneId`, `u0`.`ThreeId`, `s`.`Id` AS `Id1`, `s`.`Name` AS `Name1`, `s`.`LeftId`, `s`.`RightId`
     FROM `UnidirectionalJoinOneToThreePayloadFull` AS `u0`
     INNER JOIN `UnidirectionalEntityOnes` AS `u1` ON `u0`.`OneId` = `u1`.`Id`
     LEFT JOIN `UnidirectionalEntityTwos` AS `u2` ON `u1`.`Id` = `u2`.`ReferenceInverseId`
@@ -2526,9 +2526,9 @@ LEFT JOIN (
         SELECT `u4`.`Id`, `u4`.`Name`, `u3`.`LeftId`, `u3`.`RightId`
         FROM `UnidirectionalJoinOneSelfPayload` AS `u3`
         INNER JOIN `UnidirectionalEntityOnes` AS `u4` ON `u3`.`RightId` = `u4`.`Id`
-    ) AS `t` ON `u1`.`Id` = `t`.`LeftId`
-) AS `t0` ON `u`.`Id` = `t0`.`ThreeId`
-ORDER BY `u`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id`, `t0`.`Id0`, `t0`.`LeftId`, `t0`.`RightId`
+    ) AS `s` ON `u1`.`Id` = `s`.`LeftId`
+) AS `s0` ON `u`.`Id` = `s0`.`ThreeId`
+ORDER BY `u`.`Id`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Id`, `s0`.`Id0`, `s0`.`LeftId`, `s0`.`RightId`
 """);
     }
 
@@ -2538,15 +2538,15 @@ public override async Task Include_skip_navigation_and_reference_unidirectional(
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `u0`.`Id`, `t`.`Id`, `t`.`Name`, `t`.`TwoSkipSharedId`, `t`.`UnidirectionalEntityOneId`, `u0`.`CollectionInverseId`, `u0`.`Name`, `u0`.`ReferenceInverseId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `u0`.`Id`, `s`.`Id`, `s`.`Name`, `s`.`TwoSkipSharedId`, `s`.`UnidirectionalEntityOneId`, `u0`.`CollectionInverseId`, `u0`.`Name`, `u0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityTwos` AS `u`
 LEFT JOIN `UnidirectionalEntityThrees` AS `u0` ON `u`.`Id` = `u0`.`ReferenceInverseId`
 LEFT JOIN (
     SELECT `u2`.`Id`, `u2`.`Name`, `u1`.`TwoSkipSharedId`, `u1`.`UnidirectionalEntityOneId`
     FROM `UnidirectionalEntityOneUnidirectionalEntityTwo` AS `u1`
     INNER JOIN `UnidirectionalEntityOnes` AS `u2` ON `u1`.`UnidirectionalEntityOneId` = `u2`.`Id`
-) AS `t` ON `u`.`Id` = `t`.`TwoSkipSharedId`
-ORDER BY `u`.`Id`, `u0`.`Id`, `t`.`TwoSkipSharedId`, `t`.`UnidirectionalEntityOneId`
+) AS `s` ON `u`.`Id` = `s`.`TwoSkipSharedId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `s`.`TwoSkipSharedId`, `s`.`UnidirectionalEntityOneId`
 """);
     }
 
@@ -2556,15 +2556,15 @@ public override async Task Filtered_include_skip_navigation_where_unidirectional
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`Id`, `t`.`Name`, `t`.`OneId`, `t`.`ThreeId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`Id`, `s`.`Name`, `s`.`OneId`, `s`.`ThreeId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `j`.`OneId`, `j`.`ThreeId`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`
 """);
     }
 
@@ -2574,14 +2574,14 @@ public override async Task Filtered_include_skip_navigation_order_by_unidirectio
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`, `t`.`TwoId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`, `s`.`TwoId`
 FROM `UnidirectionalEntityThrees` AS `u`
 LEFT JOIN (
     SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`ThreeId`, `u0`.`TwoId`
     FROM `UnidirectionalJoinTwoToThree` AS `u0`
     INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoId` = `u1`.`Id`
-) AS `t` ON `u`.`Id` = `t`.`ThreeId`
-ORDER BY `u`.`Id`, `t`.`Id`, `t`.`ThreeId`
+) AS `s` ON `u`.`Id` = `s`.`ThreeId`
+ORDER BY `u`.`Id`, `s`.`Id`, `s`.`ThreeId`
 """);
     }
 
@@ -2591,18 +2591,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_unidir
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`SelfSkipSharedRightId`, `t0`.`UnidirectionalEntityTwoId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`SelfSkipSharedRightId`, `s0`.`UnidirectionalEntityTwoId`
 FROM `UnidirectionalEntityTwos` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`SelfSkipSharedRightId`, `t`.`UnidirectionalEntityTwoId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`SelfSkipSharedRightId`, `s`.`UnidirectionalEntityTwoId`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`SelfSkipSharedRightId`, `u0`.`UnidirectionalEntityTwoId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`UnidirectionalEntityTwoId` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalEntityTwoUnidirectionalEntityTwo` AS `u0`
         INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`SelfSkipSharedRightId` = `u1`.`Id`
-    ) AS `t`
-    WHERE 2 < `t`.`row`
-) AS `t0` ON `u`.`Id` = `t0`.`UnidirectionalEntityTwoId`
-ORDER BY `u`.`Id`, `t0`.`UnidirectionalEntityTwoId`, `t0`.`Id`
+    ) AS `s`
+    WHERE 2 < `s`.`row`
+) AS `s0` ON `u`.`Id` = `s0`.`UnidirectionalEntityTwoId`
+ORDER BY `u`.`Id`, `s0`.`UnidirectionalEntityTwoId`, `s0`.`Id`
 """);
     }
 
@@ -2612,18 +2612,18 @@ public override async Task Filtered_include_skip_navigation_order_by_take_unidir
 
         AssertSql(
 """
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`TwoSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`TwoSkipSharedId`, `s0`.`UnidirectionalEntityCompositeKeyKey1`, `s0`.`UnidirectionalEntityCompositeKeyKey2`, `s0`.`UnidirectionalEntityCompositeKeyKey3`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`TwoSkipSharedId`, `t`.`UnidirectionalEntityCompositeKeyKey1`, `t`.`UnidirectionalEntityCompositeKeyKey2`, `t`.`UnidirectionalEntityCompositeKeyKey3`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`TwoSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`TwoSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`, ROW_NUMBER() OVER(PARTITION BY `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalEntityCompositeKeyUnidirectionalEntityTwo` AS `u0`
         INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoSkipSharedId` = `u1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON ((`u`.`Key1` = `t0`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `t0`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `t0`.`UnidirectionalEntityCompositeKeyKey3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`, `t0`.`Id`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON ((`u`.`Key1` = `s0`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `s0`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `s0`.`UnidirectionalEntityCompositeKeyKey3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s0`.`UnidirectionalEntityCompositeKeyKey1`, `s0`.`UnidirectionalEntityCompositeKeyKey2`, `s0`.`UnidirectionalEntityCompositeKeyKey3`, `s0`.`Id`
 """);
     }
 
@@ -2632,18 +2632,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take_u
         await base.Filtered_include_skip_navigation_order_by_skip_take_unidirectional(async);
         AssertSql(
 """
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`Id0`
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`Id0`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`Id0`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`Id0`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`Id` AS `Id0`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, ROW_NUMBER() OVER(PARTITION BY `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalJoinThreeToCompositeKeyFull` AS `u0`
         INNER JOIN `UnidirectionalEntityThrees` AS `u1` ON `u0`.`ThreeId` = `u1`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON ((`u`.`Key1` = `t0`.`CompositeId1`) AND (`u`.`Key2` = `t0`.`CompositeId2`)) AND (`u`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON ((`u`.`Key1` = `s0`.`CompositeId1`) AND (`u`.`Key2` = `s0`.`CompositeId2`)) AND (`u`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`
 """);
     }
 
@@ -2653,20 +2653,20 @@ public override async Task Filtered_include_skip_navigation_where_then_include_s
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`Name`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`, `t0`.`TwoSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`Name`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`, `s0`.`TwoSkipSharedId`, `s0`.`UnidirectionalEntityCompositeKeyKey1`, `s0`.`UnidirectionalEntityCompositeKeyKey2`, `s0`.`UnidirectionalEntityCompositeKeyKey3`
 FROM `UnidirectionalLeaves` AS `u`
 LEFT JOIN (
-    SELECT `u1`.`Key1`, `u1`.`Key2`, `u1`.`Key3`, `u1`.`Name`, `u0`.`LeafId`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId`, `t`.`TwoSkipSharedId`, `t`.`UnidirectionalEntityCompositeKeyKey1`, `t`.`UnidirectionalEntityCompositeKeyKey2`, `t`.`UnidirectionalEntityCompositeKeyKey3`
+    SELECT `u1`.`Key1`, `u1`.`Key2`, `u1`.`Key3`, `u1`.`Name`, `u0`.`LeafId`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name` AS `Name0`, `s`.`ReferenceInverseId`, `s`.`TwoSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
     FROM `UnidirectionalJoinCompositeKeyToLeaf` AS `u0`
     INNER JOIN `UnidirectionalEntityCompositeKeys` AS `u1` ON ((`u0`.`CompositeId1` = `u1`.`Key1`) AND (`u0`.`CompositeId2` = `u1`.`Key2`)) AND (`u0`.`CompositeId3` = `u1`.`Key3`)
     LEFT JOIN (
         SELECT `u3`.`Id`, `u3`.`CollectionInverseId`, `u3`.`ExtraId`, `u3`.`Name`, `u3`.`ReferenceInverseId`, `u2`.`TwoSkipSharedId`, `u2`.`UnidirectionalEntityCompositeKeyKey1`, `u2`.`UnidirectionalEntityCompositeKeyKey2`, `u2`.`UnidirectionalEntityCompositeKeyKey3`
         FROM `UnidirectionalEntityCompositeKeyUnidirectionalEntityTwo` AS `u2`
         INNER JOIN `UnidirectionalEntityTwos` AS `u3` ON `u2`.`TwoSkipSharedId` = `u3`.`Id`
-    ) AS `t` ON ((`u1`.`Key1` = `t`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u1`.`Key2` = `t`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u1`.`Key3` = `t`.`UnidirectionalEntityCompositeKeyKey3`)
+    ) AS `s` ON ((`u1`.`Key1` = `s`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u1`.`Key2` = `s`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u1`.`Key3` = `s`.`UnidirectionalEntityCompositeKeyKey3`)
     WHERE `u1`.`Key1` < 5
-) AS `t0` ON `u`.`Id` = `t0`.`LeafId`
-ORDER BY `u`.`Id`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`TwoSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+) AS `s0` ON `u`.`Id` = `s0`.`LeafId`
+ORDER BY `u`.`Id`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`TwoSkipSharedId`, `s0`.`UnidirectionalEntityCompositeKeyKey1`, `s0`.`UnidirectionalEntityCompositeKeyKey2`, `s0`.`UnidirectionalEntityCompositeKeyKey3`
 """);
     }
 
@@ -2676,7 +2676,7 @@ public override async Task Filter_include_on_skip_navigation_combined_unidirecti
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id1`, `t`.`CollectionInverseId0`, `t`.`ExtraId0`, `t`.`Name1`, `t`.`ReferenceInverseId0`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id1`, `s`.`CollectionInverseId0`, `s`.`ExtraId0`, `s`.`Name1`, `s`.`ReferenceInverseId0`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `j`.`OneId`, `j`.`TwoId`, `e2`.`Id` AS `Id1`, `e2`.`CollectionInverseId` AS `CollectionInverseId0`, `e2`.`ExtraId` AS `ExtraId0`, `e2`.`Name` AS `Name1`, `e2`.`ReferenceInverseId` AS `ReferenceInverseId0`
@@ -2685,8 +2685,8 @@ LEFT JOIN (
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
     LEFT JOIN `EntityTwos` AS `e2` ON `e0`.`Id` = `e2`.`CollectionInverseId`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -2724,13 +2724,13 @@ public override async Task Select_many_over_skip_navigation_where_non_equality_u
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `UnidirectionalEntityOnes` AS `u`
 LEFT JOIN (
     SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`OneId`
     FROM `UnidirectionalJoinOneToTwo` AS `u0`
     INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoId` = `u1`.`Id`
-) AS `t` ON (`u`.`Id` = `t`.`OneId`) AND (`u`.`Id` <> `t`.`Id`)
+) AS `s` ON (`u`.`Id` = `s`.`OneId`) AND (`u`.`Id` <> `s`.`Id`)
 """);
     }
 
@@ -2790,14 +2790,14 @@ public override async Task GetType_in_hierarchy_in_querying_base_type_unidirecti
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
+SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, `u1`.`IsGreen`, `u1`.`Discriminator`
 FROM (
     SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
     FROM `UnidirectionalBranches` AS `u`
     UNION ALL
     SELECT `u0`.`Id`, `u0`.`Name`, `u0`.`Number`, `u0`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
     FROM `UnidirectionalLeaves` AS `u0`
-) AS `t`
+) AS `u1`
 WHERE FALSE
 """);
     }
diff --git a/test/EFCore.MySql.FunctionalTests/Query/TPCManyToManyQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/TPCManyToManyQueryMySqlTest.cs
index 2e16229e9..75f9a10b7 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/TPCManyToManyQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/TPCManyToManyQueryMySqlTest.cs
@@ -115,13 +115,13 @@ ORDER BY (
     SELECT COUNT(*)
     FROM `JoinOneToBranch` AS `j`
     INNER JOIN (
-        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
+        SELECT `b`.`Id`, `b`.`Name`
         FROM `Branches` AS `b`
         UNION ALL
-        SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
+        SELECT `l`.`Id`, `l`.`Name`
         FROM `Leaves` AS `l`
-    ) AS `t` ON `j`.`EntityBranchId` = `t`.`Id`
-    WHERE (`e`.`Id` = `j`.`EntityOneId`) AND (`t`.`Name` LIKE 'L%')), `e`.`Id`
+    ) AS `u` ON `j`.`EntityBranchId` = `u`.`Id`
+    WHERE (`e`.`Id` = `j`.`EntityOneId`) AND (`u`.`Name` LIKE 'L%')), `e`.`Id`
 """);
     }
 
@@ -162,14 +162,14 @@ public override async Task Skip_navigation_select_many_average(bool async)
         await base.Skip_navigation_select_many_average(async);
 
         AssertSql(
-$"""
-SELECT AVG({MySqlTestHelpers.CastAsDouble(@"`t`.`Key1`")})
+"""
+SELECT AVG(CAST(`s`.`Key1` AS double))
 FROM `EntityTwos` AS `e`
 INNER JOIN (
     SELECT `e1`.`Key1`, `e0`.`TwoSkipSharedId`
     FROM `EntityCompositeKeyEntityTwo` AS `e0`
     INNER JOIN `EntityCompositeKeys` AS `e1` ON ((`e0`.`CompositeKeySkipSharedKey1` = `e1`.`Key1`) AND (`e0`.`CompositeKeySkipSharedKey2` = `e1`.`Key2`)) AND (`e0`.`CompositeKeySkipSharedKey3` = `e1`.`Key3`)
-) AS `t` ON `e`.`Id` = `t`.`TwoSkipSharedId`
+) AS `s` ON `e`.`Id` = `s`.`TwoSkipSharedId`
 """);
     }
 
@@ -179,13 +179,13 @@ public override async Task Skip_navigation_select_many_max(bool async)
 
         AssertSql(
 """
-SELECT MAX(`t`.`Key1`)
+SELECT MAX(`s`.`Key1`)
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `e0`.`Key1`, `j`.`ThreeId`
     FROM `JoinThreeToCompositeKeyFull` AS `j`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`j`.`CompositeId1` = `e0`.`Key1`) AND (`j`.`CompositeId2` = `e0`.`Key2`)) AND (`j`.`CompositeId3` = `e0`.`Key3`)
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 """);
     }
 
@@ -195,10 +195,10 @@ public override async Task Skip_navigation_select_many_min(bool async)
 
         AssertSql(
 """
-SELECT MIN(`t0`.`Id`)
+SELECT MIN(`s`.`Id`)
 FROM `EntityThrees` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `e0`.`ThreeSkipSharedId`
+    SELECT `u`.`Id`, `e0`.`ThreeSkipSharedId`
     FROM `EntityRootEntityThree` AS `e0`
     INNER JOIN (
         SELECT `r`.`Id`
@@ -212,8 +212,8 @@ UNION ALL
         UNION ALL
         SELECT `l0`.`Id`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeSkipSharedId`
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeSkipSharedId`
 """);
     }
 
@@ -223,7 +223,7 @@ public override async Task Skip_navigation_select_many_sum(bool async)
 
         AssertSql(
 """
-SELECT COALESCE(SUM(`t0`.`Key1`), 0)
+SELECT COALESCE(SUM(`s`.`Key1`), 0)
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -236,12 +236,12 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e0`.`Key1`, `e`.`RootSkipSharedId`
     FROM `EntityCompositeKeyEntityRoot` AS `e`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1`) AND (`e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2`)) AND (`e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`)
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
 """);
     }
 
@@ -311,17 +311,17 @@ public override async Task Skip_navigation_order_by_first_or_default(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`
+SELECT `s0`.`Id`, `s0`.`Name`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`ThreeId`
+    SELECT `s`.`Id`, `s`.`Name`, `s`.`ThreeId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`Name`, `j`.`ThreeId`, ROW_NUMBER() OVER(PARTITION BY `j`.`ThreeId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToThreePayloadFullShared` AS `j`
         INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
 """);
     }
 
@@ -331,10 +331,10 @@ public override async Task Skip_navigation_order_by_single_or_default(bool async
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`
+SELECT `s0`.`Id`, `s0`.`Name`
 FROM `EntityOnes` AS `e`
 LEFT JOIN LATERAL (
-    SELECT `t`.`Id`, `t`.`Name`
+    SELECT `s`.`Id`, `s`.`Name`
     FROM (
         SELECT `e0`.`Id`, `e0`.`Name`
         FROM `JoinOneSelfPayload` AS `j`
@@ -342,10 +342,10 @@ LEFT JOIN LATERAL (
         WHERE `e`.`Id` = `j`.`LeftId`
         ORDER BY `e0`.`Id`
         LIMIT 1
-    ) AS `t`
-    ORDER BY `t`.`Id`
+    ) AS `s`
+    ORDER BY `s`.`Id`
     LIMIT 1
-) AS `t0` ON TRUE
+) AS `s0` ON TRUE
 """);
     }
 
@@ -355,23 +355,23 @@ public override async Task Skip_navigation_order_by_last_or_default(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`
+SELECT `s0`.`Id`, `s0`.`Name`
 FROM (
     SELECT `b`.`Id`
     FROM `Branches` AS `b`
     UNION ALL
     SELECT `l`.`Id`
     FROM `Leaves` AS `l`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`EntityBranchId`
+    SELECT `s`.`Id`, `s`.`Name`, `s`.`EntityBranchId`
     FROM (
         SELECT `e`.`Id`, `e`.`Name`, `j`.`EntityBranchId`, ROW_NUMBER() OVER(PARTITION BY `j`.`EntityBranchId` ORDER BY `e`.`Id` DESC) AS `row`
         FROM `JoinOneToBranch` AS `j`
         INNER JOIN `EntityOnes` AS `e` ON `j`.`EntityOneId` = `e`.`Id`
-    ) AS `t1`
-    WHERE `t1`.`row` <= 1
-) AS `t0` ON `t`.`Id` = `t0`.`EntityBranchId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `u`.`Id` = `s0`.`EntityBranchId`
 """);
     }
 
@@ -381,17 +381,17 @@ public override async Task Skip_navigation_order_by_reverse_first_or_default(boo
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`ThreeId`, ROW_NUMBER() OVER(PARTITION BY `j`.`ThreeId` ORDER BY `e0`.`Id` DESC) AS `row`
         FROM `JoinTwoToThree` AS `j`
         INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
 """);
     }
 
@@ -401,14 +401,14 @@ public override async Task Skip_navigation_cast(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
     SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `Leaves` AS `l` ON `j`.`LeafId` = `l`.`Id`
-) AS `t` ON ((`e`.`Key1` = `t`.`CompositeId1`) AND (`e`.`Key2` = `t`.`CompositeId2`)) AND (`e`.`Key3` = `t`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeId1`) AND (`e`.`Key2` = `s`.`CompositeId2`)) AND (`e`.`Key3` = `s`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`
 """);
     }
 
@@ -417,28 +417,28 @@ public override async Task Skip_navigation_of_type(bool async)
         await base.Skip_navigation_of_type(async);
 
         AssertSql(
-$"""
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+"""
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`, `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityRoot` AS `e0`
     INNER JOIN (
-        SELECT `r`.`Id`, `r`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityRoot'")} AS `Discriminator`
+        SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'EntityRoot' AS `Discriminator`
         FROM `Roots` AS `r`
         UNION ALL
-        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityBranch'")} AS `Discriminator`
+        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
         FROM `Branches` AS `b`
         UNION ALL
         SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
         FROM `Leaves` AS `l`
         UNION ALL
-        SELECT `l0`.`Id`, `l0`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityLeaf2'")} AS `Discriminator`
+        SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'EntityLeaf2' AS `Discriminator`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-    WHERE `t`.`Discriminator` = 'EntityLeaf'
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+    WHERE `u`.`Discriminator` = 'EntityLeaf'
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
 """);
     }
 
@@ -491,7 +491,7 @@ public override async Task Select_many_over_skip_navigation(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -504,12 +504,12 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `e`.`RootSkipSharedId`
     FROM `EntityRootEntityThree` AS `e`
     INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
 """);
     }
 
@@ -519,13 +519,13 @@ public override async Task Select_many_over_skip_navigation_where(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`OneId`
+) AS `s` ON `e`.`Id` = `s`.`OneId`
 """);
     }
 
@@ -535,17 +535,17 @@ public override async Task Select_many_over_skip_navigation_order_by_skip(bool a
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, ROW_NUMBER() OVER(PARTITION BY `j`.`OneId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToThreePayloadFull` AS `j`
         INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-    ) AS `t`
-    WHERE 2 < `t`.`row`
-) AS `t0` ON `e`.`Id` = `t0`.`OneId`
+    ) AS `s`
+    WHERE 2 < `s`.`row`
+) AS `s0` ON `e`.`Id` = `s0`.`OneId`
 """);
     }
 
@@ -555,17 +555,17 @@ public override async Task Select_many_over_skip_navigation_order_by_take(bool a
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneSkipSharedId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneSkipSharedId`
     FROM (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, `e0`.`OneSkipSharedId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`OneSkipSharedId` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityOneEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON `e`.`Id` = `t0`.`OneSkipSharedId`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON `e`.`Id` = `s0`.`OneSkipSharedId`
 """);
     }
 
@@ -575,17 +575,17 @@ public override async Task Select_many_over_skip_navigation_order_by_skip_take(b
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`
     FROM (
         SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`, ROW_NUMBER() OVER(PARTITION BY `j`.`OneId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToThreePayloadFullShared` AS `j`
         INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (2 < `t`.`row`) AND (`t`.`row` <= 5)
-) AS `t0` ON `e`.`Id` = `t0`.`OneId`
+    ) AS `s`
+    WHERE (2 < `s`.`row`) AND (`s`.`row` <= 5)
+) AS `s0` ON `e`.`Id` = `s0`.`OneId`
 """);
     }
 
@@ -595,10 +595,10 @@ public override async Task Select_many_over_skip_navigation_of_type(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `e0`.`ThreeSkipSharedId`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`, `e0`.`ThreeSkipSharedId`
     FROM `EntityRootEntityThree` AS `e0`
     INNER JOIN (
         SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'EntityRoot' AS `Discriminator`
@@ -612,9 +612,9 @@ UNION ALL
         UNION ALL
         SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'EntityLeaf2' AS `Discriminator`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-    WHERE `t`.`Discriminator` IN ('EntityBranch', 'EntityLeaf')
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeSkipSharedId`
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+    WHERE `u`.`Discriminator` IN ('EntityBranch', 'EntityLeaf')
+) AS `s` ON `e`.`Id` = `s`.`ThreeSkipSharedId`
 """);
     }
 
@@ -624,10 +624,10 @@ public override async Task Select_many_over_skip_navigation_cast(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `j`.`EntityOneId`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`, `j`.`EntityOneId`
     FROM `JoinOneToBranch` AS `j`
     INNER JOIN (
         SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
@@ -635,8 +635,8 @@ INNER JOIN (
         UNION ALL
         SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
         FROM `Leaves` AS `l`
-    ) AS `t` ON `j`.`EntityBranchId` = `t`.`Id`
-) AS `t0` ON `e`.`Id` = `t0`.`EntityOneId`
+    ) AS `u` ON `j`.`EntityBranchId` = `u`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`EntityOneId`
 """);
     }
 
@@ -646,14 +646,14 @@ public override async Task Select_skip_navigation(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `t`.`Id`, `t`.`Name`, `t`.`LeftId`, `t`.`RightId`
+SELECT `e`.`Id`, `s`.`Id`, `s`.`Name`, `s`.`LeftId`, `s`.`RightId`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`Name`, `j`.`LeftId`, `j`.`RightId`
     FROM `JoinOneSelfPayload` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`LeftId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`RightId`
-ORDER BY `e`.`Id`, `t`.`LeftId`, `t`.`RightId`
+) AS `s` ON `e`.`Id` = `s`.`RightId`
+ORDER BY `e`.`Id`, `s`.`LeftId`, `s`.`RightId`
 """);
     }
 
@@ -663,24 +663,24 @@ public override async Task Select_skip_navigation_multiple(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`, `t`.`TwoId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`SelfSkipSharedLeftId`, `t0`.`SelfSkipSharedRightId`, `t1`.`Key1`, `t1`.`Key2`, `t1`.`Key3`, `t1`.`Name`, `t1`.`TwoSkipSharedId`, `t1`.`CompositeKeySkipSharedKey1`, `t1`.`CompositeKeySkipSharedKey2`, `t1`.`CompositeKeySkipSharedKey3`
+SELECT `e`.`Id`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`, `s`.`TwoId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`SelfSkipSharedLeftId`, `s0`.`SelfSkipSharedRightId`, `s1`.`Key1`, `s1`.`Key2`, `s1`.`Key3`, `s1`.`Name`, `s1`.`TwoSkipSharedId`, `s1`.`CompositeKeySkipSharedKey1`, `s1`.`CompositeKeySkipSharedKey2`, `s1`.`CompositeKeySkipSharedKey3`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`ThreeId`, `j`.`TwoId`
     FROM `JoinTwoToThree` AS `j`
     INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
 LEFT JOIN (
     SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e1`.`SelfSkipSharedLeftId`, `e1`.`SelfSkipSharedRightId`
     FROM `EntityTwoEntityTwo` AS `e1`
     INNER JOIN `EntityTwos` AS `e2` ON `e1`.`SelfSkipSharedLeftId` = `e2`.`Id`
-) AS `t0` ON `e`.`Id` = `t0`.`SelfSkipSharedRightId`
+) AS `s0` ON `e`.`Id` = `s0`.`SelfSkipSharedRightId`
 LEFT JOIN (
     SELECT `e4`.`Key1`, `e4`.`Key2`, `e4`.`Key3`, `e4`.`Name`, `e3`.`TwoSkipSharedId`, `e3`.`CompositeKeySkipSharedKey1`, `e3`.`CompositeKeySkipSharedKey2`, `e3`.`CompositeKeySkipSharedKey3`
     FROM `EntityCompositeKeyEntityTwo` AS `e3`
     INNER JOIN `EntityCompositeKeys` AS `e4` ON ((`e3`.`CompositeKeySkipSharedKey1` = `e4`.`Key1`) AND (`e3`.`CompositeKeySkipSharedKey2` = `e4`.`Key2`)) AND (`e3`.`CompositeKeySkipSharedKey3` = `e4`.`Key3`)
-) AS `t1` ON `e`.`Id` = `t1`.`TwoSkipSharedId`
-ORDER BY `e`.`Id`, `t`.`ThreeId`, `t`.`TwoId`, `t`.`Id`, `t0`.`SelfSkipSharedLeftId`, `t0`.`SelfSkipSharedRightId`, `t0`.`Id`, `t1`.`TwoSkipSharedId`, `t1`.`CompositeKeySkipSharedKey1`, `t1`.`CompositeKeySkipSharedKey2`, `t1`.`CompositeKeySkipSharedKey3`, `t1`.`Key1`, `t1`.`Key2`
+) AS `s1` ON `e`.`Id` = `s1`.`TwoSkipSharedId`
+ORDER BY `e`.`Id`, `s`.`ThreeId`, `s`.`TwoId`, `s`.`Id`, `s0`.`SelfSkipSharedLeftId`, `s0`.`SelfSkipSharedRightId`, `s0`.`Id`, `s1`.`TwoSkipSharedId`, `s1`.`CompositeKeySkipSharedKey1`, `s1`.`CompositeKeySkipSharedKey2`, `s1`.`CompositeKeySkipSharedKey3`, `s1`.`Key1`, `s1`.`Key2`
 """);
     }
 
@@ -690,17 +690,17 @@ public override async Task Select_skip_navigation_first_or_default(bool async)
 
         AssertSql(
 """
-SELECT `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`Name`
+SELECT `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`Name`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Key1`, `t`.`Key2`, `t`.`Key3`, `t`.`Name`, `t`.`ThreeId`
+    SELECT `s`.`Key1`, `s`.`Key2`, `s`.`Key3`, `s`.`Name`, `s`.`ThreeId`
     FROM (
         SELECT `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e0`.`Name`, `j`.`ThreeId`, ROW_NUMBER() OVER(PARTITION BY `j`.`ThreeId` ORDER BY `e0`.`Key1`, `e0`.`Key2`) AS `row`
         FROM `JoinThreeToCompositeKeyFull` AS `j`
         INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`j`.`CompositeId1` = `e0`.`Key1`) AND (`j`.`CompositeId2` = `e0`.`Key2`)) AND (`j`.`CompositeId3` = `e0`.`Key3`)
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
 ORDER BY `e`.`Id`
 """);
     }
@@ -710,27 +710,27 @@ public override async Task Include_skip_navigation(bool async)
         await base.Include_skip_navigation(async);
 
         AssertSql(
-$"""
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`Slumber`, `t0`.`IsGreen`, `t0`.`IsBrown`, `t0`.`Discriminator`
+"""
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`Slumber`, `s`.`IsGreen`, `s`.`IsBrown`, `s`.`Discriminator`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`
+    SELECT `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`
     FROM `EntityCompositeKeyEntityRoot` AS `e0`
     INNER JOIN (
-        SELECT `r`.`Id`, `r`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Slumber`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsBrown`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityRoot'")} AS `Discriminator`
+        SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
         FROM `Roots` AS `r`
         UNION ALL
-        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Slumber`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsBrown`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityBranch'")} AS `Discriminator`
+        SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityBranch' AS `Discriminator`
         FROM `Branches` AS `b`
         UNION ALL
         SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, NULL AS `Slumber`, `l`.`IsGreen`, NULL AS `IsBrown`, 'EntityLeaf' AS `Discriminator`
         FROM `Leaves` AS `l`
         UNION ALL
-        SELECT `l0`.`Id`, `l0`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `Number`, `l0`.`Slumber`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `IsGreen`, `l0`.`IsBrown`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'EntityLeaf2'")} AS `Discriminator`
+        SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`
 """);
     }
 
@@ -740,15 +740,15 @@ public override async Task Include_skip_navigation_then_reference(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
     SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
 """);
     }
 
@@ -758,19 +758,19 @@ public override async Task Include_skip_navigation_then_include_skip_navigation(
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`EntityBranchId`, `t0`.`EntityOneId`, `t0`.`Id0`, `t0`.`Name0`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`, `s0`.`Name`, `s0`.`Number`, `s0`.`IsGreen`, `s0`.`EntityBranchId`, `s0`.`EntityOneId`, `s0`.`Id0`, `s0`.`Name0`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `t`.`EntityBranchId`, `t`.`EntityOneId`, `t`.`Id` AS `Id0`, `t`.`Name` AS `Name0`
+    SELECT `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `s`.`EntityBranchId`, `s`.`EntityOneId`, `s`.`Id` AS `Id0`, `s`.`Name` AS `Name0`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `Leaves` AS `l` ON `j`.`LeafId` = `l`.`Id`
     LEFT JOIN (
         SELECT `j0`.`EntityBranchId`, `j0`.`EntityOneId`, `e0`.`Id`, `e0`.`Name`
         FROM `JoinOneToBranch` AS `j0`
         INNER JOIN `EntityOnes` AS `e0` ON `j0`.`EntityOneId` = `e0`.`Id`
-    ) AS `t` ON `l`.`Id` = `t`.`EntityBranchId`
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeId1`) AND (`e`.`Key2` = `t0`.`CompositeId2`)) AND (`e`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`, `t0`.`EntityBranchId`, `t0`.`EntityOneId`
+    ) AS `s` ON `l`.`Id` = `s`.`EntityBranchId`
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeId1`) AND (`e`.`Key2` = `s0`.`CompositeId2`)) AND (`e`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`, `s0`.`EntityBranchId`, `s0`.`EntityOneId`
 """);
     }
 
@@ -780,10 +780,10 @@ public override async Task Include_skip_navigation_then_include_reference_and_sk
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Payload`, `t0`.`Id`, `t0`.`Name`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`, `t0`.`LeftId`, `t0`.`RightId`, `t0`.`Payload0`, `t0`.`Id1`, `t0`.`Name1`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Payload`, `s0`.`Id`, `s0`.`Name`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`, `s0`.`LeftId`, `s0`.`RightId`, `s0`.`Payload0`, `s0`.`Id1`, `s0`.`Name1`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `t`.`LeftId`, `t`.`RightId`, `t`.`Payload` AS `Payload0`, `t`.`Id` AS `Id1`, `t`.`Name` AS `Name1`
+    SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `s`.`LeftId`, `s`.`RightId`, `s`.`Payload` AS `Payload0`, `s`.`Id` AS `Id1`, `s`.`Name` AS `Name1`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
@@ -791,9 +791,9 @@ LEFT JOIN (
         SELECT `j0`.`LeftId`, `j0`.`RightId`, `j0`.`Payload`, `e2`.`Id`, `e2`.`Name`
         FROM `JoinOneSelfPayload` AS `j0`
         INNER JOIN `EntityOnes` AS `e2` ON `j0`.`RightId` = `e2`.`Id`
-    ) AS `t` ON `e0`.`Id` = `t`.`LeftId`
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id`, `t0`.`Id0`, `t0`.`LeftId`, `t0`.`RightId`
+    ) AS `s` ON `e0`.`Id` = `s`.`LeftId`
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
+ORDER BY `e`.`Id`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Id`, `s0`.`Id0`, `s0`.`LeftId`, `s0`.`RightId`
 """);
     }
 
@@ -803,15 +803,15 @@ public override async Task Include_skip_navigation_and_reference(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `e0`.`Id`, `t`.`OneSkipSharedId`, `t`.`TwoSkipSharedId`, `t`.`Id`, `t`.`Name`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `e0`.`Id`, `s`.`OneSkipSharedId`, `s`.`TwoSkipSharedId`, `s`.`Id`, `s`.`Name`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
 FROM `EntityTwos` AS `e`
 LEFT JOIN `EntityThrees` AS `e0` ON `e`.`Id` = `e0`.`ReferenceInverseId`
 LEFT JOIN (
     SELECT `e1`.`OneSkipSharedId`, `e1`.`TwoSkipSharedId`, `e2`.`Id`, `e2`.`Name`
     FROM `EntityOneEntityTwo` AS `e1`
     INNER JOIN `EntityOnes` AS `e2` ON `e1`.`OneSkipSharedId` = `e2`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`TwoSkipSharedId`
-ORDER BY `e`.`Id`, `e0`.`Id`, `t`.`OneSkipSharedId`, `t`.`TwoSkipSharedId`
+) AS `s` ON `e`.`Id` = `s`.`TwoSkipSharedId`
+ORDER BY `e`.`Id`, `e0`.`Id`, `s`.`OneSkipSharedId`, `s`.`TwoSkipSharedId`
 """);
     }
 
@@ -821,15 +821,15 @@ public override async Task Filtered_include_skip_navigation_where(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Payload`, `t`.`Id`, `t`.`Name`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Payload`, `s`.`Id`, `s`.`Name`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`
 """);
     }
 
@@ -839,14 +839,14 @@ public override async Task Filtered_include_skip_navigation_order_by(bool async)
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`ThreeId`, `t`.`TwoId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`ThreeId`, `s`.`TwoId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
     SELECT `j`.`ThreeId`, `j`.`TwoId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
     FROM `JoinTwoToThree` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`Id`, `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`Id`, `s`.`ThreeId`
 """);
     }
 
@@ -856,18 +856,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip(bool a
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t0`.`SelfSkipSharedLeftId`, `t0`.`SelfSkipSharedRightId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s0`.`SelfSkipSharedLeftId`, `s0`.`SelfSkipSharedRightId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
-    SELECT `t`.`SelfSkipSharedLeftId`, `t`.`SelfSkipSharedRightId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`SelfSkipSharedLeftId`, `s`.`SelfSkipSharedRightId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `e0`.`SelfSkipSharedLeftId`, `e0`.`SelfSkipSharedRightId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`SelfSkipSharedLeftId` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityTwoEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`SelfSkipSharedRightId` = `e1`.`Id`
-    ) AS `t`
-    WHERE 2 < `t`.`row`
-) AS `t0` ON `e`.`Id` = `t0`.`SelfSkipSharedLeftId`
-ORDER BY `e`.`Id`, `t0`.`SelfSkipSharedLeftId`, `t0`.`Id`
+    ) AS `s`
+    WHERE 2 < `s`.`row`
+) AS `s0` ON `e`.`Id` = `s0`.`SelfSkipSharedLeftId`
+ORDER BY `e`.`Id`, `s0`.`SelfSkipSharedLeftId`, `s0`.`Id`
 """);
     }
 
@@ -877,18 +877,18 @@ public override async Task Filtered_include_skip_navigation_order_by_take(bool a
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`TwoSkipSharedId`, `t`.`CompositeKeySkipSharedKey1`, `t`.`CompositeKeySkipSharedKey2`, `t`.`CompositeKeySkipSharedKey3`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`TwoSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `e0`.`TwoSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityCompositeKeyEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s0`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`
 """);
     }
 
@@ -898,18 +898,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take(b
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`Id`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`ThreeId`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s0`.`Id`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`ThreeId`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`ThreeId`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`Id`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`ThreeId`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `j`.`Id`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `j`.`ThreeId`, `e0`.`Id` AS `Id0`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinThreeToCompositeKeyFull` AS `j`
         INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeId1`) AND (`e`.`Key2` = `t0`.`CompositeId2`)) AND (`e`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id0`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeId1`) AND (`e`.`Key2` = `s0`.`CompositeId2`)) AND (`e`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id0`
 """);
     }
 
@@ -919,7 +919,7 @@ public override async Task Filtered_then_include_skip_navigation_where(bool asyn
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Payload`, `t0`.`Id0`, `t0`.`Name0`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`, `s0`.`RootSkipSharedId`, `s0`.`ThreeSkipSharedId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Payload`, `s0`.`Id0`, `s0`.`Name0`
 FROM (
     SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
     FROM `Roots` AS `r`
@@ -932,9 +932,9 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `e`.`RootSkipSharedId`, `e`.`ThreeSkipSharedId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `t1`.`OneId`, `t1`.`ThreeId`, `t1`.`Payload`, `t1`.`Id` AS `Id0`, `t1`.`Name` AS `Name0`
+    SELECT `e`.`RootSkipSharedId`, `e`.`ThreeSkipSharedId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Payload`, `s`.`Id` AS `Id0`, `s`.`Name` AS `Name0`
     FROM `EntityRootEntityThree` AS `e`
     INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
     LEFT JOIN (
@@ -942,9 +942,9 @@ LEFT JOIN (
         FROM `JoinOneToThreePayloadFullShared` AS `j`
         INNER JOIN `EntityOnes` AS `e1` ON `j`.`OneId` = `e1`.`Id`
         WHERE `e1`.`Id` < 10
-    ) AS `t1` ON `e0`.`Id` = `t1`.`ThreeId`
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`
+    ) AS `s` ON `e0`.`Id` = `s`.`ThreeId`
+) AS `s0` ON `u`.`Id` = `s0`.`RootSkipSharedId`
+ORDER BY `u`.`Id`, `s0`.`RootSkipSharedId`, `s0`.`ThreeSkipSharedId`, `s0`.`Id`, `s0`.`OneId`, `s0`.`ThreeId`
 """);
     }
 
@@ -954,7 +954,7 @@ public override async Task Filtered_then_include_skip_navigation_order_by_skip_t
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`, `t1`.`RootSkipSharedId`, `t1`.`CompositeKeySkipSharedKey1`, `t1`.`CompositeKeySkipSharedKey2`, `t1`.`CompositeKeySkipSharedKey3`, `t1`.`Key1`, `t1`.`Key2`, `t1`.`Key3`, `t1`.`Name`, `t1`.`Id`, `t1`.`CompositeId1`, `t1`.`CompositeId2`, `t1`.`CompositeId3`, `t1`.`ThreeId`, `t1`.`Id0`, `t1`.`CollectionInverseId`, `t1`.`Name0`, `t1`.`ReferenceInverseId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`, `s1`.`RootSkipSharedId`, `s1`.`CompositeKeySkipSharedKey1`, `s1`.`CompositeKeySkipSharedKey2`, `s1`.`CompositeKeySkipSharedKey3`, `s1`.`Key1`, `s1`.`Key2`, `s1`.`Key3`, `s1`.`Name`, `s1`.`Id`, `s1`.`CompositeId1`, `s1`.`CompositeId2`, `s1`.`CompositeId3`, `s1`.`ThreeId`, `s1`.`Id0`, `s1`.`CollectionInverseId`, `s1`.`Name0`, `s1`.`ReferenceInverseId`
 FROM (
     SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
     FROM `Roots` AS `r`
@@ -967,22 +967,22 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
-    SELECT `e`.`RootSkipSharedId`, `e`.`CompositeKeySkipSharedKey1`, `e`.`CompositeKeySkipSharedKey2`, `e`.`CompositeKeySkipSharedKey3`, `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e0`.`Name`, `t0`.`Id`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`ThreeId`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId`
+    SELECT `e`.`RootSkipSharedId`, `e`.`CompositeKeySkipSharedKey1`, `e`.`CompositeKeySkipSharedKey2`, `e`.`CompositeKeySkipSharedKey3`, `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e0`.`Name`, `s0`.`Id`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`ThreeId`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId`
     FROM `EntityCompositeKeyEntityRoot` AS `e`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1`) AND (`e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2`)) AND (`e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`)
     LEFT JOIN (
-        SELECT `t2`.`Id`, `t2`.`CompositeId1`, `t2`.`CompositeId2`, `t2`.`CompositeId3`, `t2`.`ThreeId`, `t2`.`Id0`, `t2`.`CollectionInverseId`, `t2`.`Name`, `t2`.`ReferenceInverseId`
+        SELECT `s`.`Id`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`ThreeId`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
         FROM (
             SELECT `j`.`Id`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `j`.`ThreeId`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3` ORDER BY `e1`.`Id`) AS `row`
             FROM `JoinThreeToCompositeKeyFull` AS `j`
             INNER JOIN `EntityThrees` AS `e1` ON `j`.`ThreeId` = `e1`.`Id`
-        ) AS `t2`
-        WHERE (1 < `t2`.`row`) AND (`t2`.`row` <= 3)
-    ) AS `t0` ON ((`e0`.`Key1` = `t0`.`CompositeId1`) AND (`e0`.`Key2` = `t0`.`CompositeId2`)) AND (`e0`.`Key3` = `t0`.`CompositeId3`)
-) AS `t1` ON `t`.`Id` = `t1`.`RootSkipSharedId`
-ORDER BY `t`.`Id`, `t1`.`RootSkipSharedId`, `t1`.`CompositeKeySkipSharedKey1`, `t1`.`CompositeKeySkipSharedKey2`, `t1`.`CompositeKeySkipSharedKey3`, `t1`.`Key1`, `t1`.`Key2`, `t1`.`Key3`, `t1`.`CompositeId1`, `t1`.`CompositeId2`, `t1`.`CompositeId3`, `t1`.`Id0`
+        ) AS `s`
+        WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+    ) AS `s0` ON ((`e0`.`Key1` = `s0`.`CompositeId1`) AND (`e0`.`Key2` = `s0`.`CompositeId2`)) AND (`e0`.`Key3` = `s0`.`CompositeId3`)
+) AS `s1` ON `u`.`Id` = `s1`.`RootSkipSharedId`
+ORDER BY `u`.`Id`, `s1`.`RootSkipSharedId`, `s1`.`CompositeKeySkipSharedKey1`, `s1`.`CompositeKeySkipSharedKey2`, `s1`.`CompositeKeySkipSharedKey3`, `s1`.`Key1`, `s1`.`Key2`, `s1`.`Key3`, `s1`.`CompositeId1`, `s1`.`CompositeId2`, `s1`.`CompositeId3`, `s1`.`Id0`
 """);
     }
 
@@ -992,20 +992,20 @@ public override async Task Filtered_include_skip_navigation_where_then_include_s
 
         AssertSql(
 """
-SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`Name`, `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`
+SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`Name`, `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`
 FROM `Leaves` AS `l`
 LEFT JOIN (
-    SELECT `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t`.`TwoSkipSharedId`, `t`.`CompositeKeySkipSharedKey1`, `t`.`CompositeKeySkipSharedKey2`, `t`.`CompositeKeySkipSharedKey3`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId`
+    SELECT `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s`.`TwoSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name` AS `Name0`, `s`.`ReferenceInverseId`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `EntityCompositeKeys` AS `e` ON ((`j`.`CompositeId1` = `e`.`Key1`) AND (`j`.`CompositeId2` = `e`.`Key2`)) AND (`j`.`CompositeId3` = `e`.`Key3`)
     LEFT JOIN (
         SELECT `e0`.`TwoSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
         FROM `EntityCompositeKeyEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t` ON ((`e`.`Key1` = `t`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t`.`CompositeKeySkipSharedKey3`)
+    ) AS `s` ON ((`e`.`Key1` = `s`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s`.`CompositeKeySkipSharedKey3`)
     WHERE `e`.`Key1` < 5
-) AS `t0` ON `l`.`Id` = `t0`.`LeafId`
-ORDER BY `l`.`Id`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`
+) AS `s0` ON `l`.`Id` = `s0`.`LeafId`
+ORDER BY `l`.`Id`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`
 """);
     }
 
@@ -1015,10 +1015,10 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take_t
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`JoinOneToTwoExtraId`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`ExtraId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t1`.`ThreeId`, `t1`.`TwoId0`, `t1`.`Id0`, `t1`.`CollectionInverseId0`, `t1`.`Name0`, `t1`.`ReferenceInverseId0`
+SELECT `e`.`Id`, `e`.`Name`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`JoinOneToTwoExtraId`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`ExtraId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `s1`.`ThreeId`, `s1`.`TwoId0`, `s1`.`Id0`, `s1`.`CollectionInverseId0`, `s1`.`Name0`, `s1`.`ReferenceInverseId0`
 FROM `EntityOnes` AS `e`
 LEFT JOIN LATERAL (
-    SELECT `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t0`.`ThreeId`, `t0`.`TwoId` AS `TwoId0`, `t0`.`Id` AS `Id0`, `t0`.`CollectionInverseId` AS `CollectionInverseId0`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId` AS `ReferenceInverseId0`
+    SELECT `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s0`.`ThreeId`, `s0`.`TwoId` AS `TwoId0`, `s0`.`Id` AS `Id0`, `s0`.`CollectionInverseId` AS `CollectionInverseId0`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId` AS `ReferenceInverseId0`
     FROM (
         SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
         FROM `JoinOneToTwo` AS `j`
@@ -1026,15 +1026,15 @@ LEFT JOIN LATERAL (
         WHERE `e`.`Id` = `j`.`OneId`
         ORDER BY `e0`.`Id`
         LIMIT 2 OFFSET 1
-    ) AS `t`
+    ) AS `s`
     LEFT JOIN (
         SELECT `j0`.`ThreeId`, `j0`.`TwoId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
         FROM `JoinTwoToThree` AS `j0`
         INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
         WHERE `e1`.`Id` < 10
-    ) AS `t0` ON `t`.`Id` = `t0`.`TwoId`
-) AS `t1` ON TRUE
-ORDER BY `e`.`Id`, `t1`.`Id`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`ThreeId`, `t1`.`TwoId0`
+    ) AS `s0` ON `s`.`Id` = `s0`.`TwoId`
+) AS `s1` ON TRUE
+ORDER BY `e`.`Id`, `s1`.`Id`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`ThreeId`, `s1`.`TwoId0`
 """);
     }
 
@@ -1044,24 +1044,24 @@ public override async Task Filtered_include_skip_navigation_where_then_include_s
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`JoinOneToTwoExtraId`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`ExtraId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t1`.`ThreeId`, `t1`.`TwoId0`, `t1`.`Id0`, `t1`.`CollectionInverseId0`, `t1`.`Name0`, `t1`.`ReferenceInverseId0`
+SELECT `e`.`Id`, `e`.`Name`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`JoinOneToTwoExtraId`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`ExtraId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `s1`.`ThreeId`, `s1`.`TwoId0`, `s1`.`Id0`, `s1`.`CollectionInverseId0`, `s1`.`Name0`, `s1`.`ReferenceInverseId0`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
-    SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `t0`.`ThreeId`, `t0`.`TwoId` AS `TwoId0`, `t0`.`Id` AS `Id0`, `t0`.`CollectionInverseId` AS `CollectionInverseId0`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId` AS `ReferenceInverseId0`
+    SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `s0`.`ThreeId`, `s0`.`TwoId` AS `TwoId0`, `s0`.`Id` AS `Id0`, `s0`.`CollectionInverseId` AS `CollectionInverseId0`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId` AS `ReferenceInverseId0`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
     LEFT JOIN (
-        SELECT `t`.`ThreeId`, `t`.`TwoId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`
+        SELECT `s`.`ThreeId`, `s`.`TwoId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
         FROM (
             SELECT `j0`.`ThreeId`, `j0`.`TwoId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j0`.`TwoId` ORDER BY `e1`.`Id`) AS `row`
             FROM `JoinTwoToThree` AS `j0`
             INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
-        ) AS `t`
-        WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-    ) AS `t0` ON `e0`.`Id` = `t0`.`TwoId`
+        ) AS `s`
+        WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+    ) AS `s0` ON `e0`.`Id` = `s0`.`TwoId`
     WHERE `e0`.`Id` < 10
-) AS `t1` ON `e`.`Id` = `t1`.`OneId`
-ORDER BY `e`.`Id`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`Id`, `t1`.`TwoId0`, `t1`.`Id0`
+) AS `s1` ON `e`.`Id` = `s1`.`OneId`
+ORDER BY `e`.`Id`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`Id`, `s1`.`TwoId0`, `s1`.`Id0`
 """);
     }
 
@@ -1071,7 +1071,7 @@ public override async Task Filter_include_on_skip_navigation_combined(bool async
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `t`.`Id1`, `t`.`CollectionInverseId0`, `t`.`ExtraId0`, `t`.`Name1`, `t`.`ReferenceInverseId0`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `s`.`Id1`, `s`.`CollectionInverseId0`, `s`.`ExtraId0`, `s`.`Name1`, `s`.`ReferenceInverseId0`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
     SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `e2`.`Id` AS `Id1`, `e2`.`CollectionInverseId` AS `CollectionInverseId0`, `e2`.`ExtraId` AS `ExtraId0`, `e2`.`Name` AS `Name1`, `e2`.`ReferenceInverseId` AS `ReferenceInverseId0`
@@ -1080,8 +1080,8 @@ LEFT JOIN (
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
     LEFT JOIN `EntityTwos` AS `e2` ON `e0`.`Id` = `e2`.`CollectionInverseId`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -1091,23 +1091,23 @@ public override async Task Filter_include_on_skip_navigation_combined_with_filte
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t3`.`OneId`, `t3`.`ThreeId`, `t3`.`Payload`, `t3`.`Id`, `t3`.`Name`, `t3`.`OneId0`, `t3`.`TwoId`, `t3`.`JoinOneToTwoExtraId`, `t3`.`Id0`, `t3`.`CollectionInverseId`, `t3`.`ExtraId`, `t3`.`Name0`, `t3`.`ReferenceInverseId`, `t3`.`EntityBranchId`, `t3`.`EntityOneId`, `t3`.`Id1`, `t3`.`Name1`, `t3`.`Number`, `t3`.`IsGreen`, `t3`.`Discriminator`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s2`.`OneId`, `s2`.`ThreeId`, `s2`.`Payload`, `s2`.`Id`, `s2`.`Name`, `s2`.`OneId0`, `s2`.`TwoId`, `s2`.`JoinOneToTwoExtraId`, `s2`.`Id0`, `s2`.`CollectionInverseId`, `s2`.`ExtraId`, `s2`.`Name0`, `s2`.`ReferenceInverseId`, `s2`.`EntityBranchId`, `s2`.`EntityOneId`, `s2`.`Id1`, `s2`.`Name1`, `s2`.`Number`, `s2`.`IsGreen`, `s2`.`Discriminator`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `t0`.`OneId` AS `OneId0`, `t0`.`TwoId`, `t0`.`JoinOneToTwoExtraId`, `t0`.`Id` AS `Id0`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId`, `t1`.`EntityBranchId`, `t1`.`EntityOneId`, `t1`.`Id` AS `Id1`, `t1`.`Name` AS `Name1`, `t1`.`Number`, `t1`.`IsGreen`, `t1`.`Discriminator`
+    SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `s0`.`OneId` AS `OneId0`, `s0`.`TwoId`, `s0`.`JoinOneToTwoExtraId`, `s0`.`Id` AS `Id0`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId`, `s1`.`EntityBranchId`, `s1`.`EntityOneId`, `s1`.`Id` AS `Id1`, `s1`.`Name` AS `Name1`, `s1`.`Number`, `s1`.`IsGreen`, `s1`.`Discriminator`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN (
-        SELECT `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+        SELECT `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
         FROM (
             SELECT `j0`.`OneId`, `j0`.`TwoId`, `j0`.`JoinOneToTwoExtraId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j0`.`OneId` ORDER BY `e1`.`Id`) AS `row`
             FROM `JoinOneToTwo` AS `j0`
             INNER JOIN `EntityTwos` AS `e1` ON `j0`.`TwoId` = `e1`.`Id`
-        ) AS `t`
-        WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-    ) AS `t0` ON `e0`.`Id` = `t0`.`OneId`
+        ) AS `s`
+        WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+    ) AS `s0` ON `e0`.`Id` = `s0`.`OneId`
     LEFT JOIN (
-        SELECT `j1`.`EntityBranchId`, `j1`.`EntityOneId`, `t2`.`Id`, `t2`.`Name`, `t2`.`Number`, `t2`.`IsGreen`, `t2`.`Discriminator`
+        SELECT `j1`.`EntityBranchId`, `j1`.`EntityOneId`, `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`
         FROM `JoinOneToBranch` AS `j1`
         INNER JOIN (
             SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
@@ -1115,12 +1115,12 @@ INNER JOIN (
             UNION ALL
             SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
             FROM `Leaves` AS `l`
-        ) AS `t2` ON `j1`.`EntityBranchId` = `t2`.`Id`
-        WHERE `t2`.`Id` < 20
-    ) AS `t1` ON `e0`.`Id` = `t1`.`EntityOneId`
+        ) AS `u` ON `j1`.`EntityBranchId` = `u`.`Id`
+        WHERE `u`.`Id` < 20
+    ) AS `s1` ON `e0`.`Id` = `s1`.`EntityOneId`
     WHERE `e0`.`Id` < 10
-) AS `t3` ON `e`.`Id` = `t3`.`ThreeId`
-ORDER BY `e`.`Id`, `t3`.`OneId`, `t3`.`ThreeId`, `t3`.`Id`, `t3`.`OneId0`, `t3`.`Id0`, `t3`.`TwoId`, `t3`.`EntityBranchId`, `t3`.`EntityOneId`
+) AS `s2` ON `e`.`Id` = `s2`.`ThreeId`
+ORDER BY `e`.`Id`, `s2`.`OneId`, `s2`.`ThreeId`, `s2`.`Id`, `s2`.`OneId0`, `s2`.`Id0`, `s2`.`TwoId`, `s2`.`EntityBranchId`, `s2`.`EntityOneId`
 """);
     }
 
@@ -1130,20 +1130,20 @@ public override async Task Filtered_include_on_skip_navigation_then_filtered_inc
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Payload`, `t0`.`Id`, `t0`.`Name`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Payload`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `t`.`Id` AS `Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId`
+    SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `e2`.`Id` AS `Id0`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name` AS `Name0`, `e2`.`ReferenceInverseId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN (
         SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
         FROM `EntityTwos` AS `e1`
         WHERE `e1`.`Id` < 5
-    ) AS `t` ON `e0`.`Id` = `t`.`CollectionInverseId`
+    ) AS `e2` ON `e0`.`Id` = `e2`.`CollectionInverseId`
     WHERE `e0`.`Id` > 15
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """);
     }
 
@@ -1153,20 +1153,20 @@ public override async Task Filtered_include_on_navigation_then_filtered_include_
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t0`.`ThreeId`, `t0`.`TwoId`, `t0`.`Id0`, `t0`.`CollectionInverseId0`, `t0`.`Name0`, `t0`.`ReferenceInverseId0`
+SELECT `e`.`Id`, `e`.`Name`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `s0`.`ThreeId`, `s0`.`TwoId`, `s0`.`Id0`, `s0`.`CollectionInverseId0`, `s0`.`Name0`, `s0`.`ReferenceInverseId0`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
-    SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `t`.`ThreeId`, `t`.`TwoId`, `t`.`Id` AS `Id0`, `t`.`CollectionInverseId` AS `CollectionInverseId0`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId` AS `ReferenceInverseId0`
+    SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `s`.`ThreeId`, `s`.`TwoId`, `s`.`Id` AS `Id0`, `s`.`CollectionInverseId` AS `CollectionInverseId0`, `s`.`Name` AS `Name0`, `s`.`ReferenceInverseId` AS `ReferenceInverseId0`
     FROM `EntityTwos` AS `e0`
     LEFT JOIN (
         SELECT `j`.`ThreeId`, `j`.`TwoId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
         FROM `JoinTwoToThree` AS `j`
         INNER JOIN `EntityThrees` AS `e1` ON `j`.`ThreeId` = `e1`.`Id`
         WHERE `e1`.`Id` < 5
-    ) AS `t` ON `e0`.`Id` = `t`.`TwoId`
+    ) AS `s` ON `e0`.`Id` = `s`.`TwoId`
     WHERE `e0`.`Id` > 15
-) AS `t0` ON `e`.`Id` = `t0`.`CollectionInverseId`
-ORDER BY `e`.`Id`, `t0`.`Id`, `t0`.`ThreeId`, `t0`.`TwoId`
+) AS `s0` ON `e`.`Id` = `s0`.`CollectionInverseId`
+ORDER BY `e`.`Id`, `s0`.`Id`, `s0`.`ThreeId`, `s0`.`TwoId`
 """);
     }
 
@@ -1196,10 +1196,10 @@ public override async Task Include_skip_navigation_split(bool async)
 """,
                 //
                 """
-SELECT `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`Slumber`, `t0`.`IsGreen`, `t0`.`IsBrown`, `t0`.`Discriminator`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
+SELECT `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`Slumber`, `s`.`IsGreen`, `s`.`IsBrown`, `s`.`Discriminator`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
-    SELECT `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`
+    SELECT `e0`.`RootSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`
     FROM `EntityCompositeKeyEntityRoot` AS `e0`
     INNER JOIN (
         SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
@@ -1213,8 +1213,8 @@ UNION ALL
         UNION ALL
         SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
         FROM `Leaf2s` AS `l0`
-    ) AS `t` ON `e0`.`RootSkipSharedId` = `t`.`Id`
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
+    ) AS `u` ON `e0`.`RootSkipSharedId` = `u`.`Id`
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s`.`CompositeKeySkipSharedKey3`)
 ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 """);
     }
@@ -1231,14 +1231,14 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityTwos` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
 ORDER BY `e`.`Id`
 """);
     }
@@ -1255,30 +1255,30 @@ public override async Task Include_skip_navigation_then_include_skip_navigation_
 """,
                 //
                 """
-SELECT `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
+SELECT `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
     SELECT `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `Leaves` AS `l` ON `j`.`LeafId` = `l`.`Id`
-) AS `t` ON ((`e`.`Key1` = `t`.`CompositeId1`) AND (`e`.`Key2` = `t`.`CompositeId2`)) AND (`e`.`Key3` = `t`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Id`
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeId1`) AND (`e`.`Key2` = `s`.`CompositeId2`)) AND (`e`.`Key3` = `s`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`EntityBranchId`, `t0`.`EntityOneId`, `t0`.`Id`, `t0`.`Name`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Id`
+SELECT `s0`.`EntityBranchId`, `s0`.`EntityOneId`, `s0`.`Id`, `s0`.`Name`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Id`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
     SELECT `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `l`.`Id`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `Leaves` AS `l` ON `j`.`LeafId` = `l`.`Id`
-) AS `t` ON ((`e`.`Key1` = `t`.`CompositeId1`) AND (`e`.`Key2` = `t`.`CompositeId2`)) AND (`e`.`Key3` = `t`.`CompositeId3`)
+) AS `s` ON ((`e`.`Key1` = `s`.`CompositeId1`) AND (`e`.`Key2` = `s`.`CompositeId2`)) AND (`e`.`Key3` = `s`.`CompositeId3`)
 INNER JOIN (
     SELECT `j0`.`EntityBranchId`, `j0`.`EntityOneId`, `e0`.`Id`, `e0`.`Name`
     FROM `JoinOneToBranch` AS `j0`
     INNER JOIN `EntityOnes` AS `e0` ON `j0`.`EntityOneId` = `e0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`EntityBranchId`
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Id`
+) AS `s0` ON `s`.`Id` = `s0`.`EntityBranchId`
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Id`
 """);
     }
 
@@ -1294,32 +1294,32 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`OneId`, `t`.`ThreeId`, `t`.`Payload`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s`.`OneId`, `s`.`ThreeId`, `s`.`Payload`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`, `s`.`Id0`
 """,
                 //
                 """
-SELECT `t0`.`LeftId`, `t0`.`RightId`, `t0`.`Payload`, `t0`.`Id`, `t0`.`Name`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`, `t`.`Id0`
+SELECT `s0`.`LeftId`, `s0`.`RightId`, `s0`.`Payload`, `s0`.`Id`, `s0`.`Name`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`, `s`.`Id0`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `e0`.`Id`, `e1`.`Id` AS `Id0`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 INNER JOIN (
     SELECT `j0`.`LeftId`, `j0`.`RightId`, `j0`.`Payload`, `e2`.`Id`, `e2`.`Name`
     FROM `JoinOneSelfPayload` AS `j0`
     INNER JOIN `EntityOnes` AS `e2` ON `j0`.`RightId` = `e2`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`LeftId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`, `t`.`Id0`
+) AS `s0` ON `s`.`Id` = `s0`.`LeftId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -1336,14 +1336,14 @@ public override async Task Include_skip_navigation_and_reference_split(bool asyn
 """,
                 //
                 """
-SELECT `t`.`OneSkipSharedId`, `t`.`TwoSkipSharedId`, `t`.`Id`, `t`.`Name`, `e`.`Id`, `e0`.`Id`
+SELECT `s`.`OneSkipSharedId`, `s`.`TwoSkipSharedId`, `s`.`Id`, `s`.`Name`, `e`.`Id`, `e0`.`Id`
 FROM `EntityTwos` AS `e`
 LEFT JOIN `EntityThrees` AS `e0` ON `e`.`Id` = `e0`.`ReferenceInverseId`
 INNER JOIN (
     SELECT `e1`.`OneSkipSharedId`, `e1`.`TwoSkipSharedId`, `e2`.`Id`, `e2`.`Name`
     FROM `EntityOneEntityTwo` AS `e1`
     INNER JOIN `EntityOnes` AS `e2` ON `e1`.`OneSkipSharedId` = `e2`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`TwoSkipSharedId`
+) AS `s` ON `e`.`Id` = `s`.`TwoSkipSharedId`
 ORDER BY `e`.`Id`, `e0`.`Id`
 """);
     }
@@ -1360,14 +1360,14 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`OneId`, `t`.`ThreeId`, `t`.`Payload`, `t`.`Id`, `t`.`Name`, `e`.`Id`
+SELECT `s`.`OneId`, `s`.`ThreeId`, `s`.`Payload`, `s`.`Id`, `s`.`Name`, `e`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 ORDER BY `e`.`Id`
 """);
     }
@@ -1384,14 +1384,14 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`ThreeId`, `t`.`TwoId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s`.`ThreeId`, `s`.`TwoId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`ThreeId`, `j`.`TwoId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
     FROM `JoinTwoToThree` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`Id`
 """);
     }
 
@@ -1407,18 +1407,18 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`SelfSkipSharedLeftId`, `t0`.`SelfSkipSharedRightId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s0`.`SelfSkipSharedLeftId`, `s0`.`SelfSkipSharedRightId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityTwos` AS `e`
 INNER JOIN (
-    SELECT `t`.`SelfSkipSharedLeftId`, `t`.`SelfSkipSharedRightId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`SelfSkipSharedLeftId`, `s`.`SelfSkipSharedRightId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `e0`.`SelfSkipSharedLeftId`, `e0`.`SelfSkipSharedRightId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`SelfSkipSharedLeftId` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityTwoEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`SelfSkipSharedRightId` = `e1`.`Id`
-    ) AS `t`
-    WHERE 2 < `t`.`row`
-) AS `t0` ON `e`.`Id` = `t0`.`SelfSkipSharedLeftId`
-ORDER BY `e`.`Id`, `t0`.`SelfSkipSharedLeftId`, `t0`.`Id`
+    ) AS `s`
+    WHERE 2 < `s`.`row`
+) AS `s0` ON `e`.`Id` = `s0`.`SelfSkipSharedLeftId`
+ORDER BY `e`.`Id`, `s0`.`SelfSkipSharedLeftId`, `s0`.`Id`
 """);
     }
 
@@ -1434,18 +1434,18 @@ public override async Task Filtered_include_skip_navigation_order_by_take_split(
 """,
                 //
                 """
-SELECT `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
+SELECT `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
-    SELECT `t`.`TwoSkipSharedId`, `t`.`CompositeKeySkipSharedKey1`, `t`.`CompositeKeySkipSharedKey2`, `t`.`CompositeKeySkipSharedKey3`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`TwoSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `e0`.`TwoSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityCompositeKeyEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s0`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`
 """);
     }
 
@@ -1461,18 +1461,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take_s
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`ThreeId`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
+SELECT `s0`.`Id`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`ThreeId`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
 FROM `EntityCompositeKeys` AS `e`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`ThreeId`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`Id`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`ThreeId`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `j`.`Id`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `j`.`ThreeId`, `e0`.`Id` AS `Id0`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinThreeToCompositeKeyFull` AS `j`
         INNER JOIN `EntityThrees` AS `e0` ON `j`.`ThreeId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeId1`) AND (`e`.`Key2` = `t0`.`CompositeId2`)) AND (`e`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id0`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeId1`) AND (`e`.`Key2` = `s0`.`CompositeId2`)) AND (`e`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id0`
 """);
     }
 
@@ -1482,7 +1482,7 @@ public override async Task Filtered_then_include_skip_navigation_where_split(boo
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`
 FROM (
     SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
     FROM `Roots` AS `r`
@@ -1495,12 +1495,12 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
     FROM `Leaf2s` AS `l0`
-) AS `t`
-ORDER BY `t`.`Id`
+) AS `u`
+ORDER BY `u`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `t`.`Id`
+SELECT `s`.`RootSkipSharedId`, `s`.`ThreeSkipSharedId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `u`.`Id`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -1513,17 +1513,17 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e`.`RootSkipSharedId`, `e`.`ThreeSkipSharedId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
     FROM `EntityRootEntityThree` AS `e`
     INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
+ORDER BY `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`ThreeSkipSharedId`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t1`.`OneId`, `t1`.`ThreeId`, `t1`.`Payload`, `t1`.`Id`, `t1`.`Name`, `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`
+SELECT `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Payload`, `s0`.`Id`, `s0`.`Name`, `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`ThreeSkipSharedId`, `s`.`Id`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -1536,19 +1536,19 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e`.`RootSkipSharedId`, `e`.`ThreeSkipSharedId`, `e0`.`Id`
     FROM `EntityRootEntityThree` AS `e`
     INNER JOIN `EntityThrees` AS `e0` ON `e`.`ThreeSkipSharedId` = `e0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e1`.`Id`, `e1`.`Name`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e1` ON `j`.`OneId` = `e1`.`Id`
     WHERE `e1`.`Id` < 10
-) AS `t1` ON `t0`.`Id` = `t1`.`ThreeId`
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`ThreeSkipSharedId`, `t0`.`Id`
+) AS `s0` ON `s`.`Id` = `s0`.`ThreeId`
+ORDER BY `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`ThreeSkipSharedId`, `s`.`Id`
 """);
     }
 
@@ -1558,7 +1558,7 @@ public override async Task Filtered_then_include_skip_navigation_order_by_skip_t
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`Slumber`, `t`.`IsGreen`, `t`.`IsBrown`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`Slumber`, `u`.`IsGreen`, `u`.`IsBrown`, `u`.`Discriminator`
 FROM (
     SELECT `r`.`Id`, `r`.`Name`, NULL AS `Number`, NULL AS `Slumber`, NULL AS `IsGreen`, NULL AS `IsBrown`, 'EntityRoot' AS `Discriminator`
     FROM `Roots` AS `r`
@@ -1571,12 +1571,12 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`, `l0`.`Name`, NULL AS `Number`, `l0`.`Slumber`, NULL AS `IsGreen`, `l0`.`IsBrown`, 'EntityLeaf2' AS `Discriminator`
     FROM `Leaf2s` AS `l0`
-) AS `t`
-ORDER BY `t`.`Id`
+) AS `u`
+ORDER BY `u`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`Name`, `t`.`Id`
+SELECT `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`, `s`.`Name`, `u`.`Id`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -1589,17 +1589,17 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e`.`RootSkipSharedId`, `e`.`CompositeKeySkipSharedKey1`, `e`.`CompositeKeySkipSharedKey2`, `e`.`CompositeKeySkipSharedKey3`, `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`, `e0`.`Name`
     FROM `EntityCompositeKeyEntityRoot` AS `e`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1`) AND (`e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2`)) AND (`e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`)
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
+ORDER BY `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 """,
                 //
                 """
-SELECT `t1`.`Id`, `t1`.`CompositeId1`, `t1`.`CompositeId2`, `t1`.`CompositeId3`, `t1`.`ThreeId`, `t1`.`Id0`, `t1`.`CollectionInverseId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`
+SELECT `s1`.`Id`, `s1`.`CompositeId1`, `s1`.`CompositeId2`, `s1`.`CompositeId3`, `s1`.`ThreeId`, `s1`.`Id0`, `s1`.`CollectionInverseId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 FROM (
     SELECT `r`.`Id`
     FROM `Roots` AS `r`
@@ -1612,22 +1612,22 @@ UNION ALL
     UNION ALL
     SELECT `l0`.`Id`
     FROM `Leaf2s` AS `l0`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `e`.`RootSkipSharedId`, `e`.`CompositeKeySkipSharedKey1`, `e`.`CompositeKeySkipSharedKey2`, `e`.`CompositeKeySkipSharedKey3`, `e0`.`Key1`, `e0`.`Key2`, `e0`.`Key3`
     FROM `EntityCompositeKeyEntityRoot` AS `e`
     INNER JOIN `EntityCompositeKeys` AS `e0` ON ((`e`.`CompositeKeySkipSharedKey1` = `e0`.`Key1`) AND (`e`.`CompositeKeySkipSharedKey2` = `e0`.`Key2`)) AND (`e`.`CompositeKeySkipSharedKey3` = `e0`.`Key3`)
-) AS `t0` ON `t`.`Id` = `t0`.`RootSkipSharedId`
+) AS `s` ON `u`.`Id` = `s`.`RootSkipSharedId`
 INNER JOIN (
-    SELECT `t2`.`Id`, `t2`.`CompositeId1`, `t2`.`CompositeId2`, `t2`.`CompositeId3`, `t2`.`ThreeId`, `t2`.`Id0`, `t2`.`CollectionInverseId`, `t2`.`Name`, `t2`.`ReferenceInverseId`
+    SELECT `s0`.`Id`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`ThreeId`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
     FROM (
         SELECT `j`.`Id`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `j`.`ThreeId`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3` ORDER BY `e1`.`Id`) AS `row`
         FROM `JoinThreeToCompositeKeyFull` AS `j`
         INNER JOIN `EntityThrees` AS `e1` ON `j`.`ThreeId` = `e1`.`Id`
-    ) AS `t2`
-    WHERE (1 < `t2`.`row`) AND (`t2`.`row` <= 3)
-) AS `t1` ON ((`t0`.`Key1` = `t1`.`CompositeId1`) AND (`t0`.`Key2` = `t1`.`CompositeId2`)) AND (`t0`.`Key3` = `t1`.`CompositeId3`)
-ORDER BY `t`.`Id`, `t0`.`RootSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t1`.`CompositeId1`, `t1`.`CompositeId2`, `t1`.`CompositeId3`, `t1`.`Id0`
+    ) AS `s0`
+    WHERE (1 < `s0`.`row`) AND (`s0`.`row` <= 3)
+) AS `s1` ON ((`s`.`Key1` = `s1`.`CompositeId1`) AND (`s`.`Key2` = `s1`.`CompositeId2`)) AND (`s`.`Key3` = `s1`.`CompositeId3`)
+ORDER BY `u`.`Id`, `s`.`RootSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`, `s1`.`CompositeId1`, `s1`.`CompositeId2`, `s1`.`CompositeId3`, `s1`.`Id0`
 """);
     }
 
@@ -1643,32 +1643,32 @@ ORDER BY `l`.`Id`
 """,
                 //
                 """
-SELECT `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Key1`, `t`.`Key2`, `t`.`Key3`, `t`.`Name`, `l`.`Id`
+SELECT `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`, `s`.`Name`, `l`.`Id`
 FROM `Leaves` AS `l`
 INNER JOIN (
     SELECT `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `EntityCompositeKeys` AS `e` ON ((`j`.`CompositeId1` = `e`.`Key1`) AND (`j`.`CompositeId2` = `e`.`Key2`)) AND (`j`.`CompositeId3` = `e`.`Key3`)
     WHERE `e`.`Key1` < 5
-) AS `t` ON `l`.`Id` = `t`.`LeafId`
-ORDER BY `l`.`Id`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Key1`, `t`.`Key2`, `t`.`Key3`
+) AS `s` ON `l`.`Id` = `s`.`LeafId`
+ORDER BY `l`.`Id`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 """,
                 //
                 """
-SELECT `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `l`.`Id`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Key1`, `t`.`Key2`, `t`.`Key3`
+SELECT `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `l`.`Id`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 FROM `Leaves` AS `l`
 INNER JOIN (
     SELECT `j`.`LeafId`, `j`.`CompositeId1`, `j`.`CompositeId2`, `j`.`CompositeId3`, `e`.`Key1`, `e`.`Key2`, `e`.`Key3`
     FROM `JoinCompositeKeyToLeaf` AS `j`
     INNER JOIN `EntityCompositeKeys` AS `e` ON ((`j`.`CompositeId1` = `e`.`Key1`) AND (`j`.`CompositeId2` = `e`.`Key2`)) AND (`j`.`CompositeId3` = `e`.`Key3`)
     WHERE `e`.`Key1` < 5
-) AS `t` ON `l`.`Id` = `t`.`LeafId`
+) AS `s` ON `l`.`Id` = `s`.`LeafId`
 INNER JOIN (
     SELECT `e0`.`TwoSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
     FROM `EntityCompositeKeyEntityTwo` AS `e0`
     INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-) AS `t0` ON ((`t`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`t`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`t`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `l`.`Id`, `t`.`LeafId`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`Key1`, `t`.`Key2`, `t`.`Key3`
+) AS `s0` ON ((`s`.`Key1` = `s0`.`CompositeKeySkipSharedKey1`) AND (`s`.`Key2` = `s0`.`CompositeKeySkipSharedKey2`)) AND (`s`.`Key3` = `s0`.`CompositeKeySkipSharedKey3`)
+ORDER BY `l`.`Id`, `s`.`LeafId`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`Key1`, `s`.`Key2`, `s`.`Key3`
 """);
     }
 
@@ -1684,39 +1684,39 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`OneId`, `t0`.`TwoId`, `t0`.`JoinOneToTwoExtraId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s0`.`OneId`, `s0`.`TwoId`, `s0`.`JoinOneToTwoExtraId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j`.`OneId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToTwo` AS `j`
         INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON `e`.`Id` = `t0`.`OneId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`Id`, `t0`.`TwoId`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON `e`.`Id` = `s0`.`OneId`
+ORDER BY `e`.`Id`, `s0`.`OneId`, `s0`.`Id`, `s0`.`TwoId`
 """,
                 //
                 """
-SELECT `t1`.`ThreeId`, `t1`.`TwoId`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `e`.`Id`, `t0`.`OneId`, `t0`.`TwoId`, `t0`.`Id`
+SELECT `s1`.`ThreeId`, `s1`.`TwoId`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `e`.`Id`, `s0`.`OneId`, `s0`.`TwoId`, `s0`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
-    SELECT `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+    SELECT `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
     FROM (
         SELECT `j`.`OneId`, `j`.`TwoId`, `e0`.`Id`, ROW_NUMBER() OVER(PARTITION BY `j`.`OneId` ORDER BY `e0`.`Id`) AS `row`
         FROM `JoinOneToTwo` AS `j`
         INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON `e`.`Id` = `t0`.`OneId`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON `e`.`Id` = `s0`.`OneId`
 INNER JOIN (
     SELECT `j0`.`ThreeId`, `j0`.`TwoId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
     FROM `JoinTwoToThree` AS `j0`
     INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
     WHERE `e1`.`Id` < 10
-) AS `t1` ON `t0`.`Id` = `t1`.`TwoId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`Id`, `t0`.`TwoId`
+) AS `s1` ON `s0`.`Id` = `s1`.`TwoId`
+ORDER BY `e`.`Id`, `s0`.`OneId`, `s0`.`Id`, `s0`.`TwoId`
 """);
     }
 
@@ -1732,36 +1732,36 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`OneId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`OneId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`ThreeId`, `t0`.`TwoId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+SELECT `s1`.`ThreeId`, `s1`.`TwoId`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`TwoId`, `e0`.`Id`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`OneId`
+) AS `s` ON `e`.`Id` = `s`.`OneId`
 INNER JOIN (
-    SELECT `t1`.`ThreeId`, `t1`.`TwoId`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`Name`, `t1`.`ReferenceInverseId`
+    SELECT `s0`.`ThreeId`, `s0`.`TwoId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
     FROM (
         SELECT `j0`.`ThreeId`, `j0`.`TwoId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j0`.`TwoId` ORDER BY `e1`.`Id`) AS `row`
         FROM `JoinTwoToThree` AS `j0`
         INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
-    ) AS `t1`
-    WHERE (1 < `t1`.`row`) AND (`t1`.`row` <= 3)
-) AS `t0` ON `t`.`Id` = `t0`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t0`.`TwoId`, `t0`.`Id`
+    ) AS `s0`
+    WHERE (1 < `s0`.`row`) AND (`s0`.`row` <= 3)
+) AS `s1` ON `s`.`Id` = `s1`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s1`.`TwoId`, `s1`.`Id`
 """);
     }
 
@@ -1777,7 +1777,7 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityTwos` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`
@@ -1785,12 +1785,12 @@ INNER JOIN (
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 """,
                 //
                 """
-SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 FROM `EntityTwos` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`TwoId`, `e0`.`Id`, `e1`.`Id` AS `Id0`
@@ -1798,9 +1798,9 @@ INNER JOIN (
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-INNER JOIN `EntityTwos` AS `e2` ON `t`.`Id` = `e2`.`CollectionInverseId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+INNER JOIN `EntityTwos` AS `e2` ON `s`.`Id` = `e2`.`CollectionInverseId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -1816,60 +1816,60 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`OneId`, `t`.`ThreeId`, `t`.`Payload`, `t`.`Id`, `t`.`Name`, `e`.`Id`
+SELECT `s`.`OneId`, `s`.`ThreeId`, `s`.`Payload`, `s`.`Id`, `s`.`Name`, `e`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`OneId`, `t0`.`TwoId`, `t0`.`JoinOneToTwoExtraId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+SELECT `s1`.`OneId`, `s1`.`TwoId`, `s1`.`JoinOneToTwoExtraId`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`ExtraId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `e0`.`Id`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 INNER JOIN (
-    SELECT `t1`.`OneId`, `t1`.`TwoId`, `t1`.`JoinOneToTwoExtraId`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`ExtraId`, `t1`.`Name`, `t1`.`ReferenceInverseId`
+    SELECT `s0`.`OneId`, `s0`.`TwoId`, `s0`.`JoinOneToTwoExtraId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
     FROM (
         SELECT `j0`.`OneId`, `j0`.`TwoId`, `j0`.`JoinOneToTwoExtraId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `j0`.`OneId` ORDER BY `e1`.`Id`) AS `row`
         FROM `JoinOneToTwo` AS `j0`
         INNER JOIN `EntityTwos` AS `e1` ON `j0`.`TwoId` = `e1`.`Id`
-    ) AS `t1`
-    WHERE (1 < `t1`.`row`) AND (`t1`.`row` <= 3)
-) AS `t0` ON `t`.`Id` = `t0`.`OneId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`, `t0`.`OneId`, `t0`.`Id`
+    ) AS `s0`
+    WHERE (1 < `s0`.`row`) AND (`s0`.`row` <= 3)
+) AS `s1` ON `s`.`Id` = `s1`.`OneId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`, `s1`.`OneId`, `s1`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`EntityBranchId`, `t0`.`EntityOneId`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+SELECT `s2`.`EntityBranchId`, `s2`.`EntityOneId`, `s2`.`Id`, `s2`.`Name`, `s2`.`Number`, `s2`.`IsGreen`, `s2`.`Discriminator`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `e0`.`Id`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 INNER JOIN (
-    SELECT `j0`.`EntityBranchId`, `j0`.`EntityOneId`, `t1`.`Id`, `t1`.`Name`, `t1`.`Number`, `t1`.`IsGreen`, `t1`.`Discriminator`
-    FROM `JoinOneToBranch` AS `j0`
+    SELECT `j1`.`EntityBranchId`, `j1`.`EntityOneId`, `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`
+    FROM `JoinOneToBranch` AS `j1`
     INNER JOIN (
         SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
         FROM `Branches` AS `b`
         UNION ALL
         SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
         FROM `Leaves` AS `l`
-    ) AS `t1` ON `j0`.`EntityBranchId` = `t1`.`Id`
-    WHERE `t1`.`Id` < 20
-) AS `t0` ON `t`.`Id` = `t0`.`EntityOneId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+    ) AS `u` ON `j1`.`EntityBranchId` = `u`.`Id`
+    WHERE `u`.`Id` < 20
+) AS `s2` ON `s`.`Id` = `s2`.`EntityOneId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """);
     }
 
@@ -1885,32 +1885,32 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`OneId`, `t`.`ThreeId`, `t`.`Payload`, `t`.`Id`, `t`.`Name`, `e`.`Id`
+SELECT `s`.`OneId`, `s`.`ThreeId`, `s`.`Payload`, `s`.`Id`, `s`.`Name`, `e`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` > 15
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 FROM `EntityThrees` AS `e`
 INNER JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `e0`.`Id`
     FROM `JoinOneToThreePayloadFull` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` > 15
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
 INNER JOIN (
     SELECT `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
     FROM `EntityTwos` AS `e1`
     WHERE `e1`.`Id` < 5
-) AS `t0` ON `t`.`Id` = `t0`.`CollectionInverseId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Id`
+) AS `e2` ON `s`.`Id` = `e2`.`CollectionInverseId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Id`
 """);
     }
 
@@ -1926,31 +1926,31 @@ ORDER BY `e`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `e`.`Id`
+SELECT `e2`.`Id`, `e2`.`CollectionInverseId`, `e2`.`ExtraId`, `e2`.`Name`, `e2`.`ReferenceInverseId`, `e`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
     FROM `EntityTwos` AS `e0`
     WHERE `e0`.`Id` > 15
-) AS `t` ON `e`.`Id` = `t`.`CollectionInverseId`
-ORDER BY `e`.`Id`, `t`.`Id`
+) AS `e2` ON `e`.`Id` = `e2`.`CollectionInverseId`
+ORDER BY `e`.`Id`, `e2`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`ThreeId`, `t0`.`TwoId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`, `e`.`Id`, `t`.`Id`
+SELECT `s`.`ThreeId`, `s`.`TwoId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `e`.`Id`, `e2`.`Id`
 FROM `EntityOnes` AS `e`
 INNER JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`
     FROM `EntityTwos` AS `e0`
     WHERE `e0`.`Id` > 15
-) AS `t` ON `e`.`Id` = `t`.`CollectionInverseId`
+) AS `e2` ON `e`.`Id` = `e2`.`CollectionInverseId`
 INNER JOIN (
     SELECT `j`.`ThreeId`, `j`.`TwoId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
     FROM `JoinTwoToThree` AS `j`
     INNER JOIN `EntityThrees` AS `e1` ON `j`.`ThreeId` = `e1`.`Id`
     WHERE `e1`.`Id` < 5
-) AS `t0` ON `t`.`Id` = `t0`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`Id`
+) AS `s` ON `e2`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `e2`.`Id`
 """);
     }
 
@@ -1960,19 +1960,19 @@ public override async Task Include_skip_navigation_then_include_inverse_works_fo
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Payload`, `t0`.`Id`, `t0`.`Name`, `t0`.`OneId0`, `t0`.`ThreeId0`, `t0`.`Payload0`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Payload`, `s0`.`Id`, `s0`.`Name`, `s0`.`OneId0`, `s0`.`ThreeId0`, `s0`.`Payload0`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
-    SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `t`.`OneId` AS `OneId0`, `t`.`ThreeId` AS `ThreeId0`, `t`.`Payload` AS `Payload0`, `t`.`Id` AS `Id0`, `t`.`CollectionInverseId`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId`
+    SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`, `s`.`OneId` AS `OneId0`, `s`.`ThreeId` AS `ThreeId0`, `s`.`Payload` AS `Payload0`, `s`.`Id` AS `Id0`, `s`.`CollectionInverseId`, `s`.`Name` AS `Name0`, `s`.`ReferenceInverseId`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     LEFT JOIN (
         SELECT `j0`.`OneId`, `j0`.`ThreeId`, `j0`.`Payload`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
         FROM `JoinOneToThreePayloadFullShared` AS `j0`
         INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
-    ) AS `t` ON `e0`.`Id` = `t`.`OneId`
-) AS `t0` ON `e`.`Id` = `t0`.`ThreeId`
-ORDER BY `e`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id`, `t0`.`OneId0`, `t0`.`ThreeId0`
+    ) AS `s` ON `e0`.`Id` = `s`.`OneId`
+) AS `s0` ON `e`.`Id` = `s0`.`ThreeId`
+ORDER BY `e`.`Id`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Id`, `s0`.`OneId0`, `s0`.`ThreeId0`
 """);
     }
 
@@ -2003,13 +2003,13 @@ public override async Task Select_many_over_skip_navigation_where_non_equality(b
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `EntityOnes` AS `e`
 LEFT JOIN (
     SELECT `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`, `j`.`OneId`
     FROM `JoinOneToTwo` AS `j`
     INNER JOIN `EntityTwos` AS `e0` ON `j`.`TwoId` = `e0`.`Id`
-) AS `t` ON (`e`.`Id` = `t`.`OneId`) AND (`e`.`Id` <> `t`.`Id`)
+) AS `s` ON (`e`.`Id` = `s`.`OneId`) AND (`e`.`Id` <> `s`.`Id`)
 """);
     }
 
@@ -2070,14 +2070,14 @@ public override async Task GetType_in_hierarchy_in_querying_base_type(bool async
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `u`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, `b`.`Number`, NULL AS `IsGreen`, 'EntityBranch' AS `Discriminator`
     FROM `Branches` AS `b`
     UNION ALL
     SELECT `l`.`Id`, `l`.`Name`, `l`.`Number`, `l`.`IsGreen`, 'EntityLeaf' AS `Discriminator`
     FROM `Leaves` AS `l`
-) AS `t`
+) AS `u`
 WHERE FALSE
 """);
     }
@@ -2088,18 +2088,18 @@ public override async Task Filtered_include_skip_navigation_order_by_take_EF_Pro
 
         AssertSql(
 """
-SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `t0`.`TwoSkipSharedId`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `e`.`Name`, `s0`.`TwoSkipSharedId`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `EntityCompositeKeys` AS `e`
 LEFT JOIN (
-    SELECT `t`.`TwoSkipSharedId`, `t`.`CompositeKeySkipSharedKey1`, `t`.`CompositeKeySkipSharedKey2`, `t`.`CompositeKeySkipSharedKey3`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`TwoSkipSharedId`, `s`.`CompositeKeySkipSharedKey1`, `s`.`CompositeKeySkipSharedKey2`, `s`.`CompositeKeySkipSharedKey3`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `e0`.`TwoSkipSharedId`, `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name`, `e1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `e0`.`CompositeKeySkipSharedKey1`, `e0`.`CompositeKeySkipSharedKey2`, `e0`.`CompositeKeySkipSharedKey3` ORDER BY `e1`.`Id`) AS `row`
         FROM `EntityCompositeKeyEntityTwo` AS `e0`
         INNER JOIN `EntityTwos` AS `e1` ON `e0`.`TwoSkipSharedId` = `e1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON ((`e`.`Key1` = `t0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `t0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `t0`.`CompositeKeySkipSharedKey3`)
-ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `t0`.`CompositeKeySkipSharedKey1`, `t0`.`CompositeKeySkipSharedKey2`, `t0`.`CompositeKeySkipSharedKey3`, `t0`.`Id`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON ((`e`.`Key1` = `s0`.`CompositeKeySkipSharedKey1`) AND (`e`.`Key2` = `s0`.`CompositeKeySkipSharedKey2`)) AND (`e`.`Key3` = `s0`.`CompositeKeySkipSharedKey3`)
+ORDER BY `e`.`Key1`, `e`.`Key2`, `e`.`Key3`, `s0`.`CompositeKeySkipSharedKey1`, `s0`.`CompositeKeySkipSharedKey2`, `s0`.`CompositeKeySkipSharedKey3`, `s0`.`Id`
 """);
     }
 
@@ -2110,10 +2110,10 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take_t
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`Name`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`JoinOneToTwoExtraId`, `t1`.`Id`, `t1`.`CollectionInverseId`, `t1`.`ExtraId`, `t1`.`Name`, `t1`.`ReferenceInverseId`, `t1`.`ThreeId`, `t1`.`TwoId0`, `t1`.`Id0`, `t1`.`CollectionInverseId0`, `t1`.`Name0`, `t1`.`ReferenceInverseId0`
+SELECT `e`.`Id`, `e`.`Name`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`JoinOneToTwoExtraId`, `s1`.`Id`, `s1`.`CollectionInverseId`, `s1`.`ExtraId`, `s1`.`Name`, `s1`.`ReferenceInverseId`, `s1`.`ThreeId`, `s1`.`TwoId0`, `s1`.`Id0`, `s1`.`CollectionInverseId0`, `s1`.`Name0`, `s1`.`ReferenceInverseId0`
 FROM `EntityOnes` AS `e`
 LEFT JOIN LATERAL (
-    SELECT `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t0`.`ThreeId`, `t0`.`TwoId` AS `TwoId0`, `t0`.`Id` AS `Id0`, `t0`.`CollectionInverseId` AS `CollectionInverseId0`, `t0`.`Name` AS `Name0`, `t0`.`ReferenceInverseId` AS `ReferenceInverseId0`
+    SELECT `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s0`.`ThreeId`, `s0`.`TwoId` AS `TwoId0`, `s0`.`Id` AS `Id0`, `s0`.`CollectionInverseId` AS `CollectionInverseId0`, `s0`.`Name` AS `Name0`, `s0`.`ReferenceInverseId` AS `ReferenceInverseId0`
     FROM (
         SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`CollectionInverseId`, `e0`.`ExtraId`, `e0`.`Name`, `e0`.`ReferenceInverseId`
         FROM `JoinOneToTwo` AS `j`
@@ -2121,15 +2121,15 @@ LEFT JOIN LATERAL (
         WHERE `e`.`Id` = `j`.`OneId`
         ORDER BY `e0`.`Id`
         LIMIT 2 OFFSET 1
-    ) AS `t`
+    ) AS `s`
     LEFT JOIN (
         SELECT `j0`.`ThreeId`, `j0`.`TwoId`, `e1`.`Id`, `e1`.`CollectionInverseId`, `e1`.`Name`, `e1`.`ReferenceInverseId`
         FROM `JoinTwoToThree` AS `j0`
         INNER JOIN `EntityThrees` AS `e1` ON `j0`.`ThreeId` = `e1`.`Id`
         WHERE `e1`.`Id` < 10
-    ) AS `t0` ON `t`.`Id` = `t0`.`TwoId`
-) AS `t1` ON TRUE
-ORDER BY `e`.`Id`, `t1`.`Id`, `t1`.`OneId`, `t1`.`TwoId`, `t1`.`ThreeId`, `t1`.`TwoId0`
+    ) AS `s0` ON `s`.`Id` = `s0`.`TwoId`
+) AS `s1` ON TRUE
+ORDER BY `e`.`Id`, `s1`.`Id`, `s1`.`OneId`, `s1`.`TwoId`, `s1`.`ThreeId`, `s1`.`TwoId0`
 """);
     }
 
@@ -2209,13 +2209,13 @@ ORDER BY (
     SELECT COUNT(*)
     FROM `UnidirectionalJoinOneToBranch` AS `u0`
     INNER JOIN (
-        SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
+        SELECT `u1`.`Id`, `u1`.`Name`
         FROM `UnidirectionalBranches` AS `u1`
         UNION ALL
-        SELECT `u2`.`Id`, `u2`.`Name`, `u2`.`Number`, `u2`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
+        SELECT `u2`.`Id`, `u2`.`Name`
         FROM `UnidirectionalLeaves` AS `u2`
-    ) AS `t` ON `u0`.`UnidirectionalEntityBranchId` = `t`.`Id`
-    WHERE (`u`.`Id` = `u0`.`UnidirectionalEntityOneId`) AND (`t`.`Name` LIKE 'L%')), `u`.`Id`
+    ) AS `u3` ON `u0`.`UnidirectionalEntityBranchId` = `u3`.`Id`
+    WHERE (`u`.`Id` = `u0`.`UnidirectionalEntityOneId`) AND (`u3`.`Name` LIKE 'L%')), `u`.`Id`
 """);
     }
 
@@ -2240,17 +2240,17 @@ public override async Task Skip_navigation_order_by_reverse_first_or_default_uni
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityThrees` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`ThreeId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`ThreeId`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`ThreeId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`ThreeId` ORDER BY `u1`.`Id` DESC) AS `row`
         FROM `UnidirectionalJoinTwoToThree` AS `u0`
         INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoId` = `u1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 1
-) AS `t0` ON `u`.`Id` = `t0`.`ThreeId`
+    ) AS `s`
+    WHERE `s`.`row` <= 1
+) AS `s0` ON `u`.`Id` = `s0`.`ThreeId`
 """);
     }
 
@@ -2259,11 +2259,11 @@ public override async Task Skip_navigation_of_type_unidirectional(bool async)
         await base.Skip_navigation_of_type_unidirectional(async);
 
         AssertSql(
-$"""
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`, `t0`.`RootSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+"""
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`, `s`.`RootSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `u0`.`RootSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`
+    SELECT `u4`.`Id`, `u4`.`Name`, `u4`.`Number`, `u4`.`IsGreen`, `u4`.`Discriminator`, `u0`.`RootSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`
     FROM `UnidirectionalEntityCompositeKeyUnidirectionalEntityRoot` AS `u0`
     INNER JOIN (
         SELECT `u1`.`Id`, `u1`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'UnidirectionalEntityRoot' AS `Discriminator`
@@ -2272,12 +2272,12 @@ UNION ALL
         SELECT `u2`.`Id`, `u2`.`Name`, `u2`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
         FROM `UnidirectionalBranches` AS `u2`
         UNION ALL
-        SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'UnidirectionalEntityLeaf'")} AS `Discriminator`
+        SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
         FROM `UnidirectionalLeaves` AS `u3`
-    ) AS `t` ON `u0`.`RootSkipSharedId` = `t`.`Id`
-    WHERE `t`.`Discriminator` = 'UnidirectionalEntityLeaf'
-) AS `t0` ON ((`u`.`Key1` = `t0`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `t0`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `t0`.`UnidirectionalEntityCompositeKeyKey3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`RootSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+    ) AS `u4` ON `u0`.`RootSkipSharedId` = `u4`.`Id`
+    WHERE `u4`.`Discriminator` = 'UnidirectionalEntityLeaf'
+) AS `s` ON ((`u`.`Key1` = `s`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `s`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `s`.`UnidirectionalEntityCompositeKeyKey3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s`.`RootSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
 """);
     }
 
@@ -2330,22 +2330,22 @@ public override async Task Select_many_over_skip_navigation_unidirectional(bool
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM (
-    SELECT `u1`.`Id`
-    FROM `UnidirectionalRoots` AS `u1`
+    SELECT `u`.`Id`
+    FROM `UnidirectionalRoots` AS `u`
     UNION ALL
-    SELECT `u2`.`Id`
-    FROM `UnidirectionalBranches` AS `u2`
+    SELECT `u0`.`Id`
+    FROM `UnidirectionalBranches` AS `u0`
     UNION ALL
-    SELECT `u3`.`Id`
-    FROM `UnidirectionalLeaves` AS `u3`
-) AS `t`
+    SELECT `u1`.`Id`
+    FROM `UnidirectionalLeaves` AS `u1`
+) AS `u2`
 INNER JOIN (
-    SELECT `u0`.`Id`, `u0`.`CollectionInverseId`, `u0`.`Name`, `u0`.`ReferenceInverseId`, `u`.`UnidirectionalEntityRootId`
-    FROM `UnidirectionalEntityRootUnidirectionalEntityThree` AS `u`
-    INNER JOIN `UnidirectionalEntityThrees` AS `u0` ON `u`.`ThreeSkipSharedId` = `u0`.`Id`
-) AS `t0` ON `t`.`Id` = `t0`.`UnidirectionalEntityRootId`
+    SELECT `u4`.`Id`, `u4`.`CollectionInverseId`, `u4`.`Name`, `u4`.`ReferenceInverseId`, `u3`.`UnidirectionalEntityRootId`
+    FROM `UnidirectionalEntityRootUnidirectionalEntityThree` AS `u3`
+    INNER JOIN `UnidirectionalEntityThrees` AS `u4` ON `u3`.`ThreeSkipSharedId` = `u4`.`Id`
+) AS `s` ON `u2`.`Id` = `s`.`UnidirectionalEntityRootId`
 """);
     }
 
@@ -2355,13 +2355,13 @@ public override async Task Select_many_over_skip_navigation_where_unidirectional
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `UnidirectionalEntityOnes` AS `u`
 LEFT JOIN (
     SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`OneId`
     FROM `UnidirectionalJoinOneToTwo` AS `u0`
     INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoId` = `u1`.`Id`
-) AS `t` ON `u`.`Id` = `t`.`OneId`
+) AS `s` ON `u`.`Id` = `s`.`OneId`
 """);
     }
 
@@ -2371,17 +2371,17 @@ public override async Task Select_many_over_skip_navigation_order_by_take_unidir
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityOnes` AS `u`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`UnidirectionalEntityOneId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`UnidirectionalEntityOneId`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`UnidirectionalEntityOneId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`UnidirectionalEntityOneId` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalEntityOneUnidirectionalEntityTwo` AS `u0`
         INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoSkipSharedId` = `u1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON `u`.`Id` = `t0`.`UnidirectionalEntityOneId`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON `u`.`Id` = `s0`.`UnidirectionalEntityOneId`
 """);
     }
 
@@ -2391,17 +2391,17 @@ public override async Task Select_many_over_skip_navigation_order_by_skip_take_u
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityOnes` AS `u`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`, `t`.`OneId`
+    SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`, `s`.`OneId`
     FROM (
         SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`OneId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`OneId` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalJoinOneToThreePayloadFullShared` AS `u0`
         INNER JOIN `UnidirectionalEntityThrees` AS `u1` ON `u0`.`ThreeId` = `u1`.`Id`
-    ) AS `t`
-    WHERE (2 < `t`.`row`) AND (`t`.`row` <= 5)
-) AS `t0` ON `u`.`Id` = `t0`.`OneId`
+    ) AS `s`
+    WHERE (2 < `s`.`row`) AND (`s`.`row` <= 5)
+) AS `s0` ON `u`.`Id` = `s0`.`OneId`
 """);
     }
 
@@ -2411,10 +2411,10 @@ public override async Task Select_many_over_skip_navigation_cast_unidirectional(
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`
 FROM `UnidirectionalEntityOnes` AS `u`
 INNER JOIN (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`, `u0`.`UnidirectionalEntityOneId`
+    SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, `u3`.`Discriminator`, `u0`.`UnidirectionalEntityOneId`
     FROM `UnidirectionalJoinOneToBranch` AS `u0`
     INNER JOIN (
         SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
@@ -2422,8 +2422,8 @@ INNER JOIN (
         UNION ALL
         SELECT `u2`.`Id`, `u2`.`Name`, `u2`.`Number`, `u2`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
         FROM `UnidirectionalLeaves` AS `u2`
-    ) AS `t` ON `u0`.`UnidirectionalEntityBranchId` = `t`.`Id`
-) AS `t0` ON `u`.`Id` = `t0`.`UnidirectionalEntityOneId`
+    ) AS `u3` ON `u0`.`UnidirectionalEntityBranchId` = `u3`.`Id`
+) AS `s` ON `u`.`Id` = `s`.`UnidirectionalEntityOneId`
 """);
     }
 
@@ -2432,14 +2432,14 @@ public override async Task Select_skip_navigation_unidirectional(bool async)
         await base.Select_skip_navigation_unidirectional(async);
         AssertSql(
 """
-SELECT `u`.`Id`, `t`.`Id`, `t`.`Name`, `t`.`LeftId`, `t`.`RightId`
+SELECT `u`.`Id`, `s`.`Id`, `s`.`Name`, `s`.`LeftId`, `s`.`RightId`
 FROM `UnidirectionalEntityOnes` AS `u`
 LEFT JOIN (
     SELECT `u1`.`Id`, `u1`.`Name`, `u0`.`LeftId`, `u0`.`RightId`
     FROM `UnidirectionalJoinOneSelfPayload` AS `u0`
     INNER JOIN `UnidirectionalEntityOnes` AS `u1` ON `u0`.`LeftId` = `u1`.`Id`
-) AS `t` ON `u`.`Id` = `t`.`RightId`
-ORDER BY `u`.`Id`, `t`.`LeftId`, `t`.`RightId`
+) AS `s` ON `u`.`Id` = `s`.`RightId`
+ORDER BY `u`.`Id`, `s`.`LeftId`, `s`.`RightId`
 """);
     }
 
@@ -2448,11 +2448,11 @@ public override async Task Include_skip_navigation_unidirectional(bool async)
         await base.Include_skip_navigation_unidirectional(async);
 
         AssertSql(
-$"""
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `t0`.`RootSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`Discriminator`
+"""
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `s`.`RootSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`, `s`.`Id`, `s`.`Name`, `s`.`Number`, `s`.`IsGreen`, `s`.`Discriminator`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `u0`.`RootSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`, `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
+    SELECT `u0`.`RootSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`, `u4`.`Id`, `u4`.`Name`, `u4`.`Number`, `u4`.`IsGreen`, `u4`.`Discriminator`
     FROM `UnidirectionalEntityCompositeKeyUnidirectionalEntityRoot` AS `u0`
     INNER JOIN (
         SELECT `u1`.`Id`, `u1`.`Name`, NULL AS `Number`, NULL AS `IsGreen`, 'UnidirectionalEntityRoot' AS `Discriminator`
@@ -2461,11 +2461,11 @@ UNION ALL
         SELECT `u2`.`Id`, `u2`.`Name`, `u2`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
         FROM `UnidirectionalBranches` AS `u2`
         UNION ALL
-        SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'UnidirectionalEntityLeaf'")} AS `Discriminator`
+        SELECT `u3`.`Id`, `u3`.`Name`, `u3`.`Number`, `u3`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
         FROM `UnidirectionalLeaves` AS `u3`
-    ) AS `t` ON `u0`.`RootSkipSharedId` = `t`.`Id`
-) AS `t0` ON ((`u`.`Key1` = `t0`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `t0`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `t0`.`UnidirectionalEntityCompositeKeyKey3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`RootSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+    ) AS `u4` ON `u0`.`RootSkipSharedId` = `u4`.`Id`
+) AS `s` ON ((`u`.`Key1` = `s`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `s`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `s`.`UnidirectionalEntityCompositeKeyKey3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s`.`RootSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`
 """);
     }
 
@@ -2475,15 +2475,15 @@ public override async Task Include_skip_navigation_then_reference_unidirectional
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`, `t`.`UnidirectionalJoinOneToTwoExtraId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`, `s`.`UnidirectionalJoinOneToTwoExtraId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`
 FROM `UnidirectionalEntityTwos` AS `u`
 LEFT JOIN (
     SELECT `u0`.`OneId`, `u0`.`TwoId`, `u0`.`UnidirectionalJoinOneToTwoExtraId`, `u1`.`Id`, `u1`.`Name`, `u2`.`Id` AS `Id0`, `u2`.`CollectionInverseId`, `u2`.`ExtraId`, `u2`.`Name` AS `Name0`, `u2`.`ReferenceInverseId`
     FROM `UnidirectionalJoinOneToTwo` AS `u0`
     INNER JOIN `UnidirectionalEntityOnes` AS `u1` ON `u0`.`OneId` = `u1`.`Id`
     LEFT JOIN `UnidirectionalEntityTwos` AS `u2` ON `u1`.`Id` = `u2`.`ReferenceInverseId`
-) AS `t` ON `u`.`Id` = `t`.`TwoId`
-ORDER BY `u`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`
+) AS `s` ON `u`.`Id` = `s`.`TwoId`
+ORDER BY `u`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`
 """);
     }
 
@@ -2493,19 +2493,19 @@ public override async Task Include_skip_navigation_then_include_skip_navigation_
 
         AssertSql(
 """
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`, `t0`.`Name`, `t0`.`Number`, `t0`.`IsGreen`, `t0`.`UnidirectionalEntityBranchId`, `t0`.`UnidirectionalEntityOneId`, `t0`.`Id0`, `t0`.`Name0`
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`, `s0`.`Name`, `s0`.`Number`, `s0`.`IsGreen`, `s0`.`UnidirectionalEntityBranchId`, `s0`.`UnidirectionalEntityOneId`, `s0`.`Id0`, `s0`.`Name0`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `u0`.`LeafId`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, `u1`.`IsGreen`, `t`.`UnidirectionalEntityBranchId`, `t`.`UnidirectionalEntityOneId`, `t`.`Id` AS `Id0`, `t`.`Name` AS `Name0`
+    SELECT `u0`.`LeafId`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, `u1`.`IsGreen`, `s`.`UnidirectionalEntityBranchId`, `s`.`UnidirectionalEntityOneId`, `s`.`Id` AS `Id0`, `s`.`Name` AS `Name0`
     FROM `UnidirectionalJoinCompositeKeyToLeaf` AS `u0`
     INNER JOIN `UnidirectionalLeaves` AS `u1` ON `u0`.`LeafId` = `u1`.`Id`
     LEFT JOIN (
         SELECT `u2`.`UnidirectionalEntityBranchId`, `u2`.`UnidirectionalEntityOneId`, `u3`.`Id`, `u3`.`Name`
         FROM `UnidirectionalJoinOneToBranch` AS `u2`
         INNER JOIN `UnidirectionalEntityOnes` AS `u3` ON `u2`.`UnidirectionalEntityOneId` = `u3`.`Id`
-    ) AS `t` ON `u1`.`Id` = `t`.`UnidirectionalEntityBranchId`
-) AS `t0` ON ((`u`.`Key1` = `t0`.`CompositeId1`) AND (`u`.`Key2` = `t0`.`CompositeId2`)) AND (`u`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id`, `t0`.`UnidirectionalEntityBranchId`, `t0`.`UnidirectionalEntityOneId`
+    ) AS `s` ON `u1`.`Id` = `s`.`UnidirectionalEntityBranchId`
+) AS `s0` ON ((`u`.`Key1` = `s0`.`CompositeId1`) AND (`u`.`Key2` = `s0`.`CompositeId2`)) AND (`u`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id`, `s0`.`UnidirectionalEntityBranchId`, `s0`.`UnidirectionalEntityOneId`
 """);
     }
 
@@ -2515,10 +2515,10 @@ public override async Task Include_skip_navigation_then_include_reference_and_sk
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Payload`, `t0`.`Id`, `t0`.`Name`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`, `t0`.`LeftId`, `t0`.`RightId`, `t0`.`Payload0`, `t0`.`Id1`, `t0`.`Name1`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Payload`, `s0`.`Id`, `s0`.`Name`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`, `s0`.`LeftId`, `s0`.`RightId`, `s0`.`Payload0`, `s0`.`Id1`, `s0`.`Name1`
 FROM `UnidirectionalEntityThrees` AS `u`
 LEFT JOIN (
-    SELECT `u0`.`OneId`, `u0`.`ThreeId`, `u0`.`Payload`, `u1`.`Id`, `u1`.`Name`, `u2`.`Id` AS `Id0`, `u2`.`CollectionInverseId`, `u2`.`ExtraId`, `u2`.`Name` AS `Name0`, `u2`.`ReferenceInverseId`, `t`.`LeftId`, `t`.`RightId`, `t`.`Payload` AS `Payload0`, `t`.`Id` AS `Id1`, `t`.`Name` AS `Name1`
+    SELECT `u0`.`OneId`, `u0`.`ThreeId`, `u0`.`Payload`, `u1`.`Id`, `u1`.`Name`, `u2`.`Id` AS `Id0`, `u2`.`CollectionInverseId`, `u2`.`ExtraId`, `u2`.`Name` AS `Name0`, `u2`.`ReferenceInverseId`, `s`.`LeftId`, `s`.`RightId`, `s`.`Payload` AS `Payload0`, `s`.`Id` AS `Id1`, `s`.`Name` AS `Name1`
     FROM `UnidirectionalJoinOneToThreePayloadFull` AS `u0`
     INNER JOIN `UnidirectionalEntityOnes` AS `u1` ON `u0`.`OneId` = `u1`.`Id`
     LEFT JOIN `UnidirectionalEntityTwos` AS `u2` ON `u1`.`Id` = `u2`.`ReferenceInverseId`
@@ -2526,9 +2526,9 @@ LEFT JOIN (
         SELECT `u3`.`LeftId`, `u3`.`RightId`, `u3`.`Payload`, `u4`.`Id`, `u4`.`Name`
         FROM `UnidirectionalJoinOneSelfPayload` AS `u3`
         INNER JOIN `UnidirectionalEntityOnes` AS `u4` ON `u3`.`RightId` = `u4`.`Id`
-    ) AS `t` ON `u1`.`Id` = `t`.`LeftId`
-) AS `t0` ON `u`.`Id` = `t0`.`ThreeId`
-ORDER BY `u`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id`, `t0`.`Id0`, `t0`.`LeftId`, `t0`.`RightId`
+    ) AS `s` ON `u1`.`Id` = `s`.`LeftId`
+) AS `s0` ON `u`.`Id` = `s0`.`ThreeId`
+ORDER BY `u`.`Id`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Id`, `s0`.`Id0`, `s0`.`LeftId`, `s0`.`RightId`
 """);
     }
 
@@ -2538,15 +2538,15 @@ public override async Task Include_skip_navigation_and_reference_unidirectional(
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `u0`.`Id`, `t`.`TwoSkipSharedId`, `t`.`UnidirectionalEntityOneId`, `t`.`Id`, `t`.`Name`, `u0`.`CollectionInverseId`, `u0`.`Name`, `u0`.`ReferenceInverseId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `u0`.`Id`, `s`.`TwoSkipSharedId`, `s`.`UnidirectionalEntityOneId`, `s`.`Id`, `s`.`Name`, `u0`.`CollectionInverseId`, `u0`.`Name`, `u0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityTwos` AS `u`
 LEFT JOIN `UnidirectionalEntityThrees` AS `u0` ON `u`.`Id` = `u0`.`ReferenceInverseId`
 LEFT JOIN (
     SELECT `u1`.`TwoSkipSharedId`, `u1`.`UnidirectionalEntityOneId`, `u2`.`Id`, `u2`.`Name`
     FROM `UnidirectionalEntityOneUnidirectionalEntityTwo` AS `u1`
     INNER JOIN `UnidirectionalEntityOnes` AS `u2` ON `u1`.`UnidirectionalEntityOneId` = `u2`.`Id`
-) AS `t` ON `u`.`Id` = `t`.`TwoSkipSharedId`
-ORDER BY `u`.`Id`, `u0`.`Id`, `t`.`TwoSkipSharedId`, `t`.`UnidirectionalEntityOneId`
+) AS `s` ON `u`.`Id` = `s`.`TwoSkipSharedId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `s`.`TwoSkipSharedId`, `s`.`UnidirectionalEntityOneId`
 """);
     }
 
@@ -2556,19 +2556,19 @@ public override async Task Include_skip_navigation_then_include_inverse_works_fo
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Payload`, `t0`.`Id`, `t0`.`Name`, `t0`.`OneId0`, `t0`.`ThreeId0`, `t0`.`Payload0`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Payload`, `s0`.`Id`, `s0`.`Name`, `s0`.`OneId0`, `s0`.`ThreeId0`, `s0`.`Payload0`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityThrees` AS `u`
 LEFT JOIN (
-    SELECT `u0`.`OneId`, `u0`.`ThreeId`, `u0`.`Payload`, `u1`.`Id`, `u1`.`Name`, `t`.`OneId` AS `OneId0`, `t`.`ThreeId` AS `ThreeId0`, `t`.`Payload` AS `Payload0`, `t`.`Id` AS `Id0`, `t`.`CollectionInverseId`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId`
+    SELECT `u0`.`OneId`, `u0`.`ThreeId`, `u0`.`Payload`, `u1`.`Id`, `u1`.`Name`, `s`.`OneId` AS `OneId0`, `s`.`ThreeId` AS `ThreeId0`, `s`.`Payload` AS `Payload0`, `s`.`Id` AS `Id0`, `s`.`CollectionInverseId`, `s`.`Name` AS `Name0`, `s`.`ReferenceInverseId`
     FROM `UnidirectionalJoinOneToThreePayloadFullShared` AS `u0`
     INNER JOIN `UnidirectionalEntityOnes` AS `u1` ON `u0`.`OneId` = `u1`.`Id`
     LEFT JOIN (
         SELECT `u2`.`OneId`, `u2`.`ThreeId`, `u2`.`Payload`, `u3`.`Id`, `u3`.`CollectionInverseId`, `u3`.`Name`, `u3`.`ReferenceInverseId`
         FROM `UnidirectionalJoinOneToThreePayloadFullShared` AS `u2`
         INNER JOIN `UnidirectionalEntityThrees` AS `u3` ON `u2`.`ThreeId` = `u3`.`Id`
-    ) AS `t` ON `u1`.`Id` = `t`.`OneId`
-) AS `t0` ON `u`.`Id` = `t0`.`ThreeId`
-ORDER BY `u`.`Id`, `t0`.`OneId`, `t0`.`ThreeId`, `t0`.`Id`, `t0`.`OneId0`, `t0`.`ThreeId0`
+    ) AS `s` ON `u1`.`Id` = `s`.`OneId`
+) AS `s0` ON `u`.`Id` = `s0`.`ThreeId`
+ORDER BY `u`.`Id`, `s0`.`OneId`, `s0`.`ThreeId`, `s0`.`Id`, `s0`.`OneId0`, `s0`.`ThreeId0`
 """);
     }
 
@@ -2578,15 +2578,15 @@ public override async Task Filtered_include_skip_navigation_where_unidirectional
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`OneId`, `t`.`ThreeId`, `t`.`Payload`, `t`.`Id`, `t`.`Name`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`OneId`, `s`.`ThreeId`, `s`.`Payload`, `s`.`Id`, `s`.`Name`
 FROM `EntityThrees` AS `e`
 LEFT JOIN (
     SELECT `j`.`OneId`, `j`.`ThreeId`, `j`.`Payload`, `e0`.`Id`, `e0`.`Name`
     FROM `JoinOneToThreePayloadFullShared` AS `j`
     INNER JOIN `EntityOnes` AS `e0` ON `j`.`OneId` = `e0`.`Id`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`ThreeId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`ThreeId`
+) AS `s` ON `e`.`Id` = `s`.`ThreeId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`ThreeId`
 """);
     }
 
@@ -2596,14 +2596,14 @@ public override async Task Filtered_include_skip_navigation_order_by_unidirectio
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t`.`ThreeId`, `t`.`TwoId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s`.`ThreeId`, `s`.`TwoId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `UnidirectionalEntityThrees` AS `u`
 LEFT JOIN (
     SELECT `u0`.`ThreeId`, `u0`.`TwoId`, `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`
     FROM `UnidirectionalJoinTwoToThree` AS `u0`
     INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoId` = `u1`.`Id`
-) AS `t` ON `u`.`Id` = `t`.`ThreeId`
-ORDER BY `u`.`Id`, `t`.`Id`, `t`.`ThreeId`
+) AS `s` ON `u`.`Id` = `s`.`ThreeId`
+ORDER BY `u`.`Id`, `s`.`Id`, `s`.`ThreeId`
 """);
     }
 
@@ -2613,18 +2613,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_unidir
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `t0`.`SelfSkipSharedRightId`, `t0`.`UnidirectionalEntityTwoId`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `u`.`Id`, `u`.`CollectionInverseId`, `u`.`ExtraId`, `u`.`Name`, `u`.`ReferenceInverseId`, `s0`.`SelfSkipSharedRightId`, `s0`.`UnidirectionalEntityTwoId`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityTwos` AS `u`
 LEFT JOIN (
-    SELECT `t`.`SelfSkipSharedRightId`, `t`.`UnidirectionalEntityTwoId`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`SelfSkipSharedRightId`, `s`.`UnidirectionalEntityTwoId`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `u0`.`SelfSkipSharedRightId`, `u0`.`UnidirectionalEntityTwoId`, `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`UnidirectionalEntityTwoId` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalEntityTwoUnidirectionalEntityTwo` AS `u0`
         INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`SelfSkipSharedRightId` = `u1`.`Id`
-    ) AS `t`
-    WHERE 2 < `t`.`row`
-) AS `t0` ON `u`.`Id` = `t0`.`UnidirectionalEntityTwoId`
-ORDER BY `u`.`Id`, `t0`.`UnidirectionalEntityTwoId`, `t0`.`Id`
+    ) AS `s`
+    WHERE 2 < `s`.`row`
+) AS `s0` ON `u`.`Id` = `s0`.`UnidirectionalEntityTwoId`
+ORDER BY `u`.`Id`, `s0`.`UnidirectionalEntityTwoId`, `s0`.`Id`
 """);
     }
 
@@ -2634,18 +2634,18 @@ public override async Task Filtered_include_skip_navigation_order_by_take_unidir
 
         AssertSql(
 """
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `t0`.`TwoSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `s0`.`TwoSkipSharedId`, `s0`.`UnidirectionalEntityCompositeKeyKey1`, `s0`.`UnidirectionalEntityCompositeKeyKey2`, `s0`.`UnidirectionalEntityCompositeKeyKey3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `t`.`TwoSkipSharedId`, `t`.`UnidirectionalEntityCompositeKeyKey1`, `t`.`UnidirectionalEntityCompositeKeyKey2`, `t`.`UnidirectionalEntityCompositeKeyKey3`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`TwoSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `u0`.`TwoSkipSharedId`, `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3`, `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`UnidirectionalEntityCompositeKeyKey1`, `u0`.`UnidirectionalEntityCompositeKeyKey2`, `u0`.`UnidirectionalEntityCompositeKeyKey3` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalEntityCompositeKeyUnidirectionalEntityTwo` AS `u0`
         INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoSkipSharedId` = `u1`.`Id`
-    ) AS `t`
-    WHERE `t`.`row` <= 2
-) AS `t0` ON ((`u`.`Key1` = `t0`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `t0`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `t0`.`UnidirectionalEntityCompositeKeyKey3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`, `t0`.`Id`
+    ) AS `s`
+    WHERE `s`.`row` <= 2
+) AS `s0` ON ((`u`.`Key1` = `s0`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u`.`Key2` = `s0`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u`.`Key3` = `s0`.`UnidirectionalEntityCompositeKeyKey3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s0`.`UnidirectionalEntityCompositeKeyKey1`, `s0`.`UnidirectionalEntityCompositeKeyKey2`, `s0`.`UnidirectionalEntityCompositeKeyKey3`, `s0`.`Id`
 """);
     }
 
@@ -2655,18 +2655,18 @@ public override async Task Filtered_include_skip_navigation_order_by_skip_take_u
 
         AssertSql(
 """
-SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `t0`.`Id`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`ThreeId`, `t0`.`Id0`, `t0`.`CollectionInverseId`, `t0`.`Name`, `t0`.`ReferenceInverseId`
+SELECT `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `u`.`Name`, `s0`.`Id`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`ThreeId`, `s0`.`Id0`, `s0`.`CollectionInverseId`, `s0`.`Name`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalEntityCompositeKeys` AS `u`
 LEFT JOIN (
-    SELECT `t`.`Id`, `t`.`CompositeId1`, `t`.`CompositeId2`, `t`.`CompositeId3`, `t`.`ThreeId`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`Name`, `t`.`ReferenceInverseId`
+    SELECT `s`.`Id`, `s`.`CompositeId1`, `s`.`CompositeId2`, `s`.`CompositeId3`, `s`.`ThreeId`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`Name`, `s`.`ReferenceInverseId`
     FROM (
         SELECT `u0`.`Id`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `u0`.`ThreeId`, `u1`.`Id` AS `Id0`, `u1`.`CollectionInverseId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, ROW_NUMBER() OVER(PARTITION BY `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3` ORDER BY `u1`.`Id`) AS `row`
         FROM `UnidirectionalJoinThreeToCompositeKeyFull` AS `u0`
         INNER JOIN `UnidirectionalEntityThrees` AS `u1` ON `u0`.`ThreeId` = `u1`.`Id`
-    ) AS `t`
-    WHERE (1 < `t`.`row`) AND (`t`.`row` <= 3)
-) AS `t0` ON ((`u`.`Key1` = `t0`.`CompositeId1`) AND (`u`.`Key2` = `t0`.`CompositeId2`)) AND (`u`.`Key3` = `t0`.`CompositeId3`)
-ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Id0`
+    ) AS `s`
+    WHERE (1 < `s`.`row`) AND (`s`.`row` <= 3)
+) AS `s0` ON ((`u`.`Key1` = `s0`.`CompositeId1`) AND (`u`.`Key2` = `s0`.`CompositeId2`)) AND (`u`.`Key3` = `s0`.`CompositeId3`)
+ORDER BY `u`.`Key1`, `u`.`Key2`, `u`.`Key3`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Id0`
 """);
     }
 
@@ -2676,20 +2676,20 @@ public override async Task Filtered_include_skip_navigation_where_then_include_s
 
         AssertSql(
 """
-SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`Name`, `t0`.`TwoSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`, `t0`.`Id`, `t0`.`CollectionInverseId`, `t0`.`ExtraId`, `t0`.`Name0`, `t0`.`ReferenceInverseId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, `u`.`IsGreen`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`Name`, `s0`.`TwoSkipSharedId`, `s0`.`UnidirectionalEntityCompositeKeyKey1`, `s0`.`UnidirectionalEntityCompositeKeyKey2`, `s0`.`UnidirectionalEntityCompositeKeyKey3`, `s0`.`Id`, `s0`.`CollectionInverseId`, `s0`.`ExtraId`, `s0`.`Name0`, `s0`.`ReferenceInverseId`
 FROM `UnidirectionalLeaves` AS `u`
 LEFT JOIN (
-    SELECT `u0`.`LeafId`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `u1`.`Key1`, `u1`.`Key2`, `u1`.`Key3`, `u1`.`Name`, `t`.`TwoSkipSharedId`, `t`.`UnidirectionalEntityCompositeKeyKey1`, `t`.`UnidirectionalEntityCompositeKeyKey2`, `t`.`UnidirectionalEntityCompositeKeyKey3`, `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name` AS `Name0`, `t`.`ReferenceInverseId`
+    SELECT `u0`.`LeafId`, `u0`.`CompositeId1`, `u0`.`CompositeId2`, `u0`.`CompositeId3`, `u1`.`Key1`, `u1`.`Key2`, `u1`.`Key3`, `u1`.`Name`, `s`.`TwoSkipSharedId`, `s`.`UnidirectionalEntityCompositeKeyKey1`, `s`.`UnidirectionalEntityCompositeKeyKey2`, `s`.`UnidirectionalEntityCompositeKeyKey3`, `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name` AS `Name0`, `s`.`ReferenceInverseId`
     FROM `UnidirectionalJoinCompositeKeyToLeaf` AS `u0`
     INNER JOIN `UnidirectionalEntityCompositeKeys` AS `u1` ON ((`u0`.`CompositeId1` = `u1`.`Key1`) AND (`u0`.`CompositeId2` = `u1`.`Key2`)) AND (`u0`.`CompositeId3` = `u1`.`Key3`)
     LEFT JOIN (
         SELECT `u2`.`TwoSkipSharedId`, `u2`.`UnidirectionalEntityCompositeKeyKey1`, `u2`.`UnidirectionalEntityCompositeKeyKey2`, `u2`.`UnidirectionalEntityCompositeKeyKey3`, `u3`.`Id`, `u3`.`CollectionInverseId`, `u3`.`ExtraId`, `u3`.`Name`, `u3`.`ReferenceInverseId`
         FROM `UnidirectionalEntityCompositeKeyUnidirectionalEntityTwo` AS `u2`
         INNER JOIN `UnidirectionalEntityTwos` AS `u3` ON `u2`.`TwoSkipSharedId` = `u3`.`Id`
-    ) AS `t` ON ((`u1`.`Key1` = `t`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u1`.`Key2` = `t`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u1`.`Key3` = `t`.`UnidirectionalEntityCompositeKeyKey3`)
+    ) AS `s` ON ((`u1`.`Key1` = `s`.`UnidirectionalEntityCompositeKeyKey1`) AND (`u1`.`Key2` = `s`.`UnidirectionalEntityCompositeKeyKey2`)) AND (`u1`.`Key3` = `s`.`UnidirectionalEntityCompositeKeyKey3`)
     WHERE `u1`.`Key1` < 5
-) AS `t0` ON `u`.`Id` = `t0`.`LeafId`
-ORDER BY `u`.`Id`, `t0`.`LeafId`, `t0`.`CompositeId1`, `t0`.`CompositeId2`, `t0`.`CompositeId3`, `t0`.`Key1`, `t0`.`Key2`, `t0`.`Key3`, `t0`.`TwoSkipSharedId`, `t0`.`UnidirectionalEntityCompositeKeyKey1`, `t0`.`UnidirectionalEntityCompositeKeyKey2`, `t0`.`UnidirectionalEntityCompositeKeyKey3`
+) AS `s0` ON `u`.`Id` = `s0`.`LeafId`
+ORDER BY `u`.`Id`, `s0`.`LeafId`, `s0`.`CompositeId1`, `s0`.`CompositeId2`, `s0`.`CompositeId3`, `s0`.`Key1`, `s0`.`Key2`, `s0`.`Key3`, `s0`.`TwoSkipSharedId`, `s0`.`UnidirectionalEntityCompositeKeyKey1`, `s0`.`UnidirectionalEntityCompositeKeyKey2`, `s0`.`UnidirectionalEntityCompositeKeyKey3`
 """);
     }
 
@@ -2699,7 +2699,7 @@ public override async Task Filter_include_on_skip_navigation_combined_unidirecti
 
         AssertSql(
 """
-SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `t`.`OneId`, `t`.`TwoId`, `t`.`JoinOneToTwoExtraId`, `t`.`Id`, `t`.`Name`, `t`.`Id0`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name0`, `t`.`ReferenceInverseId`, `t`.`Id1`, `t`.`CollectionInverseId0`, `t`.`ExtraId0`, `t`.`Name1`, `t`.`ReferenceInverseId0`
+SELECT `e`.`Id`, `e`.`CollectionInverseId`, `e`.`ExtraId`, `e`.`Name`, `e`.`ReferenceInverseId`, `s`.`OneId`, `s`.`TwoId`, `s`.`JoinOneToTwoExtraId`, `s`.`Id`, `s`.`Name`, `s`.`Id0`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name0`, `s`.`ReferenceInverseId`, `s`.`Id1`, `s`.`CollectionInverseId0`, `s`.`ExtraId0`, `s`.`Name1`, `s`.`ReferenceInverseId0`
 FROM `EntityTwos` AS `e`
 LEFT JOIN (
     SELECT `j`.`OneId`, `j`.`TwoId`, `j`.`JoinOneToTwoExtraId`, `e0`.`Id`, `e0`.`Name`, `e1`.`Id` AS `Id0`, `e1`.`CollectionInverseId`, `e1`.`ExtraId`, `e1`.`Name` AS `Name0`, `e1`.`ReferenceInverseId`, `e2`.`Id` AS `Id1`, `e2`.`CollectionInverseId` AS `CollectionInverseId0`, `e2`.`ExtraId` AS `ExtraId0`, `e2`.`Name` AS `Name1`, `e2`.`ReferenceInverseId` AS `ReferenceInverseId0`
@@ -2708,8 +2708,8 @@ LEFT JOIN (
     LEFT JOIN `EntityTwos` AS `e1` ON `e0`.`Id` = `e1`.`ReferenceInverseId`
     LEFT JOIN `EntityTwos` AS `e2` ON `e0`.`Id` = `e2`.`CollectionInverseId`
     WHERE `e0`.`Id` < 10
-) AS `t` ON `e`.`Id` = `t`.`TwoId`
-ORDER BY `e`.`Id`, `t`.`OneId`, `t`.`TwoId`, `t`.`Id`, `t`.`Id0`
+) AS `s` ON `e`.`Id` = `s`.`TwoId`
+ORDER BY `e`.`Id`, `s`.`OneId`, `s`.`TwoId`, `s`.`Id`, `s`.`Id0`
 """);
     }
 
@@ -2748,13 +2748,13 @@ public override async Task Select_many_over_skip_navigation_where_non_equality_u
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`CollectionInverseId`, `t`.`ExtraId`, `t`.`Name`, `t`.`ReferenceInverseId`
+SELECT `s`.`Id`, `s`.`CollectionInverseId`, `s`.`ExtraId`, `s`.`Name`, `s`.`ReferenceInverseId`
 FROM `UnidirectionalEntityOnes` AS `u`
 LEFT JOIN (
     SELECT `u1`.`Id`, `u1`.`CollectionInverseId`, `u1`.`ExtraId`, `u1`.`Name`, `u1`.`ReferenceInverseId`, `u0`.`OneId`
     FROM `UnidirectionalJoinOneToTwo` AS `u0`
     INNER JOIN `UnidirectionalEntityTwos` AS `u1` ON `u0`.`TwoId` = `u1`.`Id`
-) AS `t` ON (`u`.`Id` = `t`.`OneId`) AND (`u`.`Id` <> `t`.`Id`)
+) AS `s` ON (`u`.`Id` = `s`.`OneId`) AND (`u`.`Id` <> `s`.`Id`)
 """);
     }
 
@@ -2814,14 +2814,14 @@ public override async Task GetType_in_hierarchy_in_querying_base_type_unidirecti
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`Number`, `t`.`IsGreen`, `t`.`Discriminator`
+SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`Number`, `u1`.`IsGreen`, `u1`.`Discriminator`
 FROM (
     SELECT `u`.`Id`, `u`.`Name`, `u`.`Number`, NULL AS `IsGreen`, 'UnidirectionalEntityBranch' AS `Discriminator`
     FROM `UnidirectionalBranches` AS `u`
     UNION ALL
     SELECT `u0`.`Id`, `u0`.`Name`, `u0`.`Number`, `u0`.`IsGreen`, 'UnidirectionalEntityLeaf' AS `Discriminator`
     FROM `UnidirectionalLeaves` AS `u0`
-) AS `t`
+) AS `u1`
 WHERE FALSE
 """);
     }
diff --git a/test/EFCore.MySql.FunctionalTests/Query/TPCRelationshipsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/TPCRelationshipsQueryMySqlTest.cs
index 43bacab8c..4f432af2a 100644
--- a/test/EFCore.MySql.FunctionalTests/Query/TPCRelationshipsQueryMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/Query/TPCRelationshipsQueryMySqlTest.cs
@@ -29,31 +29,31 @@ public override void Changes_in_derived_related_entities_are_detected()
 
         AssertSql(
 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`BaseId`, `t0`.`Discriminator`, `t0`.`BaseInheritanceRelationshipEntityId`, `t0`.`Id1`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t0`.`Id0`, `t0`.`Name0`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t0`.`OwnedReferenceOnDerived_Id`, `t0`.`OwnedReferenceOnDerived_Name`, `t1`.`Id`, `t1`.`BaseParentId`, `t1`.`Name`, `t1`.`DerivedProperty`, `t1`.`Discriminator`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`BaseId`, `s`.`Discriminator`, `s`.`BaseInheritanceRelationshipEntityId`, `s`.`Id1`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `s`.`Id0`, `s`.`Name0`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `s`.`OwnedReferenceOnDerived_Id`, `s`.`OwnedReferenceOnDerived_Name`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`
 FROM (
-    SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `o`.`Id` AS `Id0`, `o`.`Name` AS `Name0`, `d`.`Id` AS `Id1`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+    SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `o`.`Id` AS `Id0`, `o`.`Name` AS `Name0`, `d0`.`Id` AS `Id1`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
     FROM (
-        SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
-        FROM `BaseEntities` AS `b0`
+        SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
+        FROM `BaseEntities` AS `b`
         UNION ALL
-        SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-        FROM `DerivedEntities` AS `d2`
-    ) AS `t`
-    LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-    LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-    WHERE `t`.`Name` = 'Derived1(4)'
+        SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+        FROM `DerivedEntities` AS `d`
+    ) AS `u`
+    LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+    LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+    WHERE `u`.`Name` = 'Derived1(4)'
     LIMIT 2
-) AS `t0`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t0`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+) AS `s`
+LEFT JOIN `OwnedCollections` AS `o0` ON `s`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `s`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 LEFT JOIN (
-    SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
-    FROM `BaseCollectionsOnBase` AS `b`
+    SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
+    FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t1` ON `t0`.`Id` = `t1`.`BaseParentId`
-ORDER BY `t0`.`Id`, `t0`.`BaseInheritanceRelationshipEntityId`, `t0`.`Id1`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
+    SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, `d2`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d2`
+) AS `u0` ON `s`.`Id` = `u0`.`BaseParentId`
+ORDER BY `s`.`Id`, `s`.`BaseInheritanceRelationshipEntityId`, `s`.`Id1`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -63,20 +63,20 @@ public override async Task Include_collection_without_inheritance(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `c`.`Id`, `c`.`Name`, `c`.`ParentId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `c`.`Id`, `c`.`Name`, `c`.`ParentId`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-LEFT JOIN `CollectionsOnBase` AS `c` ON `t`.`Id` = `c`.`ParentId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `CollectionsOnBase` AS `c` ON `u`.`Id` = `c`.`ParentId`
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -86,20 +86,20 @@ public override async Task Include_collection_without_inheritance_reverse(bool a
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM `CollectionsOnBase` AS `c`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t` ON `c`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `c`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `c`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -109,21 +109,21 @@ public override async Task Include_collection_without_inheritance_with_filter(bo
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `c`.`Id`, `c`.`Name`, `c`.`ParentId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `c`.`Id`, `c`.`Name`, `c`.`ParentId`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-LEFT JOIN `CollectionsOnBase` AS `c` ON `t`.`Id` = `c`.`ParentId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `CollectionsOnBase` AS `c` ON `u`.`Id` = `c`.`ParentId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -133,21 +133,21 @@ public override async Task Include_collection_without_inheritance_with_filter_re
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM `CollectionsOnBase` AS `c`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t` ON `c`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `c`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 WHERE (`c`.`Name` <> 'Bar') OR `c`.`Name` IS NULL
-ORDER BY `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `c`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -157,26 +157,26 @@ public override async Task Include_collection_with_inheritance(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
     SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, `d2`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
     FROM `DerivedCollectionsOnBase` AS `d2`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -186,7 +186,7 @@ public override async Task Include_collection_with_inheritance_on_derived1(bool
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedProperty`, `t`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedProperty`, `u`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
 LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
@@ -197,7 +197,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
     FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
 ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
 """);
     }
@@ -208,7 +208,7 @@ public override async Task Include_collection_with_inheritance_on_derived2(bool
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`Id`, `t`.`Name`, `t`.`ParentId`, `t`.`DerivedInheritanceRelationshipEntityId`, `t`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`Id`, `u`.`Name`, `u`.`ParentId`, `u`.`DerivedInheritanceRelationshipEntityId`, `u`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
 LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
@@ -219,7 +219,7 @@ LEFT JOIN (
     UNION ALL
     SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`ParentId`, `d1`.`DerivedInheritanceRelationshipEntityId`, 'DerivedCollectionOnDerived' AS `Discriminator`
     FROM `DerivedCollectionsOnDerived` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`ParentId`
+) AS `u` ON `d`.`Id` = `u`.`ParentId`
 ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
 """);
     }
@@ -246,19 +246,19 @@ public override async Task Include_collection_with_inheritance_on_derived_revers
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentId`, `t`.`DerivedInheritanceRelationshipEntityId`, `t`.`Discriminator`, `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentId`, `u`.`DerivedInheritanceRelationshipEntityId`, `u`.`Discriminator`, `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, `b`.`ParentId`, NULL AS `DerivedInheritanceRelationshipEntityId`, 'BaseCollectionOnDerived' AS `Discriminator`
     FROM `BaseCollectionsOnDerived` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`ParentId`, `d1`.`DerivedInheritanceRelationshipEntityId`, 'DerivedCollectionOnDerived' AS `Discriminator`
-    FROM `DerivedCollectionsOnDerived` AS `d1`
-) AS `t`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`ParentId` = `d`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`ParentId`, `d`.`DerivedInheritanceRelationshipEntityId`, 'DerivedCollectionOnDerived' AS `Discriminator`
+    FROM `DerivedCollectionsOnDerived` AS `d`
+) AS `u`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`ParentId` = `d0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `d0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedCollections` AS `o0` ON `d0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d0`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `d0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -268,26 +268,26 @@ public override async Task Include_collection_with_inheritance_reverse(bool asyn
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedProperty`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`Name`, `t0`.`BaseId`, `t0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedProperty`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`Name`, `u0`.`BaseId`, `u0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t0`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u0`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u0`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -297,27 +297,27 @@ public override async Task Include_collection_with_inheritance_with_filter(bool
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
     SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, `d2`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
     FROM `DerivedCollectionsOnBase` AS `d2`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -327,27 +327,27 @@ public override async Task Include_collection_with_inheritance_with_filter_rever
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedProperty`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`Name`, `t0`.`BaseId`, `t0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedProperty`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`Name`, `u0`.`BaseId`, `u0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t0`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u0`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u0`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -357,20 +357,20 @@ public override async Task Include_reference_without_inheritance(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `r`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `r`.`Name`, `r`.`ParentId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `r`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `r`.`Name`, `r`.`ParentId`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `ReferencesOnBase` AS `r` ON `t`.`Id` = `r`.`ParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `r`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `ReferencesOnBase` AS `r` ON `u`.`Id` = `r`.`ParentId`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `r`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -428,20 +428,20 @@ public override async Task Include_reference_without_inheritance_reverse(bool as
 
         AssertSql(
 """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`ParentId`, `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `r`.`Id`, `r`.`Name`, `r`.`ParentId`, `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM `ReferencesOnBase` AS `r`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t` ON `r`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `r`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `r`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `r`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -451,21 +451,21 @@ public override async Task Include_reference_without_inheritance_with_filter(boo
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `r`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `r`.`Name`, `r`.`ParentId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `r`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `r`.`Name`, `r`.`ParentId`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `ReferencesOnBase` AS `r` ON `t`.`Id` = `r`.`ParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `r`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `ReferencesOnBase` AS `r` ON `u`.`Id` = `r`.`ParentId`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `r`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -475,21 +475,21 @@ public override async Task Include_reference_without_inheritance_with_filter_rev
 
         AssertSql(
 """
-SELECT `r`.`Id`, `r`.`Name`, `r`.`ParentId`, `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `r`.`Id`, `r`.`Name`, `r`.`ParentId`, `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM `ReferencesOnBase` AS `r`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t` ON `r`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `r`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 WHERE (`r`.`Name` <> 'Bar') OR `r`.`Name` IS NULL
-ORDER BY `r`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `r`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -499,26 +499,26 @@ public override async Task Include_reference_with_inheritance(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d2`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -528,19 +528,19 @@ public override async Task Include_reference_with_inheritance_on_derived1(bool a
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`BaseParentId`, `t`.`Name`, `t`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`BaseParentId`, `u`.`Name`, `u`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
 LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -550,19 +550,19 @@ public override async Task Include_reference_with_inheritance_on_derived2(bool a
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedInheritanceRelationshipEntityId`, `t`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedInheritanceRelationshipEntityId`, `u`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedInheritanceRelationshipEntityId`, 'BaseReferenceOnDerived' AS `Discriminator`
     FROM `BaseReferencesOnDerived` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, 'DerivedReferenceOnDerived' AS `Discriminator`
-    FROM `DerivedReferencesOnDerived` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, 'DerivedReferenceOnDerived' AS `Discriminator`
+    FROM `DerivedReferencesOnDerived` AS `d0`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
 LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -588,19 +588,19 @@ public override async Task Include_reference_with_inheritance_on_derived_reverse
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedInheritanceRelationshipEntityId`, `t`.`Discriminator`, `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedInheritanceRelationshipEntityId`, `u`.`Discriminator`, `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedInheritanceRelationshipEntityId`, 'BaseReferenceOnDerived' AS `Discriminator`
     FROM `BaseReferencesOnDerived` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, 'DerivedReferenceOnDerived' AS `Discriminator`
-    FROM `DerivedReferencesOnDerived` AS `d1`
-) AS `t`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`BaseParentId` = `d`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedInheritanceRelationshipEntityId`, 'DerivedReferenceOnDerived' AS `Discriminator`
+    FROM `DerivedReferencesOnDerived` AS `d`
+) AS `u`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`BaseParentId` = `d0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `d0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedCollections` AS `o0` ON `d0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d0`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `d0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -610,20 +610,20 @@ public override async Task Include_reference_with_inheritance_on_derived_with_fi
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`BaseParentId`, `t`.`Name`, `t`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`BaseParentId`, `u`.`Name`, `u`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
 LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 WHERE (`d`.`Name` <> 'Bar') OR `d`.`Name` IS NULL
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -633,20 +633,20 @@ public override async Task Include_reference_with_inheritance_on_derived_with_fi
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedInheritanceRelationshipEntityId`, `t`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedInheritanceRelationshipEntityId`, `u`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedInheritanceRelationshipEntityId`, 'BaseReferenceOnDerived' AS `Discriminator`
     FROM `BaseReferencesOnDerived` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, 'DerivedReferenceOnDerived' AS `Discriminator`
-    FROM `DerivedReferencesOnDerived` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, 'DerivedReferenceOnDerived' AS `Discriminator`
+    FROM `DerivedReferencesOnDerived` AS `d0`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
 LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 WHERE (`d`.`Name` <> 'Bar') OR `d`.`Name` IS NULL
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -673,20 +673,20 @@ public override async Task Include_reference_with_inheritance_on_derived_with_fi
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedInheritanceRelationshipEntityId`, `t`.`Discriminator`, `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedInheritanceRelationshipEntityId`, `u`.`Discriminator`, `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedInheritanceRelationshipEntityId`, 'BaseReferenceOnDerived' AS `Discriminator`
     FROM `BaseReferencesOnDerived` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, 'DerivedReferenceOnDerived' AS `Discriminator`
-    FROM `DerivedReferencesOnDerived` AS `d1`
-) AS `t`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`BaseParentId` = `d`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedInheritanceRelationshipEntityId`, 'DerivedReferenceOnDerived' AS `Discriminator`
+    FROM `DerivedReferencesOnDerived` AS `d`
+) AS `u`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`BaseParentId` = `d0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `d0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedCollections` AS `o0` ON `d0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d0`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `d0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -696,26 +696,26 @@ public override async Task Include_reference_with_inheritance_reverse(bool async
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`Name`, `t0`.`BaseId`, `t0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`Name`, `u0`.`BaseId`, `u0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t0`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u0`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u0`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -725,27 +725,27 @@ public override async Task Include_reference_with_inheritance_with_filter(bool a
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d2`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -755,27 +755,27 @@ public override async Task Include_reference_with_inheritance_with_filter_revers
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`Name`, `t0`.`BaseId`, `t0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`Name`, `u0`.`BaseId`, `u0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t0`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u0`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u0`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -785,23 +785,23 @@ public override async Task Include_self_reference_with_inheritance(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `d`.`Name`, `d`.`BaseId`, `o2`.`BaseInheritanceRelationshipEntityId`, `o2`.`Id`, `o2`.`Name`, `o0`.`Id`, `o0`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `d0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`, `d0`.`Name`, `d0`.`BaseId`, `o2`.`BaseInheritanceRelationshipEntityId`, `o2`.`Id`, `o2`.`Name`, `o0`.`Id`, `o0`.`Name`, `d3`.`DerivedInheritanceRelationshipEntityId`, `d3`.`Id`, `d3`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d3`.`Id`, `d3`.`Name`, `d3`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d3`
-) AS `t`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`BaseId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d0` ON `t`.`Id` = `d0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `OwnedCollections` AS `o1` ON `t`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `t`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
-LEFT JOIN `OwnedCollections` AS `o2` ON `d`.`Id` = `o2`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `d`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `o2`.`BaseInheritanceRelationshipEntityId`, `o2`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`BaseId`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedCollections` AS `o2` ON `d0`.`Id` = `o2`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d3` ON `d0`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `d0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `o2`.`BaseInheritanceRelationshipEntityId`, `o2`.`Id`, `d3`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -811,23 +811,23 @@ public override async Task Include_self_reference_with_inheritance_reverse(bool
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o2`.`BaseInheritanceRelationshipEntityId`, `o2`.`Id`, `o2`.`Name`, `o0`.`Id`, `o0`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o2`.`BaseInheritanceRelationshipEntityId`, `o2`.`Id`, `o2`.`Name`, `o0`.`Id`, `o0`.`Name`, `d3`.`DerivedInheritanceRelationshipEntityId`, `d3`.`Id`, `d3`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d3`.`Id`, `d3`.`Name`, `d3`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d3`
-) AS `t` ON `d`.`BaseId` = `t`.`Id`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u` ON `d`.`BaseId` = `u`.`Id`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `OwnedReferences` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d0` ON `t`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
 LEFT JOIN `OwnedCollections` AS `o1` ON `d`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
-LEFT JOIN `OwnedCollections` AS `o2` ON `t`.`Id` = `o2`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `t`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `o2`.`BaseInheritanceRelationshipEntityId`, `o2`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `d`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedCollections` AS `o2` ON `u`.`Id` = `o2`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d3` ON `u`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `o2`.`BaseInheritanceRelationshipEntityId`, `o2`.`Id`, `d3`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -837,14 +837,14 @@ public override async Task Nested_include_collection_reference_on_non_entity_bas
 
         AssertSql(
 """
-SELECT `r`.`Id`, `r`.`Name`, `t`.`Id`, `t`.`Name`, `t`.`ReferenceId`, `t`.`ReferencedEntityId`, `t`.`Id0`, `t`.`Name0`
+SELECT `r`.`Id`, `r`.`Name`, `s`.`Id`, `s`.`Name`, `s`.`ReferenceId`, `s`.`ReferencedEntityId`, `s`.`Id0`, `s`.`Name0`
 FROM `ReferencedEntities` AS `r`
 LEFT JOIN (
     SELECT `p`.`Id`, `p`.`Name`, `p`.`ReferenceId`, `p`.`ReferencedEntityId`, `r0`.`Id` AS `Id0`, `r0`.`Name` AS `Name0`
     FROM `PrincipalEntities` AS `p`
     LEFT JOIN `ReferencedEntities` AS `r0` ON `p`.`ReferenceId` = `r0`.`Id`
-) AS `t` ON `r`.`Id` = `t`.`ReferencedEntityId`
-ORDER BY `r`.`Id`, `t`.`Id`
+) AS `s` ON `r`.`Id` = `s`.`ReferencedEntityId`
+ORDER BY `r`.`Id`, `s`.`Id`
 """);
     }
 
@@ -853,37 +853,37 @@ public override async Task Nested_include_with_inheritance_collection_collection
         await base.Nested_include_with_inheritance_collection_collection(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t1`.`Id`, `t1`.`BaseParentId`, `t1`.`Name`, `t1`.`DerivedProperty`, `t1`.`Discriminator`, `t1`.`Id0`, `t1`.`Name0`, `t1`.`ParentCollectionId`, `t1`.`ParentReferenceId`, `t1`.`Discriminator0`
+"""
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `s`.`Id`, `s`.`BaseParentId`, `s`.`Name`, `s`.`DerivedProperty`, `s`.`Discriminator`, `s`.`Id0`, `s`.`Name0`, `s`.`ParentCollectionId`, `s`.`ParentReferenceId`, `s`.`Discriminator0`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 LEFT JOIN (
-    SELECT `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t2`.`Id` AS `Id0`, `t2`.`Name` AS `Name0`, `t2`.`ParentCollectionId`, `t2`.`ParentReferenceId`, `t2`.`Discriminator` AS `Discriminator0`
+    SELECT `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u1`.`Id` AS `Id0`, `u1`.`Name` AS `Name0`, `u1`.`ParentCollectionId`, `u1`.`ParentReferenceId`, `u1`.`Discriminator` AS `Discriminator0`
     FROM (
-        SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `DerivedProperty`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'BaseCollectionOnBase'")} AS `Discriminator`
+        SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
         FROM `BaseCollectionsOnBase` AS `b0`
         UNION ALL
-        SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, `d2`.`DerivedProperty`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'DerivedCollectionOnBase'")} AS `Discriminator`
+        SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, `d2`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
         FROM `DerivedCollectionsOnBase` AS `d2`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN (
-        SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'NestedCollectionBase'")} AS `Discriminator`
+        SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
         FROM `NestedCollections` AS `n`
         UNION ALL
-        SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'NestedCollectionDerived'")} AS `Discriminator`
+        SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
         FROM `NestedCollectionsDerived` AS `n0`
-    ) AS `t2` ON `t0`.`Id` = `t2`.`ParentCollectionId`
-) AS `t1` ON `t`.`Id` = `t1`.`BaseParentId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `t1`.`Id`
+    ) AS `u1` ON `u0`.`Id` = `u1`.`ParentCollectionId`
+) AS `s` ON `u`.`Id` = `s`.`BaseParentId`
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `s`.`Id`
 """);
     }
 
@@ -892,34 +892,34 @@ public override async Task Nested_include_with_inheritance_collection_collection
         await base.Nested_include_with_inheritance_collection_collection_reverse(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentCollectionId`, `t`.`ParentReferenceId`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`Name`, `t1`.`BaseId`, `t1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+"""
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentCollectionId`, `u`.`ParentReferenceId`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u1`.`Id`, `u1`.`Name`, `u1`.`BaseId`, `u1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t0` ON `t`.`ParentCollectionId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u0` ON `u`.`ParentCollectionId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t1`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u1`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u1`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -928,37 +928,37 @@ public override async Task Nested_include_with_inheritance_collection_reference(
         await base.Nested_include_with_inheritance_collection_reference(async);
 
         AssertSql(
-$"""
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t1`.`Id`, `t1`.`BaseParentId`, `t1`.`Name`, `t1`.`DerivedProperty`, `t1`.`Discriminator`, `t1`.`Id0`, `t1`.`Name0`, `t1`.`ParentCollectionId`, `t1`.`ParentReferenceId`, `t1`.`Discriminator0`
+"""
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `s`.`Id`, `s`.`BaseParentId`, `s`.`Name`, `s`.`DerivedProperty`, `s`.`Discriminator`, `s`.`Id0`, `s`.`Name0`, `s`.`ParentCollectionId`, `s`.`ParentReferenceId`, `s`.`Discriminator0`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 LEFT JOIN (
-    SELECT `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t2`.`Id` AS `Id0`, `t2`.`Name` AS `Name0`, `t2`.`ParentCollectionId`, `t2`.`ParentReferenceId`, `t2`.`Discriminator` AS `Discriminator0`
+    SELECT `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u1`.`Id` AS `Id0`, `u1`.`Name` AS `Name0`, `u1`.`ParentCollectionId`, `u1`.`ParentReferenceId`, `u1`.`Discriminator` AS `Discriminator0`
     FROM (
-        SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, {MySqlTestHelpers.MySqlBug96947Workaround(@"NULL", "signed")} AS `DerivedProperty`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'BaseCollectionOnBase'")} AS `Discriminator`
+        SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
         FROM `BaseCollectionsOnBase` AS `b0`
         UNION ALL
-        SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, `d2`.`DerivedProperty`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'DerivedCollectionOnBase'")} AS `Discriminator`
+        SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, `d2`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
         FROM `DerivedCollectionsOnBase` AS `d2`
-    ) AS `t0`
+    ) AS `u0`
     LEFT JOIN (
-        SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'NestedReferenceBase'")} AS `Discriminator`
+        SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedReferenceBase' AS `Discriminator`
         FROM `NestedReferences` AS `n`
         UNION ALL
-        SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, {MySqlTestHelpers.MySqlBug96947Workaround(@"'NestedReferenceDerived'")} AS `Discriminator`
+        SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedReferenceDerived' AS `Discriminator`
         FROM `NestedReferencesDerived` AS `n0`
-    ) AS `t2` ON `t0`.`Id` = `t2`.`ParentCollectionId`
-) AS `t1` ON `t`.`Id` = `t1`.`BaseParentId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `t1`.`Id`
+    ) AS `u1` ON `u0`.`Id` = `u1`.`ParentCollectionId`
+) AS `s` ON `u`.`Id` = `s`.`BaseParentId`
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `s`.`Id`
 """);
     }
 
@@ -968,33 +968,33 @@ public override async Task Nested_include_with_inheritance_collection_reference_
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentCollectionId`, `t`.`ParentReferenceId`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`Name`, `t1`.`BaseId`, `t1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentCollectionId`, `u`.`ParentReferenceId`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u1`.`Id`, `u1`.`Name`, `u1`.`BaseId`, `u1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedReferenceBase' AS `Discriminator`
     FROM `NestedReferences` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedReferenceDerived' AS `Discriminator`
     FROM `NestedReferencesDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t0` ON `t`.`ParentCollectionId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u0` ON `u`.`ParentCollectionId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t1`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u1`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u1`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1004,33 +1004,33 @@ public override async Task Nested_include_with_inheritance_reference_collection(
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`Name`, `t1`.`ParentCollectionId`, `t1`.`ParentReferenceId`, `t1`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`Discriminator`, `u1`.`Id`, `u1`.`Name`, `u1`.`ParentCollectionId`, `u1`.`ParentReferenceId`, `u1`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d2`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
 LEFT JOIN (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t1` ON `t0`.`Id` = `t1`.`ParentReferenceId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
+) AS `u1` ON `u0`.`Id` = `u1`.`ParentReferenceId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`
 """);
     }
 
@@ -1040,26 +1040,26 @@ public override async Task Nested_include_with_inheritance_reference_collection_
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`BaseParentId`, `t`.`Name`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`Name`, `t0`.`ParentCollectionId`, `t0`.`ParentReferenceId`, `t0`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`BaseParentId`, `u`.`Name`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`Name`, `u0`.`ParentCollectionId`, `u0`.`ParentReferenceId`, `u0`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
 LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
 LEFT JOIN (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t0` ON `t`.`Id` = `t0`.`ParentReferenceId`
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
+) AS `u0` ON `u`.`Id` = `u0`.`ParentReferenceId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -1069,33 +1069,33 @@ public override async Task Nested_include_with_inheritance_reference_collection_
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentCollectionId`, `t`.`ParentReferenceId`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`Name`, `t1`.`BaseId`, `t1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentCollectionId`, `u`.`ParentReferenceId`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`Discriminator`, `u1`.`Id`, `u1`.`Name`, `u1`.`BaseId`, `u1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t0` ON `t`.`ParentReferenceId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d`
+) AS `u0` ON `u`.`ParentReferenceId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t1`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u1`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u1`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1105,33 +1105,33 @@ public override async Task Nested_include_with_inheritance_reference_reference(b
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`Discriminator`, `t1`.`Name`, `t1`.`ParentCollectionId`, `t1`.`ParentReferenceId`, `t1`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`Discriminator`, `u1`.`Name`, `u1`.`ParentCollectionId`, `u1`.`ParentReferenceId`, `u1`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d2`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
 LEFT JOIN (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedReferenceBase' AS `Discriminator`
     FROM `NestedReferences` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedReferenceDerived' AS `Discriminator`
     FROM `NestedReferencesDerived` AS `n0`
-) AS `t1` ON `t0`.`Id` = `t1`.`ParentReferenceId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+) AS `u1` ON `u0`.`Id` = `u1`.`ParentReferenceId`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1141,26 +1141,26 @@ public override async Task Nested_include_with_inheritance_reference_reference_o
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`BaseParentId`, `t`.`Name`, `t`.`Discriminator`, `t0`.`Name`, `t0`.`ParentCollectionId`, `t0`.`ParentReferenceId`, `t0`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`BaseParentId`, `u`.`Name`, `u`.`Discriminator`, `u0`.`Name`, `u0`.`ParentCollectionId`, `u0`.`ParentReferenceId`, `u0`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
 LEFT JOIN (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedReferenceBase' AS `Discriminator`
     FROM `NestedReferences` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedReferenceDerived' AS `Discriminator`
     FROM `NestedReferencesDerived` AS `n0`
-) AS `t0` ON `t`.`Id` = `t0`.`ParentReferenceId`
+) AS `u0` ON `u`.`Id` = `u0`.`ParentReferenceId`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
 LEFT JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1170,33 +1170,33 @@ public override async Task Nested_include_with_inheritance_reference_reference_r
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentCollectionId`, `t`.`ParentReferenceId`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`Name`, `t1`.`BaseId`, `t1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentCollectionId`, `u`.`ParentReferenceId`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`Discriminator`, `u1`.`Id`, `u1`.`Name`, `u1`.`BaseId`, `u1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedReferenceBase' AS `Discriminator`
     FROM `NestedReferences` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedReferenceDerived' AS `Discriminator`
     FROM `NestedReferencesDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t0` ON `t`.`ParentReferenceId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d`
+) AS `u0` ON `u`.`ParentReferenceId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t1`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u1`.`Id` = `d1`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u1`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d2`.`DerivedInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1206,22 +1206,22 @@ public override async Task Collection_projection_on_base_type(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`
+SELECT `u`.`Id`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
     SELECT `d`.`Id`
     FROM `DerivedEntities` AS `d`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
     SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
     FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-ORDER BY `t`.`Id`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+ORDER BY `u`.`Id`
 """);
     }
 
@@ -1231,21 +1231,21 @@ public override async Task Include_on_derived_type_with_queryable_Cast(bool asyn
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `d1`.`Id`, `d1`.`Name`, `d1`.`ParentId`, `d1`.`DerivedInheritanceRelationshipEntityId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `o`.`Id`, `o`.`Name`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`, `d2`.`Id`, `d2`.`Name`, `d2`.`ParentId`, `d2`.`DerivedInheritanceRelationshipEntityId`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d2`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-LEFT JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedCollectionsOnDerived` AS `d1` ON `t`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
-WHERE `t`.`Id` >= 4
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+LEFT JOIN `OwnedCollections` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `u`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedCollectionsOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+WHERE `u`.`Id` >= 4
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -1255,68 +1255,68 @@ public override async Task Include_collection_with_inheritance_split(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
 INNER JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d3`.`Id`, `d3`.`BaseParentId`, `d3`.`Name`, `d3`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d3`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -1326,68 +1326,68 @@ public override async Task Include_collection_with_inheritance_reverse_split(boo
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedProperty`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`Name`, `t0`.`BaseId`, `t0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedProperty`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`Name`, `u0`.`BaseId`, `u0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o`.`Id`, `o`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u0`.`Id` = `d1`.`Id`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u0`.`Id` = `d2`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u0`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d3`.`DerivedInheritanceRelationshipEntityId`, `d3`.`Id`, `d3`.`Name`, `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`
-    FROM `DerivedEntities` AS `d2`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t0`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u0`.`Id` = `d2`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d3` ON `u0`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """);
     }
 
@@ -1397,72 +1397,72 @@ public override async Task Include_collection_with_inheritance_with_filter_split
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
 INNER JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d3`.`Id`, `d3`.`BaseParentId`, `d3`.`Name`, `d3`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d3`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -1472,71 +1472,71 @@ public override async Task Include_collection_with_inheritance_with_filter_rever
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedProperty`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`Name`, `t0`.`BaseId`, `t0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedProperty`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`Name`, `u0`.`BaseId`, `u0`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o`.`Id`, `o`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u0`.`Id` = `d1`.`Id`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u0`.`Id` = `d2`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u0`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d3`.`DerivedInheritanceRelationshipEntityId`, `d3`.`Id`, `d3`.`Name`, `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`
-    FROM `DerivedEntities` AS `d2`
-) AS `t0` ON `t`.`BaseParentId` = `t0`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t0`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t0`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u0` ON `u`.`BaseParentId` = `u0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u0`.`Id` = `d2`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d3` ON `u0`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """);
     }
 
@@ -1546,62 +1546,62 @@ public override async Task Include_collection_without_inheritance_split(bool asy
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `CollectionsOnBase` AS `c` ON `t`.`Id` = `c`.`ParentId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `CollectionsOnBase` AS `c` ON `u`.`Id` = `c`.`ParentId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -1611,50 +1611,50 @@ public override async Task Include_collection_without_inheritance_reverse_split(
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM `CollectionsOnBase` AS `c`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t` ON `c`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-ORDER BY `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `c`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+ORDER BY `c`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `c`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM `CollectionsOnBase` AS `c`
 LEFT JOIN (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t` ON `c`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `c`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `c`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `c`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM `CollectionsOnBase` AS `c`
 LEFT JOIN (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t` ON `c`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `c`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `c`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -1664,66 +1664,66 @@ public override async Task Include_collection_without_inheritance_with_filter_sp
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `CollectionsOnBase` AS `c` ON `t`.`Id` = `c`.`ParentId`
-WHERE (`t`.`Name` <> 'Bar') OR `t`.`Name` IS NULL
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `CollectionsOnBase` AS `c` ON `u`.`Id` = `c`.`ParentId`
+WHERE (`u`.`Name` <> 'Bar') OR `u`.`Name` IS NULL
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -1733,53 +1733,53 @@ public override async Task Include_collection_without_inheritance_with_filter_re
 
         AssertSql(
 """
-SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `c`.`Id`, `c`.`Name`, `c`.`ParentId`, `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM `CollectionsOnBase` AS `c`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t` ON `c`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `c`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
 WHERE (`c`.`Name` <> 'Bar') OR `c`.`Name` IS NULL
-ORDER BY `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+ORDER BY `c`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `c`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM `CollectionsOnBase` AS `c`
 LEFT JOIN (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t` ON `c`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `c`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
 WHERE (`c`.`Name` <> 'Bar') OR `c`.`Name` IS NULL
-ORDER BY `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+ORDER BY `c`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `c`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM `CollectionsOnBase` AS `c`
 LEFT JOIN (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t` ON `c`.`ParentId` = `t`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u` ON `c`.`ParentId` = `u`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
 WHERE (`c`.`Name` <> 'Bar') OR `c`.`Name` IS NULL
-ORDER BY `c`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+ORDER BY `c`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -1796,33 +1796,33 @@ public override async Task Include_collection_with_inheritance_on_derived1_split
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `OwnedCollections` AS `o1` ON `d`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`BaseParentId`, `t`.`Name`, `t`.`DerivedProperty`, `t`.`Discriminator`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `u`.`Id`, `u`.`BaseParentId`, `u`.`Name`, `u`.`DerivedProperty`, `u`.`Discriminator`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
 INNER JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+    SELECT `d2`.`Id`, `d2`.`BaseParentId`, `d2`.`Name`, `d2`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d2`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1838,33 +1838,33 @@ public override async Task Include_collection_with_inheritance_on_derived2_split
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `OwnedCollections` AS `o1` ON `d`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentId`, `t`.`DerivedInheritanceRelationshipEntityId`, `t`.`Discriminator`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentId`, `u`.`DerivedInheritanceRelationshipEntityId`, `u`.`Discriminator`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
 INNER JOIN (
     SELECT `b`.`Id`, `b`.`Name`, `b`.`ParentId`, NULL AS `DerivedInheritanceRelationshipEntityId`, 'BaseCollectionOnDerived' AS `Discriminator`
     FROM `BaseCollectionsOnDerived` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`ParentId`, `d0`.`DerivedInheritanceRelationshipEntityId`, 'DerivedCollectionOnDerived' AS `Discriminator`
-    FROM `DerivedCollectionsOnDerived` AS `d0`
-) AS `t` ON `d`.`Id` = `t`.`ParentId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+    SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`ParentId`, `d2`.`DerivedInheritanceRelationshipEntityId`, 'DerivedCollectionOnDerived' AS `Discriminator`
+    FROM `DerivedCollectionsOnDerived` AS `d2`
+) AS `u` ON `d`.`Id` = `u`.`ParentId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1881,27 +1881,27 @@ public override async Task Include_collection_with_inheritance_on_derived3_split
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `OwnedCollections` AS `o1` ON `d`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `d1`.`DerivedInheritanceRelationshipEntityId`, `d1`.`Id`, `d1`.`Name`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d1` ON `d`.`Id` = `d1`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`ParentId`, `d0`.`DerivedInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `d2`.`Id`, `d2`.`Name`, `d2`.`ParentId`, `d2`.`DerivedInheritanceRelationshipEntityId`, `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `DerivedCollectionsOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `DerivedCollectionsOnDerived` AS `d2` ON `d`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1911,47 +1911,47 @@ public override async Task Include_collection_with_inheritance_on_derived_revers
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentId`, `t`.`DerivedInheritanceRelationshipEntityId`, `t`.`Discriminator`, `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentId`, `u`.`DerivedInheritanceRelationshipEntityId`, `u`.`Discriminator`, `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, `o`.`BaseInheritanceRelationshipEntityId`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, `b`.`ParentId`, NULL AS `DerivedInheritanceRelationshipEntityId`, 'BaseCollectionOnDerived' AS `Discriminator`
     FROM `BaseCollectionsOnDerived` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`ParentId`, `d0`.`DerivedInheritanceRelationshipEntityId`, 'DerivedCollectionOnDerived' AS `Discriminator`
-    FROM `DerivedCollectionsOnDerived` AS `d0`
-) AS `t`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`ParentId` = `d`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`ParentId`, `d`.`DerivedInheritanceRelationshipEntityId`, 'DerivedCollectionOnDerived' AS `Discriminator`
+    FROM `DerivedCollectionsOnDerived` AS `d`
+) AS `u`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`ParentId` = `d0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `d0`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `d0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM (
     SELECT `b`.`Id`, `b`.`ParentId`
     FROM `BaseCollectionsOnDerived` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`ParentId`
-    FROM `DerivedCollectionsOnDerived` AS `d0`
-) AS `t`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`ParentId` = `d`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`ParentId`
+    FROM `DerivedCollectionsOnDerived` AS `d`
+) AS `u`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`ParentId` = `d0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `OwnedCollections` AS `o1` ON `d0`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `u`.`Id`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM (
     SELECT `b`.`Id`, `b`.`ParentId`
     FROM `BaseCollectionsOnDerived` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`ParentId`
-    FROM `DerivedCollectionsOnDerived` AS `d1`
-) AS `t`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`ParentId` = `d`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `d`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+    SELECT `d`.`Id`, `d`.`ParentId`
+    FROM `DerivedCollectionsOnDerived` AS `d`
+) AS `u`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`ParentId` = `d0`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d0`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `d0`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `d0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """);
     }
 
@@ -1961,96 +1961,96 @@ public override async Task Nested_include_with_inheritance_reference_collection_
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`Discriminator`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o`.`Id`, `o`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`Discriminator`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`
     FROM `BaseReferencesOnBase` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u`.`Id` = `d2`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d3`.`DerivedInheritanceRelationshipEntityId`, `d3`.`Id`, `d3`.`Name`, `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`
     FROM `BaseReferencesOnBase` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`, `d2`.`BaseParentId`
-    FROM `DerivedReferencesOnBase` AS `d2`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u`.`Id` = `d2`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d3` ON `u`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """,
                 //
                 """
-SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`ParentCollectionId`, `t1`.`ParentReferenceId`, `t1`.`Discriminator`, `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`ParentCollectionId`, `u1`.`ParentReferenceId`, `u1`.`Discriminator`, `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`
     FROM `BaseReferencesOnBase` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u`.`Id` = `d2`.`Id`
 INNER JOIN (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t1` ON `t0`.`Id` = `t1`.`ParentReferenceId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+) AS `u1` ON `u0`.`Id` = `u1`.`ParentReferenceId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """);
     }
 
@@ -2060,7 +2060,7 @@ public override async Task Nested_include_with_inheritance_reference_collection_
 
         AssertSql(
 """
-SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o`.`Id`, `o`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `t`.`BaseParentId`, `t`.`Name`, `t`.`Discriminator`
+SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `o`.`Id`, `o`.`Name`, `d`.`Id`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`, `u`.`BaseParentId`, `u`.`Name`, `u`.`Discriminator`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
@@ -2068,13 +2068,13 @@ LEFT JOIN (
     UNION ALL
     SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
     FROM `DerivedReferencesOnBase` AS `d0`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
 LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `d`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
@@ -2082,29 +2082,29 @@ LEFT JOIN (
     UNION ALL
     SELECT `d0`.`Id`, `d0`.`BaseParentId`
     FROM `DerivedReferencesOnBase` AS `d0`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `OwnedCollections` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `OwnedCollections` AS `o1` ON `d`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `d`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `d`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+    SELECT `d0`.`Id`, `d0`.`BaseParentId`
+    FROM `DerivedReferencesOnBase` AS `d0`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `d`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`Name`, `t0`.`ParentCollectionId`, `t0`.`ParentReferenceId`, `t0`.`Discriminator`, `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+SELECT `u0`.`Id`, `u0`.`Name`, `u0`.`ParentCollectionId`, `u0`.`ParentReferenceId`, `u0`.`Discriminator`, `d`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 FROM `DerivedEntities` AS `d`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
@@ -2112,16 +2112,16 @@ LEFT JOIN (
     UNION ALL
     SELECT `d0`.`Id`, `d0`.`BaseParentId`
     FROM `DerivedReferencesOnBase` AS `d0`
-) AS `t` ON `d`.`Id` = `t`.`BaseParentId`
-LEFT JOIN `OwnedReferences` AS `o` ON `d`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+) AS `u` ON `d`.`Id` = `u`.`BaseParentId`
+LEFT JOIN `OwnedReferences` AS `o0` ON `d`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
 INNER JOIN (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t0` ON `t`.`Id` = `t0`.`ParentReferenceId`
-ORDER BY `d`.`Id`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`
+) AS `u0` ON `u`.`Id` = `u0`.`ParentReferenceId`
+ORDER BY `d`.`Id`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`
 """);
     }
 
@@ -2131,89 +2131,89 @@ public override async Task Nested_include_with_inheritance_reference_collection_
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentCollectionId`, `t`.`ParentReferenceId`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`Name`, `t1`.`BaseId`, `t1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentCollectionId`, `u`.`ParentReferenceId`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`Discriminator`, `u1`.`Id`, `u1`.`Name`, `u1`.`BaseId`, `u1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o`.`Id`, `o`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, 'BaseReferenceOnBase' AS `Discriminator`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
-    FROM `DerivedReferencesOnBase` AS `d0`
-) AS `t0` ON `t`.`ParentReferenceId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, 'DerivedReferenceOnBase' AS `Discriminator`
+    FROM `DerivedReferencesOnBase` AS `d`
+) AS `u0` ON `u`.`ParentReferenceId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u1`.`Id` = `d1`.`Id`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `n`.`Id`, `n`.`ParentReferenceId`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`ParentReferenceId`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`
-    FROM `DerivedReferencesOnBase` AS `d0`
-) AS `t0` ON `t`.`ParentReferenceId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`
+    FROM `DerivedReferencesOnBase` AS `d`
+) AS `u0` ON `u`.`ParentReferenceId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u1`.`Id` = `d2`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u1`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d3`.`DerivedInheritanceRelationshipEntityId`, `d3`.`Id`, `d3`.`Name`, `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `n`.`Id`, `n`.`ParentReferenceId`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`ParentReferenceId`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseReferencesOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`
-    FROM `DerivedReferencesOnBase` AS `d1`
-) AS `t0` ON `t`.`ParentReferenceId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`
+    FROM `DerivedReferencesOnBase` AS `d`
+) AS `u0` ON `u`.`ParentReferenceId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`
-    FROM `DerivedEntities` AS `d2`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t1`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u1`.`Id` = `d2`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d3` ON `u1`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """);
     }
 
@@ -2223,78 +2223,78 @@ public override async Task Nested_include_with_inheritance_collection_reference_
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `t1`.`Id`, `t1`.`BaseParentId`, `t1`.`Name`, `t1`.`DerivedProperty`, `t1`.`Discriminator`, `t1`.`Id0`, `t1`.`Name0`, `t1`.`ParentCollectionId`, `t1`.`ParentReferenceId`, `t1`.`Discriminator0` AS `Discriminator`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `s`.`Id`, `s`.`BaseParentId`, `s`.`Name`, `s`.`DerivedProperty`, `s`.`Discriminator`, `s`.`Id0`, `s`.`Name0`, `s`.`ParentCollectionId`, `s`.`ParentReferenceId`, `s`.`Discriminator0` AS `Discriminator`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
 INNER JOIN (
-    SELECT `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t2`.`Id` AS `Id0`, `t2`.`Name` AS `Name0`, `t2`.`ParentCollectionId`, `t2`.`ParentReferenceId`, `t2`.`Discriminator` AS `Discriminator0`
+    SELECT `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u1`.`Id` AS `Id0`, `u1`.`Name` AS `Name0`, `u1`.`ParentCollectionId`, `u1`.`ParentReferenceId`, `u1`.`Discriminator` AS `Discriminator0`
     FROM (
         SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
         FROM `BaseCollectionsOnBase` AS `b0`
         UNION ALL
-        SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-        FROM `DerivedCollectionsOnBase` AS `d1`
-    ) AS `t0`
+        SELECT `d3`.`Id`, `d3`.`BaseParentId`, `d3`.`Name`, `d3`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+        FROM `DerivedCollectionsOnBase` AS `d3`
+    ) AS `u0`
     LEFT JOIN (
         SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedReferenceBase' AS `Discriminator`
         FROM `NestedReferences` AS `n`
         UNION ALL
         SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedReferenceDerived' AS `Discriminator`
         FROM `NestedReferencesDerived` AS `n0`
-    ) AS `t2` ON `t0`.`Id` = `t2`.`ParentCollectionId`
-) AS `t1` ON `t`.`Id` = `t1`.`BaseParentId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    ) AS `u1` ON `u0`.`Id` = `u1`.`ParentCollectionId`
+) AS `s` ON `u`.`Id` = `s`.`BaseParentId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
@@ -2304,89 +2304,89 @@ public override async Task Nested_include_with_inheritance_collection_reference_
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentCollectionId`, `t`.`ParentReferenceId`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`Name`, `t1`.`BaseId`, `t1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentCollectionId`, `u`.`ParentReferenceId`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u1`.`Id`, `u1`.`Name`, `u1`.`BaseId`, `u1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o`.`Id`, `o`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedReferenceBase' AS `Discriminator`
     FROM `NestedReferences` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedReferenceDerived' AS `Discriminator`
     FROM `NestedReferencesDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t0` ON `t`.`ParentCollectionId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u0` ON `u`.`ParentCollectionId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u1`.`Id` = `d1`.`Id`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `n`.`Id`, `n`.`ParentCollectionId`
     FROM `NestedReferences` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`ParentCollectionId`
     FROM `NestedReferencesDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t0` ON `t`.`ParentCollectionId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u0` ON `u`.`ParentCollectionId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u1`.`Id` = `d2`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u1`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d3`.`DerivedInheritanceRelationshipEntityId`, `d3`.`Id`, `d3`.`Name`, `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `n`.`Id`, `n`.`ParentCollectionId`
     FROM `NestedReferences` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`ParentCollectionId`
     FROM `NestedReferencesDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t0` ON `t`.`ParentCollectionId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u0` ON `u`.`ParentCollectionId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`
-    FROM `DerivedEntities` AS `d2`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t1`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u1`.`Id` = `d2`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d3` ON `u1`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """);
     }
 
@@ -2396,96 +2396,96 @@ public override async Task Nested_include_with_inheritance_collection_collection
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
 INNER JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`, `d1`.`Name`, `d1`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `t0`.`Id`
+    SELECT `d3`.`Id`, `d3`.`BaseParentId`, `d3`.`Name`, `d3`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d3`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `u0`.`Id`
 """,
                 //
                 """
-SELECT `t1`.`Id`, `t1`.`Name`, `t1`.`ParentCollectionId`, `t1`.`ParentReferenceId`, `t1`.`Discriminator`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `t0`.`Id`
+SELECT `u1`.`Id`, `u1`.`Name`, `u1`.`ParentCollectionId`, `u1`.`ParentReferenceId`, `u1`.`Discriminator`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `u0`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
 INNER JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`
     FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
+    SELECT `d3`.`Id`, `d3`.`BaseParentId`
+    FROM `DerivedCollectionsOnBase` AS `d3`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
 INNER JOIN (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t1` ON `t0`.`Id` = `t1`.`ParentCollectionId`
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `t0`.`Id`
+) AS `u1` ON `u0`.`Id` = `u1`.`ParentCollectionId`
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `u0`.`Id`
 """);
     }
 
@@ -2495,89 +2495,89 @@ public override async Task Nested_include_with_inheritance_collection_collection
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ParentCollectionId`, `t`.`ParentReferenceId`, `t`.`Discriminator`, `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t1`.`Id`, `t1`.`Name`, `t1`.`BaseId`, `t1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`ParentCollectionId`, `u`.`ParentReferenceId`, `u`.`Discriminator`, `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u1`.`Id`, `u1`.`Name`, `u1`.`BaseId`, `u1`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`, `o`.`Id`, `o`.`Name`, `d1`.`OwnedReferenceOnDerived_Id`, `d1`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `n`.`Id`, `n`.`Name`, `n`.`ParentCollectionId`, `n`.`ParentReferenceId`, 'NestedCollectionBase' AS `Discriminator`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`Name`, `n0`.`ParentCollectionId`, `n0`.`ParentReferenceId`, 'NestedCollectionDerived' AS `Discriminator`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`, `b`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t0` ON `t`.`ParentCollectionId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`, `d`.`Name`, `d`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u0` ON `u`.`ParentCollectionId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`, `b0`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`Name`, `d1`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d1`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o` ON `u1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u1`.`Id` = `d1`.`Id`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `n`.`Id`, `n`.`ParentCollectionId`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`ParentCollectionId`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`BaseParentId`
-    FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t0` ON `t`.`ParentCollectionId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u0` ON `u`.`ParentCollectionId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u1`.`Id` = `d2`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u1`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d3`.`DerivedInheritanceRelationshipEntityId`, `d3`.`Id`, `d3`.`Name`, `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 FROM (
     SELECT `n`.`Id`, `n`.`ParentCollectionId`
     FROM `NestedCollections` AS `n`
     UNION ALL
     SELECT `n0`.`Id`, `n0`.`ParentCollectionId`
     FROM `NestedCollectionsDerived` AS `n0`
-) AS `t`
+) AS `u`
 LEFT JOIN (
     SELECT `b`.`Id`, `b`.`BaseParentId`
     FROM `BaseCollectionsOnBase` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`, `d1`.`BaseParentId`
-    FROM `DerivedCollectionsOnBase` AS `d1`
-) AS `t0` ON `t`.`ParentCollectionId` = `t0`.`Id`
+    SELECT `d`.`Id`, `d`.`BaseParentId`
+    FROM `DerivedCollectionsOnBase` AS `d`
+) AS `u0` ON `u`.`ParentCollectionId` = `u0`.`Id`
 LEFT JOIN (
     SELECT `b0`.`Id`
     FROM `BaseEntities` AS `b0`
     UNION ALL
-    SELECT `d2`.`Id`
-    FROM `DerivedEntities` AS `d2`
-) AS `t1` ON `t0`.`BaseParentId` = `t1`.`Id`
-LEFT JOIN `OwnedReferences` AS `o` ON `t1`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t1`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t1`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-ORDER BY `t`.`Id`, `t0`.`Id`, `t1`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d0`.`Id`
+    FROM `DerivedEntities` AS `d0`
+) AS `u1` ON `u0`.`BaseParentId` = `u1`.`Id`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u1`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d2` ON `u1`.`Id` = `d2`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d3` ON `u1`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+ORDER BY `u`.`Id`, `u0`.`Id`, `u1`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d2`.`Id`
 """);
     }
 
@@ -2593,13 +2593,13 @@ ORDER BY `r`.`Id`
 """,
                 //
                 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`ReferenceId`, `t`.`ReferencedEntityId`, `t`.`Id0`, `t`.`Name0`, `r`.`Id`
+SELECT `s`.`Id`, `s`.`Name`, `s`.`ReferenceId`, `s`.`ReferencedEntityId`, `s`.`Id0`, `s`.`Name0`, `r`.`Id`
 FROM `ReferencedEntities` AS `r`
 INNER JOIN (
     SELECT `p`.`Id`, `p`.`Name`, `p`.`ReferenceId`, `p`.`ReferencedEntityId`, `r0`.`Id` AS `Id0`, `r0`.`Name` AS `Name0`
     FROM `PrincipalEntities` AS `p`
     LEFT JOIN `ReferencedEntities` AS `r0` ON `p`.`ReferenceId` = `r0`.`Id`
-) AS `t` ON `r`.`Id` = `t`.`ReferencedEntityId`
+) AS `s` ON `r`.`Id` = `s`.`ReferencedEntityId`
 ORDER BY `r`.`Id`
 """);
     }
@@ -2610,34 +2610,34 @@ public override async Task Collection_projection_on_base_type_split(bool async)
 
         AssertSql(
 """
-SELECT `t`.`Id`
+SELECT `u`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
     SELECT `d`.`Id`
     FROM `DerivedEntities` AS `d`
-) AS `t`
-ORDER BY `t`.`Id`
+) AS `u`
+ORDER BY `u`.`Id`
 """,
                 //
                 """
-SELECT `t0`.`Id`, `t0`.`BaseParentId`, `t0`.`Name`, `t0`.`DerivedProperty`, `t0`.`Discriminator`, `t`.`Id`
+SELECT `u0`.`Id`, `u0`.`BaseParentId`, `u0`.`Name`, `u0`.`DerivedProperty`, `u0`.`Discriminator`, `u`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
     SELECT `d`.`Id`
     FROM `DerivedEntities` AS `d`
-) AS `t`
+) AS `u`
 INNER JOIN (
     SELECT `b0`.`Id`, `b0`.`BaseParentId`, `b0`.`Name`, NULL AS `DerivedProperty`, 'BaseCollectionOnBase' AS `Discriminator`
     FROM `BaseCollectionsOnBase` AS `b0`
     UNION ALL
     SELECT `d0`.`Id`, `d0`.`BaseParentId`, `d0`.`Name`, `d0`.`DerivedProperty`, 'DerivedCollectionOnBase' AS `Discriminator`
     FROM `DerivedCollectionsOnBase` AS `d0`
-) AS `t0` ON `t`.`Id` = `t0`.`BaseParentId`
-ORDER BY `t`.`Id`
+) AS `u0` ON `u`.`Id` = `u0`.`BaseParentId`
+ORDER BY `u`.`Id`
 """);
     }
 
@@ -2647,66 +2647,66 @@ public override async Task Include_on_derived_type_with_queryable_Cast_split(boo
 
         AssertSql(
 """
-SELECT `t`.`Id`, `t`.`Name`, `t`.`BaseId`, `t`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`, `o`.`Id`, `o`.`Name`, `d`.`OwnedReferenceOnDerived_Id`, `d`.`OwnedReferenceOnDerived_Name`
+SELECT `u`.`Id`, `u`.`Name`, `u`.`BaseId`, `u`.`Discriminator`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`, `o`.`Id`, `o`.`Name`, `d0`.`OwnedReferenceOnDerived_Id`, `d0`.`OwnedReferenceOnDerived_Name`
 FROM (
     SELECT `b`.`Id`, `b`.`Name`, NULL AS `BaseId`, 'BaseInheritanceRelationshipEntity' AS `Discriminator`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-WHERE `t`.`Id` >= 4
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`, `d`.`Name`, `d`.`BaseId`, 'DerivedInheritanceRelationshipEntity' AS `Discriminator`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o` ON `u`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d0` ON `u`.`Id` = `d0`.`Id`
+WHERE `u`.`Id` >= 4
+ORDER BY `u`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d0`.`Id`
 """,
                 //
                 """
-SELECT `o0`.`BaseInheritanceRelationshipEntityId`, `o0`.`Id`, `o0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `o1`.`BaseInheritanceRelationshipEntityId`, `o1`.`Id`, `o1`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d0`.`Id`
-    FROM `DerivedEntities` AS `d0`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `OwnedCollections` AS `o0` ON `t`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
-WHERE `t`.`Id` >= 4
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `OwnedCollections` AS `o1` ON `u`.`Id` = `o1`.`BaseInheritanceRelationshipEntityId`
+WHERE `u`.`Id` >= 4
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`DerivedInheritanceRelationshipEntityId`, `d0`.`Id`, `d0`.`Name`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d2`.`DerivedInheritanceRelationshipEntityId`, `d2`.`Id`, `d2`.`Name`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE `t`.`Id` >= 4
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedEntities_OwnedCollectionOnDerived` AS `d2` ON `u`.`Id` = `d2`.`DerivedInheritanceRelationshipEntityId`
+WHERE `u`.`Id` >= 4
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """,
                 //
                 """
-SELECT `d0`.`Id`, `d0`.`Name`, `d0`.`ParentId`, `d0`.`DerivedInheritanceRelationshipEntityId`, `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+SELECT `d3`.`Id`, `d3`.`Name`, `d3`.`ParentId`, `d3`.`DerivedInheritanceRelationshipEntityId`, `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 FROM (
     SELECT `b`.`Id`
     FROM `BaseEntities` AS `b`
     UNION ALL
-    SELECT `d1`.`Id`
-    FROM `DerivedEntities` AS `d1`
-) AS `t`
-LEFT JOIN `OwnedReferences` AS `o` ON `t`.`Id` = `o`.`BaseInheritanceRelationshipEntityId`
-LEFT JOIN `DerivedEntities` AS `d` ON `t`.`Id` = `d`.`Id`
-INNER JOIN `DerivedCollectionsOnDerived` AS `d0` ON `t`.`Id` = `d0`.`DerivedInheritanceRelationshipEntityId`
-WHERE `t`.`Id` >= 4
-ORDER BY `t`.`Id`, `o`.`BaseInheritanceRelationshipEntityId`, `d`.`Id`
+    SELECT `d`.`Id`
+    FROM `DerivedEntities` AS `d`
+) AS `u`
+LEFT JOIN `OwnedReferences` AS `o0` ON `u`.`Id` = `o0`.`BaseInheritanceRelationshipEntityId`
+LEFT JOIN `DerivedEntities` AS `d1` ON `u`.`Id` = `d1`.`Id`
+INNER JOIN `DerivedCollectionsOnDerived` AS `d3` ON `u`.`Id` = `d3`.`DerivedInheritanceRelationshipEntityId`
+WHERE `u`.`Id` >= 4
+ORDER BY `u`.`Id`, `o0`.`BaseInheritanceRelationshipEntityId`, `d1`.`Id`
 """);
     }
 
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DataEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DataEntityType.cs
new file mode 100644
index 000000000..0a3766e7a
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DataEntityType.cs
@@ -0,0 +1,173 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NetTopologySuite.Geometries;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 5,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()));
+            blob.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var point = runtimeEntityType.AddProperty(
+                "Point",
+                typeof(Point),
+                nullable: true);
+            point.TypeMapping = null;
+            point.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringWithCharSet = runtimeEntityType.AddProperty(
+                "StringWithCharSet",
+                typeof(string),
+                nullable: true,
+                valueGenerated: ValueGenerated.OnAdd,
+                valueConverter: new CastingConverter<string, string>(),
+                valueComparer: new CompiledModelTestBase.CustomValueComparer<string>(),
+                providerValueComparer: new CompiledModelTestBase.CustomValueComparer<string>());
+            stringWithCharSet.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(128)",
+                    size: 128),
+                converter: new ValueConverter<string, string>(
+                    (string v) => (string)v,
+                    (string v) => (string)v),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        (string v) => (string)v,
+                        (string v) => (string)v)));
+            stringWithCharSet.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+            stringWithCharSet.AddAnnotation("Relational:ColumnType", "varchar(128)");
+            stringWithCharSet.AddAnnotation("Relational:DefaultValue", "String having charset");
+
+            var stringWithCollation = runtimeEntityType.AddProperty(
+                "StringWithCollation",
+                typeof(string),
+                nullable: true,
+                valueGenerated: ValueGenerated.OnAdd,
+                valueConverter: new CastingConverter<string, string>(),
+                valueComparer: new CompiledModelTestBase.CustomValueComparer<string>(),
+                providerValueComparer: new CompiledModelTestBase.CustomValueComparer<string>());
+            stringWithCollation.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(128)",
+                    size: 128),
+                converter: new ValueConverter<string, string>(
+                    (string v) => (string)v,
+                    (string v) => (string)v),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        (string v) => (string)v,
+                        (string v) => (string)v)));
+            stringWithCollation.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+            stringWithCollation.AddAnnotation("Relational:ColumnType", "varchar(128)");
+            stringWithCollation.AddAnnotation("Relational:DefaultValue", "String using collation");
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Data");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModel.cs
new file mode 100644
index 000000000..583ee4d90
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs
new file mode 100644
index 000000000..3892a94f3
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs
@@ -0,0 +1,2758 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 9)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+            var dependentBase = DependentBaseEntityType.Create(this);
+            var manyTypes = ManyTypesEntityType.Create(this);
+            var principalBase = PrincipalBaseEntityType.Create(this);
+            var ownedType = OwnedTypeEntityType.Create(this);
+            var ownedType0 = OwnedType0EntityType.Create(this);
+            var principalBasePrincipalDerivedDependentBasebyte = PrincipalBasePrincipalDerivedDependentBasebyteEntityType.Create(this);
+            var dependentDerived = DependentDerivedEntityType.Create(this, dependentBase);
+            var principalDerived = PrincipalDerivedEntityType.Create(this, principalBase);
+
+            DependentBaseEntityType.CreateForeignKey1(dependentBase, principalBase);
+            DependentBaseEntityType.CreateForeignKey2(dependentBase, principalDerived);
+            OwnedTypeEntityType.CreateForeignKey1(ownedType, principalBase);
+            OwnedTypeEntityType.CreateForeignKey2(ownedType, ownedType);
+            OwnedType0EntityType.CreateForeignKey1(ownedType0, principalDerived);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateForeignKey1(principalBasePrincipalDerivedDependentBasebyte, principalDerived);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateForeignKey2(principalBasePrincipalDerivedDependentBasebyte, principalBase);
+            PrincipalDerivedEntityType.CreateForeignKey1(principalDerived, principalBase);
+
+            PrincipalBaseEntityType.CreateSkipNavigation1(principalBase, principalDerived, principalBasePrincipalDerivedDependentBasebyte);
+            PrincipalDerivedEntityType.CreateSkipNavigation1(principalDerived, principalBase, principalBasePrincipalDerivedDependentBasebyte);
+
+            DataEntityType.CreateAnnotations(data);
+            DependentBaseEntityType.CreateAnnotations(dependentBase);
+            ManyTypesEntityType.CreateAnnotations(manyTypes);
+            PrincipalBaseEntityType.CreateAnnotations(principalBase);
+            OwnedTypeEntityType.CreateAnnotations(ownedType);
+            OwnedType0EntityType.CreateAnnotations(ownedType0);
+            PrincipalBasePrincipalDerivedDependentBasebyteEntityType.CreateAnnotations(principalBasePrincipalDerivedDependentBasebyte);
+            DependentDerivedEntityType.CreateAnnotations(dependentDerived);
+            PrincipalDerivedEntityType.CreateAnnotations(principalDerived);
+
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Id", idColumnBase);
+            var pointColumnBase = new ColumnBase<ColumnMappingBase>("Point", "point", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Point", pointColumnBase);
+            var stringWithCharSetColumnBase = new ColumnBase<ColumnMappingBase>("StringWithCharSet", "varchar(128)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("StringWithCharSet", stringWithCharSetColumnBase);
+            var stringWithCollationColumnBase = new ColumnBase<ColumnMappingBase>("StringWithCollation", "varchar(128)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("StringWithCollation", stringWithCollationColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, data.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)pointColumnBase, data.FindProperty("Point")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringWithCharSetColumnBase, data.FindProperty("StringWithCharSet")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringWithCollationColumnBase, data.FindProperty("StringWithCollation")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            data.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dataTable = new Table("Data", null, relationalModel);
+            var idColumn = new Column("Id", "int", dataTable);
+            dataTable.Columns.Add("Id", idColumn);
+            var blobColumn = new Column("Blob", "longblob", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("Blob", blobColumn);
+            var pointColumn = new Column("Point", "point", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("Point", pointColumn);
+            var stringWithCharSetColumn = new Column("StringWithCharSet", "varchar(128)", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("StringWithCharSet", stringWithCharSetColumn);
+            var stringWithCollationColumn = new Column("StringWithCollation", "varchar(128)", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("StringWithCollation", stringWithCollationColumn);
+            var pK_Data = new UniqueConstraint("PK_Data", dataTable, new[] { idColumn });
+            dataTable.PrimaryKey = pK_Data;
+            var pK_DataUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                new[] { "Id" });
+            pK_Data.MappedKeys.Add(pK_DataUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DataUc).Add(pK_Data);
+            dataTable.UniqueConstraints.Add("PK_Data", pK_Data);
+            relationalModel.Tables.Add(("Data", null), dataTable);
+            var dataTableMapping = new TableMapping(data, dataTable, null);
+            dataTable.AddTypeMapping(dataTableMapping, false);
+            tableMappings.Add(dataTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, data.FindProperty("Id")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(blobColumn, data.FindProperty("Blob")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(pointColumn, data.FindProperty("Point")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(stringWithCharSetColumn, data.FindProperty("StringWithCharSet")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(stringWithCollationColumn, data.FindProperty("StringWithCollation")!, dataTableMapping);
+
+            var dependentBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>")!;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", null, relationalModel);
+            var dataColumnBase = new ColumnBase<ColumnMappingBase>("Data", "char(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Data", dataColumnBase);
+            var enumDiscriminatorColumnBase = new ColumnBase<ColumnMappingBase>("EnumDiscriminator", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("EnumDiscriminator", enumDiscriminatorColumnBase);
+            var idColumnBase0 = new ColumnBase<ColumnMappingBase>("Id", "tinyint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase0);
+            var moneyColumnBase = new ColumnBase<ColumnMappingBase>("Money", "decimal(9,3)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Money", moneyColumnBase);
+            var principalAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalAlternateId", "char(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalAlternateId", principalAlternateIdColumnBase);
+            var principalIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalId", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalId", principalIdColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(dependentBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalAlternateIdColumnBase, dependentBase.FindProperty("PrincipalAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalIdColumnBase, dependentBase.FindProperty("PrincipalId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumDiscriminatorColumnBase, dependentBase.FindProperty("EnumDiscriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase0, dependentBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings0 = new List<TableMapping>();
+            dependentBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings0);
+            var dependentBasebyteTable = new Table("DependentBase<byte?>", null, relationalModel);
+            var principalIdColumn = new Column("PrincipalId", "bigint", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("PrincipalId", principalIdColumn);
+            var principalAlternateIdColumn = new Column("PrincipalAlternateId", "char(36)", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("PrincipalAlternateId", principalAlternateIdColumn);
+            var dataColumn = new Column("Data", "char(20)", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Data", dataColumn);
+            var enumDiscriminatorColumn = new Column("EnumDiscriminator", "int", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("EnumDiscriminator", enumDiscriminatorColumn);
+            var idColumn0 = new Column("Id", "tinyint unsigned", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Id", idColumn0);
+            var moneyColumn = new Column("Money", "decimal(9,3)", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("Money", moneyColumn);
+            var pK_DependentBasebyte = new UniqueConstraint("PK_DependentBase<byte?>", dependentBasebyteTable, new[] { principalIdColumn, principalAlternateIdColumn });
+            dependentBasebyteTable.PrimaryKey = pK_DependentBasebyte;
+            var pK_DependentBasebyteUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId", "PrincipalAlternateId" });
+            pK_DependentBasebyte.MappedKeys.Add(pK_DependentBasebyteUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DependentBasebyteUc).Add(pK_DependentBasebyte);
+            dependentBasebyteTable.UniqueConstraints.Add("PK_DependentBase<byte?>", pK_DependentBasebyte);
+            var iX_DependentBasebyte_PrincipalId = new TableIndex(
+            "IX_DependentBase<byte?>_PrincipalId", dependentBasebyteTable, new[] { principalIdColumn }, true);
+            var iX_DependentBasebyte_PrincipalIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" });
+            iX_DependentBasebyte_PrincipalId.MappedIndexes.Add(iX_DependentBasebyte_PrincipalIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_DependentBasebyte_PrincipalIdIx).Add(iX_DependentBasebyte_PrincipalId);
+            dependentBasebyteTable.Indexes.Add("IX_DependentBase<byte?>_PrincipalId", iX_DependentBasebyte_PrincipalId);
+            relationalModel.Tables.Add(("DependentBase<byte?>", null), dependentBasebyteTable);
+            var dependentBasebyteTableMapping = new TableMapping(dependentBase, dependentBasebyteTable, true)
+            {
+                IsSharedTablePrincipal = true,
+            };
+            dependentBasebyteTable.AddTypeMapping(dependentBasebyteTableMapping, false);
+            tableMappings0.Add(dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalAlternateIdColumn, dependentBase.FindProperty("PrincipalAlternateId")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalIdColumn, dependentBase.FindProperty("PrincipalId")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(enumDiscriminatorColumn, dependentBase.FindProperty("EnumDiscriminator")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn0, dependentBase.FindProperty("Id")!, dependentBasebyteTableMapping);
+
+            var dependentDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<byte?>")!;
+
+            var defaultTableMappings1 = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings1);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0 = new TableMappingBase<ColumnMappingBase>(dependentDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0, false);
+            defaultTableMappings1.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalAlternateIdColumnBase, dependentDerived.FindProperty("PrincipalAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalIdColumnBase, dependentDerived.FindProperty("PrincipalId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dataColumnBase, dependentDerived.FindProperty("Data")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumDiscriminatorColumnBase, dependentDerived.FindProperty("EnumDiscriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase0, dependentDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)moneyColumnBase, dependentDerived.FindProperty("Money")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase0);
+
+            var tableMappings1 = new List<TableMapping>();
+            dependentDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings1);
+            var dependentBasebyteTableMapping0 = new TableMapping(dependentDerived, dependentBasebyteTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            dependentBasebyteTable.AddTypeMapping(dependentBasebyteTableMapping0, false);
+            tableMappings1.Add(dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(principalAlternateIdColumn, dependentDerived.FindProperty("PrincipalAlternateId")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(principalIdColumn, dependentDerived.FindProperty("PrincipalId")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(dataColumn, dependentDerived.FindProperty("Data")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(enumDiscriminatorColumn, dependentDerived.FindProperty("EnumDiscriminator")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(idColumn0, dependentDerived.FindProperty("Id")!, dependentBasebyteTableMapping0);
+            RelationalModel.CreateColumnMapping(moneyColumn, dependentDerived.FindProperty("Money")!, dependentBasebyteTableMapping0);
+
+            var manyTypes = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes")!;
+
+            var defaultTableMappings2 = new List<TableMappingBase<ColumnMappingBase>>();
+            manyTypes.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings2);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes", null, relationalModel);
+            var boolColumnBase = new ColumnBase<ColumnMappingBase>("Bool", "tinyint(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Bool", boolColumnBase);
+            var boolArrayColumnBase = new ColumnBase<ColumnMappingBase>("BoolArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolArray", boolArrayColumnBase);
+            var boolToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToStringConverterProperty", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToStringConverterProperty", boolToStringConverterPropertyColumnBase);
+            var boolToTwoValuesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToTwoValuesConverterProperty", "tinyint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToTwoValuesConverterProperty", boolToTwoValuesConverterPropertyColumnBase);
+            var boolToZeroOneConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BoolToZeroOneConverterProperty", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BoolToZeroOneConverterProperty", boolToZeroOneConverterPropertyColumnBase);
+            var bytesColumnBase = new ColumnBase<ColumnMappingBase>("Bytes", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Bytes", bytesColumnBase);
+            var bytesArrayColumnBase = new ColumnBase<ColumnMappingBase>("BytesArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BytesArray", bytesArrayColumnBase);
+            var bytesToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("BytesToStringConverterProperty", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("BytesToStringConverterProperty", bytesToStringConverterPropertyColumnBase);
+            var castingConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("CastingConverterProperty", "decimal(65,30)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CastingConverterProperty", castingConverterPropertyColumnBase);
+            var charColumnBase = new ColumnBase<ColumnMappingBase>("Char", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Char", charColumnBase);
+            var charArrayColumnBase = new ColumnBase<ColumnMappingBase>("CharArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharArray", charArrayColumnBase);
+            var charToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("CharToStringConverterProperty", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumnBase);
+            var dateOnlyColumnBase = new ColumnBase<ColumnMappingBase>("DateOnly", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnly", dateOnlyColumnBase);
+            var dateOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("DateOnlyArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnlyArray", dateOnlyArrayColumnBase);
+            var dateOnlyToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateOnlyToStringConverterProperty", "varchar(10)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnlyToStringConverterProperty", dateOnlyToStringConverterPropertyColumnBase);
+            var dateTimeColumnBase = new ColumnBase<ColumnMappingBase>("DateTime", "datetime(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTime", dateTimeColumnBase);
+            var dateTimeArrayColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeArray", dateTimeArrayColumnBase);
+            var dateTimeOffsetToBinaryConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToBinaryConverterProperty", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToBinaryConverterProperty", dateTimeOffsetToBinaryConverterPropertyColumnBase);
+            var dateTimeOffsetToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToBytesConverterProperty", "varbinary(12)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToBytesConverterProperty", dateTimeOffsetToBytesConverterPropertyColumnBase);
+            var dateTimeOffsetToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeOffsetToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeOffsetToStringConverterProperty", dateTimeOffsetToStringConverterPropertyColumnBase);
+            var dateTimeToBinaryConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToBinaryConverterProperty", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToBinaryConverterProperty", dateTimeToBinaryConverterPropertyColumnBase);
+            var dateTimeToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToStringConverterProperty", dateTimeToStringConverterPropertyColumnBase);
+            var dateTimeToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DateTimeToTicksConverterProperty", "datetime(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateTimeToTicksConverterProperty", dateTimeToTicksConverterPropertyColumnBase);
+            var decimalColumnBase = new ColumnBase<ColumnMappingBase>("Decimal", "decimal(65,30)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Decimal", decimalColumnBase);
+            var decimalArrayColumnBase = new ColumnBase<ColumnMappingBase>("DecimalArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalArray", decimalArrayColumnBase);
+            var decimalNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DecimalNumberToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalNumberToBytesConverterProperty", decimalNumberToBytesConverterPropertyColumnBase);
+            var decimalNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DecimalNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DecimalNumberToStringConverterProperty", decimalNumberToStringConverterPropertyColumnBase);
+            var doubleColumnBase = new ColumnBase<ColumnMappingBase>("Double", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Double", doubleColumnBase);
+            var doubleArrayColumnBase = new ColumnBase<ColumnMappingBase>("DoubleArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleArray", doubleArrayColumnBase);
+            var doubleNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DoubleNumberToBytesConverterProperty", "varbinary(8)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleNumberToBytesConverterProperty", doubleNumberToBytesConverterPropertyColumnBase);
+            var doubleNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("DoubleNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DoubleNumberToStringConverterProperty", doubleNumberToStringConverterPropertyColumnBase);
+            var enum16ColumnBase = new ColumnBase<ColumnMappingBase>("Enum16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16", enum16ColumnBase);
+            var enum16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum16Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16Array", enum16ArrayColumnBase);
+            var enum16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsString", enum16AsStringColumnBase);
+            var enum16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsStringArray", enum16AsStringArrayColumnBase);
+            var enum16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum16AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16AsStringCollection", enum16AsStringCollectionColumnBase);
+            var enum16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum16Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum16Collection", enum16CollectionColumnBase);
+            var enum32ColumnBase = new ColumnBase<ColumnMappingBase>("Enum32", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32", enum32ColumnBase);
+            var enum32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum32Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32Array", enum32ArrayColumnBase);
+            var enum32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsString", enum32AsStringColumnBase);
+            var enum32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsStringArray", enum32AsStringArrayColumnBase);
+            var enum32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum32AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32AsStringCollection", enum32AsStringCollectionColumnBase);
+            var enum32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum32Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum32Collection", enum32CollectionColumnBase);
+            var enum64ColumnBase = new ColumnBase<ColumnMappingBase>("Enum64", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64", enum64ColumnBase);
+            var enum64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum64Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64Array", enum64ArrayColumnBase);
+            var enum64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsString", enum64AsStringColumnBase);
+            var enum64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsStringArray", enum64AsStringArrayColumnBase);
+            var enum64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum64AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64AsStringCollection", enum64AsStringCollectionColumnBase);
+            var enum64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum64Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum64Collection", enum64CollectionColumnBase);
+            var enum8ColumnBase = new ColumnBase<ColumnMappingBase>("Enum8", "tinyint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8", enum8ColumnBase);
+            var enum8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum8Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8Array", enum8ArrayColumnBase);
+            var enum8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsString", enum8AsStringColumnBase);
+            var enum8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsStringArray", enum8AsStringArrayColumnBase);
+            var enum8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum8AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8AsStringCollection", enum8AsStringCollectionColumnBase);
+            var enum8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("Enum8Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Enum8Collection", enum8CollectionColumnBase);
+            var enumToNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("EnumToNumberConverterProperty", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumToNumberConverterProperty", enumToNumberConverterPropertyColumnBase);
+            var enumToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("EnumToStringConverterProperty", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumToStringConverterProperty", enumToStringConverterPropertyColumnBase);
+            var enumU16ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16", "smallint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16", enumU16ColumnBase);
+            var enumU16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16Array", enumU16ArrayColumnBase);
+            var enumU16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsString", enumU16AsStringColumnBase);
+            var enumU16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsStringArray", enumU16AsStringArrayColumnBase);
+            var enumU16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16AsStringCollection", enumU16AsStringCollectionColumnBase);
+            var enumU16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU16Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU16Collection", enumU16CollectionColumnBase);
+            var enumU32ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32", "int unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32", enumU32ColumnBase);
+            var enumU32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32Array", enumU32ArrayColumnBase);
+            var enumU32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsString", enumU32AsStringColumnBase);
+            var enumU32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsStringArray", enumU32AsStringArrayColumnBase);
+            var enumU32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32AsStringCollection", enumU32AsStringCollectionColumnBase);
+            var enumU32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU32Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU32Collection", enumU32CollectionColumnBase);
+            var enumU64ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64", "bigint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64", enumU64ColumnBase);
+            var enumU64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64Array", enumU64ArrayColumnBase);
+            var enumU64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsString", enumU64AsStringColumnBase);
+            var enumU64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsStringArray", enumU64AsStringArrayColumnBase);
+            var enumU64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64AsStringCollection", enumU64AsStringCollectionColumnBase);
+            var enumU64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU64Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU64Collection", enumU64CollectionColumnBase);
+            var enumU8ColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8", "tinyint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8", enumU8ColumnBase);
+            var enumU8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8Array", enumU8ArrayColumnBase);
+            var enumU8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsString", enumU8AsStringColumnBase);
+            var enumU8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsStringArray", enumU8AsStringArrayColumnBase);
+            var enumU8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8AsStringCollection", enumU8AsStringCollectionColumnBase);
+            var enumU8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("EnumU8Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("EnumU8Collection", enumU8CollectionColumnBase);
+            var floatColumnBase = new ColumnBase<ColumnMappingBase>("Float", "float", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Float", floatColumnBase);
+            var floatArrayColumnBase = new ColumnBase<ColumnMappingBase>("FloatArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("FloatArray", floatArrayColumnBase);
+            var guidColumnBase = new ColumnBase<ColumnMappingBase>("Guid", "char(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Guid", guidColumnBase);
+            var guidArrayColumnBase = new ColumnBase<ColumnMappingBase>("GuidArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidArray", guidArrayColumnBase);
+            var guidToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("GuidToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidToBytesConverterProperty", guidToBytesConverterPropertyColumnBase);
+            var guidToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("GuidToStringConverterProperty", "varchar(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("GuidToStringConverterProperty", guidToStringConverterPropertyColumnBase);
+            var iPAddressColumnBase = new ColumnBase<ColumnMappingBase>("IPAddress", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddress", iPAddressColumnBase);
+            var iPAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressArray", iPAddressArrayColumnBase);
+            var iPAddressToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressToBytesConverterProperty", "varbinary(16)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressToBytesConverterProperty", iPAddressToBytesConverterPropertyColumnBase);
+            var iPAddressToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IPAddressToStringConverterProperty", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IPAddressToStringConverterProperty", iPAddressToStringConverterPropertyColumnBase);
+            var idColumnBase1 = new ColumnBase<ColumnMappingBase>("Id", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Id", idColumnBase1);
+            var int16ColumnBase = new ColumnBase<ColumnMappingBase>("Int16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int16", int16ColumnBase);
+            var int16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int16Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int16Array", int16ArrayColumnBase);
+            var int32ColumnBase = new ColumnBase<ColumnMappingBase>("Int32", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int32", int32ColumnBase);
+            var int32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int32Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int32Array", int32ArrayColumnBase);
+            var int64ColumnBase = new ColumnBase<ColumnMappingBase>("Int64", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int64", int64ColumnBase);
+            var int64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int64Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int64Array", int64ArrayColumnBase);
+            var int8ColumnBase = new ColumnBase<ColumnMappingBase>("Int8", "tinyint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int8", int8ColumnBase);
+            var int8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("Int8Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Int8Array", int8ArrayColumnBase);
+            var intNumberToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IntNumberToBytesConverterProperty", "varbinary(4)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IntNumberToBytesConverterProperty", intNumberToBytesConverterPropertyColumnBase);
+            var intNumberToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("IntNumberToStringConverterProperty", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("IntNumberToStringConverterProperty", intNumberToStringConverterPropertyColumnBase);
+            var nullIntToNullStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("NullIntToNullStringConverterProperty", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullIntToNullStringConverterProperty", nullIntToNullStringConverterPropertyColumnBase);
+            var nullableBoolColumnBase = new ColumnBase<ColumnMappingBase>("NullableBool", "tinyint(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBool", nullableBoolColumnBase);
+            var nullableBoolArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableBoolArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBoolArray", nullableBoolArrayColumnBase);
+            var nullableBytesColumnBase = new ColumnBase<ColumnMappingBase>("NullableBytes", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBytes", nullableBytesColumnBase);
+            var nullableBytesArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableBytesArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableBytesArray", nullableBytesArrayColumnBase);
+            var nullableCharColumnBase = new ColumnBase<ColumnMappingBase>("NullableChar", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableChar", nullableCharColumnBase);
+            var nullableCharArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableCharArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableCharArray", nullableCharArrayColumnBase);
+            var nullableDateOnlyColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateOnly", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateOnly", nullableDateOnlyColumnBase);
+            var nullableDateOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateOnlyArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateOnlyArray", nullableDateOnlyArrayColumnBase);
+            var nullableDateTimeColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateTime", "datetime(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateTime", nullableDateTimeColumnBase);
+            var nullableDateTimeArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDateTimeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDateTimeArray", nullableDateTimeArrayColumnBase);
+            var nullableDecimalColumnBase = new ColumnBase<ColumnMappingBase>("NullableDecimal", "decimal(65,30)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDecimal", nullableDecimalColumnBase);
+            var nullableDecimalArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDecimalArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDecimalArray", nullableDecimalArrayColumnBase);
+            var nullableDoubleColumnBase = new ColumnBase<ColumnMappingBase>("NullableDouble", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDouble", nullableDoubleColumnBase);
+            var nullableDoubleArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableDoubleArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableDoubleArray", nullableDoubleArrayColumnBase);
+            var nullableEnum16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16", nullableEnum16ColumnBase);
+            var nullableEnum16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16Array", nullableEnum16ArrayColumnBase);
+            var nullableEnum16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsString", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsString", nullableEnum16AsStringColumnBase);
+            var nullableEnum16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsStringArray", nullableEnum16AsStringArrayColumnBase);
+            var nullableEnum16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16AsStringCollection", nullableEnum16AsStringCollectionColumnBase);
+            var nullableEnum16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum16Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum16Collection", nullableEnum16CollectionColumnBase);
+            var nullableEnum32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32", nullableEnum32ColumnBase);
+            var nullableEnum32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32Array", nullableEnum32ArrayColumnBase);
+            var nullableEnum32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsString", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsString", nullableEnum32AsStringColumnBase);
+            var nullableEnum32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsStringArray", nullableEnum32AsStringArrayColumnBase);
+            var nullableEnum32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32AsStringCollection", nullableEnum32AsStringCollectionColumnBase);
+            var nullableEnum32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum32Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum32Collection", nullableEnum32CollectionColumnBase);
+            var nullableEnum64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64", nullableEnum64ColumnBase);
+            var nullableEnum64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64Array", nullableEnum64ArrayColumnBase);
+            var nullableEnum64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsString", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsString", nullableEnum64AsStringColumnBase);
+            var nullableEnum64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsStringArray", nullableEnum64AsStringArrayColumnBase);
+            var nullableEnum64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64AsStringCollection", nullableEnum64AsStringCollectionColumnBase);
+            var nullableEnum64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum64Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum64Collection", nullableEnum64CollectionColumnBase);
+            var nullableEnum8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8", "tinyint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8", nullableEnum8ColumnBase);
+            var nullableEnum8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8Array", nullableEnum8ArrayColumnBase);
+            var nullableEnum8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsString", "tinyint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsString", nullableEnum8AsStringColumnBase);
+            var nullableEnum8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsStringArray", nullableEnum8AsStringArrayColumnBase);
+            var nullableEnum8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8AsStringCollection", nullableEnum8AsStringCollectionColumnBase);
+            var nullableEnum8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnum8Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnum8Collection", nullableEnum8CollectionColumnBase);
+            var nullableEnumU16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16", "smallint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16", nullableEnumU16ColumnBase);
+            var nullableEnumU16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16Array", nullableEnumU16ArrayColumnBase);
+            var nullableEnumU16AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsString", "smallint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsString", nullableEnumU16AsStringColumnBase);
+            var nullableEnumU16AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsStringArray", nullableEnumU16AsStringArrayColumnBase);
+            var nullableEnumU16AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16AsStringCollection", nullableEnumU16AsStringCollectionColumnBase);
+            var nullableEnumU16CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU16Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU16Collection", nullableEnumU16CollectionColumnBase);
+            var nullableEnumU32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32", "int unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32", nullableEnumU32ColumnBase);
+            var nullableEnumU32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32Array", nullableEnumU32ArrayColumnBase);
+            var nullableEnumU32AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsString", "int unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsString", nullableEnumU32AsStringColumnBase);
+            var nullableEnumU32AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsStringArray", nullableEnumU32AsStringArrayColumnBase);
+            var nullableEnumU32AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32AsStringCollection", nullableEnumU32AsStringCollectionColumnBase);
+            var nullableEnumU32CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU32Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU32Collection", nullableEnumU32CollectionColumnBase);
+            var nullableEnumU64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64", "bigint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64", nullableEnumU64ColumnBase);
+            var nullableEnumU64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64Array", nullableEnumU64ArrayColumnBase);
+            var nullableEnumU64AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsString", "bigint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsString", nullableEnumU64AsStringColumnBase);
+            var nullableEnumU64AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsStringArray", nullableEnumU64AsStringArrayColumnBase);
+            var nullableEnumU64AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64AsStringCollection", nullableEnumU64AsStringCollectionColumnBase);
+            var nullableEnumU64CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU64Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU64Collection", nullableEnumU64CollectionColumnBase);
+            var nullableEnumU8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8", "tinyint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8", nullableEnumU8ColumnBase);
+            var nullableEnumU8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8Array", nullableEnumU8ArrayColumnBase);
+            var nullableEnumU8AsStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsString", "tinyint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsString", nullableEnumU8AsStringColumnBase);
+            var nullableEnumU8AsStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsStringArray", nullableEnumU8AsStringArrayColumnBase);
+            var nullableEnumU8AsStringCollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8AsStringCollection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8AsStringCollection", nullableEnumU8AsStringCollectionColumnBase);
+            var nullableEnumU8CollectionColumnBase = new ColumnBase<ColumnMappingBase>("NullableEnumU8Collection", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableEnumU8Collection", nullableEnumU8CollectionColumnBase);
+            var nullableFloatColumnBase = new ColumnBase<ColumnMappingBase>("NullableFloat", "float", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableFloat", nullableFloatColumnBase);
+            var nullableFloatArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableFloatArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableFloatArray", nullableFloatArrayColumnBase);
+            var nullableGuidColumnBase = new ColumnBase<ColumnMappingBase>("NullableGuid", "char(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableGuid", nullableGuidColumnBase);
+            var nullableGuidArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableGuidArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableGuidArray", nullableGuidArrayColumnBase);
+            var nullableIPAddressColumnBase = new ColumnBase<ColumnMappingBase>("NullableIPAddress", "varchar(45)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableIPAddress", nullableIPAddressColumnBase);
+            var nullableIPAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableIPAddressArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableIPAddressArray", nullableIPAddressArrayColumnBase);
+            var nullableInt16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt16", "smallint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt16", nullableInt16ColumnBase);
+            var nullableInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt16Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt16Array", nullableInt16ArrayColumnBase);
+            var nullableInt32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt32", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt32", nullableInt32ColumnBase);
+            var nullableInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt32Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt32Array", nullableInt32ArrayColumnBase);
+            var nullableInt64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt64", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt64", nullableInt64ColumnBase);
+            var nullableInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt64Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt64Array", nullableInt64ArrayColumnBase);
+            var nullableInt8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt8", "tinyint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt8", nullableInt8ColumnBase);
+            var nullableInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableInt8Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableInt8Array", nullableInt8ArrayColumnBase);
+            var nullablePhysicalAddressColumnBase = new ColumnBase<ColumnMappingBase>("NullablePhysicalAddress", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullablePhysicalAddress", nullablePhysicalAddressColumnBase);
+            var nullablePhysicalAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullablePhysicalAddressArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullablePhysicalAddressArray", nullablePhysicalAddressArrayColumnBase);
+            var nullableStringColumnBase = new ColumnBase<ColumnMappingBase>("NullableString", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableString", nullableStringColumnBase);
+            var nullableStringArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableStringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableStringArray", nullableStringArrayColumnBase);
+            var nullableTimeOnlyColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeOnly", "time(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeOnly", nullableTimeOnlyColumnBase);
+            var nullableTimeOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeOnlyArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeOnlyArray", nullableTimeOnlyArrayColumnBase);
+            var nullableTimeSpanColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeSpan", "time(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeSpan", nullableTimeSpanColumnBase);
+            var nullableTimeSpanArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableTimeSpanArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableTimeSpanArray", nullableTimeSpanArrayColumnBase);
+            var nullableUInt16ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt16", "smallint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt16", nullableUInt16ColumnBase);
+            var nullableUInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt16Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt16Array", nullableUInt16ArrayColumnBase);
+            var nullableUInt32ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt32", "int unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt32", nullableUInt32ColumnBase);
+            var nullableUInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt32Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt32Array", nullableUInt32ArrayColumnBase);
+            var nullableUInt64ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt64", "bigint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt64", nullableUInt64ColumnBase);
+            var nullableUInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt64Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt64Array", nullableUInt64ArrayColumnBase);
+            var nullableUInt8ColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt8", "tinyint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt8", nullableUInt8ColumnBase);
+            var nullableUInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUInt8Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUInt8Array", nullableUInt8ArrayColumnBase);
+            var nullableUriColumnBase = new ColumnBase<ColumnMappingBase>("NullableUri", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUri", nullableUriColumnBase);
+            var nullableUriArrayColumnBase = new ColumnBase<ColumnMappingBase>("NullableUriArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("NullableUriArray", nullableUriArrayColumnBase);
+            var physicalAddressColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddress", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddress", physicalAddressColumnBase);
+            var physicalAddressArrayColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressArray", physicalAddressArrayColumnBase);
+            var physicalAddressToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressToBytesConverterProperty", "varbinary(8)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressToBytesConverterProperty", physicalAddressToBytesConverterPropertyColumnBase);
+            var physicalAddressToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("PhysicalAddressToStringConverterProperty", "varchar(20)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("PhysicalAddressToStringConverterProperty", physicalAddressToStringConverterPropertyColumnBase);
+            var stringColumnBase = new ColumnBase<ColumnMappingBase>("String", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("String", stringColumnBase);
+            var stringArrayColumnBase = new ColumnBase<ColumnMappingBase>("StringArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringArray", stringArrayColumnBase);
+            var stringToBoolConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToBoolConverterProperty", "tinyint(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToBoolConverterProperty", stringToBoolConverterPropertyColumnBase);
+            var stringToBytesConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToBytesConverterProperty", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToBytesConverterProperty", stringToBytesConverterPropertyColumnBase);
+            var stringToCharConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToCharConverterProperty", "varchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToCharConverterProperty", stringToCharConverterPropertyColumnBase);
+            var stringToDateOnlyConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateOnlyConverterProperty", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateOnlyConverterProperty", stringToDateOnlyConverterPropertyColumnBase);
+            var stringToDateTimeConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateTimeConverterProperty", "datetime(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateTimeConverterProperty", stringToDateTimeConverterPropertyColumnBase);
+            var stringToDateTimeOffsetConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDateTimeOffsetConverterProperty", "datetime(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDateTimeOffsetConverterProperty", stringToDateTimeOffsetConverterPropertyColumnBase);
+            var stringToDecimalNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDecimalNumberConverterProperty", "decimal(65,30)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDecimalNumberConverterProperty", stringToDecimalNumberConverterPropertyColumnBase);
+            var stringToDoubleNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToDoubleNumberConverterProperty", "double", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToDoubleNumberConverterProperty", stringToDoubleNumberConverterPropertyColumnBase);
+            var stringToEnumConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToEnumConverterProperty", "int unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToEnumConverterProperty", stringToEnumConverterPropertyColumnBase);
+            var stringToGuidConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToGuidConverterProperty", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToGuidConverterProperty", stringToGuidConverterPropertyColumnBase);
+            var stringToIntNumberConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToIntNumberConverterProperty", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToIntNumberConverterProperty", stringToIntNumberConverterPropertyColumnBase);
+            var stringToTimeOnlyConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToTimeOnlyConverterProperty", "time(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToTimeOnlyConverterProperty", stringToTimeOnlyConverterPropertyColumnBase);
+            var stringToTimeSpanConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToTimeSpanConverterProperty", "time(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToTimeSpanConverterProperty", stringToTimeSpanConverterPropertyColumnBase);
+            var stringToUriConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("StringToUriConverterProperty", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("StringToUriConverterProperty", stringToUriConverterPropertyColumnBase);
+            var timeOnlyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnly", "time(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnly", timeOnlyColumnBase);
+            var timeOnlyArrayColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyArray", timeOnlyArrayColumnBase);
+            var timeOnlyToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyToStringConverterProperty", timeOnlyToStringConverterPropertyColumnBase);
+            var timeOnlyToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeOnlyToTicksConverterProperty", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeOnlyToTicksConverterProperty", timeOnlyToTicksConverterPropertyColumnBase);
+            var timeSpanColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpan", "time(6)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpan", timeSpanColumnBase);
+            var timeSpanArrayColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanArray", timeSpanArrayColumnBase);
+            var timeSpanToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanToStringConverterProperty", "varchar(48)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanToStringConverterProperty", timeSpanToStringConverterPropertyColumnBase);
+            var timeSpanToTicksConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("TimeSpanToTicksConverterProperty", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("TimeSpanToTicksConverterProperty", timeSpanToTicksConverterPropertyColumnBase);
+            var uInt16ColumnBase = new ColumnBase<ColumnMappingBase>("UInt16", "smallint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt16", uInt16ColumnBase);
+            var uInt16ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt16Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt16Array", uInt16ArrayColumnBase);
+            var uInt32ColumnBase = new ColumnBase<ColumnMappingBase>("UInt32", "int unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt32", uInt32ColumnBase);
+            var uInt32ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt32Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt32Array", uInt32ArrayColumnBase);
+            var uInt64ColumnBase = new ColumnBase<ColumnMappingBase>("UInt64", "bigint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt64", uInt64ColumnBase);
+            var uInt64ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt64Array", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt64Array", uInt64ArrayColumnBase);
+            var uInt8ColumnBase = new ColumnBase<ColumnMappingBase>("UInt8", "tinyint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt8", uInt8ColumnBase);
+            var uInt8ArrayColumnBase = new ColumnBase<ColumnMappingBase>("UInt8Array", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UInt8Array", uInt8ArrayColumnBase);
+            var uriColumnBase = new ColumnBase<ColumnMappingBase>("Uri", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Uri", uriColumnBase);
+            var uriArrayColumnBase = new ColumnBase<ColumnMappingBase>("UriArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UriArray", uriArrayColumnBase);
+            var uriToStringConverterPropertyColumnBase = new ColumnBase<ColumnMappingBase>("UriToStringConverterProperty", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("UriToStringConverterProperty", uriToStringConverterPropertyColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase = new TableMappingBase<ColumnMappingBase>(manyTypes, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase, false);
+            defaultTableMappings2.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase1, manyTypes.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolColumnBase, manyTypes.FindProperty("Bool")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolArrayColumnBase, manyTypes.FindProperty("BoolArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToStringConverterPropertyColumnBase, manyTypes.FindProperty("BoolToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToTwoValuesConverterPropertyColumnBase, manyTypes.FindProperty("BoolToTwoValuesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)boolToZeroOneConverterPropertyColumnBase, manyTypes.FindProperty("BoolToZeroOneConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesColumnBase, manyTypes.FindProperty("Bytes")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesArrayColumnBase, manyTypes.FindProperty("BytesArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)bytesToStringConverterPropertyColumnBase, manyTypes.FindProperty("BytesToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)castingConverterPropertyColumnBase, manyTypes.FindProperty("CastingConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charColumnBase, manyTypes.FindProperty("Char")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charArrayColumnBase, manyTypes.FindProperty("CharArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)charToStringConverterPropertyColumnBase, manyTypes.FindProperty("CharToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyColumnBase, manyTypes.FindProperty("DateOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyArrayColumnBase, manyTypes.FindProperty("DateOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateOnlyToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateOnlyToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeColumnBase, manyTypes.FindProperty("DateTime")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeArrayColumnBase, manyTypes.FindProperty("DateTimeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToBinaryConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToBinaryConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeOffsetToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeOffsetToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToBinaryConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToBinaryConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToStringConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)dateTimeToTicksConverterPropertyColumnBase, manyTypes.FindProperty("DateTimeToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalColumnBase, manyTypes.FindProperty("Decimal")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalArrayColumnBase, manyTypes.FindProperty("DecimalArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DecimalNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)decimalNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("DecimalNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleColumnBase, manyTypes.FindProperty("Double")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleArrayColumnBase, manyTypes.FindProperty("DoubleArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("DoubleNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)doubleNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("DoubleNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16ColumnBase, manyTypes.FindProperty("Enum16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16ArrayColumnBase, manyTypes.FindProperty("Enum16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringColumnBase, manyTypes.FindProperty("Enum16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringArrayColumnBase, manyTypes.FindProperty("Enum16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16AsStringCollectionColumnBase, manyTypes.FindProperty("Enum16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum16CollectionColumnBase, manyTypes.FindProperty("Enum16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32ColumnBase, manyTypes.FindProperty("Enum32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32ArrayColumnBase, manyTypes.FindProperty("Enum32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringColumnBase, manyTypes.FindProperty("Enum32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringArrayColumnBase, manyTypes.FindProperty("Enum32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32AsStringCollectionColumnBase, manyTypes.FindProperty("Enum32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum32CollectionColumnBase, manyTypes.FindProperty("Enum32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64ColumnBase, manyTypes.FindProperty("Enum64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64ArrayColumnBase, manyTypes.FindProperty("Enum64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringColumnBase, manyTypes.FindProperty("Enum64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringArrayColumnBase, manyTypes.FindProperty("Enum64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64AsStringCollectionColumnBase, manyTypes.FindProperty("Enum64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum64CollectionColumnBase, manyTypes.FindProperty("Enum64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8ColumnBase, manyTypes.FindProperty("Enum8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8ArrayColumnBase, manyTypes.FindProperty("Enum8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringColumnBase, manyTypes.FindProperty("Enum8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringArrayColumnBase, manyTypes.FindProperty("Enum8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8AsStringCollectionColumnBase, manyTypes.FindProperty("Enum8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum8CollectionColumnBase, manyTypes.FindProperty("Enum8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumToNumberConverterPropertyColumnBase, manyTypes.FindProperty("EnumToNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumToStringConverterPropertyColumnBase, manyTypes.FindProperty("EnumToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16ColumnBase, manyTypes.FindProperty("EnumU16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16ArrayColumnBase, manyTypes.FindProperty("EnumU16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringColumnBase, manyTypes.FindProperty("EnumU16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringArrayColumnBase, manyTypes.FindProperty("EnumU16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU16CollectionColumnBase, manyTypes.FindProperty("EnumU16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32ColumnBase, manyTypes.FindProperty("EnumU32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32ArrayColumnBase, manyTypes.FindProperty("EnumU32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringColumnBase, manyTypes.FindProperty("EnumU32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringArrayColumnBase, manyTypes.FindProperty("EnumU32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU32CollectionColumnBase, manyTypes.FindProperty("EnumU32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64ColumnBase, manyTypes.FindProperty("EnumU64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64ArrayColumnBase, manyTypes.FindProperty("EnumU64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringColumnBase, manyTypes.FindProperty("EnumU64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringArrayColumnBase, manyTypes.FindProperty("EnumU64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU64CollectionColumnBase, manyTypes.FindProperty("EnumU64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8ColumnBase, manyTypes.FindProperty("EnumU8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8ArrayColumnBase, manyTypes.FindProperty("EnumU8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringColumnBase, manyTypes.FindProperty("EnumU8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringArrayColumnBase, manyTypes.FindProperty("EnumU8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8AsStringCollectionColumnBase, manyTypes.FindProperty("EnumU8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enumU8CollectionColumnBase, manyTypes.FindProperty("EnumU8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)floatColumnBase, manyTypes.FindProperty("Float")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)floatArrayColumnBase, manyTypes.FindProperty("FloatArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidColumnBase, manyTypes.FindProperty("Guid")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidArrayColumnBase, manyTypes.FindProperty("GuidArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidToBytesConverterPropertyColumnBase, manyTypes.FindProperty("GuidToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)guidToStringConverterPropertyColumnBase, manyTypes.FindProperty("GuidToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressColumnBase, manyTypes.FindProperty("IPAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressArrayColumnBase, manyTypes.FindProperty("IPAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressToBytesConverterPropertyColumnBase, manyTypes.FindProperty("IPAddressToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)iPAddressToStringConverterPropertyColumnBase, manyTypes.FindProperty("IPAddressToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int16ColumnBase, manyTypes.FindProperty("Int16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int16ArrayColumnBase, manyTypes.FindProperty("Int16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int32ColumnBase, manyTypes.FindProperty("Int32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int32ArrayColumnBase, manyTypes.FindProperty("Int32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int64ColumnBase, manyTypes.FindProperty("Int64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int64ArrayColumnBase, manyTypes.FindProperty("Int64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int8ColumnBase, manyTypes.FindProperty("Int8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)int8ArrayColumnBase, manyTypes.FindProperty("Int8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)intNumberToBytesConverterPropertyColumnBase, manyTypes.FindProperty("IntNumberToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)intNumberToStringConverterPropertyColumnBase, manyTypes.FindProperty("IntNumberToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullIntToNullStringConverterPropertyColumnBase, manyTypes.FindProperty("NullIntToNullStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBoolColumnBase, manyTypes.FindProperty("NullableBool")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBoolArrayColumnBase, manyTypes.FindProperty("NullableBoolArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBytesColumnBase, manyTypes.FindProperty("NullableBytes")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableBytesArrayColumnBase, manyTypes.FindProperty("NullableBytesArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableCharColumnBase, manyTypes.FindProperty("NullableChar")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableCharArrayColumnBase, manyTypes.FindProperty("NullableCharArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateOnlyColumnBase, manyTypes.FindProperty("NullableDateOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateOnlyArrayColumnBase, manyTypes.FindProperty("NullableDateOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateTimeColumnBase, manyTypes.FindProperty("NullableDateTime")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDateTimeArrayColumnBase, manyTypes.FindProperty("NullableDateTimeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDecimalColumnBase, manyTypes.FindProperty("NullableDecimal")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDecimalArrayColumnBase, manyTypes.FindProperty("NullableDecimalArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDoubleColumnBase, manyTypes.FindProperty("NullableDouble")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableDoubleArrayColumnBase, manyTypes.FindProperty("NullableDoubleArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16ColumnBase, manyTypes.FindProperty("NullableEnum16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16ArrayColumnBase, manyTypes.FindProperty("NullableEnum16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringColumnBase, manyTypes.FindProperty("NullableEnum16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum16CollectionColumnBase, manyTypes.FindProperty("NullableEnum16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32ColumnBase, manyTypes.FindProperty("NullableEnum32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32ArrayColumnBase, manyTypes.FindProperty("NullableEnum32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringColumnBase, manyTypes.FindProperty("NullableEnum32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum32CollectionColumnBase, manyTypes.FindProperty("NullableEnum32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64ColumnBase, manyTypes.FindProperty("NullableEnum64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64ArrayColumnBase, manyTypes.FindProperty("NullableEnum64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringColumnBase, manyTypes.FindProperty("NullableEnum64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum64CollectionColumnBase, manyTypes.FindProperty("NullableEnum64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8ColumnBase, manyTypes.FindProperty("NullableEnum8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8ArrayColumnBase, manyTypes.FindProperty("NullableEnum8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringColumnBase, manyTypes.FindProperty("NullableEnum8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnum8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnum8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnum8CollectionColumnBase, manyTypes.FindProperty("NullableEnum8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16ColumnBase, manyTypes.FindProperty("NullableEnumU16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16ArrayColumnBase, manyTypes.FindProperty("NullableEnumU16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringColumnBase, manyTypes.FindProperty("NullableEnumU16AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU16AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU16AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU16CollectionColumnBase, manyTypes.FindProperty("NullableEnumU16Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32ColumnBase, manyTypes.FindProperty("NullableEnumU32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32ArrayColumnBase, manyTypes.FindProperty("NullableEnumU32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringColumnBase, manyTypes.FindProperty("NullableEnumU32AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU32AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU32AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU32CollectionColumnBase, manyTypes.FindProperty("NullableEnumU32Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64ColumnBase, manyTypes.FindProperty("NullableEnumU64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64ArrayColumnBase, manyTypes.FindProperty("NullableEnumU64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringColumnBase, manyTypes.FindProperty("NullableEnumU64AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU64AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU64AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU64CollectionColumnBase, manyTypes.FindProperty("NullableEnumU64Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8ColumnBase, manyTypes.FindProperty("NullableEnumU8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8ArrayColumnBase, manyTypes.FindProperty("NullableEnumU8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringColumnBase, manyTypes.FindProperty("NullableEnumU8AsString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringArrayColumnBase, manyTypes.FindProperty("NullableEnumU8AsStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8AsStringCollectionColumnBase, manyTypes.FindProperty("NullableEnumU8AsStringCollection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableEnumU8CollectionColumnBase, manyTypes.FindProperty("NullableEnumU8Collection")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableFloatColumnBase, manyTypes.FindProperty("NullableFloat")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableFloatArrayColumnBase, manyTypes.FindProperty("NullableFloatArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableGuidColumnBase, manyTypes.FindProperty("NullableGuid")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableGuidArrayColumnBase, manyTypes.FindProperty("NullableGuidArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableIPAddressColumnBase, manyTypes.FindProperty("NullableIPAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableIPAddressArrayColumnBase, manyTypes.FindProperty("NullableIPAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt16ColumnBase, manyTypes.FindProperty("NullableInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt16ArrayColumnBase, manyTypes.FindProperty("NullableInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt32ColumnBase, manyTypes.FindProperty("NullableInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt32ArrayColumnBase, manyTypes.FindProperty("NullableInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt64ColumnBase, manyTypes.FindProperty("NullableInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt64ArrayColumnBase, manyTypes.FindProperty("NullableInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt8ColumnBase, manyTypes.FindProperty("NullableInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableInt8ArrayColumnBase, manyTypes.FindProperty("NullableInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullablePhysicalAddressColumnBase, manyTypes.FindProperty("NullablePhysicalAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullablePhysicalAddressArrayColumnBase, manyTypes.FindProperty("NullablePhysicalAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableStringColumnBase, manyTypes.FindProperty("NullableString")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableStringArrayColumnBase, manyTypes.FindProperty("NullableStringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeOnlyColumnBase, manyTypes.FindProperty("NullableTimeOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeOnlyArrayColumnBase, manyTypes.FindProperty("NullableTimeOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeSpanColumnBase, manyTypes.FindProperty("NullableTimeSpan")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableTimeSpanArrayColumnBase, manyTypes.FindProperty("NullableTimeSpanArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt16ColumnBase, manyTypes.FindProperty("NullableUInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt16ArrayColumnBase, manyTypes.FindProperty("NullableUInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt32ColumnBase, manyTypes.FindProperty("NullableUInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt32ArrayColumnBase, manyTypes.FindProperty("NullableUInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt64ColumnBase, manyTypes.FindProperty("NullableUInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt64ArrayColumnBase, manyTypes.FindProperty("NullableUInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt8ColumnBase, manyTypes.FindProperty("NullableUInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUInt8ArrayColumnBase, manyTypes.FindProperty("NullableUInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUriColumnBase, manyTypes.FindProperty("NullableUri")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)nullableUriArrayColumnBase, manyTypes.FindProperty("NullableUriArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressColumnBase, manyTypes.FindProperty("PhysicalAddress")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressArrayColumnBase, manyTypes.FindProperty("PhysicalAddressArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressToBytesConverterPropertyColumnBase, manyTypes.FindProperty("PhysicalAddressToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)physicalAddressToStringConverterPropertyColumnBase, manyTypes.FindProperty("PhysicalAddressToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringColumnBase, manyTypes.FindProperty("String")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringArrayColumnBase, manyTypes.FindProperty("StringArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToBoolConverterPropertyColumnBase, manyTypes.FindProperty("StringToBoolConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToBytesConverterPropertyColumnBase, manyTypes.FindProperty("StringToBytesConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToCharConverterPropertyColumnBase, manyTypes.FindProperty("StringToCharConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateOnlyConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateOnlyConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateTimeConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateTimeConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDateTimeOffsetConverterPropertyColumnBase, manyTypes.FindProperty("StringToDateTimeOffsetConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDecimalNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToDecimalNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToDoubleNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToDoubleNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToEnumConverterPropertyColumnBase, manyTypes.FindProperty("StringToEnumConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToGuidConverterPropertyColumnBase, manyTypes.FindProperty("StringToGuidConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToIntNumberConverterPropertyColumnBase, manyTypes.FindProperty("StringToIntNumberConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToTimeOnlyConverterPropertyColumnBase, manyTypes.FindProperty("StringToTimeOnlyConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToTimeSpanConverterPropertyColumnBase, manyTypes.FindProperty("StringToTimeSpanConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringToUriConverterPropertyColumnBase, manyTypes.FindProperty("StringToUriConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyColumnBase, manyTypes.FindProperty("TimeOnly")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyArrayColumnBase, manyTypes.FindProperty("TimeOnlyArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyToStringConverterPropertyColumnBase, manyTypes.FindProperty("TimeOnlyToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeOnlyToTicksConverterPropertyColumnBase, manyTypes.FindProperty("TimeOnlyToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanColumnBase, manyTypes.FindProperty("TimeSpan")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanArrayColumnBase, manyTypes.FindProperty("TimeSpanArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanToStringConverterPropertyColumnBase, manyTypes.FindProperty("TimeSpanToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)timeSpanToTicksConverterPropertyColumnBase, manyTypes.FindProperty("TimeSpanToTicksConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt16ColumnBase, manyTypes.FindProperty("UInt16")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt16ArrayColumnBase, manyTypes.FindProperty("UInt16Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt32ColumnBase, manyTypes.FindProperty("UInt32")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt32ArrayColumnBase, manyTypes.FindProperty("UInt32Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt64ColumnBase, manyTypes.FindProperty("UInt64")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt64ArrayColumnBase, manyTypes.FindProperty("UInt64Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt8ColumnBase, manyTypes.FindProperty("UInt8")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uInt8ArrayColumnBase, manyTypes.FindProperty("UInt8Array")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriColumnBase, manyTypes.FindProperty("Uri")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriArrayColumnBase, manyTypes.FindProperty("UriArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)uriToStringConverterPropertyColumnBase, manyTypes.FindProperty("UriToStringConverterProperty")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesMappingBase);
+
+            var tableMappings2 = new List<TableMapping>();
+            manyTypes.SetRuntimeAnnotation("Relational:TableMappings", tableMappings2);
+            var manyTypesTable = new Table("ManyTypes", null, relationalModel);
+            var idColumn1 = new Column("Id", "int", manyTypesTable);
+            manyTypesTable.Columns.Add("Id", idColumn1);
+            var boolColumn = new Column("Bool", "tinyint(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("Bool", boolColumn);
+            var boolArrayColumn = new Column("BoolArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolArray", boolArrayColumn);
+            var boolToStringConverterPropertyColumn = new Column("BoolToStringConverterProperty", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToStringConverterProperty", boolToStringConverterPropertyColumn);
+            var boolToTwoValuesConverterPropertyColumn = new Column("BoolToTwoValuesConverterProperty", "tinyint unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToTwoValuesConverterProperty", boolToTwoValuesConverterPropertyColumn);
+            var boolToZeroOneConverterPropertyColumn = new Column("BoolToZeroOneConverterProperty", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("BoolToZeroOneConverterProperty", boolToZeroOneConverterPropertyColumn);
+            var bytesColumn = new Column("Bytes", "longblob", manyTypesTable);
+            manyTypesTable.Columns.Add("Bytes", bytesColumn);
+            var bytesArrayColumn = new Column("BytesArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("BytesArray", bytesArrayColumn);
+            var bytesToStringConverterPropertyColumn = new Column("BytesToStringConverterProperty", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("BytesToStringConverterProperty", bytesToStringConverterPropertyColumn);
+            var castingConverterPropertyColumn = new Column("CastingConverterProperty", "decimal(65,30)", manyTypesTable);
+            manyTypesTable.Columns.Add("CastingConverterProperty", castingConverterPropertyColumn);
+            var charColumn = new Column("Char", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("Char", charColumn);
+            var charArrayColumn = new Column("CharArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("CharArray", charArrayColumn);
+            var charToStringConverterPropertyColumn = new Column("CharToStringConverterProperty", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumn);
+            var dateOnlyColumn = new Column("DateOnly", "date", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnly", dateOnlyColumn);
+            var dateOnlyArrayColumn = new Column("DateOnlyArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnlyArray", dateOnlyArrayColumn);
+            var dateOnlyToStringConverterPropertyColumn = new Column("DateOnlyToStringConverterProperty", "varchar(10)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateOnlyToStringConverterProperty", dateOnlyToStringConverterPropertyColumn);
+            var dateTimeColumn = new Column("DateTime", "datetime(6)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTime", dateTimeColumn);
+            var dateTimeArrayColumn = new Column("DateTimeArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeArray", dateTimeArrayColumn);
+            var dateTimeOffsetToBinaryConverterPropertyColumn = new Column("DateTimeOffsetToBinaryConverterProperty", "bigint", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToBinaryConverterProperty", dateTimeOffsetToBinaryConverterPropertyColumn);
+            var dateTimeOffsetToBytesConverterPropertyColumn = new Column("DateTimeOffsetToBytesConverterProperty", "varbinary(12)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToBytesConverterProperty", dateTimeOffsetToBytesConverterPropertyColumn);
+            var dateTimeOffsetToStringConverterPropertyColumn = new Column("DateTimeOffsetToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeOffsetToStringConverterProperty", dateTimeOffsetToStringConverterPropertyColumn);
+            var dateTimeToBinaryConverterPropertyColumn = new Column("DateTimeToBinaryConverterProperty", "bigint", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToBinaryConverterProperty", dateTimeToBinaryConverterPropertyColumn);
+            var dateTimeToStringConverterPropertyColumn = new Column("DateTimeToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToStringConverterProperty", dateTimeToStringConverterPropertyColumn);
+            var dateTimeToTicksConverterPropertyColumn = new Column("DateTimeToTicksConverterProperty", "datetime(6)", manyTypesTable);
+            manyTypesTable.Columns.Add("DateTimeToTicksConverterProperty", dateTimeToTicksConverterPropertyColumn);
+            var decimalColumn = new Column("Decimal", "decimal(65,30)", manyTypesTable);
+            manyTypesTable.Columns.Add("Decimal", decimalColumn);
+            var decimalArrayColumn = new Column("DecimalArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalArray", decimalArrayColumn);
+            var decimalNumberToBytesConverterPropertyColumn = new Column("DecimalNumberToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalNumberToBytesConverterProperty", decimalNumberToBytesConverterPropertyColumn);
+            var decimalNumberToStringConverterPropertyColumn = new Column("DecimalNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("DecimalNumberToStringConverterProperty", decimalNumberToStringConverterPropertyColumn);
+            var doubleColumn = new Column("Double", "double", manyTypesTable);
+            manyTypesTable.Columns.Add("Double", doubleColumn);
+            var doubleArrayColumn = new Column("DoubleArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleArray", doubleArrayColumn);
+            var doubleNumberToBytesConverterPropertyColumn = new Column("DoubleNumberToBytesConverterProperty", "varbinary(8)", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleNumberToBytesConverterProperty", doubleNumberToBytesConverterPropertyColumn);
+            var doubleNumberToStringConverterPropertyColumn = new Column("DoubleNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("DoubleNumberToStringConverterProperty", doubleNumberToStringConverterPropertyColumn);
+            var enum16Column = new Column("Enum16", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16", enum16Column);
+            var enum16ArrayColumn = new Column("Enum16Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16Array", enum16ArrayColumn);
+            var enum16AsStringColumn = new Column("Enum16AsString", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsString", enum16AsStringColumn);
+            var enum16AsStringArrayColumn = new Column("Enum16AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsStringArray", enum16AsStringArrayColumn);
+            var enum16AsStringCollectionColumn = new Column("Enum16AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16AsStringCollection", enum16AsStringCollectionColumn);
+            var enum16CollectionColumn = new Column("Enum16Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum16Collection", enum16CollectionColumn);
+            var enum32Column = new Column("Enum32", "int", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32", enum32Column);
+            var enum32ArrayColumn = new Column("Enum32Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32Array", enum32ArrayColumn);
+            var enum32AsStringColumn = new Column("Enum32AsString", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsString", enum32AsStringColumn);
+            var enum32AsStringArrayColumn = new Column("Enum32AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsStringArray", enum32AsStringArrayColumn);
+            var enum32AsStringCollectionColumn = new Column("Enum32AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32AsStringCollection", enum32AsStringCollectionColumn);
+            var enum32CollectionColumn = new Column("Enum32Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum32Collection", enum32CollectionColumn);
+            var enum64Column = new Column("Enum64", "bigint", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64", enum64Column);
+            var enum64ArrayColumn = new Column("Enum64Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64Array", enum64ArrayColumn);
+            var enum64AsStringColumn = new Column("Enum64AsString", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsString", enum64AsStringColumn);
+            var enum64AsStringArrayColumn = new Column("Enum64AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsStringArray", enum64AsStringArrayColumn);
+            var enum64AsStringCollectionColumn = new Column("Enum64AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64AsStringCollection", enum64AsStringCollectionColumn);
+            var enum64CollectionColumn = new Column("Enum64Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum64Collection", enum64CollectionColumn);
+            var enum8Column = new Column("Enum8", "tinyint", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8", enum8Column);
+            var enum8ArrayColumn = new Column("Enum8Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8Array", enum8ArrayColumn);
+            var enum8AsStringColumn = new Column("Enum8AsString", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsString", enum8AsStringColumn);
+            var enum8AsStringArrayColumn = new Column("Enum8AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsStringArray", enum8AsStringArrayColumn);
+            var enum8AsStringCollectionColumn = new Column("Enum8AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8AsStringCollection", enum8AsStringCollectionColumn);
+            var enum8CollectionColumn = new Column("Enum8Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Enum8Collection", enum8CollectionColumn);
+            var enumToNumberConverterPropertyColumn = new Column("EnumToNumberConverterProperty", "int", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumToNumberConverterProperty", enumToNumberConverterPropertyColumn);
+            var enumToStringConverterPropertyColumn = new Column("EnumToStringConverterProperty", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumToStringConverterProperty", enumToStringConverterPropertyColumn);
+            var enumU16Column = new Column("EnumU16", "smallint unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16", enumU16Column);
+            var enumU16ArrayColumn = new Column("EnumU16Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16Array", enumU16ArrayColumn);
+            var enumU16AsStringColumn = new Column("EnumU16AsString", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsString", enumU16AsStringColumn);
+            var enumU16AsStringArrayColumn = new Column("EnumU16AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsStringArray", enumU16AsStringArrayColumn);
+            var enumU16AsStringCollectionColumn = new Column("EnumU16AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16AsStringCollection", enumU16AsStringCollectionColumn);
+            var enumU16CollectionColumn = new Column("EnumU16Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU16Collection", enumU16CollectionColumn);
+            var enumU32Column = new Column("EnumU32", "int unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32", enumU32Column);
+            var enumU32ArrayColumn = new Column("EnumU32Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32Array", enumU32ArrayColumn);
+            var enumU32AsStringColumn = new Column("EnumU32AsString", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsString", enumU32AsStringColumn);
+            var enumU32AsStringArrayColumn = new Column("EnumU32AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsStringArray", enumU32AsStringArrayColumn);
+            var enumU32AsStringCollectionColumn = new Column("EnumU32AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32AsStringCollection", enumU32AsStringCollectionColumn);
+            var enumU32CollectionColumn = new Column("EnumU32Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU32Collection", enumU32CollectionColumn);
+            var enumU64Column = new Column("EnumU64", "bigint unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64", enumU64Column);
+            var enumU64ArrayColumn = new Column("EnumU64Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64Array", enumU64ArrayColumn);
+            var enumU64AsStringColumn = new Column("EnumU64AsString", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsString", enumU64AsStringColumn);
+            var enumU64AsStringArrayColumn = new Column("EnumU64AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsStringArray", enumU64AsStringArrayColumn);
+            var enumU64AsStringCollectionColumn = new Column("EnumU64AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64AsStringCollection", enumU64AsStringCollectionColumn);
+            var enumU64CollectionColumn = new Column("EnumU64Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU64Collection", enumU64CollectionColumn);
+            var enumU8Column = new Column("EnumU8", "tinyint unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8", enumU8Column);
+            var enumU8ArrayColumn = new Column("EnumU8Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8Array", enumU8ArrayColumn);
+            var enumU8AsStringColumn = new Column("EnumU8AsString", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsString", enumU8AsStringColumn);
+            var enumU8AsStringArrayColumn = new Column("EnumU8AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsStringArray", enumU8AsStringArrayColumn);
+            var enumU8AsStringCollectionColumn = new Column("EnumU8AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8AsStringCollection", enumU8AsStringCollectionColumn);
+            var enumU8CollectionColumn = new Column("EnumU8Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("EnumU8Collection", enumU8CollectionColumn);
+            var floatColumn = new Column("Float", "float", manyTypesTable);
+            manyTypesTable.Columns.Add("Float", floatColumn);
+            var floatArrayColumn = new Column("FloatArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("FloatArray", floatArrayColumn);
+            var guidColumn = new Column("Guid", "char(36)", manyTypesTable);
+            manyTypesTable.Columns.Add("Guid", guidColumn);
+            var guidArrayColumn = new Column("GuidArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidArray", guidArrayColumn);
+            var guidToBytesConverterPropertyColumn = new Column("GuidToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidToBytesConverterProperty", guidToBytesConverterPropertyColumn);
+            var guidToStringConverterPropertyColumn = new Column("GuidToStringConverterProperty", "varchar(36)", manyTypesTable);
+            manyTypesTable.Columns.Add("GuidToStringConverterProperty", guidToStringConverterPropertyColumn);
+            var iPAddressColumn = new Column("IPAddress", "varchar(45)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddress", iPAddressColumn);
+            var iPAddressArrayColumn = new Column("IPAddressArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressArray", iPAddressArrayColumn);
+            var iPAddressToBytesConverterPropertyColumn = new Column("IPAddressToBytesConverterProperty", "varbinary(16)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressToBytesConverterProperty", iPAddressToBytesConverterPropertyColumn);
+            var iPAddressToStringConverterPropertyColumn = new Column("IPAddressToStringConverterProperty", "varchar(45)", manyTypesTable);
+            manyTypesTable.Columns.Add("IPAddressToStringConverterProperty", iPAddressToStringConverterPropertyColumn);
+            var int16Column = new Column("Int16", "smallint", manyTypesTable);
+            manyTypesTable.Columns.Add("Int16", int16Column);
+            var int16ArrayColumn = new Column("Int16Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Int16Array", int16ArrayColumn);
+            var int32Column = new Column("Int32", "int", manyTypesTable);
+            manyTypesTable.Columns.Add("Int32", int32Column);
+            var int32ArrayColumn = new Column("Int32Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Int32Array", int32ArrayColumn);
+            var int64Column = new Column("Int64", "bigint", manyTypesTable);
+            manyTypesTable.Columns.Add("Int64", int64Column);
+            var int64ArrayColumn = new Column("Int64Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Int64Array", int64ArrayColumn);
+            var int8Column = new Column("Int8", "tinyint", manyTypesTable);
+            manyTypesTable.Columns.Add("Int8", int8Column);
+            var int8ArrayColumn = new Column("Int8Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Int8Array", int8ArrayColumn);
+            var intNumberToBytesConverterPropertyColumn = new Column("IntNumberToBytesConverterProperty", "varbinary(4)", manyTypesTable);
+            manyTypesTable.Columns.Add("IntNumberToBytesConverterProperty", intNumberToBytesConverterPropertyColumn);
+            var intNumberToStringConverterPropertyColumn = new Column("IntNumberToStringConverterProperty", "varchar(64)", manyTypesTable);
+            manyTypesTable.Columns.Add("IntNumberToStringConverterProperty", intNumberToStringConverterPropertyColumn);
+            var nullIntToNullStringConverterPropertyColumn = new Column("NullIntToNullStringConverterProperty", "longtext", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullIntToNullStringConverterProperty", nullIntToNullStringConverterPropertyColumn);
+            var nullableBoolColumn = new Column("NullableBool", "tinyint(1)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableBool", nullableBoolColumn);
+            var nullableBoolArrayColumn = new Column("NullableBoolArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableBoolArray", nullableBoolArrayColumn);
+            var nullableBytesColumn = new Column("NullableBytes", "longblob", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableBytes", nullableBytesColumn);
+            var nullableBytesArrayColumn = new Column("NullableBytesArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableBytesArray", nullableBytesArrayColumn);
+            var nullableCharColumn = new Column("NullableChar", "varchar(1)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableChar", nullableCharColumn);
+            var nullableCharArrayColumn = new Column("NullableCharArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableCharArray", nullableCharArrayColumn);
+            var nullableDateOnlyColumn = new Column("NullableDateOnly", "date", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDateOnly", nullableDateOnlyColumn);
+            var nullableDateOnlyArrayColumn = new Column("NullableDateOnlyArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDateOnlyArray", nullableDateOnlyArrayColumn);
+            var nullableDateTimeColumn = new Column("NullableDateTime", "datetime(6)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDateTime", nullableDateTimeColumn);
+            var nullableDateTimeArrayColumn = new Column("NullableDateTimeArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDateTimeArray", nullableDateTimeArrayColumn);
+            var nullableDecimalColumn = new Column("NullableDecimal", "decimal(65,30)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDecimal", nullableDecimalColumn);
+            var nullableDecimalArrayColumn = new Column("NullableDecimalArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDecimalArray", nullableDecimalArrayColumn);
+            var nullableDoubleColumn = new Column("NullableDouble", "double", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableDouble", nullableDoubleColumn);
+            var nullableDoubleArrayColumn = new Column("NullableDoubleArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableDoubleArray", nullableDoubleArrayColumn);
+            var nullableEnum16Column = new Column("NullableEnum16", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum16", nullableEnum16Column);
+            var nullableEnum16ArrayColumn = new Column("NullableEnum16Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16Array", nullableEnum16ArrayColumn);
+            var nullableEnum16AsStringColumn = new Column("NullableEnum16AsString", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum16AsString", nullableEnum16AsStringColumn);
+            var nullableEnum16AsStringArrayColumn = new Column("NullableEnum16AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16AsStringArray", nullableEnum16AsStringArrayColumn);
+            var nullableEnum16AsStringCollectionColumn = new Column("NullableEnum16AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16AsStringCollection", nullableEnum16AsStringCollectionColumn);
+            var nullableEnum16CollectionColumn = new Column("NullableEnum16Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum16Collection", nullableEnum16CollectionColumn);
+            var nullableEnum32Column = new Column("NullableEnum32", "int", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum32", nullableEnum32Column);
+            var nullableEnum32ArrayColumn = new Column("NullableEnum32Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32Array", nullableEnum32ArrayColumn);
+            var nullableEnum32AsStringColumn = new Column("NullableEnum32AsString", "int", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum32AsString", nullableEnum32AsStringColumn);
+            var nullableEnum32AsStringArrayColumn = new Column("NullableEnum32AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32AsStringArray", nullableEnum32AsStringArrayColumn);
+            var nullableEnum32AsStringCollectionColumn = new Column("NullableEnum32AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32AsStringCollection", nullableEnum32AsStringCollectionColumn);
+            var nullableEnum32CollectionColumn = new Column("NullableEnum32Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum32Collection", nullableEnum32CollectionColumn);
+            var nullableEnum64Column = new Column("NullableEnum64", "bigint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum64", nullableEnum64Column);
+            var nullableEnum64ArrayColumn = new Column("NullableEnum64Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64Array", nullableEnum64ArrayColumn);
+            var nullableEnum64AsStringColumn = new Column("NullableEnum64AsString", "bigint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum64AsString", nullableEnum64AsStringColumn);
+            var nullableEnum64AsStringArrayColumn = new Column("NullableEnum64AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64AsStringArray", nullableEnum64AsStringArrayColumn);
+            var nullableEnum64AsStringCollectionColumn = new Column("NullableEnum64AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64AsStringCollection", nullableEnum64AsStringCollectionColumn);
+            var nullableEnum64CollectionColumn = new Column("NullableEnum64Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum64Collection", nullableEnum64CollectionColumn);
+            var nullableEnum8Column = new Column("NullableEnum8", "tinyint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum8", nullableEnum8Column);
+            var nullableEnum8ArrayColumn = new Column("NullableEnum8Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8Array", nullableEnum8ArrayColumn);
+            var nullableEnum8AsStringColumn = new Column("NullableEnum8AsString", "tinyint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnum8AsString", nullableEnum8AsStringColumn);
+            var nullableEnum8AsStringArrayColumn = new Column("NullableEnum8AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8AsStringArray", nullableEnum8AsStringArrayColumn);
+            var nullableEnum8AsStringCollectionColumn = new Column("NullableEnum8AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8AsStringCollection", nullableEnum8AsStringCollectionColumn);
+            var nullableEnum8CollectionColumn = new Column("NullableEnum8Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnum8Collection", nullableEnum8CollectionColumn);
+            var nullableEnumU16Column = new Column("NullableEnumU16", "smallint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU16", nullableEnumU16Column);
+            var nullableEnumU16ArrayColumn = new Column("NullableEnumU16Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16Array", nullableEnumU16ArrayColumn);
+            var nullableEnumU16AsStringColumn = new Column("NullableEnumU16AsString", "smallint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU16AsString", nullableEnumU16AsStringColumn);
+            var nullableEnumU16AsStringArrayColumn = new Column("NullableEnumU16AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16AsStringArray", nullableEnumU16AsStringArrayColumn);
+            var nullableEnumU16AsStringCollectionColumn = new Column("NullableEnumU16AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16AsStringCollection", nullableEnumU16AsStringCollectionColumn);
+            var nullableEnumU16CollectionColumn = new Column("NullableEnumU16Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU16Collection", nullableEnumU16CollectionColumn);
+            var nullableEnumU32Column = new Column("NullableEnumU32", "int unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU32", nullableEnumU32Column);
+            var nullableEnumU32ArrayColumn = new Column("NullableEnumU32Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32Array", nullableEnumU32ArrayColumn);
+            var nullableEnumU32AsStringColumn = new Column("NullableEnumU32AsString", "int unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU32AsString", nullableEnumU32AsStringColumn);
+            var nullableEnumU32AsStringArrayColumn = new Column("NullableEnumU32AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32AsStringArray", nullableEnumU32AsStringArrayColumn);
+            var nullableEnumU32AsStringCollectionColumn = new Column("NullableEnumU32AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32AsStringCollection", nullableEnumU32AsStringCollectionColumn);
+            var nullableEnumU32CollectionColumn = new Column("NullableEnumU32Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU32Collection", nullableEnumU32CollectionColumn);
+            var nullableEnumU64Column = new Column("NullableEnumU64", "bigint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU64", nullableEnumU64Column);
+            var nullableEnumU64ArrayColumn = new Column("NullableEnumU64Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64Array", nullableEnumU64ArrayColumn);
+            var nullableEnumU64AsStringColumn = new Column("NullableEnumU64AsString", "bigint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU64AsString", nullableEnumU64AsStringColumn);
+            var nullableEnumU64AsStringArrayColumn = new Column("NullableEnumU64AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64AsStringArray", nullableEnumU64AsStringArrayColumn);
+            var nullableEnumU64AsStringCollectionColumn = new Column("NullableEnumU64AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64AsStringCollection", nullableEnumU64AsStringCollectionColumn);
+            var nullableEnumU64CollectionColumn = new Column("NullableEnumU64Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU64Collection", nullableEnumU64CollectionColumn);
+            var nullableEnumU8Column = new Column("NullableEnumU8", "tinyint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU8", nullableEnumU8Column);
+            var nullableEnumU8ArrayColumn = new Column("NullableEnumU8Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8Array", nullableEnumU8ArrayColumn);
+            var nullableEnumU8AsStringColumn = new Column("NullableEnumU8AsString", "tinyint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableEnumU8AsString", nullableEnumU8AsStringColumn);
+            var nullableEnumU8AsStringArrayColumn = new Column("NullableEnumU8AsStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8AsStringArray", nullableEnumU8AsStringArrayColumn);
+            var nullableEnumU8AsStringCollectionColumn = new Column("NullableEnumU8AsStringCollection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8AsStringCollection", nullableEnumU8AsStringCollectionColumn);
+            var nullableEnumU8CollectionColumn = new Column("NullableEnumU8Collection", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableEnumU8Collection", nullableEnumU8CollectionColumn);
+            var nullableFloatColumn = new Column("NullableFloat", "float", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableFloat", nullableFloatColumn);
+            var nullableFloatArrayColumn = new Column("NullableFloatArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableFloatArray", nullableFloatArrayColumn);
+            var nullableGuidColumn = new Column("NullableGuid", "char(36)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableGuid", nullableGuidColumn);
+            var nullableGuidArrayColumn = new Column("NullableGuidArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableGuidArray", nullableGuidArrayColumn);
+            var nullableIPAddressColumn = new Column("NullableIPAddress", "varchar(45)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableIPAddress", nullableIPAddressColumn);
+            var nullableIPAddressArrayColumn = new Column("NullableIPAddressArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableIPAddressArray", nullableIPAddressArrayColumn);
+            var nullableInt16Column = new Column("NullableInt16", "smallint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt16", nullableInt16Column);
+            var nullableInt16ArrayColumn = new Column("NullableInt16Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt16Array", nullableInt16ArrayColumn);
+            var nullableInt32Column = new Column("NullableInt32", "int", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt32", nullableInt32Column);
+            var nullableInt32ArrayColumn = new Column("NullableInt32Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt32Array", nullableInt32ArrayColumn);
+            var nullableInt64Column = new Column("NullableInt64", "bigint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt64", nullableInt64Column);
+            var nullableInt64ArrayColumn = new Column("NullableInt64Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt64Array", nullableInt64ArrayColumn);
+            var nullableInt8Column = new Column("NullableInt8", "tinyint", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableInt8", nullableInt8Column);
+            var nullableInt8ArrayColumn = new Column("NullableInt8Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableInt8Array", nullableInt8ArrayColumn);
+            var nullablePhysicalAddressColumn = new Column("NullablePhysicalAddress", "varchar(20)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullablePhysicalAddress", nullablePhysicalAddressColumn);
+            var nullablePhysicalAddressArrayColumn = new Column("NullablePhysicalAddressArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullablePhysicalAddressArray", nullablePhysicalAddressArrayColumn);
+            var nullableStringColumn = new Column("NullableString", "longtext", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableString", nullableStringColumn);
+            var nullableStringArrayColumn = new Column("NullableStringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableStringArray", nullableStringArrayColumn);
+            var nullableTimeOnlyColumn = new Column("NullableTimeOnly", "time(6)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableTimeOnly", nullableTimeOnlyColumn);
+            var nullableTimeOnlyArrayColumn = new Column("NullableTimeOnlyArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableTimeOnlyArray", nullableTimeOnlyArrayColumn);
+            var nullableTimeSpanColumn = new Column("NullableTimeSpan", "time(6)", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableTimeSpan", nullableTimeSpanColumn);
+            var nullableTimeSpanArrayColumn = new Column("NullableTimeSpanArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableTimeSpanArray", nullableTimeSpanArrayColumn);
+            var nullableUInt16Column = new Column("NullableUInt16", "smallint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt16", nullableUInt16Column);
+            var nullableUInt16ArrayColumn = new Column("NullableUInt16Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt16Array", nullableUInt16ArrayColumn);
+            var nullableUInt32Column = new Column("NullableUInt32", "int unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt32", nullableUInt32Column);
+            var nullableUInt32ArrayColumn = new Column("NullableUInt32Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt32Array", nullableUInt32ArrayColumn);
+            var nullableUInt64Column = new Column("NullableUInt64", "bigint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt64", nullableUInt64Column);
+            var nullableUInt64ArrayColumn = new Column("NullableUInt64Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt64Array", nullableUInt64ArrayColumn);
+            var nullableUInt8Column = new Column("NullableUInt8", "tinyint unsigned", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUInt8", nullableUInt8Column);
+            var nullableUInt8ArrayColumn = new Column("NullableUInt8Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUInt8Array", nullableUInt8ArrayColumn);
+            var nullableUriColumn = new Column("NullableUri", "longtext", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("NullableUri", nullableUriColumn);
+            var nullableUriArrayColumn = new Column("NullableUriArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("NullableUriArray", nullableUriArrayColumn);
+            var physicalAddressColumn = new Column("PhysicalAddress", "varchar(20)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddress", physicalAddressColumn);
+            var physicalAddressArrayColumn = new Column("PhysicalAddressArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressArray", physicalAddressArrayColumn);
+            var physicalAddressToBytesConverterPropertyColumn = new Column("PhysicalAddressToBytesConverterProperty", "varbinary(8)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressToBytesConverterProperty", physicalAddressToBytesConverterPropertyColumn);
+            var physicalAddressToStringConverterPropertyColumn = new Column("PhysicalAddressToStringConverterProperty", "varchar(20)", manyTypesTable);
+            manyTypesTable.Columns.Add("PhysicalAddressToStringConverterProperty", physicalAddressToStringConverterPropertyColumn);
+            var stringColumn = new Column("String", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("String", stringColumn);
+            var stringArrayColumn = new Column("StringArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("StringArray", stringArrayColumn);
+            var stringToBoolConverterPropertyColumn = new Column("StringToBoolConverterProperty", "tinyint(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToBoolConverterProperty", stringToBoolConverterPropertyColumn);
+            var stringToBytesConverterPropertyColumn = new Column("StringToBytesConverterProperty", "longblob", manyTypesTable)
+            {
+                IsNullable = true
+            };
+            manyTypesTable.Columns.Add("StringToBytesConverterProperty", stringToBytesConverterPropertyColumn);
+            var stringToCharConverterPropertyColumn = new Column("StringToCharConverterProperty", "varchar(1)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToCharConverterProperty", stringToCharConverterPropertyColumn);
+            var stringToDateOnlyConverterPropertyColumn = new Column("StringToDateOnlyConverterProperty", "date", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateOnlyConverterProperty", stringToDateOnlyConverterPropertyColumn);
+            var stringToDateTimeConverterPropertyColumn = new Column("StringToDateTimeConverterProperty", "datetime(6)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateTimeConverterProperty", stringToDateTimeConverterPropertyColumn);
+            var stringToDateTimeOffsetConverterPropertyColumn = new Column("StringToDateTimeOffsetConverterProperty", "datetime(6)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDateTimeOffsetConverterProperty", stringToDateTimeOffsetConverterPropertyColumn);
+            var stringToDecimalNumberConverterPropertyColumn = new Column("StringToDecimalNumberConverterProperty", "decimal(65,30)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDecimalNumberConverterProperty", stringToDecimalNumberConverterPropertyColumn);
+            var stringToDoubleNumberConverterPropertyColumn = new Column("StringToDoubleNumberConverterProperty", "double", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToDoubleNumberConverterProperty", stringToDoubleNumberConverterPropertyColumn);
+            var stringToEnumConverterPropertyColumn = new Column("StringToEnumConverterProperty", "int unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToEnumConverterProperty", stringToEnumConverterPropertyColumn);
+            var stringToGuidConverterPropertyColumn = new Column("StringToGuidConverterProperty", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToGuidConverterProperty", stringToGuidConverterPropertyColumn);
+            var stringToIntNumberConverterPropertyColumn = new Column("StringToIntNumberConverterProperty", "int", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToIntNumberConverterProperty", stringToIntNumberConverterPropertyColumn);
+            var stringToTimeOnlyConverterPropertyColumn = new Column("StringToTimeOnlyConverterProperty", "time(6)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToTimeOnlyConverterProperty", stringToTimeOnlyConverterPropertyColumn);
+            var stringToTimeSpanConverterPropertyColumn = new Column("StringToTimeSpanConverterProperty", "time(6)", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToTimeSpanConverterProperty", stringToTimeSpanConverterPropertyColumn);
+            var stringToUriConverterPropertyColumn = new Column("StringToUriConverterProperty", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("StringToUriConverterProperty", stringToUriConverterPropertyColumn);
+            var timeOnlyColumn = new Column("TimeOnly", "time(6)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnly", timeOnlyColumn);
+            var timeOnlyArrayColumn = new Column("TimeOnlyArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyArray", timeOnlyArrayColumn);
+            var timeOnlyToStringConverterPropertyColumn = new Column("TimeOnlyToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyToStringConverterProperty", timeOnlyToStringConverterPropertyColumn);
+            var timeOnlyToTicksConverterPropertyColumn = new Column("TimeOnlyToTicksConverterProperty", "bigint", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeOnlyToTicksConverterProperty", timeOnlyToTicksConverterPropertyColumn);
+            var timeSpanColumn = new Column("TimeSpan", "time(6)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpan", timeSpanColumn);
+            var timeSpanArrayColumn = new Column("TimeSpanArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanArray", timeSpanArrayColumn);
+            var timeSpanToStringConverterPropertyColumn = new Column("TimeSpanToStringConverterProperty", "varchar(48)", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanToStringConverterProperty", timeSpanToStringConverterPropertyColumn);
+            var timeSpanToTicksConverterPropertyColumn = new Column("TimeSpanToTicksConverterProperty", "bigint", manyTypesTable);
+            manyTypesTable.Columns.Add("TimeSpanToTicksConverterProperty", timeSpanToTicksConverterPropertyColumn);
+            var uInt16Column = new Column("UInt16", "smallint unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt16", uInt16Column);
+            var uInt16ArrayColumn = new Column("UInt16Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt16Array", uInt16ArrayColumn);
+            var uInt32Column = new Column("UInt32", "int unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt32", uInt32Column);
+            var uInt32ArrayColumn = new Column("UInt32Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt32Array", uInt32ArrayColumn);
+            var uInt64Column = new Column("UInt64", "bigint unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt64", uInt64Column);
+            var uInt64ArrayColumn = new Column("UInt64Array", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt64Array", uInt64ArrayColumn);
+            var uInt8Column = new Column("UInt8", "tinyint unsigned", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt8", uInt8Column);
+            var uInt8ArrayColumn = new Column("UInt8Array", "longblob", manyTypesTable);
+            manyTypesTable.Columns.Add("UInt8Array", uInt8ArrayColumn);
+            var uriColumn = new Column("Uri", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("Uri", uriColumn);
+            var uriArrayColumn = new Column("UriArray", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("UriArray", uriArrayColumn);
+            var uriToStringConverterPropertyColumn = new Column("UriToStringConverterProperty", "longtext", manyTypesTable);
+            manyTypesTable.Columns.Add("UriToStringConverterProperty", uriToStringConverterPropertyColumn);
+            var pK_ManyTypes = new UniqueConstraint("PK_ManyTypes", manyTypesTable, new[] { idColumn1 });
+            manyTypesTable.PrimaryKey = pK_ManyTypes;
+            var pK_ManyTypesUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes",
+                new[] { "Id" });
+            pK_ManyTypes.MappedKeys.Add(pK_ManyTypesUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_ManyTypesUc).Add(pK_ManyTypes);
+            manyTypesTable.UniqueConstraints.Add("PK_ManyTypes", pK_ManyTypes);
+            relationalModel.Tables.Add(("ManyTypes", null), manyTypesTable);
+            var manyTypesTableMapping = new TableMapping(manyTypes, manyTypesTable, null);
+            manyTypesTable.AddTypeMapping(manyTypesTableMapping, false);
+            tableMappings2.Add(manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn1, manyTypes.FindProperty("Id")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolColumn, manyTypes.FindProperty("Bool")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolArrayColumn, manyTypes.FindProperty("BoolArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToStringConverterPropertyColumn, manyTypes.FindProperty("BoolToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToTwoValuesConverterPropertyColumn, manyTypes.FindProperty("BoolToTwoValuesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(boolToZeroOneConverterPropertyColumn, manyTypes.FindProperty("BoolToZeroOneConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesColumn, manyTypes.FindProperty("Bytes")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesArrayColumn, manyTypes.FindProperty("BytesArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(bytesToStringConverterPropertyColumn, manyTypes.FindProperty("BytesToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(castingConverterPropertyColumn, manyTypes.FindProperty("CastingConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charColumn, manyTypes.FindProperty("Char")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charArrayColumn, manyTypes.FindProperty("CharArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(charToStringConverterPropertyColumn, manyTypes.FindProperty("CharToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyColumn, manyTypes.FindProperty("DateOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyArrayColumn, manyTypes.FindProperty("DateOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateOnlyToStringConverterPropertyColumn, manyTypes.FindProperty("DateOnlyToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeColumn, manyTypes.FindProperty("DateTime")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeArrayColumn, manyTypes.FindProperty("DateTimeArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToBinaryConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToBinaryConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToBytesConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeOffsetToStringConverterPropertyColumn, manyTypes.FindProperty("DateTimeOffsetToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToBinaryConverterPropertyColumn, manyTypes.FindProperty("DateTimeToBinaryConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToStringConverterPropertyColumn, manyTypes.FindProperty("DateTimeToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(dateTimeToTicksConverterPropertyColumn, manyTypes.FindProperty("DateTimeToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalColumn, manyTypes.FindProperty("Decimal")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalArrayColumn, manyTypes.FindProperty("DecimalArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("DecimalNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(decimalNumberToStringConverterPropertyColumn, manyTypes.FindProperty("DecimalNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleColumn, manyTypes.FindProperty("Double")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleArrayColumn, manyTypes.FindProperty("DoubleArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("DoubleNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(doubleNumberToStringConverterPropertyColumn, manyTypes.FindProperty("DoubleNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16Column, manyTypes.FindProperty("Enum16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16ArrayColumn, manyTypes.FindProperty("Enum16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringColumn, manyTypes.FindProperty("Enum16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringArrayColumn, manyTypes.FindProperty("Enum16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16AsStringCollectionColumn, manyTypes.FindProperty("Enum16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum16CollectionColumn, manyTypes.FindProperty("Enum16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32Column, manyTypes.FindProperty("Enum32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32ArrayColumn, manyTypes.FindProperty("Enum32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringColumn, manyTypes.FindProperty("Enum32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringArrayColumn, manyTypes.FindProperty("Enum32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32AsStringCollectionColumn, manyTypes.FindProperty("Enum32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum32CollectionColumn, manyTypes.FindProperty("Enum32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64Column, manyTypes.FindProperty("Enum64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64ArrayColumn, manyTypes.FindProperty("Enum64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringColumn, manyTypes.FindProperty("Enum64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringArrayColumn, manyTypes.FindProperty("Enum64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64AsStringCollectionColumn, manyTypes.FindProperty("Enum64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum64CollectionColumn, manyTypes.FindProperty("Enum64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8Column, manyTypes.FindProperty("Enum8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8ArrayColumn, manyTypes.FindProperty("Enum8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringColumn, manyTypes.FindProperty("Enum8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringArrayColumn, manyTypes.FindProperty("Enum8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8AsStringCollectionColumn, manyTypes.FindProperty("Enum8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enum8CollectionColumn, manyTypes.FindProperty("Enum8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumToNumberConverterPropertyColumn, manyTypes.FindProperty("EnumToNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumToStringConverterPropertyColumn, manyTypes.FindProperty("EnumToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16Column, manyTypes.FindProperty("EnumU16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16ArrayColumn, manyTypes.FindProperty("EnumU16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringColumn, manyTypes.FindProperty("EnumU16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringArrayColumn, manyTypes.FindProperty("EnumU16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16AsStringCollectionColumn, manyTypes.FindProperty("EnumU16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU16CollectionColumn, manyTypes.FindProperty("EnumU16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32Column, manyTypes.FindProperty("EnumU32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32ArrayColumn, manyTypes.FindProperty("EnumU32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringColumn, manyTypes.FindProperty("EnumU32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringArrayColumn, manyTypes.FindProperty("EnumU32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32AsStringCollectionColumn, manyTypes.FindProperty("EnumU32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU32CollectionColumn, manyTypes.FindProperty("EnumU32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64Column, manyTypes.FindProperty("EnumU64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64ArrayColumn, manyTypes.FindProperty("EnumU64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringColumn, manyTypes.FindProperty("EnumU64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringArrayColumn, manyTypes.FindProperty("EnumU64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64AsStringCollectionColumn, manyTypes.FindProperty("EnumU64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU64CollectionColumn, manyTypes.FindProperty("EnumU64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8Column, manyTypes.FindProperty("EnumU8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8ArrayColumn, manyTypes.FindProperty("EnumU8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringColumn, manyTypes.FindProperty("EnumU8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringArrayColumn, manyTypes.FindProperty("EnumU8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8AsStringCollectionColumn, manyTypes.FindProperty("EnumU8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(enumU8CollectionColumn, manyTypes.FindProperty("EnumU8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(floatColumn, manyTypes.FindProperty("Float")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(floatArrayColumn, manyTypes.FindProperty("FloatArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidColumn, manyTypes.FindProperty("Guid")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidArrayColumn, manyTypes.FindProperty("GuidArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidToBytesConverterPropertyColumn, manyTypes.FindProperty("GuidToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(guidToStringConverterPropertyColumn, manyTypes.FindProperty("GuidToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressColumn, manyTypes.FindProperty("IPAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressArrayColumn, manyTypes.FindProperty("IPAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressToBytesConverterPropertyColumn, manyTypes.FindProperty("IPAddressToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(iPAddressToStringConverterPropertyColumn, manyTypes.FindProperty("IPAddressToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int16Column, manyTypes.FindProperty("Int16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int16ArrayColumn, manyTypes.FindProperty("Int16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int32Column, manyTypes.FindProperty("Int32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int32ArrayColumn, manyTypes.FindProperty("Int32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int64Column, manyTypes.FindProperty("Int64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int64ArrayColumn, manyTypes.FindProperty("Int64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int8Column, manyTypes.FindProperty("Int8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(int8ArrayColumn, manyTypes.FindProperty("Int8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(intNumberToBytesConverterPropertyColumn, manyTypes.FindProperty("IntNumberToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(intNumberToStringConverterPropertyColumn, manyTypes.FindProperty("IntNumberToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullIntToNullStringConverterPropertyColumn, manyTypes.FindProperty("NullIntToNullStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBoolColumn, manyTypes.FindProperty("NullableBool")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBoolArrayColumn, manyTypes.FindProperty("NullableBoolArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBytesColumn, manyTypes.FindProperty("NullableBytes")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableBytesArrayColumn, manyTypes.FindProperty("NullableBytesArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableCharColumn, manyTypes.FindProperty("NullableChar")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableCharArrayColumn, manyTypes.FindProperty("NullableCharArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateOnlyColumn, manyTypes.FindProperty("NullableDateOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateOnlyArrayColumn, manyTypes.FindProperty("NullableDateOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateTimeColumn, manyTypes.FindProperty("NullableDateTime")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDateTimeArrayColumn, manyTypes.FindProperty("NullableDateTimeArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDecimalColumn, manyTypes.FindProperty("NullableDecimal")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDecimalArrayColumn, manyTypes.FindProperty("NullableDecimalArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDoubleColumn, manyTypes.FindProperty("NullableDouble")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableDoubleArrayColumn, manyTypes.FindProperty("NullableDoubleArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16Column, manyTypes.FindProperty("NullableEnum16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16ArrayColumn, manyTypes.FindProperty("NullableEnum16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringColumn, manyTypes.FindProperty("NullableEnum16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringArrayColumn, manyTypes.FindProperty("NullableEnum16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum16CollectionColumn, manyTypes.FindProperty("NullableEnum16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32Column, manyTypes.FindProperty("NullableEnum32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32ArrayColumn, manyTypes.FindProperty("NullableEnum32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringColumn, manyTypes.FindProperty("NullableEnum32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringArrayColumn, manyTypes.FindProperty("NullableEnum32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum32CollectionColumn, manyTypes.FindProperty("NullableEnum32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64Column, manyTypes.FindProperty("NullableEnum64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64ArrayColumn, manyTypes.FindProperty("NullableEnum64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringColumn, manyTypes.FindProperty("NullableEnum64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringArrayColumn, manyTypes.FindProperty("NullableEnum64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum64CollectionColumn, manyTypes.FindProperty("NullableEnum64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8Column, manyTypes.FindProperty("NullableEnum8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8ArrayColumn, manyTypes.FindProperty("NullableEnum8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringColumn, manyTypes.FindProperty("NullableEnum8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringArrayColumn, manyTypes.FindProperty("NullableEnum8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8AsStringCollectionColumn, manyTypes.FindProperty("NullableEnum8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnum8CollectionColumn, manyTypes.FindProperty("NullableEnum8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16Column, manyTypes.FindProperty("NullableEnumU16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16ArrayColumn, manyTypes.FindProperty("NullableEnumU16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringColumn, manyTypes.FindProperty("NullableEnumU16AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU16AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU16AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU16CollectionColumn, manyTypes.FindProperty("NullableEnumU16Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32Column, manyTypes.FindProperty("NullableEnumU32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32ArrayColumn, manyTypes.FindProperty("NullableEnumU32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringColumn, manyTypes.FindProperty("NullableEnumU32AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU32AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU32AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU32CollectionColumn, manyTypes.FindProperty("NullableEnumU32Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64Column, manyTypes.FindProperty("NullableEnumU64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64ArrayColumn, manyTypes.FindProperty("NullableEnumU64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringColumn, manyTypes.FindProperty("NullableEnumU64AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU64AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU64AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU64CollectionColumn, manyTypes.FindProperty("NullableEnumU64Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8Column, manyTypes.FindProperty("NullableEnumU8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8ArrayColumn, manyTypes.FindProperty("NullableEnumU8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringColumn, manyTypes.FindProperty("NullableEnumU8AsString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringArrayColumn, manyTypes.FindProperty("NullableEnumU8AsStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8AsStringCollectionColumn, manyTypes.FindProperty("NullableEnumU8AsStringCollection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableEnumU8CollectionColumn, manyTypes.FindProperty("NullableEnumU8Collection")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableFloatColumn, manyTypes.FindProperty("NullableFloat")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableFloatArrayColumn, manyTypes.FindProperty("NullableFloatArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableGuidColumn, manyTypes.FindProperty("NullableGuid")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableGuidArrayColumn, manyTypes.FindProperty("NullableGuidArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableIPAddressColumn, manyTypes.FindProperty("NullableIPAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableIPAddressArrayColumn, manyTypes.FindProperty("NullableIPAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt16Column, manyTypes.FindProperty("NullableInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt16ArrayColumn, manyTypes.FindProperty("NullableInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt32Column, manyTypes.FindProperty("NullableInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt32ArrayColumn, manyTypes.FindProperty("NullableInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt64Column, manyTypes.FindProperty("NullableInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt64ArrayColumn, manyTypes.FindProperty("NullableInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt8Column, manyTypes.FindProperty("NullableInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableInt8ArrayColumn, manyTypes.FindProperty("NullableInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullablePhysicalAddressColumn, manyTypes.FindProperty("NullablePhysicalAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullablePhysicalAddressArrayColumn, manyTypes.FindProperty("NullablePhysicalAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableStringColumn, manyTypes.FindProperty("NullableString")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableStringArrayColumn, manyTypes.FindProperty("NullableStringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeOnlyColumn, manyTypes.FindProperty("NullableTimeOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeOnlyArrayColumn, manyTypes.FindProperty("NullableTimeOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeSpanColumn, manyTypes.FindProperty("NullableTimeSpan")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableTimeSpanArrayColumn, manyTypes.FindProperty("NullableTimeSpanArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt16Column, manyTypes.FindProperty("NullableUInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt16ArrayColumn, manyTypes.FindProperty("NullableUInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt32Column, manyTypes.FindProperty("NullableUInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt32ArrayColumn, manyTypes.FindProperty("NullableUInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt64Column, manyTypes.FindProperty("NullableUInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt64ArrayColumn, manyTypes.FindProperty("NullableUInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt8Column, manyTypes.FindProperty("NullableUInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUInt8ArrayColumn, manyTypes.FindProperty("NullableUInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUriColumn, manyTypes.FindProperty("NullableUri")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(nullableUriArrayColumn, manyTypes.FindProperty("NullableUriArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressColumn, manyTypes.FindProperty("PhysicalAddress")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressArrayColumn, manyTypes.FindProperty("PhysicalAddressArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressToBytesConverterPropertyColumn, manyTypes.FindProperty("PhysicalAddressToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(physicalAddressToStringConverterPropertyColumn, manyTypes.FindProperty("PhysicalAddressToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringColumn, manyTypes.FindProperty("String")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringArrayColumn, manyTypes.FindProperty("StringArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToBoolConverterPropertyColumn, manyTypes.FindProperty("StringToBoolConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToBytesConverterPropertyColumn, manyTypes.FindProperty("StringToBytesConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToCharConverterPropertyColumn, manyTypes.FindProperty("StringToCharConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateOnlyConverterPropertyColumn, manyTypes.FindProperty("StringToDateOnlyConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateTimeConverterPropertyColumn, manyTypes.FindProperty("StringToDateTimeConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDateTimeOffsetConverterPropertyColumn, manyTypes.FindProperty("StringToDateTimeOffsetConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDecimalNumberConverterPropertyColumn, manyTypes.FindProperty("StringToDecimalNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToDoubleNumberConverterPropertyColumn, manyTypes.FindProperty("StringToDoubleNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToEnumConverterPropertyColumn, manyTypes.FindProperty("StringToEnumConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToGuidConverterPropertyColumn, manyTypes.FindProperty("StringToGuidConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToIntNumberConverterPropertyColumn, manyTypes.FindProperty("StringToIntNumberConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToTimeOnlyConverterPropertyColumn, manyTypes.FindProperty("StringToTimeOnlyConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToTimeSpanConverterPropertyColumn, manyTypes.FindProperty("StringToTimeSpanConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(stringToUriConverterPropertyColumn, manyTypes.FindProperty("StringToUriConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyColumn, manyTypes.FindProperty("TimeOnly")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyArrayColumn, manyTypes.FindProperty("TimeOnlyArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyToStringConverterPropertyColumn, manyTypes.FindProperty("TimeOnlyToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeOnlyToTicksConverterPropertyColumn, manyTypes.FindProperty("TimeOnlyToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanColumn, manyTypes.FindProperty("TimeSpan")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanArrayColumn, manyTypes.FindProperty("TimeSpanArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanToStringConverterPropertyColumn, manyTypes.FindProperty("TimeSpanToStringConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(timeSpanToTicksConverterPropertyColumn, manyTypes.FindProperty("TimeSpanToTicksConverterProperty")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt16Column, manyTypes.FindProperty("UInt16")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt16ArrayColumn, manyTypes.FindProperty("UInt16Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt32Column, manyTypes.FindProperty("UInt32")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt32ArrayColumn, manyTypes.FindProperty("UInt32Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt64Column, manyTypes.FindProperty("UInt64")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt64ArrayColumn, manyTypes.FindProperty("UInt64Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt8Column, manyTypes.FindProperty("UInt8")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uInt8ArrayColumn, manyTypes.FindProperty("UInt8Array")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriColumn, manyTypes.FindProperty("Uri")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriArrayColumn, manyTypes.FindProperty("UriArray")!, manyTypesTableMapping);
+            RelationalModel.CreateColumnMapping(uriToStringConverterPropertyColumn, manyTypes.FindProperty("UriToStringConverterProperty")!, manyTypesTableMapping);
+
+            var principalBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase")!;
+
+            var defaultTableMappings3 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings3);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", null, relationalModel);
+            var alternateIdColumnBase = new ColumnBase<ColumnMappingBase>("AlternateId", "char(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("AlternateId", alternateIdColumnBase);
+            var enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Enum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum1", enum1ColumnBase);
+            var enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Enum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum2", enum2ColumnBase);
+            var flagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase);
+            var flagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase);
+            var idColumnBase2 = new ColumnBase<ColumnMappingBase>("Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Id", idColumnBase2);
+            var pointColumnBase0 = new ColumnBase<ColumnMappingBase>("Point", "geometry", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Point", pointColumnBase0);
+            var refTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase);
+            var refTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase);
+            var refTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase);
+            var refTypeListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeList", refTypeListColumnBase);
+            var stringWithCharSetColumnBase0 = new ColumnBase<ColumnMappingBase>("StringWithCharSet", "varchar(128)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("StringWithCharSet", stringWithCharSetColumnBase0);
+            var stringWithCollationColumnBase0 = new ColumnBase<ColumnMappingBase>("StringWithCollation", "varchar(128)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("StringWithCollation", stringWithCollationColumnBase0);
+            var valueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase);
+            var valueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase);
+            var valueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase);
+            var valueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase = new TableMappingBase<ColumnMappingBase>(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase, false);
+            defaultTableMappings3.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)alternateIdColumnBase, principalBase.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase2, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)pointColumnBase0, principalBase.FindProperty("Point")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringWithCharSetColumnBase0, principalBase.FindProperty("StringWithCharSet")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringWithCollationColumnBase0, principalBase.FindProperty("StringWithCollation")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+
+            var tableMappings3 = new List<TableMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings3);
+            var principalBaseTable = new Table("PrincipalBase", "mySchema", relationalModel);
+            var idColumn2 = new Column("Id", "bigint", principalBaseTable);
+            principalBaseTable.Columns.Add("Id", idColumn2);
+            var alternateIdColumn = new Column("AlternateId", "char(36)", principalBaseTable);
+            principalBaseTable.Columns.Add("AlternateId", alternateIdColumn);
+            var enum1Column = new Column("Enum1", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("Enum1", enum1Column);
+            var enum2Column = new Column("Enum2", "int", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Enum2", enum2Column);
+            var flagsEnum1Column = new Column("FlagsEnum1", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum1", flagsEnum1Column);
+            var flagsEnum2Column = new Column("FlagsEnum2", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum2", flagsEnum2Column);
+            var owned_NumberColumn = new Column("Owned_Number", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned_Number", owned_NumberColumn);
+            var owned_RefTypeArrayColumn = new Column("Owned_RefTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeArray", owned_RefTypeArrayColumn);
+            var owned_RefTypeEnumerableColumn = new Column("Owned_RefTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeEnumerable", owned_RefTypeEnumerableColumn);
+            var owned_RefTypeIListColumn = new Column("Owned_RefTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeIList", owned_RefTypeIListColumn);
+            var owned_RefTypeListColumn = new Column("Owned_RefTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeList", owned_RefTypeListColumn);
+            var owned_ValueTypeArrayColumn = new Column("Owned_ValueTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeArray", owned_ValueTypeArrayColumn);
+            var owned_ValueTypeEnumerableColumn = new Column("Owned_ValueTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeEnumerable", owned_ValueTypeEnumerableColumn);
+            var owned_ValueTypeIListColumn = new Column("Owned_ValueTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeIList", owned_ValueTypeIListColumn);
+            var owned_ValueTypeListColumn = new Column("Owned_ValueTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeList", owned_ValueTypeListColumn);
+            var pointColumn0 = new Column("Point", "geometry", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Point", pointColumn0);
+            var refTypeArrayColumn = new Column("RefTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeArray", refTypeArrayColumn);
+            var refTypeEnumerableColumn = new Column("RefTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn);
+            var refTypeIListColumn = new Column("RefTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeIList", refTypeIListColumn);
+            var refTypeListColumn = new Column("RefTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeList", refTypeListColumn);
+            var stringWithCharSetColumn0 = new Column("StringWithCharSet", "varchar(128)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("StringWithCharSet", stringWithCharSetColumn0);
+            var stringWithCollationColumn0 = new Column("StringWithCollation", "varchar(128)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("StringWithCollation", stringWithCollationColumn0);
+            var valueTypeArrayColumn = new Column("ValueTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn);
+            var valueTypeEnumerableColumn = new Column("ValueTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn);
+            var valueTypeIListColumn = new Column("ValueTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeIList", valueTypeIListColumn);
+            var valueTypeListColumn = new Column("ValueTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeList", valueTypeListColumn);
+            var aK_PrincipalBase_Id = new UniqueConstraint("AK_PrincipalBase_Id", principalBaseTable, new[] { idColumn2 });
+            var aK_PrincipalBase_IdUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            aK_PrincipalBase_Id.MappedKeys.Add(aK_PrincipalBase_IdUc);
+            RelationalModel.GetOrCreateUniqueConstraints(aK_PrincipalBase_IdUc).Add(aK_PrincipalBase_Id);
+            principalBaseTable.UniqueConstraints.Add("AK_PrincipalBase_Id", aK_PrincipalBase_Id);
+            var pK = new UniqueConstraint("PK", principalBaseTable, new[] { idColumn2, alternateIdColumn });
+            principalBaseTable.PrimaryKey = pK;
+            var pKUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            pK.MappedKeys.Add(pKUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pKUc).Add(pK);
+            var pKUc0 = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" });
+            pK.MappedKeys.Add(pKUc0);
+            RelationalModel.GetOrCreateUniqueConstraints(pKUc0).Add(pK);
+            principalBaseTable.UniqueConstraints.Add("PK", pK);
+            var iX_PrincipalBase_AlternateId_Id = new TableIndex(
+            "IX_PrincipalBase_AlternateId_Id", principalBaseTable, new[] { alternateIdColumn, idColumn2 }, false);
+            var iX_PrincipalBase_AlternateId_IdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "AlternateId", "Id" });
+            iX_PrincipalBase_AlternateId_Id.MappedIndexes.Add(iX_PrincipalBase_AlternateId_IdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_AlternateId_IdIx).Add(iX_PrincipalBase_AlternateId_Id);
+            principalBaseTable.Indexes.Add("IX_PrincipalBase_AlternateId_Id", iX_PrincipalBase_AlternateId_Id);
+            relationalModel.Tables.Add(("PrincipalBase", "mySchema"), principalBaseTable);
+            var principalBaseTableMapping = new TableMapping(principalBase, principalBaseTable, true)
+            {
+                IsSharedTablePrincipal = true,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping, false);
+            tableMappings3.Add(principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(alternateIdColumn, principalBase.FindProperty("AlternateId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn2, principalBase.FindProperty("Id")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column, principalBase.FindProperty("Enum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column, principalBase.FindProperty("Enum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalBase.FindProperty("FlagsEnum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalBase.FindProperty("FlagsEnum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(pointColumn0, principalBase.FindProperty("Point")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(stringWithCharSetColumn0, principalBase.FindProperty("StringWithCharSet")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(stringWithCollationColumn0, principalBase.FindProperty("StringWithCollation")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTableMapping);
+
+            var ownedType = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType")!;
+
+            var defaultTableMappings4 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedType.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings4);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType", null, relationalModel);
+            var detailsColumnBase = new ColumnBase<ColumnMappingBase>("Details", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("Details", detailsColumnBase);
+            var numberColumnBase = new ColumnBase<ColumnMappingBase>("Number", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("Number", numberColumnBase);
+            var principalBaseAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalBaseAlternateId", "char(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("PrincipalBaseAlternateId", principalBaseAlternateIdColumnBase);
+            var principalBaseIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalBaseId", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("PrincipalBaseId", principalBaseIdColumnBase);
+            var refTypeArrayColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase0);
+            var refTypeEnumerableColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase0);
+            var refTypeIListColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase0);
+            var refTypeListColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("RefTypeList", refTypeListColumnBase0);
+            var valueTypeArrayColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase0);
+            var valueTypeEnumerableColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase0);
+            var valueTypeIListColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase0);
+            var valueTypeListColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase0);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase = new TableMappingBase<ColumnMappingBase>(ownedType, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase, false);
+            defaultTableMappings4.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseAlternateIdColumnBase, ownedType.FindProperty("PrincipalBaseAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase, ownedType.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)detailsColumnBase, ownedType.FindProperty("Details")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)numberColumnBase, ownedType.FindProperty("Number")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase0, ownedType.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase0, ownedType.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase0, ownedType.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase0, ownedType.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase0, ownedType.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase0, ownedType.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase0, ownedType.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase0, ownedType.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseOwnedOwnedTypeMappingBase);
+
+            var tableMappings4 = new List<TableMapping>();
+            ownedType.SetRuntimeAnnotation("Relational:TableMappings", tableMappings4);
+            var principalBaseTableMapping0 = new TableMapping(ownedType, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+                IsSplitEntityTypePrincipal = true
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping0, false);
+            tableMappings4.Add(principalBaseTableMapping0);
+            principalBaseTable.AddRowInternalForeignKey(ownedType, RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" }));
+            RelationalModel.CreateColumnMapping(alternateIdColumn, ownedType.FindProperty("PrincipalBaseAlternateId")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(idColumn2, ownedType.FindProperty("PrincipalBaseId")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_NumberColumn, ownedType.FindProperty("Number")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeArrayColumn, ownedType.FindProperty("RefTypeArray")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeEnumerableColumn, ownedType.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeIListColumn, ownedType.FindProperty("RefTypeIList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeListColumn, ownedType.FindProperty("RefTypeList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeArrayColumn, ownedType.FindProperty("ValueTypeArray")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeEnumerableColumn, ownedType.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeIListColumn, ownedType.FindProperty("ValueTypeIList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeListColumn, ownedType.FindProperty("ValueTypeList")!, principalBaseTableMapping0);
+            var detailsTable = new Table("Details", null, relationalModel);
+            var principalBaseIdColumn = new Column("PrincipalBaseId", "bigint", detailsTable);
+            detailsTable.Columns.Add("PrincipalBaseId", principalBaseIdColumn);
+            var principalBaseAlternateIdColumn = new Column("PrincipalBaseAlternateId", "char(36)", detailsTable);
+            detailsTable.Columns.Add("PrincipalBaseAlternateId", principalBaseAlternateIdColumn);
+            var detailsColumn = new Column("Details", "longtext", detailsTable)
+            {
+                IsNullable = true
+            };
+            detailsTable.Columns.Add("Details", detailsColumn);
+            var pK_Details = new UniqueConstraint("PK_Details", detailsTable, new[] { principalBaseIdColumn, principalBaseAlternateIdColumn });
+            detailsTable.PrimaryKey = pK_Details;
+            var pK_DetailsUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" });
+            pK_Details.MappedKeys.Add(pK_DetailsUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DetailsUc).Add(pK_Details);
+            detailsTable.UniqueConstraints.Add("PK_Details", pK_Details);
+            relationalModel.Tables.Add(("Details", null), detailsTable);
+            var detailsTableMapping = new TableMapping(ownedType, detailsTable, null)
+            {
+                IsSplitEntityTypePrincipal = false
+            };
+            detailsTable.AddTypeMapping(detailsTableMapping, false);
+            tableMappings4.Add(detailsTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseAlternateIdColumn, ownedType.FindProperty("PrincipalBaseAlternateId")!, detailsTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn, ownedType.FindProperty("PrincipalBaseId")!, detailsTableMapping);
+            RelationalModel.CreateColumnMapping(detailsColumn, ownedType.FindProperty("Details")!, detailsTableMapping);
+
+            var principalDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>")!;
+
+            var defaultTableMappings5 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings5);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0 = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0, false);
+            defaultTableMappings5.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)alternateIdColumnBase, principalDerived.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase2, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)pointColumnBase0, principalDerived.FindProperty("Point")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringWithCharSetColumnBase0, principalDerived.FindProperty("StringWithCharSet")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)stringWithCollationColumnBase0, principalDerived.FindProperty("StringWithCollation")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>", null, relationalModel);
+            var alternateIdColumnBase0 = new ColumnBase<ColumnMappingBase>("AlternateId", "char(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("AlternateId", alternateIdColumnBase0);
+            var idColumnBase3 = new ColumnBase<ColumnMappingBase>("Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase3);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings5.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)alternateIdColumnBase0, principalDerived.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase3, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings5 = new List<TableMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings5);
+            var principalBaseTableMapping1 = new TableMapping(principalDerived, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping1, false);
+            tableMappings5.Add(principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(alternateIdColumn, principalDerived.FindProperty("AlternateId")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(idColumn2, principalDerived.FindProperty("Id")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(enum1Column, principalDerived.FindProperty("Enum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(enum2Column, principalDerived.FindProperty("Enum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalDerived.FindProperty("FlagsEnum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalDerived.FindProperty("FlagsEnum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(pointColumn0, principalDerived.FindProperty("Point")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalDerived.FindProperty("RefTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalDerived.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalDerived.FindProperty("RefTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalDerived.FindProperty("RefTypeList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(stringWithCharSetColumn0, principalDerived.FindProperty("StringWithCharSet")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(stringWithCollationColumn0, principalDerived.FindProperty("StringWithCollation")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalDerived.FindProperty("ValueTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalDerived.FindProperty("ValueTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalDerived.FindProperty("ValueTypeList")!, principalBaseTableMapping1);
+            var principalDerivedTable = new Table("PrincipalDerived", null, relationalModel);
+            var derivedIdColumn = new Column("DerivedId", "bigint", principalDerivedTable);
+            principalDerivedTable.Columns.Add("DerivedId", derivedIdColumn);
+            var alternateIdColumn0 = new Column("AlternateId", "char(36)", principalDerivedTable);
+            principalDerivedTable.Columns.Add("AlternateId", alternateIdColumn0);
+            var aK_PrincipalDerived_DerivedId = new UniqueConstraint("AK_PrincipalDerived_DerivedId", principalDerivedTable, new[] { derivedIdColumn });
+            var aK_PrincipalDerived_DerivedIdUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            aK_PrincipalDerived_DerivedId.MappedKeys.Add(aK_PrincipalDerived_DerivedIdUc);
+            RelationalModel.GetOrCreateUniqueConstraints(aK_PrincipalDerived_DerivedIdUc).Add(aK_PrincipalDerived_DerivedId);
+            principalDerivedTable.UniqueConstraints.Add("AK_PrincipalDerived_DerivedId", aK_PrincipalDerived_DerivedId);
+            var pK0 = new UniqueConstraint("PK", principalDerivedTable, new[] { derivedIdColumn, alternateIdColumn0 });
+            principalDerivedTable.PrimaryKey = pK0;
+            var pK0Uc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            pK0.MappedKeys.Add(pK0Uc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK0Uc).Add(pK0);
+            principalDerivedTable.UniqueConstraints.Add("PK", pK0);
+            var iX_PrincipalDerived_AlternateId_DerivedId = new TableIndex(
+            "IX_PrincipalDerived_AlternateId_DerivedId", principalDerivedTable, new[] { alternateIdColumn0, derivedIdColumn }, false);
+            var iX_PrincipalDerived_AlternateId_DerivedIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "AlternateId", "Id" });
+            iX_PrincipalDerived_AlternateId_DerivedId.MappedIndexes.Add(iX_PrincipalDerived_AlternateId_DerivedIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalDerived_AlternateId_DerivedIdIx).Add(iX_PrincipalDerived_AlternateId_DerivedId);
+            principalDerivedTable.Indexes.Add("IX_PrincipalDerived_AlternateId_DerivedId", iX_PrincipalDerived_AlternateId_DerivedId);
+            relationalModel.Tables.Add(("PrincipalDerived", null), principalDerivedTable);
+            var principalDerivedTableMapping = new TableMapping(principalDerived, principalDerivedTable, null);
+            principalDerivedTable.AddTypeMapping(principalDerivedTableMapping, false);
+            tableMappings5.Add(principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(alternateIdColumn0, principalDerived.FindProperty("AlternateId")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(derivedIdColumn, principalDerived.FindProperty("Id")!, principalDerivedTableMapping);
+
+            var ownedType0 = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType")!;
+
+            var defaultTableMappings6 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedType0.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings6);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType", null, relationalModel);
+            var detailsColumnBase0 = new ColumnBase<ColumnMappingBase>("Details", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("Details", detailsColumnBase0);
+            var idColumnBase4 = new ColumnBase<ColumnMappingBase>("Id", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("Id", idColumnBase4);
+            var numberColumnBase0 = new ColumnBase<ColumnMappingBase>("Number", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("Number", numberColumnBase0);
+            var principalDerivedDependentBasebyteAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalDerived<DependentBase<byte?>>AlternateId", "char(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("PrincipalDerived<DependentBase<byte?>>AlternateId", principalDerivedDependentBasebyteAlternateIdColumnBase);
+            var principalDerivedDependentBasebyteIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalDerived<DependentBase<byte?>>Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumnBase);
+            var refTypeArrayColumnBase1 = new ColumnBase<ColumnMappingBase>("RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase1);
+            var refTypeEnumerableColumnBase1 = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase1);
+            var refTypeIListColumnBase1 = new ColumnBase<ColumnMappingBase>("RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase1);
+            var refTypeListColumnBase1 = new ColumnBase<ColumnMappingBase>("RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("RefTypeList", refTypeListColumnBase1);
+            var valueTypeArrayColumnBase1 = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase1);
+            var valueTypeEnumerableColumnBase1 = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase1);
+            var valueTypeIListColumnBase1 = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase1);
+            var valueTypeListColumnBase1 = new ColumnBase<ColumnMappingBase>("ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase1);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase = new TableMappingBase<ColumnMappingBase>(ownedType0, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase, false);
+            defaultTableMappings6.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase4, ownedType0.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalDerivedDependentBasebyteAlternateIdColumnBase, ownedType0.FindProperty("PrincipalDerivedAlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalDerivedDependentBasebyteIdColumnBase, ownedType0.FindProperty("PrincipalDerivedId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)detailsColumnBase0, ownedType0.FindProperty("Details")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)numberColumnBase0, ownedType0.FindProperty("Number")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase1, ownedType0.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase1, ownedType0.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase1, ownedType0.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase1, ownedType0.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase1, ownedType0.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase1, ownedType0.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase1, ownedType0.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase1, ownedType0.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteManyOwnedOwnedTypeMappingBase);
+
+            var tableMappings6 = new List<TableMapping>();
+            ownedType0.SetRuntimeAnnotation("Relational:TableMappings", tableMappings6);
+            var manyOwnedTable = new Table("ManyOwned", null, relationalModel);
+            var principalDerivedDependentBasebyteIdColumn = new Column("PrincipalDerived<DependentBase<byte?>>Id", "bigint", manyOwnedTable);
+            manyOwnedTable.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumn);
+            var principalDerivedDependentBasebyteAlternateIdColumn = new Column("PrincipalDerived<DependentBase<byte?>>AlternateId", "char(36)", manyOwnedTable);
+            manyOwnedTable.Columns.Add("PrincipalDerived<DependentBase<byte?>>AlternateId", principalDerivedDependentBasebyteAlternateIdColumn);
+            var idColumn3 = new Column("Id", "int", manyOwnedTable);
+            manyOwnedTable.Columns.Add("Id", idColumn3);
+            var detailsColumn0 = new Column("Details", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("Details", detailsColumn0);
+            var numberColumn = new Column("Number", "int", manyOwnedTable);
+            manyOwnedTable.Columns.Add("Number", numberColumn);
+            var refTypeArrayColumn0 = new Column("RefTypeArray", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("RefTypeArray", refTypeArrayColumn0);
+            var refTypeEnumerableColumn0 = new Column("RefTypeEnumerable", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn0);
+            var refTypeIListColumn0 = new Column("RefTypeIList", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("RefTypeIList", refTypeIListColumn0);
+            var refTypeListColumn0 = new Column("RefTypeList", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("RefTypeList", refTypeListColumn0);
+            var valueTypeArrayColumn0 = new Column("ValueTypeArray", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn0);
+            var valueTypeEnumerableColumn0 = new Column("ValueTypeEnumerable", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn0);
+            var valueTypeIListColumn0 = new Column("ValueTypeIList", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("ValueTypeIList", valueTypeIListColumn0);
+            var valueTypeListColumn0 = new Column("ValueTypeList", "longtext", manyOwnedTable)
+            {
+                IsNullable = true
+            };
+            manyOwnedTable.Columns.Add("ValueTypeList", valueTypeListColumn0);
+            var pK_ManyOwned = new UniqueConstraint("PK_ManyOwned", manyOwnedTable, new[] { principalDerivedDependentBasebyteIdColumn, principalDerivedDependentBasebyteAlternateIdColumn, idColumn3 });
+            manyOwnedTable.PrimaryKey = pK_ManyOwned;
+            var pK_ManyOwnedUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                new[] { "PrincipalDerivedId", "PrincipalDerivedAlternateId", "Id" });
+            pK_ManyOwned.MappedKeys.Add(pK_ManyOwnedUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_ManyOwnedUc).Add(pK_ManyOwned);
+            manyOwnedTable.UniqueConstraints.Add("PK_ManyOwned", pK_ManyOwned);
+            relationalModel.Tables.Add(("ManyOwned", null), manyOwnedTable);
+            var manyOwnedTableMapping = new TableMapping(ownedType0, manyOwnedTable, null);
+            manyOwnedTable.AddTypeMapping(manyOwnedTableMapping, false);
+            tableMappings6.Add(manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn3, ownedType0.FindProperty("Id")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(principalDerivedDependentBasebyteAlternateIdColumn, ownedType0.FindProperty("PrincipalDerivedAlternateId")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(principalDerivedDependentBasebyteIdColumn, ownedType0.FindProperty("PrincipalDerivedId")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(detailsColumn0, ownedType0.FindProperty("Details")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(numberColumn, ownedType0.FindProperty("Number")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn0, ownedType0.FindProperty("RefTypeArray")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn0, ownedType0.FindProperty("RefTypeEnumerable")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn0, ownedType0.FindProperty("RefTypeIList")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn0, ownedType0.FindProperty("RefTypeList")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn0, ownedType0.FindProperty("ValueTypeArray")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn0, ownedType0.FindProperty("ValueTypeEnumerable")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn0, ownedType0.FindProperty("ValueTypeIList")!, manyOwnedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn0, ownedType0.FindProperty("ValueTypeList")!, manyOwnedTableMapping);
+
+            var principalBasePrincipalDerivedDependentBasebyte = FindEntityType("PrincipalBasePrincipalDerived<DependentBase<byte?>>")!;
+
+            var defaultTableMappings7 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBasePrincipalDerivedDependentBasebyte.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings7);
+            var principalBasePrincipalDerivedDependentBasebyteTableBase = new TableBase("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null, relationalModel);
+            var derivedsAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("DerivedsAlternateId", "char(36)", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("DerivedsAlternateId", derivedsAlternateIdColumnBase);
+            var derivedsIdColumnBase = new ColumnBase<ColumnMappingBase>("DerivedsId", "bigint", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("DerivedsId", derivedsIdColumnBase);
+            var principalsAlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalsAlternateId", "char(36)", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("PrincipalsAlternateId", principalsAlternateIdColumnBase);
+            var principalsIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalsId", "bigint", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("PrincipalsId", principalsIdColumnBase);
+            var rowidColumnBase = new ColumnBase<ColumnMappingBase>("rowid", "timestamp(6)", principalBasePrincipalDerivedDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            principalBasePrincipalDerivedDependentBasebyteTableBase.Columns.Add("rowid", rowidColumnBase);
+            relationalModel.DefaultTables.Add("PrincipalBasePrincipalDerived<DependentBase<byte?>>", principalBasePrincipalDerivedDependentBasebyteTableBase);
+            var principalBasePrincipalDerivedDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(principalBasePrincipalDerivedDependentBasebyte, principalBasePrincipalDerivedDependentBasebyteTableBase, null);
+            principalBasePrincipalDerivedDependentBasebyteTableBase.AddTypeMapping(principalBasePrincipalDerivedDependentBasebyteMappingBase, false);
+            defaultTableMappings7.Add(principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)derivedsAlternateIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)derivedsIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalsAlternateIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalsIdColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsId")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)rowidColumnBase, principalBasePrincipalDerivedDependentBasebyte.FindProperty("rowid")!, principalBasePrincipalDerivedDependentBasebyteMappingBase);
+
+            var tableMappings7 = new List<TableMapping>();
+            principalBasePrincipalDerivedDependentBasebyte.SetRuntimeAnnotation("Relational:TableMappings", tableMappings7);
+            var principalBasePrincipalDerivedDependentBasebyteTable = new Table("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null, relationalModel);
+            var derivedsIdColumn = new Column("DerivedsId", "bigint", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("DerivedsId", derivedsIdColumn);
+            var derivedsAlternateIdColumn = new Column("DerivedsAlternateId", "char(36)", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("DerivedsAlternateId", derivedsAlternateIdColumn);
+            var principalsIdColumn = new Column("PrincipalsId", "bigint", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("PrincipalsId", principalsIdColumn);
+            var principalsAlternateIdColumn = new Column("PrincipalsAlternateId", "char(36)", principalBasePrincipalDerivedDependentBasebyteTable);
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("PrincipalsAlternateId", principalsAlternateIdColumn);
+            var rowidColumn = new Column("rowid", "timestamp(6)", principalBasePrincipalDerivedDependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            principalBasePrincipalDerivedDependentBasebyteTable.Columns.Add("rowid", rowidColumn);
+            var pK_PrincipalBasePrincipalDerivedDependentBasebyte = new UniqueConstraint("PK_PrincipalBasePrincipalDerived<DependentBase<byte?>>", principalBasePrincipalDerivedDependentBasebyteTable, new[] { derivedsIdColumn, derivedsAlternateIdColumn, principalsIdColumn, principalsAlternateIdColumn });
+            principalBasePrincipalDerivedDependentBasebyteTable.PrimaryKey = pK_PrincipalBasePrincipalDerivedDependentBasebyte;
+            var pK_PrincipalBasePrincipalDerivedDependentBasebyteUc = RelationalModel.GetKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "DerivedsId", "DerivedsAlternateId", "PrincipalsId", "PrincipalsAlternateId" });
+            pK_PrincipalBasePrincipalDerivedDependentBasebyte.MappedKeys.Add(pK_PrincipalBasePrincipalDerivedDependentBasebyteUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalBasePrincipalDerivedDependentBasebyteUc).Add(pK_PrincipalBasePrincipalDerivedDependentBasebyte);
+            principalBasePrincipalDerivedDependentBasebyteTable.UniqueConstraints.Add("PK_PrincipalBasePrincipalDerived<DependentBase<byte?>>", pK_PrincipalBasePrincipalDerivedDependentBasebyte);
+            var iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa = new TableIndex(
+            "IX_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", principalBasePrincipalDerivedDependentBasebyteTable, new[] { principalsIdColumn, principalsAlternateIdColumn }, false);
+            var iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx = RelationalModel.GetIndex(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "PrincipalsId", "PrincipalsAlternateId" });
+            iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.MappedIndexes.Add(iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaIx).Add(iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalBasePrincipalDerivedDependentBasebyteTable.Indexes.Add("IX_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", iX_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            relationalModel.Tables.Add(("PrincipalBasePrincipalDerived<DependentBase<byte?>>", null), principalBasePrincipalDerivedDependentBasebyteTable);
+            var principalBasePrincipalDerivedDependentBasebyteTableMapping = new TableMapping(principalBasePrincipalDerivedDependentBasebyte, principalBasePrincipalDerivedDependentBasebyteTable, null);
+            principalBasePrincipalDerivedDependentBasebyteTable.AddTypeMapping(principalBasePrincipalDerivedDependentBasebyteTableMapping, false);
+            tableMappings7.Add(principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(derivedsAlternateIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(derivedsIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("DerivedsId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalsAlternateIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsAlternateId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalsIdColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("PrincipalsId")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(rowidColumn, principalBasePrincipalDerivedDependentBasebyte.FindProperty("rowid")!, principalBasePrincipalDerivedDependentBasebyteTableMapping);
+            var fK_DependentBasebyte_PrincipalBase_PrincipalId = new ForeignKeyConstraint(
+                "FK_DependentBase<byte?>_PrincipalBase_PrincipalId", dependentBasebyteTable, principalBaseTable,
+                new[] { principalIdColumn },
+                principalBaseTable.FindUniqueConstraint("AK_PrincipalBase_Id")!, ReferentialAction.Cascade);
+            var fK_DependentBasebyte_PrincipalBase_PrincipalIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            fK_DependentBasebyte_PrincipalBase_PrincipalId.MappedForeignKeys.Add(fK_DependentBasebyte_PrincipalBase_PrincipalIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_DependentBasebyte_PrincipalBase_PrincipalIdFk).Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            dependentBasebyteTable.ForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalBase_PrincipalId);
+            var fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA = new ForeignKeyConstraint(
+                "FK_DependentBase<byte?>_PrincipalDerived_PrincipalId_PrincipalA~", dependentBasebyteTable, principalDerivedTable,
+                new[] { principalIdColumn, principalAlternateIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK")!, ReferentialAction.NoAction);
+            var fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalAFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId", "PrincipalAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" });
+            fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA.MappedForeignKeys.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalAFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalAFk).Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA);
+            dependentBasebyteTable.ForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId_PrincipalA);
+            var fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate = new ForeignKeyConstraint(
+                "FK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate~", detailsTable, principalBaseTable,
+                new[] { principalBaseIdColumn, principalBaseAlternateIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            var fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternateFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                new[] { "PrincipalBaseId", "PrincipalBaseAlternateId" });
+            fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate.MappedForeignKeys.Add(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternateFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternateFk).Add(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate);
+            detailsTable.ForeignKeyConstraints.Add(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_Details_PrincipalBase_PrincipalBaseId_PrincipalBaseAlternate);
+            var fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby = new ForeignKeyConstraint(
+                "FK_ManyOwned_PrincipalDerived_PrincipalDerived<DependentBase<by~", manyOwnedTable, principalDerivedTable,
+                new[] { principalDerivedDependentBasebyteIdColumn, principalDerivedDependentBasebyteAlternateIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            var fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBasebyFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                new[] { "PrincipalDerivedId", "PrincipalDerivedAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" });
+            fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby.MappedForeignKeys.Add(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBasebyFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBasebyFk).Add(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby);
+            manyOwnedTable.ForeignKeyConstraints.Add(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_ManyOwned_PrincipalDerived_PrincipalDerivedDependentBaseby);
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa = new ForeignKeyConstraint(
+                "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Principa~", principalBasePrincipalDerivedDependentBasebyteTable, principalDerivedTable,
+                new[] { derivedsIdColumn, derivedsAlternateIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk = RelationalModel.GetForeignKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "DerivedsId", "DerivedsAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" });
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa.MappedForeignKeys.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBasePrincipalDerivedDependentBasebyte_PrincipaFk).Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalBasePrincipalDerivedDependentBasebyteTable.ForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Principa);
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1 = new ForeignKeyConstraint(
+                "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Princip~1", principalBasePrincipalDerivedDependentBasebyteTable, principalBaseTable,
+                new[] { principalsIdColumn, principalsAlternateIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            var fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk = RelationalModel.GetForeignKey(this,
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                new[] { "PrincipalsId", "PrincipalsAlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1.MappedForeignKeys.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1Fk).Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            principalBasePrincipalDerivedDependentBasebyteTable.ForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBasePrincipalDerivedDependentBasebyte_Princip1);
+            var fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId = new ForeignKeyConstraint(
+                "FK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId", principalDerivedTable, principalBaseTable,
+                new[] { derivedIdColumn, alternateIdColumn0 },
+                principalBaseTable.FindUniqueConstraint("PK")!, ReferentialAction.Cascade);
+            var fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id", "AlternateId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id", "AlternateId" });
+            fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId.MappedForeignKeys.Add(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateIdFk).Add(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId);
+            principalDerivedTable.ForeignKeyConstraints.Add(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalDerived_PrincipalBase_DerivedId_AlternateId);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs
new file mode 100644
index 000000000..9f6286a9c
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs
@@ -0,0 +1,192 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class DependentBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                baseEntityType,
+                discriminatorProperty: "EnumDiscriminator",
+                discriminatorValue: CompiledModelTestBase.Enum1.One,
+                derivedTypesCount: 1,
+                propertyCount: 4,
+                navigationCount: 1,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var principalId = runtimeEntityType.AddProperty(
+                "PrincipalId",
+                typeof(long),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0L);
+            principalId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v));
+            principalId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalAlternateId",
+                typeof(Guid),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalAlternateId.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v));
+            principalAlternateId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumDiscriminator = runtimeEntityType.AddProperty(
+                "EnumDiscriminator",
+                typeof(CompiledModelTestBase.Enum1),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                valueGeneratorFactory: new DiscriminatorValueGeneratorFactory().Create);
+            enumDiscriminator.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum1>(
+                    (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum1 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum1 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum1>(
+                    (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum1 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum1 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum1, int>(
+                    (CompiledModelTestBase.Enum1 value) => (int)value,
+                    (int value) => (CompiledModelTestBase.Enum1)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum1, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum1, int>(
+                        (CompiledModelTestBase.Enum1 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum1)value)));
+            enumDiscriminator.SetSentinelFromProviderValue(0);
+            enumDiscriminator.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Id", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            id.TypeMapping = MySqlByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)),
+                keyComparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)),
+                providerValueComparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)));
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalId, principalAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalId },
+                unique: true);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId"), declaringEntityType.FindProperty("PrincipalAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientNoAction,
+                unique: true,
+                required: true);
+
+            var principal = declaringEntityType.AddNavigation("Principal",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dependent = principalEntityType.AddNavigation("Dependent",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Dependent", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Dependent>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true,
+                lazyLoadingEnabled: false);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("DiscriminatorMappingComplete", false);
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPH");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs
new file mode 100644
index 000000000..6bdeb8f9c
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs
@@ -0,0 +1,99 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class DependentDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentDerived<byte?>",
+                typeof(CompiledModelTestBase.DependentDerived<byte?>),
+                baseEntityType,
+                discriminatorProperty: "EnumDiscriminator",
+                discriminatorValue: CompiledModelTestBase.Enum1.Two,
+                propertyCount: 2);
+
+            var data = runtimeEntityType.AddProperty(
+                "Data",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.DependentDerived<byte?>).GetProperty("Data", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentDerived<byte?>).GetField("<Data>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                maxLength: 20,
+                unicode: false);
+            data.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(20)",
+                    size: 20,
+                    unicode: false,
+                    fixedLength: true,
+                    dbType: System.Data.DbType.StringFixedLength));
+            data.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+            data.AddAnnotation("Relational:IsFixedLength", true);
+
+            var money = runtimeEntityType.AddProperty(
+                "Money",
+                typeof(decimal),
+                precision: 9,
+                scale: 3,
+                sentinel: 0m);
+            money.TypeMapping = MySqlDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "decimal(9,3)",
+                    precision: 9,
+                    scale: 3));
+            money.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs
new file mode 100644
index 000000000..4a7879593
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs
@@ -0,0 +1,9246 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Reflection;
+using System.Text;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class ManyTypesEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+ManyTypes",
+                typeof(CompiledModelTestBase.ManyTypes),
+                baseEntityType,
+                propertyCount: 236,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(CompiledModelTestBase.ManyTypesId),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                valueConverter: new CompiledModelTestBase.ManyTypesIdConverter());
+            id.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.ManyTypesId>(
+                    (CompiledModelTestBase.ManyTypesId v1, CompiledModelTestBase.ManyTypesId v2) => v1.Equals(v2),
+                    (CompiledModelTestBase.ManyTypesId v) => v.GetHashCode(),
+                    (CompiledModelTestBase.ManyTypesId v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.ManyTypesId>(
+                    (CompiledModelTestBase.ManyTypesId v1, CompiledModelTestBase.ManyTypesId v2) => v1.Equals(v2),
+                    (CompiledModelTestBase.ManyTypesId v) => v.GetHashCode(),
+                    (CompiledModelTestBase.ManyTypesId v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.ManyTypesId, int>(
+                    (CompiledModelTestBase.ManyTypesId v) => v.Id,
+                    (int v) => new CompiledModelTestBase.ManyTypesId(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.ManyTypesId, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.ManyTypesId, int>(
+                        (CompiledModelTestBase.ManyTypesId v) => v.Id,
+                        (int v) => new CompiledModelTestBase.ManyTypesId(v))));
+            id.SetSentinelFromProviderValue(0);
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            var @bool = runtimeEntityType.AddProperty(
+                "Bool",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Bool", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Bool>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: false);
+            @bool.TypeMapping = MySqlBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v));
+            @bool.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var boolArray = runtimeEntityType.AddProperty(
+                "BoolArray",
+                typeof(bool[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<bool>(new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v)),
+                keyComparer: new ListComparer<bool>(new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<bool>(new JsonCollectionReaderWriter<bool[], bool[], bool>(
+                    JsonBoolReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<bool[], bool[], bool>(
+                    JsonBoolReaderWriter.Instance),
+                elementMapping: MySqlBoolTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<bool>(
+                        (bool v1, bool v2) => v1 == v2,
+                        (bool v) => v.GetHashCode(),
+                        (bool v) => v),
+                    keyComparer: new ValueComparer<bool>(
+                        (bool v1, bool v2) => v1 == v2,
+                        (bool v) => v.GetHashCode(),
+                        (bool v) => v),
+                    providerValueComparer: new ValueComparer<bool>(
+                        (bool v1, bool v2) => v1 == v2,
+                        (bool v) => v.GetHashCode(),
+                        (bool v) => v)));
+            boolArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var boolToStringConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToStringConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<bool, string>(
+                    (bool v) => (string)(v ? "B" : "A"),
+                    (string v) => !string.IsNullOrEmpty(v) && (int)v.ToUpperInvariant()[0] == (int)'B'),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<bool, string>(
+                        (bool v) => (string)(v ? "B" : "A"),
+                        (string v) => !string.IsNullOrEmpty(v) && (int)v.ToUpperInvariant()[0] == (int)'B')));
+            boolToStringConverterProperty.SetSentinelFromProviderValue("A");
+            boolToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var boolToTwoValuesConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToTwoValuesConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToTwoValuesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToTwoValuesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            boolToTwoValuesConverterProperty.TypeMapping = MySqlByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v),
+                converter: new ValueConverter<bool, byte>(
+                    (bool v) => (byte)(v ? 1 : 0),
+                    (byte v) => v == 1),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<bool, byte>(
+                        (bool v) => (byte)(v ? 1 : 0),
+                        (byte v) => v == 1)));
+            boolToTwoValuesConverterProperty.SetSentinelFromProviderValue((byte)0);
+            boolToTwoValuesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var boolToZeroOneConverterProperty = runtimeEntityType.AddProperty(
+                "BoolToZeroOneConverterProperty",
+                typeof(bool),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BoolToZeroOneConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BoolToZeroOneConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new BoolToZeroOneConverter<short>());
+            boolToZeroOneConverterProperty.TypeMapping = MySqlShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v),
+                converter: new ValueConverter<bool, short>(
+                    (bool v) => (short)(v ? 1 : 0),
+                    (short v) => v == 1),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<bool, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<bool, short>(
+                        (bool v) => (short)(v ? 1 : 0),
+                        (short v) => v == 1)));
+            boolToZeroOneConverterProperty.SetSentinelFromProviderValue((short)0);
+            boolToZeroOneConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var bytes = runtimeEntityType.AddProperty(
+                "Bytes",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Bytes", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Bytes>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            bytes.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()));
+            bytes.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var bytesArray = runtimeEntityType.AddProperty(
+                "BytesArray",
+                typeof(byte[][]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BytesArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BytesArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            bytesArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte[]>(new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v)),
+                keyComparer: new ListComparer<byte[]>(new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte[]>(new JsonCollectionReaderWriter<byte[][], byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<byte[][], byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance),
+                elementMapping: MySqlByteArrayTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte[]>(
+                        (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                        (Byte[] v) => v.GetHashCode(),
+                        (Byte[] v) => v),
+                    keyComparer: new ValueComparer<byte[]>(
+                        (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                        (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                        (Byte[] source) => source.ToArray()),
+                    providerValueComparer: new ValueComparer<byte[]>(
+                        (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                        (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                        (Byte[] source) => source.ToArray())));
+            bytesArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var bytesToStringConverterProperty = runtimeEntityType.AddProperty(
+                "BytesToStringConverterProperty",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("BytesToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<BytesToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new BytesToStringConverter(),
+                valueComparer: new ArrayStructuralComparer<byte>());
+            bytesToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] v) => v.ToArray()),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] v) => v.ToArray()),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<byte[], string>(
+                    (Byte[] v) => Convert.ToBase64String(v),
+                    (string v) => Convert.FromBase64String(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<byte[], string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<byte[], string>(
+                        (Byte[] v) => Convert.ToBase64String(v),
+                        (string v) => Convert.FromBase64String(v))));
+            bytesToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var castingConverterProperty = runtimeEntityType.AddProperty(
+                "CastingConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CastingConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CastingConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new CastingConverter<int, decimal>());
+            castingConverterProperty.TypeMapping = MySqlDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                converter: new ValueConverter<int, decimal>(
+                    (int v) => (decimal)v,
+                    (decimal v) => (int)v),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<int, decimal>(
+                        (int v) => (decimal)v,
+                        (decimal v) => (int)v)));
+            castingConverterProperty.SetSentinelFromProviderValue(0m);
+            castingConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var @char = runtimeEntityType.AddProperty(
+                "Char",
+                typeof(char),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Char", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Char>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            @char.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char>(
+                    (char v1, char v2) => v1 == v2,
+                    (char v) => (int)v,
+                    (char v) => v),
+                keyComparer: new ValueComparer<char>(
+                    (char v1, char v2) => v1 == v2,
+                    (char v) => (int)v,
+                    (char v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<char, string>(
+                    (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                    (string v) => v.Length < 1 ? '\0' : v[0]),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                        (string v) => v.Length < 1 ? '\0' : v[0])));
+            @char.SetSentinelFromProviderValue("\0");
+            @char.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var charArray = runtimeEntityType.AddProperty(
+                "CharArray",
+                typeof(char[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CharArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CharArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            charArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<char>(new ValueComparer<char>(
+                    (char v1, char v2) => v1 == v2,
+                    (char v) => (int)v,
+                    (char v) => v)),
+                keyComparer: new ListComparer<char>(new ValueComparer<char>(
+                    (char v1, char v2) => v1 == v2,
+                    (char v) => (int)v,
+                    (char v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<char>(new JsonCollectionReaderWriter<char[], char[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                            (string v) => v.Length < 1 ? '\0' : v[0])))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<char[], char[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                            (string v) => v.Length < 1 ? '\0' : v[0]))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<char>(
+                        (char v1, char v2) => v1 == v2,
+                        (char v) => (int)v,
+                        (char v) => v),
+                    keyComparer: new ValueComparer<char>(
+                        (char v1, char v2) => v1 == v2,
+                        (char v) => (int)v,
+                        (char v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(1)",
+                        size: 1),
+                    converter: new ValueConverter<char, string>(
+                        (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                        (string v) => v.Length < 1 ? '\0' : v[0]),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                            (string v) => v.Length < 1 ? '\0' : v[0]))));
+            charArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var charToStringConverterProperty = runtimeEntityType.AddProperty(
+                "CharToStringConverterProperty",
+                typeof(char),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("CharToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<CharToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new CharToStringConverter());
+            charToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char>(
+                    (char v1, char v2) => v1 == v2,
+                    (char v) => (int)v,
+                    (char v) => v),
+                keyComparer: new ValueComparer<char>(
+                    (char v1, char v2) => v1 == v2,
+                    (char v) => (int)v,
+                    (char v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<char, string>(
+                    (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                    (string v) => v.Length < 1 ? '\0' : v[0]),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                        (string v) => v.Length < 1 ? '\0' : v[0])));
+            charToStringConverterProperty.SetSentinelFromProviderValue("\0");
+            charToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateOnly = runtimeEntityType.AddProperty(
+                "DateOnly",
+                typeof(DateOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateOnly(1, 1, 1));
+            dateOnly.TypeMapping = MySqlDateTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly>(
+                    (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    (DateOnly v) => v.GetHashCode(),
+                    (DateOnly v) => v),
+                keyComparer: new ValueComparer<DateOnly>(
+                    (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    (DateOnly v) => v.GetHashCode(),
+                    (DateOnly v) => v),
+                providerValueComparer: new ValueComparer<DateOnly>(
+                    (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    (DateOnly v) => v.GetHashCode(),
+                    (DateOnly v) => v));
+            dateOnly.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateOnlyArray = runtimeEntityType.AddProperty(
+                "DateOnlyArray",
+                typeof(DateOnly[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            dateOnlyArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<DateOnly>(new ValueComparer<DateOnly>(
+                    (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    (DateOnly v) => v.GetHashCode(),
+                    (DateOnly v) => v)),
+                keyComparer: new ListComparer<DateOnly>(new ValueComparer<DateOnly>(
+                    (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    (DateOnly v) => v.GetHashCode(),
+                    (DateOnly v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateOnly>(new JsonCollectionReaderWriter<DateOnly[], DateOnly[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<DateOnly[], DateOnly[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance),
+                elementMapping: MySqlDateTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateOnly>(
+                        (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        (DateOnly v) => v.GetHashCode(),
+                        (DateOnly v) => v),
+                    keyComparer: new ValueComparer<DateOnly>(
+                        (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        (DateOnly v) => v.GetHashCode(),
+                        (DateOnly v) => v),
+                    providerValueComparer: new ValueComparer<DateOnly>(
+                        (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        (DateOnly v) => v.GetHashCode(),
+                        (DateOnly v) => v)));
+            dateOnlyArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateOnlyToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateOnlyToStringConverterProperty",
+                typeof(DateOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateOnlyToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateOnlyToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateOnlyToStringConverter());
+            dateOnlyToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly>(
+                    (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    (DateOnly v) => v.GetHashCode(),
+                    (DateOnly v) => v),
+                keyComparer: new ValueComparer<DateOnly>(
+                    (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    (DateOnly v) => v.GetHashCode(),
+                    (DateOnly v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(10)",
+                    size: 10),
+                converter: new ValueConverter<DateOnly, string>(
+                    (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"),
+                    (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateOnly, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateOnly, string>(
+                        (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"),
+                        (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None))));
+            dateOnlyToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01");
+            dateOnlyToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateTime = runtimeEntityType.AddProperty(
+                "DateTime",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+            dateTime.TypeMapping = MySqlDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "datetime(6)",
+                    precision: 6));
+            dateTime.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateTimeArray = runtimeEntityType.AddProperty(
+                "DateTimeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            dateTimeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                keyComparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "datetime(6)",
+                        precision: 6)));
+            dateTimeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateTimeOffsetToBinaryConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToBinaryConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToBinaryConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToBinaryConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToBinaryConverter());
+            dateTimeOffsetToBinaryConverterProperty.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    (DateTimeOffset v) => v.GetHashCode(),
+                    (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    (DateTimeOffset v) => v.GetHashCode(),
+                    (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                converter: new ValueConverter<DateTimeOffset, long>(
+                    (DateTimeOffset v) => DateTimeOffsetToBinaryConverter.ToLong(v),
+                    (long v) => DateTimeOffsetToBinaryConverter.ToDateTimeOffset(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, long>(
+                        (DateTimeOffset v) => DateTimeOffsetToBinaryConverter.ToLong(v),
+                        (long v) => DateTimeOffsetToBinaryConverter.ToDateTimeOffset(v))));
+            dateTimeOffsetToBinaryConverterProperty.SetSentinelFromProviderValue(0L);
+            dateTimeOffsetToBinaryConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateTimeOffsetToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToBytesConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToBytesConverter());
+            dateTimeOffsetToBytesConverterProperty.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    (DateTimeOffset v) => v.GetHashCode(),
+                    (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    (DateTimeOffset v) => v.GetHashCode(),
+                    (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(12)",
+                    size: 12),
+                converter: new ValueConverter<DateTimeOffset, byte[]>(
+                    (DateTimeOffset v) => DateTimeOffsetToBytesConverter.ToBytes(v),
+                    (Byte[] v) => DateTimeOffsetToBytesConverter.FromBytes(v)),
+                storeTypePostfix: StoreTypePostfix.Size,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, byte[]>(
+                        (DateTimeOffset v) => DateTimeOffsetToBytesConverter.ToBytes(v),
+                        (Byte[] v) => DateTimeOffsetToBytesConverter.FromBytes(v))));
+            dateTimeOffsetToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+            dateTimeOffsetToBytesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateTimeOffsetToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeOffsetToStringConverterProperty",
+                typeof(DateTimeOffset),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeOffsetToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeOffsetToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeOffsetToStringConverter());
+            dateTimeOffsetToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTimeOffset>(
+                    (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    (DateTimeOffset v) => v.GetHashCode(),
+                    (DateTimeOffset v) => v),
+                keyComparer: new ValueComparer<DateTimeOffset>(
+                    (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    (DateTimeOffset v) => v.GetHashCode(),
+                    (DateTimeOffset v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<DateTimeOffset, string>(
+                    (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"),
+                    (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTimeOffset, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateTimeOffset, string>(
+                        (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"),
+                        (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture))));
+            dateTimeOffsetToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01 00:00:00+00:00");
+            dateTimeOffsetToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateTimeToBinaryConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToBinaryConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToBinaryConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToBinaryConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeToBinaryConverter());
+            dateTimeToBinaryConverterProperty.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                converter: new ValueConverter<DateTime, long>(
+                    (DateTime v) => v.ToBinary(),
+                    (long v) => DateTime.FromBinary(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTime, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<DateTime, long>(
+                        (DateTime v) => v.ToBinary(),
+                        (long v) => DateTime.FromBinary(v))));
+            dateTimeToBinaryConverterProperty.SetSentinelFromProviderValue(0L);
+            dateTimeToBinaryConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateTimeToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToStringConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new DateTimeToStringConverter());
+            dateTimeToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<DateTime, string>(
+                    (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"),
+                    (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<DateTime, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<DateTime, string>(
+                        (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"),
+                        (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture))));
+            dateTimeToStringConverterProperty.SetSentinelFromProviderValue("0001-01-01 00:00:00");
+            dateTimeToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var dateTimeToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "DateTimeToTicksConverterProperty",
+                typeof(DateTime),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DateTimeToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DateTimeToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+            dateTimeToTicksConverterProperty.TypeMapping = MySqlDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                keyComparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "datetime(6)",
+                    precision: 6));
+            dateTimeToTicksConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var @decimal = runtimeEntityType.AddProperty(
+                "Decimal",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Decimal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Decimal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0m);
+            @decimal.TypeMapping = MySqlDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v));
+            @decimal.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var decimalArray = runtimeEntityType.AddProperty(
+                "DecimalArray",
+                typeof(decimal[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            decimalArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<decimal>(new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v)),
+                keyComparer: new ListComparer<decimal>(new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<decimal>(new JsonCollectionReaderWriter<decimal[], decimal[], decimal>(
+                    JsonDecimalReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<decimal[], decimal[], decimal>(
+                    JsonDecimalReaderWriter.Instance),
+                elementMapping: MySqlDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<decimal>(
+                        (decimal v1, decimal v2) => v1 == v2,
+                        (decimal v) => v.GetHashCode(),
+                        (decimal v) => v),
+                    keyComparer: new ValueComparer<decimal>(
+                        (decimal v1, decimal v2) => v1 == v2,
+                        (decimal v) => v.GetHashCode(),
+                        (decimal v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        (decimal v1, decimal v2) => v1 == v2,
+                        (decimal v) => v.GetHashCode(),
+                        (decimal v) => v)));
+            decimalArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var decimalNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DecimalNumberToBytesConverterProperty",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<decimal>());
+            decimalNumberToBytesConverterProperty.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<decimal, byte[]>(
+                    (decimal v) => NumberToBytesConverter<decimal>.DecimalToBytes(v),
+                    (Byte[] v) => v == null ? 0M : NumberToBytesConverter<decimal>.BytesToDecimal(v)),
+                storeTypePostfix: StoreTypePostfix.Size,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<decimal, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<decimal, byte[]>(
+                        (decimal v) => NumberToBytesConverter<decimal>.DecimalToBytes(v),
+                        (Byte[] v) => v == null ? 0M : NumberToBytesConverter<decimal>.BytesToDecimal(v))));
+            decimalNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+            decimalNumberToBytesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var decimalNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DecimalNumberToStringConverterProperty",
+                typeof(decimal),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DecimalNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DecimalNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<decimal>());
+            decimalNumberToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                keyComparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<decimal, string>(
+                    (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                    (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<decimal, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<decimal, string>(
+                        (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                        (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            decimalNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+            decimalNumberToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var @double = runtimeEntityType.AddProperty(
+                "Double",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Double", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Double>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0.0);
+            @double.TypeMapping = MySqlDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v),
+                providerValueComparer: new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v));
+            @double.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var doubleArray = runtimeEntityType.AddProperty(
+                "DoubleArray",
+                typeof(double[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            doubleArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<double>(new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v)),
+                keyComparer: new ListComparer<double>(new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<double>(new JsonCollectionReaderWriter<double[], double[], double>(
+                    JsonDoubleReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<double[], double[], double>(
+                    JsonDoubleReaderWriter.Instance),
+                elementMapping: MySqlDoubleTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<double>(
+                        (double v1, double v2) => v1.Equals(v2),
+                        (double v) => v.GetHashCode(),
+                        (double v) => v),
+                    keyComparer: new ValueComparer<double>(
+                        (double v1, double v2) => v1.Equals(v2),
+                        (double v) => v.GetHashCode(),
+                        (double v) => v),
+                    providerValueComparer: new ValueComparer<double>(
+                        (double v1, double v2) => v1.Equals(v2),
+                        (double v) => v.GetHashCode(),
+                        (double v) => v)));
+            doubleArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var doubleNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "DoubleNumberToBytesConverterProperty",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<double>());
+            doubleNumberToBytesConverterProperty.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(8)",
+                    size: 8),
+                converter: new ValueConverter<double, byte[]>(
+                    (double v) => NumberToBytesConverter<double>.ReverseLong(BitConverter.GetBytes(v)),
+                    (Byte[] v) => v == null ? 0D : BitConverter.ToDouble(NumberToBytesConverter<double>.ReverseLong(v), 0)),
+                storeTypePostfix: StoreTypePostfix.Size,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<double, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<double, byte[]>(
+                        (double v) => NumberToBytesConverter<double>.ReverseLong(BitConverter.GetBytes(v)),
+                        (Byte[] v) => v == null ? 0D : BitConverter.ToDouble(NumberToBytesConverter<double>.ReverseLong(v), 0))));
+            doubleNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+            doubleNumberToBytesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var doubleNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "DoubleNumberToStringConverterProperty",
+                typeof(double),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("DoubleNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<DoubleNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<double>());
+            doubleNumberToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v),
+                keyComparer: new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<double, string>(
+                    (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", (object)v),
+                    (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<double, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<double, string>(
+                        (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", (object)v),
+                        (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            doubleNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+            doubleNumberToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum16 = runtimeEntityType.AddProperty(
+                "Enum16",
+                typeof(CompiledModelTestBase.Enum16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16.TypeMapping = MySqlShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    (CompiledModelTestBase.Enum16 value) => (short)value,
+                    (short value) => (CompiledModelTestBase.Enum16)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value)));
+            enum16.SetSentinelFromProviderValue((short)0);
+            enum16.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum16Array = runtimeEntityType.AddProperty(
+                "Enum16Array",
+                typeof(CompiledModelTestBase.Enum16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))));
+            enum16Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum16AsString = runtimeEntityType.AddProperty(
+                "Enum16AsString",
+                typeof(CompiledModelTestBase.Enum16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum16AsString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                    (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))));
+            enum16AsString.SetSentinelFromProviderValue("Default");
+            enum16AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum16AsStringArray = runtimeEntityType.AddProperty(
+                "Enum16AsStringArray",
+                typeof(CompiledModelTestBase.Enum16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))));
+            enum16AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum16AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum16AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum16>, List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum16>, List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                        (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, string>(
+                            (CompiledModelTestBase.Enum16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum16, string, CompiledModelTestBase.Enum16>.ConvertToEnum(v)))));
+            enum16AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum16Collection = runtimeEntityType.AddProperty(
+                "Enum16Collection",
+                typeof(List<CompiledModelTestBase.Enum16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum16Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16>(
+                    (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum16>, List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum16>, List<CompiledModelTestBase.Enum16>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))));
+            enum16Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum32 = runtimeEntityType.AddProperty(
+                "Enum32",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    (CompiledModelTestBase.Enum32 value) => (int)value,
+                    (int value) => (CompiledModelTestBase.Enum32)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value)));
+            enum32.SetSentinelFromProviderValue(0);
+            enum32.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum32Array = runtimeEntityType.AddProperty(
+                "Enum32Array",
+                typeof(CompiledModelTestBase.Enum32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))),
+                elementMapping: MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))));
+            enum32Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum32AsString = runtimeEntityType.AddProperty(
+                "Enum32AsString",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum32AsString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                    (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))));
+            enum32AsString.SetSentinelFromProviderValue("Default");
+            enum32AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum32AsStringArray = runtimeEntityType.AddProperty(
+                "Enum32AsStringArray",
+                typeof(CompiledModelTestBase.Enum32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))));
+            enum32AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum32AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum32AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum32>, List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum32>, List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                            (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)))));
+            enum32AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum32Collection = runtimeEntityType.AddProperty(
+                "Enum32Collection",
+                typeof(List<CompiledModelTestBase.Enum32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum32Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum32>, List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum32>, List<CompiledModelTestBase.Enum32>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))),
+                elementMapping: MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))));
+            enum32Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum64 = runtimeEntityType.AddProperty(
+                "Enum64",
+                typeof(CompiledModelTestBase.Enum64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    (CompiledModelTestBase.Enum64 value) => (long)value,
+                    (long value) => (CompiledModelTestBase.Enum64)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value)));
+            enum64.SetSentinelFromProviderValue(0L);
+            enum64.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum64Array = runtimeEntityType.AddProperty(
+                "Enum64Array",
+                typeof(CompiledModelTestBase.Enum64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))),
+                elementMapping: MySqlLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))));
+            enum64Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum64AsString = runtimeEntityType.AddProperty(
+                "Enum64AsString",
+                typeof(CompiledModelTestBase.Enum64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum64AsString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                    (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))));
+            enum64AsString.SetSentinelFromProviderValue("Default");
+            enum64AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum64AsStringArray = runtimeEntityType.AddProperty(
+                "Enum64AsStringArray",
+                typeof(CompiledModelTestBase.Enum64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))));
+            enum64AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum64AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum64AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum64>, List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum64>, List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                        (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, string>(
+                            (CompiledModelTestBase.Enum64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum64, string, CompiledModelTestBase.Enum64>.ConvertToEnum(v)))));
+            enum64AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum64Collection = runtimeEntityType.AddProperty(
+                "Enum64Collection",
+                typeof(List<CompiledModelTestBase.Enum64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum64Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64>(
+                    (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum64>, List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum64>, List<CompiledModelTestBase.Enum64>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))),
+                elementMapping: MySqlLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))));
+            enum64Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum8 = runtimeEntityType.AddProperty(
+                "Enum8",
+                typeof(CompiledModelTestBase.Enum8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8.TypeMapping = MySqlSByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<sbyte>(
+                    (sbyte v1, sbyte v2) => v1 == v2,
+                    (sbyte v) => (int)v,
+                    (sbyte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                    (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                    (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                    JsonSByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value)));
+            enum8.SetSentinelFromProviderValue((sbyte)0);
+            enum8.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum8Array = runtimeEntityType.AddProperty(
+                "Enum8Array",
+                typeof(CompiledModelTestBase.Enum8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))),
+                elementMapping: MySqlSByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))));
+            enum8Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum8AsString = runtimeEntityType.AddProperty(
+                "Enum8AsString",
+                typeof(CompiledModelTestBase.Enum8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enum8AsString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                    (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))));
+            enum8AsString.SetSentinelFromProviderValue("Default");
+            enum8AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum8AsStringArray = runtimeEntityType.AddProperty(
+                "Enum8AsStringArray",
+                typeof(CompiledModelTestBase.Enum8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))));
+            enum8AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum8AsStringCollection = runtimeEntityType.AddProperty(
+                "Enum8AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum8>, List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum8>, List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                        (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, string>(
+                            (CompiledModelTestBase.Enum8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.Enum8, string, CompiledModelTestBase.Enum8>.ConvertToEnum(v)))));
+            enum8AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum8Collection = runtimeEntityType.AddProperty(
+                "Enum8Collection",
+                typeof(List<CompiledModelTestBase.Enum8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Enum8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Enum8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum8Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8>(
+                    (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum8>, List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.Enum8>, List<CompiledModelTestBase.Enum8>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))),
+                elementMapping: MySqlSByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))));
+            enum8Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumToNumberConverterProperty = runtimeEntityType.AddProperty(
+                "EnumToNumberConverterProperty",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumToNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumToNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new EnumToNumberConverter<CompiledModelTestBase.Enum32, int>());
+            enumToNumberConverterProperty.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    (CompiledModelTestBase.Enum32 value) => (int)value,
+                    (int value) => (CompiledModelTestBase.Enum32)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value)));
+            enumToNumberConverterProperty.SetSentinelFromProviderValue(0);
+            enumToNumberConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumToStringConverterProperty = runtimeEntityType.AddProperty(
+                "EnumToStringConverterProperty",
+                typeof(CompiledModelTestBase.Enum32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new EnumToStringConverter<CompiledModelTestBase.Enum32>());
+            enumToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                    (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.Enum32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                    (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, string>(
+                        (CompiledModelTestBase.Enum32 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.Enum32, string, CompiledModelTestBase.Enum32>.ConvertToEnum(v))));
+            enumToStringConverterProperty.SetSentinelFromProviderValue("Default");
+            enumToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU16 = runtimeEntityType.AddProperty(
+                "EnumU16",
+                typeof(CompiledModelTestBase.EnumU16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16.TypeMapping = MySqlUShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<ushort>(
+                    (ushort v1, ushort v2) => v1 == v2,
+                    (ushort v) => (int)v,
+                    (ushort v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                    (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                    (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                    JsonUInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value)));
+            enumU16.SetSentinelFromProviderValue((ushort)0);
+            enumU16.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU16Array = runtimeEntityType.AddProperty(
+                "EnumU16Array",
+                typeof(CompiledModelTestBase.EnumU16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))),
+                elementMapping: MySqlUShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))));
+            enumU16Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU16AsString = runtimeEntityType.AddProperty(
+                "EnumU16AsString",
+                typeof(CompiledModelTestBase.EnumU16),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU16AsString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                    (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))));
+            enumU16AsString.SetSentinelFromProviderValue("Min");
+            enumU16AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU16AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU16AsStringArray",
+                typeof(CompiledModelTestBase.EnumU16[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))));
+            enumU16AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU16AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU16AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU16>, List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU16>, List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                        (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, string>(
+                            (CompiledModelTestBase.EnumU16 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU16, string, CompiledModelTestBase.EnumU16>.ConvertToEnum(v)))));
+            enumU16AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU16Collection = runtimeEntityType.AddProperty(
+                "EnumU16Collection",
+                typeof(List<CompiledModelTestBase.EnumU16>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU16Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16>(
+                    (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU16 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU16>, List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU16>, List<CompiledModelTestBase.EnumU16>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))),
+                elementMapping: MySqlUShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))));
+            enumU16Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU32 = runtimeEntityType.AddProperty(
+                "EnumU32",
+                typeof(CompiledModelTestBase.EnumU32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32.TypeMapping = MySqlUIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                    (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                    (uint value) => (CompiledModelTestBase.EnumU32)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                    JsonUInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value)));
+            enumU32.SetSentinelFromProviderValue(0u);
+            enumU32.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU32Array = runtimeEntityType.AddProperty(
+                "EnumU32Array",
+                typeof(CompiledModelTestBase.EnumU32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))),
+                elementMapping: MySqlUIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))));
+            enumU32Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU32AsString = runtimeEntityType.AddProperty(
+                "EnumU32AsString",
+                typeof(CompiledModelTestBase.EnumU32),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU32AsString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                    (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))));
+            enumU32AsString.SetSentinelFromProviderValue("Min");
+            enumU32AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU32AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU32AsStringArray",
+                typeof(CompiledModelTestBase.EnumU32[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))));
+            enumU32AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU32AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU32AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU32>, List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU32>, List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                        (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, string>(
+                            (CompiledModelTestBase.EnumU32 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU32, string, CompiledModelTestBase.EnumU32>.ConvertToEnum(v)))));
+            enumU32AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU32Collection = runtimeEntityType.AddProperty(
+                "EnumU32Collection",
+                typeof(List<CompiledModelTestBase.EnumU32>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU32Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32>(
+                    (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU32 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU32>, List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU32>, List<CompiledModelTestBase.EnumU32>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))),
+                elementMapping: MySqlUIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))));
+            enumU32Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU64 = runtimeEntityType.AddProperty(
+                "EnumU64",
+                typeof(CompiledModelTestBase.EnumU64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64.TypeMapping = MySqlULongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<ulong>(
+                    (ulong v1, ulong v2) => v1 == v2,
+                    (ulong v) => v.GetHashCode(),
+                    (ulong v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                    (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                    (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                    JsonUInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value)));
+            enumU64.SetSentinelFromProviderValue(0ul);
+            enumU64.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU64Array = runtimeEntityType.AddProperty(
+                "EnumU64Array",
+                typeof(CompiledModelTestBase.EnumU64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))),
+                elementMapping: MySqlULongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))));
+            enumU64Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU64AsString = runtimeEntityType.AddProperty(
+                "EnumU64AsString",
+                typeof(CompiledModelTestBase.EnumU64),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU64AsString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                    (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))));
+            enumU64AsString.SetSentinelFromProviderValue("Min");
+            enumU64AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU64AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU64AsStringArray",
+                typeof(CompiledModelTestBase.EnumU64[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))));
+            enumU64AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU64AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU64AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU64>, List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU64>, List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                        (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, string>(
+                            (CompiledModelTestBase.EnumU64 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU64, string, CompiledModelTestBase.EnumU64>.ConvertToEnum(v)))));
+            enumU64AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU64Collection = runtimeEntityType.AddProperty(
+                "EnumU64Collection",
+                typeof(List<CompiledModelTestBase.EnumU64>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU64Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64>(
+                    (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU64 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU64>, List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU64>, List<CompiledModelTestBase.EnumU64>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))),
+                elementMapping: MySqlULongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))));
+            enumU64Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU8 = runtimeEntityType.AddProperty(
+                "EnumU8",
+                typeof(CompiledModelTestBase.EnumU8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8.TypeMapping = MySqlByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                    (byte value) => (CompiledModelTestBase.EnumU8)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value)));
+            enumU8.SetSentinelFromProviderValue((byte)0);
+            enumU8.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU8Array = runtimeEntityType.AddProperty(
+                "EnumU8Array",
+                typeof(CompiledModelTestBase.EnumU8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))));
+            enumU8Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU8AsString = runtimeEntityType.AddProperty(
+                "EnumU8AsString",
+                typeof(CompiledModelTestBase.EnumU8),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                providerPropertyType: typeof(string));
+            enumU8AsString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                    (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                    (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))));
+            enumU8AsString.SetSentinelFromProviderValue("Min");
+            enumU8AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU8AsStringArray = runtimeEntityType.AddProperty(
+                "EnumU8AsStringArray",
+                typeof(CompiledModelTestBase.EnumU8[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))));
+            enumU8AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU8AsStringCollection = runtimeEntityType.AddProperty(
+                "EnumU8AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU8>, List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU8>, List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                        (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                        (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, string>(
+                            (CompiledModelTestBase.EnumU8 v) => v.ToString(),
+                            (string v) => StringEnumConverter<CompiledModelTestBase.EnumU8, string, CompiledModelTestBase.EnumU8>.ConvertToEnum(v)))));
+            enumU8AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enumU8Collection = runtimeEntityType.AddProperty(
+                "EnumU8Collection",
+                typeof(List<CompiledModelTestBase.EnumU8>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("EnumU8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<EnumU8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enumU8Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v)),
+                keyComparer: new ListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8>(
+                    (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                    (CompiledModelTestBase.EnumU8 v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8>(new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU8>, List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<CompiledModelTestBase.EnumU8>, List<CompiledModelTestBase.EnumU8>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))));
+            enumU8Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var @float = runtimeEntityType.AddProperty(
+                "Float",
+                typeof(float),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Float", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Float>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0f);
+            @float.TypeMapping = MySqlFloatTypeMapping.Default.Clone(
+                comparer: new ValueComparer<float>(
+                    (float v1, float v2) => v1.Equals(v2),
+                    (float v) => v.GetHashCode(),
+                    (float v) => v),
+                keyComparer: new ValueComparer<float>(
+                    (float v1, float v2) => v1.Equals(v2),
+                    (float v) => v.GetHashCode(),
+                    (float v) => v),
+                providerValueComparer: new ValueComparer<float>(
+                    (float v1, float v2) => v1.Equals(v2),
+                    (float v) => v.GetHashCode(),
+                    (float v) => v));
+            @float.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var floatArray = runtimeEntityType.AddProperty(
+                "FloatArray",
+                typeof(float[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("FloatArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<FloatArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            floatArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<float>(new ValueComparer<float>(
+                    (float v1, float v2) => v1.Equals(v2),
+                    (float v) => v.GetHashCode(),
+                    (float v) => v)),
+                keyComparer: new ListComparer<float>(new ValueComparer<float>(
+                    (float v1, float v2) => v1.Equals(v2),
+                    (float v) => v.GetHashCode(),
+                    (float v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<float>(new JsonCollectionReaderWriter<float[], float[], float>(
+                    JsonFloatReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<float[], float[], float>(
+                    JsonFloatReaderWriter.Instance),
+                elementMapping: MySqlFloatTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<float>(
+                        (float v1, float v2) => v1.Equals(v2),
+                        (float v) => v.GetHashCode(),
+                        (float v) => v),
+                    keyComparer: new ValueComparer<float>(
+                        (float v1, float v2) => v1.Equals(v2),
+                        (float v) => v.GetHashCode(),
+                        (float v) => v),
+                    providerValueComparer: new ValueComparer<float>(
+                        (float v1, float v2) => v1.Equals(v2),
+                        (float v) => v.GetHashCode(),
+                        (float v) => v)));
+            floatArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var guid = runtimeEntityType.AddProperty(
+                "Guid",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Guid", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Guid>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            guid.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v));
+            guid.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var guidArray = runtimeEntityType.AddProperty(
+                "GuidArray",
+                typeof(Guid[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            guidArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<Guid>(new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v)),
+                keyComparer: new ListComparer<Guid>(new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<Guid>(new JsonCollectionReaderWriter<Guid[], Guid[], Guid>(
+                    JsonGuidReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<Guid[], Guid[], Guid>(
+                    JsonGuidReaderWriter.Instance),
+                elementMapping: MySqlGuidTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Guid>(
+                        (Guid v1, Guid v2) => v1 == v2,
+                        (Guid v) => v.GetHashCode(),
+                        (Guid v) => v),
+                    keyComparer: new ValueComparer<Guid>(
+                        (Guid v1, Guid v2) => v1 == v2,
+                        (Guid v) => v.GetHashCode(),
+                        (Guid v) => v),
+                    providerValueComparer: new ValueComparer<Guid>(
+                        (Guid v1, Guid v2) => v1 == v2,
+                        (Guid v) => v.GetHashCode(),
+                        (Guid v) => v)));
+            guidArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var guidToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "GuidToBytesConverterProperty",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new GuidToBytesConverter());
+            guidToBytesConverterProperty.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<Guid, byte[]>(
+                    (Guid v) => v.ToByteArray(),
+                    (Byte[] v) => new Guid(v)),
+                storeTypePostfix: StoreTypePostfix.Size,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Guid, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<Guid, byte[]>(
+                        (Guid v) => v.ToByteArray(),
+                        (Byte[] v) => new Guid(v))));
+            guidToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 });
+            guidToBytesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var guidToStringConverterProperty = runtimeEntityType.AddProperty(
+                "GuidToStringConverterProperty",
+                typeof(Guid),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("GuidToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<GuidToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new GuidToStringConverter());
+            guidToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(36)",
+                    size: 36),
+                converter: new ValueConverter<Guid, string>(
+                    (Guid v) => v.ToString("D"),
+                    (string v) => new Guid(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Guid, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Guid, string>(
+                        (Guid v) => v.ToString("D"),
+                        (string v) => new Guid(v))));
+            guidToStringConverterProperty.SetSentinelFromProviderValue("00000000-0000-0000-0000-000000000000");
+            guidToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var iPAddress = runtimeEntityType.AddProperty(
+                "IPAddress",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            iPAddress.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    (IPAddress v) => v.ToString(),
+                    (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v))));
+            iPAddress.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var iPAddressArray = runtimeEntityType.AddProperty(
+                "IPAddressArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            iPAddressArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            iPAddressArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var iPAddressToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "IPAddressToBytesConverterProperty",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new IPAddressToBytesConverter());
+            iPAddressToBytesConverterProperty.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(16)",
+                    size: 16),
+                converter: new ValueConverter<IPAddress, byte[]>(
+                    (IPAddress v) => v.GetAddressBytes(),
+                    (Byte[] v) => new IPAddress(v)),
+                storeTypePostfix: StoreTypePostfix.Size,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<IPAddress, byte[]>(
+                        (IPAddress v) => v.GetAddressBytes(),
+                        (Byte[] v) => new IPAddress(v))));
+            iPAddressToBytesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var iPAddressToStringConverterProperty = runtimeEntityType.AddProperty(
+                "IPAddressToStringConverterProperty",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IPAddressToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IPAddressToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new IPAddressToStringConverter());
+            iPAddressToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    (IPAddress v) => v.ToString(),
+                    (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v))));
+            iPAddressToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var int16 = runtimeEntityType.AddProperty(
+                "Int16",
+                typeof(short),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (short)0);
+            int16.TypeMapping = MySqlShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v),
+                keyComparer: new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v),
+                providerValueComparer: new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v));
+            int16.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var int16Array = runtimeEntityType.AddProperty(
+                "Int16Array",
+                typeof(short[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int16Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                keyComparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionReaderWriter<short[], short[], short>(
+                    JsonInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<short[], short[], short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)));
+            int16Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var int32 = runtimeEntityType.AddProperty(
+                "Int32",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0);
+            int32.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            int32.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var int32Array = runtimeEntityType.AddProperty(
+                "Int32Array",
+                typeof(int[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int32Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<int>(new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v)),
+                keyComparer: new ListComparer<int>(new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<int>(new JsonCollectionReaderWriter<int[], int[], int>(
+                    JsonInt32ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<int[], int[], int>(
+                    JsonInt32ReaderWriter.Instance),
+                elementMapping: MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v)));
+            int32Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var int64 = runtimeEntityType.AddProperty(
+                "Int64",
+                typeof(long),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0L);
+            int64.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v));
+            int64.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var int64Array = runtimeEntityType.AddProperty(
+                "Int64Array",
+                typeof(long[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int64Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<long>(new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v)),
+                keyComparer: new ListComparer<long>(new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<long>(new JsonCollectionReaderWriter<long[], long[], long>(
+                    JsonInt64ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<long[], long[], long>(
+                    JsonInt64ReaderWriter.Instance),
+                elementMapping: MySqlLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    keyComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v)));
+            int64Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var int8 = runtimeEntityType.AddProperty(
+                "Int8",
+                typeof(sbyte),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (sbyte)0);
+            int8.TypeMapping = MySqlSByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<sbyte>(
+                    (sbyte v1, sbyte v2) => v1 == v2,
+                    (sbyte v) => (int)v,
+                    (sbyte v) => v),
+                keyComparer: new ValueComparer<sbyte>(
+                    (sbyte v1, sbyte v2) => v1 == v2,
+                    (sbyte v) => (int)v,
+                    (sbyte v) => v),
+                providerValueComparer: new ValueComparer<sbyte>(
+                    (sbyte v1, sbyte v2) => v1 == v2,
+                    (sbyte v) => (int)v,
+                    (sbyte v) => v));
+            int8.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var int8Array = runtimeEntityType.AddProperty(
+                "Int8Array",
+                typeof(sbyte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Int8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Int8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            int8Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<sbyte>(new ValueComparer<sbyte>(
+                    (sbyte v1, sbyte v2) => v1 == v2,
+                    (sbyte v) => (int)v,
+                    (sbyte v) => v)),
+                keyComparer: new ListComparer<sbyte>(new ValueComparer<sbyte>(
+                    (sbyte v1, sbyte v2) => v1 == v2,
+                    (sbyte v) => (int)v,
+                    (sbyte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<sbyte>(new JsonCollectionReaderWriter<sbyte[], sbyte[], sbyte>(
+                    JsonSByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<sbyte[], sbyte[], sbyte>(
+                    JsonSByteReaderWriter.Instance),
+                elementMapping: MySqlSByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    keyComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    providerValueComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v)));
+            int8Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var intNumberToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "IntNumberToBytesConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IntNumberToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IntNumberToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToBytesConverter<int>());
+            intNumberToBytesConverterProperty.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(4)",
+                    size: 4),
+                converter: new ValueConverter<int, byte[]>(
+                    (int v) => NumberToBytesConverter<int>.ReverseInt(BitConverter.GetBytes(v)),
+                    (Byte[] v) => v == null ? 0 : BitConverter.ToInt32(NumberToBytesConverter<int>.ReverseInt(v.Length == 0 ? new byte[4] : v), 0)),
+                storeTypePostfix: StoreTypePostfix.Size,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<int, byte[]>(
+                        (int v) => NumberToBytesConverter<int>.ReverseInt(BitConverter.GetBytes(v)),
+                        (Byte[] v) => v == null ? 0 : BitConverter.ToInt32(NumberToBytesConverter<int>.ReverseInt(v.Length == 0 ? new byte[4] : v), 0))));
+            intNumberToBytesConverterProperty.SetSentinelFromProviderValue(new byte[] { 0, 0, 0, 0 });
+            intNumberToBytesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var intNumberToStringConverterProperty = runtimeEntityType.AddProperty(
+                "IntNumberToStringConverterProperty",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("IntNumberToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<IntNumberToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new NumberToStringConverter<int>());
+            intNumberToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(64)",
+                    size: 64),
+                converter: new ValueConverter<int, string>(
+                    (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                    (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<int, string>(
+                        (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                        (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
+            intNumberToStringConverterProperty.SetSentinelFromProviderValue("0");
+            intNumberToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullIntToNullStringConverterProperty = runtimeEntityType.AddProperty(
+                "NullIntToNullStringConverterProperty",
+                typeof(int?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullIntToNullStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullIntToNullStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true,
+                valueConverter: new CompiledModelTestBase.NullIntToNullStringConverter());
+            nullIntToNullStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int?>(
+                    (Nullable<int> v1, Nullable<int> v2) => v1 == v2,
+                    (Nullable<int> v) => (int)v,
+                    (Nullable<int> v) => v),
+                keyComparer: new ValueComparer<int?>(
+                    (Nullable<int> v1, Nullable<int> v2) => v1 == v2,
+                    (Nullable<int> v) => (int)v,
+                    (Nullable<int> v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<int?, string>(
+                    (Nullable<int> v) => v == null ? null : v.ToString(),
+                    (string v) => v == null || v == "<null>" ? null : (Nullable<int>)int.Parse(v),
+                    convertsNulls: true),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<int?, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<int?, string>(
+                        (Nullable<int> v) => v == null ? null : v.ToString(),
+                        (string v) => v == null || v == "<null>" ? null : (Nullable<int>)int.Parse(v),
+                        convertsNulls: true)));
+            nullIntToNullStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableBool = runtimeEntityType.AddProperty(
+                "NullableBool",
+                typeof(bool?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBool", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBool>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableBool.TypeMapping = MySqlBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool?>(
+                    (Nullable<bool> v1, Nullable<bool> v2) => v1.HasValue && v2.HasValue && (bool)v1 == (bool)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<bool> v) => v.HasValue ? ((bool)v).GetHashCode() : 0,
+                    (Nullable<bool> v) => v.HasValue ? (Nullable<bool>)(bool)v : default(Nullable<bool>)),
+                keyComparer: new ValueComparer<bool?>(
+                    (Nullable<bool> v1, Nullable<bool> v2) => v1.HasValue && v2.HasValue && (bool)v1 == (bool)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<bool> v) => v.HasValue ? ((bool)v).GetHashCode() : 0,
+                    (Nullable<bool> v) => v.HasValue ? (Nullable<bool>)(bool)v : default(Nullable<bool>)),
+                providerValueComparer: new ValueComparer<bool?>(
+                    (Nullable<bool> v1, Nullable<bool> v2) => v1.HasValue && v2.HasValue && (bool)v1 == (bool)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<bool> v) => v.HasValue ? ((bool)v).GetHashCode() : 0,
+                    (Nullable<bool> v) => v.HasValue ? (Nullable<bool>)(bool)v : default(Nullable<bool>)));
+            nullableBool.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableBoolArray = runtimeEntityType.AddProperty(
+                "NullableBoolArray",
+                typeof(bool?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBoolArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBoolArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableBoolArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<bool>(new ValueComparer<bool?>(
+                    (Nullable<bool> v1, Nullable<bool> v2) => v1.HasValue && v2.HasValue && (bool)v1 == (bool)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<bool> v) => v.HasValue ? ((bool)v).GetHashCode() : 0,
+                    (Nullable<bool> v) => v.HasValue ? (Nullable<bool>)(bool)v : default(Nullable<bool>))),
+                keyComparer: new NullableValueTypeListComparer<bool>(new ValueComparer<bool?>(
+                    (Nullable<bool> v1, Nullable<bool> v2) => v1.HasValue && v2.HasValue && (bool)v1 == (bool)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<bool> v) => v.HasValue ? ((bool)v).GetHashCode() : 0,
+                    (Nullable<bool> v) => v.HasValue ? (Nullable<bool>)(bool)v : default(Nullable<bool>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<bool?>(new JsonNullableStructCollectionReaderWriter<bool?[], bool?[], bool>(
+                    JsonBoolReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<bool?[], bool?[], bool>(
+                    JsonBoolReaderWriter.Instance),
+                elementMapping: MySqlBoolTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<bool>(
+                        (bool v1, bool v2) => v1 == v2,
+                        (bool v) => v.GetHashCode(),
+                        (bool v) => v),
+                    keyComparer: new ValueComparer<bool>(
+                        (bool v1, bool v2) => v1 == v2,
+                        (bool v) => v.GetHashCode(),
+                        (bool v) => v),
+                    providerValueComparer: new ValueComparer<bool>(
+                        (bool v1, bool v2) => v1 == v2,
+                        (bool v) => v.GetHashCode(),
+                        (bool v) => v)));
+            nullableBoolArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableBytes = runtimeEntityType.AddProperty(
+                "NullableBytes",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBytes", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBytes>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableBytes.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()));
+            nullableBytes.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableBytesArray = runtimeEntityType.AddProperty(
+                "NullableBytesArray",
+                typeof(byte[][]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableBytesArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableBytesArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableBytesArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte[]>(new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v)),
+                keyComparer: new ListComparer<byte[]>(new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte[]>(new JsonCollectionReaderWriter<byte[][], byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<byte[][], byte[][], byte[]>(
+                    JsonByteArrayReaderWriter.Instance),
+                elementMapping: MySqlByteArrayTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte[]>(
+                        (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                        (Byte[] v) => v.GetHashCode(),
+                        (Byte[] v) => v),
+                    keyComparer: new ValueComparer<byte[]>(
+                        (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                        (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                        (Byte[] source) => source.ToArray()),
+                    providerValueComparer: new ValueComparer<byte[]>(
+                        (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                        (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                        (Byte[] source) => source.ToArray())));
+            nullableBytesArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableChar = runtimeEntityType.AddProperty(
+                "NullableChar",
+                typeof(char?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableChar", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableChar>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableChar.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<char?>(
+                    (Nullable<char> v1, Nullable<char> v2) => v1.HasValue && v2.HasValue && (char)v1 == (char)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<char> v) => v.HasValue ? (int)(char)v : 0,
+                    (Nullable<char> v) => v.HasValue ? (Nullable<char>)(char)v : default(Nullable<char>)),
+                keyComparer: new ValueComparer<char?>(
+                    (Nullable<char> v1, Nullable<char> v2) => v1.HasValue && v2.HasValue && (char)v1 == (char)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<char> v) => v.HasValue ? (int)(char)v : 0,
+                    (Nullable<char> v) => v.HasValue ? (Nullable<char>)(char)v : default(Nullable<char>)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<char, string>(
+                    (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                    (string v) => v.Length < 1 ? '\0' : v[0]),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<char, string>(
+                        (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                        (string v) => v.Length < 1 ? '\0' : v[0])));
+            nullableChar.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableCharArray = runtimeEntityType.AddProperty(
+                "NullableCharArray",
+                typeof(char?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableCharArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableCharArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableCharArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<char>(new ValueComparer<char?>(
+                    (Nullable<char> v1, Nullable<char> v2) => v1.HasValue && v2.HasValue && (char)v1 == (char)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<char> v) => v.HasValue ? (int)(char)v : 0,
+                    (Nullable<char> v) => v.HasValue ? (Nullable<char>)(char)v : default(Nullable<char>))),
+                keyComparer: new NullableValueTypeListComparer<char>(new ValueComparer<char?>(
+                    (Nullable<char> v1, Nullable<char> v2) => v1.HasValue && v2.HasValue && (char)v1 == (char)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<char> v) => v.HasValue ? (int)(char)v : 0,
+                    (Nullable<char> v) => v.HasValue ? (Nullable<char>)(char)v : default(Nullable<char>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<char?>(new JsonNullableStructCollectionReaderWriter<char?[], char?[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                            (string v) => v.Length < 1 ? '\0' : v[0])))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<char?[], char?[], char>(
+                    new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                            (string v) => v.Length < 1 ? '\0' : v[0]))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<char>(
+                        (char v1, char v2) => v1 == v2,
+                        (char v) => (int)v,
+                        (char v) => v),
+                    keyComparer: new ValueComparer<char>(
+                        (char v1, char v2) => v1 == v2,
+                        (char v) => (int)v,
+                        (char v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(1)",
+                        size: 1),
+                    converter: new ValueConverter<char, string>(
+                        (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                        (string v) => v.Length < 1 ? '\0' : v[0]),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<char, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<char, string>(
+                            (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v),
+                            (string v) => v.Length < 1 ? '\0' : v[0]))));
+            nullableCharArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableDateOnly = runtimeEntityType.AddProperty(
+                "NullableDateOnly",
+                typeof(DateOnly?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDateOnly.TypeMapping = MySqlDateTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateOnly?>(
+                    (Nullable<DateOnly> v1, Nullable<DateOnly> v2) => v1.HasValue && v2.HasValue && (DateOnly)v1 == (DateOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateOnly> v) => v.HasValue ? ((DateOnly)v).GetHashCode() : 0,
+                    (Nullable<DateOnly> v) => v.HasValue ? (Nullable<DateOnly>)(DateOnly)v : default(Nullable<DateOnly>)),
+                keyComparer: new ValueComparer<DateOnly?>(
+                    (Nullable<DateOnly> v1, Nullable<DateOnly> v2) => v1.HasValue && v2.HasValue && (DateOnly)v1 == (DateOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateOnly> v) => v.HasValue ? ((DateOnly)v).GetHashCode() : 0,
+                    (Nullable<DateOnly> v) => v.HasValue ? (Nullable<DateOnly>)(DateOnly)v : default(Nullable<DateOnly>)),
+                providerValueComparer: new ValueComparer<DateOnly?>(
+                    (Nullable<DateOnly> v1, Nullable<DateOnly> v2) => v1.HasValue && v2.HasValue && (DateOnly)v1 == (DateOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateOnly> v) => v.HasValue ? ((DateOnly)v).GetHashCode() : 0,
+                    (Nullable<DateOnly> v) => v.HasValue ? (Nullable<DateOnly>)(DateOnly)v : default(Nullable<DateOnly>)));
+            nullableDateOnly.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableDateOnlyArray = runtimeEntityType.AddProperty(
+                "NullableDateOnlyArray",
+                typeof(DateOnly?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDateOnlyArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<DateOnly>(new ValueComparer<DateOnly?>(
+                    (Nullable<DateOnly> v1, Nullable<DateOnly> v2) => v1.HasValue && v2.HasValue && (DateOnly)v1 == (DateOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateOnly> v) => v.HasValue ? ((DateOnly)v).GetHashCode() : 0,
+                    (Nullable<DateOnly> v) => v.HasValue ? (Nullable<DateOnly>)(DateOnly)v : default(Nullable<DateOnly>))),
+                keyComparer: new NullableValueTypeListComparer<DateOnly>(new ValueComparer<DateOnly?>(
+                    (Nullable<DateOnly> v1, Nullable<DateOnly> v2) => v1.HasValue && v2.HasValue && (DateOnly)v1 == (DateOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateOnly> v) => v.HasValue ? ((DateOnly)v).GetHashCode() : 0,
+                    (Nullable<DateOnly> v) => v.HasValue ? (Nullable<DateOnly>)(DateOnly)v : default(Nullable<DateOnly>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateOnly?>(new JsonNullableStructCollectionReaderWriter<DateOnly?[], DateOnly?[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<DateOnly?[], DateOnly?[], DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance),
+                elementMapping: MySqlDateTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateOnly>(
+                        (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        (DateOnly v) => v.GetHashCode(),
+                        (DateOnly v) => v),
+                    keyComparer: new ValueComparer<DateOnly>(
+                        (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        (DateOnly v) => v.GetHashCode(),
+                        (DateOnly v) => v),
+                    providerValueComparer: new ValueComparer<DateOnly>(
+                        (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                        (DateOnly v) => v.GetHashCode(),
+                        (DateOnly v) => v)));
+            nullableDateOnlyArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableDateTime = runtimeEntityType.AddProperty(
+                "NullableDateTime",
+                typeof(DateTime?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateTime", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateTime>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDateTime.TypeMapping = MySqlDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<DateTime?>(
+                    (Nullable<DateTime> v1, Nullable<DateTime> v2) => v1.HasValue && v2.HasValue && (DateTime)v1 == (DateTime)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateTime> v) => v.HasValue ? ((DateTime)v).GetHashCode() : 0,
+                    (Nullable<DateTime> v) => v.HasValue ? (Nullable<DateTime>)(DateTime)v : default(Nullable<DateTime>)),
+                keyComparer: new ValueComparer<DateTime?>(
+                    (Nullable<DateTime> v1, Nullable<DateTime> v2) => v1.HasValue && v2.HasValue && (DateTime)v1 == (DateTime)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateTime> v) => v.HasValue ? ((DateTime)v).GetHashCode() : 0,
+                    (Nullable<DateTime> v) => v.HasValue ? (Nullable<DateTime>)(DateTime)v : default(Nullable<DateTime>)),
+                providerValueComparer: new ValueComparer<DateTime?>(
+                    (Nullable<DateTime> v1, Nullable<DateTime> v2) => v1.HasValue && v2.HasValue && (DateTime)v1 == (DateTime)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateTime> v) => v.HasValue ? ((DateTime)v).GetHashCode() : 0,
+                    (Nullable<DateTime> v) => v.HasValue ? (Nullable<DateTime>)(DateTime)v : default(Nullable<DateTime>)),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "datetime(6)",
+                    precision: 6));
+            nullableDateTime.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableDateTimeArray = runtimeEntityType.AddProperty(
+                "NullableDateTimeArray",
+                typeof(DateTime?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDateTimeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDateTimeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDateTimeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<DateTime>(new ValueComparer<DateTime?>(
+                    (Nullable<DateTime> v1, Nullable<DateTime> v2) => v1.HasValue && v2.HasValue && (DateTime)v1 == (DateTime)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateTime> v) => v.HasValue ? ((DateTime)v).GetHashCode() : 0,
+                    (Nullable<DateTime> v) => v.HasValue ? (Nullable<DateTime>)(DateTime)v : default(Nullable<DateTime>))),
+                keyComparer: new NullableValueTypeListComparer<DateTime>(new ValueComparer<DateTime?>(
+                    (Nullable<DateTime> v1, Nullable<DateTime> v2) => v1.HasValue && v2.HasValue && (DateTime)v1 == (DateTime)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<DateTime> v) => v.HasValue ? ((DateTime)v).GetHashCode() : 0,
+                    (Nullable<DateTime> v) => v.HasValue ? (Nullable<DateTime>)(DateTime)v : default(Nullable<DateTime>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateTime?>(new JsonNullableStructCollectionReaderWriter<DateTime?[], DateTime?[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<DateTime?[], DateTime?[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "datetime(6)",
+                        precision: 6)));
+            nullableDateTimeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableDecimal = runtimeEntityType.AddProperty(
+                "NullableDecimal",
+                typeof(decimal?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDecimal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDecimal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDecimal.TypeMapping = MySqlDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<decimal?>(
+                    (Nullable<decimal> v1, Nullable<decimal> v2) => v1.HasValue && v2.HasValue && (decimal)v1 == (decimal)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<decimal> v) => v.HasValue ? ((decimal)v).GetHashCode() : 0,
+                    (Nullable<decimal> v) => v.HasValue ? (Nullable<decimal>)(decimal)v : default(Nullable<decimal>)),
+                keyComparer: new ValueComparer<decimal?>(
+                    (Nullable<decimal> v1, Nullable<decimal> v2) => v1.HasValue && v2.HasValue && (decimal)v1 == (decimal)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<decimal> v) => v.HasValue ? ((decimal)v).GetHashCode() : 0,
+                    (Nullable<decimal> v) => v.HasValue ? (Nullable<decimal>)(decimal)v : default(Nullable<decimal>)),
+                providerValueComparer: new ValueComparer<decimal?>(
+                    (Nullable<decimal> v1, Nullable<decimal> v2) => v1.HasValue && v2.HasValue && (decimal)v1 == (decimal)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<decimal> v) => v.HasValue ? ((decimal)v).GetHashCode() : 0,
+                    (Nullable<decimal> v) => v.HasValue ? (Nullable<decimal>)(decimal)v : default(Nullable<decimal>)));
+            nullableDecimal.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableDecimalArray = runtimeEntityType.AddProperty(
+                "NullableDecimalArray",
+                typeof(decimal?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDecimalArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDecimalArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDecimalArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<decimal>(new ValueComparer<decimal?>(
+                    (Nullable<decimal> v1, Nullable<decimal> v2) => v1.HasValue && v2.HasValue && (decimal)v1 == (decimal)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<decimal> v) => v.HasValue ? ((decimal)v).GetHashCode() : 0,
+                    (Nullable<decimal> v) => v.HasValue ? (Nullable<decimal>)(decimal)v : default(Nullable<decimal>))),
+                keyComparer: new NullableValueTypeListComparer<decimal>(new ValueComparer<decimal?>(
+                    (Nullable<decimal> v1, Nullable<decimal> v2) => v1.HasValue && v2.HasValue && (decimal)v1 == (decimal)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<decimal> v) => v.HasValue ? ((decimal)v).GetHashCode() : 0,
+                    (Nullable<decimal> v) => v.HasValue ? (Nullable<decimal>)(decimal)v : default(Nullable<decimal>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<decimal?>(new JsonNullableStructCollectionReaderWriter<decimal?[], decimal?[], decimal>(
+                    JsonDecimalReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<decimal?[], decimal?[], decimal>(
+                    JsonDecimalReaderWriter.Instance),
+                elementMapping: MySqlDecimalTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<decimal>(
+                        (decimal v1, decimal v2) => v1 == v2,
+                        (decimal v) => v.GetHashCode(),
+                        (decimal v) => v),
+                    keyComparer: new ValueComparer<decimal>(
+                        (decimal v1, decimal v2) => v1 == v2,
+                        (decimal v) => v.GetHashCode(),
+                        (decimal v) => v),
+                    providerValueComparer: new ValueComparer<decimal>(
+                        (decimal v1, decimal v2) => v1 == v2,
+                        (decimal v) => v.GetHashCode(),
+                        (decimal v) => v)));
+            nullableDecimalArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableDouble = runtimeEntityType.AddProperty(
+                "NullableDouble",
+                typeof(double?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDouble", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDouble>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableDouble.TypeMapping = MySqlDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<double?>(
+                    (Nullable<double> v1, Nullable<double> v2) => v1.HasValue && v2.HasValue && ((double)v1).Equals((double)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<double> v) => v.HasValue ? ((double)v).GetHashCode() : 0,
+                    (Nullable<double> v) => v.HasValue ? (Nullable<double>)(double)v : default(Nullable<double>)),
+                keyComparer: new ValueComparer<double?>(
+                    (Nullable<double> v1, Nullable<double> v2) => v1.HasValue && v2.HasValue && ((double)v1).Equals((double)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<double> v) => v.HasValue ? ((double)v).GetHashCode() : 0,
+                    (Nullable<double> v) => v.HasValue ? (Nullable<double>)(double)v : default(Nullable<double>)),
+                providerValueComparer: new ValueComparer<double?>(
+                    (Nullable<double> v1, Nullable<double> v2) => v1.HasValue && v2.HasValue && ((double)v1).Equals((double)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<double> v) => v.HasValue ? ((double)v).GetHashCode() : 0,
+                    (Nullable<double> v) => v.HasValue ? (Nullable<double>)(double)v : default(Nullable<double>)));
+            nullableDouble.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableDoubleArray = runtimeEntityType.AddProperty(
+                "NullableDoubleArray",
+                typeof(double?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableDoubleArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableDoubleArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableDoubleArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<double>(new ValueComparer<double?>(
+                    (Nullable<double> v1, Nullable<double> v2) => v1.HasValue && v2.HasValue && ((double)v1).Equals((double)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<double> v) => v.HasValue ? ((double)v).GetHashCode() : 0,
+                    (Nullable<double> v) => v.HasValue ? (Nullable<double>)(double)v : default(Nullable<double>))),
+                keyComparer: new NullableValueTypeListComparer<double>(new ValueComparer<double?>(
+                    (Nullable<double> v1, Nullable<double> v2) => v1.HasValue && v2.HasValue && ((double)v1).Equals((double)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<double> v) => v.HasValue ? ((double)v).GetHashCode() : 0,
+                    (Nullable<double> v) => v.HasValue ? (Nullable<double>)(double)v : default(Nullable<double>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<double?>(new JsonNullableStructCollectionReaderWriter<double?[], double?[], double>(
+                    JsonDoubleReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<double?[], double?[], double>(
+                    JsonDoubleReaderWriter.Instance),
+                elementMapping: MySqlDoubleTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<double>(
+                        (double v1, double v2) => v1.Equals(v2),
+                        (double v) => v.GetHashCode(),
+                        (double v) => v),
+                    keyComparer: new ValueComparer<double>(
+                        (double v1, double v2) => v1.Equals(v2),
+                        (double v) => v.GetHashCode(),
+                        (double v) => v),
+                    providerValueComparer: new ValueComparer<double>(
+                        (double v1, double v2) => v1.Equals(v2),
+                        (double v) => v.GetHashCode(),
+                        (double v) => v)));
+            nullableDoubleArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum16 = runtimeEntityType.AddProperty(
+                "NullableEnum16",
+                typeof(CompiledModelTestBase.Enum16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum16.TypeMapping = MySqlShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>)),
+                providerValueComparer: new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    (CompiledModelTestBase.Enum16 value) => (short)value,
+                    (short value) => (CompiledModelTestBase.Enum16)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value)));
+            nullableEnum16.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum16Array = runtimeEntityType.AddProperty(
+                "NullableEnum16Array",
+                typeof(CompiledModelTestBase.Enum16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))));
+            nullableEnum16Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum16AsString = runtimeEntityType.AddProperty(
+                "NullableEnum16AsString",
+                typeof(CompiledModelTestBase.Enum16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum16AsString.TypeMapping = MySqlShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>)),
+                providerValueComparer: new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                    (CompiledModelTestBase.Enum16 value) => (short)value,
+                    (short value) => (CompiledModelTestBase.Enum16)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                    JsonInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value)));
+            nullableEnum16AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum16AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum16AsStringArray",
+                typeof(CompiledModelTestBase.Enum16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16?[], CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))));
+            nullableEnum16AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum16AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum16AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum16?>, List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum16?>, List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))));
+            nullableEnum16AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum16Collection = runtimeEntityType.AddProperty(
+                "NullableEnum16Collection",
+                typeof(List<CompiledModelTestBase.Enum16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum16Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum16>(new ValueComparer<CompiledModelTestBase.Enum16?>(
+                    (Nullable<CompiledModelTestBase.Enum16> v1, Nullable<CompiledModelTestBase.Enum16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum16)v1, (object)(CompiledModelTestBase.Enum16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? ((CompiledModelTestBase.Enum16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum16>)(CompiledModelTestBase.Enum16)v : default(Nullable<CompiledModelTestBase.Enum16>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum16?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum16?>, List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum16?>, List<CompiledModelTestBase.Enum16?>, CompiledModelTestBase.Enum16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum16>(
+                        (CompiledModelTestBase.Enum16 v1, CompiledModelTestBase.Enum16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum16 v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                        (CompiledModelTestBase.Enum16 value) => (short)value,
+                        (short value) => (CompiledModelTestBase.Enum16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum16, short>(
+                        JsonInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum16, short>(
+                            (CompiledModelTestBase.Enum16 value) => (short)value,
+                            (short value) => (CompiledModelTestBase.Enum16)value))));
+            nullableEnum16Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum32 = runtimeEntityType.AddProperty(
+                "NullableEnum32",
+                typeof(CompiledModelTestBase.Enum32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum32.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>)),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    (CompiledModelTestBase.Enum32 value) => (int)value,
+                    (int value) => (CompiledModelTestBase.Enum32)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value)));
+            nullableEnum32.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum32Array = runtimeEntityType.AddProperty(
+                "NullableEnum32Array",
+                typeof(CompiledModelTestBase.Enum32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))),
+                elementMapping: MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))));
+            nullableEnum32Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum32AsString = runtimeEntityType.AddProperty(
+                "NullableEnum32AsString",
+                typeof(CompiledModelTestBase.Enum32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum32AsString.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>)),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                    (CompiledModelTestBase.Enum32 value) => (int)value,
+                    (int value) => (CompiledModelTestBase.Enum32)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value)));
+            nullableEnum32AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum32AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum32AsStringArray",
+                typeof(CompiledModelTestBase.Enum32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32?[], CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))),
+                elementMapping: MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))));
+            nullableEnum32AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum32AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum32AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum32?>, List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum32?>, List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))),
+                elementMapping: MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))));
+            nullableEnum32AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum32Collection = runtimeEntityType.AddProperty(
+                "NullableEnum32Collection",
+                typeof(List<CompiledModelTestBase.Enum32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum32Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum32>(new ValueComparer<CompiledModelTestBase.Enum32?>(
+                    (Nullable<CompiledModelTestBase.Enum32> v1, Nullable<CompiledModelTestBase.Enum32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum32)v1, (object)(CompiledModelTestBase.Enum32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? ((CompiledModelTestBase.Enum32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum32>)(CompiledModelTestBase.Enum32)v : default(Nullable<CompiledModelTestBase.Enum32>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum32?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum32?>, List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum32?>, List<CompiledModelTestBase.Enum32?>, CompiledModelTestBase.Enum32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))),
+                elementMapping: MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum32>(
+                        (CompiledModelTestBase.Enum32 v1, CompiledModelTestBase.Enum32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum32 v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                        (CompiledModelTestBase.Enum32 value) => (int)value,
+                        (int value) => (CompiledModelTestBase.Enum32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum32, int>(
+                        JsonInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum32, int>(
+                            (CompiledModelTestBase.Enum32 value) => (int)value,
+                            (int value) => (CompiledModelTestBase.Enum32)value))));
+            nullableEnum32Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum64 = runtimeEntityType.AddProperty(
+                "NullableEnum64",
+                typeof(CompiledModelTestBase.Enum64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum64.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>)),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    (CompiledModelTestBase.Enum64 value) => (long)value,
+                    (long value) => (CompiledModelTestBase.Enum64)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value)));
+            nullableEnum64.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum64Array = runtimeEntityType.AddProperty(
+                "NullableEnum64Array",
+                typeof(CompiledModelTestBase.Enum64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))),
+                elementMapping: MySqlLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))));
+            nullableEnum64Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum64AsString = runtimeEntityType.AddProperty(
+                "NullableEnum64AsString",
+                typeof(CompiledModelTestBase.Enum64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum64AsString.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>)),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                    (CompiledModelTestBase.Enum64 value) => (long)value,
+                    (long value) => (CompiledModelTestBase.Enum64)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value)));
+            nullableEnum64AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum64AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum64AsStringArray",
+                typeof(CompiledModelTestBase.Enum64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64?[], CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))),
+                elementMapping: MySqlLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))));
+            nullableEnum64AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum64AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum64AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum64?>, List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum64?>, List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))),
+                elementMapping: MySqlLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))));
+            nullableEnum64AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum64Collection = runtimeEntityType.AddProperty(
+                "NullableEnum64Collection",
+                typeof(List<CompiledModelTestBase.Enum64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum64Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum64>(new ValueComparer<CompiledModelTestBase.Enum64?>(
+                    (Nullable<CompiledModelTestBase.Enum64> v1, Nullable<CompiledModelTestBase.Enum64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum64)v1, (object)(CompiledModelTestBase.Enum64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? ((CompiledModelTestBase.Enum64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum64>)(CompiledModelTestBase.Enum64)v : default(Nullable<CompiledModelTestBase.Enum64>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum64?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum64?>, List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum64?>, List<CompiledModelTestBase.Enum64?>, CompiledModelTestBase.Enum64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))),
+                elementMapping: MySqlLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum64>(
+                        (CompiledModelTestBase.Enum64 v1, CompiledModelTestBase.Enum64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum64 v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                        (CompiledModelTestBase.Enum64 value) => (long)value,
+                        (long value) => (CompiledModelTestBase.Enum64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum64, long>(
+                        JsonInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum64, long>(
+                            (CompiledModelTestBase.Enum64 value) => (long)value,
+                            (long value) => (CompiledModelTestBase.Enum64)value))));
+            nullableEnum64Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum8 = runtimeEntityType.AddProperty(
+                "NullableEnum8",
+                typeof(CompiledModelTestBase.Enum8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum8.TypeMapping = MySqlSByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>)),
+                providerValueComparer: new ValueComparer<sbyte>(
+                    (sbyte v1, sbyte v2) => v1 == v2,
+                    (sbyte v) => (int)v,
+                    (sbyte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                    (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                    (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                    JsonSByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value)));
+            nullableEnum8.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum8Array = runtimeEntityType.AddProperty(
+                "NullableEnum8Array",
+                typeof(CompiledModelTestBase.Enum8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))),
+                elementMapping: MySqlSByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))));
+            nullableEnum8Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum8AsString = runtimeEntityType.AddProperty(
+                "NullableEnum8AsString",
+                typeof(CompiledModelTestBase.Enum8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnum8AsString.TypeMapping = MySqlSByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>)),
+                providerValueComparer: new ValueComparer<sbyte>(
+                    (sbyte v1, sbyte v2) => v1 == v2,
+                    (sbyte v) => (int)v,
+                    (sbyte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                    (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                    (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                    JsonSByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value)));
+            nullableEnum8AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum8AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnum8AsStringArray",
+                typeof(CompiledModelTestBase.Enum8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8?[], CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))),
+                elementMapping: MySqlSByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))));
+            nullableEnum8AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum8AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnum8AsStringCollection",
+                typeof(List<CompiledModelTestBase.Enum8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum8?>, List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum8?>, List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))),
+                elementMapping: MySqlSByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))));
+            nullableEnum8AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnum8Collection = runtimeEntityType.AddProperty(
+                "NullableEnum8Collection",
+                typeof(List<CompiledModelTestBase.Enum8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnum8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnum8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnum8Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.Enum8>(new ValueComparer<CompiledModelTestBase.Enum8?>(
+                    (Nullable<CompiledModelTestBase.Enum8> v1, Nullable<CompiledModelTestBase.Enum8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.Enum8)v1, (object)(CompiledModelTestBase.Enum8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? ((CompiledModelTestBase.Enum8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.Enum8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.Enum8>)(CompiledModelTestBase.Enum8)v : default(Nullable<CompiledModelTestBase.Enum8>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.Enum8?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum8?>, List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.Enum8?>, List<CompiledModelTestBase.Enum8?>, CompiledModelTestBase.Enum8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))),
+                elementMapping: MySqlSByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.Enum8>(
+                        (CompiledModelTestBase.Enum8 v1, CompiledModelTestBase.Enum8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.Enum8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.Enum8 v) => v),
+                    providerValueComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                        (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                        (sbyte value) => (CompiledModelTestBase.Enum8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum8, sbyte>(
+                        JsonSByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.Enum8, sbyte>(
+                            (CompiledModelTestBase.Enum8 value) => (sbyte)value,
+                            (sbyte value) => (CompiledModelTestBase.Enum8)value))));
+            nullableEnum8Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU16 = runtimeEntityType.AddProperty(
+                "NullableEnumU16",
+                typeof(CompiledModelTestBase.EnumU16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU16.TypeMapping = MySqlUShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>)),
+                providerValueComparer: new ValueComparer<ushort>(
+                    (ushort v1, ushort v2) => v1 == v2,
+                    (ushort v) => (int)v,
+                    (ushort v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                    (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                    (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                    JsonUInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value)));
+            nullableEnumU16.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU16Array = runtimeEntityType.AddProperty(
+                "NullableEnumU16Array",
+                typeof(CompiledModelTestBase.EnumU16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))),
+                elementMapping: MySqlUShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))));
+            nullableEnumU16Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU16AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsString",
+                typeof(CompiledModelTestBase.EnumU16?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU16AsString.TypeMapping = MySqlUShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>)),
+                providerValueComparer: new ValueComparer<ushort>(
+                    (ushort v1, ushort v2) => v1 == v2,
+                    (ushort v) => (int)v,
+                    (ushort v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                    (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                    (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                    JsonUInt16ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value)));
+            nullableEnumU16AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU16AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsStringArray",
+                typeof(CompiledModelTestBase.EnumU16?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16?[], CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))),
+                elementMapping: MySqlUShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))));
+            nullableEnumU16AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU16AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU16AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU16?>, List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU16?>, List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))),
+                elementMapping: MySqlUShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))));
+            nullableEnumU16AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU16Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU16Collection",
+                typeof(List<CompiledModelTestBase.EnumU16?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU16Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU16Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU16Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU16>(new ValueComparer<CompiledModelTestBase.EnumU16?>(
+                    (Nullable<CompiledModelTestBase.EnumU16> v1, Nullable<CompiledModelTestBase.EnumU16> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU16)v1, (object)(CompiledModelTestBase.EnumU16)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? ((CompiledModelTestBase.EnumU16)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU16> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU16>)(CompiledModelTestBase.EnumU16)v : default(Nullable<CompiledModelTestBase.EnumU16>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU16?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU16?>, List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU16?>, List<CompiledModelTestBase.EnumU16?>, CompiledModelTestBase.EnumU16>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))),
+                elementMapping: MySqlUShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU16>(
+                        (CompiledModelTestBase.EnumU16 v1, CompiledModelTestBase.EnumU16 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU16 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU16 v) => v),
+                    providerValueComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                        (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                        (ushort value) => (CompiledModelTestBase.EnumU16)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU16, ushort>(
+                        JsonUInt16ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU16, ushort>(
+                            (CompiledModelTestBase.EnumU16 value) => (ushort)value,
+                            (ushort value) => (CompiledModelTestBase.EnumU16)value))));
+            nullableEnumU16Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU32 = runtimeEntityType.AddProperty(
+                "NullableEnumU32",
+                typeof(CompiledModelTestBase.EnumU32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU32.TypeMapping = MySqlUIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>)),
+                providerValueComparer: new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                    (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                    (uint value) => (CompiledModelTestBase.EnumU32)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                    JsonUInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value)));
+            nullableEnumU32.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU32Array = runtimeEntityType.AddProperty(
+                "NullableEnumU32Array",
+                typeof(CompiledModelTestBase.EnumU32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))),
+                elementMapping: MySqlUIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))));
+            nullableEnumU32Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU32AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsString",
+                typeof(CompiledModelTestBase.EnumU32?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU32AsString.TypeMapping = MySqlUIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>)),
+                providerValueComparer: new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                    (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                    (uint value) => (CompiledModelTestBase.EnumU32)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                    JsonUInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value)));
+            nullableEnumU32AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU32AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsStringArray",
+                typeof(CompiledModelTestBase.EnumU32?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32?[], CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))),
+                elementMapping: MySqlUIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))));
+            nullableEnumU32AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU32AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU32AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU32?>, List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU32?>, List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))),
+                elementMapping: MySqlUIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))));
+            nullableEnumU32AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU32Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU32Collection",
+                typeof(List<CompiledModelTestBase.EnumU32?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU32Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU32Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU32Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU32>(new ValueComparer<CompiledModelTestBase.EnumU32?>(
+                    (Nullable<CompiledModelTestBase.EnumU32> v1, Nullable<CompiledModelTestBase.EnumU32> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU32)v1, (object)(CompiledModelTestBase.EnumU32)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? ((CompiledModelTestBase.EnumU32)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU32> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU32>)(CompiledModelTestBase.EnumU32)v : default(Nullable<CompiledModelTestBase.EnumU32>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU32?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU32?>, List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU32?>, List<CompiledModelTestBase.EnumU32?>, CompiledModelTestBase.EnumU32>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))),
+                elementMapping: MySqlUIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU32>(
+                        (CompiledModelTestBase.EnumU32 v1, CompiledModelTestBase.EnumU32 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU32 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU32 v) => v),
+                    providerValueComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                        (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                        (uint value) => (CompiledModelTestBase.EnumU32)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU32, uint>(
+                        JsonUInt32ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU32, uint>(
+                            (CompiledModelTestBase.EnumU32 value) => (uint)value,
+                            (uint value) => (CompiledModelTestBase.EnumU32)value))));
+            nullableEnumU32Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU64 = runtimeEntityType.AddProperty(
+                "NullableEnumU64",
+                typeof(CompiledModelTestBase.EnumU64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU64.TypeMapping = MySqlULongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>)),
+                providerValueComparer: new ValueComparer<ulong>(
+                    (ulong v1, ulong v2) => v1 == v2,
+                    (ulong v) => v.GetHashCode(),
+                    (ulong v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                    (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                    (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                    JsonUInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value)));
+            nullableEnumU64.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU64Array = runtimeEntityType.AddProperty(
+                "NullableEnumU64Array",
+                typeof(CompiledModelTestBase.EnumU64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))),
+                elementMapping: MySqlULongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))));
+            nullableEnumU64Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU64AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsString",
+                typeof(CompiledModelTestBase.EnumU64?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU64AsString.TypeMapping = MySqlULongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>)),
+                providerValueComparer: new ValueComparer<ulong>(
+                    (ulong v1, ulong v2) => v1 == v2,
+                    (ulong v) => v.GetHashCode(),
+                    (ulong v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                    (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                    (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                    JsonUInt64ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value)));
+            nullableEnumU64AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU64AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsStringArray",
+                typeof(CompiledModelTestBase.EnumU64?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64?[], CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))),
+                elementMapping: MySqlULongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))));
+            nullableEnumU64AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU64AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU64AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU64?>, List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU64?>, List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))),
+                elementMapping: MySqlULongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))));
+            nullableEnumU64AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU64Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU64Collection",
+                typeof(List<CompiledModelTestBase.EnumU64?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU64Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU64Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU64Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU64>(new ValueComparer<CompiledModelTestBase.EnumU64?>(
+                    (Nullable<CompiledModelTestBase.EnumU64> v1, Nullable<CompiledModelTestBase.EnumU64> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU64)v1, (object)(CompiledModelTestBase.EnumU64)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? ((CompiledModelTestBase.EnumU64)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU64> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU64>)(CompiledModelTestBase.EnumU64)v : default(Nullable<CompiledModelTestBase.EnumU64>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU64?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU64?>, List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU64?>, List<CompiledModelTestBase.EnumU64?>, CompiledModelTestBase.EnumU64>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))),
+                elementMapping: MySqlULongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU64>(
+                        (CompiledModelTestBase.EnumU64 v1, CompiledModelTestBase.EnumU64 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU64 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU64 v) => v),
+                    providerValueComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                        (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                        (ulong value) => (CompiledModelTestBase.EnumU64)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU64, ulong>(
+                        JsonUInt64ReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU64, ulong>(
+                            (CompiledModelTestBase.EnumU64 value) => (ulong)value,
+                            (ulong value) => (CompiledModelTestBase.EnumU64)value))));
+            nullableEnumU64Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU8 = runtimeEntityType.AddProperty(
+                "NullableEnumU8",
+                typeof(CompiledModelTestBase.EnumU8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU8.TypeMapping = MySqlByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>)),
+                providerValueComparer: new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                    (byte value) => (CompiledModelTestBase.EnumU8)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value)));
+            nullableEnumU8.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU8Array = runtimeEntityType.AddProperty(
+                "NullableEnumU8Array",
+                typeof(CompiledModelTestBase.EnumU8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))));
+            nullableEnumU8Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU8AsString = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsString",
+                typeof(CompiledModelTestBase.EnumU8?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableEnumU8AsString.TypeMapping = MySqlByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>)),
+                providerValueComparer: new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                    (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                    (byte value) => (CompiledModelTestBase.EnumU8)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                    JsonByteReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value)));
+            nullableEnumU8AsString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU8AsStringArray = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsStringArray",
+                typeof(CompiledModelTestBase.EnumU8?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8AsStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8?[], CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))));
+            nullableEnumU8AsStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU8AsStringCollection = runtimeEntityType.AddProperty(
+                "NullableEnumU8AsStringCollection",
+                typeof(List<CompiledModelTestBase.EnumU8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8AsStringCollection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8AsStringCollection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8AsStringCollection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU8?>, List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU8?>, List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))));
+            nullableEnumU8AsStringCollection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableEnumU8Collection = runtimeEntityType.AddProperty(
+                "NullableEnumU8Collection",
+                typeof(List<CompiledModelTestBase.EnumU8?>),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableEnumU8Collection", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableEnumU8Collection>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableEnumU8Collection.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>))),
+                keyComparer: new NullableValueTypeListComparer<CompiledModelTestBase.EnumU8>(new ValueComparer<CompiledModelTestBase.EnumU8?>(
+                    (Nullable<CompiledModelTestBase.EnumU8> v1, Nullable<CompiledModelTestBase.EnumU8> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.EnumU8)v1, (object)(CompiledModelTestBase.EnumU8)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? ((CompiledModelTestBase.EnumU8)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.EnumU8> v) => v.HasValue ? (Nullable<CompiledModelTestBase.EnumU8>)(CompiledModelTestBase.EnumU8)v : default(Nullable<CompiledModelTestBase.EnumU8>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<CompiledModelTestBase.EnumU8?>(new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU8?>, List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value)))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<List<CompiledModelTestBase.EnumU8?>, List<CompiledModelTestBase.EnumU8?>, CompiledModelTestBase.EnumU8>(
+                    new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    keyComparer: new ValueComparer<CompiledModelTestBase.EnumU8>(
+                        (CompiledModelTestBase.EnumU8 v1, CompiledModelTestBase.EnumU8 v2) => object.Equals((object)v1, (object)v2),
+                        (CompiledModelTestBase.EnumU8 v) => v.GetHashCode(),
+                        (CompiledModelTestBase.EnumU8 v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    converter: new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                        (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                        (byte value) => (CompiledModelTestBase.EnumU8)value),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.EnumU8, byte>(
+                        JsonByteReaderWriter.Instance,
+                        new ValueConverter<CompiledModelTestBase.EnumU8, byte>(
+                            (CompiledModelTestBase.EnumU8 value) => (byte)value,
+                            (byte value) => (CompiledModelTestBase.EnumU8)value))));
+            nullableEnumU8Collection.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableFloat = runtimeEntityType.AddProperty(
+                "NullableFloat",
+                typeof(float?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableFloat", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableFloat>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableFloat.TypeMapping = MySqlFloatTypeMapping.Default.Clone(
+                comparer: new ValueComparer<float?>(
+                    (Nullable<float> v1, Nullable<float> v2) => v1.HasValue && v2.HasValue && ((float)v1).Equals((float)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<float> v) => v.HasValue ? ((float)v).GetHashCode() : 0,
+                    (Nullable<float> v) => v.HasValue ? (Nullable<float>)(float)v : default(Nullable<float>)),
+                keyComparer: new ValueComparer<float?>(
+                    (Nullable<float> v1, Nullable<float> v2) => v1.HasValue && v2.HasValue && ((float)v1).Equals((float)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<float> v) => v.HasValue ? ((float)v).GetHashCode() : 0,
+                    (Nullable<float> v) => v.HasValue ? (Nullable<float>)(float)v : default(Nullable<float>)),
+                providerValueComparer: new ValueComparer<float?>(
+                    (Nullable<float> v1, Nullable<float> v2) => v1.HasValue && v2.HasValue && ((float)v1).Equals((float)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<float> v) => v.HasValue ? ((float)v).GetHashCode() : 0,
+                    (Nullable<float> v) => v.HasValue ? (Nullable<float>)(float)v : default(Nullable<float>)));
+            nullableFloat.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableFloatArray = runtimeEntityType.AddProperty(
+                "NullableFloatArray",
+                typeof(float?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableFloatArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableFloatArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableFloatArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<float>(new ValueComparer<float?>(
+                    (Nullable<float> v1, Nullable<float> v2) => v1.HasValue && v2.HasValue && ((float)v1).Equals((float)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<float> v) => v.HasValue ? ((float)v).GetHashCode() : 0,
+                    (Nullable<float> v) => v.HasValue ? (Nullable<float>)(float)v : default(Nullable<float>))),
+                keyComparer: new NullableValueTypeListComparer<float>(new ValueComparer<float?>(
+                    (Nullable<float> v1, Nullable<float> v2) => v1.HasValue && v2.HasValue && ((float)v1).Equals((float)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<float> v) => v.HasValue ? ((float)v).GetHashCode() : 0,
+                    (Nullable<float> v) => v.HasValue ? (Nullable<float>)(float)v : default(Nullable<float>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<float?>(new JsonNullableStructCollectionReaderWriter<float?[], float?[], float>(
+                    JsonFloatReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<float?[], float?[], float>(
+                    JsonFloatReaderWriter.Instance),
+                elementMapping: MySqlFloatTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<float>(
+                        (float v1, float v2) => v1.Equals(v2),
+                        (float v) => v.GetHashCode(),
+                        (float v) => v),
+                    keyComparer: new ValueComparer<float>(
+                        (float v1, float v2) => v1.Equals(v2),
+                        (float v) => v.GetHashCode(),
+                        (float v) => v),
+                    providerValueComparer: new ValueComparer<float>(
+                        (float v1, float v2) => v1.Equals(v2),
+                        (float v) => v.GetHashCode(),
+                        (float v) => v)));
+            nullableFloatArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableGuid = runtimeEntityType.AddProperty(
+                "NullableGuid",
+                typeof(Guid?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableGuid", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableGuid>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableGuid.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid?>(
+                    (Nullable<Guid> v1, Nullable<Guid> v2) => v1.HasValue && v2.HasValue && (Guid)v1 == (Guid)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<Guid> v) => v.HasValue ? ((Guid)v).GetHashCode() : 0,
+                    (Nullable<Guid> v) => v.HasValue ? (Nullable<Guid>)(Guid)v : default(Nullable<Guid>)),
+                keyComparer: new ValueComparer<Guid?>(
+                    (Nullable<Guid> v1, Nullable<Guid> v2) => v1.HasValue && v2.HasValue && (Guid)v1 == (Guid)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<Guid> v) => v.HasValue ? ((Guid)v).GetHashCode() : 0,
+                    (Nullable<Guid> v) => v.HasValue ? (Nullable<Guid>)(Guid)v : default(Nullable<Guid>)),
+                providerValueComparer: new ValueComparer<Guid?>(
+                    (Nullable<Guid> v1, Nullable<Guid> v2) => v1.HasValue && v2.HasValue && (Guid)v1 == (Guid)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<Guid> v) => v.HasValue ? ((Guid)v).GetHashCode() : 0,
+                    (Nullable<Guid> v) => v.HasValue ? (Nullable<Guid>)(Guid)v : default(Nullable<Guid>)));
+            nullableGuid.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableGuidArray = runtimeEntityType.AddProperty(
+                "NullableGuidArray",
+                typeof(Guid?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableGuidArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableGuidArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableGuidArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<Guid>(new ValueComparer<Guid?>(
+                    (Nullable<Guid> v1, Nullable<Guid> v2) => v1.HasValue && v2.HasValue && (Guid)v1 == (Guid)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<Guid> v) => v.HasValue ? ((Guid)v).GetHashCode() : 0,
+                    (Nullable<Guid> v) => v.HasValue ? (Nullable<Guid>)(Guid)v : default(Nullable<Guid>))),
+                keyComparer: new NullableValueTypeListComparer<Guid>(new ValueComparer<Guid?>(
+                    (Nullable<Guid> v1, Nullable<Guid> v2) => v1.HasValue && v2.HasValue && (Guid)v1 == (Guid)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<Guid> v) => v.HasValue ? ((Guid)v).GetHashCode() : 0,
+                    (Nullable<Guid> v) => v.HasValue ? (Nullable<Guid>)(Guid)v : default(Nullable<Guid>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<Guid?>(new JsonNullableStructCollectionReaderWriter<Guid?[], Guid?[], Guid>(
+                    JsonGuidReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<Guid?[], Guid?[], Guid>(
+                    JsonGuidReaderWriter.Instance),
+                elementMapping: MySqlGuidTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Guid>(
+                        (Guid v1, Guid v2) => v1 == v2,
+                        (Guid v) => v.GetHashCode(),
+                        (Guid v) => v),
+                    keyComparer: new ValueComparer<Guid>(
+                        (Guid v1, Guid v2) => v1 == v2,
+                        (Guid v) => v.GetHashCode(),
+                        (Guid v) => v),
+                    providerValueComparer: new ValueComparer<Guid>(
+                        (Guid v1, Guid v2) => v1 == v2,
+                        (Guid v) => v.GetHashCode(),
+                        (Guid v) => v)));
+            nullableGuidArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableIPAddress = runtimeEntityType.AddProperty(
+                "NullableIPAddress",
+                typeof(IPAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableIPAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableIPAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableIPAddress.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v),
+                keyComparer: new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(45)",
+                    size: 45),
+                converter: new ValueConverter<IPAddress, string>(
+                    (IPAddress v) => v.ToString(),
+                    (string v) => IPAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v))));
+            nullableIPAddress.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableIPAddressArray = runtimeEntityType.AddProperty(
+                "NullableIPAddressArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableIPAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableIPAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableIPAddressArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            nullableIPAddressArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableInt16 = runtimeEntityType.AddProperty(
+                "NullableInt16",
+                typeof(short?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt16.TypeMapping = MySqlShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<short?>(
+                    (Nullable<short> v1, Nullable<short> v2) => v1.HasValue && v2.HasValue && (short)v1 == (short)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<short> v) => v.HasValue ? (int)(short)v : 0,
+                    (Nullable<short> v) => v.HasValue ? (Nullable<short>)(short)v : default(Nullable<short>)),
+                keyComparer: new ValueComparer<short?>(
+                    (Nullable<short> v1, Nullable<short> v2) => v1.HasValue && v2.HasValue && (short)v1 == (short)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<short> v) => v.HasValue ? (int)(short)v : 0,
+                    (Nullable<short> v) => v.HasValue ? (Nullable<short>)(short)v : default(Nullable<short>)),
+                providerValueComparer: new ValueComparer<short?>(
+                    (Nullable<short> v1, Nullable<short> v2) => v1.HasValue && v2.HasValue && (short)v1 == (short)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<short> v) => v.HasValue ? (int)(short)v : 0,
+                    (Nullable<short> v) => v.HasValue ? (Nullable<short>)(short)v : default(Nullable<short>)));
+            nullableInt16.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableInt16Array = runtimeEntityType.AddProperty(
+                "NullableInt16Array",
+                typeof(short?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt16Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<short>(new ValueComparer<short?>(
+                    (Nullable<short> v1, Nullable<short> v2) => v1.HasValue && v2.HasValue && (short)v1 == (short)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<short> v) => v.HasValue ? (int)(short)v : 0,
+                    (Nullable<short> v) => v.HasValue ? (Nullable<short>)(short)v : default(Nullable<short>))),
+                keyComparer: new NullableValueTypeListComparer<short>(new ValueComparer<short?>(
+                    (Nullable<short> v1, Nullable<short> v2) => v1.HasValue && v2.HasValue && (short)v1 == (short)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<short> v) => v.HasValue ? (int)(short)v : 0,
+                    (Nullable<short> v) => v.HasValue ? (Nullable<short>)(short)v : default(Nullable<short>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<short?>(new JsonNullableStructCollectionReaderWriter<short?[], short?[], short>(
+                    JsonInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<short?[], short?[], short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)));
+            nullableInt16Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableInt32 = runtimeEntityType.AddProperty(
+                "NullableInt32",
+                typeof(int?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt32.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int?>(
+                    (Nullable<int> v1, Nullable<int> v2) => v1.HasValue && v2.HasValue && (int)v1 == (int)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<int> v) => v.HasValue ? (int)v : 0,
+                    (Nullable<int> v) => v.HasValue ? (Nullable<int>)(int)v : default(Nullable<int>)),
+                keyComparer: new ValueComparer<int?>(
+                    (Nullable<int> v1, Nullable<int> v2) => v1.HasValue && v2.HasValue && (int)v1 == (int)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<int> v) => v.HasValue ? (int)v : 0,
+                    (Nullable<int> v) => v.HasValue ? (Nullable<int>)(int)v : default(Nullable<int>)),
+                providerValueComparer: new ValueComparer<int?>(
+                    (Nullable<int> v1, Nullable<int> v2) => v1.HasValue && v2.HasValue && (int)v1 == (int)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<int> v) => v.HasValue ? (int)v : 0,
+                    (Nullable<int> v) => v.HasValue ? (Nullable<int>)(int)v : default(Nullable<int>)));
+            nullableInt32.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableInt32Array = runtimeEntityType.AddProperty(
+                "NullableInt32Array",
+                typeof(int?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt32Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<int>(new ValueComparer<int?>(
+                    (Nullable<int> v1, Nullable<int> v2) => v1.HasValue && v2.HasValue && (int)v1 == (int)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<int> v) => v.HasValue ? (int)v : 0,
+                    (Nullable<int> v) => v.HasValue ? (Nullable<int>)(int)v : default(Nullable<int>))),
+                keyComparer: new NullableValueTypeListComparer<int>(new ValueComparer<int?>(
+                    (Nullable<int> v1, Nullable<int> v2) => v1.HasValue && v2.HasValue && (int)v1 == (int)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<int> v) => v.HasValue ? (int)v : 0,
+                    (Nullable<int> v) => v.HasValue ? (Nullable<int>)(int)v : default(Nullable<int>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<int?>(new JsonNullableStructCollectionReaderWriter<int?[], int?[], int>(
+                    JsonInt32ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<int?[], int?[], int>(
+                    JsonInt32ReaderWriter.Instance),
+                elementMapping: MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v)));
+            nullableInt32Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableInt64 = runtimeEntityType.AddProperty(
+                "NullableInt64",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt64.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                keyComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                providerValueComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+            nullableInt64.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableInt64Array = runtimeEntityType.AddProperty(
+                "NullableInt64Array",
+                typeof(long?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt64Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<long>(new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>))),
+                keyComparer: new NullableValueTypeListComparer<long>(new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<long?>(new JsonNullableStructCollectionReaderWriter<long?[], long?[], long>(
+                    JsonInt64ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<long?[], long?[], long>(
+                    JsonInt64ReaderWriter.Instance),
+                elementMapping: MySqlLongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    keyComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v),
+                    providerValueComparer: new ValueComparer<long>(
+                        (long v1, long v2) => v1 == v2,
+                        (long v) => v.GetHashCode(),
+                        (long v) => v)));
+            nullableInt64Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableInt8 = runtimeEntityType.AddProperty(
+                "NullableInt8",
+                typeof(sbyte?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableInt8.TypeMapping = MySqlSByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<sbyte?>(
+                    (Nullable<sbyte> v1, Nullable<sbyte> v2) => v1.HasValue && v2.HasValue && (sbyte)v1 == (sbyte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<sbyte> v) => v.HasValue ? (int)(sbyte)v : 0,
+                    (Nullable<sbyte> v) => v.HasValue ? (Nullable<sbyte>)(sbyte)v : default(Nullable<sbyte>)),
+                keyComparer: new ValueComparer<sbyte?>(
+                    (Nullable<sbyte> v1, Nullable<sbyte> v2) => v1.HasValue && v2.HasValue && (sbyte)v1 == (sbyte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<sbyte> v) => v.HasValue ? (int)(sbyte)v : 0,
+                    (Nullable<sbyte> v) => v.HasValue ? (Nullable<sbyte>)(sbyte)v : default(Nullable<sbyte>)),
+                providerValueComparer: new ValueComparer<sbyte?>(
+                    (Nullable<sbyte> v1, Nullable<sbyte> v2) => v1.HasValue && v2.HasValue && (sbyte)v1 == (sbyte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<sbyte> v) => v.HasValue ? (int)(sbyte)v : 0,
+                    (Nullable<sbyte> v) => v.HasValue ? (Nullable<sbyte>)(sbyte)v : default(Nullable<sbyte>)));
+            nullableInt8.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableInt8Array = runtimeEntityType.AddProperty(
+                "NullableInt8Array",
+                typeof(sbyte?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableInt8Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<sbyte>(new ValueComparer<sbyte?>(
+                    (Nullable<sbyte> v1, Nullable<sbyte> v2) => v1.HasValue && v2.HasValue && (sbyte)v1 == (sbyte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<sbyte> v) => v.HasValue ? (int)(sbyte)v : 0,
+                    (Nullable<sbyte> v) => v.HasValue ? (Nullable<sbyte>)(sbyte)v : default(Nullable<sbyte>))),
+                keyComparer: new NullableValueTypeListComparer<sbyte>(new ValueComparer<sbyte?>(
+                    (Nullable<sbyte> v1, Nullable<sbyte> v2) => v1.HasValue && v2.HasValue && (sbyte)v1 == (sbyte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<sbyte> v) => v.HasValue ? (int)(sbyte)v : 0,
+                    (Nullable<sbyte> v) => v.HasValue ? (Nullable<sbyte>)(sbyte)v : default(Nullable<sbyte>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<sbyte?>(new JsonNullableStructCollectionReaderWriter<sbyte?[], sbyte?[], sbyte>(
+                    JsonSByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<sbyte?[], sbyte?[], sbyte>(
+                    JsonSByteReaderWriter.Instance),
+                elementMapping: MySqlSByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    keyComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v),
+                    providerValueComparer: new ValueComparer<sbyte>(
+                        (sbyte v1, sbyte v2) => v1 == v2,
+                        (sbyte v) => (int)v,
+                        (sbyte v) => v)));
+            nullableInt8Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullablePhysicalAddress = runtimeEntityType.AddProperty(
+                "NullablePhysicalAddress",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullablePhysicalAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullablePhysicalAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullablePhysicalAddress.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    (PhysicalAddress v) => v.ToString(),
+                    (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        (PhysicalAddress v) => v.ToString(),
+                        (string v) => PhysicalAddress.Parse(v))));
+            nullablePhysicalAddress.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullablePhysicalAddressArray = runtimeEntityType.AddProperty(
+                "NullablePhysicalAddressArray",
+                typeof(PhysicalAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullablePhysicalAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullablePhysicalAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullablePhysicalAddressArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v)),
+                keyComparer: new ListComparer<PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<PhysicalAddress>(new JsonCollectionReaderWriter<PhysicalAddress[], PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            (PhysicalAddress v) => v.ToString(),
+                            (string v) => PhysicalAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<PhysicalAddress[], PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            (PhysicalAddress v) => v.ToString(),
+                            (string v) => PhysicalAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<PhysicalAddress>(
+                        (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        (PhysicalAddress v) => v.GetHashCode(),
+                        (PhysicalAddress v) => v),
+                    keyComparer: new ValueComparer<PhysicalAddress>(
+                        (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        (PhysicalAddress v) => v.GetHashCode(),
+                        (PhysicalAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(20)",
+                        size: 20),
+                    converter: new ValueConverter<PhysicalAddress, string>(
+                        (PhysicalAddress v) => v.ToString(),
+                        (string v) => PhysicalAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            (PhysicalAddress v) => v.ToString(),
+                            (string v) => PhysicalAddress.Parse(v)))));
+            nullablePhysicalAddressArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableString = runtimeEntityType.AddProperty(
+                "NullableString",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableString", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableString>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableString.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                storeTypePostfix: StoreTypePostfix.None);
+            nullableString.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableStringArray = runtimeEntityType.AddProperty(
+                "NullableStringArray",
+                typeof(string[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableStringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableStringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableStringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<string[], string[], string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<string[], string[], string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            nullableStringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableTimeOnly = runtimeEntityType.AddProperty(
+                "NullableTimeOnly",
+                typeof(TimeOnly?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableTimeOnly.TypeMapping = MySqlTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly?>(
+                    (Nullable<TimeOnly> v1, Nullable<TimeOnly> v2) => v1.HasValue && v2.HasValue && (TimeOnly)v1 == (TimeOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeOnly> v) => v.HasValue ? ((TimeOnly)v).GetHashCode() : 0,
+                    (Nullable<TimeOnly> v) => v.HasValue ? (Nullable<TimeOnly>)(TimeOnly)v : default(Nullable<TimeOnly>)),
+                keyComparer: new ValueComparer<TimeOnly?>(
+                    (Nullable<TimeOnly> v1, Nullable<TimeOnly> v2) => v1.HasValue && v2.HasValue && (TimeOnly)v1 == (TimeOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeOnly> v) => v.HasValue ? ((TimeOnly)v).GetHashCode() : 0,
+                    (Nullable<TimeOnly> v) => v.HasValue ? (Nullable<TimeOnly>)(TimeOnly)v : default(Nullable<TimeOnly>)),
+                providerValueComparer: new ValueComparer<TimeOnly?>(
+                    (Nullable<TimeOnly> v1, Nullable<TimeOnly> v2) => v1.HasValue && v2.HasValue && (TimeOnly)v1 == (TimeOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeOnly> v) => v.HasValue ? ((TimeOnly)v).GetHashCode() : 0,
+                    (Nullable<TimeOnly> v) => v.HasValue ? (Nullable<TimeOnly>)(TimeOnly)v : default(Nullable<TimeOnly>)),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "time(6)",
+                    precision: 6));
+            nullableTimeOnly.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableTimeOnlyArray = runtimeEntityType.AddProperty(
+                "NullableTimeOnlyArray",
+                typeof(TimeOnly?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableTimeOnlyArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<TimeOnly>(new ValueComparer<TimeOnly?>(
+                    (Nullable<TimeOnly> v1, Nullable<TimeOnly> v2) => v1.HasValue && v2.HasValue && (TimeOnly)v1 == (TimeOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeOnly> v) => v.HasValue ? ((TimeOnly)v).GetHashCode() : 0,
+                    (Nullable<TimeOnly> v) => v.HasValue ? (Nullable<TimeOnly>)(TimeOnly)v : default(Nullable<TimeOnly>))),
+                keyComparer: new NullableValueTypeListComparer<TimeOnly>(new ValueComparer<TimeOnly?>(
+                    (Nullable<TimeOnly> v1, Nullable<TimeOnly> v2) => v1.HasValue && v2.HasValue && (TimeOnly)v1 == (TimeOnly)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeOnly> v) => v.HasValue ? ((TimeOnly)v).GetHashCode() : 0,
+                    (Nullable<TimeOnly> v) => v.HasValue ? (Nullable<TimeOnly>)(TimeOnly)v : default(Nullable<TimeOnly>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<TimeOnly?>(new JsonNullableStructCollectionReaderWriter<TimeOnly?[], TimeOnly?[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<TimeOnly?[], TimeOnly?[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance),
+                elementMapping: MySqlTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeOnly>(
+                        (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        (TimeOnly v) => v.GetHashCode(),
+                        (TimeOnly v) => v),
+                    keyComparer: new ValueComparer<TimeOnly>(
+                        (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        (TimeOnly v) => v.GetHashCode(),
+                        (TimeOnly v) => v),
+                    providerValueComparer: new ValueComparer<TimeOnly>(
+                        (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        (TimeOnly v) => v.GetHashCode(),
+                        (TimeOnly v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "time(6)",
+                        precision: 6)));
+            nullableTimeOnlyArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableTimeSpan = runtimeEntityType.AddProperty(
+                "NullableTimeSpan",
+                typeof(TimeSpan?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeSpan", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeSpan>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableTimeSpan.TypeMapping = MySqlTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan?>(
+                    (Nullable<TimeSpan> v1, Nullable<TimeSpan> v2) => v1.HasValue && v2.HasValue && (TimeSpan)v1 == (TimeSpan)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeSpan> v) => v.HasValue ? ((TimeSpan)v).GetHashCode() : 0,
+                    (Nullable<TimeSpan> v) => v.HasValue ? (Nullable<TimeSpan>)(TimeSpan)v : default(Nullable<TimeSpan>)),
+                keyComparer: new ValueComparer<TimeSpan?>(
+                    (Nullable<TimeSpan> v1, Nullable<TimeSpan> v2) => v1.HasValue && v2.HasValue && (TimeSpan)v1 == (TimeSpan)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeSpan> v) => v.HasValue ? ((TimeSpan)v).GetHashCode() : 0,
+                    (Nullable<TimeSpan> v) => v.HasValue ? (Nullable<TimeSpan>)(TimeSpan)v : default(Nullable<TimeSpan>)),
+                providerValueComparer: new ValueComparer<TimeSpan?>(
+                    (Nullable<TimeSpan> v1, Nullable<TimeSpan> v2) => v1.HasValue && v2.HasValue && (TimeSpan)v1 == (TimeSpan)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeSpan> v) => v.HasValue ? ((TimeSpan)v).GetHashCode() : 0,
+                    (Nullable<TimeSpan> v) => v.HasValue ? (Nullable<TimeSpan>)(TimeSpan)v : default(Nullable<TimeSpan>)),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "time(6)",
+                    precision: 6),
+                clrType: typeof(TimeSpan));
+            nullableTimeSpan.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableTimeSpanArray = runtimeEntityType.AddProperty(
+                "NullableTimeSpanArray",
+                typeof(TimeSpan?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableTimeSpanArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableTimeSpanArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableTimeSpanArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<TimeSpan>(new ValueComparer<TimeSpan?>(
+                    (Nullable<TimeSpan> v1, Nullable<TimeSpan> v2) => v1.HasValue && v2.HasValue && (TimeSpan)v1 == (TimeSpan)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeSpan> v) => v.HasValue ? ((TimeSpan)v).GetHashCode() : 0,
+                    (Nullable<TimeSpan> v) => v.HasValue ? (Nullable<TimeSpan>)(TimeSpan)v : default(Nullable<TimeSpan>))),
+                keyComparer: new NullableValueTypeListComparer<TimeSpan>(new ValueComparer<TimeSpan?>(
+                    (Nullable<TimeSpan> v1, Nullable<TimeSpan> v2) => v1.HasValue && v2.HasValue && (TimeSpan)v1 == (TimeSpan)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<TimeSpan> v) => v.HasValue ? ((TimeSpan)v).GetHashCode() : 0,
+                    (Nullable<TimeSpan> v) => v.HasValue ? (Nullable<TimeSpan>)(TimeSpan)v : default(Nullable<TimeSpan>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<TimeSpan?>(new JsonNullableStructCollectionReaderWriter<TimeSpan?[], TimeSpan?[], TimeSpan>(
+                    new JsonCastValueReaderWriter<TimeSpan>(
+                        JsonTimeOnlyReaderWriter.Instance))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<TimeSpan?[], TimeSpan?[], TimeSpan>(
+                    new JsonCastValueReaderWriter<TimeSpan>(
+                        JsonTimeOnlyReaderWriter.Instance)),
+                elementMapping: MySqlTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeSpan>(
+                        (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        (TimeSpan v) => v.GetHashCode(),
+                        (TimeSpan v) => v),
+                    keyComparer: new ValueComparer<TimeSpan>(
+                        (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        (TimeSpan v) => v.GetHashCode(),
+                        (TimeSpan v) => v),
+                    providerValueComparer: new ValueComparer<TimeSpan>(
+                        (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        (TimeSpan v) => v.GetHashCode(),
+                        (TimeSpan v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "time(6)",
+                        precision: 6),
+                    clrType: typeof(TimeSpan)));
+            nullableTimeSpanArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUInt16 = runtimeEntityType.AddProperty(
+                "NullableUInt16",
+                typeof(ushort?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt16.TypeMapping = MySqlUShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ushort?>(
+                    (Nullable<ushort> v1, Nullable<ushort> v2) => v1.HasValue && v2.HasValue && (ushort)v1 == (ushort)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ushort> v) => v.HasValue ? (int)(ushort)v : 0,
+                    (Nullable<ushort> v) => v.HasValue ? (Nullable<ushort>)(ushort)v : default(Nullable<ushort>)),
+                keyComparer: new ValueComparer<ushort?>(
+                    (Nullable<ushort> v1, Nullable<ushort> v2) => v1.HasValue && v2.HasValue && (ushort)v1 == (ushort)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ushort> v) => v.HasValue ? (int)(ushort)v : 0,
+                    (Nullable<ushort> v) => v.HasValue ? (Nullable<ushort>)(ushort)v : default(Nullable<ushort>)),
+                providerValueComparer: new ValueComparer<ushort?>(
+                    (Nullable<ushort> v1, Nullable<ushort> v2) => v1.HasValue && v2.HasValue && (ushort)v1 == (ushort)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ushort> v) => v.HasValue ? (int)(ushort)v : 0,
+                    (Nullable<ushort> v) => v.HasValue ? (Nullable<ushort>)(ushort)v : default(Nullable<ushort>)));
+            nullableUInt16.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUInt16Array = runtimeEntityType.AddProperty(
+                "NullableUInt16Array",
+                typeof(ushort?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt16Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<ushort>(new ValueComparer<ushort?>(
+                    (Nullable<ushort> v1, Nullable<ushort> v2) => v1.HasValue && v2.HasValue && (ushort)v1 == (ushort)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ushort> v) => v.HasValue ? (int)(ushort)v : 0,
+                    (Nullable<ushort> v) => v.HasValue ? (Nullable<ushort>)(ushort)v : default(Nullable<ushort>))),
+                keyComparer: new NullableValueTypeListComparer<ushort>(new ValueComparer<ushort?>(
+                    (Nullable<ushort> v1, Nullable<ushort> v2) => v1.HasValue && v2.HasValue && (ushort)v1 == (ushort)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ushort> v) => v.HasValue ? (int)(ushort)v : 0,
+                    (Nullable<ushort> v) => v.HasValue ? (Nullable<ushort>)(ushort)v : default(Nullable<ushort>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<ushort?>(new JsonNullableStructCollectionReaderWriter<ushort?[], ushort?[], ushort>(
+                    JsonUInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<ushort?[], ushort?[], ushort>(
+                    JsonUInt16ReaderWriter.Instance),
+                elementMapping: MySqlUShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    keyComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    providerValueComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v)));
+            nullableUInt16Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUInt32 = runtimeEntityType.AddProperty(
+                "NullableUInt32",
+                typeof(uint?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt32.TypeMapping = MySqlUIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<uint?>(
+                    (Nullable<uint> v1, Nullable<uint> v2) => v1.HasValue && v2.HasValue && (uint)v1 == (uint)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<uint> v) => v.HasValue ? (int)(uint)v : 0,
+                    (Nullable<uint> v) => v.HasValue ? (Nullable<uint>)(uint)v : default(Nullable<uint>)),
+                keyComparer: new ValueComparer<uint?>(
+                    (Nullable<uint> v1, Nullable<uint> v2) => v1.HasValue && v2.HasValue && (uint)v1 == (uint)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<uint> v) => v.HasValue ? (int)(uint)v : 0,
+                    (Nullable<uint> v) => v.HasValue ? (Nullable<uint>)(uint)v : default(Nullable<uint>)),
+                providerValueComparer: new ValueComparer<uint?>(
+                    (Nullable<uint> v1, Nullable<uint> v2) => v1.HasValue && v2.HasValue && (uint)v1 == (uint)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<uint> v) => v.HasValue ? (int)(uint)v : 0,
+                    (Nullable<uint> v) => v.HasValue ? (Nullable<uint>)(uint)v : default(Nullable<uint>)));
+            nullableUInt32.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUInt32Array = runtimeEntityType.AddProperty(
+                "NullableUInt32Array",
+                typeof(uint?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt32Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<uint>(new ValueComparer<uint?>(
+                    (Nullable<uint> v1, Nullable<uint> v2) => v1.HasValue && v2.HasValue && (uint)v1 == (uint)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<uint> v) => v.HasValue ? (int)(uint)v : 0,
+                    (Nullable<uint> v) => v.HasValue ? (Nullable<uint>)(uint)v : default(Nullable<uint>))),
+                keyComparer: new NullableValueTypeListComparer<uint>(new ValueComparer<uint?>(
+                    (Nullable<uint> v1, Nullable<uint> v2) => v1.HasValue && v2.HasValue && (uint)v1 == (uint)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<uint> v) => v.HasValue ? (int)(uint)v : 0,
+                    (Nullable<uint> v) => v.HasValue ? (Nullable<uint>)(uint)v : default(Nullable<uint>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<uint?>(new JsonNullableStructCollectionReaderWriter<uint?[], uint?[], uint>(
+                    JsonUInt32ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<uint?[], uint?[], uint>(
+                    JsonUInt32ReaderWriter.Instance),
+                elementMapping: MySqlUIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    keyComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    providerValueComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v)));
+            nullableUInt32Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUInt64 = runtimeEntityType.AddProperty(
+                "NullableUInt64",
+                typeof(ulong?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt64.TypeMapping = MySqlULongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ulong?>(
+                    (Nullable<ulong> v1, Nullable<ulong> v2) => v1.HasValue && v2.HasValue && (ulong)v1 == (ulong)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ulong> v) => v.HasValue ? ((ulong)v).GetHashCode() : 0,
+                    (Nullable<ulong> v) => v.HasValue ? (Nullable<ulong>)(ulong)v : default(Nullable<ulong>)),
+                keyComparer: new ValueComparer<ulong?>(
+                    (Nullable<ulong> v1, Nullable<ulong> v2) => v1.HasValue && v2.HasValue && (ulong)v1 == (ulong)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ulong> v) => v.HasValue ? ((ulong)v).GetHashCode() : 0,
+                    (Nullable<ulong> v) => v.HasValue ? (Nullable<ulong>)(ulong)v : default(Nullable<ulong>)),
+                providerValueComparer: new ValueComparer<ulong?>(
+                    (Nullable<ulong> v1, Nullable<ulong> v2) => v1.HasValue && v2.HasValue && (ulong)v1 == (ulong)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ulong> v) => v.HasValue ? ((ulong)v).GetHashCode() : 0,
+                    (Nullable<ulong> v) => v.HasValue ? (Nullable<ulong>)(ulong)v : default(Nullable<ulong>)));
+            nullableUInt64.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUInt64Array = runtimeEntityType.AddProperty(
+                "NullableUInt64Array",
+                typeof(ulong?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt64Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<ulong>(new ValueComparer<ulong?>(
+                    (Nullable<ulong> v1, Nullable<ulong> v2) => v1.HasValue && v2.HasValue && (ulong)v1 == (ulong)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ulong> v) => v.HasValue ? ((ulong)v).GetHashCode() : 0,
+                    (Nullable<ulong> v) => v.HasValue ? (Nullable<ulong>)(ulong)v : default(Nullable<ulong>))),
+                keyComparer: new NullableValueTypeListComparer<ulong>(new ValueComparer<ulong?>(
+                    (Nullable<ulong> v1, Nullable<ulong> v2) => v1.HasValue && v2.HasValue && (ulong)v1 == (ulong)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<ulong> v) => v.HasValue ? ((ulong)v).GetHashCode() : 0,
+                    (Nullable<ulong> v) => v.HasValue ? (Nullable<ulong>)(ulong)v : default(Nullable<ulong>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<ulong?>(new JsonNullableStructCollectionReaderWriter<ulong?[], ulong?[], ulong>(
+                    JsonUInt64ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<ulong?[], ulong?[], ulong>(
+                    JsonUInt64ReaderWriter.Instance),
+                elementMapping: MySqlULongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    keyComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    providerValueComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v)));
+            nullableUInt64Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUInt8 = runtimeEntityType.AddProperty(
+                "NullableUInt8",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUInt8.TypeMapping = MySqlByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)),
+                keyComparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)),
+                providerValueComparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)));
+            nullableUInt8.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUInt8Array = runtimeEntityType.AddProperty(
+                "NullableUInt8Array",
+                typeof(byte?[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUInt8Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new NullableValueTypeListComparer<byte>(new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>))),
+                keyComparer: new NullableValueTypeListComparer<byte>(new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>))),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte?>(new JsonNullableStructCollectionReaderWriter<byte?[], byte?[], byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonNullableStructCollectionReaderWriter<byte?[], byte?[], byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            nullableUInt8Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUri = runtimeEntityType.AddProperty(
+                "NullableUri",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUri", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUri>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            nullableUri.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<Uri, string>(
+                    (Uri v) => v.ToString(),
+                    (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        (Uri v) => v.ToString(),
+                        (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+            nullableUri.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var nullableUriArray = runtimeEntityType.AddProperty(
+                "NullableUriArray",
+                typeof(Uri[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("NullableUriArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<NullableUriArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            nullableUriArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<Uri>(new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v)),
+                keyComparer: new ListComparer<Uri>(new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<Uri>(new JsonCollectionReaderWriter<Uri[], Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            (Uri v) => v.ToString(),
+                            (string v) => new Uri(v, UriKind.RelativeOrAbsolute))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<Uri[], Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            (Uri v) => v.ToString(),
+                            (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Uri>(
+                        (Uri v1, Uri v2) => v1 == v2,
+                        (Uri v) => v.GetHashCode(),
+                        (Uri v) => v),
+                    keyComparer: new ValueComparer<Uri>(
+                        (Uri v1, Uri v2) => v1 == v2,
+                        (Uri v) => v.GetHashCode(),
+                        (Uri v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<Uri, string>(
+                        (Uri v) => v.ToString(),
+                        (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            (Uri v) => v.ToString(),
+                            (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))));
+            nullableUriArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var physicalAddress = runtimeEntityType.AddProperty(
+                "PhysicalAddress",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddress", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddress>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            physicalAddress.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    (PhysicalAddress v) => v.ToString(),
+                    (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        (PhysicalAddress v) => v.ToString(),
+                        (string v) => PhysicalAddress.Parse(v))));
+            physicalAddress.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var physicalAddressArray = runtimeEntityType.AddProperty(
+                "PhysicalAddressArray",
+                typeof(PhysicalAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            physicalAddressArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v)),
+                keyComparer: new ListComparer<PhysicalAddress>(new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<PhysicalAddress>(new JsonCollectionReaderWriter<PhysicalAddress[], PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            (PhysicalAddress v) => v.ToString(),
+                            (string v) => PhysicalAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<PhysicalAddress[], PhysicalAddress[], PhysicalAddress>(
+                    new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            (PhysicalAddress v) => v.ToString(),
+                            (string v) => PhysicalAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<PhysicalAddress>(
+                        (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        (PhysicalAddress v) => v.GetHashCode(),
+                        (PhysicalAddress v) => v),
+                    keyComparer: new ValueComparer<PhysicalAddress>(
+                        (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                        (PhysicalAddress v) => v.GetHashCode(),
+                        (PhysicalAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(20)",
+                        size: 20),
+                    converter: new ValueConverter<PhysicalAddress, string>(
+                        (PhysicalAddress v) => v.ToString(),
+                        (string v) => PhysicalAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<PhysicalAddress, string>(
+                            (PhysicalAddress v) => v.ToString(),
+                            (string v) => PhysicalAddress.Parse(v)))));
+            physicalAddressArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var physicalAddressToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "PhysicalAddressToBytesConverterProperty",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new PhysicalAddressToBytesConverter());
+            physicalAddressToBytesConverterProperty.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varbinary(8)",
+                    size: 8),
+                converter: new ValueConverter<PhysicalAddress, byte[]>(
+                    (PhysicalAddress v) => v.GetAddressBytes(),
+                    (Byte[] v) => new PhysicalAddress(v)),
+                storeTypePostfix: StoreTypePostfix.Size,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, byte[]>(
+                        (PhysicalAddress v) => v.GetAddressBytes(),
+                        (Byte[] v) => new PhysicalAddress(v))));
+            physicalAddressToBytesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var physicalAddressToStringConverterProperty = runtimeEntityType.AddProperty(
+                "PhysicalAddressToStringConverterProperty",
+                typeof(PhysicalAddress),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("PhysicalAddressToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<PhysicalAddressToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new PhysicalAddressToStringConverter());
+            physicalAddressToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v),
+                keyComparer: new ValueComparer<PhysicalAddress>(
+                    (PhysicalAddress v1, PhysicalAddress v2) => object.Equals(v1, v2),
+                    (PhysicalAddress v) => v.GetHashCode(),
+                    (PhysicalAddress v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(20)",
+                    size: 20),
+                converter: new ValueConverter<PhysicalAddress, string>(
+                    (PhysicalAddress v) => v.ToString(),
+                    (string v) => PhysicalAddress.Parse(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<PhysicalAddress, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<PhysicalAddress, string>(
+                        (PhysicalAddress v) => v.ToString(),
+                        (string v) => PhysicalAddress.Parse(v))));
+            physicalAddressToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var @string = runtimeEntityType.AddProperty(
+                "String",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("String", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<String>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            @string.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                storeTypePostfix: StoreTypePostfix.None);
+            @string.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringArray = runtimeEntityType.AddProperty(
+                "StringArray",
+                typeof(string[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            stringArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<string[], string[], string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<string[], string[], string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            stringArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToBoolConverterProperty = runtimeEntityType.AddProperty(
+                "StringToBoolConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToBoolConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToBoolConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToBoolConverter());
+            stringToBoolConverterProperty.TypeMapping = MySqlBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                converter: new ValueConverter<string, bool>(
+                    (string v) => Convert.ToBoolean(v),
+                    (bool v) => Convert.ToString(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, bool>(
+                    JsonBoolReaderWriter.Instance,
+                    new ValueConverter<string, bool>(
+                        (string v) => Convert.ToBoolean(v),
+                        (bool v) => Convert.ToString(v))));
+            stringToBoolConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToBytesConverterProperty = runtimeEntityType.AddProperty(
+                "StringToBytesConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToBytesConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToBytesConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            stringToBytesConverterProperty.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                converter: new ValueConverter<string, byte[]>(
+                    (string v) => Encoding.UTF32.GetBytes(v),
+                    (Byte[] v) => Encoding.UTF32.GetString(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, byte[]>(
+                    JsonByteArrayReaderWriter.Instance,
+                    new ValueConverter<string, byte[]>(
+                        (string v) => Encoding.UTF32.GetBytes(v),
+                        (Byte[] v) => Encoding.UTF32.GetString(v))));
+            stringToBytesConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToCharConverterProperty = runtimeEntityType.AddProperty(
+                "StringToCharConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToCharConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToCharConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToCharConverter());
+            stringToCharConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(1)",
+                    size: 1),
+                converter: new ValueConverter<string, string>(
+                    (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)(v.Length < 1 ? '\0' : v[0])),
+                    (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)(v.Length < 1 ? '\0' : v[0]))),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)(v.Length < 1 ? '\0' : v[0])),
+                        (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)(v.Length < 1 ? '\0' : v[0])))));
+            stringToCharConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToDateOnlyConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateOnlyConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateOnlyConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateOnlyConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateOnlyConverter());
+            stringToDateOnlyConverterProperty.TypeMapping = MySqlDateTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<DateOnly>(
+                    (DateOnly v1, DateOnly v2) => v1.Equals(v2),
+                    (DateOnly v) => v.GetHashCode(),
+                    (DateOnly v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 10),
+                converter: new ValueConverter<string, DateOnly>(
+                    (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                    (DateOnly v) => v.ToString("yyyy\\-MM\\-dd")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateOnly>(
+                    JsonDateOnlyReaderWriter.Instance,
+                    new ValueConverter<string, DateOnly>(
+                        (string v) => DateOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                        (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"))));
+            stringToDateOnlyConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToDateTimeConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateTimeConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateTimeConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateTimeConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateTimeConverter());
+            stringToDateTimeConverterProperty.TypeMapping = MySqlDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "datetime(6)",
+                    size: 48,
+                    precision: 6),
+                converter: new ValueConverter<string, DateTime>(
+                    (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture),
+                    (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateTime>(
+                    JsonDateTimeReaderWriter.Instance,
+                    new ValueConverter<string, DateTime>(
+                        (string v) => DateTime.Parse(v, CultureInfo.InvariantCulture),
+                        (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"))));
+            stringToDateTimeConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToDateTimeOffsetConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDateTimeOffsetConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDateTimeOffsetConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDateTimeOffsetConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToDateTimeOffsetConverter());
+            stringToDateTimeOffsetConverterProperty.TypeMapping = MySqlDateTimeOffsetTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<DateTimeOffset>(
+                    (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2),
+                    (DateTimeOffset v) => v.GetHashCode(),
+                    (DateTimeOffset v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "datetime(6)",
+                    size: 48,
+                    precision: 6),
+                converter: new ValueConverter<string, DateTimeOffset>(
+                    (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture),
+                    (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, DateTimeOffset>(
+                    JsonDateTimeOffsetReaderWriter.Instance,
+                    new ValueConverter<string, DateTimeOffset>(
+                        (string v) => DateTimeOffset.Parse(v, CultureInfo.InvariantCulture),
+                        (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"))));
+            stringToDateTimeOffsetConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToDecimalNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDecimalNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDecimalNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDecimalNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<decimal>());
+            stringToDecimalNumberConverterProperty.TypeMapping = MySqlDecimalTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<decimal>(
+                    (decimal v1, decimal v2) => v1 == v2,
+                    (decimal v) => v.GetHashCode(),
+                    (decimal v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, decimal>(
+                    (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, decimal>(
+                    JsonDecimalReaderWriter.Instance,
+                    new ValueConverter<string, decimal>(
+                        (string v) => decimal.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v))));
+            stringToDecimalNumberConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToDoubleNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToDoubleNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToDoubleNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToDoubleNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<double>());
+            stringToDoubleNumberConverterProperty.TypeMapping = MySqlDoubleTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<double>(
+                    (double v1, double v2) => v1.Equals(v2),
+                    (double v) => v.GetHashCode(),
+                    (double v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, double>(
+                    (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", (object)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, double>(
+                    JsonDoubleReaderWriter.Instance,
+                    new ValueConverter<string, double>(
+                        (string v) => double.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", (object)v))));
+            stringToDoubleNumberConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToEnumConverterProperty = runtimeEntityType.AddProperty(
+                "StringToEnumConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToEnumConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToEnumConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToEnumConverter<CompiledModelTestBase.EnumU32>());
+            stringToEnumConverterProperty.TypeMapping = MySqlUIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v),
+                converter: new ValueConverter<string, uint>(
+                    (string v) => (uint)StringEnumConverter<string, CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32>.ConvertToEnum(v),
+                    (uint value) => ((CompiledModelTestBase.EnumU32)value).ToString()),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, uint>(
+                    JsonUInt32ReaderWriter.Instance,
+                    new ValueConverter<string, uint>(
+                        (string v) => (uint)StringEnumConverter<string, CompiledModelTestBase.EnumU32, CompiledModelTestBase.EnumU32>.ConvertToEnum(v),
+                        (uint value) => ((CompiledModelTestBase.EnumU32)value).ToString())));
+            stringToEnumConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToGuidConverterProperty = runtimeEntityType.AddProperty(
+                "StringToGuidConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToGuidConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToGuidConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            stringToGuidConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                storeTypePostfix: StoreTypePostfix.None);
+            stringToGuidConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToIntNumberConverterProperty = runtimeEntityType.AddProperty(
+                "StringToIntNumberConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToIntNumberConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToIntNumberConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToNumberConverter<int>());
+            stringToIntNumberConverterProperty.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    size: 64),
+                converter: new ValueConverter<string, int>(
+                    (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                    (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<string, int>(
+                        (string v) => int.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture),
+                        (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v))));
+            stringToIntNumberConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToTimeOnlyConverterProperty = runtimeEntityType.AddProperty(
+                "StringToTimeOnlyConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToTimeOnlyConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToTimeOnlyConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToTimeOnlyConverter());
+            stringToTimeOnlyConverterProperty.TypeMapping = MySqlTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "time(6)",
+                    size: 48,
+                    precision: 6),
+                converter: new ValueConverter<string, TimeOnly>(
+                    (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                    (TimeOnly v) => v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", (object)v) : v.ToString("o")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance,
+                    new ValueConverter<string, TimeOnly>(
+                        (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None),
+                        (TimeOnly v) => v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", (object)v) : v.ToString("o"))));
+            stringToTimeOnlyConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToTimeSpanConverterProperty = runtimeEntityType.AddProperty(
+                "StringToTimeSpanConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToTimeSpanConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToTimeSpanConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToTimeSpanConverter());
+            stringToTimeSpanConverterProperty.TypeMapping = MySqlTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "time(6)",
+                    size: 48,
+                    precision: 6),
+                converter: new ValueConverter<string, TimeSpan>(
+                    (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture),
+                    (TimeSpan v) => v.ToString("c")),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance,
+                    new ValueConverter<string, TimeSpan>(
+                        (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture),
+                        (TimeSpan v) => v.ToString("c"))));
+            stringToTimeSpanConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringToUriConverterProperty = runtimeEntityType.AddProperty(
+                "StringToUriConverterProperty",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("StringToUriConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<StringToUriConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new StringToUriConverter());
+            stringToUriConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<string, string>(
+                    (string v) => new Uri(v, UriKind.RelativeOrAbsolute).ToString(),
+                    (string v) => new Uri(v, UriKind.RelativeOrAbsolute).ToString()),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        (string v) => new Uri(v, UriKind.RelativeOrAbsolute).ToString(),
+                        (string v) => new Uri(v, UriKind.RelativeOrAbsolute).ToString())));
+            stringToUriConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var timeOnly = runtimeEntityType.AddProperty(
+                "TimeOnly",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnly", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnly>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new TimeOnly(0, 0, 0));
+            timeOnly.TypeMapping = MySqlTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "time(6)",
+                    precision: 6));
+            timeOnly.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var timeOnlyArray = runtimeEntityType.AddProperty(
+                "TimeOnlyArray",
+                typeof(TimeOnly[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            timeOnlyArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<TimeOnly>(new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v)),
+                keyComparer: new ListComparer<TimeOnly>(new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<TimeOnly>(new JsonCollectionReaderWriter<TimeOnly[], TimeOnly[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<TimeOnly[], TimeOnly[], TimeOnly>(
+                    JsonTimeOnlyReaderWriter.Instance),
+                elementMapping: MySqlTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeOnly>(
+                        (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        (TimeOnly v) => v.GetHashCode(),
+                        (TimeOnly v) => v),
+                    keyComparer: new ValueComparer<TimeOnly>(
+                        (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        (TimeOnly v) => v.GetHashCode(),
+                        (TimeOnly v) => v),
+                    providerValueComparer: new ValueComparer<TimeOnly>(
+                        (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                        (TimeOnly v) => v.GetHashCode(),
+                        (TimeOnly v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "time(6)",
+                        precision: 6)));
+            timeOnlyArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var timeOnlyToStringConverterProperty = runtimeEntityType.AddProperty(
+                "TimeOnlyToStringConverterProperty",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeOnlyToStringConverter());
+            timeOnlyToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<TimeOnly, string>(
+                    (TimeOnly v) => v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", (object)v) : v.ToString("o"),
+                    (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeOnly, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<TimeOnly, string>(
+                        (TimeOnly v) => v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", (object)v) : v.ToString("o"),
+                        (string v) => TimeOnly.Parse(v, CultureInfo.InvariantCulture, DateTimeStyles.None))));
+            timeOnlyToStringConverterProperty.SetSentinelFromProviderValue("00:00:00");
+            timeOnlyToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var timeOnlyToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "TimeOnlyToTicksConverterProperty",
+                typeof(TimeOnly),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeOnlyToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeOnlyToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeOnlyToTicksConverter());
+            timeOnlyToTicksConverterProperty.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v),
+                keyComparer: new ValueComparer<TimeOnly>(
+                    (TimeOnly v1, TimeOnly v2) => v1.Equals(v2),
+                    (TimeOnly v) => v.GetHashCode(),
+                    (TimeOnly v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                converter: new ValueConverter<TimeOnly, long>(
+                    (TimeOnly v) => v.Ticks,
+                    (long v) => new TimeOnly(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeOnly, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<TimeOnly, long>(
+                        (TimeOnly v) => v.Ticks,
+                        (long v) => new TimeOnly(v))));
+            timeOnlyToTicksConverterProperty.SetSentinelFromProviderValue(0L);
+            timeOnlyToTicksConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var timeSpan = runtimeEntityType.AddProperty(
+                "TimeSpan",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpan", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpan>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: new TimeSpan(0, 0, 0, 0, 0));
+            timeSpan.TypeMapping = MySqlTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "time(6)",
+                    precision: 6),
+                clrType: typeof(TimeSpan));
+            timeSpan.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var timeSpanArray = runtimeEntityType.AddProperty(
+                "TimeSpanArray",
+                typeof(TimeSpan[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            timeSpanArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<TimeSpan>(new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v)),
+                keyComparer: new ListComparer<TimeSpan>(new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<TimeSpan>(new JsonCollectionReaderWriter<TimeSpan[], TimeSpan[], TimeSpan>(
+                    new JsonCastValueReaderWriter<TimeSpan>(
+                        JsonTimeOnlyReaderWriter.Instance))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<TimeSpan[], TimeSpan[], TimeSpan>(
+                    new JsonCastValueReaderWriter<TimeSpan>(
+                        JsonTimeOnlyReaderWriter.Instance)),
+                elementMapping: MySqlTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<TimeSpan>(
+                        (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        (TimeSpan v) => v.GetHashCode(),
+                        (TimeSpan v) => v),
+                    keyComparer: new ValueComparer<TimeSpan>(
+                        (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        (TimeSpan v) => v.GetHashCode(),
+                        (TimeSpan v) => v),
+                    providerValueComparer: new ValueComparer<TimeSpan>(
+                        (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                        (TimeSpan v) => v.GetHashCode(),
+                        (TimeSpan v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "time(6)",
+                        precision: 6),
+                    clrType: typeof(TimeSpan)));
+            timeSpanArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var timeSpanToStringConverterProperty = runtimeEntityType.AddProperty(
+                "TimeSpanToStringConverterProperty",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeSpanToStringConverter());
+            timeSpanToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(48)",
+                    size: 48),
+                converter: new ValueConverter<TimeSpan, string>(
+                    (TimeSpan v) => v.ToString("c"),
+                    (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeSpan, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<TimeSpan, string>(
+                        (TimeSpan v) => v.ToString("c"),
+                        (string v) => TimeSpan.Parse(v, CultureInfo.InvariantCulture))));
+            timeSpanToStringConverterProperty.SetSentinelFromProviderValue("00:00:00");
+            timeSpanToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var timeSpanToTicksConverterProperty = runtimeEntityType.AddProperty(
+                "TimeSpanToTicksConverterProperty",
+                typeof(TimeSpan),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("TimeSpanToTicksConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<TimeSpanToTicksConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new TimeSpanToTicksConverter());
+            timeSpanToTicksConverterProperty.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v),
+                keyComparer: new ValueComparer<TimeSpan>(
+                    (TimeSpan v1, TimeSpan v2) => v1.Equals(v2),
+                    (TimeSpan v) => v.GetHashCode(),
+                    (TimeSpan v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                converter: new ValueConverter<TimeSpan, long>(
+                    (TimeSpan v) => v.Ticks,
+                    (long v) => new TimeSpan(v)),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<TimeSpan, long>(
+                    JsonInt64ReaderWriter.Instance,
+                    new ValueConverter<TimeSpan, long>(
+                        (TimeSpan v) => v.Ticks,
+                        (long v) => new TimeSpan(v))));
+            timeSpanToTicksConverterProperty.SetSentinelFromProviderValue(0L);
+            timeSpanToTicksConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uInt16 = runtimeEntityType.AddProperty(
+                "UInt16",
+                typeof(ushort),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt16", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt16>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (ushort)0);
+            uInt16.TypeMapping = MySqlUShortTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ushort>(
+                    (ushort v1, ushort v2) => v1 == v2,
+                    (ushort v) => (int)v,
+                    (ushort v) => v),
+                keyComparer: new ValueComparer<ushort>(
+                    (ushort v1, ushort v2) => v1 == v2,
+                    (ushort v) => (int)v,
+                    (ushort v) => v),
+                providerValueComparer: new ValueComparer<ushort>(
+                    (ushort v1, ushort v2) => v1 == v2,
+                    (ushort v) => (int)v,
+                    (ushort v) => v));
+            uInt16.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uInt16Array = runtimeEntityType.AddProperty(
+                "UInt16Array",
+                typeof(ushort[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt16Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt16Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt16Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<ushort>(new ValueComparer<ushort>(
+                    (ushort v1, ushort v2) => v1 == v2,
+                    (ushort v) => (int)v,
+                    (ushort v) => v)),
+                keyComparer: new ListComparer<ushort>(new ValueComparer<ushort>(
+                    (ushort v1, ushort v2) => v1 == v2,
+                    (ushort v) => (int)v,
+                    (ushort v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<ushort>(new JsonCollectionReaderWriter<ushort[], ushort[], ushort>(
+                    JsonUInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<ushort[], ushort[], ushort>(
+                    JsonUInt16ReaderWriter.Instance),
+                elementMapping: MySqlUShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    keyComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v),
+                    providerValueComparer: new ValueComparer<ushort>(
+                        (ushort v1, ushort v2) => v1 == v2,
+                        (ushort v) => (int)v,
+                        (ushort v) => v)));
+            uInt16Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uInt32 = runtimeEntityType.AddProperty(
+                "UInt32",
+                typeof(uint),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt32", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt32>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0u);
+            uInt32.TypeMapping = MySqlUIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v),
+                keyComparer: new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v),
+                providerValueComparer: new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v));
+            uInt32.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uInt32Array = runtimeEntityType.AddProperty(
+                "UInt32Array",
+                typeof(uint[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt32Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt32Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt32Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<uint>(new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v)),
+                keyComparer: new ListComparer<uint>(new ValueComparer<uint>(
+                    (uint v1, uint v2) => v1 == v2,
+                    (uint v) => (int)v,
+                    (uint v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<uint>(new JsonCollectionReaderWriter<uint[], uint[], uint>(
+                    JsonUInt32ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<uint[], uint[], uint>(
+                    JsonUInt32ReaderWriter.Instance),
+                elementMapping: MySqlUIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    keyComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v),
+                    providerValueComparer: new ValueComparer<uint>(
+                        (uint v1, uint v2) => v1 == v2,
+                        (uint v) => (int)v,
+                        (uint v) => v)));
+            uInt32Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uInt64 = runtimeEntityType.AddProperty(
+                "UInt64",
+                typeof(ulong),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt64", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt64>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0ul);
+            uInt64.TypeMapping = MySqlULongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<ulong>(
+                    (ulong v1, ulong v2) => v1 == v2,
+                    (ulong v) => v.GetHashCode(),
+                    (ulong v) => v),
+                keyComparer: new ValueComparer<ulong>(
+                    (ulong v1, ulong v2) => v1 == v2,
+                    (ulong v) => v.GetHashCode(),
+                    (ulong v) => v),
+                providerValueComparer: new ValueComparer<ulong>(
+                    (ulong v1, ulong v2) => v1 == v2,
+                    (ulong v) => v.GetHashCode(),
+                    (ulong v) => v));
+            uInt64.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uInt64Array = runtimeEntityType.AddProperty(
+                "UInt64Array",
+                typeof(ulong[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt64Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt64Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt64Array.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<ulong>(new ValueComparer<ulong>(
+                    (ulong v1, ulong v2) => v1 == v2,
+                    (ulong v) => v.GetHashCode(),
+                    (ulong v) => v)),
+                keyComparer: new ListComparer<ulong>(new ValueComparer<ulong>(
+                    (ulong v1, ulong v2) => v1 == v2,
+                    (ulong v) => v.GetHashCode(),
+                    (ulong v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<ulong>(new JsonCollectionReaderWriter<ulong[], ulong[], ulong>(
+                    JsonUInt64ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<ulong[], ulong[], ulong>(
+                    JsonUInt64ReaderWriter.Instance),
+                elementMapping: MySqlULongTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    keyComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v),
+                    providerValueComparer: new ValueComparer<ulong>(
+                        (ulong v1, ulong v2) => v1 == v2,
+                        (ulong v) => v.GetHashCode(),
+                        (ulong v) => v)));
+            uInt64Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uInt8 = runtimeEntityType.AddProperty(
+                "UInt8",
+                typeof(byte),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt8>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: (byte)0);
+            uInt8.TypeMapping = MySqlByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v),
+                keyComparer: new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v),
+                providerValueComparer: new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v));
+            uInt8.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uInt8Array = runtimeEntityType.AddProperty(
+                "UInt8Array",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UInt8Array", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UInt8Array>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uInt8Array.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()));
+            uInt8Array.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uri = runtimeEntityType.AddProperty(
+                "Uri",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("Uri", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<Uri>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uri.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<Uri, string>(
+                    (Uri v) => v.ToString(),
+                    (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        (Uri v) => v.ToString(),
+                        (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+            uri.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uriArray = runtimeEntityType.AddProperty(
+                "UriArray",
+                typeof(Uri[]),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UriArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UriArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            uriArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<Uri>(new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v)),
+                keyComparer: new ListComparer<Uri>(new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<Uri>(new JsonCollectionReaderWriter<Uri[], Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            (Uri v) => v.ToString(),
+                            (string v) => new Uri(v, UriKind.RelativeOrAbsolute))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<Uri[], Uri[], Uri>(
+                    new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            (Uri v) => v.ToString(),
+                            (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<Uri>(
+                        (Uri v1, Uri v2) => v1 == v2,
+                        (Uri v) => v.GetHashCode(),
+                        (Uri v) => v),
+                    keyComparer: new ValueComparer<Uri>(
+                        (Uri v1, Uri v2) => v1 == v2,
+                        (Uri v) => v.GetHashCode(),
+                        (Uri v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new ValueConverter<Uri, string>(
+                        (Uri v) => v.ToString(),
+                        (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<Uri, string>(
+                            (Uri v) => v.ToString(),
+                            (string v) => new Uri(v, UriKind.RelativeOrAbsolute)))));
+            uriArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var uriToStringConverterProperty = runtimeEntityType.AddProperty(
+                "UriToStringConverterProperty",
+                typeof(Uri),
+                propertyInfo: typeof(CompiledModelTestBase.ManyTypes).GetProperty("UriToStringConverterProperty", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.ManyTypes).GetField("<UriToStringConverterProperty>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueConverter: new UriToStringConverter());
+            uriToStringConverterProperty.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v),
+                keyComparer: new ValueComparer<Uri>(
+                    (Uri v1, Uri v2) => v1 == v2,
+                    (Uri v) => v.GetHashCode(),
+                    (Uri v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new ValueConverter<Uri, string>(
+                    (Uri v) => v.ToString(),
+                    (string v) => new Uri(v, UriKind.RelativeOrAbsolute)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<Uri, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<Uri, string>(
+                        (Uri v) => v.ToString(),
+                        (string v) => new Uri(v, UriKind.RelativeOrAbsolute))));
+            uriToStringConverterProperty.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "ManyTypes");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs
new file mode 100644
index 000000000..c7859fd3c
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs
@@ -0,0 +1,560 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class OwnedType0EntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>.ManyOwned#OwnedType",
+                typeof(CompiledModelTestBase.OwnedType),
+                baseEntityType,
+                sharedClrType: true,
+                propertyCount: 13,
+                servicePropertyCount: 1,
+                foreignKeyCount: 1,
+                keyCount: 1);
+
+            var principalDerivedId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedId",
+                typeof(long),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0L);
+            principalDerivedId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v));
+            principalDerivedId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalDerivedAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedAlternateId",
+                typeof(Guid),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalDerivedAlternateId.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v));
+            principalDerivedAlternateId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            var details = runtimeEntityType.AddProperty(
+                "Details",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            details.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                storeTypePostfix: StoreTypePostfix.None);
+            details.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var number = runtimeEntityType.AddProperty(
+                "Number",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                sentinel: 0);
+            number.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            number.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                keyComparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "datetime(6)",
+                        precision: 6)));
+            valueTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                keyComparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)));
+            valueTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var context = runtimeEntityType.AddServiceProperty(
+                "Context",
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Context", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                serviceType: typeof(DbContext));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalDerivedId, principalDerivedAlternateId, id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalDerivedId"), declaringEntityType.FindProperty("PrincipalDerivedAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true,
+                ownership: true);
+
+            var manyOwned = principalEntityType.AddNavigation("ManyOwned",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(ICollection<CompiledModelTestBase.OwnedType>),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("ManyOwned", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "ManyOwned");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs
new file mode 100644
index 000000000..e662a0cf5
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs
@@ -0,0 +1,596 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class OwnedTypeEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                typeof(CompiledModelTestBase.OwnedType),
+                baseEntityType,
+                sharedClrType: true,
+                changeTrackingStrategy: ChangeTrackingStrategy.ChangingAndChangedNotificationsWithOriginalValues,
+                propertyCount: 12,
+                servicePropertyCount: 1,
+                foreignKeyCount: 2,
+                keyCount: 1);
+
+            var principalBaseId = runtimeEntityType.AddProperty(
+                "PrincipalBaseId",
+                typeof(long),
+                propertyAccessMode: PropertyAccessMode.Field,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0L);
+            principalBaseId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v));
+
+            var overrides = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var principalBaseIdPrincipalBase = new RuntimeRelationalPropertyOverrides(
+                principalBaseId,
+                StoreObjectIdentifier.Table("PrincipalBase", "mySchema"),
+                false,
+                null);
+            overrides.Add(StoreObjectIdentifier.Table("PrincipalBase", "mySchema"), principalBaseIdPrincipalBase);
+            principalBaseId.AddAnnotation("Relational:RelationalOverrides", overrides);
+
+            principalBaseId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalBaseAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalBaseAlternateId",
+                typeof(Guid),
+                propertyAccessMode: PropertyAccessMode.Field,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+            principalBaseAlternateId.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v));
+            principalBaseAlternateId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var details = runtimeEntityType.AddProperty(
+                "Details",
+                typeof(string),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            details.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            var overrides0 = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var detailsDetails = new RuntimeRelationalPropertyOverrides(
+                details,
+                StoreObjectIdentifier.Table("Details", null),
+                false,
+                null);
+            overrides0.Add(StoreObjectIdentifier.Table("Details", null), detailsDetails);
+            details.AddAnnotation("Relational:RelationalOverrides", overrides0);
+
+            details.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var number = runtimeEntityType.AddProperty(
+                "Number",
+                typeof(int),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                sentinel: 0);
+            number.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            number.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            refTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                keyComparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "datetime(6)",
+                        precision: 6)));
+            valueTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                nullable: true);
+            valueTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                keyComparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)));
+            valueTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var context = runtimeEntityType.AddServiceProperty(
+                "Context",
+                propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Context", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                serviceType: typeof(DbContext));
+
+            var key = runtimeEntityType.AddKey(
+                new[] { principalBaseId, principalBaseAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId"), declaringEntityType.FindProperty("PrincipalBaseAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                requiredDependent: true,
+                ownership: true);
+
+            var owned = principalEntityType.AddNavigation("Owned",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.OwnedType),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Owned", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("_ownedField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.Field,
+                eagerLoaded: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId"), declaringEntityType.FindProperty("PrincipalBaseAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("PrincipalBaseId"), principalEntityType.FindProperty("PrincipalBaseAlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true,
+                requiredDependent: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var fragments = new StoreObjectDictionary<RuntimeEntityTypeMappingFragment>();
+            var detailsFragment = new RuntimeEntityTypeMappingFragment(
+                runtimeEntityType,
+                StoreObjectIdentifier.Table("Details", null),
+                null);
+            fragments.Add(StoreObjectIdentifier.Table("Details", null), detailsFragment);
+            runtimeEntityType.AddAnnotation("Relational:MappingFragments", fragments);
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", "mySchema");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs
new file mode 100644
index 000000000..108949728
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs
@@ -0,0 +1,721 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NetTopologySuite.Geometries;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class PrincipalBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                typeof(CompiledModelTestBase.PrincipalBase),
+                baseEntityType,
+                discriminatorValue: "PrincipalBase",
+                derivedTypesCount: 1,
+                propertyCount: 17,
+                navigationCount: 1,
+                skipNavigationCount: 1,
+                unnamedIndexCount: 1,
+                keyCount: 2);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            id.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                keyComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                providerValueComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+
+            var overrides = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var idPrincipalDerived = new RuntimeRelationalPropertyOverrides(
+                id,
+                StoreObjectIdentifier.Table("PrincipalDerived", null),
+                true,
+                "DerivedId");
+            overrides.Add(StoreObjectIdentifier.Table("PrincipalDerived", null), idPrincipalDerived);
+            id.AddAnnotation("Relational:RelationalOverrides", overrides);
+
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var alternateId = runtimeEntityType.AddProperty(
+                "AlternateId",
+                typeof(Guid),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("AlternateId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                propertyAccessMode: PropertyAccessMode.FieldDuringConstruction,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: new Guid("00000000-0000-0000-0000-000000000000"),
+                jsonValueReaderWriter: JsonGuidReaderWriter.Instance);
+            alternateId.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v));
+            alternateId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum1 = runtimeEntityType.AddProperty(
+                "Enum1",
+                typeof(CompiledModelTestBase.AnEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AnEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AnEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    (CompiledModelTestBase.AnEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AnEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        (CompiledModelTestBase.AnEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AnEnum)value)));
+            enum1.SetSentinelFromProviderValue(0);
+            enum1.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum2 = runtimeEntityType.AddProperty(
+                "Enum2",
+                typeof(CompiledModelTestBase.AnEnum?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            enum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum?>(
+                    (Nullable<CompiledModelTestBase.AnEnum> v1, Nullable<CompiledModelTestBase.AnEnum> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.AnEnum)v1, (object)(CompiledModelTestBase.AnEnum)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? ((CompiledModelTestBase.AnEnum)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? (Nullable<CompiledModelTestBase.AnEnum>)(CompiledModelTestBase.AnEnum)v : default(Nullable<CompiledModelTestBase.AnEnum>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum?>(
+                    (Nullable<CompiledModelTestBase.AnEnum> v1, Nullable<CompiledModelTestBase.AnEnum> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.AnEnum)v1, (object)(CompiledModelTestBase.AnEnum)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? ((CompiledModelTestBase.AnEnum)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? (Nullable<CompiledModelTestBase.AnEnum>)(CompiledModelTestBase.AnEnum)v : default(Nullable<CompiledModelTestBase.AnEnum>)),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    (CompiledModelTestBase.AnEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AnEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        (CompiledModelTestBase.AnEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AnEnum)value)));
+            enum2.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var flagsEnum1 = runtimeEntityType.AddProperty(
+                "FlagsEnum1",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AFlagsEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AFlagsEnum)value)));
+            flagsEnum1.SetSentinelFromProviderValue(0);
+            flagsEnum1.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var flagsEnum2 = runtimeEntityType.AddProperty(
+                "FlagsEnum2",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AFlagsEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AFlagsEnum)value)));
+            flagsEnum2.SetSentinelFromProviderValue(6);
+            flagsEnum2.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var point = runtimeEntityType.AddProperty(
+                "Point",
+                typeof(Point),
+                nullable: true,
+                valueGenerated: ValueGenerated.OnAdd,
+                valueConverter: new CastingConverter<Point, Point>(),
+                valueComparer: new CompiledModelTestBase.CustomValueComparer<Point>(),
+                providerValueComparer: new CompiledModelTestBase.CustomValueComparer<Point>());
+            point.TypeMapping = null;
+            point.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+            point.AddAnnotation("Relational:ColumnType", "geometry");
+            point.AddAnnotation("Relational:DefaultValue", (NetTopologySuite.Geometries.Point)new NetTopologySuite.IO.WKTReader().Read("SRID=0;POINT Z(0 0 0)"));
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var stringWithCharSet = runtimeEntityType.AddProperty(
+                "StringWithCharSet",
+                typeof(string),
+                nullable: true,
+                valueGenerated: ValueGenerated.OnAdd,
+                valueConverter: new CastingConverter<string, string>(),
+                valueComparer: new CompiledModelTestBase.CustomValueComparer<string>(),
+                providerValueComparer: new CompiledModelTestBase.CustomValueComparer<string>());
+            stringWithCharSet.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(128)",
+                    size: 128),
+                converter: new ValueConverter<string, string>(
+                    (string v) => (string)v,
+                    (string v) => (string)v),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        (string v) => (string)v,
+                        (string v) => (string)v)));
+            stringWithCharSet.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+            stringWithCharSet.AddAnnotation("Relational:ColumnType", "varchar(128)");
+            stringWithCharSet.AddAnnotation("Relational:DefaultValue", "String having charset");
+
+            var stringWithCollation = runtimeEntityType.AddProperty(
+                "StringWithCollation",
+                typeof(string),
+                nullable: true,
+                valueGenerated: ValueGenerated.OnAdd,
+                valueConverter: new CastingConverter<string, string>(),
+                valueComparer: new CompiledModelTestBase.CustomValueComparer<string>(),
+                providerValueComparer: new CompiledModelTestBase.CustomValueComparer<string>());
+            stringWithCollation.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(128)",
+                    size: 128),
+                converter: new ValueConverter<string, string>(
+                    (string v) => (string)v,
+                    (string v) => (string)v),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
+                    JsonStringReaderWriter.Instance,
+                    new ValueConverter<string, string>(
+                        (string v) => (string)v,
+                        (string v) => (string)v)));
+            stringWithCollation.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+            stringWithCollation.AddAnnotation("Relational:ColumnType", "varchar(128)");
+            stringWithCollation.AddAnnotation("Relational:DefaultValue", "String using collation");
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                keyComparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "datetime(6)",
+                        precision: 6)));
+            valueTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                keyComparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)));
+            valueTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+
+            var key0 = runtimeEntityType.AddKey(
+                new[] { id, alternateId });
+            runtimeEntityType.SetPrimaryKey(key0);
+            key0.AddAnnotation("Relational:Name", "PK");
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { alternateId, id });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeSkipNavigation CreateSkipNavigation1(RuntimeEntityType declaringEntityType, RuntimeEntityType targetEntityType, RuntimeEntityType joinEntityType)
+        {
+            var skipNavigation = declaringEntityType.AddSkipNavigation(
+                "Deriveds",
+                targetEntityType,
+                joinEntityType.FindForeignKey(
+                    new[] { joinEntityType.FindProperty("PrincipalsId"), joinEntityType.FindProperty("PrincipalsAlternateId") },
+                    declaringEntityType.FindKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") }),
+                    declaringEntityType),
+                true,
+                false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Deriveds", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Deriveds>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var inverse = targetEntityType.FindSkipNavigation("Principals");
+            if (inverse != null)
+            {
+                skipNavigation.Inverse = inverse;
+                inverse.Inverse = skipNavigation;
+            }
+
+            return skipNavigation;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPT");
+            runtimeEntityType.AddAnnotation("Relational:Schema", "mySchema");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
new file mode 100644
index 000000000..e5de2b1e6
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBasePrincipalDerivedDependentBasebyteEntityType.cs
@@ -0,0 +1,192 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class PrincipalBasePrincipalDerivedDependentBasebyteEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "PrincipalBasePrincipalDerived<DependentBase<byte?>>",
+                typeof(Dictionary<string, object>),
+                baseEntityType,
+                sharedClrType: true,
+                indexerPropertyInfo: RuntimeEntityType.FindIndexerProperty(typeof(Dictionary<string, object>)),
+                propertyBag: true,
+                propertyCount: 5,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var derivedsId = runtimeEntityType.AddProperty(
+                "DerivedsId",
+                typeof(long),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            derivedsId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v));
+            derivedsId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var derivedsAlternateId = runtimeEntityType.AddProperty(
+                "DerivedsAlternateId",
+                typeof(Guid),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            derivedsAlternateId.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v));
+            derivedsAlternateId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalsId = runtimeEntityType.AddProperty(
+                "PrincipalsId",
+                typeof(long),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            principalsId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                keyComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v),
+                providerValueComparer: new ValueComparer<long>(
+                    (long v1, long v2) => v1 == v2,
+                    (long v) => v.GetHashCode(),
+                    (long v) => v));
+            principalsId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalsAlternateId = runtimeEntityType.AddProperty(
+                "PrincipalsAlternateId",
+                typeof(Guid),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            principalsAlternateId.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v));
+            principalsAlternateId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var rowid = runtimeEntityType.AddProperty(
+                "rowid",
+                typeof(byte[]),
+                propertyInfo: runtimeEntityType.FindIndexerPropertyInfo(),
+                nullable: true,
+                concurrencyToken: true,
+                valueGenerated: ValueGenerated.OnAddOrUpdate,
+                beforeSaveBehavior: PropertySaveBehavior.Ignore,
+                afterSaveBehavior: PropertySaveBehavior.Ignore);
+            rowid.TypeMapping = MySqlDateTimeTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(v1, v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(v),
+                    (Byte[] v) => v == null ? null : v.ToArray()),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "timestamp(6)",
+                    precision: 6),
+                converter: new ValueConverter<byte[], DateTime>(
+                    (Byte[] v) => BytesToDateTimeConverter.FromBytes(v),
+                    (DateTime v) => BytesToDateTimeConverter.ToBytes(v)));
+            rowid.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.ComputedColumn);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { derivedsId, derivedsAlternateId, principalsId, principalsAlternateId });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalsId, principalsAlternateId });
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("DerivedsId"), declaringEntityType.FindProperty("DerivedsAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalsId"), declaringEntityType.FindProperty("PrincipalsAlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                required: true);
+
+            runtimeForeignKey.AddAnnotation("Relational:Name", "FK_PrincipalBasePrincipalDerived<DependentBase<byte?>>_Princip~1");
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBasePrincipalDerived<DependentBase<byte?>>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedEntityType.cs
new file mode 100644
index 000000000..4c3ed5ed5
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalDerivedEntityType.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class PrincipalDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                baseEntityType,
+                discriminatorValue: "PrincipalDerived<DependentBase<byte?>>",
+                propertyCount: 0,
+                navigationCount: 2,
+                skipNavigationCount: 1,
+                foreignKeyCount: 1);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id"), principalEntityType.FindProperty("AlternateId") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.Cascade,
+                unique: true,
+                required: true);
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeSkipNavigation CreateSkipNavigation1(RuntimeEntityType declaringEntityType, RuntimeEntityType targetEntityType, RuntimeEntityType joinEntityType)
+        {
+            var skipNavigation = declaringEntityType.AddSkipNavigation(
+                "Principals",
+                targetEntityType,
+                joinEntityType.FindForeignKey(
+                    new[] { joinEntityType.FindProperty("DerivedsId"), joinEntityType.FindProperty("DerivedsAlternateId") },
+                    declaringEntityType.FindKey(new[] { declaringEntityType.FindProperty("Id"), declaringEntityType.FindProperty("AlternateId") }),
+                    declaringEntityType),
+                true,
+                false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Principals", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Principals>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                eagerLoaded: true,
+                lazyLoadingEnabled: false);
+
+            var inverse = targetEntityType.FindSkipNavigation("Deriveds");
+            if (inverse != null)
+            {
+                skipNavigation.Inverse = inverse;
+                inverse.Inverse = skipNavigation;
+            }
+
+            return skipNavigation;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalDerived");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataEntityType.cs
new file mode 100644
index 000000000..e4ea3b2fa
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DataEntityType.cs
@@ -0,0 +1,90 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 2,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()));
+            blob.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Data");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModel.cs
new file mode 100644
index 000000000..583ee4d90
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModelBuilder.cs
new file mode 100644
index 000000000..8b735b26a
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/CheckConstraints/DbContextModelBuilder.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+
+            DataEntityType.CreateAnnotations(data);
+
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Id", idColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, data.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            data.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dataTable = new Table("Data", null, relationalModel);
+            var idColumn = new Column("Id", "int", dataTable);
+            dataTable.Columns.Add("Id", idColumn);
+            var blobColumn = new Column("Blob", "longblob", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("Blob", blobColumn);
+            var pK_Data = new UniqueConstraint("PK_Data", dataTable, new[] { idColumn });
+            dataTable.PrimaryKey = pK_Data;
+            var pK_DataUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                new[] { "Id" });
+            pK_Data.MappedKeys.Add(pK_DataUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DataUc).Add(pK_Data);
+            dataTable.UniqueConstraints.Add("PK_Data", pK_Data);
+            relationalModel.Tables.Add(("Data", null), dataTable);
+            var dataTableMapping = new TableMapping(data, dataTable, null);
+            dataTable.AddTypeMapping(dataTableMapping, false);
+            tableMappings.Add(dataTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, data.FindProperty("Id")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(blobColumn, data.FindProperty("Blob")!, dataTableMapping);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModel.cs
new file mode 100644
index 000000000..583ee4d90
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModelBuilder.cs
new file mode 100644
index 000000000..d8691fc79
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/DbContextModelBuilder.cs
@@ -0,0 +1,1106 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 2)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var principalBase = PrincipalBaseEntityType.Create(this);
+            var principalDerived = PrincipalDerivedEntityType.Create(this, principalBase);
+
+            PrincipalBaseEntityType.CreateForeignKey1(principalBase, principalBase);
+
+            PrincipalBaseEntityType.CreateAnnotations(principalBase);
+            PrincipalDerivedEntityType.CreateAnnotations(principalDerived);
+
+            var functions = new Dictionary<string, IDbFunction>();
+            var principalBaseTvf = new RuntimeDbFunction(
+                "PrincipalBaseTvf",
+                this,
+                typeof(IQueryable<CompiledModelTestBase.PrincipalBase>),
+                "PrincipalBaseTvf",
+                schema: "dbo");
+
+            functions["PrincipalBaseTvf"] = principalBaseTvf;
+
+            AddAnnotation("Relational:DbFunctions", functions);
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:DefaultSchema", "dbo");
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var principalBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", null, relationalModel);
+            var discriminatorColumnBase = new ColumnBase<ColumnMappingBase>("Discriminator", "varchar(55)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Discriminator", discriminatorColumnBase);
+            var enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Enum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum1", enum1ColumnBase);
+            var enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Enum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum2", enum2ColumnBase);
+            var flagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase);
+            var flagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Id", idColumnBase);
+            var owned_DetailsColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Details", "varchar(64)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Details", owned_DetailsColumnBase);
+            var owned_NumberColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Number", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Number", owned_NumberColumnBase);
+            var owned_Principal_AlternateIdColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_AlternateId", "char(36)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_AlternateId", owned_Principal_AlternateIdColumnBase);
+            var owned_Principal_Enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_Enum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_Enum1", owned_Principal_Enum1ColumnBase);
+            var owned_Principal_Enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_Enum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_Enum2", owned_Principal_Enum2ColumnBase);
+            var owned_Principal_FlagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_FlagsEnum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_FlagsEnum1", owned_Principal_FlagsEnum1ColumnBase);
+            var owned_Principal_FlagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_FlagsEnum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_FlagsEnum2", owned_Principal_FlagsEnum2ColumnBase);
+            var owned_Principal_IdColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_Id", owned_Principal_IdColumnBase);
+            var owned_Principal_RefTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_RefTypeArray", owned_Principal_RefTypeArrayColumnBase);
+            var owned_Principal_RefTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_RefTypeEnumerable", owned_Principal_RefTypeEnumerableColumnBase);
+            var owned_Principal_RefTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_RefTypeIList", owned_Principal_RefTypeIListColumnBase);
+            var owned_Principal_RefTypeListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_RefTypeList", owned_Principal_RefTypeListColumnBase);
+            var owned_Principal_ValueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_ValueTypeArray", owned_Principal_ValueTypeArrayColumnBase);
+            var owned_Principal_ValueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_ValueTypeEnumerable", owned_Principal_ValueTypeEnumerableColumnBase);
+            var owned_Principal_ValueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_ValueTypeIList", owned_Principal_ValueTypeIListColumnBase);
+            var owned_Principal_ValueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_Principal_ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_Principal_ValueTypeList", owned_Principal_ValueTypeListColumnBase);
+            var owned_RefTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("Owned_RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_RefTypeArray", owned_RefTypeArrayColumnBase);
+            var owned_RefTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("Owned_RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_RefTypeEnumerable", owned_RefTypeEnumerableColumnBase);
+            var owned_RefTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_RefTypeIList", owned_RefTypeIListColumnBase);
+            var owned_RefTypeListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_RefTypeList", owned_RefTypeListColumnBase);
+            var owned_ValueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("Owned_ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_ValueTypeArray", owned_ValueTypeArrayColumnBase);
+            var owned_ValueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("Owned_ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_ValueTypeEnumerable", owned_ValueTypeEnumerableColumnBase);
+            var owned_ValueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_ValueTypeIList", owned_ValueTypeIListColumnBase);
+            var owned_ValueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("Owned_ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Owned_ValueTypeList", owned_ValueTypeListColumnBase);
+            var principalBaseIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalBaseId", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("PrincipalBaseId", principalBaseIdColumnBase);
+            var refTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase);
+            var refTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase);
+            var refTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase);
+            var refTypeListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeList", refTypeListColumnBase);
+            var valueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase);
+            var valueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase);
+            var valueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase);
+            var valueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase = new TableMappingBase<ColumnMappingBase>(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)discriminatorColumnBase, principalBase.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase, principalBase.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var principalBaseTable = new Table("PrincipalBase", "dbo", relationalModel);
+            var idColumn = new Column("Id", "bigint", principalBaseTable);
+            principalBaseTable.Columns.Add("Id", idColumn);
+            var deetsColumn = new Column("Deets", "varchar(64)", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Deets", deetsColumn);
+            var discriminatorColumn = new Column("Discriminator", "varchar(55)", principalBaseTable);
+            principalBaseTable.Columns.Add("Discriminator", discriminatorColumn);
+            var enum1Column = new Column("Enum1", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("Enum1", enum1Column);
+            var enum2Column = new Column("Enum2", "int", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Enum2", enum2Column);
+            var flagsEnum1Column = new Column("FlagsEnum1", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum1", flagsEnum1Column);
+            var flagsEnum2Column = new Column("FlagsEnum2", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum2", flagsEnum2Column);
+            var owned_NumberColumn = new Column("Owned_Number", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned_Number", owned_NumberColumn);
+            var owned_Principal_AlternateIdColumn = new Column("Owned_Principal_AlternateId", "char(36)", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned_Principal_AlternateId", owned_Principal_AlternateIdColumn);
+            var owned_Principal_Enum1Column = new Column("Owned_Principal_Enum1", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned_Principal_Enum1", owned_Principal_Enum1Column);
+            var owned_Principal_Enum2Column = new Column("Owned_Principal_Enum2", "int", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_Enum2", owned_Principal_Enum2Column);
+            var owned_Principal_FlagsEnum1Column = new Column("Owned_Principal_FlagsEnum1", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned_Principal_FlagsEnum1", owned_Principal_FlagsEnum1Column);
+            var owned_Principal_FlagsEnum2Column = new Column("Owned_Principal_FlagsEnum2", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("Owned_Principal_FlagsEnum2", owned_Principal_FlagsEnum2Column);
+            var owned_Principal_IdColumn = new Column("Owned_Principal_Id", "bigint", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_Id", owned_Principal_IdColumn);
+            var owned_Principal_RefTypeArrayColumn = new Column("Owned_Principal_RefTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_RefTypeArray", owned_Principal_RefTypeArrayColumn);
+            var owned_Principal_RefTypeEnumerableColumn = new Column("Owned_Principal_RefTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_RefTypeEnumerable", owned_Principal_RefTypeEnumerableColumn);
+            var owned_Principal_RefTypeIListColumn = new Column("Owned_Principal_RefTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_RefTypeIList", owned_Principal_RefTypeIListColumn);
+            var owned_Principal_RefTypeListColumn = new Column("Owned_Principal_RefTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_RefTypeList", owned_Principal_RefTypeListColumn);
+            var owned_Principal_ValueTypeArrayColumn = new Column("Owned_Principal_ValueTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_ValueTypeArray", owned_Principal_ValueTypeArrayColumn);
+            var owned_Principal_ValueTypeEnumerableColumn = new Column("Owned_Principal_ValueTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_ValueTypeEnumerable", owned_Principal_ValueTypeEnumerableColumn);
+            var owned_Principal_ValueTypeIListColumn = new Column("Owned_Principal_ValueTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_ValueTypeIList", owned_Principal_ValueTypeIListColumn);
+            var owned_Principal_ValueTypeListColumn = new Column("Owned_Principal_ValueTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_Principal_ValueTypeList", owned_Principal_ValueTypeListColumn);
+            var owned_RefTypeArrayColumn = new Column("Owned_RefTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeArray", owned_RefTypeArrayColumn);
+            var owned_RefTypeEnumerableColumn = new Column("Owned_RefTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeEnumerable", owned_RefTypeEnumerableColumn);
+            var owned_RefTypeIListColumn = new Column("Owned_RefTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeIList", owned_RefTypeIListColumn);
+            var owned_RefTypeListColumn = new Column("Owned_RefTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_RefTypeList", owned_RefTypeListColumn);
+            var owned_ValueTypeArrayColumn = new Column("Owned_ValueTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeArray", owned_ValueTypeArrayColumn);
+            var owned_ValueTypeEnumerableColumn = new Column("Owned_ValueTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeEnumerable", owned_ValueTypeEnumerableColumn);
+            var owned_ValueTypeIListColumn = new Column("Owned_ValueTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeIList", owned_ValueTypeIListColumn);
+            var owned_ValueTypeListColumn = new Column("Owned_ValueTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Owned_ValueTypeList", owned_ValueTypeListColumn);
+            var principalBaseIdColumn = new Column("PrincipalBaseId", "bigint", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("PrincipalBaseId", principalBaseIdColumn);
+            var refTypeArrayColumn = new Column("RefTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeArray", refTypeArrayColumn);
+            var refTypeEnumerableColumn = new Column("RefTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn);
+            var refTypeIListColumn = new Column("RefTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeIList", refTypeIListColumn);
+            var refTypeListColumn = new Column("RefTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeList", refTypeListColumn);
+            var valueTypeArrayColumn = new Column("ValueTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn);
+            var valueTypeEnumerableColumn = new Column("ValueTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn);
+            var valueTypeIListColumn = new Column("ValueTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeIList", valueTypeIListColumn);
+            var valueTypeListColumn = new Column("ValueTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeList", valueTypeListColumn);
+            var pK_PrincipalBase = new UniqueConstraint("PK_PrincipalBase", principalBaseTable, new[] { idColumn });
+            principalBaseTable.PrimaryKey = pK_PrincipalBase;
+            var pK_PrincipalBaseUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            pK_PrincipalBase.MappedKeys.Add(pK_PrincipalBaseUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalBaseUc).Add(pK_PrincipalBase);
+            principalBaseTable.UniqueConstraints.Add("PK_PrincipalBase", pK_PrincipalBase);
+            var iX_PrincipalBase_PrincipalBaseId = new TableIndex(
+            "IX_PrincipalBase_PrincipalBaseId", principalBaseTable, new[] { principalBaseIdColumn }, false);
+            var iX_PrincipalBase_PrincipalBaseIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalBaseId" });
+            iX_PrincipalBase_PrincipalBaseId.MappedIndexes.Add(iX_PrincipalBase_PrincipalBaseIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_PrincipalBaseIdIx).Add(iX_PrincipalBase_PrincipalBaseId);
+            principalBaseTable.Indexes.Add("IX_PrincipalBase_PrincipalBaseId", iX_PrincipalBase_PrincipalBaseId);
+            relationalModel.Tables.Add(("PrincipalBase", "dbo"), principalBaseTable);
+            var principalBaseTableMapping = new TableMapping(principalBase, principalBaseTable, true)
+            {
+                IsSharedTablePrincipal = true,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping, false);
+            tableMappings.Add(principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, principalBase.FindProperty("Id")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(discriminatorColumn, principalBase.FindProperty("Discriminator")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column, principalBase.FindProperty("Enum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column, principalBase.FindProperty("Enum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalBase.FindProperty("FlagsEnum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalBase.FindProperty("FlagsEnum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTableMapping);
+
+            var viewMappings = new List<ViewMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:ViewMappings", viewMappings);
+            var principalBaseViewView = new View("PrincipalBaseView", "dbo", relationalModel);
+            var discriminatorViewColumn = new ViewColumn("Discriminator", "varchar(55)", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Discriminator", discriminatorViewColumn);
+            var enum1ViewColumn = new ViewColumn("Enum1", "int", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Enum1", enum1ViewColumn);
+            var enum2ViewColumn = new ViewColumn("Enum2", "int", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("Enum2", enum2ViewColumn);
+            var flagsEnum1ViewColumn = new ViewColumn("FlagsEnum1", "int", principalBaseViewView);
+            principalBaseViewView.Columns.Add("FlagsEnum1", flagsEnum1ViewColumn);
+            var flagsEnum2ViewColumn = new ViewColumn("FlagsEnum2", "int", principalBaseViewView);
+            principalBaseViewView.Columns.Add("FlagsEnum2", flagsEnum2ViewColumn);
+            var idViewColumn = new ViewColumn("Id", "bigint", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Id", idViewColumn);
+            var principalBaseIdViewColumn = new ViewColumn("PrincipalBaseId", "bigint", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("PrincipalBaseId", principalBaseIdViewColumn);
+            var refTypeArrayViewColumn = new ViewColumn("RefTypeArray", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeArray", refTypeArrayViewColumn);
+            var refTypeEnumerableViewColumn = new ViewColumn("RefTypeEnumerable", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeEnumerable", refTypeEnumerableViewColumn);
+            var refTypeIListViewColumn = new ViewColumn("RefTypeIList", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeIList", refTypeIListViewColumn);
+            var refTypeListViewColumn = new ViewColumn("RefTypeList", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeList", refTypeListViewColumn);
+            var valueTypeArrayViewColumn = new ViewColumn("ValueTypeArray", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeArray", valueTypeArrayViewColumn);
+            var valueTypeEnumerableViewColumn = new ViewColumn("ValueTypeEnumerable", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableViewColumn);
+            var valueTypeIListViewColumn = new ViewColumn("ValueTypeIList", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeIList", valueTypeIListViewColumn);
+            var valueTypeListViewColumn = new ViewColumn("ValueTypeList", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeList", valueTypeListViewColumn);
+            relationalModel.Views.Add(("PrincipalBaseView", "dbo"), principalBaseViewView);
+            var principalBaseViewViewMapping = new ViewMapping(principalBase, principalBaseViewView, true);
+            principalBaseViewView.AddTypeMapping(principalBaseViewViewMapping, false);
+            viewMappings.Add(principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(idViewColumn, principalBase.FindProperty("Id")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(discriminatorViewColumn, principalBase.FindProperty("Discriminator")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum1ViewColumn, principalBase.FindProperty("Enum1")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum2ViewColumn, principalBase.FindProperty("Enum2")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum1ViewColumn, principalBase.FindProperty("FlagsEnum1")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum2ViewColumn, principalBase.FindProperty("FlagsEnum2")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalBaseIdViewColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeArrayViewColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeEnumerableViewColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeIListViewColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeListViewColumn, principalBase.FindProperty("RefTypeList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeArrayViewColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeEnumerableViewColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeIListViewColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeListViewColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseViewViewMapping);
+
+            var sqlQueryMappings = new List<SqlQueryMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:SqlQueryMappings", sqlQueryMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery = new SqlQuery("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.MappedSqlQuery", relationalModel, "select * from PrincipalBase");
+            var discriminatorSqlQueryColumn = new SqlQueryColumn("Discriminator", "varchar(55)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("Discriminator", discriminatorSqlQueryColumn);
+            var enum1SqlQueryColumn = new SqlQueryColumn("Enum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("Enum1", enum1SqlQueryColumn);
+            var enum2SqlQueryColumn = new SqlQueryColumn("Enum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("Enum2", enum2SqlQueryColumn);
+            var flagsEnum1SqlQueryColumn = new SqlQueryColumn("FlagsEnum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("FlagsEnum1", flagsEnum1SqlQueryColumn);
+            var flagsEnum2SqlQueryColumn = new SqlQueryColumn("FlagsEnum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("FlagsEnum2", flagsEnum2SqlQueryColumn);
+            var idSqlQueryColumn = new SqlQueryColumn("Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("Id", idSqlQueryColumn);
+            var principalBaseIdSqlQueryColumn = new SqlQueryColumn("PrincipalBaseId", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("PrincipalBaseId", principalBaseIdSqlQueryColumn);
+            var refTypeArraySqlQueryColumn = new SqlQueryColumn("RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("RefTypeArray", refTypeArraySqlQueryColumn);
+            var refTypeEnumerableSqlQueryColumn = new SqlQueryColumn("RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("RefTypeEnumerable", refTypeEnumerableSqlQueryColumn);
+            var refTypeIListSqlQueryColumn = new SqlQueryColumn("RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("RefTypeIList", refTypeIListSqlQueryColumn);
+            var refTypeListSqlQueryColumn = new SqlQueryColumn("RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("RefTypeList", refTypeListSqlQueryColumn);
+            var valueTypeArraySqlQueryColumn = new SqlQueryColumn("ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("ValueTypeArray", valueTypeArraySqlQueryColumn);
+            var valueTypeEnumerableSqlQueryColumn = new SqlQueryColumn("ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableSqlQueryColumn);
+            var valueTypeIListSqlQueryColumn = new SqlQueryColumn("ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("ValueTypeIList", valueTypeIListSqlQueryColumn);
+            var valueTypeListSqlQueryColumn = new SqlQueryColumn("ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.Columns.Add("ValueTypeList", valueTypeListSqlQueryColumn);
+            relationalModel.Queries.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.MappedSqlQuery", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping = new SqlQueryMapping(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery, true);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping, false);
+            sqlQueryMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping.IsDefaultSqlQueryMapping = true;
+            RelationalModel.CreateSqlQueryColumnMapping(idSqlQueryColumn, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(discriminatorSqlQueryColumn, principalBase.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(enum1SqlQueryColumn, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(enum2SqlQueryColumn, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(flagsEnum1SqlQueryColumn, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(flagsEnum2SqlQueryColumn, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(principalBaseIdSqlQueryColumn, principalBase.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeArraySqlQueryColumn, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeEnumerableSqlQueryColumn, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeIListSqlQueryColumn, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeListSqlQueryColumn, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeArraySqlQueryColumn, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeEnumerableSqlQueryColumn, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeIListSqlQueryColumn, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeListSqlQueryColumn, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping);
+
+            var functionMappings = new List<FunctionMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:FunctionMappings", functionMappings);
+            var principalBaseTvf = (IRuntimeDbFunction)this.FindDbFunction("PrincipalBaseTvf")!;
+            var principalBaseTvfFunction = new StoreFunction(principalBaseTvf, relationalModel);
+            var discriminatorFunctionColumn = new FunctionColumn("Discriminator", "varchar(55)", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("Discriminator", discriminatorFunctionColumn);
+            var enum1FunctionColumn = new FunctionColumn("Enum1", "int", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("Enum1", enum1FunctionColumn);
+            var enum2FunctionColumn = new FunctionColumn("Enum2", "int", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("Enum2", enum2FunctionColumn);
+            var flagsEnum1FunctionColumn = new FunctionColumn("FlagsEnum1", "int", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("FlagsEnum1", flagsEnum1FunctionColumn);
+            var flagsEnum2FunctionColumn = new FunctionColumn("FlagsEnum2", "int", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("FlagsEnum2", flagsEnum2FunctionColumn);
+            var idFunctionColumn = new FunctionColumn("Id", "bigint", principalBaseTvfFunction);
+            principalBaseTvfFunction.Columns.Add("Id", idFunctionColumn);
+            var principalBaseIdFunctionColumn = new FunctionColumn("PrincipalBaseId", "bigint", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("PrincipalBaseId", principalBaseIdFunctionColumn);
+            var refTypeArrayFunctionColumn = new FunctionColumn("RefTypeArray", "longtext", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("RefTypeArray", refTypeArrayFunctionColumn);
+            var refTypeEnumerableFunctionColumn = new FunctionColumn("RefTypeEnumerable", "longtext", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("RefTypeEnumerable", refTypeEnumerableFunctionColumn);
+            var refTypeIListFunctionColumn = new FunctionColumn("RefTypeIList", "longtext", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("RefTypeIList", refTypeIListFunctionColumn);
+            var refTypeListFunctionColumn = new FunctionColumn("RefTypeList", "longtext", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("RefTypeList", refTypeListFunctionColumn);
+            var valueTypeArrayFunctionColumn = new FunctionColumn("ValueTypeArray", "longtext", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("ValueTypeArray", valueTypeArrayFunctionColumn);
+            var valueTypeEnumerableFunctionColumn = new FunctionColumn("ValueTypeEnumerable", "longtext", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableFunctionColumn);
+            var valueTypeIListFunctionColumn = new FunctionColumn("ValueTypeIList", "longtext", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("ValueTypeIList", valueTypeIListFunctionColumn);
+            var valueTypeListFunctionColumn = new FunctionColumn("ValueTypeList", "longtext", principalBaseTvfFunction)
+            {
+                IsNullable = true
+            };
+            principalBaseTvfFunction.Columns.Add("ValueTypeList", valueTypeListFunctionColumn);
+            relationalModel.Functions.Add(
+                ("PrincipalBaseTvf", "dbo", new string[0]),
+                principalBaseTvfFunction);
+            var principalBaseTvfFunctionMapping = new FunctionMapping(principalBase, principalBaseTvfFunction, principalBaseTvf, true);
+            principalBaseTvfFunction.AddTypeMapping(principalBaseTvfFunctionMapping, false);
+            functionMappings.Add(principalBaseTvfFunctionMapping);
+            principalBaseTvfFunctionMapping.IsDefaultFunctionMapping = true;
+            RelationalModel.CreateFunctionColumnMapping(idFunctionColumn, principalBase.FindProperty("Id")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(discriminatorFunctionColumn, principalBase.FindProperty("Discriminator")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(enum1FunctionColumn, principalBase.FindProperty("Enum1")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(enum2FunctionColumn, principalBase.FindProperty("Enum2")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(flagsEnum1FunctionColumn, principalBase.FindProperty("FlagsEnum1")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(flagsEnum2FunctionColumn, principalBase.FindProperty("FlagsEnum2")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(principalBaseIdFunctionColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(refTypeArrayFunctionColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(refTypeEnumerableFunctionColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(refTypeIListFunctionColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(refTypeListFunctionColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(valueTypeArrayFunctionColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(valueTypeEnumerableFunctionColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(valueTypeIListFunctionColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTvfFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(valueTypeListFunctionColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTvfFunctionMapping);
+
+            var deleteSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:DeleteStoredProcedureMappings", deleteSprocMappings);
+            var principalBase_DeleteStoreSproc = new StoreStoredProcedure("PrincipalBase_Delete", "dbo", relationalModel);
+            var id_OriginalParameter = new StoreStoredProcedureParameter("Id_Original", "bigint", 0, principalBase_DeleteStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_DeleteStoreSproc.AddParameter(id_OriginalParameter);
+            var rowsAffectedParameter = new StoreStoredProcedureParameter("RowsAffected", "int", 1, principalBase_DeleteStoreSproc, System.Data.ParameterDirection.Output);
+            principalBase_DeleteStoreSproc.AddParameter(rowsAffectedParameter);
+            principalBase_DeleteStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Delete", "dbo"), principalBase_DeleteStoreSproc);
+            var principalBase_DeleteDSproc = (IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!;
+            var principalBase_DeleteSprocMapping = new StoredProcedureMapping(principalBase, principalBase_DeleteStoreSproc, (IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!, principalBaseTableMapping, true);
+            principalBase_DeleteStoreSproc.AddTypeMapping(principalBase_DeleteSprocMapping, false);
+            deleteSprocMappings.Add(principalBase_DeleteSprocMapping);
+            principalBaseTableMapping.DeleteStoredProcedureMapping = principalBase_DeleteSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter, principalBase_DeleteDSproc.FindParameter("Id_Original")!, principalBase.FindProperty("Id")!, principalBase_DeleteSprocMapping);
+
+            var insertSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:InsertStoredProcedureMappings", insertSprocMappings);
+            var principalBase_InsertStoreSproc = new StoreStoredProcedure("PrincipalBase_Insert", "dbo", relationalModel);
+            var principalBaseIdParameter = new StoreStoredProcedureParameter("PrincipalBaseId", "bigint", 0, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(principalBaseIdParameter);
+            var enum1Parameter = new StoreStoredProcedureParameter("Enum1", "int", 1, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(enum1Parameter);
+            var enum2Parameter = new StoreStoredProcedureParameter("Enum2", "int", 2, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(enum2Parameter);
+            var flagsEnum1Parameter = new StoreStoredProcedureParameter("FlagsEnum1", "int", 3, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(flagsEnum1Parameter);
+            var flagsEnum2Parameter = new StoreStoredProcedureParameter("FlagsEnum2", "int", 4, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(flagsEnum2Parameter);
+            var valueTypeListParameter = new StoreStoredProcedureParameter("ValueTypeList", "longtext", 5, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeListParameter);
+            var valueTypeIListParameter = new StoreStoredProcedureParameter("ValueTypeIList", "longtext", 6, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeIListParameter);
+            var valueTypeArrayParameter = new StoreStoredProcedureParameter("ValueTypeArray", "longtext", 7, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeArrayParameter);
+            var valueTypeEnumerableParameter = new StoreStoredProcedureParameter("ValueTypeEnumerable", "longtext", 8, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeEnumerableParameter);
+            var refTypeListParameter = new StoreStoredProcedureParameter("RefTypeList", "longtext", 9, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeListParameter);
+            var refTypeIListParameter = new StoreStoredProcedureParameter("RefTypeIList", "longtext", 10, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeIListParameter);
+            var refTypeArrayParameter = new StoreStoredProcedureParameter("RefTypeArray", "longtext", 11, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeArrayParameter);
+            var refTypeEnumerableParameter = new StoreStoredProcedureParameter("RefTypeEnumerable", "longtext", 12, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeEnumerableParameter);
+            var discriminatorParameter = new StoreStoredProcedureParameter("Discriminator", "varchar(55)", 13, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(discriminatorParameter);
+            var idParameter = new StoreStoredProcedureParameter("Id", "bigint", 14, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Output);
+            principalBase_InsertStoreSproc.AddParameter(idParameter);
+            principalBase_InsertStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Insert", "dbo"), principalBase_InsertStoreSproc);
+            var principalBase_InsertISproc = (IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!;
+            var principalBase_InsertSprocMapping = new StoredProcedureMapping(principalBase, principalBase_InsertStoreSproc, (IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!, principalBaseTableMapping, true);
+            principalBase_InsertStoreSproc.AddTypeMapping(principalBase_InsertSprocMapping, false);
+            insertSprocMappings.Add(principalBase_InsertSprocMapping);
+            principalBaseTableMapping.InsertStoredProcedureMapping = principalBase_InsertSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(idParameter, principalBase_InsertISproc.FindParameter("Id")!, principalBase.FindProperty("Id")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(discriminatorParameter, principalBase_InsertISproc.FindParameter("Discriminator")!, principalBase.FindProperty("Discriminator")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter, principalBase_InsertISproc.FindParameter("Enum1")!, principalBase.FindProperty("Enum1")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter, principalBase_InsertISproc.FindParameter("Enum2")!, principalBase.FindProperty("Enum2")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum1")!, principalBase.FindProperty("FlagsEnum1")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum2")!, principalBase.FindProperty("FlagsEnum2")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter, principalBase_InsertISproc.FindParameter("PrincipalBaseId")!, principalBase.FindProperty("PrincipalBaseId")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter, principalBase_InsertISproc.FindParameter("RefTypeArray")!, principalBase.FindProperty("RefTypeArray")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("RefTypeEnumerable")!, principalBase.FindProperty("RefTypeEnumerable")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter, principalBase_InsertISproc.FindParameter("RefTypeIList")!, principalBase.FindProperty("RefTypeIList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter, principalBase_InsertISproc.FindParameter("RefTypeList")!, principalBase.FindProperty("RefTypeList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter, principalBase_InsertISproc.FindParameter("ValueTypeArray")!, principalBase.FindProperty("ValueTypeArray")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("ValueTypeEnumerable")!, principalBase.FindProperty("ValueTypeEnumerable")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter, principalBase_InsertISproc.FindParameter("ValueTypeIList")!, principalBase.FindProperty("ValueTypeIList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter, principalBase_InsertISproc.FindParameter("ValueTypeList")!, principalBase.FindProperty("ValueTypeList")!, principalBase_InsertSprocMapping);
+
+            var updateSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:UpdateStoredProcedureMappings", updateSprocMappings);
+            var principalBase_UpdateStoreSproc = new StoreStoredProcedure("PrincipalBase_Update", "dbo", relationalModel);
+            var principalBaseIdParameter0 = new StoreStoredProcedureParameter("PrincipalBaseId", "bigint", 0, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(principalBaseIdParameter0);
+            var enum1Parameter0 = new StoreStoredProcedureParameter("Enum1", "int", 1, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(enum1Parameter0);
+            var enum2Parameter0 = new StoreStoredProcedureParameter("Enum2", "int", 2, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(enum2Parameter0);
+            var flagsEnum1Parameter0 = new StoreStoredProcedureParameter("FlagsEnum1", "int", 3, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(flagsEnum1Parameter0);
+            var flagsEnum2Parameter0 = new StoreStoredProcedureParameter("FlagsEnum2", "int", 4, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(flagsEnum2Parameter0);
+            var valueTypeListParameter0 = new StoreStoredProcedureParameter("ValueTypeList", "longtext", 5, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeListParameter0);
+            var valueTypeIListParameter0 = new StoreStoredProcedureParameter("ValueTypeIList", "longtext", 6, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeIListParameter0);
+            var valueTypeArrayParameter0 = new StoreStoredProcedureParameter("ValueTypeArray", "longtext", 7, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeArrayParameter0);
+            var valueTypeEnumerableParameter0 = new StoreStoredProcedureParameter("ValueTypeEnumerable", "longtext", 8, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeEnumerableParameter0);
+            var refTypeListParameter0 = new StoreStoredProcedureParameter("RefTypeList", "longtext", 9, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeListParameter0);
+            var refTypeIListParameter0 = new StoreStoredProcedureParameter("RefTypeIList", "longtext", 10, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeIListParameter0);
+            var refTypeArrayParameter0 = new StoreStoredProcedureParameter("RefTypeArray", "longtext", 11, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeArrayParameter0);
+            var refTypeEnumerableParameter0 = new StoreStoredProcedureParameter("RefTypeEnumerable", "longtext", 12, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeEnumerableParameter0);
+            var id_OriginalParameter0 = new StoreStoredProcedureParameter("Id_Original", "bigint", 13, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(id_OriginalParameter0);
+            principalBase_UpdateStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Update", "dbo"), principalBase_UpdateStoreSproc);
+            var principalBase_UpdateUSproc = (IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!;
+            var principalBase_UpdateSprocMapping = new StoredProcedureMapping(principalBase, principalBase_UpdateStoreSproc, (IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!, principalBaseTableMapping, true);
+            principalBase_UpdateStoreSproc.AddTypeMapping(principalBase_UpdateSprocMapping, false);
+            updateSprocMappings.Add(principalBase_UpdateSprocMapping);
+            principalBaseTableMapping.UpdateStoredProcedureMapping = principalBase_UpdateSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter0, principalBase_UpdateUSproc.FindParameter("Id_Original")!, principalBase.FindProperty("Id")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter0, principalBase_UpdateUSproc.FindParameter("Enum1")!, principalBase.FindProperty("Enum1")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter0, principalBase_UpdateUSproc.FindParameter("Enum2")!, principalBase.FindProperty("Enum2")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum1")!, principalBase.FindProperty("FlagsEnum1")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum2")!, principalBase.FindProperty("FlagsEnum2")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter0, principalBase_UpdateUSproc.FindParameter("PrincipalBaseId")!, principalBase.FindProperty("PrincipalBaseId")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeArray")!, principalBase.FindProperty("RefTypeArray")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeEnumerable")!, principalBase.FindProperty("RefTypeEnumerable")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeIList")!, principalBase.FindProperty("RefTypeIList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeList")!, principalBase.FindProperty("RefTypeList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeArray")!, principalBase.FindProperty("ValueTypeArray")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeEnumerable")!, principalBase.FindProperty("ValueTypeEnumerable")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeIList")!, principalBase.FindProperty("ValueTypeIList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeList")!, principalBase.FindProperty("ValueTypeList")!, principalBase_UpdateSprocMapping);
+
+            var ownedType = principalBase.FindComplexProperty("Owned")!.ComplexType;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            ownedType.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0 = new TableMappingBase<ColumnMappingBase>(ownedType, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0, false);
+            defaultTableMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_DetailsColumnBase, ownedType.FindProperty("Details")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_NumberColumnBase, ownedType.FindProperty("Number")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_RefTypeArrayColumnBase, ownedType.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_RefTypeEnumerableColumnBase, ownedType.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_RefTypeIListColumnBase, ownedType.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_RefTypeListColumnBase, ownedType.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_ValueTypeArrayColumnBase, ownedType.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_ValueTypeEnumerableColumnBase, ownedType.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_ValueTypeIListColumnBase, ownedType.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_ValueTypeListColumnBase, ownedType.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase0);
+
+            var tableMappings0 = new List<TableMapping>();
+            ownedType.SetRuntimeAnnotation("Relational:TableMappings", tableMappings0);
+            var principalBaseTableMapping0 = new TableMapping(ownedType, principalBaseTable, true);
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping0, false);
+            tableMappings0.Add(principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(deetsColumn, ownedType.FindProperty("Details")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_NumberColumn, ownedType.FindProperty("Number")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeArrayColumn, ownedType.FindProperty("RefTypeArray")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeEnumerableColumn, ownedType.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeIListColumn, ownedType.FindProperty("RefTypeIList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_RefTypeListColumn, ownedType.FindProperty("RefTypeList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeArrayColumn, ownedType.FindProperty("ValueTypeArray")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeEnumerableColumn, ownedType.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeIListColumn, ownedType.FindProperty("ValueTypeIList")!, principalBaseTableMapping0);
+            RelationalModel.CreateColumnMapping(owned_ValueTypeListColumn, ownedType.FindProperty("ValueTypeList")!, principalBaseTableMapping0);
+
+            var principalBase0 = ownedType.FindComplexProperty("Principal")!.ComplexType;
+
+            var defaultTableMappings1 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase0.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings1);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1 = new TableMappingBase<ColumnMappingBase>(principalBase0, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1, false);
+            defaultTableMappings1.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_AlternateIdColumnBase, principalBase0.FindProperty("AlternateId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_Enum1ColumnBase, principalBase0.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_Enum2ColumnBase, principalBase0.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_FlagsEnum1ColumnBase, principalBase0.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_FlagsEnum2ColumnBase, principalBase0.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_IdColumnBase, principalBase0.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_RefTypeArrayColumnBase, principalBase0.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_RefTypeEnumerableColumnBase, principalBase0.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_RefTypeIListColumnBase, principalBase0.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_RefTypeListColumnBase, principalBase0.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_ValueTypeArrayColumnBase, principalBase0.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_ValueTypeEnumerableColumnBase, principalBase0.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_ValueTypeIListColumnBase, principalBase0.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)owned_Principal_ValueTypeListColumnBase, principalBase0.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase1);
+
+            var tableMappings1 = new List<TableMapping>();
+            principalBase0.SetRuntimeAnnotation("Relational:TableMappings", tableMappings1);
+            var principalBaseTableMapping1 = new TableMapping(principalBase0, principalBaseTable, true);
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping1, false);
+            tableMappings1.Add(principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_AlternateIdColumn, principalBase0.FindProperty("AlternateId")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_Enum1Column, principalBase0.FindProperty("Enum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_Enum2Column, principalBase0.FindProperty("Enum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_FlagsEnum1Column, principalBase0.FindProperty("FlagsEnum1")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_FlagsEnum2Column, principalBase0.FindProperty("FlagsEnum2")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_IdColumn, principalBase0.FindProperty("Id")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_RefTypeArrayColumn, principalBase0.FindProperty("RefTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_RefTypeEnumerableColumn, principalBase0.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_RefTypeIListColumn, principalBase0.FindProperty("RefTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_RefTypeListColumn, principalBase0.FindProperty("RefTypeList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_ValueTypeArrayColumn, principalBase0.FindProperty("ValueTypeArray")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_ValueTypeEnumerableColumn, principalBase0.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_ValueTypeIListColumn, principalBase0.FindProperty("ValueTypeIList")!, principalBaseTableMapping1);
+            RelationalModel.CreateColumnMapping(owned_Principal_ValueTypeListColumn, principalBase0.FindProperty("ValueTypeList")!, principalBaseTableMapping1);
+
+            var principalDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>")!;
+
+            var defaultTableMappings2 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings2);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2 = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2, false);
+            defaultTableMappings2.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)discriminatorColumnBase, principalDerived.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase, principalDerived.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase2);
+
+            var tableMappings2 = new List<TableMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings2);
+            var principalBaseTableMapping2 = new TableMapping(principalDerived, principalBaseTable, null)
+            {
+                IsSharedTablePrincipal = false,
+            };
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping2, false);
+            tableMappings2.Add(principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(idColumn, principalDerived.FindProperty("Id")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(discriminatorColumn, principalDerived.FindProperty("Discriminator")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(enum1Column, principalDerived.FindProperty("Enum1")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(enum2Column, principalDerived.FindProperty("Enum2")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalDerived.FindProperty("FlagsEnum1")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalDerived.FindProperty("FlagsEnum2")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn, principalDerived.FindProperty("PrincipalBaseId")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalDerived.FindProperty("RefTypeArray")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalDerived.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalDerived.FindProperty("RefTypeIList")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalDerived.FindProperty("RefTypeList")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalDerived.FindProperty("ValueTypeArray")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalDerived.FindProperty("ValueTypeIList")!, principalBaseTableMapping2);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalDerived.FindProperty("ValueTypeList")!, principalBaseTableMapping2);
+
+            var sqlQueryMappings0 = new List<SqlQueryMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:SqlQueryMappings", sqlQueryMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0 = new SqlQueryMapping(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQuery.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0, false);
+            sqlQueryMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0.IsDefaultSqlQueryMapping = true;
+            RelationalModel.CreateSqlQueryColumnMapping(idSqlQueryColumn, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(discriminatorSqlQueryColumn, principalDerived.FindProperty("Discriminator")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(enum1SqlQueryColumn, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(enum2SqlQueryColumn, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(flagsEnum1SqlQueryColumn, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(flagsEnum2SqlQueryColumn, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(principalBaseIdSqlQueryColumn, principalDerived.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeArraySqlQueryColumn, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeEnumerableSqlQueryColumn, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeIListSqlQueryColumn, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(refTypeListSqlQueryColumn, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeArraySqlQueryColumn, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeEnumerableSqlQueryColumn, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeIListSqlQueryColumn, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+            RelationalModel.CreateSqlQueryColumnMapping(valueTypeListSqlQueryColumn, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappedSqlQuerySqlQueryMapping0);
+
+            var deleteSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:DeleteStoredProcedureMappings", deleteSprocMappings0);
+            var principalBase_DeleteDSproc0 = (IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!;
+            var principalBase_DeleteSprocMapping0 = new StoredProcedureMapping(principalDerived, principalBase_DeleteStoreSproc, (IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!, principalBaseTableMapping2, null);
+            principalBase_DeleteStoreSproc.AddTypeMapping(principalBase_DeleteSprocMapping0, false);
+            deleteSprocMappings0.Add(principalBase_DeleteSprocMapping0);
+            principalBaseTableMapping2.DeleteStoredProcedureMapping = principalBase_DeleteSprocMapping0;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter, principalBase_DeleteDSproc0.FindParameter("Id_Original")!, principalDerived.FindProperty("Id")!, principalBase_DeleteSprocMapping0);
+
+            var insertSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:InsertStoredProcedureMappings", insertSprocMappings0);
+            var principalBase_InsertISproc0 = (IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!;
+            var principalBase_InsertSprocMapping0 = new StoredProcedureMapping(principalDerived, principalBase_InsertStoreSproc, (IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!, principalBaseTableMapping2, null);
+            principalBase_InsertStoreSproc.AddTypeMapping(principalBase_InsertSprocMapping0, false);
+            insertSprocMappings0.Add(principalBase_InsertSprocMapping0);
+            principalBaseTableMapping2.InsertStoredProcedureMapping = principalBase_InsertSprocMapping0;
+            RelationalModel.CreateStoredProcedureParameterMapping(idParameter, principalBase_InsertISproc0.FindParameter("Id")!, principalDerived.FindProperty("Id")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(discriminatorParameter, principalBase_InsertISproc0.FindParameter("Discriminator")!, principalDerived.FindProperty("Discriminator")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter, principalBase_InsertISproc0.FindParameter("Enum1")!, principalDerived.FindProperty("Enum1")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter, principalBase_InsertISproc0.FindParameter("Enum2")!, principalDerived.FindProperty("Enum2")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter, principalBase_InsertISproc0.FindParameter("FlagsEnum1")!, principalDerived.FindProperty("FlagsEnum1")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter, principalBase_InsertISproc0.FindParameter("FlagsEnum2")!, principalDerived.FindProperty("FlagsEnum2")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter, principalBase_InsertISproc0.FindParameter("PrincipalBaseId")!, principalDerived.FindProperty("PrincipalBaseId")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter, principalBase_InsertISproc0.FindParameter("RefTypeArray")!, principalDerived.FindProperty("RefTypeArray")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter, principalBase_InsertISproc0.FindParameter("RefTypeEnumerable")!, principalDerived.FindProperty("RefTypeEnumerable")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter, principalBase_InsertISproc0.FindParameter("RefTypeIList")!, principalDerived.FindProperty("RefTypeIList")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter, principalBase_InsertISproc0.FindParameter("RefTypeList")!, principalDerived.FindProperty("RefTypeList")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter, principalBase_InsertISproc0.FindParameter("ValueTypeArray")!, principalDerived.FindProperty("ValueTypeArray")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter, principalBase_InsertISproc0.FindParameter("ValueTypeEnumerable")!, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter, principalBase_InsertISproc0.FindParameter("ValueTypeIList")!, principalDerived.FindProperty("ValueTypeIList")!, principalBase_InsertSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter, principalBase_InsertISproc0.FindParameter("ValueTypeList")!, principalDerived.FindProperty("ValueTypeList")!, principalBase_InsertSprocMapping0);
+
+            var updateSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:UpdateStoredProcedureMappings", updateSprocMappings0);
+            var principalBase_UpdateUSproc0 = (IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!;
+            var principalBase_UpdateSprocMapping0 = new StoredProcedureMapping(principalDerived, principalBase_UpdateStoreSproc, (IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!, principalBaseTableMapping2, null);
+            principalBase_UpdateStoreSproc.AddTypeMapping(principalBase_UpdateSprocMapping0, false);
+            updateSprocMappings0.Add(principalBase_UpdateSprocMapping0);
+            principalBaseTableMapping2.UpdateStoredProcedureMapping = principalBase_UpdateSprocMapping0;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter0, principalBase_UpdateUSproc0.FindParameter("Id_Original")!, principalDerived.FindProperty("Id")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter0, principalBase_UpdateUSproc0.FindParameter("Enum1")!, principalDerived.FindProperty("Enum1")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter0, principalBase_UpdateUSproc0.FindParameter("Enum2")!, principalDerived.FindProperty("Enum2")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter0, principalBase_UpdateUSproc0.FindParameter("FlagsEnum1")!, principalDerived.FindProperty("FlagsEnum1")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter0, principalBase_UpdateUSproc0.FindParameter("FlagsEnum2")!, principalDerived.FindProperty("FlagsEnum2")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter0, principalBase_UpdateUSproc0.FindParameter("PrincipalBaseId")!, principalDerived.FindProperty("PrincipalBaseId")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter0, principalBase_UpdateUSproc0.FindParameter("RefTypeArray")!, principalDerived.FindProperty("RefTypeArray")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter0, principalBase_UpdateUSproc0.FindParameter("RefTypeEnumerable")!, principalDerived.FindProperty("RefTypeEnumerable")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter0, principalBase_UpdateUSproc0.FindParameter("RefTypeIList")!, principalDerived.FindProperty("RefTypeIList")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter0, principalBase_UpdateUSproc0.FindParameter("RefTypeList")!, principalDerived.FindProperty("RefTypeList")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter0, principalBase_UpdateUSproc0.FindParameter("ValueTypeArray")!, principalDerived.FindProperty("ValueTypeArray")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter0, principalBase_UpdateUSproc0.FindParameter("ValueTypeEnumerable")!, principalDerived.FindProperty("ValueTypeEnumerable")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter0, principalBase_UpdateUSproc0.FindParameter("ValueTypeIList")!, principalDerived.FindProperty("ValueTypeIList")!, principalBase_UpdateSprocMapping0);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter0, principalBase_UpdateUSproc0.FindParameter("ValueTypeList")!, principalDerived.FindProperty("ValueTypeList")!, principalBase_UpdateSprocMapping0);
+            var fK_PrincipalBase_PrincipalBase_PrincipalBaseId = new ForeignKeyConstraint(
+                "FK_PrincipalBase_PrincipalBase_PrincipalBaseId", principalBaseTable, principalBaseTable,
+                new[] { principalBaseIdColumn },
+                principalBaseTable.FindUniqueConstraint("PK_PrincipalBase")!, ReferentialAction.NoAction);
+            var fK_PrincipalBase_PrincipalBase_PrincipalBaseIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalBaseId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            fK_PrincipalBase_PrincipalBase_PrincipalBaseId.MappedForeignKeys.Add(fK_PrincipalBase_PrincipalBase_PrincipalBaseIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBase_PrincipalBase_PrincipalBaseIdFk).Add(fK_PrincipalBase_PrincipalBase_PrincipalBaseId);
+            principalBaseTable.ForeignKeyConstraints.Add(fK_PrincipalBase_PrincipalBase_PrincipalBaseId);
+            principalBaseTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBase_PrincipalBase_PrincipalBaseId);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs
new file mode 100644
index 000000000..ec5a28340
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs
@@ -0,0 +1,1744 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.ValueGeneration;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class PrincipalBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                typeof(CompiledModelTestBase.PrincipalBase),
+                baseEntityType,
+                discriminatorProperty: "Discriminator",
+                discriminatorValue: "PrincipalBase",
+                derivedTypesCount: 1,
+                propertyCount: 15,
+                complexPropertyCount: 1,
+                navigationCount: 1,
+                foreignKeyCount: 1,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            id.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                keyComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                providerValueComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            var discriminator = runtimeEntityType.AddProperty(
+                "Discriminator",
+                typeof(string),
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                maxLength: 55,
+                valueGeneratorFactory: new DiscriminatorValueGeneratorFactory().Create);
+            discriminator.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar(55)",
+                    size: 55));
+            discriminator.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum1 = runtimeEntityType.AddProperty(
+                "Enum1",
+                typeof(CompiledModelTestBase.AnEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            enum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AnEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AnEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    (CompiledModelTestBase.AnEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AnEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        (CompiledModelTestBase.AnEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AnEnum)value)));
+            enum1.SetSentinelFromProviderValue(0);
+            enum1.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum2 = runtimeEntityType.AddProperty(
+                "Enum2",
+                typeof(CompiledModelTestBase.AnEnum?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            enum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum?>(
+                    (Nullable<CompiledModelTestBase.AnEnum> v1, Nullable<CompiledModelTestBase.AnEnum> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.AnEnum)v1, (object)(CompiledModelTestBase.AnEnum)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? ((CompiledModelTestBase.AnEnum)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? (Nullable<CompiledModelTestBase.AnEnum>)(CompiledModelTestBase.AnEnum)v : default(Nullable<CompiledModelTestBase.AnEnum>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum?>(
+                    (Nullable<CompiledModelTestBase.AnEnum> v1, Nullable<CompiledModelTestBase.AnEnum> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.AnEnum)v1, (object)(CompiledModelTestBase.AnEnum)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? ((CompiledModelTestBase.AnEnum)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? (Nullable<CompiledModelTestBase.AnEnum>)(CompiledModelTestBase.AnEnum)v : default(Nullable<CompiledModelTestBase.AnEnum>)),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    (CompiledModelTestBase.AnEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AnEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        (CompiledModelTestBase.AnEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AnEnum)value)));
+            enum2.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var flagsEnum1 = runtimeEntityType.AddProperty(
+                "FlagsEnum1",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AFlagsEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AFlagsEnum)value)));
+            flagsEnum1.SetSentinelFromProviderValue(0);
+            flagsEnum1.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var flagsEnum2 = runtimeEntityType.AddProperty(
+                "FlagsEnum2",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AFlagsEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AFlagsEnum)value)));
+            flagsEnum2.SetSentinelFromProviderValue(0);
+            flagsEnum2.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalBaseId = runtimeEntityType.AddProperty(
+                "PrincipalBaseId",
+                typeof(long?),
+                nullable: true);
+            principalBaseId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                keyComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                providerValueComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+            principalBaseId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                keyComparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "datetime(6)",
+                        precision: 6)));
+            valueTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                keyComparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)));
+            valueTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            OwnedComplexProperty.Create(runtimeEntityType);
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalBaseId });
+
+            return runtimeEntityType;
+        }
+
+        private static class OwnedComplexProperty
+        {
+            public static RuntimeComplexProperty Create(RuntimeEntityType declaringType)
+            {
+                var complexProperty = declaringType.AddComplexProperty("Owned",
+                    typeof(CompiledModelTestBase.OwnedType),
+                    "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType",
+                    typeof(CompiledModelTestBase.OwnedType),
+                    propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Owned", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("_ownedField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    propertyAccessMode: PropertyAccessMode.Field,
+                    changeTrackingStrategy: ChangeTrackingStrategy.ChangingAndChangedNotificationsWithOriginalValues,
+                    propertyCount: 10,
+                    complexPropertyCount: 1);
+
+                var complexType = complexProperty.ComplexType;
+                var details = complexType.AddProperty(
+                    "Details",
+                    typeof(string),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Details", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_details", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    propertyAccessMode: PropertyAccessMode.FieldDuringConstruction,
+                    nullable: true,
+                    concurrencyToken: true,
+                    valueGenerated: ValueGenerated.OnAddOrUpdate,
+                    beforeSaveBehavior: PropertySaveBehavior.Ignore,
+                    afterSaveBehavior: PropertySaveBehavior.Ignore,
+                    maxLength: 64,
+                    unicode: false,
+                    precision: 3,
+                    scale: 2,
+                    sentinel: "");
+                details.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(64)",
+                        size: 64,
+                        unicode: false,
+                        precision: 3,
+                        scale: 2));
+                details.AddAnnotation("foo", "bar");
+                details.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+                details.AddAnnotation("Relational:ColumnName", "Deets");
+                details.AddAnnotation("Relational:ColumnType", "varchar");
+
+                var number = complexType.AddProperty(
+                    "Number",
+                    typeof(int),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Number", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Number>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    sentinel: 0);
+                number.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    keyComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v),
+                    providerValueComparer: new ValueComparer<int>(
+                        (int v1, int v2) => v1 == v2,
+                        (int v) => v,
+                        (int v) => v));
+                number.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                var refTypeArray = complexType.AddProperty(
+                    "RefTypeArray",
+                    typeof(IPAddress[]),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v)),
+                    keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                (IPAddress v) => v.ToString(),
+                                (string v) => IPAddress.Parse(v))))),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                (IPAddress v) => v.ToString(),
+                                (string v) => IPAddress.Parse(v)))),
+                    elementMapping: MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<IPAddress>(
+                            (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            (IPAddress v) => v.GetHashCode(),
+                            (IPAddress v) => v),
+                        keyComparer: new ValueComparer<IPAddress>(
+                            (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            (IPAddress v) => v.GetHashCode(),
+                            (IPAddress v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(45)",
+                            size: 45),
+                        converter: new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                (IPAddress v) => v.ToString(),
+                                (string v) => IPAddress.Parse(v)))));
+                refTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                var refTypeEnumerable = complexType.AddProperty(
+                    "RefTypeEnumerable",
+                    typeof(IEnumerable<string>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ListComparer<string>(new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v)),
+                    keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                        JsonStringReaderWriter.Instance)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                        JsonStringReaderWriter.Instance),
+                    elementMapping: MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        keyComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        storeTypePostfix: StoreTypePostfix.None));
+                refTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                var refTypeIList = complexType.AddProperty(
+                    "RefTypeIList",
+                    typeof(IList<string>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeIList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ListComparer<string>(new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v)),
+                    keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                        JsonStringReaderWriter.Instance)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                        JsonStringReaderWriter.Instance),
+                    elementMapping: MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        keyComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        storeTypePostfix: StoreTypePostfix.None));
+                refTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                var refTypeList = complexType.AddProperty(
+                    "RefTypeList",
+                    typeof(List<IPAddress>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_refTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                refTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v)),
+                    keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                (IPAddress v) => v.ToString(),
+                                (string v) => IPAddress.Parse(v))))),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                        new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                (IPAddress v) => v.ToString(),
+                                (string v) => IPAddress.Parse(v)))),
+                    elementMapping: MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<IPAddress>(
+                            (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            (IPAddress v) => v.GetHashCode(),
+                            (IPAddress v) => v),
+                        keyComparer: new ValueComparer<IPAddress>(
+                            (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            (IPAddress v) => v.GetHashCode(),
+                            (IPAddress v) => v),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "varchar(45)",
+                            size: 45),
+                        converter: new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                            JsonStringReaderWriter.Instance,
+                            new ValueConverter<IPAddress, string>(
+                                (IPAddress v) => v.ToString(),
+                                (string v) => IPAddress.Parse(v)))));
+                refTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                var valueTypeArray = complexType.AddProperty(
+                    "ValueTypeArray",
+                    typeof(DateTime[]),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeArray", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v)),
+                    keyComparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                        JsonDateTimeReaderWriter.Instance)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                        JsonDateTimeReaderWriter.Instance),
+                    elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<DateTime>(
+                            (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            (DateTime v) => v.GetHashCode(),
+                            (DateTime v) => v),
+                        keyComparer: new ValueComparer<DateTime>(
+                            (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            (DateTime v) => v.GetHashCode(),
+                            (DateTime v) => v),
+                        providerValueComparer: new ValueComparer<DateTime>(
+                            (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            (DateTime v) => v.GetHashCode(),
+                            (DateTime v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "datetime(6)",
+                            precision: 6)));
+                valueTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                var valueTypeEnumerable = complexType.AddProperty(
+                    "ValueTypeEnumerable",
+                    typeof(IEnumerable<byte>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeEnumerable", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)),
+                    keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                        JsonByteReaderWriter.Instance)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                        JsonByteReaderWriter.Instance),
+                    elementMapping: MySqlByteTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v),
+                        keyComparer: new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v),
+                        providerValueComparer: new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v)));
+                valueTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                var valueTypeIList = complexType.AddProperty(
+                    "ValueTypeIList",
+                    typeof(IList<byte>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)),
+                    keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                        JsonByteReaderWriter.Instance)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                        JsonByteReaderWriter.Instance),
+                    elementMapping: MySqlByteTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v),
+                        keyComparer: new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v),
+                        providerValueComparer: new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v)));
+                valueTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                var valueTypeList = complexType.AddProperty(
+                    "ValueTypeList",
+                    typeof(List<short>),
+                    propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("_valueTypeList", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                    nullable: true);
+                valueTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ListComparer<short>(new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)),
+                    keyComparer: new ListComparer<short>(new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    converter: new CollectionToJsonStringConverter<short>(new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                        JsonInt16ReaderWriter.Instance)),
+                    storeTypePostfix: StoreTypePostfix.None,
+                    jsonValueReaderWriter: new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                        JsonInt16ReaderWriter.Instance),
+                    elementMapping: MySqlShortTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<short>(
+                            (short v1, short v2) => v1 == v2,
+                            (short v) => (int)v,
+                            (short v) => v),
+                        keyComparer: new ValueComparer<short>(
+                            (short v1, short v2) => v1 == v2,
+                            (short v) => (int)v,
+                            (short v) => v),
+                        providerValueComparer: new ValueComparer<short>(
+                            (short v1, short v2) => v1 == v2,
+                            (short v) => (int)v,
+                            (short v) => v)));
+                valueTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                PrincipalComplexProperty.Create(complexType);
+                complexType.AddAnnotation("go", "brr");
+                complexType.AddAnnotation("Relational:FunctionName", "PrincipalBaseTvf");
+                complexType.AddAnnotation("Relational:Schema", "dbo");
+                complexType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+                complexType.AddAnnotation("Relational:TableName", "PrincipalBase");
+                complexType.AddAnnotation("Relational:ViewName", "PrincipalBaseView");
+                complexType.AddAnnotation("Relational:ViewSchema", "dbo");
+                complexProperty.AddAnnotation("goo", "ber");
+                return complexProperty;
+            }
+
+            private static class PrincipalComplexProperty
+            {
+                public static RuntimeComplexProperty Create(RuntimeComplexType declaringType)
+                {
+                    var complexProperty = declaringType.AddComplexProperty("Principal",
+                        typeof(CompiledModelTestBase.PrincipalBase),
+                        "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase.Owned#OwnedType.Principal#PrincipalBase",
+                        typeof(CompiledModelTestBase.PrincipalBase),
+                        propertyInfo: typeof(CompiledModelTestBase.OwnedType).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.OwnedType).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        propertyCount: 14);
+
+                    var complexType = complexProperty.ComplexType;
+                    var alternateId = complexType.AddProperty(
+                        "AlternateId",
+                        typeof(Guid),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("AlternateId", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+                    alternateId.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<Guid>(
+                            (Guid v1, Guid v2) => v1 == v2,
+                            (Guid v) => v.GetHashCode(),
+                            (Guid v) => v),
+                        keyComparer: new ValueComparer<Guid>(
+                            (Guid v1, Guid v2) => v1 == v2,
+                            (Guid v) => v.GetHashCode(),
+                            (Guid v) => v),
+                        providerValueComparer: new ValueComparer<Guid>(
+                            (Guid v1, Guid v2) => v1 == v2,
+                            (Guid v) => v.GetHashCode(),
+                            (Guid v) => v));
+                    alternateId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var enum1 = complexType.AddProperty(
+                        "Enum1",
+                        typeof(CompiledModelTestBase.AnEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    enum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals((object)v1, (object)v2),
+                            (CompiledModelTestBase.AnEnum v) => v.GetHashCode(),
+                            (CompiledModelTestBase.AnEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                            (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals((object)v1, (object)v2),
+                            (CompiledModelTestBase.AnEnum v) => v.GetHashCode(),
+                            (CompiledModelTestBase.AnEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            (int v1, int v2) => v1 == v2,
+                            (int v) => v,
+                            (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                            (CompiledModelTestBase.AnEnum value) => (int)value,
+                            (int value) => (CompiledModelTestBase.AnEnum)value),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                                (CompiledModelTestBase.AnEnum value) => (int)value,
+                                (int value) => (CompiledModelTestBase.AnEnum)value)));
+                    enum1.SetSentinelFromProviderValue(0);
+                    enum1.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var enum2 = complexType.AddProperty(
+                        "Enum2",
+                        typeof(CompiledModelTestBase.AnEnum?),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    enum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AnEnum?>(
+                            (Nullable<CompiledModelTestBase.AnEnum> v1, Nullable<CompiledModelTestBase.AnEnum> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.AnEnum)v1, (object)(CompiledModelTestBase.AnEnum)v2) || !v1.HasValue && !v2.HasValue,
+                            (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? ((CompiledModelTestBase.AnEnum)v).GetHashCode() : 0,
+                            (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? (Nullable<CompiledModelTestBase.AnEnum>)(CompiledModelTestBase.AnEnum)v : default(Nullable<CompiledModelTestBase.AnEnum>)),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum?>(
+                            (Nullable<CompiledModelTestBase.AnEnum> v1, Nullable<CompiledModelTestBase.AnEnum> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.AnEnum)v1, (object)(CompiledModelTestBase.AnEnum)v2) || !v1.HasValue && !v2.HasValue,
+                            (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? ((CompiledModelTestBase.AnEnum)v).GetHashCode() : 0,
+                            (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? (Nullable<CompiledModelTestBase.AnEnum>)(CompiledModelTestBase.AnEnum)v : default(Nullable<CompiledModelTestBase.AnEnum>)),
+                        providerValueComparer: new ValueComparer<int>(
+                            (int v1, int v2) => v1 == v2,
+                            (int v) => v,
+                            (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                            (CompiledModelTestBase.AnEnum value) => (int)value,
+                            (int value) => (CompiledModelTestBase.AnEnum)value),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                                (CompiledModelTestBase.AnEnum value) => (int)value,
+                                (int value) => (CompiledModelTestBase.AnEnum)value)));
+                    enum2.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var flagsEnum1 = complexType.AddProperty(
+                        "FlagsEnum1",
+                        typeof(CompiledModelTestBase.AFlagsEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    flagsEnum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                            (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                            (CompiledModelTestBase.AFlagsEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                            (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                            (CompiledModelTestBase.AFlagsEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            (int v1, int v2) => v1 == v2,
+                            (int v) => v,
+                            (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                            (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                            (int value) => (CompiledModelTestBase.AFlagsEnum)value),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                                (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                                (int value) => (CompiledModelTestBase.AFlagsEnum)value)));
+                    flagsEnum1.SetSentinelFromProviderValue(0);
+                    flagsEnum1.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var flagsEnum2 = complexType.AddProperty(
+                        "FlagsEnum2",
+                        typeof(CompiledModelTestBase.AFlagsEnum),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+                    flagsEnum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                            (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                            (CompiledModelTestBase.AFlagsEnum v) => v),
+                        keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                            (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                            (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                            (CompiledModelTestBase.AFlagsEnum v) => v),
+                        providerValueComparer: new ValueComparer<int>(
+                            (int v1, int v2) => v1 == v2,
+                            (int v) => v,
+                            (int v) => v),
+                        converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                            (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                            (int value) => (CompiledModelTestBase.AFlagsEnum)value),
+                        jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                            JsonInt32ReaderWriter.Instance,
+                            new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                                (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                                (int value) => (CompiledModelTestBase.AFlagsEnum)value)));
+                    flagsEnum2.SetSentinelFromProviderValue(0);
+                    flagsEnum2.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var id = complexType.AddProperty(
+                        "Id",
+                        typeof(long?),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    id.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                        comparer: new ValueComparer<long?>(
+                            (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                            (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                            (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                        keyComparer: new ValueComparer<long?>(
+                            (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                            (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                            (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                        providerValueComparer: new ValueComparer<long?>(
+                            (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                            (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                            (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+                    id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var refTypeArray = complexType.AddProperty(
+                        "RefTypeArray",
+                        typeof(IPAddress[]),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                            (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            (IPAddress v) => v.GetHashCode(),
+                            (IPAddress v) => v)),
+                        keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                            (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            (IPAddress v) => v.GetHashCode(),
+                            (IPAddress v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    (IPAddress v) => v.ToString(),
+                                    (string v) => IPAddress.Parse(v))))),
+                        storeTypePostfix: StoreTypePostfix.None,
+                        jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    (IPAddress v) => v.ToString(),
+                                    (string v) => IPAddress.Parse(v)))),
+                        elementMapping: MySqlStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<IPAddress>(
+                                (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                (IPAddress v) => v.GetHashCode(),
+                                (IPAddress v) => v),
+                            keyComparer: new ValueComparer<IPAddress>(
+                                (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                (IPAddress v) => v.GetHashCode(),
+                                (IPAddress v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                (string v1, string v2) => v1 == v2,
+                                (string v) => v.GetHashCode(),
+                                (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(45)",
+                                size: 45),
+                            converter: new ValueConverter<IPAddress, string>(
+                                (IPAddress v) => v.ToString(),
+                                (string v) => IPAddress.Parse(v)),
+                            jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    (IPAddress v) => v.ToString(),
+                                    (string v) => IPAddress.Parse(v)))));
+                    refTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var refTypeEnumerable = complexType.AddProperty(
+                        "RefTypeEnumerable",
+                        typeof(IEnumerable<string>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ListComparer<string>(new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v)),
+                        keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                            JsonStringReaderWriter.Instance)),
+                        storeTypePostfix: StoreTypePostfix.None,
+                        jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                            JsonStringReaderWriter.Instance),
+                        elementMapping: MySqlStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<string>(
+                                (string v1, string v2) => v1 == v2,
+                                (string v) => v.GetHashCode(),
+                                (string v) => v),
+                            keyComparer: new ValueComparer<string>(
+                                (string v1, string v2) => v1 == v2,
+                                (string v) => v.GetHashCode(),
+                                (string v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                (string v1, string v2) => v1 == v2,
+                                (string v) => v.GetHashCode(),
+                                (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "longtext"),
+                            storeTypePostfix: StoreTypePostfix.None));
+                    refTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var refTypeIList = complexType.AddProperty(
+                        "RefTypeIList",
+                        typeof(IList<string>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ListComparer<string>(new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v)),
+                        keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                            JsonStringReaderWriter.Instance)),
+                        storeTypePostfix: StoreTypePostfix.None,
+                        jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                            JsonStringReaderWriter.Instance),
+                        elementMapping: MySqlStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<string>(
+                                (string v1, string v2) => v1 == v2,
+                                (string v) => v.GetHashCode(),
+                                (string v) => v),
+                            keyComparer: new ValueComparer<string>(
+                                (string v1, string v2) => v1 == v2,
+                                (string v) => v.GetHashCode(),
+                                (string v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                (string v1, string v2) => v1 == v2,
+                                (string v) => v.GetHashCode(),
+                                (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "longtext"),
+                            storeTypePostfix: StoreTypePostfix.None));
+                    refTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var refTypeList = complexType.AddProperty(
+                        "RefTypeList",
+                        typeof(List<IPAddress>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    refTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                            (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            (IPAddress v) => v.GetHashCode(),
+                            (IPAddress v) => v)),
+                        keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                            (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                            (IPAddress v) => v.GetHashCode(),
+                            (IPAddress v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    (IPAddress v) => v.ToString(),
+                                    (string v) => IPAddress.Parse(v))))),
+                        storeTypePostfix: StoreTypePostfix.None,
+                        jsonValueReaderWriter: new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                            new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    (IPAddress v) => v.ToString(),
+                                    (string v) => IPAddress.Parse(v)))),
+                        elementMapping: MySqlStringTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<IPAddress>(
+                                (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                (IPAddress v) => v.GetHashCode(),
+                                (IPAddress v) => v),
+                            keyComparer: new ValueComparer<IPAddress>(
+                                (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                                (IPAddress v) => v.GetHashCode(),
+                                (IPAddress v) => v),
+                            providerValueComparer: new ValueComparer<string>(
+                                (string v1, string v2) => v1 == v2,
+                                (string v) => v.GetHashCode(),
+                                (string v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "varchar(45)",
+                                size: 45),
+                            converter: new ValueConverter<IPAddress, string>(
+                                (IPAddress v) => v.ToString(),
+                                (string v) => IPAddress.Parse(v)),
+                            jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                                JsonStringReaderWriter.Instance,
+                                new ValueConverter<IPAddress, string>(
+                                    (IPAddress v) => v.ToString(),
+                                    (string v) => IPAddress.Parse(v)))));
+                    refTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var valueTypeArray = complexType.AddProperty(
+                        "ValueTypeArray",
+                        typeof(DateTime[]),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                            (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            (DateTime v) => v.GetHashCode(),
+                            (DateTime v) => v)),
+                        keyComparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                            (DateTime v1, DateTime v2) => v1.Equals(v2),
+                            (DateTime v) => v.GetHashCode(),
+                            (DateTime v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                            JsonDateTimeReaderWriter.Instance)),
+                        storeTypePostfix: StoreTypePostfix.None,
+                        jsonValueReaderWriter: new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                            JsonDateTimeReaderWriter.Instance),
+                        elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<DateTime>(
+                                (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                (DateTime v) => v.GetHashCode(),
+                                (DateTime v) => v),
+                            keyComparer: new ValueComparer<DateTime>(
+                                (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                (DateTime v) => v.GetHashCode(),
+                                (DateTime v) => v),
+                            providerValueComparer: new ValueComparer<DateTime>(
+                                (DateTime v1, DateTime v2) => v1.Equals(v2),
+                                (DateTime v) => v.GetHashCode(),
+                                (DateTime v) => v),
+                            mappingInfo: new RelationalTypeMappingInfo(
+                                storeTypeName: "datetime(6)",
+                                precision: 6)));
+                    valueTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var valueTypeEnumerable = complexType.AddProperty(
+                        "ValueTypeEnumerable",
+                        typeof(IEnumerable<byte>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v)),
+                        keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                            JsonByteReaderWriter.Instance)),
+                        storeTypePostfix: StoreTypePostfix.None,
+                        jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                            JsonByteReaderWriter.Instance),
+                        elementMapping: MySqlByteTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<byte>(
+                                (byte v1, byte v2) => v1 == v2,
+                                (byte v) => (int)v,
+                                (byte v) => v),
+                            keyComparer: new ValueComparer<byte>(
+                                (byte v1, byte v2) => v1 == v2,
+                                (byte v) => (int)v,
+                                (byte v) => v),
+                            providerValueComparer: new ValueComparer<byte>(
+                                (byte v1, byte v2) => v1 == v2,
+                                (byte v) => (int)v,
+                                (byte v) => v)));
+                    valueTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var valueTypeIList = complexType.AddProperty(
+                        "ValueTypeIList",
+                        typeof(IList<byte>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v)),
+                        keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                            (byte v1, byte v2) => v1 == v2,
+                            (byte v) => (int)v,
+                            (byte v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                            JsonByteReaderWriter.Instance)),
+                        storeTypePostfix: StoreTypePostfix.None,
+                        jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                            JsonByteReaderWriter.Instance),
+                        elementMapping: MySqlByteTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<byte>(
+                                (byte v1, byte v2) => v1 == v2,
+                                (byte v) => (int)v,
+                                (byte v) => v),
+                            keyComparer: new ValueComparer<byte>(
+                                (byte v1, byte v2) => v1 == v2,
+                                (byte v) => (int)v,
+                                (byte v) => v),
+                            providerValueComparer: new ValueComparer<byte>(
+                                (byte v1, byte v2) => v1 == v2,
+                                (byte v) => (int)v,
+                                (byte v) => v)));
+                    valueTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    var valueTypeList = complexType.AddProperty(
+                        "ValueTypeList",
+                        typeof(List<short>),
+                        propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                        nullable: true);
+                    valueTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                        comparer: new ListComparer<short>(new ValueComparer<short>(
+                            (short v1, short v2) => v1 == v2,
+                            (short v) => (int)v,
+                            (short v) => v)),
+                        keyComparer: new ListComparer<short>(new ValueComparer<short>(
+                            (short v1, short v2) => v1 == v2,
+                            (short v) => (int)v,
+                            (short v) => v)),
+                        providerValueComparer: new ValueComparer<string>(
+                            (string v1, string v2) => v1 == v2,
+                            (string v) => v.GetHashCode(),
+                            (string v) => v),
+                        mappingInfo: new RelationalTypeMappingInfo(
+                            storeTypeName: "longtext"),
+                        converter: new CollectionToJsonStringConverter<short>(new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                            JsonInt16ReaderWriter.Instance)),
+                        storeTypePostfix: StoreTypePostfix.None,
+                        jsonValueReaderWriter: new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                            JsonInt16ReaderWriter.Instance),
+                        elementMapping: MySqlShortTypeMapping.Default.Clone(
+                            comparer: new ValueComparer<short>(
+                                (short v1, short v2) => v1 == v2,
+                                (short v) => (int)v,
+                                (short v) => v),
+                            keyComparer: new ValueComparer<short>(
+                                (short v1, short v2) => v1 == v2,
+                                (short v) => (int)v,
+                                (short v) => v),
+                            providerValueComparer: new ValueComparer<short>(
+                                (short v1, short v2) => v1 == v2,
+                                (short v) => (int)v,
+                                (short v) => v)));
+                    valueTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+                    complexType.AddAnnotation("Relational:FunctionName", "PrincipalBaseTvf");
+                    complexType.AddAnnotation("Relational:Schema", "dbo");
+                    complexType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+                    complexType.AddAnnotation("Relational:TableName", "PrincipalBase");
+                    complexType.AddAnnotation("Relational:ViewName", "PrincipalBaseView");
+                    complexType.AddAnnotation("Relational:ViewSchema", "dbo");
+                    return complexProperty;
+                }
+            }
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deriveds = principalEntityType.AddNavigation("Deriveds",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Deriveds", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Deriveds>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var insertSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Insert",
+                "dbo",
+                false);
+
+            var principalBaseId = insertSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var enum1 = insertSproc.AddParameter(
+                "Enum1", System.Data.ParameterDirection.Input, false, "Enum1", false);
+            var enum2 = insertSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum1 = insertSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum2 = insertSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList = insertSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList = insertSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray = insertSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable = insertSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList = insertSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList = insertSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray = insertSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable = insertSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var discriminator = insertSproc.AddParameter(
+                "Discriminator", System.Data.ParameterDirection.Input, false, "Discriminator", false);
+            var id = insertSproc.AddParameter(
+                "Id", System.Data.ParameterDirection.Output, false, "Id", false);
+            runtimeEntityType.AddAnnotation("Relational:InsertStoredProcedure", insertSproc);
+
+            var deleteSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Delete",
+                "dbo",
+                false);
+
+            var id0 = deleteSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            var rowsAffected = deleteSproc.AddParameter(
+                "RowsAffected", System.Data.ParameterDirection.Output, true, null, null);
+            runtimeEntityType.AddAnnotation("Relational:DeleteStoredProcedure", deleteSproc);
+
+            var updateSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Update",
+                "dbo",
+                false);
+
+            var principalBaseId0 = updateSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var enum10 = updateSproc.AddParameter(
+                "Enum1", System.Data.ParameterDirection.Input, false, "Enum1", false);
+            var enum20 = updateSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum10 = updateSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum20 = updateSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList0 = updateSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList0 = updateSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray0 = updateSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable0 = updateSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList0 = updateSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList0 = updateSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray0 = updateSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable0 = updateSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var id1 = updateSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:UpdateStoredProcedure", updateSproc);
+
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", "PrincipalBaseTvf");
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPH");
+            runtimeEntityType.AddAnnotation("Relational:Schema", "dbo");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewDefinitionSql", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", "PrincipalBaseView");
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", "dbo");
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedEntityType.cs
new file mode 100644
index 000000000..260a78b69
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalDerivedEntityType.cs
@@ -0,0 +1,41 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class PrincipalDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                baseEntityType,
+                discriminatorProperty: "Discriminator",
+                discriminatorValue: "PrincipalDerived<DependentBase<byte?>>",
+                propertyCount: 0);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", "dbo");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", "select * from PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", "dbo");
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModel.cs
new file mode 100644
index 000000000..3cd9c09d1
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(CompiledModelRelationalTestBase.FunctionParameterTypeMappingContext))]
+    public partial class FunctionParameterTypeMappingContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static FunctionParameterTypeMappingContextModel()
+        {
+            var model = new FunctionParameterTypeMappingContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (FunctionParameterTypeMappingContextModel)model.FinalizeModel();
+        }
+
+        private static FunctionParameterTypeMappingContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs
new file mode 100644
index 000000000..5c77a9ee3
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs
@@ -0,0 +1,102 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class FunctionParameterTypeMappingContextModel
+    {
+        private FunctionParameterTypeMappingContextModel()
+            : base(skipDetectChanges: true, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 0)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var functions = new Dictionary<string, IDbFunction>();
+            var getSqlFragmentStatic = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionParameterTypeMappingContext.GetSqlFragmentStatic(string)",
+                this,
+                typeof(string),
+                "GetSqlFragmentStatic",
+                storeType: "longtext",
+                methodInfo: typeof(CompiledModelRelationalTestBase.FunctionParameterTypeMappingContext).GetMethod(
+                    "GetSqlFragmentStatic",
+                    BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(string) },
+                    null),
+                scalar: true,
+                nullable: true);
+
+            var param = getSqlFragmentStatic.AddParameter(
+                "param",
+                typeof(string),
+                false,
+                "varchar");
+            param.TypeMapping = StringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar",
+                    dbType: System.Data.DbType.AnsiString));
+
+            getSqlFragmentStatic.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                storeTypePostfix: StoreTypePostfix.None);
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionParameterTypeMappingContext.GetSqlFragmentStatic(string)"] = getSqlFragmentStatic;
+
+            AddAnnotation("Relational:DbFunctions", functions);
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+            var getSqlFragmentStatic = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionParameterTypeMappingContext.GetSqlFragmentStatic(string)")!;
+            var getSqlFragmentStaticFunction = new StoreFunction(getSqlFragmentStatic, relationalModel);
+            var paramFunctionParameter = getSqlFragmentStaticFunction.FindParameter("param")!;
+            relationalModel.Functions.Add(
+                ("GetSqlFragmentStatic", null, new[] { "varchar" }),
+                getSqlFragmentStaticFunction);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModel.cs
new file mode 100644
index 000000000..ead6c2fb0
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(CompiledModelRelationalTestBase.FunctionTypeMappingContext))]
+    public partial class FunctionTypeMappingContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static FunctionTypeMappingContextModel()
+        {
+            var model = new FunctionTypeMappingContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (FunctionTypeMappingContextModel)model.FinalizeModel();
+        }
+
+        private static FunctionTypeMappingContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs
new file mode 100644
index 000000000..43cff4731
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs
@@ -0,0 +1,102 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class FunctionTypeMappingContextModel
+    {
+        private FunctionTypeMappingContextModel()
+            : base(skipDetectChanges: true, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 0)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var functions = new Dictionary<string, IDbFunction>();
+            var getSqlFragmentStatic = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionTypeMappingContext.GetSqlFragmentStatic(string)",
+                this,
+                typeof(string),
+                "GetSqlFragmentStatic",
+                storeType: "varchar",
+                methodInfo: typeof(CompiledModelRelationalTestBase.FunctionTypeMappingContext).GetMethod(
+                    "GetSqlFragmentStatic",
+                    BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(string) },
+                    null),
+                scalar: true,
+                nullable: true);
+
+            var param = getSqlFragmentStatic.AddParameter(
+                "param",
+                typeof(string),
+                false,
+                "longtext");
+            param.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                storeTypePostfix: StoreTypePostfix.None);
+
+            getSqlFragmentStatic.TypeMapping = StringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "varchar",
+                    dbType: System.Data.DbType.AnsiString));
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionTypeMappingContext.GetSqlFragmentStatic(string)"] = getSqlFragmentStatic;
+
+            AddAnnotation("Relational:DbFunctions", functions);
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+            var getSqlFragmentStatic = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionTypeMappingContext.GetSqlFragmentStatic(string)")!;
+            var getSqlFragmentStaticFunction = new StoreFunction(getSqlFragmentStatic, relationalModel);
+            var paramFunctionParameter = getSqlFragmentStaticFunction.FindParameter("param")!;
+            relationalModel.Functions.Add(
+                ("GetSqlFragmentStatic", null, new[] { "longtext" }),
+                getSqlFragmentStaticFunction);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataEntityType.cs
new file mode 100644
index 000000000..37b125561
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DataEntityType.cs
@@ -0,0 +1,64 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 1);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()));
+            blob.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData()");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModel.cs
new file mode 100644
index 000000000..8d6f346c0
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(CompiledModelRelationalTestBase.DbFunctionContext))]
+    public partial class DbFunctionContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbFunctionContextModel()
+        {
+            var model = new DbFunctionContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbFunctionContextModel)model.FinalizeModel();
+        }
+
+        private static DbFunctionContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs
new file mode 100644
index 000000000..1a636e5c3
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs
@@ -0,0 +1,322 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbFunctionContextModel
+    {
+        private DbFunctionContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 2, typeConfigurationCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+            var @object = ObjectEntityType.Create(this);
+
+            DataEntityType.CreateAnnotations(data);
+            ObjectEntityType.CreateAnnotations(@object);
+
+            var type = this.AddTypeMappingConfiguration(
+                typeof(string),
+                maxLength: 256);
+            type.AddAnnotation("Relational:IsFixedLength", true);
+
+            var functions = new Dictionary<string, IDbFunction>();
+            var getBlobs = new RuntimeDbFunction(
+                "GetBlobs()",
+                this,
+                typeof(IQueryable<object>),
+                "GetBlobs");
+
+            functions["GetBlobs()"] = getBlobs;
+
+            var getCount = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetCount(System.Guid?,string)",
+                this,
+                typeof(int),
+                "CustomerOrderCount",
+                schema: "dbf",
+                storeType: "int",
+                methodInfo: typeof(CompiledModelRelationalTestBase.DbFunctionContext).GetMethod(
+                    "GetCount",
+                    BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(Guid?), typeof(string) },
+                    null),
+                scalar: true);
+
+            var id = getCount.AddParameter(
+                "id",
+                typeof(Guid?),
+                true,
+                "char(36)");
+            id.TypeMapping = MySqlGuidTypeMapping.Default.Clone(
+                comparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                keyComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v),
+                providerValueComparer: new ValueComparer<Guid>(
+                    (Guid v1, Guid v2) => v1 == v2,
+                    (Guid v) => v.GetHashCode(),
+                    (Guid v) => v));
+            id.AddAnnotation("MyAnnotation", new[] { 1L });
+
+            var condition = getCount.AddParameter(
+                "condition",
+                typeof(string),
+                false,
+                "char(256)");
+            condition.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(256)",
+                    size: 256,
+                    fixedLength: true,
+                    dbType: System.Data.DbType.StringFixedLength));
+
+            getCount.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetCount(System.Guid?,string)"] = getCount;
+
+            var getData = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData()",
+                this,
+                typeof(IQueryable<CompiledModelTestBase.Data>),
+                "GetAllData",
+                methodInfo: typeof(CompiledModelRelationalTestBase.DbFunctionContext).GetMethod(
+                    "GetData",
+                    BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] {  },
+                    null));
+
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData()"] = getData;
+
+            var getData0 = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData(int)",
+                this,
+                typeof(IQueryable<CompiledModelTestBase.Data>),
+                "GetData",
+                methodInfo: typeof(CompiledModelRelationalTestBase.DbFunctionContext).GetMethod(
+                    "GetData",
+                    BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(int) },
+                    null));
+
+            var id0 = getData0.AddParameter(
+                "id",
+                typeof(int),
+                false,
+                "int");
+            id0.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData(int)"] = getData0;
+
+            var isDateStatic = new RuntimeDbFunction(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.IsDateStatic(string)",
+                this,
+                typeof(bool),
+                "IsDate",
+                storeType: "tinyint(1)",
+                methodInfo: typeof(CompiledModelRelationalTestBase.DbFunctionContext).GetMethod(
+                    "IsDateStatic",
+                    BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly,
+                    null,
+                    new Type[] { typeof(string) },
+                    null),
+                scalar: true,
+                nullable: true,
+                builtIn: true);
+
+            var date = isDateStatic.AddParameter(
+                "date",
+                typeof(string),
+                false,
+                "char(256)");
+            date.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                keyComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "char(256)",
+                    size: 256,
+                    fixedLength: true,
+                    dbType: System.Data.DbType.StringFixedLength));
+
+            isDateStatic.TypeMapping = MySqlBoolTypeMapping.Default.Clone(
+                comparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                keyComparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v),
+                providerValueComparer: new ValueComparer<bool>(
+                    (bool v1, bool v2) => v1 == v2,
+                    (bool v) => v.GetHashCode(),
+                    (bool v) => v));
+            isDateStatic.AddAnnotation("MyGuid", new Guid("00000000-0000-0000-0000-000000000000"));
+            functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.IsDateStatic(string)"] = isDateStatic;
+
+            AddAnnotation("Relational:DbFunctions", functions);
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var functionMappings = new List<FunctionMapping>();
+            data.SetRuntimeAnnotation("Relational:FunctionMappings", functionMappings);
+            var getAllData = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData()")!;
+            var getAllDataFunction = new StoreFunction(getAllData, relationalModel);
+            var blobFunctionColumn = new FunctionColumn("Blob", "longblob", getAllDataFunction)
+            {
+                IsNullable = true
+            };
+            getAllDataFunction.Columns.Add("Blob", blobFunctionColumn);
+            relationalModel.Functions.Add(
+                ("GetAllData", null, new string[0]),
+                getAllDataFunction);
+            var getAllDataFunctionMapping = new FunctionMapping(data, getAllDataFunction, getAllData, null);
+            getAllDataFunction.AddTypeMapping(getAllDataFunctionMapping, false);
+            functionMappings.Add(getAllDataFunctionMapping);
+            getAllDataFunctionMapping.IsDefaultFunctionMapping = true;
+            RelationalModel.CreateFunctionColumnMapping(blobFunctionColumn, data.FindProperty("Blob")!, getAllDataFunctionMapping);
+            var getData = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetData(int)")!;
+            var getDataFunction = new StoreFunction(getData, relationalModel);
+            var idFunctionParameter = getDataFunction.FindParameter("id")!;
+            var blobFunctionColumn0 = new FunctionColumn("Blob", "longblob", getDataFunction)
+            {
+                IsNullable = true
+            };
+            getDataFunction.Columns.Add("Blob", blobFunctionColumn0);
+            relationalModel.Functions.Add(
+                ("GetData", null, new[] { "int" }),
+                getDataFunction);
+            var getDataFunctionMapping = new FunctionMapping(data, getDataFunction, getData, null);
+            getDataFunction.AddTypeMapping(getDataFunctionMapping, false);
+            functionMappings.Add(getDataFunctionMapping);
+            RelationalModel.CreateFunctionColumnMapping(blobFunctionColumn0, data.FindProperty("Blob")!, getDataFunctionMapping);
+
+            var @object = FindEntityType("object")!;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            @object.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var objectTableBase = new TableBase("object", null, relationalModel);
+            relationalModel.DefaultTables.Add("object", objectTableBase);
+            var objectMappingBase = new TableMappingBase<ColumnMappingBase>(@object, objectTableBase, null);
+            objectTableBase.AddTypeMapping(objectMappingBase, false);
+            defaultTableMappings0.Add(objectMappingBase);
+
+            var functionMappings0 = new List<FunctionMapping>();
+            @object.SetRuntimeAnnotation("Relational:FunctionMappings", functionMappings0);
+            var getBlobs = (IRuntimeDbFunction)this.FindDbFunction("GetBlobs()")!;
+            var getBlobsFunction = new StoreFunction(getBlobs, relationalModel);
+            relationalModel.Functions.Add(
+                ("GetBlobs", null, new string[0]),
+                getBlobsFunction);
+            var getBlobsFunctionMapping = new FunctionMapping(@object, getBlobsFunction, getBlobs, null);
+            getBlobsFunction.AddTypeMapping(getBlobsFunctionMapping, false);
+            functionMappings0.Add(getBlobsFunctionMapping);
+            getBlobsFunctionMapping.IsDefaultFunctionMapping = true;
+            var customerOrderCount = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.GetCount(System.Guid?,string)")!;
+            var customerOrderCountFunction = new StoreFunction(customerOrderCount, relationalModel);
+            var idFunctionParameter0 = customerOrderCountFunction.FindParameter("id")!;
+            var conditionFunctionParameter = customerOrderCountFunction.FindParameter("condition")!;
+            relationalModel.Functions.Add(
+                ("CustomerOrderCount", "dbf", new[] { "char(36)", "char(256)" }),
+                customerOrderCountFunction);
+            var isDate = (IRuntimeDbFunction)this.FindDbFunction("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+DbFunctionContext.IsDateStatic(string)")!;
+            var isDateFunction = new StoreFunction(isDate, relationalModel);
+            var dateFunctionParameter = isDateFunction.FindParameter("date")!;
+            relationalModel.Functions.Add(
+                ("IsDate", null, new[] { "char(256)" }),
+                isDateFunction);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/ObjectEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/ObjectEntityType.cs
new file mode 100644
index 000000000..ffdea2f12
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/DbFunctions/ObjectEntityType.cs
@@ -0,0 +1,38 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class ObjectEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "object",
+                typeof(object),
+                baseEntityType,
+                propertyCount: 0);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", "GetBlobs()");
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataEntityType.cs
new file mode 100644
index 000000000..e4ea3b2fa
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DataEntityType.cs
@@ -0,0 +1,90 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 2,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()));
+            blob.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Data");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModel.cs
new file mode 100644
index 000000000..583ee4d90
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelBuilder.cs
new file mode 100644
index 000000000..8b735b26a
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelBuilder.cs
@@ -0,0 +1,82 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+
+            DataEntityType.CreateAnnotations(data);
+
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Id", idColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, data.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            data.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dataTable = new Table("Data", null, relationalModel);
+            var idColumn = new Column("Id", "int", dataTable);
+            dataTable.Columns.Add("Id", idColumn);
+            var blobColumn = new Column("Blob", "longblob", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("Blob", blobColumn);
+            var pK_Data = new UniqueConstraint("PK_Data", dataTable, new[] { idColumn });
+            dataTable.PrimaryKey = pK_Data;
+            var pK_DataUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                new[] { "Id" });
+            pK_Data.MappedKeys.Add(pK_DataUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DataUc).Add(pK_Data);
+            dataTable.UniqueConstraints.Add("PK_Data", pK_Data);
+            relationalModel.Tables.Add(("Data", null), dataTable);
+            var dataTableMapping = new TableMapping(data, dataTable, null);
+            dataTable.AddTypeMapping(dataTableMapping, false);
+            tableMappings.Add(dataTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, data.FindProperty("Id")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(blobColumn, data.FindProperty("Blob")!, dataTableMapping);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelCustomizer.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelCustomizer.cs
new file mode 100644
index 000000000..8d477de97
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Dynamic_schema/DbContextModelCustomizer.cs
@@ -0,0 +1,72 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace TestNamespace;
+
+public partial class DbContextModel
+{
+    private string DefaultSchema { get; init; } = "custom";
+
+    partial void Customize()
+    {
+        RemoveAnnotation("Relational:DefaultSchema");
+        AddAnnotation("Relational:DefaultSchema", DefaultSchema);
+        RemoveRuntimeAnnotation("Relational:RelationalModel");
+
+        foreach (RuntimeEntityType entityType in ((IModel)this).GetEntityTypes())
+        {
+            Customize(entityType);
+
+            foreach (var key in entityType.GetDeclaredKeys())
+            {
+                key.RemoveRuntimeAnnotation(RelationalAnnotationNames.UniqueConstraintMappings);
+            }
+
+            foreach (var index in entityType.GetDeclaredIndexes())
+            {
+                index.RemoveRuntimeAnnotation(RelationalAnnotationNames.TableIndexMappings);
+            }
+
+            foreach (var foreignKey in entityType.GetDeclaredForeignKeys())
+            {
+                foreignKey.RemoveRuntimeAnnotation(RelationalAnnotationNames.ForeignKeyMappings);
+            }
+
+            var tableName = entityType.FindAnnotation("Relational:TableName")?.Value as string;
+            if (string.IsNullOrEmpty(tableName))
+                continue;
+
+            entityType.SetAnnotation("Relational:Schema", DefaultSchema);
+        }
+    }
+
+    private static void Customize(RuntimeTypeBase entityType)
+    {
+        entityType.RemoveRuntimeAnnotation(RelationalAnnotationNames.DefaultMappings);
+        entityType.RemoveRuntimeAnnotation(RelationalAnnotationNames.TableMappings);
+        entityType.RemoveRuntimeAnnotation(RelationalAnnotationNames.ViewMappings);
+        entityType.RemoveRuntimeAnnotation(RelationalAnnotationNames.SqlQueryMappings);
+        entityType.RemoveRuntimeAnnotation(RelationalAnnotationNames.FunctionMappings);
+        entityType.RemoveRuntimeAnnotation(RelationalAnnotationNames.InsertStoredProcedureMappings);
+        entityType.RemoveRuntimeAnnotation(RelationalAnnotationNames.DeleteStoredProcedureMappings);
+        entityType.RemoveRuntimeAnnotation(RelationalAnnotationNames.UpdateStoredProcedureMappings);
+
+        foreach (var property in entityType.GetDeclaredProperties())
+        {
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.DefaultColumnMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.TableColumnMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.ViewColumnMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.SqlQueryColumnMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.FunctionColumnMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.InsertStoredProcedureParameterMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.DeleteStoredProcedureParameterMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.UpdateStoredProcedureParameterMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.InsertStoredProcedureResultColumnMappings);
+            property.RemoveRuntimeAnnotation(RelationalAnnotationNames.UpdateStoredProcedureResultColumnMappings);
+        }
+
+        foreach (var complexProperty in entityType.GetDeclaredComplexProperties())
+        {
+            Customize(complexProperty.ComplexType);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModel.cs
new file mode 100644
index 000000000..583ee4d90
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModelBuilder.cs
new file mode 100644
index 000000000..f2ab9f7d6
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Sequences/DbContextModelBuilder.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: true, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 0)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var sequences = new Dictionary<(string, string), ISequence>();
+            var @long = new RuntimeSequence(
+                "Long",
+                this,
+                typeof(long),
+                startValue: -4L,
+                incrementBy: 2,
+                cyclic: true,
+                minValue: -2L,
+                maxValue: 2L);
+
+            sequences[("Long", null)] = @long;
+
+            AddAnnotation("Relational:Sequences", sequences);
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DbContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DbContextModel.cs
new file mode 100644
index 000000000..583ee4d90
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DbContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DbContextModelBuilder.cs
new file mode 100644
index 000000000..48e0205af
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DbContextModelBuilder.cs
@@ -0,0 +1,1092 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 3)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var dependentBase = DependentBaseEntityType.Create(this);
+            var principalBase = PrincipalBaseEntityType.Create(this);
+            var principalDerived = PrincipalDerivedEntityType.Create(this, principalBase);
+
+            DependentBaseEntityType.CreateForeignKey1(dependentBase, principalDerived);
+            PrincipalBaseEntityType.CreateForeignKey1(principalBase, principalBase);
+            PrincipalBaseEntityType.CreateForeignKey2(principalBase, principalDerived);
+
+            DependentBaseEntityType.CreateAnnotations(dependentBase);
+            PrincipalBaseEntityType.CreateAnnotations(principalBase);
+            PrincipalDerivedEntityType.CreateAnnotations(principalDerived);
+
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:DefaultSchema", "TPC");
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var dependentBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            dependentBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", null, relationalModel);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "tinyint unsigned", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase);
+            var principalIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalId", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalId", principalIdColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(dependentBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, dependentBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalIdColumnBase, dependentBase.FindProperty("PrincipalId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            dependentBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dependentBasebyteTable = new Table("DependentBase<byte?>", "TPC", relationalModel);
+            var idColumn = new Column("Id", "tinyint unsigned", dependentBasebyteTable);
+            dependentBasebyteTable.Columns.Add("Id", idColumn);
+            var principalIdColumn = new Column("PrincipalId", "bigint", dependentBasebyteTable)
+            {
+                IsNullable = true
+            };
+            dependentBasebyteTable.Columns.Add("PrincipalId", principalIdColumn);
+            var pK_DependentBasebyte = new UniqueConstraint("PK_DependentBase<byte?>", dependentBasebyteTable, new[] { idColumn });
+            dependentBasebyteTable.PrimaryKey = pK_DependentBasebyte;
+            var pK_DependentBasebyteUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "Id" });
+            pK_DependentBasebyte.MappedKeys.Add(pK_DependentBasebyteUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DependentBasebyteUc).Add(pK_DependentBasebyte);
+            dependentBasebyteTable.UniqueConstraints.Add("PK_DependentBase<byte?>", pK_DependentBasebyte);
+            var iX_DependentBasebyte_PrincipalId = new TableIndex(
+            "IX_DependentBase<byte?>_PrincipalId", dependentBasebyteTable, new[] { principalIdColumn }, true);
+            var iX_DependentBasebyte_PrincipalIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" });
+            iX_DependentBasebyte_PrincipalId.MappedIndexes.Add(iX_DependentBasebyte_PrincipalIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_DependentBasebyte_PrincipalIdIx).Add(iX_DependentBasebyte_PrincipalId);
+            dependentBasebyteTable.Indexes.Add("IX_DependentBase<byte?>_PrincipalId", iX_DependentBasebyte_PrincipalId);
+            relationalModel.Tables.Add(("DependentBase<byte?>", "TPC"), dependentBasebyteTable);
+            var dependentBasebyteTableMapping = new TableMapping(dependentBase, dependentBasebyteTable, null);
+            dependentBasebyteTable.AddTypeMapping(dependentBasebyteTableMapping, false);
+            tableMappings.Add(dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, dependentBase.FindProperty("Id")!, dependentBasebyteTableMapping);
+            RelationalModel.CreateColumnMapping(principalIdColumn, dependentBase.FindProperty("PrincipalId")!, dependentBasebyteTableMapping);
+
+            var principalBase = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase")!;
+
+            var defaultTableMappings0 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalBase.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings0);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", null, relationalModel);
+            var enum1ColumnBase = new ColumnBase<ColumnMappingBase>("Enum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum1", enum1ColumnBase);
+            var enum2ColumnBase = new ColumnBase<ColumnMappingBase>("Enum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Enum2", enum2ColumnBase);
+            var flagsEnum1ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase);
+            var flagsEnum2ColumnBase = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase);
+            var idColumnBase0 = new ColumnBase<ColumnMappingBase>("Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("Id", idColumnBase0);
+            var principalBaseIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalBaseId", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("PrincipalBaseId", principalBaseIdColumnBase);
+            var principalDerivedDependentBasebyteIdColumnBase = new ColumnBase<ColumnMappingBase>("PrincipalDerived<DependentBase<byte?>>Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumnBase);
+            var refTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase);
+            var refTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase);
+            var refTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase);
+            var refTypeListColumnBase = new ColumnBase<ColumnMappingBase>("RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("RefTypeList", refTypeListColumnBase);
+            var valueTypeArrayColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase);
+            var valueTypeEnumerableColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase);
+            var valueTypeIListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase);
+            var valueTypeListColumnBase = new ColumnBase<ColumnMappingBase>("ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase = new TableMappingBase<ColumnMappingBase>(principalBase, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase, false);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase, false);
+            defaultTableMappings0.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase0, principalBase.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase, principalBase.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase, principalBase.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase, principalBase.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase, principalBase.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase, principalBase.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalDerivedDependentBasebyteIdColumnBase, principalBase.FindProperty("PrincipalDerivedId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase, principalBase.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase, principalBase.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase, principalBase.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase, principalBase.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase, principalBase.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase, principalBase.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase, principalBase.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase, principalBase.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalBaseMappingBase);
+
+            var tableMappings0 = new List<TableMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:TableMappings", tableMappings0);
+            var principalBaseTable = new Table("PrincipalBase", "TPC", relationalModel);
+            var idColumn0 = new Column("Id", "bigint", principalBaseTable);
+            principalBaseTable.Columns.Add("Id", idColumn0);
+            var enum1Column = new Column("Enum1", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("Enum1", enum1Column);
+            var enum2Column = new Column("Enum2", "int", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("Enum2", enum2Column);
+            var flagsEnum1Column = new Column("FlagsEnum1", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum1", flagsEnum1Column);
+            var flagsEnum2Column = new Column("FlagsEnum2", "int", principalBaseTable);
+            principalBaseTable.Columns.Add("FlagsEnum2", flagsEnum2Column);
+            var principalBaseIdColumn = new Column("PrincipalBaseId", "bigint", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("PrincipalBaseId", principalBaseIdColumn);
+            var principalDerivedDependentBasebyteIdColumn = new Column("PrincipalDerived<DependentBase<byte?>>Id", "bigint", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumn);
+            var refTypeArrayColumn = new Column("RefTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeArray", refTypeArrayColumn);
+            var refTypeEnumerableColumn = new Column("RefTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn);
+            var refTypeIListColumn = new Column("RefTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeIList", refTypeIListColumn);
+            var refTypeListColumn = new Column("RefTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("RefTypeList", refTypeListColumn);
+            var valueTypeArrayColumn = new Column("ValueTypeArray", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn);
+            var valueTypeEnumerableColumn = new Column("ValueTypeEnumerable", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn);
+            var valueTypeIListColumn = new Column("ValueTypeIList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeIList", valueTypeIListColumn);
+            var valueTypeListColumn = new Column("ValueTypeList", "longtext", principalBaseTable)
+            {
+                IsNullable = true
+            };
+            principalBaseTable.Columns.Add("ValueTypeList", valueTypeListColumn);
+            var pK_PrincipalBase = new UniqueConstraint("PK_PrincipalBase", principalBaseTable, new[] { idColumn0 });
+            principalBaseTable.PrimaryKey = pK_PrincipalBase;
+            var pK_PrincipalBaseUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            pK_PrincipalBase.MappedKeys.Add(pK_PrincipalBaseUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalBaseUc).Add(pK_PrincipalBase);
+            principalBaseTable.UniqueConstraints.Add("PK_PrincipalBase", pK_PrincipalBase);
+            var iX_PrincipalBase_PrincipalDerivedDependentBasebyteId = new TableIndex(
+            "IX_PrincipalBase_PrincipalDerived<DependentBase<byte?>>Id", principalBaseTable, new[] { principalDerivedDependentBasebyteIdColumn }, false);
+            var iX_PrincipalBase_PrincipalDerivedDependentBasebyteIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalDerivedId" });
+            iX_PrincipalBase_PrincipalDerivedDependentBasebyteId.MappedIndexes.Add(iX_PrincipalBase_PrincipalDerivedDependentBasebyteIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalBase_PrincipalDerivedDependentBasebyteIdIx).Add(iX_PrincipalBase_PrincipalDerivedDependentBasebyteId);
+            principalBaseTable.Indexes.Add("IX_PrincipalBase_PrincipalDerived<DependentBase<byte?>>Id", iX_PrincipalBase_PrincipalDerivedDependentBasebyteId);
+            var pIX = new TableIndex(
+            "PIX", principalBaseTable, new[] { principalBaseIdColumn }, true);
+            var pIXIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                "PrincipalIndex");
+            pIX.MappedIndexes.Add(pIXIx);
+            RelationalModel.GetOrCreateTableIndexes(pIXIx).Add(pIX);
+            principalBaseTable.Indexes.Add("PIX", pIX);
+            relationalModel.Tables.Add(("PrincipalBase", "TPC"), principalBaseTable);
+            var principalBaseTableMapping = new TableMapping(principalBase, principalBaseTable, false);
+            principalBaseTable.AddTypeMapping(principalBaseTableMapping, false);
+            tableMappings0.Add(principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn0, principalBase.FindProperty("Id")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column, principalBase.FindProperty("Enum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column, principalBase.FindProperty("Enum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column, principalBase.FindProperty("FlagsEnum1")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column, principalBase.FindProperty("FlagsEnum2")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(principalDerivedDependentBasebyteIdColumn, principalBase.FindProperty("PrincipalDerivedId")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn, principalBase.FindProperty("RefTypeList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseTableMapping);
+
+            var viewMappings = new List<ViewMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:ViewMappings", viewMappings);
+            var principalBaseViewView = new View("PrincipalBaseView", "TPC", relationalModel);
+            var enum1ViewColumn = new ViewColumn("Enum1", "int", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Enum1", enum1ViewColumn);
+            var enum2ViewColumn = new ViewColumn("Enum2", "int", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("Enum2", enum2ViewColumn);
+            var flagsEnum1ViewColumn = new ViewColumn("FlagsEnum1", "int", principalBaseViewView);
+            principalBaseViewView.Columns.Add("FlagsEnum1", flagsEnum1ViewColumn);
+            var flagsEnum2ViewColumn = new ViewColumn("FlagsEnum2", "int", principalBaseViewView);
+            principalBaseViewView.Columns.Add("FlagsEnum2", flagsEnum2ViewColumn);
+            var idViewColumn = new ViewColumn("Id", "bigint", principalBaseViewView);
+            principalBaseViewView.Columns.Add("Id", idViewColumn);
+            var principalBaseIdViewColumn = new ViewColumn("PrincipalBaseId", "bigint", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("PrincipalBaseId", principalBaseIdViewColumn);
+            var principalDerivedIdViewColumn = new ViewColumn("PrincipalDerivedId", "bigint", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("PrincipalDerivedId", principalDerivedIdViewColumn);
+            var refTypeArrayViewColumn = new ViewColumn("RefTypeArray", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeArray", refTypeArrayViewColumn);
+            var refTypeEnumerableViewColumn = new ViewColumn("RefTypeEnumerable", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeEnumerable", refTypeEnumerableViewColumn);
+            var refTypeIListViewColumn = new ViewColumn("RefTypeIList", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeIList", refTypeIListViewColumn);
+            var refTypeListViewColumn = new ViewColumn("RefTypeList", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("RefTypeList", refTypeListViewColumn);
+            var valueTypeArrayViewColumn = new ViewColumn("ValueTypeArray", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeArray", valueTypeArrayViewColumn);
+            var valueTypeEnumerableViewColumn = new ViewColumn("ValueTypeEnumerable", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableViewColumn);
+            var valueTypeIListViewColumn = new ViewColumn("ValueTypeIList", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeIList", valueTypeIListViewColumn);
+            var valueTypeListViewColumn = new ViewColumn("ValueTypeList", "longtext", principalBaseViewView)
+            {
+                IsNullable = true
+            };
+            principalBaseViewView.Columns.Add("ValueTypeList", valueTypeListViewColumn);
+            relationalModel.Views.Add(("PrincipalBaseView", "TPC"), principalBaseViewView);
+            var principalBaseViewViewMapping = new ViewMapping(principalBase, principalBaseViewView, false);
+            principalBaseViewView.AddTypeMapping(principalBaseViewViewMapping, false);
+            viewMappings.Add(principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(idViewColumn, principalBase.FindProperty("Id")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum1ViewColumn, principalBase.FindProperty("Enum1")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum2ViewColumn, principalBase.FindProperty("Enum2")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum1ViewColumn, principalBase.FindProperty("FlagsEnum1")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum2ViewColumn, principalBase.FindProperty("FlagsEnum2")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalBaseIdViewColumn, principalBase.FindProperty("PrincipalBaseId")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalDerivedIdViewColumn, principalBase.FindProperty("PrincipalDerivedId")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeArrayViewColumn, principalBase.FindProperty("RefTypeArray")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeEnumerableViewColumn, principalBase.FindProperty("RefTypeEnumerable")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeIListViewColumn, principalBase.FindProperty("RefTypeIList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeListViewColumn, principalBase.FindProperty("RefTypeList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeArrayViewColumn, principalBase.FindProperty("ValueTypeArray")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeEnumerableViewColumn, principalBase.FindProperty("ValueTypeEnumerable")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeIListViewColumn, principalBase.FindProperty("ValueTypeIList")!, principalBaseViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeListViewColumn, principalBase.FindProperty("ValueTypeList")!, principalBaseViewViewMapping);
+
+            var deleteSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:DeleteStoredProcedureMappings", deleteSprocMappings);
+            var principalBase_DeleteStoreSproc = new StoreStoredProcedure("PrincipalBase_Delete", "TPC", relationalModel);
+            principalBase_DeleteStoreSproc.ReturnValue = new StoreStoredProcedureReturnValue("", "int", principalBase_DeleteStoreSproc);
+            var id_OriginalParameter = new StoreStoredProcedureParameter("Id_Original", "bigint", 0, principalBase_DeleteStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_DeleteStoreSproc.AddParameter(id_OriginalParameter);
+            principalBase_DeleteStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Delete", "TPC"), principalBase_DeleteStoreSproc);
+            var principalBase_DeleteDSproc = (IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!;
+            var principalBase_DeleteSprocMapping = new StoredProcedureMapping(principalBase, principalBase_DeleteStoreSproc, (IRuntimeStoredProcedure)principalBase.GetDeleteStoredProcedure()!, principalBaseTableMapping, false);
+            principalBase_DeleteStoreSproc.AddTypeMapping(principalBase_DeleteSprocMapping, false);
+            deleteSprocMappings.Add(principalBase_DeleteSprocMapping);
+            principalBaseTableMapping.DeleteStoredProcedureMapping = principalBase_DeleteSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter, principalBase_DeleteDSproc.FindParameter("Id_Original")!, principalBase.FindProperty("Id")!, principalBase_DeleteSprocMapping);
+
+            var insertSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:InsertStoredProcedureMappings", insertSprocMappings);
+            var principalBase_InsertStoreSproc = new StoreStoredProcedure("PrincipalBase_Insert", "TPC", relationalModel);
+            var idParameter = new StoreStoredProcedureParameter("Id", "bigint", 0, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(idParameter);
+            var principalBaseIdParameter = new StoreStoredProcedureParameter("PrincipalBaseId", "bigint", 1, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(principalBaseIdParameter);
+            var principalDerivedIdParameter = new StoreStoredProcedureParameter("PrincipalDerivedId", "bigint", 2, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(principalDerivedIdParameter);
+            var enum2Parameter = new StoreStoredProcedureParameter("Enum2", "int", 3, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(enum2Parameter);
+            var flagsEnum1Parameter = new StoreStoredProcedureParameter("FlagsEnum1", "int", 4, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(flagsEnum1Parameter);
+            var flagsEnum2Parameter = new StoreStoredProcedureParameter("FlagsEnum2", "int", 5, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_InsertStoreSproc.AddParameter(flagsEnum2Parameter);
+            var valueTypeListParameter = new StoreStoredProcedureParameter("ValueTypeList", "longtext", 6, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeListParameter);
+            var valueTypeIListParameter = new StoreStoredProcedureParameter("ValueTypeIList", "longtext", 7, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeIListParameter);
+            var valueTypeArrayParameter = new StoreStoredProcedureParameter("ValueTypeArray", "longtext", 8, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeArrayParameter);
+            var valueTypeEnumerableParameter = new StoreStoredProcedureParameter("ValueTypeEnumerable", "longtext", 9, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(valueTypeEnumerableParameter);
+            var refTypeListParameter = new StoreStoredProcedureParameter("RefTypeList", "longtext", 10, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeListParameter);
+            var refTypeIListParameter = new StoreStoredProcedureParameter("RefTypeIList", "longtext", 11, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeIListParameter);
+            var refTypeArrayParameter = new StoreStoredProcedureParameter("RefTypeArray", "longtext", 12, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeArrayParameter);
+            var refTypeEnumerableParameter = new StoreStoredProcedureParameter("RefTypeEnumerable", "longtext", 13, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_InsertStoreSproc.AddParameter(refTypeEnumerableParameter);
+            var baseEnumParameter = new StoreStoredProcedureParameter("BaseEnum", "int", 14, principalBase_InsertStoreSproc, System.Data.ParameterDirection.Output);
+            principalBase_InsertStoreSproc.AddParameter(baseEnumParameter);
+            principalBase_InsertStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Insert", "TPC"), principalBase_InsertStoreSproc);
+            var principalBase_InsertISproc = (IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!;
+            var principalBase_InsertSprocMapping = new StoredProcedureMapping(principalBase, principalBase_InsertStoreSproc, (IRuntimeStoredProcedure)principalBase.GetInsertStoredProcedure()!, principalBaseTableMapping, false);
+            principalBase_InsertStoreSproc.AddTypeMapping(principalBase_InsertSprocMapping, false);
+            insertSprocMappings.Add(principalBase_InsertSprocMapping);
+            principalBaseTableMapping.InsertStoredProcedureMapping = principalBase_InsertSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(idParameter, principalBase_InsertISproc.FindParameter("Id")!, principalBase.FindProperty("Id")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(baseEnumParameter, principalBase_InsertISproc.FindParameter("BaseEnum")!, principalBase.FindProperty("Enum1")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter, principalBase_InsertISproc.FindParameter("Enum2")!, principalBase.FindProperty("Enum2")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum1")!, principalBase.FindProperty("FlagsEnum1")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter, principalBase_InsertISproc.FindParameter("FlagsEnum2")!, principalBase.FindProperty("FlagsEnum2")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter, principalBase_InsertISproc.FindParameter("PrincipalBaseId")!, principalBase.FindProperty("PrincipalBaseId")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalDerivedIdParameter, principalBase_InsertISproc.FindParameter("PrincipalDerivedId")!, principalBase.FindProperty("PrincipalDerivedId")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter, principalBase_InsertISproc.FindParameter("RefTypeArray")!, principalBase.FindProperty("RefTypeArray")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("RefTypeEnumerable")!, principalBase.FindProperty("RefTypeEnumerable")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter, principalBase_InsertISproc.FindParameter("RefTypeIList")!, principalBase.FindProperty("RefTypeIList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter, principalBase_InsertISproc.FindParameter("RefTypeList")!, principalBase.FindProperty("RefTypeList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter, principalBase_InsertISproc.FindParameter("ValueTypeArray")!, principalBase.FindProperty("ValueTypeArray")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter, principalBase_InsertISproc.FindParameter("ValueTypeEnumerable")!, principalBase.FindProperty("ValueTypeEnumerable")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter, principalBase_InsertISproc.FindParameter("ValueTypeIList")!, principalBase.FindProperty("ValueTypeIList")!, principalBase_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter, principalBase_InsertISproc.FindParameter("ValueTypeList")!, principalBase.FindProperty("ValueTypeList")!, principalBase_InsertSprocMapping);
+
+            var updateSprocMappings = new List<StoredProcedureMapping>();
+            principalBase.SetRuntimeAnnotation("Relational:UpdateStoredProcedureMappings", updateSprocMappings);
+            var principalBase_UpdateStoreSproc = new StoreStoredProcedure("PrincipalBase_Update", "TPC", relationalModel);
+            var principalBaseIdParameter0 = new StoreStoredProcedureParameter("PrincipalBaseId", "bigint", 0, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(principalBaseIdParameter0);
+            var principalDerivedIdParameter0 = new StoreStoredProcedureParameter("PrincipalDerivedId", "bigint", 1, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(principalDerivedIdParameter0);
+            var enum1Parameter = new StoreStoredProcedureParameter("Enum1", "int", 2, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(enum1Parameter);
+            var enum2Parameter0 = new StoreStoredProcedureParameter("Enum2", "int", 3, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(enum2Parameter0);
+            var flagsEnum1Parameter0 = new StoreStoredProcedureParameter("FlagsEnum1", "int", 4, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(flagsEnum1Parameter0);
+            var flagsEnum2Parameter0 = new StoreStoredProcedureParameter("FlagsEnum2", "int", 5, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(flagsEnum2Parameter0);
+            var valueTypeListParameter0 = new StoreStoredProcedureParameter("ValueTypeList", "longtext", 6, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeListParameter0);
+            var valueTypeIListParameter0 = new StoreStoredProcedureParameter("ValueTypeIList", "longtext", 7, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeIListParameter0);
+            var valueTypeArrayParameter0 = new StoreStoredProcedureParameter("ValueTypeArray", "longtext", 8, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeArrayParameter0);
+            var valueTypeEnumerableParameter0 = new StoreStoredProcedureParameter("ValueTypeEnumerable", "longtext", 9, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(valueTypeEnumerableParameter0);
+            var refTypeListParameter0 = new StoreStoredProcedureParameter("RefTypeList", "longtext", 10, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeListParameter0);
+            var refTypeIListParameter0 = new StoreStoredProcedureParameter("RefTypeIList", "longtext", 11, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeIListParameter0);
+            var refTypeArrayParameter0 = new StoreStoredProcedureParameter("RefTypeArray", "longtext", 12, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeArrayParameter0);
+            var refTypeEnumerableParameter0 = new StoreStoredProcedureParameter("RefTypeEnumerable", "longtext", 13, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            principalBase_UpdateStoreSproc.AddParameter(refTypeEnumerableParameter0);
+            var id_OriginalParameter0 = new StoreStoredProcedureParameter("Id_Original", "bigint", 14, principalBase_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            principalBase_UpdateStoreSproc.AddParameter(id_OriginalParameter0);
+            principalBase_UpdateStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("PrincipalBase_Update", "TPC"), principalBase_UpdateStoreSproc);
+            var principalBase_UpdateUSproc = (IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!;
+            var principalBase_UpdateSprocMapping = new StoredProcedureMapping(principalBase, principalBase_UpdateStoreSproc, (IRuntimeStoredProcedure)principalBase.GetUpdateStoredProcedure()!, principalBaseTableMapping, false);
+            principalBase_UpdateStoreSproc.AddTypeMapping(principalBase_UpdateSprocMapping, false);
+            updateSprocMappings.Add(principalBase_UpdateSprocMapping);
+            principalBaseTableMapping.UpdateStoredProcedureMapping = principalBase_UpdateSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter0, principalBase_UpdateUSproc.FindParameter("Id_Original")!, principalBase.FindProperty("Id")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter, principalBase_UpdateUSproc.FindParameter("Enum1")!, principalBase.FindProperty("Enum1")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter0, principalBase_UpdateUSproc.FindParameter("Enum2")!, principalBase.FindProperty("Enum2")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum1")!, principalBase.FindProperty("FlagsEnum1")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter0, principalBase_UpdateUSproc.FindParameter("FlagsEnum2")!, principalBase.FindProperty("FlagsEnum2")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter0, principalBase_UpdateUSproc.FindParameter("PrincipalBaseId")!, principalBase.FindProperty("PrincipalBaseId")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalDerivedIdParameter0, principalBase_UpdateUSproc.FindParameter("PrincipalDerivedId")!, principalBase.FindProperty("PrincipalDerivedId")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeArray")!, principalBase.FindProperty("RefTypeArray")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeEnumerable")!, principalBase.FindProperty("RefTypeEnumerable")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeIList")!, principalBase.FindProperty("RefTypeIList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter0, principalBase_UpdateUSproc.FindParameter("RefTypeList")!, principalBase.FindProperty("RefTypeList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeArray")!, principalBase.FindProperty("ValueTypeArray")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeEnumerable")!, principalBase.FindProperty("ValueTypeEnumerable")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeIList")!, principalBase.FindProperty("ValueTypeIList")!, principalBase_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter0, principalBase_UpdateUSproc.FindParameter("ValueTypeList")!, principalBase.FindProperty("ValueTypeList")!, principalBase_UpdateSprocMapping);
+
+            var principalDerived = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>")!;
+
+            var defaultTableMappings1 = new List<TableMappingBase<ColumnMappingBase>>();
+            principalDerived.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings1);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>", null, relationalModel);
+            var enum1ColumnBase0 = new ColumnBase<ColumnMappingBase>("Enum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Enum1", enum1ColumnBase0);
+            var enum2ColumnBase0 = new ColumnBase<ColumnMappingBase>("Enum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Enum2", enum2ColumnBase0);
+            var flagsEnum1ColumnBase0 = new ColumnBase<ColumnMappingBase>("FlagsEnum1", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("FlagsEnum1", flagsEnum1ColumnBase0);
+            var flagsEnum2ColumnBase0 = new ColumnBase<ColumnMappingBase>("FlagsEnum2", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("FlagsEnum2", flagsEnum2ColumnBase0);
+            var idColumnBase1 = new ColumnBase<ColumnMappingBase>("Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("Id", idColumnBase1);
+            var principalBaseIdColumnBase0 = new ColumnBase<ColumnMappingBase>("PrincipalBaseId", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalBaseId", principalBaseIdColumnBase0);
+            var principalDerivedDependentBasebyteIdColumnBase0 = new ColumnBase<ColumnMappingBase>("PrincipalDerived<DependentBase<byte?>>Id", "bigint", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumnBase0);
+            var refTypeArrayColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("RefTypeArray", refTypeArrayColumnBase0);
+            var refTypeEnumerableColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumnBase0);
+            var refTypeIListColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("RefTypeIList", refTypeIListColumnBase0);
+            var refTypeListColumnBase0 = new ColumnBase<ColumnMappingBase>("RefTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("RefTypeList", refTypeListColumnBase0);
+            var valueTypeArrayColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeArray", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("ValueTypeArray", valueTypeArrayColumnBase0);
+            var valueTypeEnumerableColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeEnumerable", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumnBase0);
+            var valueTypeIListColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeIList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("ValueTypeIList", valueTypeIListColumnBase0);
+            var valueTypeListColumnBase0 = new ColumnBase<ColumnMappingBase>("ValueTypeList", "longtext", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.Columns.Add("ValueTypeList", valueTypeListColumnBase0);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase = new TableMappingBase<ColumnMappingBase>(principalDerived, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase, false);
+            defaultTableMappings1.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase1, principalDerived.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum1ColumnBase0, principalDerived.FindProperty("Enum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)enum2ColumnBase0, principalDerived.FindProperty("Enum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum1ColumnBase0, principalDerived.FindProperty("FlagsEnum1")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)flagsEnum2ColumnBase0, principalDerived.FindProperty("FlagsEnum2")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalBaseIdColumnBase0, principalDerived.FindProperty("PrincipalBaseId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)principalDerivedDependentBasebyteIdColumnBase0, principalDerived.FindProperty("PrincipalDerivedId")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeArrayColumnBase0, principalDerived.FindProperty("RefTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeEnumerableColumnBase0, principalDerived.FindProperty("RefTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeIListColumnBase0, principalDerived.FindProperty("RefTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)refTypeListColumnBase0, principalDerived.FindProperty("RefTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeArrayColumnBase0, principalDerived.FindProperty("ValueTypeArray")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeEnumerableColumnBase0, principalDerived.FindProperty("ValueTypeEnumerable")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeIListColumnBase0, principalDerived.FindProperty("ValueTypeIList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)valueTypeListColumnBase0, principalDerived.FindProperty("ValueTypeList")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBasePrincipalDerivedMicrosoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDependentBasebyteMappingBase);
+
+            var tableMappings1 = new List<TableMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:TableMappings", tableMappings1);
+            var principalDerivedTable = new Table("PrincipalDerived", "TPC", relationalModel);
+            var idColumn1 = new Column("Id", "bigint", principalDerivedTable);
+            principalDerivedTable.Columns.Add("Id", idColumn1);
+            var enum1Column0 = new Column("Enum1", "int", principalDerivedTable);
+            principalDerivedTable.Columns.Add("Enum1", enum1Column0);
+            var enum2Column0 = new Column("Enum2", "int", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("Enum2", enum2Column0);
+            var flagsEnum1Column0 = new Column("FlagsEnum1", "int", principalDerivedTable);
+            principalDerivedTable.Columns.Add("FlagsEnum1", flagsEnum1Column0);
+            var flagsEnum2Column0 = new Column("FlagsEnum2", "int", principalDerivedTable);
+            principalDerivedTable.Columns.Add("FlagsEnum2", flagsEnum2Column0);
+            var principalBaseIdColumn0 = new Column("PrincipalBaseId", "bigint", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("PrincipalBaseId", principalBaseIdColumn0);
+            var principalDerivedDependentBasebyteIdColumn0 = new Column("PrincipalDerived<DependentBase<byte?>>Id", "bigint", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("PrincipalDerived<DependentBase<byte?>>Id", principalDerivedDependentBasebyteIdColumn0);
+            var refTypeArrayColumn0 = new Column("RefTypeArray", "longtext", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("RefTypeArray", refTypeArrayColumn0);
+            var refTypeEnumerableColumn0 = new Column("RefTypeEnumerable", "longtext", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("RefTypeEnumerable", refTypeEnumerableColumn0);
+            var refTypeIListColumn0 = new Column("RefTypeIList", "longtext", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("RefTypeIList", refTypeIListColumn0);
+            var refTypeListColumn0 = new Column("RefTypeList", "longtext", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("RefTypeList", refTypeListColumn0);
+            var valueTypeArrayColumn0 = new Column("ValueTypeArray", "longtext", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("ValueTypeArray", valueTypeArrayColumn0);
+            var valueTypeEnumerableColumn0 = new Column("ValueTypeEnumerable", "longtext", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableColumn0);
+            var valueTypeIListColumn0 = new Column("ValueTypeIList", "longtext", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("ValueTypeIList", valueTypeIListColumn0);
+            var valueTypeListColumn0 = new Column("ValueTypeList", "longtext", principalDerivedTable)
+            {
+                IsNullable = true
+            };
+            principalDerivedTable.Columns.Add("ValueTypeList", valueTypeListColumn0);
+            var pK_PrincipalDerived = new UniqueConstraint("PK_PrincipalDerived", principalDerivedTable, new[] { idColumn1 });
+            principalDerivedTable.PrimaryKey = pK_PrincipalDerived;
+            var pK_PrincipalDerivedUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "Id" });
+            pK_PrincipalDerived.MappedKeys.Add(pK_PrincipalDerivedUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_PrincipalDerivedUc).Add(pK_PrincipalDerived);
+            principalDerivedTable.UniqueConstraints.Add("PK_PrincipalDerived", pK_PrincipalDerived);
+            var iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId = new TableIndex(
+            "IX_PrincipalDerived_PrincipalDerived<DependentBase<byte?>>Id", principalDerivedTable, new[] { principalDerivedDependentBasebyteIdColumn0 }, false);
+            var iX_PrincipalDerived_PrincipalDerivedDependentBasebyteIdIx = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalDerivedId" });
+            iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId.MappedIndexes.Add(iX_PrincipalDerived_PrincipalDerivedDependentBasebyteIdIx);
+            RelationalModel.GetOrCreateTableIndexes(iX_PrincipalDerived_PrincipalDerivedDependentBasebyteIdIx).Add(iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId);
+            principalDerivedTable.Indexes.Add("IX_PrincipalDerived_PrincipalDerived<DependentBase<byte?>>Id", iX_PrincipalDerived_PrincipalDerivedDependentBasebyteId);
+            var pIX0 = new TableIndex(
+            "PIX", principalDerivedTable, new[] { principalBaseIdColumn0 }, true);
+            var pIX0Ix = RelationalModel.GetIndex(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                "PrincipalIndex");
+            pIX0.MappedIndexes.Add(pIX0Ix);
+            RelationalModel.GetOrCreateTableIndexes(pIX0Ix).Add(pIX0);
+            principalDerivedTable.Indexes.Add("PIX", pIX0);
+            relationalModel.Tables.Add(("PrincipalDerived", "TPC"), principalDerivedTable);
+            var principalDerivedTableMapping = new TableMapping(principalDerived, principalDerivedTable, null);
+            principalDerivedTable.AddTypeMapping(principalDerivedTableMapping, false);
+            tableMappings1.Add(principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn1, principalDerived.FindProperty("Id")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(enum1Column0, principalDerived.FindProperty("Enum1")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(enum2Column0, principalDerived.FindProperty("Enum2")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum1Column0, principalDerived.FindProperty("FlagsEnum1")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(flagsEnum2Column0, principalDerived.FindProperty("FlagsEnum2")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(principalBaseIdColumn0, principalDerived.FindProperty("PrincipalBaseId")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(principalDerivedDependentBasebyteIdColumn0, principalDerived.FindProperty("PrincipalDerivedId")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeArrayColumn0, principalDerived.FindProperty("RefTypeArray")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeEnumerableColumn0, principalDerived.FindProperty("RefTypeEnumerable")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeIListColumn0, principalDerived.FindProperty("RefTypeIList")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(refTypeListColumn0, principalDerived.FindProperty("RefTypeList")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeArrayColumn0, principalDerived.FindProperty("ValueTypeArray")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeEnumerableColumn0, principalDerived.FindProperty("ValueTypeEnumerable")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeIListColumn0, principalDerived.FindProperty("ValueTypeIList")!, principalDerivedTableMapping);
+            RelationalModel.CreateColumnMapping(valueTypeListColumn0, principalDerived.FindProperty("ValueTypeList")!, principalDerivedTableMapping);
+
+            var viewMappings0 = new List<ViewMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:ViewMappings", viewMappings0);
+            var principalDerivedViewView = new View("PrincipalDerivedView", "TPC", relationalModel);
+            var enum1ViewColumn0 = new ViewColumn("Enum1", "int", principalDerivedViewView);
+            principalDerivedViewView.Columns.Add("Enum1", enum1ViewColumn0);
+            var enum2ViewColumn0 = new ViewColumn("Enum2", "int", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("Enum2", enum2ViewColumn0);
+            var flagsEnum1ViewColumn0 = new ViewColumn("FlagsEnum1", "int", principalDerivedViewView);
+            principalDerivedViewView.Columns.Add("FlagsEnum1", flagsEnum1ViewColumn0);
+            var flagsEnum2ViewColumn0 = new ViewColumn("FlagsEnum2", "int", principalDerivedViewView);
+            principalDerivedViewView.Columns.Add("FlagsEnum2", flagsEnum2ViewColumn0);
+            var idViewColumn0 = new ViewColumn("Id", "bigint", principalDerivedViewView);
+            principalDerivedViewView.Columns.Add("Id", idViewColumn0);
+            var principalBaseIdViewColumn0 = new ViewColumn("PrincipalBaseId", "bigint", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("PrincipalBaseId", principalBaseIdViewColumn0);
+            var principalDerivedIdViewColumn0 = new ViewColumn("PrincipalDerivedId", "bigint", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("PrincipalDerivedId", principalDerivedIdViewColumn0);
+            var refTypeArrayViewColumn0 = new ViewColumn("RefTypeArray", "longtext", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("RefTypeArray", refTypeArrayViewColumn0);
+            var refTypeEnumerableViewColumn0 = new ViewColumn("RefTypeEnumerable", "longtext", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("RefTypeEnumerable", refTypeEnumerableViewColumn0);
+            var refTypeIListViewColumn0 = new ViewColumn("RefTypeIList", "longtext", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("RefTypeIList", refTypeIListViewColumn0);
+            var refTypeListViewColumn0 = new ViewColumn("RefTypeList", "longtext", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("RefTypeList", refTypeListViewColumn0);
+            var valueTypeArrayViewColumn0 = new ViewColumn("ValueTypeArray", "longtext", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("ValueTypeArray", valueTypeArrayViewColumn0);
+            var valueTypeEnumerableViewColumn0 = new ViewColumn("ValueTypeEnumerable", "longtext", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("ValueTypeEnumerable", valueTypeEnumerableViewColumn0);
+            var valueTypeIListViewColumn0 = new ViewColumn("ValueTypeIList", "longtext", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("ValueTypeIList", valueTypeIListViewColumn0);
+            var valueTypeListViewColumn0 = new ViewColumn("ValueTypeList", "longtext", principalDerivedViewView)
+            {
+                IsNullable = true
+            };
+            principalDerivedViewView.Columns.Add("ValueTypeList", valueTypeListViewColumn0);
+            relationalModel.Views.Add(("PrincipalDerivedView", "TPC"), principalDerivedViewView);
+            var principalDerivedViewViewMapping = new ViewMapping(principalDerived, principalDerivedViewView, null);
+            principalDerivedViewView.AddTypeMapping(principalDerivedViewViewMapping, false);
+            viewMappings0.Add(principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(idViewColumn0, principalDerived.FindProperty("Id")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum1ViewColumn0, principalDerived.FindProperty("Enum1")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(enum2ViewColumn0, principalDerived.FindProperty("Enum2")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum1ViewColumn0, principalDerived.FindProperty("FlagsEnum1")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(flagsEnum2ViewColumn0, principalDerived.FindProperty("FlagsEnum2")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalBaseIdViewColumn0, principalDerived.FindProperty("PrincipalBaseId")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(principalDerivedIdViewColumn0, principalDerived.FindProperty("PrincipalDerivedId")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeArrayViewColumn0, principalDerived.FindProperty("RefTypeArray")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeEnumerableViewColumn0, principalDerived.FindProperty("RefTypeEnumerable")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeIListViewColumn0, principalDerived.FindProperty("RefTypeIList")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(refTypeListViewColumn0, principalDerived.FindProperty("RefTypeList")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeArrayViewColumn0, principalDerived.FindProperty("ValueTypeArray")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeEnumerableViewColumn0, principalDerived.FindProperty("ValueTypeEnumerable")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeIListViewColumn0, principalDerived.FindProperty("ValueTypeIList")!, principalDerivedViewViewMapping);
+            RelationalModel.CreateViewColumnMapping(valueTypeListViewColumn0, principalDerived.FindProperty("ValueTypeList")!, principalDerivedViewViewMapping);
+
+            var deleteSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:DeleteStoredProcedureMappings", deleteSprocMappings0);
+            var derived_DeleteStoreSproc = new StoreStoredProcedure("Derived_Delete", "TPC", relationalModel);
+            var id_OriginalParameter1 = new StoreStoredProcedureParameter("Id_Original", "bigint", 0, derived_DeleteStoreSproc, System.Data.ParameterDirection.Input);
+            derived_DeleteStoreSproc.AddParameter(id_OriginalParameter1);
+            derived_DeleteStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalDerived.GetDeleteStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("Derived_Delete", "TPC"), derived_DeleteStoreSproc);
+            var derived_DeleteDSproc = (IRuntimeStoredProcedure)principalDerived.GetDeleteStoredProcedure()!;
+            var derived_DeleteSprocMapping = new StoredProcedureMapping(principalDerived, derived_DeleteStoreSproc, (IRuntimeStoredProcedure)principalDerived.GetDeleteStoredProcedure()!, principalDerivedTableMapping, null);
+            derived_DeleteStoreSproc.AddTypeMapping(derived_DeleteSprocMapping, false);
+            deleteSprocMappings0.Add(derived_DeleteSprocMapping);
+            principalDerivedTableMapping.DeleteStoredProcedureMapping = derived_DeleteSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter1, derived_DeleteDSproc.FindParameter("Id_Original")!, principalDerived.FindProperty("Id")!, derived_DeleteSprocMapping);
+
+            var insertSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:InsertStoredProcedureMappings", insertSprocMappings0);
+            var derived_InsertStoreSproc = new StoreStoredProcedure("Derived_Insert", "TPC", relationalModel);
+            var idParameter0 = new StoreStoredProcedureParameter("Id", "bigint", 0, derived_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            derived_InsertStoreSproc.AddParameter(idParameter0);
+            var principalBaseIdParameter1 = new StoreStoredProcedureParameter("PrincipalBaseId", "bigint", 1, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(principalBaseIdParameter1);
+            var principalDerivedIdParameter1 = new StoreStoredProcedureParameter("PrincipalDerivedId", "bigint", 2, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(principalDerivedIdParameter1);
+            var enum2Parameter1 = new StoreStoredProcedureParameter("Enum2", "int", 3, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(enum2Parameter1);
+            var flagsEnum1Parameter1 = new StoreStoredProcedureParameter("FlagsEnum1", "int", 4, derived_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            derived_InsertStoreSproc.AddParameter(flagsEnum1Parameter1);
+            var flagsEnum2Parameter1 = new StoreStoredProcedureParameter("FlagsEnum2", "int", 5, derived_InsertStoreSproc, System.Data.ParameterDirection.Input);
+            derived_InsertStoreSproc.AddParameter(flagsEnum2Parameter1);
+            var valueTypeListParameter1 = new StoreStoredProcedureParameter("ValueTypeList", "longtext", 6, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(valueTypeListParameter1);
+            var valueTypeIListParameter1 = new StoreStoredProcedureParameter("ValueTypeIList", "longtext", 7, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(valueTypeIListParameter1);
+            var valueTypeArrayParameter1 = new StoreStoredProcedureParameter("ValueTypeArray", "longtext", 8, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(valueTypeArrayParameter1);
+            var valueTypeEnumerableParameter1 = new StoreStoredProcedureParameter("ValueTypeEnumerable", "longtext", 9, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(valueTypeEnumerableParameter1);
+            var refTypeListParameter1 = new StoreStoredProcedureParameter("RefTypeList", "longtext", 10, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(refTypeListParameter1);
+            var refTypeIListParameter1 = new StoreStoredProcedureParameter("RefTypeIList", "longtext", 11, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(refTypeIListParameter1);
+            var refTypeArrayParameter1 = new StoreStoredProcedureParameter("RefTypeArray", "longtext", 12, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(refTypeArrayParameter1);
+            var refTypeEnumerableParameter1 = new StoreStoredProcedureParameter("RefTypeEnumerable", "longtext", 13, derived_InsertStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_InsertStoreSproc.AddParameter(refTypeEnumerableParameter1);
+            var derivedEnumFunctionColumn = new StoreStoredProcedureResultColumn("DerivedEnum", "int", 0, derived_InsertStoreSproc);
+            derived_InsertStoreSproc.AddResultColumn(derivedEnumFunctionColumn);
+            derived_InsertStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalDerived.GetInsertStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("Derived_Insert", "TPC"), derived_InsertStoreSproc);
+            var derived_InsertISproc = (IRuntimeStoredProcedure)principalDerived.GetInsertStoredProcedure()!;
+            var derived_InsertSprocMapping = new StoredProcedureMapping(principalDerived, derived_InsertStoreSproc, (IRuntimeStoredProcedure)principalDerived.GetInsertStoredProcedure()!, principalDerivedTableMapping, null);
+            derived_InsertStoreSproc.AddTypeMapping(derived_InsertSprocMapping, false);
+            insertSprocMappings0.Add(derived_InsertSprocMapping);
+            principalDerivedTableMapping.InsertStoredProcedureMapping = derived_InsertSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(idParameter0, derived_InsertISproc.FindParameter("Id")!, principalDerived.FindProperty("Id")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter1, derived_InsertISproc.FindParameter("Enum2")!, principalDerived.FindProperty("Enum2")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter1, derived_InsertISproc.FindParameter("FlagsEnum1")!, principalDerived.FindProperty("FlagsEnum1")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter1, derived_InsertISproc.FindParameter("FlagsEnum2")!, principalDerived.FindProperty("FlagsEnum2")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter1, derived_InsertISproc.FindParameter("PrincipalBaseId")!, principalDerived.FindProperty("PrincipalBaseId")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalDerivedIdParameter1, derived_InsertISproc.FindParameter("PrincipalDerivedId")!, principalDerived.FindProperty("PrincipalDerivedId")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter1, derived_InsertISproc.FindParameter("RefTypeArray")!, principalDerived.FindProperty("RefTypeArray")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter1, derived_InsertISproc.FindParameter("RefTypeEnumerable")!, principalDerived.FindProperty("RefTypeEnumerable")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter1, derived_InsertISproc.FindParameter("RefTypeIList")!, principalDerived.FindProperty("RefTypeIList")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter1, derived_InsertISproc.FindParameter("RefTypeList")!, principalDerived.FindProperty("RefTypeList")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter1, derived_InsertISproc.FindParameter("ValueTypeArray")!, principalDerived.FindProperty("ValueTypeArray")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter1, derived_InsertISproc.FindParameter("ValueTypeEnumerable")!, principalDerived.FindProperty("ValueTypeEnumerable")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter1, derived_InsertISproc.FindParameter("ValueTypeIList")!, principalDerived.FindProperty("ValueTypeIList")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter1, derived_InsertISproc.FindParameter("ValueTypeList")!, principalDerived.FindProperty("ValueTypeList")!, derived_InsertSprocMapping);
+            RelationalModel.CreateStoredProcedureResultColumnMapping(derivedEnumFunctionColumn, derived_InsertISproc.FindResultColumn("DerivedEnum")!, principalDerived.FindProperty("Enum1")!, derived_InsertSprocMapping);
+
+            var updateSprocMappings0 = new List<StoredProcedureMapping>();
+            principalDerived.SetRuntimeAnnotation("Relational:UpdateStoredProcedureMappings", updateSprocMappings0);
+            var derived_UpdateStoreSproc = new StoreStoredProcedure("Derived_Update", "Derived", relationalModel);
+            var principalBaseIdParameter2 = new StoreStoredProcedureParameter("PrincipalBaseId", "bigint", 0, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(principalBaseIdParameter2);
+            var principalDerivedIdParameter2 = new StoreStoredProcedureParameter("PrincipalDerivedId", "bigint", 1, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(principalDerivedIdParameter2);
+            var enum1Parameter0 = new StoreStoredProcedureParameter("Enum1", "int", 2, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            derived_UpdateStoreSproc.AddParameter(enum1Parameter0);
+            var enum2Parameter2 = new StoreStoredProcedureParameter("Enum2", "int", 3, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(enum2Parameter2);
+            var flagsEnum1Parameter2 = new StoreStoredProcedureParameter("FlagsEnum1", "int", 4, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            derived_UpdateStoreSproc.AddParameter(flagsEnum1Parameter2);
+            var flagsEnum2Parameter2 = new StoreStoredProcedureParameter("FlagsEnum2", "int", 5, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            derived_UpdateStoreSproc.AddParameter(flagsEnum2Parameter2);
+            var valueTypeListParameter2 = new StoreStoredProcedureParameter("ValueTypeList", "longtext", 6, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(valueTypeListParameter2);
+            var valueTypeIListParameter2 = new StoreStoredProcedureParameter("ValueTypeIList", "longtext", 7, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(valueTypeIListParameter2);
+            var valueTypeArrayParameter2 = new StoreStoredProcedureParameter("ValueTypeArray", "longtext", 8, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(valueTypeArrayParameter2);
+            var valueTypeEnumerableParameter2 = new StoreStoredProcedureParameter("ValueTypeEnumerable", "longtext", 9, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(valueTypeEnumerableParameter2);
+            var refTypeListParameter2 = new StoreStoredProcedureParameter("RefTypeList", "longtext", 10, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(refTypeListParameter2);
+            var refTypeIListParameter2 = new StoreStoredProcedureParameter("RefTypeIList", "longtext", 11, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(refTypeIListParameter2);
+            var refTypeArrayParameter2 = new StoreStoredProcedureParameter("RefTypeArray", "longtext", 12, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(refTypeArrayParameter2);
+            var refTypeEnumerableParameter2 = new StoreStoredProcedureParameter("RefTypeEnumerable", "longtext", 13, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input)
+            {
+                IsNullable = true
+            };
+            derived_UpdateStoreSproc.AddParameter(refTypeEnumerableParameter2);
+            var id_OriginalParameter2 = new StoreStoredProcedureParameter("Id_Original", "bigint", 14, derived_UpdateStoreSproc, System.Data.ParameterDirection.Input);
+            derived_UpdateStoreSproc.AddParameter(id_OriginalParameter2);
+            derived_UpdateStoreSproc.AddStoredProcedure((IRuntimeStoredProcedure)principalDerived.GetUpdateStoredProcedure()!);
+            relationalModel.StoredProcedures.Add(("Derived_Update", "Derived"), derived_UpdateStoreSproc);
+            var derived_UpdateUSproc = (IRuntimeStoredProcedure)principalDerived.GetUpdateStoredProcedure()!;
+            var derived_UpdateSprocMapping = new StoredProcedureMapping(principalDerived, derived_UpdateStoreSproc, (IRuntimeStoredProcedure)principalDerived.GetUpdateStoredProcedure()!, principalDerivedTableMapping, null);
+            derived_UpdateStoreSproc.AddTypeMapping(derived_UpdateSprocMapping, false);
+            updateSprocMappings0.Add(derived_UpdateSprocMapping);
+            principalDerivedTableMapping.UpdateStoredProcedureMapping = derived_UpdateSprocMapping;
+            RelationalModel.CreateStoredProcedureParameterMapping(id_OriginalParameter2, derived_UpdateUSproc.FindParameter("Id_Original")!, principalDerived.FindProperty("Id")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum1Parameter0, derived_UpdateUSproc.FindParameter("Enum1")!, principalDerived.FindProperty("Enum1")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(enum2Parameter2, derived_UpdateUSproc.FindParameter("Enum2")!, principalDerived.FindProperty("Enum2")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum1Parameter2, derived_UpdateUSproc.FindParameter("FlagsEnum1")!, principalDerived.FindProperty("FlagsEnum1")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(flagsEnum2Parameter2, derived_UpdateUSproc.FindParameter("FlagsEnum2")!, principalDerived.FindProperty("FlagsEnum2")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalBaseIdParameter2, derived_UpdateUSproc.FindParameter("PrincipalBaseId")!, principalDerived.FindProperty("PrincipalBaseId")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(principalDerivedIdParameter2, derived_UpdateUSproc.FindParameter("PrincipalDerivedId")!, principalDerived.FindProperty("PrincipalDerivedId")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeArrayParameter2, derived_UpdateUSproc.FindParameter("RefTypeArray")!, principalDerived.FindProperty("RefTypeArray")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeEnumerableParameter2, derived_UpdateUSproc.FindParameter("RefTypeEnumerable")!, principalDerived.FindProperty("RefTypeEnumerable")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeIListParameter2, derived_UpdateUSproc.FindParameter("RefTypeIList")!, principalDerived.FindProperty("RefTypeIList")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(refTypeListParameter2, derived_UpdateUSproc.FindParameter("RefTypeList")!, principalDerived.FindProperty("RefTypeList")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeArrayParameter2, derived_UpdateUSproc.FindParameter("ValueTypeArray")!, principalDerived.FindProperty("ValueTypeArray")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeEnumerableParameter2, derived_UpdateUSproc.FindParameter("ValueTypeEnumerable")!, principalDerived.FindProperty("ValueTypeEnumerable")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeIListParameter2, derived_UpdateUSproc.FindParameter("ValueTypeIList")!, principalDerived.FindProperty("ValueTypeIList")!, derived_UpdateSprocMapping);
+            RelationalModel.CreateStoredProcedureParameterMapping(valueTypeListParameter2, derived_UpdateUSproc.FindParameter("ValueTypeList")!, principalDerived.FindProperty("ValueTypeList")!, derived_UpdateSprocMapping);
+            var fK_DependentBasebyte_PrincipalDerived_PrincipalId = new ForeignKeyConstraint(
+                "FK_DependentBase<byte?>_PrincipalDerived_PrincipalId", dependentBasebyteTable, principalDerivedTable,
+                new[] { principalIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK_PrincipalDerived")!, ReferentialAction.NoAction);
+            var fK_DependentBasebyte_PrincipalDerived_PrincipalIdFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                new[] { "PrincipalId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id" });
+            fK_DependentBasebyte_PrincipalDerived_PrincipalId.MappedForeignKeys.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalIdFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_DependentBasebyte_PrincipalDerived_PrincipalIdFk).Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId);
+            dependentBasebyteTable.ForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_DependentBasebyte_PrincipalDerived_PrincipalId);
+            var fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas = new ForeignKeyConstraint(
+                "FK_PrincipalBase_PrincipalDerived_PrincipalDerived<DependentBas~", principalBaseTable, principalDerivedTable,
+                new[] { principalDerivedDependentBasebyteIdColumn },
+                principalDerivedTable.FindUniqueConstraint("PK_PrincipalDerived")!, ReferentialAction.NoAction);
+            var fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBasFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalDerivedId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id" });
+            fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas.MappedForeignKeys.Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBasFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBasFk).Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas);
+            principalBaseTable.ForeignKeyConstraints.Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalBase_PrincipalDerived_PrincipalDerivedDependentBas);
+            var fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent = new ForeignKeyConstraint(
+                "FK_PrincipalDerived_PrincipalDerived_PrincipalDerived<Dependent~", principalDerivedTable, principalDerivedTable,
+                new[] { principalDerivedDependentBasebyteIdColumn0 },
+                principalDerivedTable.FindUniqueConstraint("PK_PrincipalDerived")!, ReferentialAction.NoAction);
+            var fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependentFk = RelationalModel.GetForeignKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                new[] { "PrincipalDerivedId" },
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                new[] { "Id" });
+            fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent.MappedForeignKeys.Add(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependentFk);
+            RelationalModel.GetOrCreateForeignKeyConstraints(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependentFk).Add(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent);
+            principalDerivedTable.ForeignKeyConstraints.Add(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent);
+            principalDerivedTable.ReferencingForeignKeyConstraints.Add(fK_PrincipalDerived_PrincipalDerived_PrincipalDerivedDependent);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DependentBaseEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DependentBaseEntityType.cs
new file mode 100644
index 000000000..2e99234fb
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/DependentBaseEntityType.cs
@@ -0,0 +1,120 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class DependentBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>",
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                baseEntityType,
+                propertyCount: 2,
+                navigationCount: 1,
+                foreignKeyCount: 1,
+                unnamedIndexCount: 1,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(byte?),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Id", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            id.TypeMapping = MySqlByteTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)),
+                keyComparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)),
+                providerValueComparer: new ValueComparer<byte?>(
+                    (Nullable<byte> v1, Nullable<byte> v2) => v1.HasValue && v2.HasValue && (byte)v1 == (byte)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<byte> v) => v.HasValue ? (int)(byte)v : 0,
+                    (Nullable<byte> v) => v.HasValue ? (Nullable<byte>)(byte)v : default(Nullable<byte>)));
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalId = runtimeEntityType.AddProperty(
+                "PrincipalId",
+                typeof(long?),
+                nullable: true);
+            principalId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                keyComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                providerValueComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+            principalId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalId },
+                unique: true);
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType,
+                deleteBehavior: DeleteBehavior.ClientCascade,
+                unique: true,
+                requiredDependent: true);
+
+            var principal = declaringEntityType.AddNavigation("Principal",
+                runtimeForeignKey,
+                onDependent: true,
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                propertyInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetProperty("Principal", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.DependentBase<byte?>).GetField("<Principal>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            var dependent = principalEntityType.AddNavigation("Dependent",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(CompiledModelTestBase.DependentBase<byte?>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Dependent", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Dependent>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", "TPC");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "DependentBase<byte?>");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalBaseEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalBaseEntityType.cs
new file mode 100644
index 000000000..aabaeb898
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalBaseEntityType.cs
@@ -0,0 +1,762 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Json;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class PrincipalBaseEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalBase",
+                typeof(CompiledModelTestBase.PrincipalBase),
+                baseEntityType,
+                discriminatorValue: "PrincipalBase",
+                derivedTypesCount: 1,
+                propertyCount: 15,
+                navigationCount: 1,
+                foreignKeyCount: 2,
+                unnamedIndexCount: 1,
+                namedIndexCount: 1,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(long?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Id>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                afterSaveBehavior: PropertySaveBehavior.Throw);
+            id.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                keyComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                providerValueComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+
+            var overrides = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var idPrincipalBaseView = new RuntimeRelationalPropertyOverrides(
+                id,
+                StoreObjectIdentifier.View("PrincipalBaseView", "TPC"),
+                false,
+                null);
+            idPrincipalBaseView.AddAnnotation("foo", "bar2");
+            overrides.Add(StoreObjectIdentifier.View("PrincipalBaseView", "TPC"), idPrincipalBaseView);
+            id.AddAnnotation("Relational:RelationalOverrides", overrides);
+
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var enum1 = runtimeEntityType.AddProperty(
+                "Enum1",
+                typeof(CompiledModelTestBase.AnEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                valueGenerated: ValueGenerated.OnAdd);
+            enum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AnEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AnEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
+                    (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AnEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AnEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    (CompiledModelTestBase.AnEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AnEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        (CompiledModelTestBase.AnEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AnEnum)value)));
+            enum1.SetSentinelFromProviderValue(1);
+
+            var overrides0 = new StoreObjectDictionary<RuntimeRelationalPropertyOverrides>();
+            var enum1Derived_Insert = new RuntimeRelationalPropertyOverrides(
+                enum1,
+                StoreObjectIdentifier.InsertStoredProcedure("Derived_Insert", "TPC"),
+                true,
+                "DerivedEnum");
+            overrides0.Add(StoreObjectIdentifier.InsertStoredProcedure("Derived_Insert", "TPC"), enum1Derived_Insert);
+            enum1.AddAnnotation("Relational:RelationalOverrides", overrides0);
+
+            enum1.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+            enum1.AddAnnotation("Relational:DefaultValue", CompiledModelTestBase.AnEnum.A);
+
+            var enum2 = runtimeEntityType.AddProperty(
+                "Enum2",
+                typeof(CompiledModelTestBase.AnEnum?),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Enum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Enum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            enum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AnEnum?>(
+                    (Nullable<CompiledModelTestBase.AnEnum> v1, Nullable<CompiledModelTestBase.AnEnum> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.AnEnum)v1, (object)(CompiledModelTestBase.AnEnum)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? ((CompiledModelTestBase.AnEnum)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? (Nullable<CompiledModelTestBase.AnEnum>)(CompiledModelTestBase.AnEnum)v : default(Nullable<CompiledModelTestBase.AnEnum>)),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum?>(
+                    (Nullable<CompiledModelTestBase.AnEnum> v1, Nullable<CompiledModelTestBase.AnEnum> v2) => v1.HasValue && v2.HasValue && object.Equals((object)(CompiledModelTestBase.AnEnum)v1, (object)(CompiledModelTestBase.AnEnum)v2) || !v1.HasValue && !v2.HasValue,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? ((CompiledModelTestBase.AnEnum)v).GetHashCode() : 0,
+                    (Nullable<CompiledModelTestBase.AnEnum> v) => v.HasValue ? (Nullable<CompiledModelTestBase.AnEnum>)(CompiledModelTestBase.AnEnum)v : default(Nullable<CompiledModelTestBase.AnEnum>)),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                    (CompiledModelTestBase.AnEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AnEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AnEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AnEnum, int>(
+                        (CompiledModelTestBase.AnEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AnEnum)value)));
+            enum2.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var flagsEnum1 = runtimeEntityType.AddProperty(
+                "FlagsEnum1",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum1", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum1>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AFlagsEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AFlagsEnum)value)));
+            flagsEnum1.SetSentinelFromProviderValue(0);
+            flagsEnum1.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var flagsEnum2 = runtimeEntityType.AddProperty(
+                "FlagsEnum2",
+                typeof(CompiledModelTestBase.AFlagsEnum),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("FlagsEnum2", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<FlagsEnum2>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+            flagsEnum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
+                    (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals((object)v1, (object)v2),
+                    (CompiledModelTestBase.AFlagsEnum v) => v.GetHashCode(),
+                    (CompiledModelTestBase.AFlagsEnum v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                converter: new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                    (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                    (int value) => (CompiledModelTestBase.AFlagsEnum)value),
+                jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.AFlagsEnum, int>(
+                    JsonInt32ReaderWriter.Instance,
+                    new ValueConverter<CompiledModelTestBase.AFlagsEnum, int>(
+                        (CompiledModelTestBase.AFlagsEnum value) => (int)value,
+                        (int value) => (CompiledModelTestBase.AFlagsEnum)value)));
+            flagsEnum2.SetSentinelFromProviderValue(0);
+            flagsEnum2.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalBaseId = runtimeEntityType.AddProperty(
+                "PrincipalBaseId",
+                typeof(long?),
+                nullable: true);
+            principalBaseId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                keyComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                providerValueComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+            principalBaseId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var principalDerivedId = runtimeEntityType.AddProperty(
+                "PrincipalDerivedId",
+                typeof(long?),
+                nullable: true);
+            principalDerivedId.TypeMapping = MySqlLongTypeMapping.Default.Clone(
+                comparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                keyComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)),
+                providerValueComparer: new ValueComparer<long?>(
+                    (Nullable<long> v1, Nullable<long> v2) => v1.HasValue && v2.HasValue && (long)v1 == (long)v2 || !v1.HasValue && !v2.HasValue,
+                    (Nullable<long> v) => v.HasValue ? ((long)v).GetHashCode() : 0,
+                    (Nullable<long> v) => v.HasValue ? (Nullable<long>)(long)v : default(Nullable<long>)));
+            principalDerivedId.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeArray = runtimeEntityType.AddProperty(
+                "RefTypeArray",
+                typeof(IPAddress[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IPAddress[], IPAddress[], IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeEnumerable = runtimeEntityType.AddProperty(
+                "RefTypeEnumerable",
+                typeof(IEnumerable<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeIList = runtimeEntityType.AddProperty(
+                "RefTypeIList",
+                typeof(IList<string>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                keyComparer: new ListComparer<string>(new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<string>(new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<string>, List<string>, string>(
+                    JsonStringReaderWriter.Instance),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    keyComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "longtext"),
+                    storeTypePostfix: StoreTypePostfix.None));
+            refTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var refTypeList = runtimeEntityType.AddProperty(
+                "RefTypeList",
+                typeof(List<IPAddress>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("RefTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<RefTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            refTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                keyComparer: new ListComparer<IPAddress>(new ValueComparer<IPAddress>(
+                    (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                    (IPAddress v) => v.GetHashCode(),
+                    (IPAddress v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<IPAddress>(new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v))))),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<IPAddress>, List<IPAddress>, IPAddress>(
+                    new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))),
+                elementMapping: MySqlStringTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    keyComparer: new ValueComparer<IPAddress>(
+                        (IPAddress v1, IPAddress v2) => v1 == null && v2 == null || v1 != null && v2 != null && v1.Equals(v2),
+                        (IPAddress v) => v.GetHashCode(),
+                        (IPAddress v) => v),
+                    providerValueComparer: new ValueComparer<string>(
+                        (string v1, string v2) => v1 == v2,
+                        (string v) => v.GetHashCode(),
+                        (string v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "varchar(45)",
+                        size: 45),
+                    converter: new ValueConverter<IPAddress, string>(
+                        (IPAddress v) => v.ToString(),
+                        (string v) => IPAddress.Parse(v)),
+                    jsonValueReaderWriter: new JsonConvertedValueReaderWriter<IPAddress, string>(
+                        JsonStringReaderWriter.Instance,
+                        new ValueConverter<IPAddress, string>(
+                            (IPAddress v) => v.ToString(),
+                            (string v) => IPAddress.Parse(v)))));
+            refTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeArray = runtimeEntityType.AddProperty(
+                "ValueTypeArray",
+                typeof(DateTime[]),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeArray", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeArray>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeArray.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                keyComparer: new ListComparer<DateTime>(new ValueComparer<DateTime>(
+                    (DateTime v1, DateTime v2) => v1.Equals(v2),
+                    (DateTime v) => v.GetHashCode(),
+                    (DateTime v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<DateTime>(new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<DateTime[], DateTime[], DateTime>(
+                    JsonDateTimeReaderWriter.Instance),
+                elementMapping: MySqlDateTimeTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    keyComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    providerValueComparer: new ValueComparer<DateTime>(
+                        (DateTime v1, DateTime v2) => v1.Equals(v2),
+                        (DateTime v) => v.GetHashCode(),
+                        (DateTime v) => v),
+                    mappingInfo: new RelationalTypeMappingInfo(
+                        storeTypeName: "datetime(6)",
+                        precision: 6)));
+            valueTypeArray.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeEnumerable = runtimeEntityType.AddProperty(
+                "ValueTypeEnumerable",
+                typeof(IEnumerable<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeEnumerable", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeEnumerable>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeEnumerable.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IEnumerable<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeEnumerable.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeIList = runtimeEntityType.AddProperty(
+                "ValueTypeIList",
+                typeof(IList<byte>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeIList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeIList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeIList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                keyComparer: new ListComparer<byte>(new ValueComparer<byte>(
+                    (byte v1, byte v2) => v1 == v2,
+                    (byte v) => (int)v,
+                    (byte v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<byte>(new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<IList<byte>, List<byte>, byte>(
+                    JsonByteReaderWriter.Instance),
+                elementMapping: MySqlByteTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    keyComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v),
+                    providerValueComparer: new ValueComparer<byte>(
+                        (byte v1, byte v2) => v1 == v2,
+                        (byte v) => (int)v,
+                        (byte v) => v)));
+            valueTypeIList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var valueTypeList = runtimeEntityType.AddProperty(
+                "ValueTypeList",
+                typeof(List<short>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("ValueTypeList", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<ValueTypeList>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            valueTypeList.TypeMapping = MySqlStringTypeMapping.Default.Clone(
+                comparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                keyComparer: new ListComparer<short>(new ValueComparer<short>(
+                    (short v1, short v2) => v1 == v2,
+                    (short v) => (int)v,
+                    (short v) => v)),
+                providerValueComparer: new ValueComparer<string>(
+                    (string v1, string v2) => v1 == v2,
+                    (string v) => v.GetHashCode(),
+                    (string v) => v),
+                mappingInfo: new RelationalTypeMappingInfo(
+                    storeTypeName: "longtext"),
+                converter: new CollectionToJsonStringConverter<short>(new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance)),
+                storeTypePostfix: StoreTypePostfix.None,
+                jsonValueReaderWriter: new JsonCollectionReaderWriter<List<short>, List<short>, short>(
+                    JsonInt16ReaderWriter.Instance),
+                elementMapping: MySqlShortTypeMapping.Default.Clone(
+                    comparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    keyComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v),
+                    providerValueComparer: new ValueComparer<short>(
+                        (short v1, short v2) => v1 == v2,
+                        (short v) => (int)v,
+                        (short v) => v)));
+            valueTypeList.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var index = runtimeEntityType.AddIndex(
+                new[] { principalDerivedId });
+
+            var principalIndex = runtimeEntityType.AddIndex(
+                new[] { principalBaseId },
+                name: "PrincipalIndex",
+                unique: true);
+            principalIndex.AddAnnotation("Relational:Filter", "AlternateId <> NULL");
+            principalIndex.AddAnnotation("Relational:Name", "PIX");
+
+            return runtimeEntityType;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey1(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalBaseId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var deriveds = principalEntityType.AddNavigation("Deriveds",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalBase).GetProperty("Deriveds", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalBase).GetField("<Deriveds>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEntityType, RuntimeEntityType principalEntityType)
+        {
+            var runtimeForeignKey = declaringEntityType.AddForeignKey(new[] { declaringEntityType.FindProperty("PrincipalDerivedId") },
+                principalEntityType.FindKey(new[] { principalEntityType.FindProperty("Id") }),
+                principalEntityType);
+
+            var principals = principalEntityType.AddNavigation("Principals",
+                runtimeForeignKey,
+                onDependent: false,
+                typeof(ICollection<CompiledModelTestBase.PrincipalBase>),
+                propertyInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetProperty("Principals", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>).GetField("<Principals>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+            return runtimeForeignKey;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var insertSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Insert",
+                "TPC",
+                false);
+
+            var id = insertSproc.AddParameter(
+                "Id", System.Data.ParameterDirection.Input, false, "Id", false);
+            var principalBaseId = insertSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var principalDerivedId = insertSproc.AddParameter(
+                "PrincipalDerivedId", System.Data.ParameterDirection.Input, false, "PrincipalDerivedId", false);
+            var enum2 = insertSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum1 = insertSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum2 = insertSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList = insertSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList = insertSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray = insertSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable = insertSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList = insertSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList = insertSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray = insertSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable = insertSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var enum1 = insertSproc.AddParameter(
+                "BaseEnum", System.Data.ParameterDirection.Output, false, "Enum1", false);
+            enum1.AddAnnotation("foo", "bar");
+            insertSproc.AddAnnotation("foo", "bar1");
+            runtimeEntityType.AddAnnotation("Relational:InsertStoredProcedure", insertSproc);
+
+            var deleteSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Delete",
+                "TPC",
+                true);
+
+            var id0 = deleteSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:DeleteStoredProcedure", deleteSproc);
+
+            var updateSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "PrincipalBase_Update",
+                "TPC",
+                false);
+
+            var principalBaseId0 = updateSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var principalDerivedId0 = updateSproc.AddParameter(
+                "PrincipalDerivedId", System.Data.ParameterDirection.Input, false, "PrincipalDerivedId", false);
+            var enum10 = updateSproc.AddParameter(
+                "Enum1", System.Data.ParameterDirection.Input, false, "Enum1", false);
+            var enum20 = updateSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum10 = updateSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum20 = updateSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList0 = updateSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList0 = updateSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray0 = updateSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable0 = updateSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList0 = updateSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList0 = updateSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray0 = updateSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable0 = updateSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var id1 = updateSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:UpdateStoredProcedure", updateSproc);
+
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:MappingStrategy", "TPC");
+            runtimeEntityType.AddAnnotation("Relational:Schema", "TPC");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalBase");
+            runtimeEntityType.AddAnnotation("Relational:ViewDefinitionSql", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", "PrincipalBaseView");
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", "TPC");
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalDerivedEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalDerivedEntityType.cs
new file mode 100644
index 000000000..7f65e1ce5
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalDerivedEntityType.cs
@@ -0,0 +1,129 @@
+// <auto-generated />
+using System;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class PrincipalDerivedEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+PrincipalDerived<Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+DependentBase<byte?>>",
+                typeof(CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>),
+                baseEntityType,
+                discriminatorValue: "PrincipalDerived<DependentBase<byte?>>",
+                propertyCount: 0,
+                navigationCount: 2);
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            var insertSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "Derived_Insert",
+                "TPC",
+                false);
+
+            var id = insertSproc.AddParameter(
+                "Id", System.Data.ParameterDirection.Input, false, "Id", false);
+            var principalBaseId = insertSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var principalDerivedId = insertSproc.AddParameter(
+                "PrincipalDerivedId", System.Data.ParameterDirection.Input, false, "PrincipalDerivedId", false);
+            var enum2 = insertSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum1 = insertSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum2 = insertSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList = insertSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList = insertSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray = insertSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable = insertSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList = insertSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList = insertSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray = insertSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable = insertSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var derivedEnum = insertSproc.AddResultColumn(
+                "DerivedEnum", false, "Enum1");
+            derivedEnum.AddAnnotation("foo", "bar3");
+            runtimeEntityType.AddAnnotation("Relational:InsertStoredProcedure", insertSproc);
+
+            var deleteSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "Derived_Delete",
+                "TPC",
+                false);
+
+            var id0 = deleteSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:DeleteStoredProcedure", deleteSproc);
+
+            var updateSproc = new RuntimeStoredProcedure(
+                runtimeEntityType,
+                "Derived_Update",
+                "Derived",
+                false);
+
+            var principalBaseId0 = updateSproc.AddParameter(
+                "PrincipalBaseId", System.Data.ParameterDirection.Input, false, "PrincipalBaseId", false);
+            var principalDerivedId0 = updateSproc.AddParameter(
+                "PrincipalDerivedId", System.Data.ParameterDirection.Input, false, "PrincipalDerivedId", false);
+            var enum1 = updateSproc.AddParameter(
+                "Enum1", System.Data.ParameterDirection.Input, false, "Enum1", false);
+            var enum20 = updateSproc.AddParameter(
+                "Enum2", System.Data.ParameterDirection.Input, false, "Enum2", false);
+            var flagsEnum10 = updateSproc.AddParameter(
+                "FlagsEnum1", System.Data.ParameterDirection.Input, false, "FlagsEnum1", false);
+            var flagsEnum20 = updateSproc.AddParameter(
+                "FlagsEnum2", System.Data.ParameterDirection.Input, false, "FlagsEnum2", false);
+            var valueTypeList0 = updateSproc.AddParameter(
+                "ValueTypeList", System.Data.ParameterDirection.Input, false, "ValueTypeList", false);
+            var valueTypeIList0 = updateSproc.AddParameter(
+                "ValueTypeIList", System.Data.ParameterDirection.Input, false, "ValueTypeIList", false);
+            var valueTypeArray0 = updateSproc.AddParameter(
+                "ValueTypeArray", System.Data.ParameterDirection.Input, false, "ValueTypeArray", false);
+            var valueTypeEnumerable0 = updateSproc.AddParameter(
+                "ValueTypeEnumerable", System.Data.ParameterDirection.Input, false, "ValueTypeEnumerable", false);
+            var refTypeList0 = updateSproc.AddParameter(
+                "RefTypeList", System.Data.ParameterDirection.Input, false, "RefTypeList", false);
+            var refTypeIList0 = updateSproc.AddParameter(
+                "RefTypeIList", System.Data.ParameterDirection.Input, false, "RefTypeIList", false);
+            var refTypeArray0 = updateSproc.AddParameter(
+                "RefTypeArray", System.Data.ParameterDirection.Input, false, "RefTypeArray", false);
+            var refTypeEnumerable0 = updateSproc.AddParameter(
+                "RefTypeEnumerable", System.Data.ParameterDirection.Input, false, "RefTypeEnumerable", false);
+            var id1 = updateSproc.AddParameter(
+                "Id_Original", System.Data.ParameterDirection.Input, false, "Id", true);
+            runtimeEntityType.AddAnnotation("Relational:UpdateStoredProcedure", updateSproc);
+
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", "TPC");
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "PrincipalDerived");
+            runtimeEntityType.AddAnnotation("Relational:ViewDefinitionSql", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewName", "PrincipalDerivedView");
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", "TPC");
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DataEntityType.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DataEntityType.cs
new file mode 100644
index 000000000..570d25fc9
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DataEntityType.cs
@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using System.Collections;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Pomelo.EntityFrameworkCore.MySql.Storage.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    internal partial class DataEntityType
+    {
+        public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+        {
+            var runtimeEntityType = model.AddEntityType(
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                typeof(CompiledModelTestBase.Data),
+                baseEntityType,
+                propertyCount: 2,
+                keyCount: 1);
+
+            var id = runtimeEntityType.AddProperty(
+                "Id",
+                typeof(int),
+                valueGenerated: ValueGenerated.OnAdd,
+                afterSaveBehavior: PropertySaveBehavior.Throw,
+                sentinel: 0);
+            id.TypeMapping = MySqlIntTypeMapping.Default.Clone(
+                comparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                keyComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v),
+                providerValueComparer: new ValueComparer<int>(
+                    (int v1, int v2) => v1 == v2,
+                    (int v) => v,
+                    (int v) => v));
+            id.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            var blob = runtimeEntityType.AddProperty(
+                "Blob",
+                typeof(byte[]),
+                propertyInfo: typeof(CompiledModelTestBase.Data).GetProperty("Blob", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                fieldInfo: typeof(CompiledModelTestBase.Data).GetField("<Blob>k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+                nullable: true);
+            blob.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
+                comparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => v.GetHashCode(),
+                    (Byte[] v) => v),
+                keyComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()),
+                providerValueComparer: new ValueComparer<byte[]>(
+                    (Byte[] v1, Byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals((object)v1, (object)v2),
+                    (Byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode((object)v),
+                    (Byte[] source) => source.ToArray()));
+            blob.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
+
+            var key = runtimeEntityType.AddKey(
+                new[] { id });
+            runtimeEntityType.SetPrimaryKey(key);
+
+            var trigger1 = runtimeEntityType.AddTrigger(
+                "Trigger1");
+
+            var trigger2 = runtimeEntityType.AddTrigger(
+                "Trigger2");
+
+            return runtimeEntityType;
+        }
+
+        public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+        {
+            runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+            runtimeEntityType.AddAnnotation("Relational:Schema", null);
+            runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+            runtimeEntityType.AddAnnotation("Relational:TableName", "Data");
+            runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+            runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+            Customize(runtimeEntityType);
+        }
+
+        static partial void Customize(RuntimeEntityType runtimeEntityType);
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModel.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModel.cs
new file mode 100644
index 000000000..583ee4d90
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModel.cs
@@ -0,0 +1,48 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    [DbContext(typeof(DbContext))]
+    public partial class DbContextModel : RuntimeModel
+    {
+        private static readonly bool _useOldBehavior31751 =
+            System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+        static DbContextModel()
+        {
+            var model = new DbContextModel();
+
+            if (_useOldBehavior31751)
+            {
+                model.Initialize();
+            }
+            else
+            {
+                var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+                thread.Start();
+                thread.Join();
+
+                void RunInitialization()
+                {
+                    model.Initialize();
+                }
+            }
+
+            model.Customize();
+            _instance = (DbContextModel)model.FinalizeModel();
+        }
+
+        private static DbContextModel _instance;
+        public static IModel Instance => _instance;
+
+        partial void Initialize();
+
+        partial void Customize();
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModelBuilder.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModelBuilder.cs
new file mode 100644
index 000000000..9ab909e3e
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/Triggers/DbContextModelBuilder.cs
@@ -0,0 +1,84 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace TestNamespace
+{
+    public partial class DbContextModel
+    {
+        private DbContextModel()
+            : base(skipDetectChanges: false, modelId: new Guid("00000000-0000-0000-0000-000000000000"), entityTypeCount: 1)
+        {
+        }
+
+        partial void Initialize()
+        {
+            var data = DataEntityType.Create(this);
+
+            DataEntityType.CreateAnnotations(data);
+
+            AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+            AddAnnotation("Relational:MaxIdentifierLength", 64);
+            AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel());
+        }
+
+        private IRelationalModel CreateRelationalModel()
+        {
+            var relationalModel = new RelationalModel(this);
+
+            var data = FindEntityType("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data")!;
+
+            var defaultTableMappings = new List<TableMappingBase<ColumnMappingBase>>();
+            data.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase = new TableBase("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", null, relationalModel);
+            var blobColumnBase = new ColumnBase<ColumnMappingBase>("Blob", "longblob", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase)
+            {
+                IsNullable = true
+            };
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Blob", blobColumnBase);
+            var idColumnBase = new ColumnBase<ColumnMappingBase>("Id", "int", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.Columns.Add("Id", idColumnBase);
+            relationalModel.DefaultTables.Add("Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase);
+            var microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase = new TableMappingBase<ColumnMappingBase>(data, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase, null);
+            microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataTableBase.AddTypeMapping(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase, false);
+            defaultTableMappings.Add(microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)idColumnBase, data.FindProperty("Id")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+            RelationalModel.CreateColumnMapping((ColumnBase<ColumnMappingBase>)blobColumnBase, data.FindProperty("Blob")!, microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseDataMappingBase);
+
+            var tableMappings = new List<TableMapping>();
+            data.SetRuntimeAnnotation("Relational:TableMappings", tableMappings);
+            var dataTable = new Table("Data", null, relationalModel);
+            var idColumn = new Column("Id", "int", dataTable);
+            dataTable.Columns.Add("Id", idColumn);
+            var blobColumn = new Column("Blob", "longblob", dataTable)
+            {
+                IsNullable = true
+            };
+            dataTable.Columns.Add("Blob", blobColumn);
+            var pK_Data = new UniqueConstraint("PK_Data", dataTable, new[] { idColumn });
+            dataTable.PrimaryKey = pK_Data;
+            var pK_DataUc = RelationalModel.GetKey(this,
+                "Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelTestBase+Data",
+                new[] { "Id" });
+            pK_Data.MappedKeys.Add(pK_DataUc);
+            RelationalModel.GetOrCreateUniqueConstraints(pK_DataUc).Add(pK_Data);
+            dataTable.UniqueConstraints.Add("PK_Data", pK_Data);
+            dataTable.Triggers.Add("Trigger1", data.FindDeclaredTrigger("Trigger1"));
+            dataTable.Triggers.Add("Trigger2", data.FindDeclaredTrigger("Trigger2"));
+            relationalModel.Tables.Add(("Data", null), dataTable);
+            var dataTableMapping = new TableMapping(data, dataTable, null);
+            dataTable.AddTypeMapping(dataTableMapping, false);
+            tableMappings.Add(dataTableMapping);
+            RelationalModel.CreateColumnMapping(idColumn, data.FindProperty("Id")!, dataTableMapping);
+            RelationalModel.CreateColumnMapping(blobColumn, data.FindProperty("Blob")!, dataTableMapping);
+            return relationalModel.MakeReadOnly();
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/CompiledModelMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/CompiledModelMySqlTest.cs
new file mode 100644
index 000000000..577ef5474
--- /dev/null
+++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/CompiledModelMySqlTest.cs
@@ -0,0 +1,385 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// ReSharper disable InconsistentNaming
+
+#nullable enable
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Text.RegularExpressions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Microsoft.EntityFrameworkCore.Scaffolding;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Microsoft.EntityFrameworkCore.TestUtilities;
+using Microsoft.Extensions.DependencyInjection;
+using NetTopologySuite.Geometries;
+using NetTopologySuite;
+using Pomelo.EntityFrameworkCore.MySql.Design.Internal;
+using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
+using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
+using Pomelo.EntityFrameworkCore.MySql.Internal;
+using Xunit;
+
+namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Scaffolding;
+
+// TODO: Add more Pomelo specific cases.
+public class CompiledModelMySqlTest : CompiledModelRelationalTestBase
+{
+    protected override void BuildBigModel(ModelBuilder modelBuilder, bool jsonColumns)
+    {
+        base.BuildBigModel(modelBuilder, jsonColumns);
+
+        modelBuilder.HasCharSet("latin1");
+        modelBuilder.UseCollation("latin1_general_ci");
+
+        modelBuilder.Entity<Data>(
+            eb =>
+            {
+                eb.HasCharSet("cp1250");
+
+                eb.Property<int>("Id");
+                eb.HasKey("Id");
+
+                eb.Property<Point>("Point")
+                    .HasSpatialReferenceSystem(4326);
+
+                eb.Property<string>("StringWithCharSet")
+                    .HasColumnType("varchar(128)")
+                    .HasDefaultValue("String having charset")
+                    .HasCharSet("ascii")
+                    .HasConversion<CastingConverter<string, string>, CustomValueComparer<string>, CustomValueComparer<string>>();
+
+                eb.Property<string>("StringWithCollation")
+                    .HasColumnType("varchar(128)")
+                    .HasDefaultValue("String using collation")
+                    .UseCollation("cp1250_general_ci")
+                    .HasConversion<CastingConverter<string, string>, CustomValueComparer<string>, CustomValueComparer<string>>();
+            });
+
+        modelBuilder.Entity<PrincipalBase>(
+            eb =>
+            {
+                eb.UseCollation("ascii_general_ci");
+
+                eb.Property<string>("StringWithCharSet")
+                    .HasColumnType("varchar(128)")
+                    .HasDefaultValue("String having charset")
+                    .HasCharSet("ascii")
+                    .HasConversion<CastingConverter<string, string>, CustomValueComparer<string>, CustomValueComparer<string>>();
+
+                eb.Property<string>("StringWithCollation")
+                    .HasColumnType("varchar(128)")
+                    .HasDefaultValue("String using collation")
+                    .UseCollation("cp1250_general_ci")
+                    .HasConversion<CastingConverter<string, string>, CustomValueComparer<string>, CustomValueComparer<string>>();
+
+                eb.Property<Point>("Point")
+                    .HasColumnType("geometry")
+                    .HasDefaultValue(
+                        NtsGeometryServices.Instance.CreateGeometryFactory(srid: 0).CreatePoint(new CoordinateZM(0, 0, 0, 0)))
+                    .HasConversion<CastingConverter<Point, Point>, CustomValueComparer<Point>, CustomValueComparer<Point>>();
+            });
+    }
+
+    protected override void AssertBigModel(IModel model, bool jsonColumns)
+    {
+        base.AssertBigModel(model, jsonColumns);
+
+        Assert.Equal(
+            CoreStrings.RuntimeModelMissingData,
+            Assert.Throws<InvalidOperationException>(model.GetCharSet).Message);
+        Assert.Equal(
+            CoreStrings.RuntimeModelMissingData,
+            Assert.Throws<InvalidOperationException>(() => model.GetCharSetDelegation()).Message);
+        Assert.Equal(
+            CoreStrings.RuntimeModelMissingData,
+            Assert.Throws<InvalidOperationException>(model.GetCollation).Message);
+        Assert.Equal(
+            CoreStrings.RuntimeModelMissingData,
+            Assert.Throws<InvalidOperationException>(() => model.GetCollationDelegation()).Message);
+
+        //
+        // Data:
+        //
+        {
+            var dataEntity = model.FindEntityType(typeof(Data))!;
+            Assert.Equal(typeof(Data).FullName, dataEntity.Name);
+            Assert.False(dataEntity.HasSharedClrType);
+            Assert.False(dataEntity.IsPropertyBag);
+            Assert.False(dataEntity.IsOwned());
+            Assert.IsType<ConstructorBinding>(dataEntity.ConstructorBinding);
+            Assert.Null(dataEntity.FindIndexerPropertyInfo());
+            Assert.Equal(ChangeTrackingStrategy.Snapshot, dataEntity.GetChangeTrackingStrategy());
+            Assert.Equal("Data", dataEntity.GetTableName());
+            Assert.Null(dataEntity.GetSchema());
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(dataEntity.GetCharSet).Message);
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(() => dataEntity.GetCharSetDelegation()).Message);
+
+            var pointProperty = dataEntity.FindProperty("Point")!;
+            Assert.Equal(typeof(Point), pointProperty.ClrType);
+            Assert.True(pointProperty.IsNullable);
+            Assert.Equal(ValueGenerated.Never, pointProperty.ValueGenerated);
+            Assert.Equal("Point", pointProperty.GetColumnName());
+            Assert.Equal("point", pointProperty.GetColumnType());
+            Assert.Null(pointProperty.GetValueConverter());
+            Assert.IsType<GeometryValueComparer<Point>>(pointProperty.GetValueComparer());
+            Assert.IsType<GeometryValueComparer<Point>>(pointProperty.GetKeyValueComparer());
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(() => pointProperty.GetSpatialReferenceSystem()).Message);
+
+            var stringWithCharSetProperty = dataEntity.FindProperty("StringWithCharSet")!;
+            Assert.Equal(typeof(string), stringWithCharSetProperty.ClrType);
+            Assert.True(stringWithCharSetProperty.IsNullable);
+            Assert.Equal(ValueGenerated.OnAdd, stringWithCharSetProperty.ValueGenerated);
+            Assert.Equal("StringWithCharSet", stringWithCharSetProperty.GetColumnName());
+            Assert.Equal("varchar(128)", stringWithCharSetProperty.GetColumnType());
+            Assert.Equal("String having charset", (string?)stringWithCharSetProperty.GetDefaultValue());
+            Assert.IsType<CastingConverter<string, string>>(stringWithCharSetProperty.GetValueConverter());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCharSetProperty.GetValueComparer());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCharSetProperty.GetKeyValueComparer());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCharSetProperty.GetProviderValueComparer());
+            Assert.Null(stringWithCharSetProperty[CoreAnnotationNames.PropertyAccessMode]);
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(stringWithCharSetProperty.GetCharSet).Message);
+
+            var stringWithCollationProperty = dataEntity.FindProperty("StringWithCollation")!;
+            Assert.Equal(typeof(string), stringWithCollationProperty.ClrType);
+            Assert.True(stringWithCollationProperty.IsNullable);
+            Assert.Equal(ValueGenerated.OnAdd, stringWithCollationProperty.ValueGenerated);
+            Assert.Equal("StringWithCollation", stringWithCollationProperty.GetColumnName());
+            Assert.Equal("varchar(128)", stringWithCollationProperty.GetColumnType());
+            Assert.Equal("String using collation", (string?)stringWithCollationProperty.GetDefaultValue());
+            Assert.IsType<CastingConverter<string, string>>(stringWithCollationProperty.GetValueConverter());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCollationProperty.GetValueComparer());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCollationProperty.GetKeyValueComparer());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCollationProperty.GetProviderValueComparer());
+            Assert.Null(stringWithCollationProperty[CoreAnnotationNames.PropertyAccessMode]);
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(stringWithCollationProperty.GetCollation).Message);
+        }
+
+        //
+        // PrincipalBase:
+        //
+        {
+            var principalBaseEntity = model.FindEntityType(typeof(PrincipalBase))!;
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(principalBaseEntity.GetCollation).Message);
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(() => principalBaseEntity.GetCollationDelegation()).Message);
+
+            var pointProperty = principalBaseEntity.FindProperty("Point")!;
+            Assert.Equal(typeof(Point), pointProperty.ClrType);
+            Assert.True(pointProperty.IsNullable);
+            Assert.Equal(ValueGenerated.OnAdd, pointProperty.ValueGenerated);
+            Assert.Equal("Point", pointProperty.GetColumnName());
+            Assert.Equal("geometry", pointProperty.GetColumnType());
+            Assert.Equal(0, ((Point)pointProperty.GetDefaultValue()!).SRID);
+            Assert.IsType<CastingConverter<Point, Point>>(pointProperty.GetValueConverter());
+            Assert.IsType<CustomValueComparer<Point>>(pointProperty.GetValueComparer());
+            Assert.IsType<CustomValueComparer<Point>>(pointProperty.GetKeyValueComparer());
+            Assert.IsType<CustomValueComparer<Point>>(pointProperty.GetProviderValueComparer());
+            Assert.Null(pointProperty[CoreAnnotationNames.PropertyAccessMode]);
+
+            var stringWithCharSetProperty = principalBaseEntity.FindProperty("StringWithCharSet")!;
+            Assert.Equal(typeof(string), stringWithCharSetProperty.ClrType);
+            Assert.True(stringWithCharSetProperty.IsNullable);
+            Assert.Equal(ValueGenerated.OnAdd, stringWithCharSetProperty.ValueGenerated);
+            Assert.Equal("StringWithCharSet", stringWithCharSetProperty.GetColumnName());
+            Assert.Equal("varchar(128)", stringWithCharSetProperty.GetColumnType());
+            Assert.Equal("String having charset", (string?)stringWithCharSetProperty.GetDefaultValue());
+            Assert.IsType<CastingConverter<string, string>>(stringWithCharSetProperty.GetValueConverter());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCharSetProperty.GetValueComparer());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCharSetProperty.GetKeyValueComparer());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCharSetProperty.GetProviderValueComparer());
+            Assert.Null(stringWithCharSetProperty[CoreAnnotationNames.PropertyAccessMode]);
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(stringWithCharSetProperty.GetCharSet).Message);
+
+            var stringWithCollationProperty = principalBaseEntity.FindProperty("StringWithCollation")!;
+            Assert.Equal(typeof(string), stringWithCollationProperty.ClrType);
+            Assert.True(stringWithCollationProperty.IsNullable);
+            Assert.Equal(ValueGenerated.OnAdd, stringWithCollationProperty.ValueGenerated);
+            Assert.Equal("StringWithCollation", stringWithCollationProperty.GetColumnName());
+            Assert.Equal("varchar(128)", stringWithCollationProperty.GetColumnType());
+            Assert.Equal("String using collation", (string?)stringWithCollationProperty.GetDefaultValue());
+            Assert.IsType<CastingConverter<string, string>>(stringWithCollationProperty.GetValueConverter());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCollationProperty.GetValueComparer());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCollationProperty.GetKeyValueComparer());
+            Assert.IsType<CustomValueComparer<string>>(stringWithCollationProperty.GetProviderValueComparer());
+            Assert.Null(stringWithCollationProperty[CoreAnnotationNames.PropertyAccessMode]);
+            Assert.Equal(
+                CoreStrings.RuntimeModelMissingData,
+                Assert.Throws<InvalidOperationException>(stringWithCollationProperty.GetCollation).Message);
+        }
+    }
+
+    public override void Tpc()
+    {
+        // The CompiledModelRelationalTestBase implementation uses stored procedures with return values and result columns, which are not
+        // supported in MySQL.
+        // We either need to change the model by overriding `BuildTcpModel` (not an issue) and then fully override the very long `AssertTcp`
+        // method (possible maintenance issue, because the class is likely to have a higher volatility), or we need to skip the stored procedure
+        // validation to allow the unsupported stored procedure features.
+        // We do the latter here.
+        Test(
+            BuildTpcModel,
+            AssertTpc,
+            options: new CompiledModelCodeGenerationOptions { UseNullableReferenceTypes = true },
+            addServices: s => s.AddSingleton<IModelValidator, StoredProcedureValidationExceptionIgnoringMySqlModelValidator>());
+    }
+
+    // protected override void BuildTpcModel(ModelBuilder modelBuilder)
+    // {
+    //     base.BuildTpcModel(modelBuilder);
+    //
+    //     modelBuilder.Entity<PrincipalBase>(
+    //         eb =>
+    //         {
+    //             // The base implementation uses `HasRowsAffectedReturnValue` which is not supported by MySQL.
+    //             // We use a parameter instead.
+    //             new StoredProcedureBuilder(eb.Metadata.GetDeleteStoredProcedure()!, eb)
+    //                 .HasRowsAffectedReturnValue(false)
+    //                 .HasRowsAffectedParameter(
+    //                     p => p.HasName("RowsAffected"));
+    //         });
+    //
+    //     modelBuilder.Entity<PrincipalDerived<DependentBase<byte?>>>(
+    //         eb =>
+    //         {
+    //             // The base implementation uses `HasResultColumn` which is not supported by MySQL.
+    //             // We use an output parameter instead.
+    //             var originalInsertStoredProcedure = eb.Metadata.RemoveInsertStoredProcedure()!;
+    //             eb.InsertUsingStoredProcedure(
+    //                 "Derived_Insert",
+    //                 s =>
+    //                 {
+    //                     foreach (var parameter in originalInsertStoredProcedure.Parameters)
+    //                     {
+    //                         s.HasParameter(parameter.PropertyName!);
+    //                     }
+    //
+    //                     s.HasParameter(
+    //                         p => p.Enum1,
+    //                         pb => pb
+    //                             .HasName("DerivedEnum")
+    //                             .HasAnnotation("foo", "bar3")
+    //                             .IsOutput());
+    //                 });
+    //         });
+    // }
+
+    // public override void ComplexTypes()
+    //     => Test(
+    //         BuildComplexTypesModel,
+    //         AssertComplexTypes,
+    //         c =>
+    //         {
+    //             c.Set<PrincipalDerived<DependentBase<byte?>>>().Add(
+    //                 new PrincipalDerived<DependentBase<byte?>>
+    //                 {
+    //                     Id = 1,
+    //                     AlternateId = new Guid(),
+    //                     Dependent = new DependentBase<byte?>(1),
+    //                     Owned = new OwnedType(c) { Principal = new PrincipalBase() }
+    //                 });
+    //
+    //             //c.SaveChanges();
+    //         },
+    //         options: new CompiledModelCodeGenerationOptions { UseNullableReferenceTypes = true },
+    //         addServices: s => s.AddSingleton<IModelValidator, StoredProcedureValidationExceptionIgnoringMySqlModelValidator>());
+
+    protected override void BuildComplexTypesModel(ModelBuilder modelBuilder)
+    {
+        base.BuildComplexTypesModel(modelBuilder);
+
+        // For some reason, the AssertComplexTypes base implementation expects the schema of the `PrincipalBaseTvf` db function to be `dbo`.
+        // We therefore just set the default schema here to `dbo`, which works.
+        modelBuilder.HasDefaultSchema("dbo");
+
+        modelBuilder.Entity<PrincipalBase>(
+            eb =>
+            {
+                // The base implementation uses `HasRowsAffectedReturnValue` which is not supported by MySQL.
+                // We use a parameter instead.
+                new StoredProcedureBuilder(eb.Metadata.GetDeleteStoredProcedure()!, eb)
+                    .HasRowsAffectedReturnValue(false)
+                    .HasRowsAffectedParameter(
+                        p => p.HasName("RowsAffected"));
+            });
+    }
+
+    public override void BigModel_with_JSON_columns()
+    {
+        Assert.Equal(
+            MySqlStrings.Ef7CoreJsonMappingNotSupported,
+            Assert.Throws<InvalidOperationException>(() => base.BigModel_with_JSON_columns()).Message);
+    }
+
+    protected override TestHelpers TestHelpers => MySqlTestHelpers.Instance;
+    protected override ITestStoreFactory TestStoreFactory => MySqlTestStoreFactory.Instance;
+
+    protected override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
+    {
+        builder = base.AddOptions(builder);
+
+        new MySqlDbContextOptionsBuilder(builder)
+            .UseNetTopologySuite()
+            .SchemaBehavior(MySqlSchemaBehavior.Ignore);
+
+        return builder;
+    }
+
+    protected override void AddDesignTimeServices(IServiceCollection services)
+        => new MySqlNetTopologySuiteDesignTimeServices().ConfigureDesignTimeServices(services);
+
+    protected override BuildSource AddReferences(BuildSource build, [CallerFilePath] string filePath = "")
+    {
+        base.AddReferences(build);
+        build.References.Add(BuildReference.ByName("Pomelo.EntityFrameworkCore.MySql"));
+        build.References.Add(BuildReference.ByName("Pomelo.EntityFrameworkCore.MySql.NetTopologySuite"));
+        build.References.Add(BuildReference.ByName("NetTopologySuite"));
+        return build;
+    }
+
+    // The CompiledModelRelationalTestBase implementation uses stored procedures with return values and result columns, which are not
+    // supported in MySQL.
+    // We either need to change the model by overriding `BuildTcpModel` (not an issue) and then fully override the very long `AssertTcp`
+    // method (possible maintenance issue, because the class is likely to have a higher volatility), or we need to skip the stored procedure
+    // validation to allow the unsupported stored procedure features.
+    // We do the latter here.
+    public class StoredProcedureValidationExceptionIgnoringMySqlModelValidator(
+        ModelValidatorDependencies dependencies,
+        RelationalModelValidatorDependencies relationalDependencies)
+        : MySqlModelValidator(dependencies, relationalDependencies)
+    {
+        protected override void ValidateStoredProcedures(IModel model, IDiagnosticsLogger<DbLoggerCategory.Model.Validation> logger)
+        {
+            try
+            {
+                base.ValidateStoredProcedures(model, logger);
+            }
+            catch (InvalidOperationException e) when (Regex.IsMatch(e.Message, Regex.Escape(MySqlStrings.StoredProcedureResultColumnsNotSupported("::::", "::::")).Replace("::::", ".*")) ||
+                                                      Regex.IsMatch(e.Message, Regex.Escape(MySqlStrings.StoredProcedureReturnValueNotSupported("::::", "::::")).Replace("::::", ".*")))
+            {
+            }
+        }
+    }
+}
diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs
index d867a6c6a..082e832fe 100644
--- a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs
+++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs
@@ -2,11 +2,13 @@
 using System.Linq;
 using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
+using Pomelo.EntityFrameworkCore.MySql.Diagnostics.Internal;
 using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal;
 using Pomelo.EntityFrameworkCore.MySql.Tests;
 
@@ -27,6 +29,8 @@ public override IServiceCollection AddProviderServices(IServiceCollection servic
         public override DbContextOptionsBuilder UseProviderOptions(DbContextOptionsBuilder optionsBuilder)
             => optionsBuilder.UseMySql("Database=DummyDatabase", AppConfig.ServerVersion);
 
+        public override LoggingDefinitions LoggingDefinitions { get; } = new MySqlLoggingDefinitions();
+
         public IServiceProvider CreateContextServices(ServerVersion serverVersion)
             => ((IInfrastructure<IServiceProvider>)new DbContext(CreateOptions(serverVersion))).Instance;
 
diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStoreFactory.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStoreFactory.cs
index a3d18583f..61dff1673 100644
--- a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStoreFactory.cs
+++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStoreFactory.cs
@@ -35,6 +35,8 @@ public override TestStore GetOrCreate(string storeName)
             => MySqlTestStore.GetOrCreate(storeName, noBackslashEscapes: NoBackslashEscapes, databaseCollation: DatabaseCollation, guidFormat: GuidFormat);
 
         public override IServiceCollection AddProviderServices(IServiceCollection serviceCollection)
-            => serviceCollection.AddEntityFrameworkMySql();
+            => serviceCollection
+                .AddEntityFrameworkMySql()
+                .AddEntityFrameworkMySqlNetTopologySuite();
     }
 }
diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/Xunit/MySqlXunitTestFrameworkDiscoverer.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/Xunit/MySqlXunitTestFrameworkDiscoverer.cs
index a2360b745..501f4ea7f 100644
--- a/test/EFCore.MySql.FunctionalTests/TestUtilities/Xunit/MySqlXunitTestFrameworkDiscoverer.cs
+++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/Xunit/MySqlXunitTestFrameworkDiscoverer.cs
@@ -25,6 +25,9 @@ public MySqlXunitTestFrameworkDiscoverer(
             // Prime the cache with our own discoverers, so they get used over the original ones from EF Core.
             DiscovererTypeCache.Add(typeof(ConditionalFactAttribute), typeof(MySqlConditionalFactDiscoverer));
             DiscovererTypeCache.Add(typeof(ConditionalTheoryAttribute), typeof(MySqlConditionalTheoryDiscoverer));
+
+            DiscovererTypeCache.Add(typeof(SkippableFactAttribute), typeof(SkippableFactDiscoverer));
+            DiscovererTypeCache.Add(typeof(SkippableTheoryAttribute), typeof(SkippableTheoryDiscoverer));
         }
 
         protected override bool IsValidTestClass(ITypeInfo type)
diff --git a/test/EFCore.MySql.FunctionalTests/UpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/UpdatesMySqlTest.cs
index cb5788469..616b3ece9 100644
--- a/test/EFCore.MySql.FunctionalTests/UpdatesMySqlTest.cs
+++ b/test/EFCore.MySql.FunctionalTests/UpdatesMySqlTest.cs
@@ -3,11 +3,11 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.TestModels.UpdatesModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
+using Microsoft.EntityFrameworkCore.Update;
 using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities;
 using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
 using Pomelo.EntityFrameworkCore.MySql.Tests;
 using Pomelo.EntityFrameworkCore.MySql.Tests.TestUtilities.Attributes;
-using Pomelo.EntityFrameworkCore.MySql.ValueGeneration.Internal;
 using Xunit;
 
 namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests
diff --git a/test/EFCore.MySql.Tests/Bugs/MySqlBug96947.cs b/test/EFCore.MySql.Tests/Bugs/MySqlBug96947.cs
index 9c73428f8..2b7c5cbe1 100644
--- a/test/EFCore.MySql.Tests/Bugs/MySqlBug96947.cs
+++ b/test/EFCore.MySql.Tests/Bugs/MySqlBug96947.cs
@@ -1,13 +1,10 @@
 using System;
 using Microsoft.EntityFrameworkCore;
-using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
-using Pomelo.EntityFrameworkCore.MySql.Tests.TestUtilities.Attributes;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Pomelo.EntityFrameworkCore.MySql.Bugs
 {
-    [SupportedServerVersionCondition(nameof(ServerVersionSupport.MySqlBug96947Workaround))]
     public class MySqlBug96947 : RawSqlTestWithFixture<MySqlBug96947.FixtureClass>
     {
         public MySqlBug96947(FixtureClass fixture, ITestOutputHelper testOutputHelper)