tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Devart.Data.Oracle.EFCore is supported net 5.

pull/6508/head
maliming 5 years ago
parent
d20707acb8
commit
3b265ddd09
6 changed files with 103 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
  2. 2
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
  3. 61
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
  4. 64
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
  5. 44
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
  6. 2
      nupkg/common.ps1

26
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
View File

@ -1,13 +1,13 @@
// using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
//
// namespace Microsoft.EntityFrameworkCore namespace Microsoft.EntityFrameworkCore
// { {
// public static class AbpOracleModelBuilderExtensions public static class AbpOracleModelBuilderExtensions
// { {
// public static void UseOracle( public static void UseOracle(
// this ModelBuilder modelBuilder) this ModelBuilder modelBuilder)
// { {
// modelBuilder.SetDatabaseProvider(EfCoreDatabaseProvider.Oracle); modelBuilder.SetDatabaseProvider(EfCoreDatabaseProvider.Oracle);
// } }
// } }
// } }

2
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
View File

@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!--<PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.11.1034" />--> <PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.14.1150" />
</ItemGroup> </ItemGroup>
</Project> </Project>

61
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
View File

@ -1,27 +1,34 @@
// using JetBrains.Annotations; using JetBrains.Annotations;
// using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
// using System; using System;
// using Devart.Data.Oracle.Entity; using Devart.Data.Oracle.Entity;
// using Volo.Abp.EntityFrameworkCore.DependencyInjection; using Volo.Abp.EntityFrameworkCore.DependencyInjection;
//
// namespace Volo.Abp.EntityFrameworkCore namespace Volo.Abp.EntityFrameworkCore
// { {
// public static class AbpDbContextConfigurationContextOracleDevartExtensions public static class AbpDbContextConfigurationContextOracleDevartExtensions
// { {
// public static DbContextOptionsBuilder UseOracle( public static DbContextOptionsBuilder UseOracle(
// [NotNull] this AbpDbContextConfigurationContext context, [NotNull] this AbpDbContextConfigurationContext context,
// [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null, [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
// bool useExistingConnectionIfAvailable = false) bool useExistingConnectionIfAvailable = false)
// { {
// TODO: UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery); if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
// if (useExistingConnectionIfAvailable && context.ExistingConnection != null) {
// { return context.DbContextOptions.UseOracle(context.ExistingConnection, optionsBuilder =>
// return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction); {
// } optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
// else oracleOptionsAction?.Invoke(optionsBuilder);
// { });
// return context.DbContextOptions.UseOracle(context.ConnectionString, oracleOptionsAction); }
// } else
// } {
// } return context.DbContextOptions.UseOracle(context.ConnectionString, optionsBuilder =>
// } {
optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
oracleOptionsAction?.Invoke(optionsBuilder);
});
}
}
}
}

64
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
View File

@ -1,32 +1,32 @@
// using JetBrains.Annotations; using JetBrains.Annotations;
// using System; using System;
// using Devart.Data.Oracle.Entity; using Devart.Data.Oracle.Entity;
//
// namespace Volo.Abp.EntityFrameworkCore namespace Volo.Abp.EntityFrameworkCore
// { {
// public static class AbpDbContextOptionsOracleDevartExtensions public static class AbpDbContextOptionsOracleDevartExtensions
// { {
// public static void UseOracle( public static void UseOracle(
// [NotNull] this AbpDbContextOptions options, [NotNull] this AbpDbContextOptions options,
// [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null, [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
// bool useExistingConnectionIfAvailable = false) bool useExistingConnectionIfAvailable = false)
// { {
// options.Configure(context => options.Configure(context =>
// { {
// context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable); context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
// }); });
// } }
//
// public static void UseOracle<TDbContext>( public static void UseOracle<TDbContext>(
// [NotNull] this AbpDbContextOptions options, [NotNull] this AbpDbContextOptions options,
// [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null, [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
// bool useExistingConnectionIfAvailable = false) bool useExistingConnectionIfAvailable = false)
// where TDbContext : AbpDbContext<TDbContext> where TDbContext : AbpDbContext<TDbContext>
// { {
// options.Configure<TDbContext>(context => options.Configure<TDbContext>(context =>
// { {
// context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable); context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
// }); });
// } }
// } }
// } }

44
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
View File

@ -1,22 +1,22 @@
// using Volo.Abp.Guids; using Volo.Abp.Guids;
// using Volo.Abp.Modularity; using Volo.Abp.Modularity;
//
// namespace Volo.Abp.EntityFrameworkCore.Oracle.Devart namespace Volo.Abp.EntityFrameworkCore.Oracle.Devart
// { {
// [DependsOn( [DependsOn(
// typeof(AbpEntityFrameworkCoreModule) typeof(AbpEntityFrameworkCoreModule)
// )] )]
// public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule
// { {
// public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
// { {
// Configure<AbpSequentialGuidGeneratorOptions>(options => Configure<AbpSequentialGuidGeneratorOptions>(options =>
// { {
// if (options.DefaultSequentialGuidType == null) if (options.DefaultSequentialGuidType == null)
// { {
// options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary; options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
// } }
// }); });
// } }
// } }
// } }

2
nupkg/common.ps1
View File

@ -87,7 +87,7 @@ $projects = (
"framework/src/Volo.Abp.EntityFrameworkCore", "framework/src/Volo.Abp.EntityFrameworkCore",
"framework/src/Volo.Abp.EntityFrameworkCore.MySQL", "framework/src/Volo.Abp.EntityFrameworkCore.MySQL",
# "framework/src/Volo.Abp.EntityFrameworkCore.Oracle", # "framework/src/Volo.Abp.EntityFrameworkCore.Oracle",
# "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart", "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart",
"framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql", "framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql",
"framework/src/Volo.Abp.EntityFrameworkCore.Sqlite", "framework/src/Volo.Abp.EntityFrameworkCore.Sqlite",
"framework/src/Volo.Abp.EntityFrameworkCore.SqlServer", "framework/src/Volo.Abp.EntityFrameworkCore.SqlServer",

Write Preview
Loading…
Cancel
Save