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

Fixing issue U4-1648 caused by incorrect sql statement

Browse Source
This commit is contained in:
Morten Christensen
2013-02-06 09:04:46 -01:00
parent d430efa7ab
commit c6bd94532d
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/DatabaseContext.cs
View File

@@ -337,6 +337,8 @@ namespace Umbraco.Core
try
{
LogHelper.Info<DatabaseContext>("Database configuration status: Started");
var database = new UmbracoDatabase(_connectionString, ProviderName);
var schemaResult = ValidateDatabaseSchema();
var installedVersion = schemaResult.DetermineInstalledVersion();
@@ -359,6 +361,8 @@ namespace Umbraco.Core
message = "Upgrade completed!";
}
LogHelper.Info<DatabaseContext>("Database configuration status: " + message);
return new Result { Message = message, Success = true, Percentage = "100" };
}
catch (Exception ex)

2
src/Umbraco.Core/Persistence/PetaPocoExtensions.cs
View File

@@ -143,6 +143,8 @@ namespace Umbraco.Core.Persistence
var creation = new DatabaseSchemaCreation(db);
creation.InitializeDatabaseSchema();
LogHelper.Info<Database>("Finalized database schema creation");
NewTable -= PetaPocoExtensions_NewTable;
}

2
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
View File

@@ -237,7 +237,7 @@ namespace Umbraco.Core.Persistence.Repositories
.On<PropertyTypeGroupDto, PropertyTypeDto>(left => left.Id, right => right.PropertyTypeGroupId)
.LeftJoin<DataTypeDto>()
.On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
.Where<PropertyTypeGroupDto>(x => x.ContentTypeNodeId == id)
.Where<PropertyTypeDto>(x => x.ContentTypeId == id)
.OrderBy<PropertyTypeGroupDto>(x => x.Id);
var dtos = Database.Fetch<PropertyTypeGroupDto, PropertyTypeDto, DataTypeDto, PropertyTypeGroupDto>(new GroupPropertyTypeRelator().Map, sql);