Browse Source

Cli: enable Oracle to database system

pull/8315/head
Yunus Emre Kalkan 6 years ago
parent
commit
8e9194e7b7
  1. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs
  2. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs
  3. 5
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/DatabaseManagementSystemChangeStep.cs

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@ -419,8 +419,8 @@ namespace Volo.Abp.Cli.Commands
return DatabaseManagementSystem.OracleDevart; return DatabaseManagementSystem.OracleDevart;
case "sqlite": case "sqlite":
return DatabaseManagementSystem.SQLite; return DatabaseManagementSystem.SQLite;
case "oracle": // Currently disabled. See https://github.com/abpframework/abp/issues/6513 case "oracle":
// return DatabaseManagementSystem.Oracle; return DatabaseManagementSystem.Oracle;
default: default:
return DatabaseManagementSystem.NotSpecified; return DatabaseManagementSystem.NotSpecified;
} }

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/ConnectionStringProvider.cs

@ -17,7 +17,7 @@ namespace Volo.Abp.Cli.Commands.Services
return "Server=localhost;Port=3306;Database=MyProjectName;Uid=root;Pwd=myPassword;"; return "Server=localhost;Port=3306;Database=MyProjectName;Uid=root;Pwd=myPassword;";
case DatabaseManagementSystem.PostgreSQL: case DatabaseManagementSystem.PostgreSQL:
return "Host=localhost;Port=5432;Database=MyProjectName;User ID=root;Password=myPassword;Pooling=true;MinimumPoolSize=0;MaximumPoolSize=100;Connection Lifetime=0;"; return "Host=localhost;Port=5432;Database=MyProjectName;User ID=root;Password=myPassword;Pooling=true;MinimumPoolSize=0;MaximumPoolSize=100;Connection Lifetime=0;";
//case DatabaseManagementSystem.Oracle: case DatabaseManagementSystem.Oracle:
case DatabaseManagementSystem.OracleDevart: case DatabaseManagementSystem.OracleDevart:
return "Data Source=MyProjectName;Integrated Security=yes;"; return "Data Source=MyProjectName;Integrated Security=yes;";
case DatabaseManagementSystem.SQLite: case DatabaseManagementSystem.SQLite:

5
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/DatabaseManagementSystemChangeStep.cs

@ -29,6 +29,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
ChangeEntityFrameworkCoreDependency(context,"Volo.Abp.EntityFrameworkCore.Oracle", ChangeEntityFrameworkCoreDependency(context,"Volo.Abp.EntityFrameworkCore.Oracle",
"Volo.Abp.EntityFrameworkCore.Oracle", "Volo.Abp.EntityFrameworkCore.Oracle",
"AbpEntityFrameworkCoreOracleModule"); "AbpEntityFrameworkCoreOracleModule");
AdjustOracleDbContextOptionsBuilder(context);
ChangeUseSqlServer(context,"UseOracle"); ChangeUseSqlServer(context,"UseOracle");
break; break;
@ -55,9 +56,9 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
private void AdjustOracleDbContextOptionsBuilder(ProjectBuildContext context) private void AdjustOracleDbContextOptionsBuilder(ProjectBuildContext context)
{ {
var dbContextFactoryFile = context.Files.FirstOrDefault(f => f.Name.EndsWith("MigrationsDbContextFactoryBase.cs", StringComparison.OrdinalIgnoreCase)) var dbContextFactoryFile = context.Files.FirstOrDefault(f => f.Name.EndsWith("MigrationsDbContextFactoryBase.cs", StringComparison.OrdinalIgnoreCase))
?? context.Files.First(f => f.Name.EndsWith("MigrationsDbContextFactory.cs", StringComparison.OrdinalIgnoreCase)); ?? context.Files.FirstOrDefault(f => f.Name.EndsWith("MigrationsDbContextFactory.cs", StringComparison.OrdinalIgnoreCase));
dbContextFactoryFile.ReplaceText("new DbContextOptionsBuilder", dbContextFactoryFile?.ReplaceText("new DbContextOptionsBuilder",
$"(DbContextOptionsBuilder<{context.BuildArgs.SolutionName.ProjectName}MigrationsDbContext>) new DbContextOptionsBuilder"); $"(DbContextOptionsBuilder<{context.BuildArgs.SolutionName.ProjectName}MigrationsDbContext>) new DbContextOptionsBuilder");
} }

Loading…
Cancel
Save