Browse Source

Merge pull request #13801 from abpframework/DisabledTransactionForSqlite

Disabled transaction for sqlite.
pull/13802/head
liangshiwei 4 years ago
committed by GitHub
parent
commit
92bfd6b420
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs
  2. 5
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
  3. 8
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs
  4. 8
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs
  5. 8
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs
  6. 8
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs

5
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs

@ -41,10 +41,7 @@ public abstract class AppNoLayersTemplateBase : AppTemplateBase
break;
}
if (context.BuildArgs.DatabaseManagementSystem == DatabaseManagementSystem.PostgreSQL)
{
context.Symbols.Add("dbms:PostgreSQL");
}
context.Symbols.Add($"dbms:{context.BuildArgs.DatabaseManagementSystem}");
switch (context.BuildArgs.UiFramework)
{

5
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@ -109,10 +109,7 @@ public abstract class AppTemplateBase : TemplateInfo
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests"));
}
if (context.BuildArgs.DatabaseManagementSystem == DatabaseManagementSystem.PostgreSQL)
{
context.Symbols.Add("dbms:PostgreSQL");
}
context.Symbols.Add($"dbms:{context.BuildArgs.DatabaseManagementSystem}");
}
protected void DeleteUnrelatedProjects(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)

8
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs

@ -8,6 +8,7 @@ using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.Menus;
using OpenIddict.Validation.AspNetCore;
using Volo.Abp;
using Volo.Abp.Uow;
using Volo.Abp.Account;
using Volo.Abp.Account.Web;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
@ -317,6 +318,13 @@ public class MyProjectNameModule : AbpModule
configurationContext.UseSqlServer();
});
});
//<TEMPLATE-REMOVE IF-NOT='dbms:SQLite'>
Configure<AbpUnitOfWorkDefaultOptions>(options =>
{
options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
});
//</TEMPLATE-REMOVE>
}
public override void OnApplicationInitialization(ApplicationInitializationContext context)

8
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs

@ -7,6 +7,7 @@ using MyCompanyName.MyProjectName.Data;
using MyCompanyName.MyProjectName.Localization;
using OpenIddict.Validation.AspNetCore;
using Volo.Abp;
using Volo.Abp.Uow;
using Volo.Abp.Account;
using Volo.Abp.Account.Web;
using Volo.Abp.AspNetCore.MultiTenancy;
@ -314,6 +315,13 @@ public class MyProjectNameModule : AbpModule
configurationContext.UseSqlServer();
});
});
//<TEMPLATE-REMOVE IF-NOT='dbms:SQLite'>
Configure<AbpUnitOfWorkDefaultOptions>(options =>
{
options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
});
//</TEMPLATE-REMOVE>
}
public override void OnApplicationInitialization(ApplicationInitializationContext context)

8
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs

@ -6,6 +6,7 @@ using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.Menus;
using OpenIddict.Validation.AspNetCore;
using Volo.Abp;
using Volo.Abp.Uow;
using Volo.Abp.Account;
using Volo.Abp.Account.Web;
using Volo.Abp.AspNetCore.Mvc;
@ -295,6 +296,13 @@ public class MyProjectNameModule : AbpModule
configurationContext.UseSqlServer();
});
});
//<TEMPLATE-REMOVE IF-NOT='dbms:SQLite'>
Configure<AbpUnitOfWorkDefaultOptions>(options =>
{
options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
});
//</TEMPLATE-REMOVE>
}
public override void OnApplicationInitialization(ApplicationInitializationContext context)

8
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs

@ -1,5 +1,6 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Uow;
using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
@ -53,5 +54,12 @@ public class MyProjectNameEntityFrameworkCoreModule : AbpModule
* See also MyProjectNameMigrationsDbContextFactory for EF Core tooling. */
options.UseSqlServer();
});
//<TEMPLATE-REMOVE IF-NOT='dbms:SQLite'>
Configure<AbpUnitOfWorkDefaultOptions>(options =>
{
options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
});
//</TEMPLATE-REMOVE>
}
}

Loading…
Cancel
Save