Browse Source

Change database provider to PostgreSQL for Ordering Service

pull/28/head
enisn 5 years ago
parent
commit
2739b89493
  1. 2
      services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj
  2. 7
      services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EntityFrameworkCore/OrderingServiceDbContextFactory.cs
  3. 9
      services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EntityFrameworkCore/OrderingServiceEntityFrameworkCoreModule.cs
  4. 12
      services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/Migrations/20211125130659_Initial.Designer.cs
  5. 0
      services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/Migrations/20211125130659_Initial.cs
  6. 10
      services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/Migrations/OrderingServiceDbContextModelSnapshot.cs
  7. 4
      services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/appsettings.json

2
services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EShopOnAbp.OrderingService.EntityFrameworkCore.csproj

@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\EShopOnAbp.OrderingService.Domain\EShopOnAbp.OrderingService.Domain.csproj" /> <ProjectReference Include="..\EShopOnAbp.OrderingService.Domain\EShopOnAbp.OrderingService.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="5.0.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

7
services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EntityFrameworkCore/OrderingServiceDbContextFactory.cs

@ -16,7 +16,12 @@ namespace EShopOnAbp.OrderingService.EntityFrameworkCore
var configuration = BuildConfiguration(); var configuration = BuildConfiguration();
var builder = new DbContextOptionsBuilder<OrderingServiceDbContext>() var builder = new DbContextOptionsBuilder<OrderingServiceDbContext>()
.UseSqlServer(configuration.GetConnectionString("Default")); .UseNpgsql(
configuration.GetConnectionString(OrderingServiceDbProperties.ConnectionStringName),
b =>
{
b.MigrationsHistoryTable("__OrderingService_Migrations");
});
return new OrderingServiceDbContext(builder.Options); return new OrderingServiceDbContext(builder.Options);
} }

9
services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EntityFrameworkCore/OrderingServiceEntityFrameworkCoreModule.cs

@ -1,13 +1,13 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.SqlServer; using Volo.Abp.EntityFrameworkCore.PostgreSql;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
namespace EShopOnAbp.OrderingService.EntityFrameworkCore namespace EShopOnAbp.OrderingService.EntityFrameworkCore
{ {
[DependsOn( [DependsOn(
typeof(OrderingServiceDomainModule), typeof(OrderingServiceDomainModule),
typeof(AbpEntityFrameworkCoreSqlServerModule) typeof(AbpEntityFrameworkCorePostgreSqlModule)
)] )]
public class OrderingServiceEntityFrameworkCoreModule : AbpModule public class OrderingServiceEntityFrameworkCoreModule : AbpModule
{ {
@ -29,7 +29,10 @@ namespace EShopOnAbp.OrderingService.EntityFrameworkCore
{ {
/* The main point to change your DBMS. /* The main point to change your DBMS.
* See also OrderingServiceMigrationsDbContextFactory for EF Core tooling. */ * See also OrderingServiceMigrationsDbContextFactory for EF Core tooling. */
options.UseSqlServer(); options.UseNpgsql(b =>
{
b.MigrationsHistoryTable("__OrderingService_Migrations");
});
}); });
} }
} }

12
services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/Migrations/20211012121150_Initial.Designer.cs → services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/Migrations/20211125130659_Initial.Designer.cs

@ -2,9 +2,9 @@
using EShopOnAbp.OrderingService.EntityFrameworkCore; using EShopOnAbp.OrderingService.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
#nullable disable #nullable disable
@ -12,18 +12,18 @@ using Volo.Abp.EntityFrameworkCore;
namespace EShopOnAbp.OrderingService.Migrations namespace EShopOnAbp.OrderingService.Migrations
{ {
[DbContext(typeof(OrderingServiceDbContext))] [DbContext(typeof(OrderingServiceDbContext))]
[Migration("20211012121150_Initial")] [Migration("20211125130659_Initial")]
partial class Initial partial class Initial
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "6.0.0-rc.1.21452.10") .HasAnnotation("ProductVersion", "6.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 128); .HasAnnotation("Relational:MaxIdentifierLength", 63);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
#pragma warning restore 612, 618 #pragma warning restore 612, 618
} }
} }

0
services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/Migrations/20211012121150_Initial.cs → services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/Migrations/20211125130659_Initial.cs

10
services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/Migrations/OrderingServiceDbContextModelSnapshot.cs

@ -2,8 +2,8 @@
using EShopOnAbp.OrderingService.EntityFrameworkCore; using EShopOnAbp.OrderingService.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
#nullable disable #nullable disable
@ -17,11 +17,11 @@ namespace EShopOnAbp.OrderingService.Migrations
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "6.0.0-rc.1.21452.10") .HasAnnotation("ProductVersion", "6.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 128); .HasAnnotation("Relational:MaxIdentifierLength", 63);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
#pragma warning restore 612, 618 #pragma warning restore 612, 618
} }
} }

4
services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/appsettings.json

@ -18,8 +18,8 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"OrderingService": "Server=localhost,1434;Database=EShopOnAbp_Ordering;User Id=sa;password=myPassw0rd;MultipleActiveResultSets=true", "OrderingService": "User ID=postgres;Password=myPassw0rd;Host=localhost;Port=5432;Database=EShopOnAbp_Ordering;Pooling=false",
"AdministrationService": "Server=localhost,1434;Database=EShopOnAbp_Administration;User Id=sa;password=myPassw0rd;MultipleActiveResultSets=true" "AdministrationService": "User ID=postgres;Password=myPassw0rd;Host=localhost;Port=5432;Database=EShopOnAbp_Administration;Pooling=false;"
}, },
"StringEncryption": { "StringEncryption": {
"DefaultPassPhrase": "0f000WgRXnVk0704" "DefaultPassPhrase": "0f000WgRXnVk0704"

Loading…
Cancel
Save