Resolved #3909: Deprecate UsePostgreSql() and rename it to UseNpgsql() for the Volo.Abp.EntityFrameworkCore.PostgreSql package.

docs/cs/Entity-Framework-Core-PostgreSQL.md

@@ -10,9 +10,9 @@ Projekt `.EntityFrameworkCore` v řešení závisí na NuGet balíku [Volo.Abp.E
 
 Najděte třídu ***YourProjectName*EntityFrameworkCoreModule** v projektu `.EntityFrameworkCore`, odstraňte `typeof(AbpEntityFrameworkCoreSqlServerModule)` z atributu `DependsOn`, přidejte `typeof(AbpEntityFrameworkCorePostgreSqlModule)` (také nahraďte `using Volo.Abp.EntityFrameworkCore.SqlServer;` za `using Volo.Abp.EntityFrameworkCore.PostgreSql;`).
 
-## UsePostgreSql()
+## UseNpgsql()
 
-Najděte volání `UseSqlServer()` v *YourProjectName*EntityFrameworkCoreModule.cs uvnitř projektu `.EntityFrameworkCore` a nahraďte za `UsePostgreSql()`.
+Najděte volání `UseSqlServer()` v *YourProjectName*EntityFrameworkCoreModule.cs uvnitř projektu `.EntityFrameworkCore` a nahraďte za `UseNpgsql()`.
 
 Najděte volání `UseSqlServer()` v *YourProjectName*MigrationsDbContextFactory.cs uvnitř projektu `.EntityFrameworkCore.DbMigrations` a nahraďte za `UseNpgsql()`.
 

docs/en/Entity-Framework-Core-PostgreSQL.md

@@ -10,9 +10,9 @@ This document explains how to switch to the **PostgreSQL** database provider for
 
 Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFrameworkCore` project, remove `typeof(AbpEntityFrameworkCoreSqlServerModule)` from the `DependsOn` attribute, add `typeof(AbpEntityFrameworkCorePostgreSqlModule)` (also replace `using Volo.Abp.EntityFrameworkCore.SqlServer;` with `using Volo.Abp.EntityFrameworkCore.PostgreSql;`).
 
-## UsePostgreSql()
+## UseNpgsql()
 
-Find `UseSqlServer()` call in *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project and replace with `UsePostgreSql()`.
+Find `UseSqlServer()` call in *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project and replace with `UseNpgsql()`.
 
 
 Find `UseSqlServer()` call in *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project and replace with `UseNpgsql()`.

docs/zh-Hans/Entity-Framework-Core-PostgreSQL.md

@@ -10,9 +10,9 @@
 
 在 `.EntityFrameworkCore` 项目中找到 **YourProjectName*EntityFrameworkCoreModule** 类, 删除 `DependsOn` attribute 上的`typeof(AbpEntityFrameworkCoreSqlServerModule)`, 添加 `typeof(AbpEntityFrameworkCorePostgreSqlModule)` (或者替换 `using Volo.Abp.EntityFrameworkCore.SqlServer;` 为 `using Volo.Abp.EntityFrameworkCore.PostgreSql;`).
 
-## UsePostgreSql()
+## UseNpgsql()
 
-查找你的解决方案中 `UseSqlServer()`调用,替换为 `UsePostgreSql()`. 检查下列文件:
+查找你的解决方案中 `UseSqlServer()`调用,替换为 `UseNpgsql()`. 检查下列文件:
 
 * `.EntityFrameworkCore` 项目中的*YourProjectName*EntityFrameworkCoreModule.cs.
 * `.EntityFrameworkCore` 项目中的*YourProjectName*MigrationsDbContextFactory.cs.

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextPostgreSqlExtensions.cs

@@ -8,9 +8,17 @@ namespace Volo.Abp.EntityFrameworkCore
 {
     public static class AbpDbContextConfigurationContextPostgreSqlExtensions
     {
+        [Obsolete("Use 'UseNpgsql(...)' method instead. This will be removed in future versions.")]
         public static DbContextOptionsBuilder UsePostgreSql(
             [NotNull] this AbpDbContextConfigurationContext context,
             [CanBeNull] Action<NpgsqlDbContextOptionsBuilder> postgreSqlOptionsAction = null)
+        {
+            return context.UseNpgsql(postgreSqlOptionsAction);
+        }
+
+        public static DbContextOptionsBuilder UseNpgsql(
+            [NotNull] this AbpDbContextConfigurationContext context,
+            [CanBeNull] Action<NpgsqlDbContextOptionsBuilder> postgreSqlOptionsAction = null)
         {
             if (context.ExistingConnection != null)
             {

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsPostgreSqlExtensions.cs

@@ -6,16 +6,18 @@ namespace Volo.Abp.EntityFrameworkCore
 {
     public static class AbpDbContextOptionsPostgreSqlExtensions
     {
+        [Obsolete("Use 'UseNpgsql(...)' method instead. This will be removed in future versions.")]
         public static void UsePostgreSql(
             [NotNull] this AbpDbContextOptions options,
             [CanBeNull] Action<NpgsqlDbContextOptionsBuilder> postgreSqlOptionsAction = null)
         {
             options.Configure(context =>
             {
-                context.UsePostgreSql(postgreSqlOptionsAction);
+                context.UseNpgsql(postgreSqlOptionsAction);
             });
         }
 
+        [Obsolete("Use 'UseNpgsql(...)' method instead. This will be removed in future versions.")]
         public static void UsePostgreSql<TDbContext>(
             [NotNull] this AbpDbContextOptions options,
             [CanBeNull] Action<NpgsqlDbContextOptionsBuilder> postgreSqlOptionsAction = null)
@@ -23,7 +25,28 @@ namespace Volo.Abp.EntityFrameworkCore
         {
             options.Configure<TDbContext>(context =>
             {
-                context.UsePostgreSql(postgreSqlOptionsAction);
+                context.UseNpgsql(postgreSqlOptionsAction);
+            });
+        }
+
+        public static void UseNpgsql(
+            [NotNull] this AbpDbContextOptions options,
+            [CanBeNull] Action<NpgsqlDbContextOptionsBuilder> postgreSqlOptionsAction = null)
+        {
+            options.Configure(context =>
+            {
+                context.UseNpgsql(postgreSqlOptionsAction);
+            });
+        }
+
+        public static void UseNpgsql<TDbContext>(
+            [NotNull] this AbpDbContextOptions options,
+            [CanBeNull] Action<NpgsqlDbContextOptionsBuilder> postgreSqlOptionsAction = null)
+            where TDbContext : AbpDbContext<TDbContext>
+        {
+            options.Configure<TDbContext>(context =>
+            {
+                context.UseNpgsql(postgreSqlOptionsAction);
             });
         }
     }