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

Fixing foreignkey issues

Browse Source
This commit is contained in:
Morten Christensen
2012-12-05 08:39:31 -01:00
parent e73f80d78c
commit 602e3260fa
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/Rdbms/ContentXmlDto.cs
View File

@@ -11,7 +11,7 @@ namespace Umbraco.Core.Models.Rdbms
{
[Column("nodeId")]
[PrimaryKeyColumn(AutoIncrement = false)]
[ForeignKey(typeof(ContentDto))]
[ForeignKey(typeof(ContentDto), Column = "nodeId")]
public int NodeId { get; set; }
[Column("xml")]

2
src/Umbraco.Core/Models/Rdbms/DocumentDto.cs
View File

@@ -42,7 +42,7 @@ namespace Umbraco.Core.Models.Rdbms
[Column("templateId")]
[NullSetting(NullSetting = NullSettings.Null)]
[ForeignKey(typeof(TemplateDto))]
[ForeignKey(typeof(TemplateDto), Column = "nodeId")]
public int? TemplateId { get; set; }
[Column("alias")]

2
src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
View File

@@ -305,7 +305,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
Alias = "",
SortOrder = 0,
DataTypeNodeId = -87,
Value = ",code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,umbracoembed,mcecharmap,|1|1,2,3,|0|500,400|1049,|true|',0,N''"
Value = ",code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,umbracoembed,mcecharmap,|1|1,2,3,|0|500,400|1049,|true|"
});
_database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto

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

@@ -73,14 +73,12 @@ namespace Umbraco.Core.Persistence
if(!string.IsNullOrEmpty(createPrimaryKeySql))
db.Execute(new Sql(createPrimaryKeySql));
if (DatabaseContext.Current.ProviderName.Contains("SqlServerCe") == false)
//Loop through foreignkey statements and execute sql
foreach (var sql in foreignSql)
{
//Loop through foreignkey statements and execute sql
foreach (var sql in foreignSql)
{
int createdFk = db.Execute(new Sql(sql));
}
int createdFk = db.Execute(new Sql(sql));
}
//Loop through index statements and execute sql
foreach (var sql in indexSql)
{

20
src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
View File

@@ -1,4 +1,5 @@
using Umbraco.Core.Persistence.Migrations.Model;
using Umbraco.Core.Persistence.DatabaseAnnotations;
using Umbraco.Core.Persistence.Migrations.Model;
using ColumnDefinition = Umbraco.Core.Persistence.SqlSyntax.ModelDefinitions.ColumnDefinition;
namespace Umbraco.Core.Persistence.SqlSyntax
@@ -35,6 +36,23 @@ namespace Umbraco.Core.Persistence.SqlSyntax
InitColumnTypeMap();
}
public override string GetIndexType(IndexTypes indexTypes)
{
string indexType;
//NOTE Sql Ce doesn't support clustered indexes
if (indexTypes == IndexTypes.Clustered)
{
indexType = "NONCLUSTERED";
}
else
{
indexType = indexTypes == IndexTypes.NonClustered
? "NONCLUSTERED"
: "UNIQUE NONCLUSTERED";
}
return indexType;
}
public override string GetQuotedTableName(string tableName)
{
return string.Format("[{0}]", tableName);