Merge branch 'dev' of https://github.com/abpframework/abp into dev

docs/en/Entity-Framework-Core-Oracle-Devart.md

@@ -0,0 +1,63 @@
+# Switch to EF Core Oracle Devart Provider
+
+This document explains how to switch to the **Oracle** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
+
+> This document uses a paid library of [Devart](https://www.devart.com/dotconnect/oracle/) company, See [this document](Entity-Framework-Core-Oracle.md) for other options.
+
+## Replace the Volo.Abp.EntityFrameworkCore.SqlServer Package
+
+`.EntityFrameworkCore` project in the solution depends on the [Volo.Abp.EntityFrameworkCore.SqlServer](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.SqlServer) NuGet package. Remove this package and add the same version of the [Volo.Abp.EntityFrameworkCore.Oracle.Devart](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.Oracle.Devart) package.
+
+## Replace the Module Dependency
+
+Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFrameworkCore` project, remove `typeof(AbpEntityFrameworkCoreSqlServerModule)` from the `DependsOn` attribute, add `typeof(AbpEntityFrameworkCoreOracleDevartModule)`
+
+Also replace `using Volo.Abp.EntityFrameworkCore.SqlServer;` with `using Volo.Abp.EntityFrameworkCore.Oracle.Devart;`.
+
+## UseOracle()
+
+Find `UseSqlServer()` calls in your solution, replace with `UseOracle()`. Check the following files:
+
+* *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project.
+* *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project.
+
+
+In the `CreateDbContext()` method of the *YourProjectName*MigrationsDbContextFactory.cs, replace the following code block
+
+```csharp
+var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
+                .UseSqlServer(configuration.GetConnectionString("Default"));
+```
+
+with this one
+```csharp
+var builder = (DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>)
+	new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>().UseOracle
+	(
+		configuration.GetConnectionString("Default")
+	);
+```
+
+> Depending on your solution structure, you may find more code files need to be changed.
+
+## Change the Connection Strings
+
+Oracle connection strings are different than SQL Server connection strings. So, check all `appsettings.json` files in your solution and replace the connection strings inside them. See the [connectionstrings.com]( https://www.connectionstrings.com/oracle/ ) for details of Oracle connection string options.
+
+You typically will change the `appsettings.json` inside the `.DbMigrator` and `.Web` projects, but it depends on your solution structure.
+
+## Re-Generate the Migrations
+
+The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) by default. 
+EF Core Migrations depend on the selected DBMS provider. Changing the DBMS provider, may not work with the existing migrations.
+
+* Delete the `Migrations` folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
+* Run `Add-Migration "Initial"` on the Package Manager Console window (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
+
+This will scaffold a new migration for Oracle.
+
+Run the `.DbMigrator` project to create the database, apply the changes and seed the initial data.
+
+## Run the Application
+
+It is ready. Just run the application and enjoy coding.

docs/en/Entity-Framework-Core-Oracle-Official.md

@@ -0,0 +1,58 @@
+# Switch to EF Core Oracle Provider
+
+This document explains how to switch to the **Oracle** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
+
+## Replace the Volo.Abp.EntityFrameworkCore.SqlServer Package
+
+`.EntityFrameworkCore` project in the solution depends on the [Volo.Abp.EntityFrameworkCore.SqlServer](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.SqlServer) NuGet package. Remove this package and add the same version of the [Volo.Abp.EntityFrameworkCore.Oracle](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.Oracle) package.
+
+## Replace the Module Dependency
+
+Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFrameworkCore` project, remove `typeof(AbpEntityFrameworkCoreSqlServerModule)` from the `DependsOn` attribute, add `typeof(AbpEntityFrameworkCoreOracleModule)`
+
+Also replace `using Volo.Abp.EntityFrameworkCore.SqlServer;` with `using Volo.Abp.EntityFrameworkCore.Oracle;`.
+
+## UseOracle()
+
+Find `UseSqlServer()` calls in your solution, replace with `UseOracle()`. Check the following files:
+
+* *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project.
+* *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project.
+
+
+In the `CreateDbContext()` method of the *YourProjectName*MigrationsDbContextFactory.cs, replace the following code block
+
+```csharp
+var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
+                .UseSqlServer(configuration.GetConnectionString("Default"));
+```
+
+with this one (just changes `UseSqlServer(...)` to `UseOracle(...)`)
+```csharp
+var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
+                .UseOracle(configuration.GetConnectionString("Default"));
+```
+
+> Depending on your solution structure, you may find more code files need to be changed.
+
+## Change the Connection Strings
+
+Oracle connection strings are different than SQL Server connection strings. So, check all `appsettings.json` files in your solution and replace the connection strings inside them. See the [connectionstrings.com]( https://www.connectionstrings.com/oracle/ ) for details of Oracle connection string options.
+
+You typically will change the `appsettings.json` inside the `.DbMigrator` and `.Web` projects, but it depends on your solution structure.
+
+## Re-Generate the Migrations
+
+The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) by default. 
+EF Core Migrations depend on the selected DBMS provider. Changing the DBMS provider, may not work with the existing migrations.
+
+* Delete the `Migrations` folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
+* Run `Add-Migration "Initial"` on the Package Manager Console window (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
+
+This will scaffold a new migration for Oracle.
+
+Run the `.DbMigrator` project to create the database, apply the changes and seed the initial data.
+
+## Run the Application
+
+It is ready. Just run the application and enjoy coding.

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

@@ -2,61 +2,9 @@
 
 This document explains how to switch to the **Oracle** database provider for **[the application startup template](Startup-Templates/Application.md)** which comes with SQL Server provider pre-configured.
 
-> This document uses a paid library of [Devart](https://www.devart.com/dotconnect/oracle/) company, because it is the only library for Oracle that supports EF Core 3.x.
+ABP Framework provides integrations for two different Oracle packages. See one of the following documents based on your provider decision:
 
-## Replace the Volo.Abp.EntityFrameworkCore.SqlServer Package
-
-`.EntityFrameworkCore` project in the solution depends on the [Volo.Abp.EntityFrameworkCore.SqlServer](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.SqlServer) NuGet package. Remove this package and add the same version of the [Volo.Abp.EntityFrameworkCore.Oracle.Devart](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.Oracle.Devart) package.
-
-## Replace the Module Dependency
-
-Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFrameworkCore` project, remove `typeof(AbpEntityFrameworkCoreSqlServerModule)` from the `DependsOn` attribute, add `typeof(AbpEntityFrameworkCoreOracleDevartModule)` (also replace `using Volo.Abp.EntityFrameworkCore.SqlServer;` with `using Volo.Abp.EntityFrameworkCore.Oracle.Devart;`).
-
-## UseOracle()
-
-Find `UseSqlServer()` calls in your solution, replace with `UseOracle()`. Check the following files:
-
-* *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project.
-* *YourProjectName*MigrationsDbContextFactory.cs inside the `.EntityFrameworkCore.DbMigrations` project.
-
-
-In the `CreateDbContext()` method of the *YourProjectName*MigrationsDbContextFactory.cs, replace the following code block
-
-```csharp
-var builder = new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>()
-                .UseSqlServer(configuration.GetConnectionString("Default"));
-```
-
-with this one
-```csharp
-var builder = (DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>)
-	new DbContextOptionsBuilder<YourProjectNameMigrationsDbContext>().UseOracle
-	(
-		configuration.GetConnectionString("Default")
-	);
-```
-
-> Depending on your solution structure, you may find more code files need to be changed.
-
-## Change the Connection Strings
-
-Oracle connection strings are different than SQL Server connection strings. So, check all `appsettings.json` files in your solution and replace the connection strings inside them. See the [connectionstrings.com]( https://www.connectionstrings.com/oracle/ ) for details of Oracle connection string options.
-
-You typically will change the `appsettings.json` inside the `.DbMigrator` and `.Web` projects, but it depends on your solution structure.
-
-## Re-Generate the Migrations
-
-The startup template uses [Entity Framework Core's Code First Migrations](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) by default. 
-EF Core Migrations depend on the selected DBMS provider. Changing the DBMS provider, may not work with the existing migrations.
-
-* Delete the `Migrations` folder under the `.EntityFrameworkCore.DbMigrations` project and re-build the solution.
-* Run `Add-Migration "Initial"` on the Package Manager Console window (select the `.DbMigrator`  (or `.Web`) project as the startup project in the Solution Explorer and select the `.EntityFrameworkCore.DbMigrations` project as the default project in the Package Manager Console).
-
-This will scaffold a new migration for Oracle.
-
-Run the `.DbMigrator` project to create the database, apply the changes and seed the initial data.
-
-## Run the Application
-
-It is ready. Just run the application and enjoy coding.
+* **[Volo.Abp.EntityFrameworkCore.Oracle](Entity-Framework-Core-Oracle-Official.md)** package uses the official & free oracle driver (which is **currently in beta**).
+* **[Volo.Abp.EntityFrameworkCore.Oracle.Devart](Entity-Framework-Core-Oracle-Devart.md)** package uses the commercial (paid) driver of [Devart](https://www.devart.com/) company.
 
+> You can choose one of the package you want. If you don't know the differences of the packages, please search for it. ABP Framework only provides integrations it doesn't provide support for such 3rd-party libraries.

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleExtensions.cs

@@ -10,10 +10,9 @@ namespace Volo.Abp.EntityFrameworkCore
     {
         public static DbContextOptionsBuilder UseOracle(
            [NotNull] this AbpDbContextConfigurationContext context,
-           [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
-           bool useExistingConnectionIfAvailable = false)
+           [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
         {
-            if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
+            if (context.ExistingConnection != null)
             {
                 return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction);
             }

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleExtensions.cs

@@ -8,24 +8,22 @@ namespace Volo.Abp.EntityFrameworkCore
     {
         public static void UseOracle(
                 [NotNull] this AbpDbContextOptions options,
-                [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
-                bool useExistingConnectionIfAvailable = false)
+                [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
         {
             options.Configure(context =>
             {
-                context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
+                context.UseOracle(oracleOptionsAction);
             });
         }
 
         public static void UseOracle<TDbContext>(
             [NotNull] this AbpDbContextOptions options,
-            [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
-            bool useExistingConnectionIfAvailable = false)
+            [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
             where TDbContext : AbpDbContext<TDbContext>
         {
             options.Configure<TDbContext>(context =>
             {
-                context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
+                context.UseOracle(oracleOptionsAction);
             });
         }
     }

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs

@@ -129,6 +129,7 @@ namespace Volo.Abp.EntityFrameworkCore
                     return EfCoreDatabaseProvider.PostgreSql;
                 case "Pomelo.EntityFrameworkCore.MySql":
                     return EfCoreDatabaseProvider.MySql;
+                case "Oracle.EntityFrameworkCore":
                 case "Devart.Data.Oracle.Entity.EFCore":
                     return EfCoreDatabaseProvider.Oracle;
                 case "Microsoft.EntityFrameworkCore.Sqlite":