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

Cleanup Dtos

Browse Source
This commit is contained in:
Stephan
2018-05-18 17:19:27 +02:00
parent 9e1d19d56a
commit 518ccd5686
9 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Persistence/Dtos/ContentDto.cs
View File

@@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Dtos
[ExplicitColumns]
internal class ContentDto
{
private const string TableName = Constants.DatabaseSchema.Tables.Content;
public const string TableName = Constants.DatabaseSchema.Tables.Content;
[Column("nodeId")]
[PrimaryKeyColumn(AutoIncrement = false)]

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

@@ -3,11 +3,13 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
namespace Umbraco.Core.Persistence.Dtos
{
[TableName(Constants.DatabaseSchema.Tables.ContentType)]
[TableName(TableName)]
[PrimaryKey("pk")]
[ExplicitColumns]
internal class ContentTypeDto
{
public const string TableName = Constants.DatabaseSchema.Tables.ContentType;
[Column("pk")]
[PrimaryKeyColumn(IdentitySeed = 535)]
public int PrimaryKey { get; set; }

2
src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs
View File

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Dtos
[ExplicitColumns]
internal class ContentVersionDto
{
private const string TableName = Constants.DatabaseSchema.Tables.ContentVersion;
public const string TableName = Constants.DatabaseSchema.Tables.ContentVersion;
[Column("id")]
[PrimaryKeyColumn]

2
src/Umbraco.Core/Persistence/Dtos/DocumentCultureVariationDto.cs
View File

@@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Dtos
[ExplicitColumns]
internal class DocumentCultureVariationDto
{
private const string TableName = Constants.DatabaseSchema.Tables.DocumentCultureVariation;
public const string TableName = Constants.DatabaseSchema.Tables.DocumentCultureVariation;
[Column("id")]
[PrimaryKeyColumn]

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

@@ -3,11 +3,13 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
namespace Umbraco.Core.Persistence.Dtos
{
[TableName(Constants.DatabaseSchema.Tables.Language)]
[TableName(TableName)]
[PrimaryKey("id")]
[ExplicitColumns]
internal class LanguageDto
{
public const string TableName = Constants.DatabaseSchema.Tables.Language;
[Column("id")]
[PrimaryKeyColumn(IdentitySeed = 2)]
public short Id { get; set; }

6
src/Umbraco.Core/Persistence/Dtos/MediaVersionDto.cs
View File

@@ -3,15 +3,17 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
namespace Umbraco.Core.Persistence.Dtos
{
[TableName(Constants.DatabaseSchema.Tables.MediaVersion)]
[TableName(TableName)]
[PrimaryKey("id", AutoIncrement = false)]
[ExplicitColumns]
internal class MediaVersionDto
{
public const string TableName = Constants.DatabaseSchema.Tables.MediaVersion;
[Column("id")]
[PrimaryKeyColumn(AutoIncrement = false)]
[ForeignKey(typeof(ContentVersionDto))]
[Index(IndexTypes.UniqueNonClustered, Name = "IX_" + Constants.DatabaseSchema.Tables.MediaVersion, ForColumns = "id, path")]
[Index(IndexTypes.UniqueNonClustered, Name = "IX_" + TableName, ForColumns = "id, path")]
public int Id { get; set; }
[Column("path")]

2
src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
View File

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Dtos
[ExplicitColumns]
internal class NodeDto
{
private const string TableName = Constants.DatabaseSchema.Tables.Node;
public const string TableName = Constants.DatabaseSchema.Tables.Node;
public const int NodeIdSeed = 1060;
[Column("id")]

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

@@ -6,11 +6,13 @@ using Umbraco.Core.Persistence.DatabaseModelDefinitions;
namespace Umbraco.Core.Persistence.Dtos
{
[TableName(Constants.DatabaseSchema.Tables.User)]
[TableName(TableName)]
[PrimaryKey("id", AutoIncrement = true)]
[ExplicitColumns]
internal class UserDto
{
public const string TableName = Constants.DatabaseSchema.Tables.User;
public UserDto()
{
UserGroupDtos = new List<UserGroupDto>();

6
src/Umbraco.Core/Persistence/Dtos/UserLoginDto.cs
View File

@@ -4,17 +4,19 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
namespace Umbraco.Core.Persistence.Dtos
{
[TableName(Constants.DatabaseSchema.Tables.UserLogin)]
[TableName(TableName)]
[PrimaryKey("sessionId", AutoIncrement = false)]
[ExplicitColumns]
internal class UserLoginDto
{
public const string TableName = Constants.DatabaseSchema.Tables.UserLogin;
[Column("sessionId")]
[PrimaryKeyColumn(AutoIncrement = false)]
public Guid SessionId { get; set; }
[Column("userId")]
[ForeignKey(typeof(UserDto), Name = "FK_" + Constants.DatabaseSchema.Tables.UserLogin + "_umbracoUser_id")]
[ForeignKey(typeof(UserDto), Name = "FK_" + TableName + "_umbracoUser_id")]
public int UserId { get; set; }
/// <summary>