Skip to content

Commit

Permalink
Merge branch 'release/3.201.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vc-ci committed Jul 13, 2023
2 parents 02c2759 + a3df31e commit ad21a5d
Show file tree
Hide file tree
Showing 37 changed files with 1,157 additions and 42 deletions.
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?><Project>
<!-- These properties will be shared for all projects -->
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<VersionPrefix>3.200.0</VersionPrefix>
<VersionPrefix>3.201.0</VersionPrefix>
<VersionSuffix>
</VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
Expand Down
23 changes: 22 additions & 1 deletion VirtoCommerce.ImportModule.sln
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtoCommerce.ImportModule.Data.MySql", "src\VirtoCommerce.ImportModule.Data.MySql\VirtoCommerce.ImportModule.Data.MySql.csproj", "{4880C5C0-9001-4F9E-AD7C-99B70E474A9D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtoCommerce.ImportModule.Data.PostgreSql", "src\VirtoCommerce.ImportModule.Data.PostgreSql\VirtoCommerce.ImportModule.Data.PostgreSql.csproj", "{4B6ABAC0-1229-419D-B15B-0A3B54388AC0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtoCommerce.ImportModule.Data.SqlServer", "src\VirtoCommerce.ImportModule.Data.SqlServer\VirtoCommerce.ImportModule.Data.SqlServer.csproj", "{67E9E646-3222-4CA3-8CED-5FDCB2C5DEFA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -58,6 +64,18 @@ Global
{866C6093-7B23-473D-86AF-F5FD59970747}.Debug|Any CPU.Build.0 = Debug|Any CPU
{866C6093-7B23-473D-86AF-F5FD59970747}.Release|Any CPU.ActiveCfg = Release|Any CPU
{866C6093-7B23-473D-86AF-F5FD59970747}.Release|Any CPU.Build.0 = Release|Any CPU
{4880C5C0-9001-4F9E-AD7C-99B70E474A9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4880C5C0-9001-4F9E-AD7C-99B70E474A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4880C5C0-9001-4F9E-AD7C-99B70E474A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4880C5C0-9001-4F9E-AD7C-99B70E474A9D}.Release|Any CPU.Build.0 = Release|Any CPU
{4B6ABAC0-1229-419D-B15B-0A3B54388AC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B6ABAC0-1229-419D-B15B-0A3B54388AC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B6ABAC0-1229-419D-B15B-0A3B54388AC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B6ABAC0-1229-419D-B15B-0A3B54388AC0}.Release|Any CPU.Build.0 = Release|Any CPU
{67E9E646-3222-4CA3-8CED-5FDCB2C5DEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67E9E646-3222-4CA3-8CED-5FDCB2C5DEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67E9E646-3222-4CA3-8CED-5FDCB2C5DEFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67E9E646-3222-4CA3-8CED-5FDCB2C5DEFA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -69,9 +87,12 @@ Global
{9855708F-B80A-4B01-BA46-5932B267D22E} = {CFC1B42A-2604-4030-BD28-7706B47C6365}
{6F6272B0-9C4F-4166-8942-BE39002194DE} = {F4A093B3-4F51-44FC-9A2E-18BE17F7541A}
{866C6093-7B23-473D-86AF-F5FD59970747} = {F4A093B3-4F51-44FC-9A2E-18BE17F7541A}
{4880C5C0-9001-4F9E-AD7C-99B70E474A9D} = {CFC1B42A-2604-4030-BD28-7706B47C6365}
{4B6ABAC0-1229-419D-B15B-0A3B54388AC0} = {CFC1B42A-2604-4030-BD28-7706B47C6365}
{67E9E646-3222-4CA3-8CED-5FDCB2C5DEFA} = {CFC1B42A-2604-4030-BD28-7706B47C6365}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {46EEF8CA-0424-44E1-A7C6-AC27D8797DB5}
882C72C9-3D60-40B4-8DF5-E8630BD7511A = {882C72C9-3D60-40B4-8DF5-E8630BD7511A}
SolutionGuid = {46EEF8CA-0424-44E1-A7C6-AC27D8797DB5}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Microsoft.EntityFrameworkCore;

namespace VirtoCommerce.ImportModule.Data.MySql;

public static class DbContextOptionsBuilderExtensions
{
/// <summary>
/// Configures the context to use MySql.
/// </summary>
public static DbContextOptionsBuilder UseMySqlDatabase(this DbContextOptionsBuilder builder, string connectionString) =>
builder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), db => db
.MigrationsAssembly(typeof(MySqlDbContextFactory).Assembly.GetName().Name));
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;

#nullable disable

namespace VirtoCommerce.ImportModule.Data.MySql.Migrations
{
public partial class Initial : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterDatabase()
.Annotation("MySql:CharSet", "utf8mb4");

migrationBuilder.CreateTable(
name: "ImportProfile",
columns: table => new
{
Id = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
Name = table.Column<string>(type: "varchar(1024)", maxLength: 1024, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
DataImporterType = table.Column<string>(type: "varchar(254)", maxLength: 254, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
UserId = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
UserName = table.Column<string>(type: "varchar(254)", maxLength: 254, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
CreatedDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
ModifiedDate = table.Column<DateTime>(type: "datetime(6)", nullable: true),
CreatedBy = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
ModifiedBy = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
},
constraints: table =>
{
table.PrimaryKey("PK_ImportProfile", x => x.Id);
})
.Annotation("MySql:CharSet", "utf8mb4");

migrationBuilder.CreateTable(
name: "ImportRunHistory",
columns: table => new
{
Id = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
UserId = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
ProfileId = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
ProfileName = table.Column<string>(type: "varchar(1024)", maxLength: 1024, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
JobId = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
Executed = table.Column<DateTime>(type: "datetime(6)", nullable: false),
Finished = table.Column<DateTime>(type: "datetime(6)", nullable: true),
TotalCount = table.Column<int>(type: "int", nullable: false),
ProcessedCount = table.Column<int>(type: "int", nullable: false),
ErrorsCount = table.Column<int>(type: "int", nullable: false),
Errors = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
FileUrl = table.Column<string>(type: "varchar(2048)", maxLength: 2048, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
ReportUrl = table.Column<string>(type: "varchar(2048)", maxLength: 2048, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
CreatedDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
ModifiedDate = table.Column<DateTime>(type: "datetime(6)", nullable: true),
CreatedBy = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
ModifiedBy = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4")
},
constraints: table =>
{
table.PrimaryKey("PK_ImportRunHistory", x => x.Id);
})
.Annotation("MySql:CharSet", "utf8mb4");

migrationBuilder.CreateIndex(
name: "IX_ImportProfile_UserId_Name",
table: "ImportProfile",
columns: new[] { "UserId", "Name" });

migrationBuilder.CreateIndex(
name: "IX_ImportRunHistory_JobId",
table: "ImportRunHistory",
column: "JobId");

migrationBuilder.CreateIndex(
name: "IX_ImportRunHistory_ProfileId",
table: "ImportRunHistory",
column: "ProfileId");

migrationBuilder.CreateIndex(
name: "IX_ImportRunHistory_UserId",
table: "ImportRunHistory",
column: "UserId");
}

protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "ImportProfile");

migrationBuilder.DropTable(
name: "ImportRunHistory");
}
}
}
Loading

0 comments on commit ad21a5d

Please sign in to comment.