Add facades through DI construction

src/ClickHouse.Facades/Context/ClickHouseContext.cs

@@ -7,7 +7,7 @@ public abstract class ClickHouseContext<TContext> : IDisposable, IAsyncDisposabl
 {
 	private bool _initialized = false;
 	private ClickHouseConnection? _connection;
-	private ClickHouseFacadeRegistry<TContext>? _facadeRegistry;
+	private ClickHouseFacadeFactory<TContext> _facadeFactory = null!;
 	private readonly Dictionary<Type, ClickHouseFacade<TContext>> _facades = new();
 
 	private bool _allowDatabaseChanges = false;
@@ -43,7 +43,7 @@ public string? ServerTimezone
 	}
 
 	public TFacade GetFacade<TFacade>()
-		where TFacade : ClickHouseFacade<TContext>, new()
+		where TFacade : ClickHouseFacade<TContext>
 	{
 		ThrowIfNotInitialized();
 
@@ -52,7 +52,7 @@ public TFacade GetFacade<TFacade>()
 			return (TFacade) facade;
 		}
 
-		var newFacade = _facadeRegistry!.CreateFacade<TFacade>(_connection!);
+		var newFacade = _facadeFactory.CreateFacade<TFacade>(_connection!);
 		_facades.Add(typeof(TFacade), newFacade);
 
 		return newFacade;
@@ -75,7 +75,7 @@ internal void Initialize(ClickHouseContextOptions<TContext> options)
 		ThrowIfInitialized();
 
 		_connection = CreateConnection(options);
-		_facadeRegistry = options.FacadeRegistry;
+		_facadeFactory = options.FacadeFactory;
 		_allowDatabaseChanges = options.AllowDatabaseChanges;
 
 		_initialized = true;

src/ClickHouse.Facades/Context/ClickHouseContextFactory.cs

@@ -3,18 +3,18 @@
 public abstract class ClickHouseContextFactory<TContext> : IClickHouseContextFactory<TContext>
 	where TContext : ClickHouseContext<TContext>, new()
 {
-	private ClickHouseFacadeRegistry<TContext>? _facadeRegistry;
+	private ClickHouseFacadeFactory<TContext>? _facadeFactory;
 
-	internal ClickHouseContextFactory<TContext> Setup(ClickHouseFacadeRegistry<TContext> facadeRegistry)
+	internal ClickHouseContextFactory<TContext> Setup(ClickHouseFacadeFactory<TContext> facadeFactory)
 	{
-		_facadeRegistry = facadeRegistry ?? throw new ArgumentNullException(nameof(facadeRegistry));
+		_facadeFactory = facadeFactory ?? throw new ArgumentNullException(nameof(facadeFactory));
 
 		return this;
 	}
 
 	public TContext CreateContext()
 	{
-		if (_facadeRegistry == null)
+		if (_facadeFactory == null)
 		{
 			throw new InvalidOperationException($"{GetType()} has no facade registry.");
 		}
@@ -24,7 +24,7 @@ public TContext CreateContext()
 		SetupContextOptions(builder);
 
 		var contextOptions = builder
-			.WithFacadeRegistry(_facadeRegistry)
+			.WithFacadeFactory(_facadeFactory)
 			.Build();
 
 		var context = new TContext();

src/ClickHouse.Facades/Setup/ClickHouseContextOptions.cs

@@ -6,7 +6,7 @@ public sealed class ClickHouseContextOptions<TContext>
 	internal string ConnectionString { get; set; } = "";
 	internal bool AllowDatabaseChanges { get; set; } = false;
 
-	internal ClickHouseFacadeRegistry<TContext> FacadeRegistry { get; set; } = new();
+	internal ClickHouseFacadeFactory<TContext> FacadeFactory { get; set; } = null!;
 
 	internal HttpClient? HttpClient { get; set; }
 	internal IHttpClientFactory? HttpClientFactory { get; set; }

src/ClickHouse.Facades/Setup/ClickHouseContextOptionsBuilder.cs

@@ -10,7 +10,7 @@ public sealed class ClickHouseContextOptionsBuilder<TContext>
 
 	private OptionalValue<string> _connectionString;
 	private OptionalValue<bool> _forceSession;
-	private OptionalValue<ClickHouseFacadeRegistry<TContext>> _facadeRegistry;
+	private OptionalValue<ClickHouseFacadeFactory<TContext>> _facadeFactory;
 	private OptionalValue<bool> _allowDatabaseChanges;
 	private OptionalValue<HttpClient> _httpClient;
 	private OptionalValue<IHttpClientFactory> _httpClientFactory;
@@ -64,15 +64,15 @@ public ClickHouseContextOptionsBuilder<TContext> AllowDatabaseChanges()
 			true);
 	}
 
-	internal ClickHouseContextOptionsBuilder<TContext> WithFacadeRegistry(
-		ClickHouseFacadeRegistry<TContext> facadeRegistry)
+	internal ClickHouseContextOptionsBuilder<TContext> WithFacadeFactory(
+		ClickHouseFacadeFactory<TContext> facadeFactory)
 	{
-		ExceptionHelpers.ThrowIfNull(facadeRegistry);
+		ExceptionHelpers.ThrowIfNull(facadeFactory);
 
 		return WithPropertyValue(
-			builder => builder._facadeRegistry,
-			(builder, value) => builder._facadeRegistry = value,
-			facadeRegistry);
+			builder => builder._facadeFactory,
+			(builder, value) => builder._facadeFactory = value,
+			facadeFactory);
 	}
 
 	public ClickHouseContextOptionsBuilder<TContext> ForceSessions()
@@ -108,7 +108,7 @@ protected override ClickHouseContextOptions<TContext> BuildCore()
 		return new ClickHouseContextOptions<TContext>
 		{
 			ConnectionString = connectionString,
-			FacadeRegistry = _facadeRegistry.NotNullOrThrow(),
+			FacadeFactory = _facadeFactory.NotNullOrThrow(),
 			AllowDatabaseChanges = _allowDatabaseChanges.OrElseValue(false),
 			HttpClient = _httpClient.OrDefault(),
 			HttpClientFactory = _httpClientFactory.OrDefault(),

src/ClickHouse.Facades/Setup/ClickHouseContextServiceBuilder.cs

@@ -16,7 +16,7 @@ private ClickHouseContextServiceBuilder()
 	}
 
 	public ClickHouseContextServiceBuilder<TContext> AddFacade<TFacade>()
-		where TFacade : ClickHouseFacade<TContext>, new()
+		where TFacade : ClickHouseFacade<TContext>
 	{
 		_facadeRegistry.AddFacade<TFacade>();
 

src/ClickHouse.Facades/Setup/ClickHouseFacadeFactory.cs

@@ -0,0 +1,28 @@
+using ClickHouse.Client.ADO;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ClickHouse.Facades;
+
+internal class ClickHouseFacadeFactory<TContext>
+	where TContext : ClickHouseContext<TContext>
+{
+	private readonly ClickHouseFacadeRegistry<TContext> _registry;
+	private readonly IServiceProvider _serviceProvider;
+
+	public ClickHouseFacadeFactory(ClickHouseFacadeRegistry<TContext> registry, IServiceProvider serviceProvider)
+	{
+		_registry = registry ?? throw new ArgumentNullException(nameof(registry));
+		_serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
+	}
+
+	internal TFacade CreateFacade<TFacade>(ClickHouseConnection connection)
+		where TFacade : ClickHouseFacade<TContext>
+	{
+		if (_registry.Contains<TFacade>())
+		{
+			return (_serviceProvider.GetRequiredService<TFacade>().SetConnection(connection) as TFacade)!;
+		}
+
+		throw new InvalidOperationException($"Facade of type {typeof(TFacade)} was not found.");
+	}
+}

src/ClickHouse.Facades/Setup/ClickHouseFacadeRegistry.cs

@@ -1,6 +1,4 @@
-using ClickHouse.Client.ADO;
-
-namespace ClickHouse.Facades;
+namespace ClickHouse.Facades;
 
 internal sealed class ClickHouseFacadeRegistry<TContext>
 	where TContext : ClickHouseContext<TContext>
@@ -13,14 +11,9 @@ internal void AddFacade<TFacade>()
 		_facades.Add(typeof(TFacade));
 	}
 
-	internal TFacade CreateFacade<TFacade>(ClickHouseConnection connection)
-		where TFacade : ClickHouseFacade<TContext>, new()
+	internal bool Contains<TFacade>()
+		where TFacade : ClickHouseFacade<TContext>
 	{
-		if (_facades.Contains(typeof(TFacade)))
-		{
-			return (new TFacade().SetConnection(connection) as TFacade)!;
-		}
-
-		throw new InvalidOperationException($"Facade of type {typeof(TFacade)} was not found.");
+		return _facades.Contains(typeof(TFacade));
 	}
 }

src/ClickHouse.Facades/Setup/ServiceCollectionExtensions.cs

@@ -34,7 +34,7 @@ public static IServiceCollection AddClickHouseContext<TContext, TContextFactory>
 			typeof(IClickHouseContextFactory<TContext>),
 			serviceProvider => ActivatorUtilities
 				.CreateInstance<TContextFactory>(serviceProvider)
-				.Setup(serviceProvider.GetRequiredService<ClickHouseFacadeRegistry<TContext>>()),
+				.Setup(serviceProvider.GetRequiredService<ClickHouseFacadeFactory<TContext>>()),
 			factoryLifetime);
 
 		services.Add(descriptor);
@@ -43,6 +43,8 @@ public static IServiceCollection AddClickHouseContext<TContext, TContextFactory>
 		builderAction(builder);
 		builder.Build(services);
 
+		services.AddTransient<ClickHouseFacadeFactory<TContext>>();
+
 		return services;
 	}
 }