forked from abpframework/abp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into cms-kit/pages-prefix
- Loading branch information
Showing
264 changed files
with
517,289 additions
and
563 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 33 additions & 26 deletions
59
...e.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,33 @@ | ||
| // using JetBrains.Annotations; | ||
| // using Microsoft.EntityFrameworkCore; | ||
| // using System; | ||
| // using Oracle.EntityFrameworkCore.Infrastructure; | ||
| // using Volo.Abp.EntityFrameworkCore.DependencyInjection; | ||
| // | ||
| // namespace Volo.Abp.EntityFrameworkCore | ||
| // { | ||
| // public static class AbpDbContextConfigurationContextOracleExtensions | ||
| // { | ||
| // public static DbContextOptionsBuilder UseOracle( | ||
| // [NotNull] this AbpDbContextConfigurationContext context, | ||
| // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) | ||
| // { | ||
| // TODO: UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery); | ||
| // if (context.ExistingConnection != null) | ||
| // { | ||
| // return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction); | ||
| // } | ||
| // else | ||
| // { | ||
| // return context.DbContextOptions.UseOracle(context.ConnectionString, oracleOptionsAction); | ||
| // } | ||
| // } | ||
| // } | ||
| // } | ||
| using JetBrains.Annotations; | ||
| using Microsoft.EntityFrameworkCore; | ||
| using System; | ||
| using Oracle.EntityFrameworkCore.Infrastructure; | ||
| using Volo.Abp.EntityFrameworkCore.DependencyInjection; | ||
|
|
||
| namespace Volo.Abp.EntityFrameworkCore | ||
| { | ||
| public static class AbpDbContextConfigurationContextOracleExtensions | ||
| { | ||
| public static DbContextOptionsBuilder UseOracle( | ||
| [NotNull] this AbpDbContextConfigurationContext context, | ||
| [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) | ||
| { | ||
| if (context.ExistingConnection != null) | ||
| { | ||
| return context.DbContextOptions.UseOracle(context.ExistingConnection, optionsBuilder => | ||
| { | ||
| optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery); | ||
| oracleOptionsAction?.Invoke(optionsBuilder); | ||
| }); | ||
| } | ||
| else | ||
| { | ||
| return context.DbContextOptions.UseOracle(context.ConnectionString, optionsBuilder => | ||
| { | ||
| optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery); | ||
| oracleOptionsAction?.Invoke(optionsBuilder); | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| } |
60 changes: 30 additions & 30 deletions
60
...yFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| // using JetBrains.Annotations; | ||
| // using System; | ||
| // using Oracle.EntityFrameworkCore.Infrastructure; | ||
| // | ||
| // namespace Volo.Abp.EntityFrameworkCore | ||
| // { | ||
| // public static class AbpDbContextOptionsOracleExtensions | ||
| // { | ||
| // public static void UseOracle( | ||
| // [NotNull] this AbpDbContextOptions options, | ||
| // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) | ||
| // { | ||
| // options.Configure(context => | ||
| // { | ||
| // context.UseOracle(oracleOptionsAction); | ||
| // }); | ||
| // } | ||
| // | ||
| // public static void UseOracle<TDbContext>( | ||
| // [NotNull] this AbpDbContextOptions options, | ||
| // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) | ||
| // where TDbContext : AbpDbContext<TDbContext> | ||
| // { | ||
| // options.Configure<TDbContext>(context => | ||
| // { | ||
| // context.UseOracle(oracleOptionsAction); | ||
| // }); | ||
| // } | ||
| // } | ||
| // } | ||
| using JetBrains.Annotations; | ||
| using System; | ||
| using Oracle.EntityFrameworkCore.Infrastructure; | ||
|
|
||
| namespace Volo.Abp.EntityFrameworkCore | ||
| { | ||
| public static class AbpDbContextOptionsOracleExtensions | ||
| { | ||
| public static void UseOracle( | ||
| [NotNull] this AbpDbContextOptions options, | ||
| [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) | ||
| { | ||
| options.Configure(context => | ||
| { | ||
| context.UseOracle(oracleOptionsAction); | ||
| }); | ||
| } | ||
|
|
||
| public static void UseOracle<TDbContext>( | ||
| [NotNull] this AbpDbContextOptions options, | ||
| [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) | ||
| where TDbContext : AbpDbContext<TDbContext> | ||
| { | ||
| options.Configure<TDbContext>(context => | ||
| { | ||
| context.UseOracle(oracleOptionsAction); | ||
| }); | ||
| } | ||
| } | ||
| } |
42 changes: 20 additions & 22 deletions
42
...workCore.Oracle/Volo/Abp/EntityFrameworkCore/Oracle/AbpEntityFrameworkCoreOracleModule.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,20 @@ | ||
| // using Volo.Abp.Guids; | ||
| // using Volo.Abp.Modularity; | ||
| // | ||
| // namespace Volo.Abp.EntityFrameworkCore.Oracle | ||
| // { | ||
| // [DependsOn( | ||
| // typeof(AbpEntityFrameworkCoreModule) | ||
| // )] | ||
| // public class AbpEntityFrameworkCoreOracleModule : AbpModule | ||
| // { | ||
| // public override void ConfigureServices(ServiceConfigurationContext context) | ||
| // { | ||
| // Configure<AbpSequentialGuidGeneratorOptions>(options => | ||
| // { | ||
| // if (options.DefaultSequentialGuidType == null) | ||
| // { | ||
| // options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary; | ||
| // } | ||
| // }); | ||
| // } | ||
| // } | ||
| // } | ||
| using Volo.Abp.Guids; | ||
| using Volo.Abp.Modularity; | ||
|
|
||
| namespace Volo.Abp.EntityFrameworkCore.Oracle | ||
| { | ||
| [DependsOn(typeof(AbpEntityFrameworkCoreModule))] | ||
| public class AbpEntityFrameworkCoreOracleModule : AbpModule | ||
| { | ||
| public override void ConfigureServices(ServiceConfigurationContext context) | ||
| { | ||
| Configure<AbpSequentialGuidGeneratorOptions>(options => | ||
| { | ||
| if (options.DefaultSequentialGuidType == null) | ||
| { | ||
| options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary; | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.