yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use parentKey and level to store tabs/property groups

Browse Source
This commit is contained in:
Ronald Barendse
2021-06-15 13:14:36 +02:00
parent 89c9d34553
commit f7f22dda42
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Core/Migrations/Upgrade/V_8_15_0/AddPropertyTypeGroupColumns.cs
View File

@@ -12,9 +12,21 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_15_0
public override void Migrate()
{
var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToList();
AddColumnIfNotExists<PropertyTypeGroupDto>(columns, "parentId");
// Add new columns
AddColumnIfNotExists<PropertyTypeGroupDto>(columns, "parentKey");
AddColumnIfNotExists<PropertyTypeGroupDto>(columns, "level");
AddColumnIfNotExists<PropertyTypeGroupDto>(columns, "icon");
// Create self-referencing foreign key
var constraints = SqlSyntax.GetConstraintsPerTable(Context.Database).ToList();
if (!constraints.Any(x => x.Item1.InvariantEquals(PropertyTypeGroupDto.TableName) && x.Item2.InvariantEquals("FK_cmsPropertyTypeGroup_parentKey")))
{
Create.ForeignKey("FK_cmsPropertyTypeGroup_parentKey")
.FromTable(PropertyTypeGroupDto.TableName).ForeignColumn("parentKey")
.ToTable(PropertyTypeGroupDto.TableName).PrimaryColumn("uniqueID")
.Do();
}
}
}
}

21
src/Umbraco.Core/Persistence/Dtos/PropertyTypeGroupDto.cs
View File

@@ -17,9 +17,20 @@ namespace Umbraco.Core.Persistence.Dtos
[PrimaryKeyColumn(IdentitySeed = 12)]
public int Id { get; set; }
[Column("parentId")]
[Column("uniqueID")]
[NullSetting(NullSetting = NullSettings.NotNull)]
[Constraint(Default = SystemMethods.NewGuid)]
[Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsPropertyTypeGroupUniqueID")]
public Guid UniqueId { get; set; }
[Column("parentKey")]
[NullSetting(NullSetting = NullSettings.Null)]
public int? ParentId { get; set; }
[ForeignKey(typeof(PropertyTypeGroupDto), Column = "uniqueID", Name = "FK_" + TableName + "_parentKey")]
public Guid? ParentKey { get; set; }
[Column("level")]
[Constraint(Default = 1)] // TODO We default to 1 (property group) for backwards compatibility, but should use zero/no default at some point.
public short Level { get; set; }
[Column("contenttypeNodeId")]
[ForeignKey(typeof(ContentTypeDto), Column = "nodeId")]
@@ -38,11 +49,5 @@ namespace Umbraco.Core.Persistence.Dtos
[ResultColumn]
[Reference(ReferenceType.Many, ReferenceMemberName = "PropertyTypeGroupId")]
public List<PropertyTypeDto> PropertyTypeDtos { get; set; }
[Column("uniqueID")]
[NullSetting(NullSetting = NullSettings.NotNull)]
[Constraint(Default = SystemMethods.NewGuid)]
[Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsPropertyTypeGroupUniqueID")]
public Guid UniqueId { get; set; }
}
}