Skip to content

Commit

Permalink
Merge pull request #115 from EasyAbp/fix-unique-index
Browse files Browse the repository at this point in the history 
Introduce `SoftDeletionToken` and fix indexes
  • Loading branch information
@gdlcf88
gdlcf88 authored Dec 18, 2023
2 parents 0e3d698 + ef7841a commit 1fb9369
Show file tree
Hide file tree
Showing 14 changed files with 3,684 additions and 14 deletions.
1,632 changes: 1,632 additions & 0 deletions ...t.Blazor.Server.Host/Migrations/20231218145009_AddedSoftDeletionTokenProperty.Designer.cs
View file

Large diffs are not rendered by default.

67 changes: 67 additions & 0 deletions ...Management.Blazor.Server.Host/Migrations/20231218145009_AddedSoftDeletionTokenProperty.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
using Microsoft.EntityFrameworkCore.Migrations;

#nullable disable

namespace EasyAbp.FileManagement.Blazor.Server.Host.Migrations
{
/// <inheritdoc />
public partial class AddedSoftDeletionTokenProperty : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_EasyAbpFileManagementFiles_FileName_ParentId_OwnerUserId_FileContainerName",
table: "EasyAbpFileManagementFiles");

migrationBuilder.DropIndex(
name: "IX_EasyAbpFileManagementFiles_ParentId_OwnerUserId_FileContainerName",
table: "EasyAbpFileManagementFiles");

migrationBuilder.AddColumn<string>(
name: "SoftDeletionToken",
table: "EasyAbpFileManagementFiles",
type: "nvarchar(450)",
nullable: true);

migrationBuilder.CreateIndex(
name: "IX_EasyAbpFileManagementFiles_FileName_ParentId_OwnerUserId_FileContainerName_TenantId_SoftDeletionToken",
table: "EasyAbpFileManagementFiles",
columns: new[] { "FileName", "ParentId", "OwnerUserId", "FileContainerName", "TenantId", "SoftDeletionToken" },
unique: true);

migrationBuilder.CreateIndex(
name: "IX_EasyAbpFileManagementFiles_ParentId_OwnerUserId_FileContainerName_FileName",
table: "EasyAbpFileManagementFiles",
columns: new[] { "ParentId", "OwnerUserId", "FileContainerName", "FileName" });
}

/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_EasyAbpFileManagementFiles_FileName_ParentId_OwnerUserId_FileContainerName_TenantId_SoftDeletionToken",
table: "EasyAbpFileManagementFiles");

migrationBuilder.DropIndex(
name: "IX_EasyAbpFileManagementFiles_ParentId_OwnerUserId_FileContainerName_FileName",
table: "EasyAbpFileManagementFiles");

migrationBuilder.DropColumn(
name: "SoftDeletionToken",
table: "EasyAbpFileManagementFiles");

migrationBuilder.CreateIndex(
name: "IX_EasyAbpFileManagementFiles_FileName_ParentId_OwnerUserId_FileContainerName",
table: "EasyAbpFileManagementFiles",
columns: new[] { "FileName", "ParentId", "OwnerUserId", "FileContainerName" },
unique: true,
filter: "[FileName] IS NOT NULL AND [ParentId] IS NOT NULL AND [OwnerUserId] IS NOT NULL AND [FileContainerName] IS NOT NULL");

migrationBuilder.CreateIndex(
name: "IX_EasyAbpFileManagementFiles_ParentId_OwnerUserId_FileContainerName",
table: "EasyAbpFileManagementFiles",
columns: new[] { "ParentId", "OwnerUserId", "FileContainerName" });
}
}
}
10 changes: 6 additions & 4 deletions host/EasyAbp.FileManagement.Blazor.Server.Host/Migrations/UnifiedDbContextModelSnapshot.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<Guid?>("ParentId")
.HasColumnType("uniqueidentifier");

b.Property<string>("SoftDeletionToken")
.HasColumnType("nvarchar(450)");

b.Property<int>("SubFilesQuantity")
.HasColumnType("int");

Expand All @@ -121,11 +124,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.HasIndex("Hash");

b.HasIndex("ParentId", "OwnerUserId", "FileContainerName");
b.HasIndex("ParentId", "OwnerUserId", "FileContainerName", "FileName");

b.HasIndex("FileName", "ParentId", "OwnerUserId", "FileContainerName")
.IsUnique()
.HasFilter("[FileName] IS NOT NULL AND [ParentId] IS NOT NULL AND [OwnerUserId] IS NOT NULL AND [FileContainerName] IS NOT NULL");
b.HasIndex("FileName", "ParentId", "OwnerUserId", "FileContainerName", "TenantId", "SoftDeletionToken")
.IsUnique();

b.ToTable("EasyAbpFileManagementFiles", (string)null);
});
Expand Down
140 changes: 140 additions & 0 deletions ...agement.HttpApi.Host/Migrations/20231218144924_AddedSoftDeletionTokenProperty.Designer.cs
View file

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

67 changes: 67 additions & 0 deletions ...p.FileManagement.HttpApi.Host/Migrations/20231218144924_AddedSoftDeletionTokenProperty.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
using Microsoft.EntityFrameworkCore.Migrations;

#nullable disable

namespace EasyAbp.FileManagement.Migrations
{
/// <inheritdoc />
public partial class AddedSoftDeletionTokenProperty : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_EasyAbpFileManagementFiles_FileName_ParentId_OwnerUserId_FileContainerName",
table: "EasyAbpFileManagementFiles");

migrationBuilder.DropIndex(
name: "IX_EasyAbpFileManagementFiles_ParentId_OwnerUserId_FileContainerName",
table: "EasyAbpFileManagementFiles");

migrationBuilder.AddColumn<string>(
name: "SoftDeletionToken",
table: "EasyAbpFileManagementFiles",
type: "nvarchar(450)",
nullable: true);

migrationBuilder.CreateIndex(
name: "IX_EasyAbpFileManagementFiles_FileName_ParentId_OwnerUserId_FileContainerName_TenantId_SoftDeletionToken",
table: "EasyAbpFileManagementFiles",
columns: new[] { "FileName", "ParentId", "OwnerUserId", "FileContainerName", "TenantId", "SoftDeletionToken" },
unique: true);

migrationBuilder.CreateIndex(
name: "IX_EasyAbpFileManagementFiles_ParentId_OwnerUserId_FileContainerName_FileName",
table: "EasyAbpFileManagementFiles",
columns: new[] { "ParentId", "OwnerUserId", "FileContainerName", "FileName" });
}

/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_EasyAbpFileManagementFiles_FileName_ParentId_OwnerUserId_FileContainerName_TenantId_SoftDeletionToken",
table: "EasyAbpFileManagementFiles");

migrationBuilder.DropIndex(
name: "IX_EasyAbpFileManagementFiles_ParentId_OwnerUserId_FileContainerName_FileName",
table: "EasyAbpFileManagementFiles");

migrationBuilder.DropColumn(
name: "SoftDeletionToken",
table: "EasyAbpFileManagementFiles");

migrationBuilder.CreateIndex(
name: "IX_EasyAbpFileManagementFiles_FileName_ParentId_OwnerUserId_FileContainerName",
table: "EasyAbpFileManagementFiles",
columns: new[] { "FileName", "ParentId", "OwnerUserId", "FileContainerName" },
unique: true,
filter: "[FileName] IS NOT NULL AND [ParentId] IS NOT NULL AND [OwnerUserId] IS NOT NULL AND [FileContainerName] IS NOT NULL");

migrationBuilder.CreateIndex(
name: "IX_EasyAbpFileManagementFiles_ParentId_OwnerUserId_FileContainerName",
table: "EasyAbpFileManagementFiles",
columns: new[] { "ParentId", "OwnerUserId", "FileContainerName" });
}
}
}
10 changes: 6 additions & 4 deletions ...ment.HttpApi.Host/Migrations/FileManagementHttpApiHostMigrationsDbContextModelSnapshot.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<Guid?>("ParentId")
.HasColumnType("uniqueidentifier");

b.Property<string>("SoftDeletionToken")
.HasColumnType("nvarchar(450)");

b.Property<int>("SubFilesQuantity")
.HasColumnType("int");

Expand All @@ -121,11 +124,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.HasIndex("Hash");

b.HasIndex("ParentId", "OwnerUserId", "FileContainerName");
b.HasIndex("ParentId", "OwnerUserId", "FileContainerName", "FileName");

b.HasIndex("FileName", "ParentId", "OwnerUserId", "FileContainerName")
.IsUnique()
.HasFilter("[FileName] IS NOT NULL AND [ParentId] IS NOT NULL AND [OwnerUserId] IS NOT NULL AND [FileContainerName] IS NOT NULL");
b.HasIndex("FileName", "ParentId", "OwnerUserId", "FileContainerName", "TenantId", "SoftDeletionToken")
.IsUnique();

b.ToTable("EasyAbpFileManagementFiles", (string)null);
});
Expand Down
Loading

0 comments on commit 1fb9369

Please sign in to comment.