From 987eeab7e7f39b0816424a2b8b4fb26b9483d2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 30 May 2020 01:13:40 +0300
Subject: [PATCH] Add useExistingConnectionIfAvailable option to UseOracle.

---
 ...ontextConfigurationContextOracleDevartExtensions.cs |  5 +++--
 .../AbpDbContextOptionsOracleDevartExtensions.cs       | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
index 9a768bb5ca..482ee8b9a8 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
@@ -10,9 +10,10 @@ namespace Volo.Abp.EntityFrameworkCore
     {
         public static DbContextOptionsBuilder UseOracle(
            [NotNull] this AbpDbContextConfigurationContext context,
-           [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
+           [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
+           bool useExistingConnectionIfAvailable = false)
         {
-            if (context.ExistingConnection != null)
+            if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
             {
                 return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction);
             }
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
index 22a8c1f7ab..20887ceb79 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
@@ -8,22 +8,24 @@ namespace Volo.Abp.EntityFrameworkCore
     {
         public static void UseOracle(
                 [NotNull] this AbpDbContextOptions options,
-                [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
+                [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
+                bool useExistingConnectionIfAvailable = false)
         {
             options.Configure(context =>
             {
-                context.UseOracle(oracleOptionsAction);
+                context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
             });
         }
 
         public static void UseOracle<TDbContext>(
             [NotNull] this AbpDbContextOptions options,
-            [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
+            [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
+            bool useExistingConnectionIfAvailable = false)
             where TDbContext : AbpDbContext<TDbContext>
         {
             options.Configure<TDbContext>(context =>
             {
-                context.UseOracle(oracleOptionsAction);
+                context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
             });
         }
     }