From c6bd94532d39fa7a9abdf70e2e0f35d8f9d765db Mon Sep 17 00:00:00 2001
From: Morten Christensen <unknown@kiln.example.com>
Date: Wed, 6 Feb 2013 09:04:46 -0100
Subject: [PATCH] Fixing issue U4-1648 caused by incorrect sql statement

---
 src/Umbraco.Core/DatabaseContext.cs                           | 4 ++++
 src/Umbraco.Core/Persistence/PetaPocoExtensions.cs            | 2 ++
 .../Persistence/Repositories/ContentTypeBaseRepository.cs     | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index 3345dceb46..7ab6fa3490 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -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)
diff --git a/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs b/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs
index 0ab1b0985d..b2fe8fab39 100644
--- a/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs
+++ b/src/Umbraco.Core/Persistence/PetaPocoExtensions.cs
@@ -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;
         }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
index c430830b76..a352089318 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
@@ -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);