Raw SQL queries for unmapped types

global.json

@@ -1,9 +1,9 @@
 {
   "tools": {
-    "dotnet": "7.0.100"
+    "dotnet": "7.0.102"
   },
   "sdk": {
-    "version": "7.0.100",
+    "version": "7.0.102",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   },

src/EFCore.Relational/Extensions/RelationalDatabaseFacadeExtensions.cs

@@ -340,11 +340,14 @@ public static IQueryable<TResult> SqlQueryRaw<TResult>(
         Check.NotNull(parameters, nameof(parameters));
 
         var facadeDependencies = GetFacadeDependencies(databaseFacade);
-
-        return facadeDependencies.QueryProvider
-            .CreateQuery<TResult>(
-                new SqlQueryRootExpression(
-                    facadeDependencies.QueryProvider, typeof(TResult), sql, Expression.Constant(parameters)));
+        var queryProvider = facadeDependencies.QueryProvider;
+        var argumentsExpression = Expression.Constant(parameters);
+
+        return queryProvider.CreateQuery<TResult>(
+            facadeDependencies.TypeMappingSource.FindMapping(typeof(TResult)) != null
+                ? new SqlQueryRootExpression(queryProvider, typeof(TResult), sql, argumentsExpression)
+                : new FromSqlQueryRootExpression(
+                    queryProvider, facadeDependencies.AdHocMapper.GetOrAddEntityType(typeof(TResult)), sql, argumentsExpression));
     }
 
     /// <summary>
@@ -380,17 +383,7 @@ public static IQueryable<TResult> SqlQueryRaw<TResult>(
     public static IQueryable<TResult> SqlQuery<TResult>(
         this DatabaseFacade databaseFacade,
         [NotParameterized] FormattableString sql)
-    {
-        Check.NotNull(sql, nameof(sql));
-        Check.NotNull(sql.Format, nameof(sql.Format));
-
-        var facadeDependencies = GetFacadeDependencies(databaseFacade);
-
-        return facadeDependencies.QueryProvider
-            .CreateQuery<TResult>(
-                new SqlQueryRootExpression(
-                    facadeDependencies.QueryProvider, typeof(TResult), sql.Format, Expression.Constant(sql.GetArguments())));
-    }
+        => SqlQueryRaw<TResult>(databaseFacade, sql.Format, sql.GetArguments()!);
 
     /// <summary>
     ///     Executes the given SQL against the database and returns the number of rows affected.
@@ -654,7 +647,7 @@ public static DbConnection GetDbConnection(this DatabaseFacade databaseFacade)
     /// <param name="contextOwnsConnection">
     ///     If <see langword="true" />, then EF will take ownership of the connection and will
     ///     dispose it in the same way it would dispose a connection created by EF. If <see langword="false" />, then the caller still
-    ///     owns the connection and is responsible for its disposal. The default value is <see langword="false"/>.
+    ///     owns the connection and is responsible for its disposal. The default value is <see langword="false" />.
     /// </param>
     public static void SetDbConnection(this DatabaseFacade databaseFacade, DbConnection? connection, bool contextOwnsConnection = false)
         => GetFacadeDependencies(databaseFacade).RelationalConnection.SetDbConnection(connection, contextOwnsConnection);

src/EFCore.Relational/Storage/Internal/RelationalDatabaseFacadeDependencies.cs

@@ -28,7 +28,9 @@ public RelationalDatabaseFacadeDependencies(
         IRelationalConnection relationalConnection,
         IRawSqlCommandBuilder rawSqlCommandBuilder,
         ICoreSingletonOptions coreOptions,
-        IAsyncQueryProvider queryProvider)
+        IAsyncQueryProvider queryProvider,
+        IAdHocMapper adHocMapper,
+        IRelationalTypeMappingSource relationalTypeMappingSource)
     {
         TransactionManager = transactionManager;
         DatabaseCreator = databaseCreator;
@@ -41,6 +43,8 @@ public RelationalDatabaseFacadeDependencies(
         RawSqlCommandBuilder = rawSqlCommandBuilder;
         CoreOptions = coreOptions;
         QueryProvider = queryProvider;
+        AdHocMapper = adHocMapper;
+        TypeMappingSource = relationalTypeMappingSource;
     }
 
     /// <summary>
@@ -49,47 +53,47 @@ public RelationalDatabaseFacadeDependencies(
     ///     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>
-    public virtual IDbContextTransactionManager TransactionManager { get; init; }
+    public virtual IDbContextTransactionManager TransactionManager { get; }
 
     /// <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>
-    public virtual IDatabaseCreator DatabaseCreator { get; init; }
+    public virtual IDatabaseCreator DatabaseCreator { get; }
 
     /// <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>
-    public virtual IExecutionStrategy ExecutionStrategy { get; init; }
+    public virtual IExecutionStrategy ExecutionStrategy { get; }
 
     /// <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>
-    public virtual IExecutionStrategyFactory ExecutionStrategyFactory { get; init; }
+    public virtual IExecutionStrategyFactory ExecutionStrategyFactory { get; }
 
     /// <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>
-    public virtual IEnumerable<IDatabaseProvider> DatabaseProviders { get; init; }
+    public virtual IEnumerable<IDatabaseProvider> DatabaseProviders { get; }
 
     /// <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>
-    public virtual IRelationalCommandDiagnosticsLogger CommandLogger { get; init; }
+    public virtual IRelationalCommandDiagnosticsLogger CommandLogger { get; }
 
     IDiagnosticsLogger<DbLoggerCategory.Database.Command> IDatabaseFacadeDependencies.CommandLogger
         => CommandLogger;
@@ -100,37 +104,53 @@ public RelationalDatabaseFacadeDependencies(
     ///     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>
-    public virtual IConcurrencyDetector ConcurrencyDetector { get; init; }
+    public virtual IConcurrencyDetector ConcurrencyDetector { get; }
 
     /// <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>
-    public virtual IRelationalConnection RelationalConnection { get; init; }
+    public virtual IRelationalConnection RelationalConnection { get; }
 
     /// <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>
-    public virtual IRawSqlCommandBuilder RawSqlCommandBuilder { get; init; }
+    public virtual IRawSqlCommandBuilder RawSqlCommandBuilder { get; }
 
     /// <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>
-    public virtual ICoreSingletonOptions CoreOptions { get; init; }
+    public virtual ICoreSingletonOptions CoreOptions { get; }
 
     /// <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>
-    public virtual IAsyncQueryProvider QueryProvider { get; init; }
+    public virtual IAsyncQueryProvider QueryProvider { get; }
+
+    /// <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>
+    public virtual IAdHocMapper AdHocMapper { get; }
+
+    /// <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>
+    public virtual ITypeMappingSource TypeMappingSource { get; }
 }

src/EFCore.Relational/Storage/RelationalSqlGenerationHelper.cs

@@ -28,7 +28,7 @@ namespace Microsoft.EntityFrameworkCore.Storage;
 public class RelationalSqlGenerationHelper : ISqlGenerationHelper
 {
     /// <summary>
-    ///     Initializes a new instance of the this class.
+    ///     Initializes a new instance of this class.
     /// </summary>
     /// <param name="dependencies">Parameter object containing dependencies for this service.</param>
     public RelationalSqlGenerationHelper(RelationalSqlGenerationHelperDependencies dependencies)

src/EFCore.Relational/Storage/RelationalTypeMappingSource.cs

@@ -35,7 +35,7 @@ public abstract class RelationalTypeMappingSource : TypeMappingSourceBase, IRela
         = new();
 
     /// <summary>
-    ///     Initializes a new instance of the this class.
+    ///     Initializes a new instance of this class.
     /// </summary>
     /// <param name="dependencies">Parameter object containing dependencies for this service.</param>
     /// <param name="relationalDependencies">Parameter object containing relational-specific dependencies for this service.</param>

src/EFCore.Relational/Update/UpdateAndSelectSqlGenerator.cs

@@ -29,7 +29,7 @@ namespace Microsoft.EntityFrameworkCore.Update;
 public abstract class UpdateAndSelectSqlGenerator : UpdateSqlGenerator
 {
     /// <summary>
-    ///     Initializes a new instance of the this class.
+    ///     Initializes a new instance of this class.
     /// </summary>
     /// <param name="dependencies">Parameter object containing dependencies for this service.</param>
     protected UpdateAndSelectSqlGenerator(UpdateSqlGeneratorDependencies dependencies)

src/EFCore.Relational/Update/UpdateSqlGenerator.cs

@@ -29,7 +29,7 @@ namespace Microsoft.EntityFrameworkCore.Update;
 public abstract class UpdateSqlGenerator : IUpdateSqlGenerator
 {
     /// <summary>
-    ///     Initializes a new instance of the this class.
+    ///     Initializes a new instance of this class.
     /// </summary>
     /// <param name="dependencies">Parameter object containing dependencies for this service.</param>
     protected UpdateSqlGenerator(UpdateSqlGeneratorDependencies dependencies)

src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs

@@ -122,6 +122,7 @@ public static readonly IDictionary<Type, ServiceCharacteristics> CoreServices
             { typeof(IQueryTranslationPostprocessorFactory), new ServiceCharacteristics(ServiceLifetime.Scoped) },
             { typeof(IShapedQueryCompilingExpressionVisitorFactory), new ServiceCharacteristics(ServiceLifetime.Scoped) },
             { typeof(IDbContextLogger), new ServiceCharacteristics(ServiceLifetime.Scoped) },
+            { typeof(IAdHocMapper), new ServiceCharacteristics(ServiceLifetime.Scoped) },
             { typeof(ILazyLoader), new ServiceCharacteristics(ServiceLifetime.Transient) },
             { typeof(IParameterBindingFactory), new ServiceCharacteristics(ServiceLifetime.Singleton, multipleRegistrations: true) },
             { typeof(ITypeMappingSourcePlugin), new ServiceCharacteristics(ServiceLifetime.Singleton, multipleRegistrations: true) },
@@ -301,6 +302,7 @@ public virtual EntityFrameworkServicesBuilder TryAddCoreServices()
         TryAdd<IQueryTranslationPostprocessorFactory, QueryTranslationPostprocessorFactory>();
         TryAdd<INavigationExpansionExtensibilityHelper, NavigationExpansionExtensibilityHelper>();
         TryAdd<IExceptionDetector, ExceptionDetector>();
+        TryAdd<IAdHocMapper, AdHocMapper>();
 
         TryAdd(
             p => p.GetService<IDbContextOptions>()?.FindExtension<CoreOptionsExtension>()?.DbContextLogger
@@ -426,7 +428,7 @@ public virtual EntityFrameworkServicesBuilder TryAdd
     /// <returns>This builder, such that further calls can be chained.</returns>
     public virtual EntityFrameworkServicesBuilder TryAdd
         <TService, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TImplementation>(
-        Func<IServiceProvider, TImplementation> factory)
+            Func<IServiceProvider, TImplementation> factory)
         where TService : class
         where TImplementation : class, TService
         => TryAdd(typeof(TService), typeof(TImplementation), factory);

src/EFCore/Infrastructure/ModelValidator.cs

@@ -237,8 +237,11 @@ protected virtual void ValidatePropertyMapping(
                         }
 
                         throw new InvalidOperationException(
-                            CoreStrings.NavigationNotAdded(
-                                entityType.DisplayName(), clrProperty.Name, propertyType.ShortDisplayName()));
+                            Equals(model.FindAnnotation(CoreAnnotationNames.AdHocModel)?.Value, true)
+                                ? CoreStrings.NavigationNotAddedAdHoc(
+                                    entityType.DisplayName(), clrProperty.Name, propertyType.ShortDisplayName())
+                                : CoreStrings.NavigationNotAdded(
+                                    entityType.DisplayName(), clrProperty.Name, propertyType.ShortDisplayName()));
                     }
 
                     // ReSharper restore CheckForReferenceEqualityInstead.3
@@ -254,8 +257,11 @@ protected virtual void ValidatePropertyMapping(
                 else
                 {
                     throw new InvalidOperationException(
-                        CoreStrings.PropertyNotAdded(
-                            entityType.DisplayName(), clrProperty.Name, propertyType.ShortDisplayName()));
+                        Equals(model.FindAnnotation(CoreAnnotationNames.AdHocModel)?.Value, true)
+                            ? CoreStrings.PropertyNotAddedAdHoc(
+                                entityType.DisplayName(), clrProperty.Name, propertyType.ShortDisplayName())
+                            : CoreStrings.PropertyNotAdded(
+                                entityType.DisplayName(), clrProperty.Name, propertyType.ShortDisplayName()));
                 }
             }
         }