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

Begin implementing Constants.DatabaseSchema

Browse Source
This commit is contained in:
Stephan
2017-10-31 18:03:40 +01:00
parent 829d995154
commit 472cb41190
63 changed files with 317 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Install/InstallSteps/MajorVersion7UpgradeReport.cs
View File

@@ -92,12 +92,12 @@ namespace Umbraco.Web.Install.InstallSteps
var sql = new Sql();
sql
.Select(
sqlSyntax.GetQuotedColumn("cmsDataType", "controlId"),
sqlSyntax.GetQuotedColumn(Constants.DatabaseSchema.Tables.DataType, "controlId"),
sqlSyntax.GetQuotedColumn("umbracoNode", "text"))
.From(sqlSyntax.GetQuotedTableName("cmsDataType"))
.From(sqlSyntax.GetQuotedTableName(Constants.DatabaseSchema.Tables.DataType))
.InnerJoin(sqlSyntax.GetQuotedTableName("umbracoNode"))
.On(
sqlSyntax.GetQuotedColumn("cmsDataType", "nodeId") + " = " +
sqlSyntax.GetQuotedColumn(Constants.DatabaseSchema.Tables.DataType, "nodeId") + " = " +
sqlSyntax.GetQuotedColumn("umbracoNode", "id"));
List<dynamic> list;

10
src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs
View File

@@ -60,17 +60,17 @@ namespace Umbraco.Web.Strategies.Migrations
{
//Turn on identity insert if db provider is not mysql
if (syntax.SupportsIdentityInsert())
e.MigrationContext.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", syntax.GetQuotedTableName("cmsDataType"))));
e.MigrationContext.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} ON ", syntax.GetQuotedTableName(Constants.DatabaseSchema.Tables.DataType))));
e.MigrationContext.Database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -26, DataTypeId = Constants.DataTypes.DefaultContentListView, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
e.MigrationContext.Database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -27, DataTypeId = Constants.DataTypes.DefaultMediaListView, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
e.MigrationContext.Database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = -28, DataTypeId = Constants.DataTypes.DefaultMembersListView, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
e.MigrationContext.Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { PrimaryKey = -26, DataTypeId = Constants.DataTypes.DefaultContentListView, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
e.MigrationContext.Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { PrimaryKey = -27, DataTypeId = Constants.DataTypes.DefaultMediaListView, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
e.MigrationContext.Database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { PrimaryKey = -28, DataTypeId = Constants.DataTypes.DefaultMembersListView, PropertyEditorAlias = Constants.PropertyEditors.ListViewAlias, DbType = "Nvarchar" });
}
finally
{
//Turn off identity insert if db provider is not mysql
if (syntax.SupportsIdentityInsert())
e.MigrationContext.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF;", syntax.GetQuotedTableName("cmsDataType"))));
e.MigrationContext.Database.Execute(new Sql(string.Format("SET IDENTITY_INSERT {0} OFF;", syntax.GetQuotedTableName(Constants.DatabaseSchema.Tables.DataType))));
}