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

Fix LockDto, had wrong primary key + missing rows

Browse Source
This commit is contained in:
Stephan
2018-10-17 13:58:18 +02:00
parent 7c1c6f6806
commit d324466fe1
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
View File

@@ -149,6 +149,7 @@ namespace Umbraco.Core.Migrations.Install
_database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.MemberTypes, Name = "MemberTypes" });
_database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.MemberTree, Name = "MemberTree" });
_database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.Domains, Name = "Domains" });
_database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.KeyValues, Name = "KeyValues" });
_database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.Languages, Name = "Languages" });
}

4
src/Umbraco.Core/Persistence/Dtos/LockDto.cs
View File

@@ -4,12 +4,12 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
namespace Umbraco.Core.Persistence.Dtos
{
[TableName(Constants.DatabaseSchema.Tables.Lock)]
[PrimaryKey("id")]
[PrimaryKey("id", AutoIncrement = false)]
[ExplicitColumns]
internal class LockDto
{
[Column("id")]
[PrimaryKeyColumn(Name = "PK_umbracoLock")]
[PrimaryKeyColumn(Name = "PK_umbracoLock", AutoIncrement = false)]
public int Id { get; set; }
[Column("value")]

3
src/Umbraco.Tests/Persistence/LocksTests.cs
View File

@@ -25,12 +25,9 @@ namespace Umbraco.Tests.Persistence
using (var scope = ScopeProvider.CreateScope())
{
var database = scope.Database;
database.Execute("SET IDENTITY_INSERT umbracoLock ON");
database.Insert("umbracoLock", "id", false, new LockDto { Id = 1, Name = "Lock.1" });
database.Insert("umbracoLock", "id", false, new LockDto { Id = 2, Name = "Lock.2" });
database.Insert("umbracoLock", "id", false, new LockDto { Id = 3, Name = "Lock.3" });
database.Execute("SET IDENTITY_INSERT umbracoLock OFF");
database.CompleteTransaction();
scope.Complete();
}
}