("Database upgrade started");
- var message = _scopeProvider.SqlContext.DatabaseType.IsMySql() ? ResultMessageForMySql : "";
-
// upgrade
var upgrader = new UmbracoUpgrader();
upgrader.Execute(_scopeProvider, _migrationBuilder, _keyValueService, _logger, _postMigrations);
- message = message + "Upgrade completed!
";
+ var message = "Upgrade completed!
";
//now that everything is done, we need to determine the version of SQL server that is executing
@@ -515,15 +513,6 @@ namespace Umbraco.Core.Migrations.Install
}
}
- private const string ResultMessageForMySql = "
Congratulations, the database step ran successfully!
" +
- "Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.
" +
- "However, your hosting provider may not support this option. Umbraco does not currently support MySQL installs that do not support case insensitive queries
" +
- "Make sure to check with your hosting provider if they support case insensitive queries as well.
" +
- "They can check this by looking for the following setting in the my.ini file in their MySQL installation directory:
" +
- "lower_case_table_names=1
" +
- "For more technical information on case sensitivity in MySQL, have a look at " +
- "the documentation on the subject
";
-
private Attempt CheckReadyForInstall()
{
if (_databaseFactory.Configured == false)
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index f32ea1cb6f..7e9df321c3 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -135,7 +135,7 @@ namespace Umbraco.Core.Migrations.Install
_database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1047, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1047", SortOrder = 2, UniqueId = new Guid("1EA2E01F-EBD8-4CE1-8D71-6B1149E63548"), Text = "Member Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
_database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1048, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1048", SortOrder = 2, UniqueId = new Guid("135D60E0-64D9-49ED-AB08-893C9BA44AE5"), Text = "Media Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
_database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1049, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1049", SortOrder = 2, UniqueId = new Guid("9DBBCBBB-2327-434A-B355-AF1B84E5010A"), Text = "Multiple Media Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
- _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = new Guid("B4E3535A-1753-47E2-8568-602CF8CFEE6F"), Text = "Related Links", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
+ _database.Insert(Constants.DatabaseSchema.Tables.Node, "id", false, new NodeDto { NodeId = 1050, Trashed = false, ParentId = -1, UserId = -1, Level = 1, Path = "-1,1050", SortOrder = 2, UniqueId = new Guid("B4E3535A-1753-47E2-8568-602CF8CFEE6F"), Text = "Multi URL Picker", NodeObjectType = Constants.ObjectTypes.DataType, CreateDate = DateTime.Now });
}
private void CreateLockData()
@@ -263,7 +263,7 @@ namespace Umbraco.Core.Migrations.Install
const string listLayout = "{\"name\": \"List\",\"path\": \"views/propertyeditors/listview/layouts/list/list.html\",\"icon\": \"icon-list\", \"isSystem\": 1,\"selected\": true}";
const string layouts = "[" + cardLayout + "," + listLayout + "]";
- //TODO Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors.
+ // TODO: Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors.
_database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -49, EditorAlias = Constants.PropertyEditors.Aliases.Boolean, DbType = "Integer" });
_database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -51, EditorAlias = Constants.PropertyEditors.Aliases.Integer, DbType = "Integer" });
_database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = -87, EditorAlias = Constants.PropertyEditors.Aliases.TinyMce, DbType = "Ntext",
@@ -301,7 +301,7 @@ namespace Umbraco.Core.Migrations.Install
_database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1048, EditorAlias = Constants.PropertyEditors.Aliases.MediaPicker, DbType = "Ntext" });
_database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1049, EditorAlias = Constants.PropertyEditors.Aliases.MediaPicker, DbType = "Ntext",
Configuration = "{\"multiPicker\":1}" });
- _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1050, EditorAlias = Constants.PropertyEditors.Aliases.RelatedLinks, DbType = "Ntext" });
+ _database.Insert(Constants.DatabaseSchema.Tables.DataType, "pk", false, new DataTypeDto { NodeId = 1050, EditorAlias = Constants.PropertyEditors.Aliases.MultiUrlPicker, DbType = "Ntext" });
}
private void CreateRelationTypeData()
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
index f9f3e5da30..5cc818a6d2 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
@@ -1,524 +1,513 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Core.Persistence.SqlSyntax;
-
-namespace Umbraco.Core.Migrations.Install
-{
- ///
- /// Creates the initial database schema during install.
- ///
- public class DatabaseSchemaCreator
- {
- private readonly IUmbracoDatabase _database;
- private readonly ILogger _logger;
-
- public DatabaseSchemaCreator(IUmbracoDatabase database, ILogger logger)
- {
- _database = database;
- _logger = logger;
- }
-
- private ISqlSyntaxProvider SqlSyntax => _database.SqlContext.SqlSyntax;
-
- // all tables, in order
- internal static readonly List OrderedTables = new List
- {
- typeof (UserDto),
- typeof (NodeDto),
- typeof (ContentTypeDto),
- typeof (TemplateDto),
- typeof (ContentDto),
- typeof (ContentVersionDto),
- typeof (MediaVersionDto),
- typeof (DocumentDto),
- typeof (ContentTypeTemplateDto),
- typeof (DataTypeDto),
- typeof (DictionaryDto),
- typeof (LanguageDto),
- typeof (LanguageTextDto),
- typeof (DomainDto),
- typeof (LogDto),
- typeof (MacroDto),
- typeof (MacroPropertyDto),
- typeof (MemberTypeDto),
- typeof (MemberDto),
- typeof (Member2MemberGroupDto),
- typeof (ContentXmlDto),
- typeof (PreviewXmlDto),
- typeof (PropertyTypeGroupDto),
- typeof (PropertyTypeDto),
- typeof (PropertyDataDto),
- typeof (RelationTypeDto),
- typeof (RelationDto),
- typeof (TagDto),
- typeof (TagRelationshipDto),
- typeof (ContentType2ContentTypeDto),
- typeof (ContentTypeAllowedContentTypeDto),
- typeof (User2NodeNotifyDto),
- typeof (ServerRegistrationDto),
- typeof (AccessDto),
- typeof (AccessRuleDto),
- typeof (CacheInstructionDto),
- typeof (ExternalLoginDto),
- typeof (RedirectUrlDto),
- typeof (LockDto),
- typeof (UserGroupDto),
- typeof (User2UserGroupDto),
- typeof (UserGroup2NodePermissionDto),
- typeof (UserGroup2AppDto),
- typeof (UserStartNodeDto),
- typeof (ContentNuDto),
- typeof (DocumentVersionDto),
- typeof (KeyValueDto),
- typeof (UserLoginDto),
- typeof (ConsentDto),
- typeof (AuditEntryDto),
- typeof (ContentVersionCultureVariationDto),
- typeof (DocumentCultureVariationDto),
- typeof (ContentScheduleDto)
- };
-
- ///
- /// Drops all Umbraco tables in the db.
- ///
- internal void UninstallDatabaseSchema()
- {
- _logger.Info("Start UninstallDatabaseSchema");
-
- foreach (var table in OrderedTables.AsEnumerable().Reverse())
- {
- var tableNameAttribute = table.FirstAttribute();
- var tableName = tableNameAttribute == null ? table.Name : tableNameAttribute.Value;
-
- _logger.Info("Uninstall {TableName}", tableName);
-
- try
- {
- if (TableExists(tableName))
- DropTable(tableName);
- }
- catch (Exception ex)
- {
- //swallow this for now, not sure how best to handle this with diff databases... though this is internal
- // and only used for unit tests. If this fails its because the table doesn't exist... generally!
- _logger.Error(ex, "Could not drop table {TableName}", tableName);
- }
- }
- }
-
- ///
- /// Initializes the database by creating the umbraco db schema.
- ///
- /// This needs to execute as part of a transaction.
- public void InitializeDatabaseSchema()
- {
- if (!_database.InTransaction)
- throw new InvalidOperationException("Database is not in a transaction.");
-
- var e = new DatabaseCreationEventArgs();
- FireBeforeCreation(e);
-
- if (e.Cancel == false)
- {
- var dataCreation = new DatabaseDataCreator(_database, _logger);
- foreach (var table in OrderedTables)
- CreateTable(false, table, dataCreation);
- }
-
- FireAfterCreation(e);
- }
-
- ///
- /// Validates the schema of the current database.
- ///
- internal DatabaseSchemaResult ValidateSchema()
- {
- var result = new DatabaseSchemaResult(SqlSyntax);
-
- result.IndexDefinitions.AddRange(SqlSyntax.GetDefinedIndexes(_database)
- .Select(x => new DbIndexDefinition(x)));
-
- result.TableDefinitions.AddRange(OrderedTables
- .Select(x => DefinitionFactory.GetTableDefinition(x, SqlSyntax)));
-
- ValidateDbTables(result);
- ValidateDbColumns(result);
- ValidateDbIndexes(result);
- ValidateDbConstraints(result);
-
- return result;
- }
-
- ///
- /// This validates the Primary/Foreign keys in the database
- ///
- ///
- ///
- /// This does not validate any database constraints that are not PKs or FKs because Umbraco does not create a database with non PK/FK contraints.
- /// Any unique "constraints" in the database are done with unique indexes.
- ///
- private void ValidateDbConstraints(DatabaseSchemaResult result)
- {
- //MySql doesn't conform to the "normal" naming of constraints, so there is currently no point in doing these checks.
- //TODO: At a later point we do other checks for MySql, but ideally it should be necessary to do special checks for different providers.
- // ALso note that to get the constraints for MySql we have to open a connection which we currently have not.
- if (SqlSyntax is MySqlSyntaxProvider)
- return;
-
- //Check constraints in configured database against constraints in schema
- var constraintsInDatabase = SqlSyntax.GetConstraintsPerColumn(_database).DistinctBy(x => x.Item3).ToList();
- var foreignKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("FK_")).Select(x => x.Item3).ToList();
- var primaryKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("PK_")).Select(x => x.Item3).ToList();
-
- var unknownConstraintsInDatabase =
- constraintsInDatabase.Where(
- x =>
- x.Item3.InvariantStartsWith("FK_") == false && x.Item3.InvariantStartsWith("PK_") == false &&
- x.Item3.InvariantStartsWith("IX_") == false).Select(x => x.Item3).ToList();
- var foreignKeysInSchema = result.TableDefinitions.SelectMany(x => x.ForeignKeys.Select(y => y.Name)).ToList();
- var primaryKeysInSchema = result.TableDefinitions.SelectMany(x => x.Columns.Select(y => y.PrimaryKeyName))
- .Where(x => x.IsNullOrWhiteSpace() == false).ToList();
-
- //Add valid and invalid foreign key differences to the result object
- // We'll need to do invariant contains with case insensitivity because foreign key, primary key, and even index naming w/ MySQL is not standardized
- // In theory you could have: FK_ or fk_ ...or really any standard that your development department (or developer) chooses to use.
- foreach (var unknown in unknownConstraintsInDatabase)
- {
- if (foreignKeysInSchema.InvariantContains(unknown) || primaryKeysInSchema.InvariantContains(unknown))
- {
- result.ValidConstraints.Add(unknown);
- }
- else
- {
- result.Errors.Add(new Tuple("Unknown", unknown));
- }
- }
-
- //Foreign keys:
-
- var validForeignKeyDifferences = foreignKeysInDatabase.Intersect(foreignKeysInSchema, StringComparer.InvariantCultureIgnoreCase);
- foreach (var foreignKey in validForeignKeyDifferences)
- {
- result.ValidConstraints.Add(foreignKey);
- }
- var invalidForeignKeyDifferences =
- foreignKeysInDatabase.Except(foreignKeysInSchema, StringComparer.InvariantCultureIgnoreCase)
- .Union(foreignKeysInSchema.Except(foreignKeysInDatabase, StringComparer.InvariantCultureIgnoreCase));
- foreach (var foreignKey in invalidForeignKeyDifferences)
- {
- result.Errors.Add(new Tuple("Constraint", foreignKey));
- }
-
-
- //Primary keys:
-
- //Add valid and invalid primary key differences to the result object
- var validPrimaryKeyDifferences = primaryKeysInDatabase.Intersect(primaryKeysInSchema, StringComparer.InvariantCultureIgnoreCase);
- foreach (var primaryKey in validPrimaryKeyDifferences)
- {
- result.ValidConstraints.Add(primaryKey);
- }
- var invalidPrimaryKeyDifferences =
- primaryKeysInDatabase.Except(primaryKeysInSchema, StringComparer.InvariantCultureIgnoreCase)
- .Union(primaryKeysInSchema.Except(primaryKeysInDatabase, StringComparer.InvariantCultureIgnoreCase));
- foreach (var primaryKey in invalidPrimaryKeyDifferences)
- {
- result.Errors.Add(new Tuple("Constraint", primaryKey));
- }
-
- }
-
- private void ValidateDbColumns(DatabaseSchemaResult result)
- {
- //Check columns in configured database against columns in schema
- var columnsInDatabase = SqlSyntax.GetColumnsInSchema(_database);
- var columnsPerTableInDatabase = columnsInDatabase.Select(x => string.Concat(x.TableName, ",", x.ColumnName)).ToList();
- var columnsPerTableInSchema = result.TableDefinitions.SelectMany(x => x.Columns.Select(y => string.Concat(y.TableName, ",", y.Name))).ToList();
- //Add valid and invalid column differences to the result object
- var validColumnDifferences = columnsPerTableInDatabase.Intersect(columnsPerTableInSchema, StringComparer.InvariantCultureIgnoreCase);
- foreach (var column in validColumnDifferences)
- {
- result.ValidColumns.Add(column);
- }
-
- var invalidColumnDifferences =
- columnsPerTableInDatabase.Except(columnsPerTableInSchema, StringComparer.InvariantCultureIgnoreCase)
- .Union(columnsPerTableInSchema.Except(columnsPerTableInDatabase, StringComparer.InvariantCultureIgnoreCase));
- foreach (var column in invalidColumnDifferences)
- {
- result.Errors.Add(new Tuple("Column", column));
- }
- }
-
- private void ValidateDbTables(DatabaseSchemaResult result)
- {
- //Check tables in configured database against tables in schema
- var tablesInDatabase = SqlSyntax.GetTablesInSchema(_database).ToList();
- var tablesInSchema = result.TableDefinitions.Select(x => x.Name).ToList();
- //Add valid and invalid table differences to the result object
- var validTableDifferences = tablesInDatabase.Intersect(tablesInSchema, StringComparer.InvariantCultureIgnoreCase);
- foreach (var tableName in validTableDifferences)
- {
- result.ValidTables.Add(tableName);
- }
-
- var invalidTableDifferences =
- tablesInDatabase.Except(tablesInSchema, StringComparer.InvariantCultureIgnoreCase)
- .Union(tablesInSchema.Except(tablesInDatabase, StringComparer.InvariantCultureIgnoreCase));
- foreach (var tableName in invalidTableDifferences)
- {
- result.Errors.Add(new Tuple("Table", tableName));
- }
- }
-
- private void ValidateDbIndexes(DatabaseSchemaResult result)
- {
- //These are just column indexes NOT constraints or Keys
- //var colIndexesInDatabase = result.DbIndexDefinitions.Where(x => x.IndexName.InvariantStartsWith("IX_")).Select(x => x.IndexName).ToList();
- var colIndexesInDatabase = result.IndexDefinitions.Select(x => x.IndexName).ToList();
- var indexesInSchema = result.TableDefinitions.SelectMany(x => x.Indexes.Select(y => y.Name)).ToList();
-
- //Add valid and invalid index differences to the result object
- var validColIndexDifferences = colIndexesInDatabase.Intersect(indexesInSchema, StringComparer.InvariantCultureIgnoreCase);
- foreach (var index in validColIndexDifferences)
- {
- result.ValidIndexes.Add(index);
- }
-
- var invalidColIndexDifferences =
- colIndexesInDatabase.Except(indexesInSchema, StringComparer.InvariantCultureIgnoreCase)
- .Union(indexesInSchema.Except(colIndexesInDatabase, StringComparer.InvariantCultureIgnoreCase));
- foreach (var index in invalidColIndexDifferences)
- {
- result.Errors.Add(new Tuple("Index", index));
- }
- }
-
- #region Events
-
- ///
- /// The save event handler
- ///
- internal delegate void DatabaseEventHandler(DatabaseCreationEventArgs e);
-
- ///
- /// Occurs when [before save].
- ///
- internal static event DatabaseEventHandler BeforeCreation;
- ///
- /// Raises the event.
- ///
- /// The instance containing the event data.
- internal virtual void FireBeforeCreation(DatabaseCreationEventArgs e)
- {
- BeforeCreation?.Invoke(e);
- }
-
- ///
- /// Occurs when [after save].
- ///
- internal static event DatabaseEventHandler AfterCreation;
- ///
- /// Raises the event.
- ///
- /// The instance containing the event data.
- internal virtual void FireAfterCreation(DatabaseCreationEventArgs e)
- {
- AfterCreation?.Invoke(e);
- }
-
- #endregion
-
- #region Utilities
-
- ///
- /// Returns whether a table with the specified exists in the database.
- ///
- /// The name of the table.
- /// true if the table exists; otherwise false.
- ///
- ///
- /// if (schemaHelper.TableExist("MyTable"))
- /// {
- /// // do something when the table exists
- /// }
- ///
- ///
- public bool TableExists(string tableName)
- {
- return SqlSyntax.DoesTableExist(_database, tableName);
- }
-
- ///
- /// Returns whether the table for the specified exists in the database.
- ///
- /// The type representing the DTO/table.
- /// true if the table exists; otherwise false.
- ///
- ///
- /// if (schemaHelper.TableExist<MyDto>)
- /// {
- /// // do something when the table exists
- /// }
- ///
- ///
- ///
- /// If has been decorated with an , the name from that
- /// attribute will be used for the table name. If the attribute is not present, the name
- /// will be used instead.
- ///
- public bool TableExists()
{
- var table = DefinitionFactory.GetTableDefinition(typeof(T), SqlSyntax);
- return table != null && TableExists(table.Name);
}
-
- ///
- /// Creates a new table in the database based on the type of .
- ///
- /// The type representing the DTO/table.
- /// Whether the table should be overwritten if it already exists.
- ///
- /// If has been decorated with an , the name from that
- /// attribute will be used for the table name. If the attribute is not present, the name
- /// will be used instead.
- ///
- /// If a table with the same name already exists, the parameter will determine
- /// whether the table is overwritten. If true, the table will be overwritten, whereas this method will
- /// not do anything if the parameter is false.
- ///
- internal void CreateTable(bool overwrite = false)
- where T : new()
- {
- var tableType = typeof(T);
- CreateTable(overwrite, tableType, new DatabaseDataCreator(_database, _logger));
- }
-
- ///
- /// Creates a new table in the database for the specified .
- ///
- /// Whether the table should be overwritten if it already exists.
- /// The the representing the table.
- ///
- ///
- /// If has been decorated with an , the name from
- /// that attribute will be used for the table name. If the attribute is not present, the name
- /// will be used instead.
- ///
- /// If a table with the same name already exists, the parameter will determine
- /// whether the table is overwritten. If true, the table will be overwritten, whereas this method will
- /// not do anything if the parameter is false.
- ///
- /// This need to execute as part of a transaction.
- ///
- internal void CreateTable(bool overwrite, Type modelType, DatabaseDataCreator dataCreation)
- {
- if (!_database.InTransaction)
- throw new InvalidOperationException("Database is not in a transaction.");
-
- var tableDefinition = DefinitionFactory.GetTableDefinition(modelType, SqlSyntax);
- var tableName = tableDefinition.Name;
-
- var createSql = SqlSyntax.Format(tableDefinition);
- var createPrimaryKeySql = SqlSyntax.FormatPrimaryKey(tableDefinition);
- var foreignSql = SqlSyntax.Format(tableDefinition.ForeignKeys);
- var indexSql = SqlSyntax.Format(tableDefinition.Indexes);
-
- var tableExist = TableExists(tableName);
- if (overwrite && tableExist)
- {
- _logger.Info("Table '{TableName}' already exists, but will be recreated", tableName);
-
- DropTable(tableName);
- tableExist = false;
- }
-
- if (tableExist)
- {
- // The table exists and was not recreated/overwritten.
- _logger.Info("Table '{TableName}' already exists - no changes were made", tableName);
- return;
- }
-
- //Execute the Create Table sql
- var created = _database.Execute(new Sql(createSql));
- _logger.Info("Create Table '{TableName}' ({Created}): \n {Sql}", tableName, created, createSql);
-
- //If any statements exists for the primary key execute them here
- if (string.IsNullOrEmpty(createPrimaryKeySql) == false)
- {
- var createdPk = _database.Execute(new Sql(createPrimaryKeySql));
- _logger.Info("Create Primary Key ({CreatedPk}):\n {Sql}", createdPk, createPrimaryKeySql);
- }
-
- //Turn on identity insert if db provider is not mysql
- if (SqlSyntax.SupportsIdentityInsert() && tableDefinition.Columns.Any(x => x.IsIdentity))
- _database.Execute(new Sql($"SET IDENTITY_INSERT {SqlSyntax.GetQuotedTableName(tableName)} ON "));
-
- //Call the NewTable-event to trigger the insert of base/default data
- //OnNewTable(tableName, _db, e, _logger);
-
- dataCreation.InitializeBaseData(tableName);
-
- //Turn off identity insert if db provider is not mysql
- if (SqlSyntax.SupportsIdentityInsert() && tableDefinition.Columns.Any(x => x.IsIdentity))
- _database.Execute(new Sql($"SET IDENTITY_INSERT {SqlSyntax.GetQuotedTableName(tableName)} OFF;"));
-
- //Special case for MySql
- if (SqlSyntax is MySqlSyntaxProvider && tableName.Equals("umbracoUser"))
- {
- _database.Update("SET id = @IdAfter WHERE id = @IdBefore AND userLogin = @Login", new { IdAfter = 0, IdBefore = 1, Login = "admin" });
- }
-
- //Loop through index statements and execute sql
- foreach (var sql in indexSql)
- {
- var createdIndex = _database.Execute(new Sql(sql));
- _logger.Info("Create Index ({CreatedIndex}):\n {Sql}", createdIndex, sql);
- }
-
- //Loop through foreignkey statements and execute sql
- foreach (var sql in foreignSql)
- {
- var createdFk = _database.Execute(new Sql(sql));
- _logger.Info("Create Foreign Key ({CreatedFk}):\n {Sql}", createdFk, sql);
- }
-
- if (overwrite)
- {
- _logger.Info("Table '{TableName}' was recreated", tableName);
- }
- else
- {
- _logger.Info("New table '{TableName}' was created", tableName);
- }
- }
-
- ///
- /// Drops the table for the specified .
- ///
- /// The type representing the DTO/table.
- ///
- ///
- /// schemaHelper.DropTable<MyDto>);
- ///
- ///
- ///
- /// If has been decorated with an , the name from that
- /// attribute will be used for the table name. If the attribute is not present, the name
- /// will be used instead.
- ///
- public void DropTable(string tableName)
- {
- var sql = new Sql(string.Format(SqlSyntax.DropTable, SqlSyntax.GetQuotedTableName(tableName)));
- _database.Execute(sql);
- }
-
- #endregion
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Migrations.Install
+{
+ ///
+ /// Creates the initial database schema during install.
+ ///
+ public class DatabaseSchemaCreator
+ {
+ private readonly IUmbracoDatabase _database;
+ private readonly ILogger _logger;
+
+ public DatabaseSchemaCreator(IUmbracoDatabase database, ILogger logger)
+ {
+ _database = database;
+ _logger = logger;
+ }
+
+ private ISqlSyntaxProvider SqlSyntax => _database.SqlContext.SqlSyntax;
+
+ // all tables, in order
+ internal static readonly List OrderedTables = new List
+ {
+ typeof (UserDto),
+ typeof (NodeDto),
+ typeof (ContentTypeDto),
+ typeof (TemplateDto),
+ typeof (ContentDto),
+ typeof (ContentVersionDto),
+ typeof (MediaVersionDto),
+ typeof (DocumentDto),
+ typeof (ContentTypeTemplateDto),
+ typeof (DataTypeDto),
+ typeof (DictionaryDto),
+ typeof (LanguageDto),
+ typeof (LanguageTextDto),
+ typeof (DomainDto),
+ typeof (LogDto),
+ typeof (MacroDto),
+ typeof (MacroPropertyDto),
+ typeof (MemberTypeDto),
+ typeof (MemberDto),
+ typeof (Member2MemberGroupDto),
+ typeof (ContentXmlDto),
+ typeof (PreviewXmlDto),
+ typeof (PropertyTypeGroupDto),
+ typeof (PropertyTypeDto),
+ typeof (PropertyDataDto),
+ typeof (RelationTypeDto),
+ typeof (RelationDto),
+ typeof (TagDto),
+ typeof (TagRelationshipDto),
+ typeof (ContentType2ContentTypeDto),
+ typeof (ContentTypeAllowedContentTypeDto),
+ typeof (User2NodeNotifyDto),
+ typeof (ServerRegistrationDto),
+ typeof (AccessDto),
+ typeof (AccessRuleDto),
+ typeof (CacheInstructionDto),
+ typeof (ExternalLoginDto),
+ typeof (RedirectUrlDto),
+ typeof (LockDto),
+ typeof (UserGroupDto),
+ typeof (User2UserGroupDto),
+ typeof (UserGroup2NodePermissionDto),
+ typeof (UserGroup2AppDto),
+ typeof (UserStartNodeDto),
+ typeof (ContentNuDto),
+ typeof (DocumentVersionDto),
+ typeof (KeyValueDto),
+ typeof (UserLoginDto),
+ typeof (ConsentDto),
+ typeof (AuditEntryDto),
+ typeof (ContentVersionCultureVariationDto),
+ typeof (DocumentCultureVariationDto),
+ typeof (ContentScheduleDto)
+ };
+
+ ///
+ /// Drops all Umbraco tables in the db.
+ ///
+ internal void UninstallDatabaseSchema()
+ {
+ _logger.Info("Start UninstallDatabaseSchema");
+
+ foreach (var table in OrderedTables.AsEnumerable().Reverse())
+ {
+ var tableNameAttribute = table.FirstAttribute();
+ var tableName = tableNameAttribute == null ? table.Name : tableNameAttribute.Value;
+
+ _logger.Info("Uninstall {TableName}", tableName);
+
+ try
+ {
+ if (TableExists(tableName))
+ DropTable(tableName);
+ }
+ catch (Exception ex)
+ {
+ //swallow this for now, not sure how best to handle this with diff databases... though this is internal
+ // and only used for unit tests. If this fails its because the table doesn't exist... generally!
+ _logger.Error(ex, "Could not drop table {TableName}", tableName);
+ }
+ }
+ }
+
+ ///
+ /// Initializes the database by creating the umbraco db schema.
+ ///
+ /// This needs to execute as part of a transaction.
+ public void InitializeDatabaseSchema()
+ {
+ if (!_database.InTransaction)
+ throw new InvalidOperationException("Database is not in a transaction.");
+
+ var e = new DatabaseCreationEventArgs();
+ FireBeforeCreation(e);
+
+ if (e.Cancel == false)
+ {
+ var dataCreation = new DatabaseDataCreator(_database, _logger);
+ foreach (var table in OrderedTables)
+ CreateTable(false, table, dataCreation);
+ }
+
+ FireAfterCreation(e);
+ }
+
+ ///
+ /// Validates the schema of the current database.
+ ///
+ internal DatabaseSchemaResult ValidateSchema()
+ {
+ var result = new DatabaseSchemaResult(SqlSyntax);
+
+ result.IndexDefinitions.AddRange(SqlSyntax.GetDefinedIndexes(_database)
+ .Select(x => new DbIndexDefinition(x)));
+
+ result.TableDefinitions.AddRange(OrderedTables
+ .Select(x => DefinitionFactory.GetTableDefinition(x, SqlSyntax)));
+
+ ValidateDbTables(result);
+ ValidateDbColumns(result);
+ ValidateDbIndexes(result);
+ ValidateDbConstraints(result);
+
+ return result;
+ }
+
+ ///
+ /// This validates the Primary/Foreign keys in the database
+ ///
+ ///
+ ///
+ /// This does not validate any database constraints that are not PKs or FKs because Umbraco does not create a database with non PK/FK constraints.
+ /// Any unique "constraints" in the database are done with unique indexes.
+ ///
+ private void ValidateDbConstraints(DatabaseSchemaResult result)
+ {
+ //Check constraints in configured database against constraints in schema
+ var constraintsInDatabase = SqlSyntax.GetConstraintsPerColumn(_database).DistinctBy(x => x.Item3).ToList();
+ var foreignKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("FK_")).Select(x => x.Item3).ToList();
+ var primaryKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("PK_")).Select(x => x.Item3).ToList();
+
+ var unknownConstraintsInDatabase =
+ constraintsInDatabase.Where(
+ x =>
+ x.Item3.InvariantStartsWith("FK_") == false && x.Item3.InvariantStartsWith("PK_") == false &&
+ x.Item3.InvariantStartsWith("IX_") == false).Select(x => x.Item3).ToList();
+ var foreignKeysInSchema = result.TableDefinitions.SelectMany(x => x.ForeignKeys.Select(y => y.Name)).ToList();
+ var primaryKeysInSchema = result.TableDefinitions.SelectMany(x => x.Columns.Select(y => y.PrimaryKeyName))
+ .Where(x => x.IsNullOrWhiteSpace() == false).ToList();
+
+ // Add valid and invalid foreign key differences to the result object
+ // We'll need to do invariant contains with case insensitivity because foreign key, primary key is not standardized
+ // In theory you could have: FK_ or fk_ ...or really any standard that your development department (or developer) chooses to use.
+ foreach (var unknown in unknownConstraintsInDatabase)
+ {
+ if (foreignKeysInSchema.InvariantContains(unknown) || primaryKeysInSchema.InvariantContains(unknown))
+ {
+ result.ValidConstraints.Add(unknown);
+ }
+ else
+ {
+ result.Errors.Add(new Tuple("Unknown", unknown));
+ }
+ }
+
+ //Foreign keys:
+
+ var validForeignKeyDifferences = foreignKeysInDatabase.Intersect(foreignKeysInSchema, StringComparer.InvariantCultureIgnoreCase);
+ foreach (var foreignKey in validForeignKeyDifferences)
+ {
+ result.ValidConstraints.Add(foreignKey);
+ }
+ var invalidForeignKeyDifferences =
+ foreignKeysInDatabase.Except(foreignKeysInSchema, StringComparer.InvariantCultureIgnoreCase)
+ .Union(foreignKeysInSchema.Except(foreignKeysInDatabase, StringComparer.InvariantCultureIgnoreCase));
+ foreach (var foreignKey in invalidForeignKeyDifferences)
+ {
+ result.Errors.Add(new Tuple("Constraint", foreignKey));
+ }
+
+
+ //Primary keys:
+
+ //Add valid and invalid primary key differences to the result object
+ var validPrimaryKeyDifferences = primaryKeysInDatabase.Intersect(primaryKeysInSchema, StringComparer.InvariantCultureIgnoreCase);
+ foreach (var primaryKey in validPrimaryKeyDifferences)
+ {
+ result.ValidConstraints.Add(primaryKey);
+ }
+ var invalidPrimaryKeyDifferences =
+ primaryKeysInDatabase.Except(primaryKeysInSchema, StringComparer.InvariantCultureIgnoreCase)
+ .Union(primaryKeysInSchema.Except(primaryKeysInDatabase, StringComparer.InvariantCultureIgnoreCase));
+ foreach (var primaryKey in invalidPrimaryKeyDifferences)
+ {
+ result.Errors.Add(new Tuple("Constraint", primaryKey));
+ }
+
+ }
+
+ private void ValidateDbColumns(DatabaseSchemaResult result)
+ {
+ //Check columns in configured database against columns in schema
+ var columnsInDatabase = SqlSyntax.GetColumnsInSchema(_database);
+ var columnsPerTableInDatabase = columnsInDatabase.Select(x => string.Concat(x.TableName, ",", x.ColumnName)).ToList();
+ var columnsPerTableInSchema = result.TableDefinitions.SelectMany(x => x.Columns.Select(y => string.Concat(y.TableName, ",", y.Name))).ToList();
+ //Add valid and invalid column differences to the result object
+ var validColumnDifferences = columnsPerTableInDatabase.Intersect(columnsPerTableInSchema, StringComparer.InvariantCultureIgnoreCase);
+ foreach (var column in validColumnDifferences)
+ {
+ result.ValidColumns.Add(column);
+ }
+
+ var invalidColumnDifferences =
+ columnsPerTableInDatabase.Except(columnsPerTableInSchema, StringComparer.InvariantCultureIgnoreCase)
+ .Union(columnsPerTableInSchema.Except(columnsPerTableInDatabase, StringComparer.InvariantCultureIgnoreCase));
+ foreach (var column in invalidColumnDifferences)
+ {
+ result.Errors.Add(new Tuple("Column", column));
+ }
+ }
+
+ private void ValidateDbTables(DatabaseSchemaResult result)
+ {
+ //Check tables in configured database against tables in schema
+ var tablesInDatabase = SqlSyntax.GetTablesInSchema(_database).ToList();
+ var tablesInSchema = result.TableDefinitions.Select(x => x.Name).ToList();
+ //Add valid and invalid table differences to the result object
+ var validTableDifferences = tablesInDatabase.Intersect(tablesInSchema, StringComparer.InvariantCultureIgnoreCase);
+ foreach (var tableName in validTableDifferences)
+ {
+ result.ValidTables.Add(tableName);
+ }
+
+ var invalidTableDifferences =
+ tablesInDatabase.Except(tablesInSchema, StringComparer.InvariantCultureIgnoreCase)
+ .Union(tablesInSchema.Except(tablesInDatabase, StringComparer.InvariantCultureIgnoreCase));
+ foreach (var tableName in invalidTableDifferences)
+ {
+ result.Errors.Add(new Tuple("Table", tableName));
+ }
+ }
+
+ private void ValidateDbIndexes(DatabaseSchemaResult result)
+ {
+ //These are just column indexes NOT constraints or Keys
+ //var colIndexesInDatabase = result.DbIndexDefinitions.Where(x => x.IndexName.InvariantStartsWith("IX_")).Select(x => x.IndexName).ToList();
+ var colIndexesInDatabase = result.IndexDefinitions.Select(x => x.IndexName).ToList();
+ var indexesInSchema = result.TableDefinitions.SelectMany(x => x.Indexes.Select(y => y.Name)).ToList();
+
+ //Add valid and invalid index differences to the result object
+ var validColIndexDifferences = colIndexesInDatabase.Intersect(indexesInSchema, StringComparer.InvariantCultureIgnoreCase);
+ foreach (var index in validColIndexDifferences)
+ {
+ result.ValidIndexes.Add(index);
+ }
+
+ var invalidColIndexDifferences =
+ colIndexesInDatabase.Except(indexesInSchema, StringComparer.InvariantCultureIgnoreCase)
+ .Union(indexesInSchema.Except(colIndexesInDatabase, StringComparer.InvariantCultureIgnoreCase));
+ foreach (var index in invalidColIndexDifferences)
+ {
+ result.Errors.Add(new Tuple("Index", index));
+ }
+ }
+
+ #region Events
+
+ ///
+ /// The save event handler
+ ///
+ internal delegate void DatabaseEventHandler(DatabaseCreationEventArgs e);
+
+ ///
+ /// Occurs when [before save].
+ ///
+ internal static event DatabaseEventHandler BeforeCreation;
+ ///
+ /// Raises the event.
+ ///
+ /// The instance containing the event data.
+ internal virtual void FireBeforeCreation(DatabaseCreationEventArgs e)
+ {
+ BeforeCreation?.Invoke(e);
+ }
+
+ ///
+ /// Occurs when [after save].
+ ///
+ internal static event DatabaseEventHandler AfterCreation;
+ ///
+ /// Raises the event.
+ ///
+ /// The instance containing the event data.
+ internal virtual void FireAfterCreation(DatabaseCreationEventArgs e)
+ {
+ AfterCreation?.Invoke(e);
+ }
+
+ #endregion
+
+ #region Utilities
+
+ ///
+ /// Returns whether a table with the specified exists in the database.
+ ///
+ /// The name of the table.
+ /// true if the table exists; otherwise false.
+ ///
+ ///
+ /// if (schemaHelper.TableExist("MyTable"))
+ /// {
+ /// // do something when the table exists
+ /// }
+ ///
+ ///
+ public bool TableExists(string tableName)
+ {
+ return SqlSyntax.DoesTableExist(_database, tableName);
+ }
+
+ ///
+ /// Returns whether the table for the specified exists in the database.
+ ///
+ /// The type representing the DTO/table.
+ /// true if the table exists; otherwise false.
+ ///
+ ///
+ /// if (schemaHelper.TableExist<MyDto>)
+ /// {
+ /// // do something when the table exists
+ /// }
+ ///
+ ///
+ ///
+ /// If has been decorated with an , the name from that
+ /// attribute will be used for the table name. If the attribute is not present, the name
+ /// will be used instead.
+ ///
+ public bool TableExists()
+ {
+ var table = DefinitionFactory.GetTableDefinition(typeof(T), SqlSyntax);
+ return table != null && TableExists(table.Name);
+ }
+
+ ///
+ /// Creates a new table in the database based on the type of .
+ ///
+ /// The type representing the DTO/table.
+ /// Whether the table should be overwritten if it already exists.
+ ///
+ /// If has been decorated with an , the name from that
+ /// attribute will be used for the table name. If the attribute is not present, the name
+ /// will be used instead.
+ ///
+ /// If a table with the same name already exists, the parameter will determine
+ /// whether the table is overwritten. If true, the table will be overwritten, whereas this method will
+ /// not do anything if the parameter is false.
+ ///
+ internal void CreateTable(bool overwrite = false)
+ where T : new()
+ {
+ var tableType = typeof(T);
+ CreateTable(overwrite, tableType, new DatabaseDataCreator(_database, _logger));
+ }
+
+ ///
+ /// Creates a new table in the database for the specified .
+ ///
+ /// Whether the table should be overwritten if it already exists.
+ /// The representing the table.
+ ///
+ ///
+ /// If has been decorated with an , the name from
+ /// that attribute will be used for the table name. If the attribute is not present, the name
+ /// will be used instead.
+ ///
+ /// If a table with the same name already exists, the parameter will determine
+ /// whether the table is overwritten. If true, the table will be overwritten, whereas this method will
+ /// not do anything if the parameter is false.
+ ///
+ /// This need to execute as part of a transaction.
+ ///
+ internal void CreateTable(bool overwrite, Type modelType, DatabaseDataCreator dataCreation)
+ {
+ if (!_database.InTransaction)
+ throw new InvalidOperationException("Database is not in a transaction.");
+
+ var tableDefinition = DefinitionFactory.GetTableDefinition(modelType, SqlSyntax);
+ var tableName = tableDefinition.Name;
+
+ var createSql = SqlSyntax.Format(tableDefinition);
+ var createPrimaryKeySql = SqlSyntax.FormatPrimaryKey(tableDefinition);
+ var foreignSql = SqlSyntax.Format(tableDefinition.ForeignKeys);
+ var indexSql = SqlSyntax.Format(tableDefinition.Indexes);
+
+ var tableExist = TableExists(tableName);
+ if (overwrite && tableExist)
+ {
+ _logger.Info("Table {TableName} already exists, but will be recreated", tableName);
+
+ DropTable(tableName);
+ tableExist = false;
+ }
+
+ if (tableExist)
+ {
+ // The table exists and was not recreated/overwritten.
+ _logger.Info("Table {TableName} already exists - no changes were made", tableName);
+ return;
+ }
+
+ //Execute the Create Table sql
+ var created = _database.Execute(new Sql(createSql));
+ _logger.Info("Create Table {TableName} ({Created}): \n {Sql}", tableName, created, createSql);
+
+ //If any statements exists for the primary key execute them here
+ if (string.IsNullOrEmpty(createPrimaryKeySql) == false)
+ {
+ var createdPk = _database.Execute(new Sql(createPrimaryKeySql));
+ _logger.Info("Create Primary Key ({CreatedPk}):\n {Sql}", createdPk, createPrimaryKeySql);
+ }
+
+ if (SqlSyntax.SupportsIdentityInsert() && tableDefinition.Columns.Any(x => x.IsIdentity))
+ _database.Execute(new Sql($"SET IDENTITY_INSERT {SqlSyntax.GetQuotedTableName(tableName)} ON "));
+
+ //Call the NewTable-event to trigger the insert of base/default data
+ //OnNewTable(tableName, _db, e, _logger);
+
+ dataCreation.InitializeBaseData(tableName);
+
+ if (SqlSyntax.SupportsIdentityInsert() && tableDefinition.Columns.Any(x => x.IsIdentity))
+ _database.Execute(new Sql($"SET IDENTITY_INSERT {SqlSyntax.GetQuotedTableName(tableName)} OFF;"));
+
+ //Loop through index statements and execute sql
+ foreach (var sql in indexSql)
+ {
+ var createdIndex = _database.Execute(new Sql(sql));
+ _logger.Info("Create Index ({CreatedIndex}):\n {Sql}", createdIndex, sql);
+ }
+
+ //Loop through foreignkey statements and execute sql
+ foreach (var sql in foreignSql)
+ {
+ var createdFk = _database.Execute(new Sql(sql));
+ _logger.Info("Create Foreign Key ({CreatedFk}):\n {Sql}", createdFk, sql);
+ }
+
+ if (overwrite)
+ {
+ _logger.Info("Table {TableName} was recreated", tableName);
+ }
+ else
+ {
+ _logger.Info("New table {TableName} was created", tableName);
+
+ }
+ }
+
+ ///
+ /// Drops the table for the specified .
+ ///
+ /// The type representing the DTO/table.
+ ///
+ ///
+ /// schemaHelper.DropTable<MyDto>);
+ ///
+ ///
+ ///
+ /// If has been decorated with an , the name from that
+ /// attribute will be used for the table name. If the attribute is not present, the name
+ /// will be used instead.
+ ///
+ public void DropTable(string tableName)
+ {
+ var sql = new Sql(string.Format(SqlSyntax.DropTable, SqlSyntax.GetQuotedTableName(tableName)));
+ _database.Execute(sql);
+ }
+
+ #endregion
+ }
+}
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
index 4c68addebc..f21216fde3 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseSchemaResult.cs
@@ -12,12 +12,8 @@ namespace Umbraco.Core.Migrations.Install
///
internal class DatabaseSchemaResult
{
- private readonly bool _isMySql;
-
public DatabaseSchemaResult(ISqlSyntaxProvider sqlSyntax)
{
- _isMySql = sqlSyntax is MySqlSyntaxProvider;
-
Errors = new List>();
TableDefinitions = new List();
ValidTables = new List();
@@ -31,7 +27,7 @@ namespace Umbraco.Core.Migrations.Install
public List TableDefinitions { get; }
- // fixme TableDefinitions are those that should be there, IndexDefinitions are those that... are in DB?
+ // TODO: what are these exactly? TableDefinitions are those that should be there, IndexDefinitions are those that... are in DB?
internal List IndexDefinitions { get; }
public List ValidTables { get; }
@@ -102,11 +98,6 @@ namespace Umbraco.Core.Migrations.Install
sb.AppendLine(" ");
}
- if (_isMySql)
- {
- sb.AppendLine("Please note that the constraints could not be validated because the current data provider is MySql.");
- }
-
return sb.ToString();
}
}
diff --git a/src/Umbraco.Core/Migrations/MigrationBase_Extra.cs b/src/Umbraco.Core/Migrations/MigrationBase_Extra.cs
index 9e13badacf..6d936e8407 100644
--- a/src/Umbraco.Core/Migrations/MigrationBase_Extra.cs
+++ b/src/Umbraco.Core/Migrations/MigrationBase_Extra.cs
@@ -98,14 +98,12 @@ namespace Umbraco.Core.Migrations
protected bool ColumnExists(string tableName, string columnName)
{
- // that's ok even on MySql
var columns = SqlSyntax.GetColumnsInSchema(Context.Database).Distinct().ToArray();
return columns.Any(x => x.TableName.InvariantEquals(tableName) && x.ColumnName.InvariantEquals(columnName));
}
protected string ColumnType(string tableName, string columnName)
{
- // that's ok even on MySql
var columns = SqlSyntax.GetColumnsInSchema(Context.Database).Distinct().ToArray();
var column = columns.FirstOrDefault(x => x.TableName.InvariantEquals(tableName) && x.ColumnName.InvariantEquals(columnName));
return column?.DataType;
diff --git a/src/Umbraco.Core/Migrations/MigrationPlan.cs b/src/Umbraco.Core/Migrations/MigrationPlan.cs
index 85d9c1d2cc..9ede9f04f2 100644
--- a/src/Umbraco.Core/Migrations/MigrationPlan.cs
+++ b/src/Umbraco.Core/Migrations/MigrationPlan.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Core.Migrations
// register the target state if we don't know it already
// this is how we keep track of the final state - because
// transitions could be defined in any order, that might
- // be overriden afterwards.
+ // be overridden afterwards.
if (!_transitions.ContainsKey(targetState))
_transitions.Add(targetState, null);
diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 833955ee6a..9bf58c8d2f 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -124,6 +124,8 @@ namespace Umbraco.Core.Migrations.Upgrade
To("{64EBCE53-E1F0-463A-B40B-E98EFCCA8AE2}");
To("{0009109C-A0B8-4F3F-8FEB-C137BBDDA268}");
To("{8A027815-D5CD-4872-8B88-9A51AB5986A6}"); // from 7.14.0
+ To("{ED28B66A-E248-4D94-8CDB-9BDF574023F0}");
+ To("{38C809D5-6C34-426B-9BEA-EFD39162595C}");
//FINAL
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_10_0/RenamePreviewFolder.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_10_0/RenamePreviewFolder.cs
index a73fb8a325..48e6d0085d 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_10_0/RenamePreviewFolder.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_10_0/RenamePreviewFolder.cs
@@ -5,7 +5,7 @@ using File = System.IO.File;
namespace Umbraco.Core.Migrations.Upgrade.V_7_10_0
{
///
- /// Renames the preview folder containing static html files to ensure it does not interfere with the MVC route
+ /// Renames the preview folder containing static HTML files to ensure it does not interfere with the MVC route
/// that is now supposed to render these views dynamically. We don't want to delete as people may have made
/// customizations to these files that would need to be migrated to the new .cshtml view files.
///
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_10_0
{
Directory.Move(previewFolderPath, newPath);
var readmeText =
- $"Static html files used for preview and canvas editing functionality no longer live in this directory.\r\n" +
+ $"Static HTML files used for preview and canvas editing functionality no longer live in this directory.\r\n" +
$"Instead they have been recreated as MVC views and can now be found in '~/Umbraco/Views/Preview'.\r\n" +
$"See issue: http://issues.umbraco.org/issue/U4-11090";
File.WriteAllText(Path.Combine(newPath, "readme.txt"), readmeText);
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/UpdateUniqueIndexOnPropertyData.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/UpdateUniqueIndexOnPropertyData.cs
index 73f03e96c6..8c688cfd28 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/UpdateUniqueIndexOnPropertyData.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_5_0/UpdateUniqueIndexOnPropertyData.cs
@@ -27,25 +27,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_5_0
if (found != null)
{
- //Check for MySQL
- if (DatabaseType.IsMySql())
- {
- //Use the special double nested sub query for MySQL since that is the only
- //way delete sub queries works
- var delPropQry = SqlSyntax.GetDeleteSubquery(
- "cmsPropertyData",
- "id",
- Sql("SELECT MIN(id) FROM cmsPropertyData GROUP BY nodeId, versionId, propertytypeid HAVING MIN(id) IS NOT NULL"),
- WhereInType.NotIn);
- Database.Execute(delPropQry.SQL);
- }
- else
- {
- //NOTE: Even though the above will work for MSSQL, we are not going to execute the
- // nested delete sub query logic since it will be slower and there could be a ton of property
- // data here so needs to be as fast as possible.
- Database.Execute("DELETE FROM cmsPropertyData WHERE id NOT IN (SELECT MIN(id) FROM cmsPropertyData GROUP BY nodeId, versionId, propertytypeid HAVING MIN(id) IS NOT NULL)");
- }
+ Database.Execute("DELETE FROM cmsPropertyData WHERE id NOT IN (SELECT MIN(id) FROM cmsPropertyData GROUP BY nodeId, versionId, propertytypeid HAVING MIN(id) IS NOT NULL)");
//we need to re create this index
Delete.Index("IX_cmsPropertyData_1").OnTable("cmsPropertyData").Do();
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToCmsMemberLoginName.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToCmsMemberLoginName.cs
index 05abc5ec83..a223d76a07 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToCmsMemberLoginName.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexToCmsMemberLoginName.cs
@@ -16,9 +16,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
//Now we need to check if we can actually d6 this because we won't be able to if there's data in there that is too long
//http://issues.umbraco.org/issue/U4-9758
- var colLen = SqlSyntax is MySqlSyntaxProvider
- ? database.ExecuteScalar("select max(LENGTH(LoginName)) from cmsMember")
- : database.ExecuteScalar("select max(datalength(LoginName)) from cmsMember");
+ var colLen = database.ExecuteScalar("select max(datalength(LoginName)) from cmsMember");
if (colLen < 900 == false && colLen != null)
{
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexesToUmbracoRelationTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexesToUmbracoRelationTables.cs
index 17dd060376..9042ae105e 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexesToUmbracoRelationTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/AddIndexesToUmbracoRelationTables.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoRelation_parentChildType")) == false)
{
//This will remove any corrupt/duplicate data in the relation table before the index is applied
- //Ensure this executes in a defered block which will be done inside of the migration transaction
+ //Ensure this executes in a deferred block which will be done inside of the migration transaction
var database = Database;
//We need to check if this index has corrupted data and then clear that data
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/ReduceLoginNameColumnsSize.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/ReduceLoginNameColumnsSize.cs
index 30ee91300d..1af21617f3 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/ReduceLoginNameColumnsSize.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_6_0/ReduceLoginNameColumnsSize.cs
@@ -17,9 +17,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_6_0
var database = Database;
var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(database);
- var colLen = (SqlSyntax is MySqlSyntaxProvider)
- ? database.ExecuteScalar("select max(LENGTH(LoginName)) from cmsMember")
- : database.ExecuteScalar("select max(datalength(LoginName)) from cmsMember");
+ var colLen = database.ExecuteScalar("select max(datalength(LoginName)) from cmsMember");
if (colLen < 900 == false) return;
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddIndexToDictionaryKeyColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddIndexToDictionaryKeyColumn.cs
index 700702204c..b366c7dab9 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddIndexToDictionaryKeyColumn.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddIndexToDictionaryKeyColumn.cs
@@ -13,9 +13,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
{
var database = Database;
//Now we need to check if we can actually do this because we won't be able to if there's data in there that is too long
- var colLen = (SqlSyntax is MySqlSyntaxProvider)
- ? database.ExecuteScalar(string.Format("select max(LENGTH({0})) from cmsDictionary", SqlSyntax.GetQuotedColumnName("key")))
- : database.ExecuteScalar(string.Format("select max(datalength({0})) from cmsDictionary", SqlSyntax.GetQuotedColumnName("key")));
+ var colLen = database.ExecuteScalar(string.Format("select max(datalength({0})) from cmsDictionary", SqlSyntax.GetQuotedColumnName("key")));
if (colLen < 900 == false && colLen != null)
{
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserGroupTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserGroupTables.cs
index 35df178672..edd78e6c84 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserGroupTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/AddUserGroupTables.cs
@@ -4,7 +4,6 @@ using System.Data;
using System.Linq;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Core.Persistence.SqlSyntax;
using ColumnInfo = Umbraco.Core.Persistence.SqlSyntax.ColumnInfo;
namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
@@ -19,9 +18,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
//For some of the migration data inserts we require to use a special MSSQL collate expression since
//some databases may have a custom collation specified and if that is the case, when we compare strings
//in dynamic SQL it will try to compare strings in different collations and this will yield errors.
- _collateSyntax = SqlSyntax is MySqlSyntaxProvider || SqlSyntax is SqlCeSyntaxProvider
- ? string.Empty
- : "COLLATE DATABASE_DEFAULT";
+ _collateSyntax = "COLLATE DATABASE_DEFAULT";
}
public override void Migrate()
@@ -30,7 +27,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
var constraints = SqlSyntax.GetConstraintsPerColumn(Context.Database).Distinct().ToArray();
var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();
- //In some very rare cases, there might alraedy be user group tables that we'll need to remove first
+ //In some very rare cases, there might already be user group tables that we'll need to remove first
//but of course we don't want to remove the tables we will be creating below if they already exist so
//need to do some checks first since these old rare tables have a different schema
RemoveOldTablesIfExist(tables, columns);
@@ -86,7 +83,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
}
///
- /// In some very rare cases, there might alraedy be user group tables that we'll need to remove first
+ /// In some very rare cases, there might already be user group tables that we'll need to remove first
/// but of course we don't want to remove the tables we will be creating below if they already exist so
/// need to do some checks first since these old rare tables have a different schema
///
@@ -340,24 +337,16 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
if (tables.InvariantContains("umbracoUserType") && tables.InvariantContains("umbracoUser"))
{
- if (DatabaseType.IsMySql())
+ //Delete the FK if it exists before dropping the column
+ if (constraints.Any(x => x.Item1.InvariantEquals("umbracoUser") && x.Item3.InvariantEquals("FK_umbracoUser_umbracoUserType_id")))
{
- //In MySql, this will drop the FK according to it's special naming rules
- Delete.ForeignKey().FromTable("umbracoUser").ForeignColumn("userType").ToTable("umbracoUserType").PrimaryColumn("id");
+ Delete.ForeignKey("FK_umbracoUser_umbracoUserType_id").OnTable("umbracoUser").Do();
}
- else
- {
- //Delete the FK if it exists before dropping the column
- if (constraints.Any(x => x.Item1.InvariantEquals("umbracoUser") && x.Item3.InvariantEquals("FK_umbracoUser_umbracoUserType_id")))
- {
- Delete.ForeignKey("FK_umbracoUser_umbracoUserType_id").OnTable("umbracoUser").Do();
- }
- //This is the super old constraint name of the FK for user type so check this one too
- if (constraints.Any(x => x.Item1.InvariantEquals("umbracoUser") && x.Item3.InvariantEquals("FK_user_userType")))
- {
- Delete.ForeignKey("FK_user_userType").OnTable("umbracoUser").Do();
- }
+ //This is the super old constraint name of the FK for user type so check this one too
+ if (constraints.Any(x => x.Item1.InvariantEquals("umbracoUser") && x.Item3.InvariantEquals("FK_user_userType")))
+ {
+ Delete.ForeignKey("FK_user_userType").OnTable("umbracoUser").Do();
}
Delete.Column("userType").FromTable("umbracoUser").Do();
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/ReduceDictionaryKeyColumnsSize.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/ReduceDictionaryKeyColumnsSize.cs
index 9f84320620..17dd3064eb 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/ReduceDictionaryKeyColumnsSize.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/ReduceDictionaryKeyColumnsSize.cs
@@ -16,9 +16,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
var database = Database;
var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(database);
- var colLen = SqlSyntax is MySqlSyntaxProvider
- ? database.ExecuteScalar(string.Format("select max(LENGTH({0})) from cmsDictionary", SqlSyntax.GetQuotedColumnName("key")))
- : database.ExecuteScalar(string.Format("select max(datalength({0})) from cmsDictionary", SqlSyntax.GetQuotedColumnName("key")));
+ var colLen = database.ExecuteScalar(string.Format("select max(datalength({0})) from cmsDictionary", SqlSyntax.GetQuotedColumnName("key")));
if (colLen < 900 == false) return;
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/UpdateUserTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/UpdateUserTables.cs
index 3714427cd7..509b3f91dd 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/UpdateUserTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_7_7_0/UpdateUserTables.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_7_0
public override void Migrate()
{
- //Don't exeucte if the column is already there
+ //Don't execute if the column is already there
var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();
if (columns.Any(x => x.TableName.InvariantEquals("umbracoUser") && x.ColumnName.InvariantEquals("createDate")) == false)
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddVariationTables1A.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddVariationTables1A.cs
index 96e82d281d..34648d402a 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddVariationTables1A.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddVariationTables1A.cs
@@ -40,8 +40,6 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
AlterColumn(Constants.DatabaseSchema.Tables.ContentVersionCultureVariation, "languageId");
Create.Table().Do();
-
- // fixme - data migration?
}
}
}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddVariationTables2.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddVariationTables2.cs
index 5b6c913195..c6cad2eac1 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddVariationTables2.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddVariationTables2.cs
@@ -13,8 +13,6 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
{
Create.Table().Do();
Create.Table().Do();
-
- // fixme - data migration?
}
}
}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
new file mode 100644
index 0000000000..ed1c08f0f8
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
@@ -0,0 +1,139 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+ public class ConvertRelatedLinksToMultiUrlPicker : MigrationBase
+ {
+ public ConvertRelatedLinksToMultiUrlPicker(IMigrationContext context) : base(context)
+ { }
+
+ public override void Migrate()
+ {
+ var sqlDataTypes = Sql()
+ .Select()
+ .From()
+ .Where(x => x.EditorAlias == "Umbraco.RelatedLinks"
+ || x.EditorAlias == "Umbraco.RelatedLinks2");
+
+ var dataTypes = Database.Fetch(sqlDataTypes);
+ var dataTypeIds = dataTypes.Select(x => x.NodeId).ToList();
+
+ if (dataTypeIds.Count == 0) return;
+
+ foreach (var dataType in dataTypes)
+ {
+ dataType.EditorAlias = Constants.PropertyEditors.Aliases.MultiUrlPicker;
+ Database.Update(dataType);
+ }
+
+ var sqlPropertyTpes = Sql()
+ .Select()
+ .From()
+ .Where(x => dataTypeIds.Contains(x.DataTypeId));
+
+ var propertyTypeIds = Database.Fetch(sqlPropertyTpes).Select(x => x.Id).ToList();
+
+ if (propertyTypeIds.Count == 0) return;
+
+ var sqlPropertyData = Sql()
+ .Select()
+ .From()
+ .Where(x => propertyTypeIds.Contains(x.PropertyTypeId));
+
+ var properties = Database.Fetch(sqlPropertyData);
+
+ // Create a Multi URL Picker datatype for the converted RelatedLinks data
+
+ foreach (var property in properties)
+ {
+ var value = property.Value.ToString();
+ if (string.IsNullOrWhiteSpace(value))
+ continue;
+
+ var relatedLinks = JsonConvert.DeserializeObject>(value);
+ var links = new List();
+ foreach (var relatedLink in relatedLinks)
+ {
+ GuidUdi udi = null;
+ if (relatedLink.IsInternal)
+ {
+ var linkIsUdi = GuidUdi.TryParse(relatedLink.Link, out udi);
+ if (linkIsUdi == false)
+ {
+ // oh no.. probably an integer, yikes!
+ if (int.TryParse(relatedLink.Link, out var intId))
+ {
+ var sqlNodeData = Sql()
+ .Select()
+ .Where(x => x.NodeId == intId);
+
+ var node = Database.Fetch(sqlNodeData).FirstOrDefault();
+ if (node != null)
+ // Note: RelatedLinks did not allow for picking media items,
+ // so if there's a value this will be a content item - hence
+ // the hardcoded "document" here
+ udi = new GuidUdi("document", node.UniqueId);
+ }
+ }
+ }
+
+ var link = new LinkDto
+ {
+ Name = relatedLink.Caption,
+ Target = relatedLink.NewWindow ? "_blank" : null,
+ Udi = udi,
+ // Should only have a URL if it's an external link otherwise it wil be a UDI
+ Url = relatedLink.IsInternal == false ? relatedLink.Link : null
+ };
+
+ links.Add(link);
+ }
+
+ var json = JsonConvert.SerializeObject(links);
+
+ // Update existing data
+ property.TextValue = json;
+ Database.Update(property);
+ }
+
+
+ }
+ }
+
+ internal class RelatedLink
+ {
+ public int? Id { get; internal set; }
+ internal bool IsDeleted { get; set; }
+ [JsonProperty("caption")]
+ public string Caption { get; set; }
+ [JsonProperty("link")]
+ public string Link { get; set; }
+ [JsonProperty("newWindow")]
+ public bool NewWindow { get; set; }
+ [JsonProperty("isInternal")]
+ public bool IsInternal { get; set; }
+ }
+
+ [DataContract]
+ internal class LinkDto
+ {
+ [DataMember(Name = "name")]
+ public string Name { get; set; }
+
+ [DataMember(Name = "target")]
+ public string Target { get; set; }
+
+ [DataMember(Name = "udi")]
+ public GuidUdi Udi { get; set; }
+
+ [DataMember(Name = "url")]
+ public string Url { get; set; }
+ }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
index ee439088be..064ffc7228 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/PropertyEditorsMigration.cs
@@ -16,7 +16,6 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
RenameDataType(Constants.PropertyEditors.Aliases.MediaPicker + "2", Constants.PropertyEditors.Aliases.MediaPicker);
RenameDataType(Constants.PropertyEditors.Aliases.MemberPicker + "2", Constants.PropertyEditors.Aliases.MemberPicker);
RenameDataType(Constants.PropertyEditors.Aliases.MultiNodeTreePicker + "2", Constants.PropertyEditors.Aliases.MultiNodeTreePicker);
- RenameDataType(Constants.PropertyEditors.Aliases.RelatedLinks + "2", Constants.PropertyEditors.Aliases.RelatedLinks);
RenameDataType("Umbraco.TextboxMultiple", Constants.PropertyEditors.Aliases.TextArea, false);
RenameDataType("Umbraco.Textbox", Constants.PropertyEditors.Aliases.TextBox, false);
}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
index 623a842525..bd08b53877 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
//populate the new macroSource column with legacy data
Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroXSLT, macroType = {(int)MacroTypes.Unknown} WHERE macroXSLT IS NOT NULL").Do();
Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptAssembly, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptAssembly IS NOT NULL").Do();
- Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.UserControl} WHERE macroScriptType IS NOT NULL").Do();
+ Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptType IS NOT NULL").Do();
Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroPython, macroType = {(int)MacroTypes.PartialView} WHERE macroPython IS NOT NULL").Do();
//now apply constraints (NOT NULL) to new table
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
index db8f95bf71..c683940f60 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
@@ -20,36 +20,25 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
Alter.Table("cmsPreviewXml").AddColumn("Rv").AsInt64().NotNullable().WithDefaultValue(0).Do();
// remove the any PK_ and the FK_ to cmsContentVersion.VersionId
- if (DatabaseType.IsMySql())
+ var constraints = SqlSyntax.GetConstraintsPerColumn(Context.Database).Distinct().ToArray();
+ var dups = new List();
+ foreach (var c in constraints.Where(x => x.Item1.InvariantEquals("cmsPreviewXml") && x.Item3.InvariantStartsWith("PK_")))
+ {
+ var keyName = c.Item3.ToLowerInvariant();
+ if (dups.Contains(keyName))
+ {
+ Logger.Warn("Duplicate constraint '{Constraint}'", c.Item3);
+ continue;
+ }
+ dups.Add(keyName);
+ Delete.PrimaryKey(c.Item3).FromTable(c.Item1).Do();
+ }
+ foreach (var c in constraints.Where(x => x.Item1.InvariantEquals("cmsPreviewXml") && x.Item3.InvariantStartsWith("FK_cmsPreviewXml_cmsContentVersion")))
{
- Delete.PrimaryKey("PK_cmsPreviewXml").FromTable("cmsPreviewXml").Do();
-
Delete.ForeignKey().FromTable("cmsPreviewXml").ForeignColumn("VersionId")
.ToTable("cmsContentVersion").PrimaryColumn("VersionId")
.Do();
}
- else
- {
- var constraints = SqlSyntax.GetConstraintsPerColumn(Context.Database).Distinct().ToArray();
- var dups = new List();
- foreach (var c in constraints.Where(x => x.Item1.InvariantEquals("cmsPreviewXml") && x.Item3.InvariantStartsWith("PK_")))
- {
- var keyName = c.Item3.ToLowerInvariant();
- if (dups.Contains(keyName))
- {
- Logger.Warn("Duplicate constraint '{Constraint}'", c.Item3);
- continue;
- }
- dups.Add(keyName);
- Delete.PrimaryKey(c.Item3).FromTable(c.Item1).Do();
- }
- foreach (var c in constraints.Where(x => x.Item1.InvariantEquals("cmsPreviewXml") && x.Item3.InvariantStartsWith("FK_cmsPreviewXml_cmsContentVersion")))
- {
- Delete.ForeignKey().FromTable("cmsPreviewXml").ForeignColumn("VersionId")
- .ToTable("cmsContentVersion").PrimaryColumn("VersionId")
- .Do();
- }
- }
if (ColumnExists("cmsPreviewXml", "Timestamp"))
Delete.Column("Timestamp").FromTable("cmsPreviewXml").Do();
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs
new file mode 100644
index 0000000000..2e37c79632
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/UpdatePickerIntegerValuesToUdi.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+ public class UpdatePickerIntegerValuesToUdi : MigrationBase
+ {
+ public UpdatePickerIntegerValuesToUdi(IMigrationContext context) : base(context)
+ { }
+
+ public override void Migrate()
+ {
+ var sqlDataTypes = Sql()
+ .Select()
+ .From()
+ .Where(x => x.EditorAlias == Constants.PropertyEditors.Aliases.ContentPicker
+ || x.EditorAlias == Constants.PropertyEditors.Aliases.MediaPicker
+ || x.EditorAlias == Constants.PropertyEditors.Aliases.MultiNodeTreePicker);
+
+ var dataTypes = Database.Fetch(sqlDataTypes).ToList();
+
+ foreach (var datatype in dataTypes.Where(x => !x.Configuration.IsNullOrWhiteSpace()))
+ {
+ switch (datatype.EditorAlias)
+ {
+ case Constants.PropertyEditors.Aliases.ContentPicker:
+ case Constants.PropertyEditors.Aliases.MediaPicker:
+ {
+ var config = JsonConvert.DeserializeObject(datatype.Configuration);
+ var startNodeId = config.Value("startNodeId");
+ if (!startNodeId.IsNullOrWhiteSpace() && int.TryParse(startNodeId, out var intStartNode))
+ {
+ var guid = intStartNode <= 0
+ ? null
+ : Context.Database.ExecuteScalar(
+ Sql().Select(x => x.UniqueId).From().Where(x => x.NodeId == intStartNode));
+ if (guid.HasValue)
+ {
+ var udi = new GuidUdi(datatype.EditorAlias == Constants.PropertyEditors.Aliases.MediaPicker
+ ? Constants.UdiEntityType.Media
+ : Constants.UdiEntityType.Document, guid.Value);
+ config["startNodeId"] = new JValue(udi.ToString());
+ }
+ else
+ config.Remove("startNodeId");
+
+ datatype.Configuration = JsonConvert.SerializeObject(config);
+ Database.Update(datatype);
+ }
+
+ break;
+ }
+ case Constants.PropertyEditors.Aliases.MultiNodeTreePicker:
+ {
+ var config = JsonConvert.DeserializeObject(datatype.Configuration);
+ var startNodeConfig = config.Value("startNode");
+ if (startNodeConfig != null)
+ {
+ var startNodeId = startNodeConfig.Value("id");
+ var objectType = startNodeConfig.Value("type");
+ if (!objectType.IsNullOrWhiteSpace()
+ && !startNodeId.IsNullOrWhiteSpace()
+ && int.TryParse(startNodeId, out var intStartNode))
+ {
+ var guid = intStartNode <= 0
+ ? null
+ : Context.Database.ExecuteScalar(
+ Sql().Select(x => x.UniqueId).From().Where(x => x.NodeId == intStartNode));
+
+ string entityType = null;
+ switch (objectType.ToLowerInvariant())
+ {
+ case "content":
+ entityType = Constants.UdiEntityType.Document;
+ break;
+ case "media":
+ entityType = Constants.UdiEntityType.Media;
+ break;
+ case "member":
+ entityType = Constants.UdiEntityType.Member;
+ break;
+ }
+
+ if (entityType != null && guid.HasValue)
+ {
+ var udi = new GuidUdi(entityType, guid.Value);
+ startNodeConfig["id"] = new JValue(udi.ToString());
+ }
+ else
+ startNodeConfig.Remove("id");
+
+ datatype.Configuration = JsonConvert.SerializeObject(config);
+ Database.Update(datatype);
+ }
+ }
+
+ break;
+ }
+ }
+ }
+
+ }
+ }
+}
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/VariantsMigration.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/VariantsMigration.cs
index 9e223e7beb..d484f7c6ba 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/VariantsMigration.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/VariantsMigration.cs
@@ -1,10 +1,8 @@
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Core.Persistence.Dtos;
namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
@@ -17,7 +15,6 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
// notes
// do NOT use Rename.Column as it's borked on SQLCE - use ReplaceColumn instead
- // not sure it all runs on MySql, needs to test
public override void Migrate()
{
@@ -195,9 +192,7 @@ JOIN {SqlSyntax.GetQuotedTableName(PreTables.Document)} doc ON doc.nodeId=cver.n
FROM {SqlSyntax.GetQuotedTableName(PreTables.Document)} doc
JOIN {SqlSyntax.GetQuotedTableName(PreTables.ContentVersion)} cver ON doc.nodeId=cver.nodeId AND doc.versionId=cver.versionId
WHERE doc.newest=1 AND doc.published=1");
- var getIdentity = Database.SqlContext.DatabaseType.IsMySql()
- ? "LAST_INSERT_ID()"
- : "@@@@IDENTITY";
+ var getIdentity = "@@@@IDENTITY";
foreach (var t in temp3)
{
Database.Execute($@"INSERT INTO {SqlSyntax.GetQuotedTableName(PreTables.ContentVersion)} (nodeId, versionId, versionDate, userId, {SqlSyntax.GetQuotedColumnName("current")}, text)
diff --git a/src/Umbraco.Core/Models/ApplicationTree.cs b/src/Umbraco.Core/Models/ApplicationTree.cs
deleted file mode 100644
index ccdebea724..0000000000
--- a/src/Umbraco.Core/Models/ApplicationTree.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using Umbraco.Core.Services;
-
-namespace Umbraco.Core.Models
-{
- [DebuggerDisplay("Tree - {Title} ({ApplicationAlias})")]
- public class ApplicationTree
- {
- private static readonly ConcurrentDictionary ResolvedTypes = new ConcurrentDictionary();
-
- ///
- /// Initializes a new instance of the class.
- ///
- public ApplicationTree() { }
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// if set to true [initialize].
- /// The sort order.
- /// The application alias.
- /// The tree alias.
- /// The tree title.
- /// The icon closed.
- /// The icon opened.
- /// The tree type.
- public ApplicationTree(bool initialize, int sortOrder, string applicationAlias, string alias, string title, string iconClosed, string iconOpened, string type)
- {
- Initialize = initialize;
- SortOrder = sortOrder;
- ApplicationAlias = applicationAlias;
- Alias = alias;
- Title = title;
- IconClosed = iconClosed;
- IconOpened = iconOpened;
- Type = type;
-
- }
-
- ///
- /// Gets or sets a value indicating whether this should initialize.
- ///
- /// true if initialize; otherwise, false.
- public bool Initialize { get; set; }
-
- ///
- /// Gets or sets the sort order.
- ///
- /// The sort order.
- public int SortOrder { get; set; }
-
- ///
- /// Gets the application alias.
- ///
- /// The application alias.
- public string ApplicationAlias { get; }
-
- ///
- /// Gets the tree alias.
- ///
- /// The alias.
- public string Alias { get; }
-
- ///
- /// Gets or sets the tree title.
- ///
- /// The title.
- public string Title { get; set; }
-
- ///
- /// Gets or sets the icon closed.
- ///
- /// The icon closed.
- public string IconClosed { get; set; }
-
- ///
- /// Gets or sets the icon opened.
- ///
- /// The icon opened.
- public string IconOpened { get; set; }
-
- ///
- /// Gets or sets the tree type assembly name.
- ///
- /// The type.
- public string Type { get; set; }
-
- ///
- /// Returns the localized root node display name
- ///
- ///
- ///
- public string GetRootNodeDisplayName(ILocalizedTextService textService)
- {
- var label = $"[{Alias}]";
-
- // try to look up a the localized tree header matching the tree alias
- var localizedLabel = textService.Localize("treeHeaders/" + Alias);
-
- // if the localizedLabel returns [alias] then return the title attribute from the trees.config file, if it's defined
- if (localizedLabel != null && localizedLabel.Equals(label, StringComparison.InvariantCultureIgnoreCase))
- {
- if (string.IsNullOrEmpty(Title) == false)
- label = Title;
- }
- else
- {
- // the localizedLabel translated into something that's not just [alias], so use the translation
- label = localizedLabel;
- }
-
- return label;
- }
-
- private Type _runtimeType;
-
- ///
- /// Returns the CLR type based on it's assembly name stored in the config
- ///
- ///
- public Type GetRuntimeType()
- {
- return _runtimeType ?? (_runtimeType = System.Type.GetType(Type));
- }
-
- ///
- /// Used to try to get and cache the tree type
- ///
- ///
- ///
- internal static Type TryGetType(string type)
- {
- try
- {
- return ResolvedTypes.GetOrAdd(type, s =>
- {
- var result = System.Type.GetType(type);
- if (result != null)
- {
- return result;
- }
-
- //we need to implement a bit of a hack here due to some trees being renamed and backwards compat
- var parts = type.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
- if (parts.Length != 2)
- throw new InvalidOperationException("Could not resolve type");
- if (parts[1].Trim() != "Umbraco.Web" || parts[0].StartsWith("Umbraco.Web.Trees") == false || parts[0].EndsWith("Controller"))
- throw new InvalidOperationException("Could not resolve type");
-
- //if it's one of our controllers but it's not suffixed with "Controller" then add it and try again
- var tempType = parts[0] + "Controller, Umbraco.Web";
-
- result = System.Type.GetType(tempType);
- if (result != null)
- return result;
-
- throw new InvalidOperationException("Could not resolve type");
- });
- }
- catch (InvalidOperationException)
- {
- //swallow, this is our own exception, couldn't find the type
- // fixme bad use of exceptions here!
- return null;
- }
- }
- }
-}
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index b0c786d4b0..ca1152a9a4 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -128,14 +128,14 @@ namespace Umbraco.Core.Models
///
/// Gets the enumeration of property groups for the entity.
- /// fixme is a proxy, kill this
+ /// TODO: remove this proxy method
///
[IgnoreDataMember]
public IEnumerable PropertyGroups => ContentTypeBase.CompositionPropertyGroups;
///
/// Gets the numeration of property types for the entity.
- /// fixme is a proxy, kill this
+ /// TODO: remove this proxy method
///
[IgnoreDataMember]
public IEnumerable PropertyTypes => ContentTypeBase.CompositionPropertyTypes;
@@ -391,7 +391,7 @@ namespace Umbraco.Core.Models
#region Dirty
///
- /// Overriden to include user properties.
+ /// Overridden to include user properties.
public override void ResetDirtyProperties(bool rememberDirty)
{
base.ResetDirtyProperties(rememberDirty);
@@ -408,14 +408,14 @@ namespace Umbraco.Core.Models
}
///
- /// Overriden to include user properties.
+ /// Overridden to include user properties.
public override bool IsDirty()
{
return IsEntityDirty() || this.IsAnyUserPropertyDirty();
}
///
- /// Overriden to include user properties.
+ /// Overridden to include user properties.
public override bool WasDirty()
{
return WasEntityDirty() || this.WasAnyUserPropertyDirty();
@@ -438,7 +438,7 @@ namespace Umbraco.Core.Models
}
///
- /// Overriden to include user properties.
+ /// Overridden to include user properties.
public override bool IsPropertyDirty(string propertyName)
{
if (base.IsPropertyDirty(propertyName))
@@ -448,7 +448,7 @@ namespace Umbraco.Core.Models
}
///
- /// Overriden to include user properties.
+ /// Overridden to include user properties.
public override bool WasPropertyDirty(string propertyName)
{
if (base.WasPropertyDirty(propertyName))
@@ -458,7 +458,7 @@ namespace Umbraco.Core.Models
}
///
- /// Overriden to include user properties.
+ /// Overridden to include user properties.
public override IEnumerable GetDirtyProperties()
{
var instanceProperties = base.GetDirtyProperties();
@@ -467,7 +467,7 @@ namespace Umbraco.Core.Models
}
///
- /// Overriden to include user properties.
+ /// Overridden to include user properties.
public override IEnumerable GetWereDirtyProperties()
{
var instanceProperties = base.GetWereDirtyProperties();
@@ -479,7 +479,7 @@ namespace Umbraco.Core.Models
///
///
- /// Overriden to deal with specific object instances
+ /// Overridden to deal with specific object instances
///
protected override void PerformDeepClone(object clone)
{
diff --git a/src/Umbraco.Core/Models/ContentScheduleCollection.cs b/src/Umbraco.Core/Models/ContentScheduleCollection.cs
index 4c06f8927d..6c7dd79312 100644
--- a/src/Umbraco.Core/Models/ContentScheduleCollection.cs
+++ b/src/Umbraco.Core/Models/ContentScheduleCollection.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Core.Models
_schedule[schedule.Culture] = changes;
}
- //TODO: Below will throw if there are duplicate dates added, validate/return bool?
+ // TODO: Below will throw if there are duplicate dates added, validate/return bool?
changes.Add(schedule.Date, schedule);
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, schedule));
@@ -62,7 +62,7 @@ namespace Umbraco.Core.Models
if (!releaseDate.HasValue && !expireDate.HasValue) return false;
- //TODO: Do we allow passing in a release or expiry date that is before now?
+ // TODO: Do we allow passing in a release or expiry date that is before now?
if (!_schedule.TryGetValue(culture, out var changes))
{
@@ -70,7 +70,7 @@ namespace Umbraco.Core.Models
_schedule[culture] = changes;
}
- //TODO: Below will throw if there are duplicate dates added, should validate/return bool?
+ // TODO: Below will throw if there are duplicate dates added, should validate/return bool?
// but the bool won't indicate which date was in error, maybe have 2 diff methods to schedule start/end?
if (releaseDate.HasValue)
diff --git a/src/Umbraco.Core/Models/ContentType.cs b/src/Umbraco.Core/Models/ContentType.cs
index e6439acade..4b9831682c 100644
--- a/src/Umbraco.Core/Models/ContentType.cs
+++ b/src/Umbraco.Core/Models/ContentType.cs
@@ -160,5 +160,8 @@ namespace Umbraco.Core.Models
return result;
}
+
+ ///
+ IContentType IContentType.DeepCloneWithResetIdentities(string newAlias) => (IContentType)DeepCloneWithResetIdentities(newAlias);
}
}
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index b6ea9f50a0..3da2838d0e 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -431,7 +431,7 @@ namespace Umbraco.Core.Models
/// PropertyTypes that are not part of a PropertyGroup
///
[IgnoreDataMember]
- //fixme should we mark this as EditorBrowsable hidden since it really isn't ever used?
+ // TODO: should we mark this as EditorBrowsable hidden since it really isn't ever used?
internal PropertyTypeCollection PropertyTypeCollection => _noGroupPropertyTypes;
///
@@ -504,9 +504,9 @@ namespace Umbraco.Core.Models
}
}
- public IContentType DeepCloneWithResetIdentities(string alias)
+ public ContentTypeBase DeepCloneWithResetIdentities(string alias)
{
- var clone = (ContentType)DeepClone();
+ var clone = (ContentTypeBase)DeepClone();
clone.Alias = alias;
clone.Key = Guid.Empty;
foreach (var propertyGroup in clone.PropertyGroups)
diff --git a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
index adbc3de54f..51c642c20d 100644
--- a/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBaseExtensions.cs
@@ -48,7 +48,7 @@ namespace Umbraco.Core.Models
throw new Exception("oops");
// skip new properties
- //TODO: This used to be WasPropertyDirty("HasIdentity") but i don't think that actually worked for detecting new entities this does seem to work properly
+ // TODO: This used to be WasPropertyDirty("HasIdentity") but i don't think that actually worked for detecting new entities this does seem to work properly
var isNewProperty = dirtyProperty.WasPropertyDirty("Id");
if (isNewProperty) return false;
diff --git a/src/Umbraco.Core/Models/DeepCloneHelper.cs b/src/Umbraco.Core/Models/DeepCloneHelper.cs
index 44a714c2c1..6470de912b 100644
--- a/src/Umbraco.Core/Models/DeepCloneHelper.cs
+++ b/src/Umbraco.Core/Models/DeepCloneHelper.cs
@@ -91,7 +91,7 @@ namespace Umbraco.Core.Models
|| (propertyInfo.PropertyType.IsInterface && propertyInfo.PropertyType.IsGenericType == false))
{
//if its an array, we'll create a list to work with first and then convert to array later
- //otherwise if its just a regular derivitave of IEnumerable, we can use a list too
+ //otherwise if its just a regular derivative of IEnumerable, we can use a list too
return new ClonePropertyInfo(propertyInfo) { GenericListType = typeof(List
/// Can be empty, but never null. To avoid allocating, do not
- /// test for emptyness, but use instead.
+ /// test for emptiness, but use instead.
IDictionary AdditionalData { get; }
///
diff --git a/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
index 18e53a8a04..60e06c4977 100644
--- a/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
+++ b/src/Umbraco.Core/Models/Entities/TreeEntityBase.cs
@@ -33,9 +33,6 @@ namespace Umbraco.Core.Models.Entities
public readonly PropertyInfo Trashed = ExpressionHelper.GetPropertyInfo(x => x.Trashed);
}
- // fixme
- // ParentId, Path, Level and Trashed all should be consistent, and all derive from parentId, really
-
///
[DataMember]
public string Name
@@ -121,4 +118,4 @@ namespace Umbraco.Core.Models.Entities
set => SetPropertyValueAndDetectChanges(value, ref _trashed, Selectors.Trashed);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Models/GridValue.cs b/src/Umbraco.Core/Models/GridValue.cs
index 237385f3f4..157304463f 100644
--- a/src/Umbraco.Core/Models/GridValue.cs
+++ b/src/Umbraco.Core/Models/GridValue.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json.Linq;
namespace Umbraco.Core.Models
{
- //TODO: Make a property value converter for this!
+ // TODO: Make a property value converter for this!
///
/// A model representing the value saved for the grid
@@ -21,7 +21,7 @@ namespace Umbraco.Core.Models
public class GridSection
{
[JsonProperty("grid")]
- public string Grid { get; set; } //fixme: what is this?
+ public string Grid { get; set; } // TODO: what is this?
[JsonProperty("rows")]
public IEnumerable Rows { get; set; }
@@ -48,7 +48,7 @@ namespace Umbraco.Core.Models
public class GridArea
{
[JsonProperty("grid")]
- public string Grid { get; set; } //fixme: what is this?
+ public string Grid { get; set; } // TODO: what is this?
[JsonProperty("controls")]
public IEnumerable Controls { get; set; }
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Core/Models/IContent.cs
index 2e71d392c6..ee38f613a3 100644
--- a/src/Umbraco.Core/Models/IContent.cs
+++ b/src/Umbraco.Core/Models/IContent.cs
@@ -137,7 +137,7 @@ namespace Umbraco.Core.Models
///
IEnumerable EditedCultures { get; }
- // fixme - these two should move to some kind of service
+ // TODO: these two should move to some kind of service
///
/// Changes the for the current content object
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index fb3714cfc0..40a1c57097 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -137,8 +137,6 @@ namespace Umbraco.Core.Models
///
void CopyFrom(IContent other, string culture = "*");
- // fixme validate published cultures?
-
///
/// Validates the content item's properties pass variant rules
///
diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
index 787e347b37..aea84d9767 100644
--- a/src/Umbraco.Core/Models/IContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/IContentTypeBase.cs
@@ -68,7 +68,7 @@ namespace Umbraco.Core.Models
///
/// The culture.
/// The segment.
- /// A value indicating whether wilcards are supported.
+ /// A value indicating whether wildcard are supported.
/// True if the combination is valid; otherwise false.
///
/// The combination must match the content type variation exactly. For instance, if the content type varies by culture,
@@ -81,7 +81,7 @@ namespace Umbraco.Core.Models
///
/// The culture.
/// The segment.
- /// A value indicating whether wilcards are supported.
+ /// A value indicating whether wildcard are supported.
/// True if the combination is valid; otherwise false.
///
/// The combination must be valid for properties of the content type. For instance, if the content type varies by culture,
diff --git a/src/Umbraco.Core/Models/IContentTypeComposition.cs b/src/Umbraco.Core/Models/IContentTypeComposition.cs
index 36ace19f0f..675d3cd268 100644
--- a/src/Umbraco.Core/Models/IContentTypeComposition.cs
+++ b/src/Umbraco.Core/Models/IContentTypeComposition.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Models
///
/// Gets or sets the content types that compose this content type.
///
- //fixme: we should be storing key references, not the object else we are caching way too much
+ // TODO: we should be storing key references, not the object else we are caching way too much
IEnumerable ContentTypeComposition { get; set; }
///
@@ -31,7 +31,7 @@ namespace Umbraco.Core.Models
bool AddContentType(IContentTypeComposition contentType);
///
- /// Removes a ContentType with the supplied alias from the the list of composite ContentTypes
+ /// Removes a ContentType with the supplied alias from the list of composite ContentTypes
///
/// Alias of a
/// True if ContentType was removed, otherwise returns False
diff --git a/src/Umbraco.Core/Models/ITemplate.cs b/src/Umbraco.Core/Models/ITemplate.cs
index 97b9324415..6548a49626 100644
--- a/src/Umbraco.Core/Models/ITemplate.cs
+++ b/src/Umbraco.Core/Models/ITemplate.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Runtime.Serialization;
-using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Models.Entities;
namespace Umbraco.Core.Models
{
///
- /// Defines a Template File (Masterpage or Mvc View)
+ /// Defines a Template File (Mvc View)
///
public interface ITemplate : IFile, IRememberBeingDirty, ICanBeDirty
{
diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
index dcf86a0b42..f5c21a3a74 100644
--- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Core.Models.Identity
_startContentIds = new int[] { };
_groups = new IReadOnlyUserGroup[] { };
_allowedSections = new string[] { };
- _culture = Current.Configs.Global().DefaultUILanguage; //fixme inject somehow?
+ _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject
_groups = new IReadOnlyUserGroup[0];
_roles = new ObservableCollection>();
_roles.CollectionChanged += _roles_CollectionChanged;
@@ -84,7 +84,7 @@ namespace Umbraco.Core.Models.Identity
_startContentIds = new int[] { };
_groups = new IReadOnlyUserGroup[] { };
_allowedSections = new string[] { };
- _culture = Current.Configs.Global().DefaultUILanguage; //fixme inject somehow?
+ _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject
_groups = groups.ToArray();
_roles = new ObservableCollection>(_groups.Select(x => new IdentityUserRole
{
@@ -95,7 +95,7 @@ namespace Umbraco.Core.Models.Identity
}
///
- /// Returns true if an Id has been set on this object this will be false if the object is new and not peristed to the database
+ /// Returns true if an Id has been set on this object this will be false if the object is new and not persisted to the database
///
public bool HasIdentity => _hasIdentity;
diff --git a/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs b/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
index 198f87cf21..276f601771 100644
--- a/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
+++ b/src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Models.Identity
public interface IIdentityUserLogin : IEntity, IRememberBeingDirty
{
///
- /// The login provider for the login (i.e. facebook, google)
+ /// The login provider for the login (i.e. Facebook, Google)
///
///
string LoginProvider { get; set; }
diff --git a/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs b/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
index 28a9fe2f15..5876f420b4 100644
--- a/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
+++ b/src/Umbraco.Core/Models/Identity/IdentityUserLogin.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Models.Entities;
namespace Umbraco.Core.Models.Identity
{
///
- /// Entity type for a user's login (i.e. facebook, google)
+ /// Entity type for a user's login (i.e. Facebook, Google)
///
///
public class IdentityUserLogin : EntityBase, IIdentityUserLogin
@@ -26,7 +26,7 @@ namespace Umbraco.Core.Models.Identity
}
///
- /// The login provider for the login (i.e. facebook, google)
+ /// The login provider for the login (i.e. Facebook, Google)
///
///
public string LoginProvider { get; set; }
diff --git a/src/Umbraco.Core/Models/MacroTypes.cs b/src/Umbraco.Core/Models/MacroTypes.cs
index 1f8ae696c5..5f8440845d 100644
--- a/src/Umbraco.Core/Models/MacroTypes.cs
+++ b/src/Umbraco.Core/Models/MacroTypes.cs
@@ -10,8 +10,6 @@ namespace Umbraco.Core.Models
[DataContract(IsReference = true)]
public enum MacroTypes
{
- [EnumMember]
- UserControl = 3,
[EnumMember]
Unknown = 4,
[EnumMember]
diff --git a/src/Umbraco.Core/Models/Media.cs b/src/Umbraco.Core/Models/Media.cs
index 9c13a22caa..a0f3aa35de 100644
--- a/src/Umbraco.Core/Models/Media.cs
+++ b/src/Umbraco.Core/Models/Media.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Models
///
/// Constructor for creating a Media object
///
- /// ame of the Media object
+ /// name of the Media object
/// Parent object
/// MediaType for the current Media object
public Media(string name, IMedia parent, IMediaType contentType)
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Models
///
/// Constructor for creating a Media object
///
- /// ame of the Media object
+ /// name of the Media object
/// Parent object
/// MediaType for the current Media object
/// Collection of properties
@@ -38,7 +38,7 @@ namespace Umbraco.Core.Models
///
/// Constructor for creating a Media object
///
- /// ame of the Media object
+ /// name of the Media object
/// Id of the Parent IMedia
/// MediaType for the current Media object
public Media(string name, int parentId, IMediaType contentType)
diff --git a/src/Umbraco.Core/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs
index f510377c09..e281aaf5ab 100644
--- a/src/Umbraco.Core/Models/MediaExtensions.cs
+++ b/src/Umbraco.Core/Models/MediaExtensions.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Core.Models
var val = media.Properties[propertyType];
if (val == null) return string.Empty;
- //fixme doesn't take into account variants
+ // TODO: would need to be adjusted to variations, when media become variants
var jsonString = val.GetValue() as string;
if (jsonString == null) return string.Empty;
@@ -46,7 +46,7 @@ namespace Umbraco.Core.Models
}
}
- // hrm, without knowing what it is, just adding a string here might not be very nice
+ // Without knowing what it is, just adding a string here might not be very nice
return string.Empty;
}
diff --git a/src/Umbraco.Core/Models/MediaType.cs b/src/Umbraco.Core/Models/MediaType.cs
index 4ae2fd190c..83e1acfbc0 100644
--- a/src/Umbraco.Core/Models/MediaType.cs
+++ b/src/Umbraco.Core/Models/MediaType.cs
@@ -44,29 +44,7 @@ namespace Umbraco.Core.Models
///
public override bool IsPublishing => IsPublishingConst;
- ///
- /// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
- ///
- ///
- public new IMediaType DeepCloneWithResetIdentities(string alias)
- {
- var clone = (MediaType)DeepClone();
- clone.Alias = alias;
- clone.Key = Guid.Empty;
- foreach (var propertyGroup in clone.PropertyGroups)
- {
- propertyGroup.ResetIdentity();
- propertyGroup.ResetDirtyProperties(false);
- }
- foreach (var propertyType in clone.PropertyTypes)
- {
- propertyType.ResetIdentity();
- propertyType.ResetDirtyProperties(false);
- }
-
- clone.ResetIdentity();
- clone.ResetDirtyProperties(false);
- return clone;
- }
+ ///
+ IMediaType IMediaType.DeepCloneWithResetIdentities(string newAlias) => (IMediaType)DeepCloneWithResetIdentities(newAlias);
}
}
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index 38927898cf..0ef15ee413 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -189,7 +189,7 @@ namespace Umbraco.Core.Models
[DataMember]
public IEnumerable Groups { get; set; }
- //TODO: When get/setting all of these properties we MUST:
+ // TODO: When get/setting all of these properties we MUST:
// * Check if we are using the umbraco membership provider, if so then we need to use the configured fields - not the explicit fields below
// * If any of the fields don't exist, what should we do? Currently it will throw an exception!
@@ -226,7 +226,7 @@ namespace Umbraco.Core.Models
/// Gets or sets the raw password answer value
///
///
- /// For security reasons this value should be encrypted, the encryption process is handled by the memberhip provider
+ /// For security reasons this value should be encrypted, the encryption process is handled by the membership provider
/// Alias: umbracoMemberPasswordRetrievalAnswer
///
/// Part of the standard properties collection.
@@ -338,7 +338,7 @@ namespace Umbraco.Core.Models
return tryConvert.Result;
}
return false;
- //TODO: Use TryConvertTo instead
+ // TODO: Use TryConvertTo instead
}
set
{
@@ -371,7 +371,7 @@ namespace Umbraco.Core.Models
return tryConvert.Result;
}
return default(DateTime);
- //TODO: Use TryConvertTo instead
+ // TODO: Use TryConvertTo instead
}
set
{
@@ -404,7 +404,7 @@ namespace Umbraco.Core.Models
return tryConvert.Result;
}
return default(DateTime);
- //TODO: Use TryConvertTo instead
+ // TODO: Use TryConvertTo instead
}
set
{
@@ -437,7 +437,7 @@ namespace Umbraco.Core.Models
return tryConvert.Result;
}
return default(DateTime);
- //TODO: Use TryConvertTo instead
+ // TODO: Use TryConvertTo instead
}
set
{
@@ -471,7 +471,7 @@ namespace Umbraco.Core.Models
return tryConvert.Result;
}
return default(int);
- //TODO: Use TryConvertTo instead
+ // TODO: Use TryConvertTo instead
}
set
{
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index bcc7e14fd7..1ce883d9a7 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -66,7 +66,7 @@ namespace Umbraco.Core.Models
// leading underscores which we don't want in this case.
// see : http://issues.umbraco.org/issue/U4-3968
- //TODO: BUT, I'm pretty sure we could do this with regards to underscores now:
+ // TODO: BUT, I'm pretty sure we could do this with regards to underscores now:
// .ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase)
// Need to ask Stephen
diff --git a/src/Umbraco.Core/Models/Membership/IProfile.cs b/src/Umbraco.Core/Models/Membership/IProfile.cs
index 335faa6c11..7da095bb14 100644
--- a/src/Umbraco.Core/Models/Membership/IProfile.cs
+++ b/src/Umbraco.Core/Models/Membership/IProfile.cs
@@ -1,7 +1,7 @@
namespace Umbraco.Core.Models.Membership
{
///
- /// Defines the the User Profile interface
+ /// Defines the User Profile interface
///
public interface IProfile
{
diff --git a/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs b/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
index ed3422d4f9..debce3afe5 100644
--- a/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
+++ b/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Core.Models.Membership
_isLockedOut = member.IsLockedOut;
_creationDate = member.CreateDate.ToUniversalTime();
_lastLoginDate = member.LastLoginDate.ToUniversalTime();
- //TODO: We currently don't really have any place to store this data!!
+ // TODO: We currently don't really have any place to store this data!!
_lastActivityDate = member.LastLoginDate.ToUniversalTime();
_lastPasswordChangedDate = member.LastPasswordChangeDate.ToUniversalTime();
_lastLockoutDate = member.LastLockoutDate.ToUniversalTime();
diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs
index 650aa6cb29..7832390b92 100644
--- a/src/Umbraco.Core/Models/Membership/User.cs
+++ b/src/Umbraco.Core/Models/Membership/User.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Core.Models.Membership
{
SessionTimeout = 60;
_userGroups = new HashSet();
- _language = Current.Configs.Global().DefaultUILanguage; //fixme inject somehow?
+ _language = Current.Configs.Global().DefaultUILanguage; // TODO: inject
_isApproved = true;
_isLockedOut = false;
_startContentIds = new int[] { };
@@ -242,7 +242,7 @@ namespace Umbraco.Core.Models.Membership
set { SetPropertyValueAndDetectChanges(value, ref _failedLoginAttempts, Ps.Value.FailedPasswordAttemptsSelector); }
}
- //TODO: Figure out how to support all of this! - we cannot have NotImplementedExceptions because these get used by the IMembershipMemberService service so
+ // TODO: Figure out how to support all of this! - we cannot have NotImplementedExceptions because these get used by the IMembershipMemberService service so
// we'll just have them as generic get/set which don't interact with the db.
[IgnoreDataMember]
diff --git a/src/Umbraco.Core/Models/Membership/UserGroup.cs b/src/Umbraco.Core/Models/Membership/UserGroup.cs
index db21c78438..e3e812f4c1 100644
--- a/src/Umbraco.Core/Models/Membership/UserGroup.cs
+++ b/src/Umbraco.Core/Models/Membership/UserGroup.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Models.Membership
private static readonly Lazy Ps = new Lazy();
- // ReSharper disable once ClassNeverInstantiated.Local // lazy-instanciated in Ps
+ // ReSharper disable once ClassNeverInstantiated.Local // lazy-instantiated in Ps
private class PropertySelectors
{
public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo(x => x.Name);
diff --git a/src/Umbraco.Core/Models/ObjectTypes.cs b/src/Umbraco.Core/Models/ObjectTypes.cs
index 2eb4d70a3a..dd943ee02b 100644
--- a/src/Umbraco.Core/Models/ObjectTypes.cs
+++ b/src/Umbraco.Core/Models/ObjectTypes.cs
@@ -76,7 +76,7 @@ namespace Umbraco.Core.Models
}
///
- /// Gets the Clr type corresponding to an object type Guid.
+ /// Gets the CLR type corresponding to an object type Guid.
///
public static Type GetClrType(Guid objectType)
{
@@ -145,7 +145,7 @@ namespace Umbraco.Core.Models
}
///
- /// Gets the Clr type corresponding to this Umbraco object type.
+ /// Gets the CLR type corresponding to this Umbraco object type.
///
public static Type GetClrType(this UmbracoObjectTypes objectType)
{
diff --git a/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs b/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs
index a852fcc997..f4ed11e09e 100644
--- a/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs
+++ b/src/Umbraco.Core/Models/Packaging/CompiledPackage.cs
@@ -23,22 +23,22 @@ namespace Umbraco.Core.Models.Packaging
public string Author { get; set; }
public string AuthorUrl { get; set; }
public string Readme { get; set; }
- public string Control { get; set; }
+ public string PackageView { get; set; }
public string IconUrl { get; set; }
- public string Actions { get; set; } //fixme: Should we make this strongly typed to IEnumerable ?
+ public string Actions { get; set; } // TODO: Should we make this strongly typed to IEnumerable ?
public PreInstallWarnings Warnings { get; set; } = new PreInstallWarnings();
public List Files { get; set; } = new List();
- public IEnumerable Macros { get; set; } //fixme: make strongly typed
- public IEnumerable Templates { get; set; } //fixme: make strongly typed
- public IEnumerable Stylesheets { get; set; } //fixme: make strongly typed
- public IEnumerable DataTypes { get; set; } //fixme: make strongly typed
- public IEnumerable Languages { get; set; } //fixme: make strongly typed
- public IEnumerable DictionaryItems { get; set; } //fixme: make strongly typed
- public IEnumerable DocumentTypes { get; set; } //fixme: make strongly typed
+ public IEnumerable Macros { get; set; } // TODO: make strongly typed
+ public IEnumerable Templates { get; set; } // TODO: make strongly typed
+ public IEnumerable Stylesheets { get; set; } // TODO: make strongly typed
+ public IEnumerable DataTypes { get; set; } // TODO: make strongly typed
+ public IEnumerable Languages { get; set; } // TODO: make strongly typed
+ public IEnumerable DictionaryItems { get; set; } // TODO: make strongly typed
+ public IEnumerable DocumentTypes { get; set; } // TODO: make strongly typed
public IEnumerable Documents { get; set; }
}
}
diff --git a/src/Umbraco.Core/Models/Packaging/IPackageInfo.cs b/src/Umbraco.Core/Models/Packaging/IPackageInfo.cs
index 8722ee7811..eea56549f1 100644
--- a/src/Umbraco.Core/Models/Packaging/IPackageInfo.cs
+++ b/src/Umbraco.Core/Models/Packaging/IPackageInfo.cs
@@ -13,7 +13,12 @@ namespace Umbraco.Core.Models.Packaging
string Author { get; }
string AuthorUrl { get; }
string Readme { get; }
- string Control { get; } //fixme - this needs to be an angular view
+
+ ///
+ /// This is the angular view path that will be loaded when the package installs
+ ///
+ string PackageView { get; }
+
string IconUrl { get; }
}
}
diff --git a/src/Umbraco.Core/Models/Packaging/PackageDefinition.cs b/src/Umbraco.Core/Models/Packaging/PackageDefinition.cs
index c068c57b08..8c0ef79d0b 100644
--- a/src/Umbraco.Core/Models/Packaging/PackageDefinition.cs
+++ b/src/Umbraco.Core/Models/Packaging/PackageDefinition.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Models.Packaging
Actions = compiled.Actions,
Author = compiled.Author,
AuthorUrl = compiled.AuthorUrl,
- Control = compiled.Control,
+ PackageView = compiled.PackageView,
IconUrl = compiled.IconUrl,
License = compiled.License,
LicenseUrl = compiled.LicenseUrl,
@@ -115,9 +115,9 @@ namespace Umbraco.Core.Models.Packaging
[DataMember(Name = "files")]
public IList Files { get; set; } = new List();
- //fixme: Change this to angular view
- [DataMember(Name = "loadControl")]
- public string Control { get; set; } = string.Empty;
+ ///
+ [DataMember(Name = "packageView")]
+ public string PackageView { get; set; } = string.Empty;
[DataMember(Name = "actions")]
public string Actions { get; set; } = "";
@@ -127,38 +127,7 @@ namespace Umbraco.Core.Models.Packaging
[DataMember(Name = "iconUrl")]
public string IconUrl { get; set; } = string.Empty;
-
- public PackageDefinition Clone()
- {
- return new PackageDefinition
- {
- Id = Id,
- PackagePath = PackagePath,
- Name = Name,
- Files = new List(Files),
- UmbracoVersion = (Version) UmbracoVersion.Clone(),
- Version = Version,
- Url = Url,
- Readme = Readme,
- AuthorUrl = AuthorUrl,
- Author = Author,
- LicenseUrl = LicenseUrl,
- Actions = Actions,
- PackageId = PackageId,
- Control = Control,
- DataTypes = new List(DataTypes),
- IconUrl = IconUrl,
- License = License,
- Templates = new List(Templates),
- Languages = new List(Languages),
- Macros = new List(Macros),
- Stylesheets = new List(Stylesheets),
- DocumentTypes = new List(DocumentTypes),
- DictionaryItems = new List(DictionaryItems),
- ContentNodeId = ContentNodeId,
- ContentLoadChildNodes = ContentLoadChildNodes
- };
- }
+
}
diff --git a/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs b/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
index f0acb2a46b..69c7a5641d 100644
--- a/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
+++ b/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Models.Packaging
public IEnumerable UnsecureFiles { get; set; } = Enumerable.Empty();
public IEnumerable FilesReplaced { get; set; } = Enumerable.Empty();
- //TODO: Shouldn't we detect other conflicting entities too ?
+ // TODO: Shouldn't we detect other conflicting entities too ?
public IEnumerable ConflictingMacros { get; set; } = Enumerable.Empty();
public IEnumerable ConflictingTemplates { get; set; } = Enumerable.Empty();
public IEnumerable ConflictingStylesheets { get; set; } = Enumerable.Empty();
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index 0c71544111..11b5239a70 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -55,7 +55,7 @@ namespace Umbraco.Core.Models
///
public class PropertyValue
{
- //TODO: Either we allow change tracking at this class level, or we add some special change tracking collections to the Property
+ // TODO: Either we allow change tracking at this class level, or we add some special change tracking collections to the Property
// class to deal with change tracking which variants have changed
private string _culture;
@@ -103,7 +103,7 @@ namespace Umbraco.Core.Models
// ReSharper disable once ClassNeverInstantiated.Local
private class PropertySelectors
{
- //TODO: This allows us to track changes for an entire Property, but doesn't allow us to track changes at the variant level
+ // TODO: This allows us to track changes for an entire Property, but doesn't allow us to track changes at the variant level
public readonly PropertyInfo ValuesSelector = ExpressionHelper.GetPropertyInfo(x => x.Values);
public readonly DelegateEqualityComparer
bool IsDraft(string culture = null);
- // fixme - consider having an IsPublished flag too
- // so that when IsDraft is true, we can check whether there is a published version?
+ ///
+ /// Gets a value indicating whether the content is published.
+ ///
+ ///
+ /// A content is published when it has a published version.
+ /// When retrieving documents from cache in non-preview mode, IsPublished is always
+ /// true, as only published documents are returned. When retrieving in draft mode, IsPublished
+ /// can either be true (document has a published version) or false (document has no
+ /// published version).
+ /// It is therefore possible for both IsDraft and IsPublished to be true at the same
+ /// time, meaning that the content is the draft version, and a published version exists.
+ ///
+ bool IsPublished(string culture = null);
#endregion
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs
index 25d9643bed..ae4caf352e 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedModelFactory.cs
@@ -24,10 +24,10 @@ namespace Umbraco.Core.Models.PublishedContent
IList CreateModelList(string alias);
///
- /// Maps a Clr type that may contain model types, to an actual Clr type.
+ /// Maps a CLR type that may contain model types, to an actual CLR type.
///
- /// The Clr type.
- /// The actual Clr type.
+ /// The CLR type.
+ /// The actual CLR type.
/// See for more details.
Type MapModelType(Type type);
}
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedProperty.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedProperty.cs
index cfab82213a..9a00e94d3e 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedProperty.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedProperty.cs
@@ -29,7 +29,7 @@
/// Gets the source value of the property.
///
///
- /// The source value is whatever was passed to the property when it was instanciated, and it is
+ /// The source value is whatever was passed to the property when it was instantiated, and it is
/// somewhat implementation-dependent -- depending on how the IPublishedCache is implemented.
/// The XmlPublishedCache source values are strings exclusively since they come from the Xml cache.
/// For other caches that get their source value from the database, it would be either a string,
diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs
index f30a53c8b6..23df9e485f 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedValueFallback.cs
@@ -94,12 +94,17 @@
/// A fallback strategy.
/// An optional default value.
/// The fallback value.
+ /// The property that does not have a value.
/// A value indicating whether a fallback value could be provided.
///
/// This method is called whenever getting the property value for the specified alias, culture and
/// segment, either returned no property at all, or a property with HasValue(culture, segment) being false.
+ /// In an , because walking up the tree is possible, the content itself may not even
+ /// have a property with the specified alias, but such a property may exist up in the tree. The
+ /// parameter is used to return a property with no value. That can then be used to invoke a converter and get the
+ /// converter's interpretation of "no value".
///
- bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, object defaultValue, out object value);
+ bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, object defaultValue, out object value, out IPublishedProperty noValueProperty);
///
/// Tries to get a fallback value for a published content property.
@@ -112,11 +117,16 @@
/// A fallback strategy.
/// An optional default value.
/// The fallback value.
+ /// The property that does not have a value.
/// A value indicating whether a fallback value could be provided.
///
/// This method is called whenever getting the property value for the specified alias, culture and
/// segment, either returned no property at all, or a property with HasValue(culture, segment) being false.
+ /// In an , because walking up the tree is possible, the content itself may not even
+ /// have a property with the specified alias, but such a property may exist up in the tree. The
+ /// parameter is used to return a property with no value. That can then be used to invoke a converter and get the
+ /// converter's interpretation of "no value".
///
- bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, T defaultValue, out T value);
+ bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, T defaultValue, out T value, out IPublishedProperty noValueProperty);
}
}
diff --git a/src/Umbraco.Core/Models/PublishedContent/ModelType.cs b/src/Umbraco.Core/Models/PublishedContent/ModelType.cs
index a366742cc5..540abda2c5 100644
--- a/src/Umbraco.Core/Models/PublishedContent/ModelType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/ModelType.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models.PublishedContent
{
///
///
- /// Represents the Clr type of a model.
+ /// Represents the CLR type of a model.
///
///
/// ModelType.For("alias")
@@ -43,11 +43,11 @@ namespace Umbraco.Core.Models.PublishedContent
=> new ModelType(alias);
///
- /// Gets the actual Clr type by replacing model types, if any.
+ /// Gets the actual CLR type by replacing model types, if any.
///
/// The type.
/// The model types map.
- /// The actual Clr type.
+ /// The actual CLR type.
public static Type Map(Type type, Dictionary modelTypes)
=> Map(type, modelTypes, false);
@@ -82,11 +82,11 @@ namespace Umbraco.Core.Models.PublishedContent
}
///
- /// Gets the actual Clr type name by replacing model types, if any.
+ /// Gets the actual CLR type name by replacing model types, if any.
///
/// The type.
/// The model types map.
- /// The actual Clr type name.
+ /// The actual CLR type name.
public static string MapToName(Type type, Dictionary map)
=> MapToName(type, map, false);
diff --git a/src/Umbraco.Core/Models/PublishedContent/NoopPublishedValueFallback.cs b/src/Umbraco.Core/Models/PublishedContent/NoopPublishedValueFallback.cs
index cd7b063d44..245bbd1d39 100644
--- a/src/Umbraco.Core/Models/PublishedContent/NoopPublishedValueFallback.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/NoopPublishedValueFallback.cs
@@ -37,16 +37,18 @@
}
///
- public bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, object defaultValue, out object value)
+ public bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, object defaultValue, out object value, out IPublishedProperty noValueProperty)
{
value = default;
+ noValueProperty = default;
return false;
}
///
- public bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, T defaultValue, out T value)
+ public bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, T defaultValue, out T value, out IPublishedProperty noValueProperty)
{
value = default;
+ noValueProperty = default;
return false;
}
}
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentEnumerable.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentEnumerable.cs
deleted file mode 100644
index dc17265bb9..0000000000
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentEnumerable.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Umbraco.Core.Models.PublishedContent
-{
- // fixme imported from 7.6 needs better explaination of what it is
-
- ///
- /// The published content enumerable, this model is to allow ToString to be overriden for value converters to support legacy requests for string values
- ///
- public class PublishedContentEnumerable : IEnumerable
- {
- ///
- /// The items in the collection
- ///
- private readonly IEnumerable _items;
-
- ///
- /// Initializes a new instance of the class.
- ///
- ///
- /// The published content items
- ///
- public PublishedContentEnumerable(IEnumerable publishedContent)
- {
- _items = publishedContent ?? throw new ArgumentNullException(nameof(publishedContent));
- }
-
- ///
- /// The ToString method to convert the objects back to CSV
- ///
- ///
- /// The .
- ///
- public override string ToString()
- {
- return string.Join(",", _items.Select(x => x.Id));
- }
-
- ///
- /// The get enumerator.
- ///
- ///
- /// The .
- ///
- public IEnumerator GetEnumerator()
- {
- return _items.GetEnumerator();
- }
-
- ///
- /// The get enumerator.
- ///
- ///
- /// The .
- ///
- IEnumerator IEnumerable.GetEnumerator()
- {
- return GetEnumerator();
- }
- }
-}
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
index f1937c1c0c..0798e9a4e0 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Models.PublishedContent
/// Initializes a new instance of the class with a content type.
///
public PublishedContentType(IContentTypeComposition contentType, IPublishedContentTypeFactory factory)
- : this(contentType.Id, contentType.Alias, contentType.GetItemType(), contentType.CompositionAliases(), contentType.Variations)
+ : this(contentType.Id, contentType.Alias, contentType.GetItemType(), contentType.CompositionAliases(), contentType.Variations, contentType.IsElement)
{
var propertyTypes = contentType.CompositionPropertyTypes
.Select(x => factory.CreatePropertyType(this, x))
@@ -41,8 +41,8 @@ namespace Umbraco.Core.Models.PublishedContent
/// This constructor is for tests and is not intended to be used directly from application code.
/// Values are assumed to be consisted and are not checked.
///
- public PublishedContentType(int id, string alias, PublishedItemType itemType, IEnumerable compositionAliases, IEnumerable propertyTypes, ContentVariation variations)
- : this (id, alias, itemType, compositionAliases, variations)
+ public PublishedContentType(int id, string alias, PublishedItemType itemType, IEnumerable compositionAliases, IEnumerable propertyTypes, ContentVariation variations, bool isElement = false)
+ : this (id, alias, itemType, compositionAliases, variations, isElement)
{
var propertyTypesA = propertyTypes.ToArray();
foreach (var propertyType in propertyTypesA)
@@ -52,13 +52,14 @@ namespace Umbraco.Core.Models.PublishedContent
InitializeIndexes();
}
- private PublishedContentType(int id, string alias, PublishedItemType itemType, IEnumerable compositionAliases, ContentVariation variations)
+ private PublishedContentType(int id, string alias, PublishedItemType itemType, IEnumerable compositionAliases, ContentVariation variations, bool isElement)
{
Id = id;
Alias = alias;
ItemType = itemType;
CompositionAliases = new HashSet(compositionAliases, StringComparer.InvariantCultureIgnoreCase);
Variations = variations;
+ IsElement = isElement;
}
private void InitializeIndexes()
@@ -85,7 +86,7 @@ namespace Umbraco.Core.Models.PublishedContent
}
}
- // fixme - this list somehow also exists in constants, see memberTypeRepository => remove duplicate!
+ // TODO: this list somehow also exists in constants, see memberTypeRepository => remove duplicate!
private static readonly Dictionary BuiltinMemberProperties = new Dictionary
{
{ "Email", (Constants.DataTypes.Textbox, Constants.PropertyEditors.Aliases.TextBox) },
@@ -147,7 +148,8 @@ namespace Umbraco.Core.Models.PublishedContent
return -1;
}
- // virtual for unit tests - fixme explain
+ // virtual for unit tests
+ // TODO: explain why
///
/// Gets a property type.
///
@@ -157,7 +159,8 @@ namespace Umbraco.Core.Models.PublishedContent
return GetPropertyType(index);
}
- // virtual for unit tests - fixme explain
+ // virtual for unit tests
+ // TODO: explain why
///
/// Gets a property type.
///
@@ -166,6 +169,11 @@ namespace Umbraco.Core.Models.PublishedContent
return index >= 0 && index < _propertyTypes.Length ? _propertyTypes[index] : null;
}
+ ///
+ /// Gets a value indicating whether this content type is for an element.
+ ///
+ public bool IsElement { get; }
+
#endregion
}
}
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
index 5de5842eda..abf4156d7f 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentTypeFactory.cs
@@ -32,15 +32,15 @@ namespace Umbraco.Core.Models.PublishedContent
}
// for tests
- internal PublishedContentType CreateContentType(int id, string alias, IEnumerable propertyTypes, ContentVariation variations = ContentVariation.Nothing)
+ internal PublishedContentType CreateContentType(int id, string alias, IEnumerable propertyTypes, ContentVariation variations = ContentVariation.Nothing, bool isElement = false)
{
- return new PublishedContentType(id, alias, PublishedItemType.Content, Enumerable.Empty(), propertyTypes, variations);
+ return new PublishedContentType(id, alias, PublishedItemType.Content, Enumerable.Empty(), propertyTypes, variations, isElement);
}
// for tests
- internal PublishedContentType CreateContentType(int id, string alias, IEnumerable compositionAliases, IEnumerable propertyTypes, ContentVariation variations = ContentVariation.Nothing)
+ internal PublishedContentType CreateContentType(int id, string alias, IEnumerable compositionAliases, IEnumerable propertyTypes, ContentVariation variations = ContentVariation.Nothing, bool isElement = false)
{
- return new PublishedContentType(id, alias, PublishedItemType.Content, compositionAliases, propertyTypes, variations);
+ return new PublishedContentType(id, alias, PublishedItemType.Content, compositionAliases, propertyTypes, variations, isElement);
}
///
@@ -79,7 +79,7 @@ namespace Umbraco.Core.Models.PublishedContent
}
if (!publishedDataTypes.TryGetValue(id, out var dataType))
- throw new ArgumentException("Not a valid datatype identifier.", nameof(id));
+ throw new ArgumentException($"Could not find a datatype with identifier {id}.", nameof(id));
return dataType;
}
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
index 36755c8944..8bf8cec244 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
@@ -111,6 +111,9 @@ namespace Umbraco.Core.Models.PublishedContent
///
public virtual bool IsDraft(string culture = null) => _content.IsDraft(culture);
+ ///
+ public virtual bool IsPublished(string culture = null) => _content.IsPublished(culture);
+
#endregion
#region Tree
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs
index f3f10e63e2..566319ab74 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedDataType.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Core.Models.PublishedContent
public int Id { get; }
///
- /// Gets the dat type editor alias.
+ /// Gets the data type editor alias.
///
public string EditorAlias { get; }
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
index e019f9a5d1..68892fd79a 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Models.PublishedContent
/// if the property type changes, then a new class needs to be created.
public class PublishedPropertyType
{
- //fixme - API design review, should this be an interface?
+ // TODO: API design review, should this be an interface?
private readonly IPublishedModelFactory _publishedModelFactory;
private readonly PropertyValueConverterCollection _propertyValueConverters;
@@ -283,11 +283,11 @@ namespace Umbraco.Core.Models.PublishedContent
}
///
- /// Gets the property model Clr type.
+ /// Gets the property model CLR type.
///
///
- /// The model Clr type may be a type, or may contain types.
- /// For the actual Clr type, see .
+ /// The model CLR type may be a type, or may contain types.
+ /// For the actual CLR type, see .
///
public Type ModelClrType
{
@@ -299,12 +299,12 @@ namespace Umbraco.Core.Models.PublishedContent
}
///
- /// Gets the property Clr type.
+ /// Gets the property CLR type.
///
///
- /// Returns the actual Clr type which does not contain types.
+ /// Returns the actual CLR type which does not contain types.
/// Mapping from may throw if some instances
- /// could not be mapped to actual Clr types.
+ /// could not be mapped to actual CLR types.
///
public Type ClrType
{
diff --git a/src/Umbraco.Core/Models/Section.cs b/src/Umbraco.Core/Models/Section.cs
deleted file mode 100644
index 4b7f8309dd..0000000000
--- a/src/Umbraco.Core/Models/Section.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace Umbraco.Core.Models
-{
- ///
- /// Represents a section defined in the app.config file.
- ///
- public class Section
- {
- public Section(string name, string @alias, int sortOrder)
- {
- Name = name;
- Alias = alias;
- SortOrder = sortOrder;
- }
-
- public Section()
- { }
-
- public string Name { get; set; }
- public string Alias { get; set; }
- public int SortOrder { get; set; }
- }
-}
diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs
index 0e135f34d6..db0e9b8c3b 100644
--- a/src/Umbraco.Core/Models/ServerRegistration.cs
+++ b/src/Umbraco.Core/Models/ServerRegistration.cs
@@ -26,13 +26,13 @@ namespace Umbraco.Core.Models
}
///
- /// Initialiazes a new instance of the class.
+ /// Initializes a new instance of the class.
///
public ServerRegistration()
{ }
///
- /// Initialiazes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The unique id of the server registration.
/// The server url.
@@ -54,7 +54,7 @@ namespace Umbraco.Core.Models
}
///
- /// Initialiazes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The server url.
/// The unique server identity.
diff --git a/src/Umbraco.Core/Models/Trees/IBackOfficeSection.cs b/src/Umbraco.Core/Models/Trees/IBackOfficeSection.cs
new file mode 100644
index 0000000000..86e2a18fd5
--- /dev/null
+++ b/src/Umbraco.Core/Models/Trees/IBackOfficeSection.cs
@@ -0,0 +1,18 @@
+namespace Umbraco.Core.Models.Trees
+{
+ ///
+ /// Defines a back office section.
+ ///
+ public interface IBackOfficeSection
+ {
+ ///
+ /// Gets the alias of the section.
+ ///
+ string Alias { get; }
+
+ ///
+ /// Gets the name of the section.
+ ///
+ string Name { get; }
+ }
+}
diff --git a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
index ff080f2cc1..6f7272beee 100644
--- a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
+++ b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.CodeAnnotations;
namespace Umbraco.Core.Models
{
///
- /// Enum used to represent the Umbraco Object Types and thier associated GUIDs
+ /// Enum used to represent the Umbraco Object Types and their associated GUIDs
///
public enum UmbracoObjectTypes
{
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index ba4d8cf590..f9aa1113b3 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -47,19 +47,19 @@ namespace Umbraco.Core.Models
}
///
- /// Tries to lookup the user's gravatar to see if the endpoint can be reached, if so it returns the valid URL
+ /// Tries to lookup the user's Gravatar to see if the endpoint can be reached, if so it returns the valid URL
///
///
- ///
+ ///
///
/// A list of 5 different sized avatar URLs
///
- internal static string[] GetUserAvatarUrls(this IUser user, ICacheProvider staticCache)
+ internal static string[] GetUserAvatarUrls(this IUser user, IAppCache cache)
{
// If FIPS is required, never check the Gravatar service as it only supports MD5 hashing.
// Unfortunately, if the FIPS setting is enabled on Windows, using MD5 will throw an exception
// and the website will not run.
- // Also, check if the user has explicitly removed all avatars including a gravatar, this will be possible and the value will be "none"
+ // Also, check if the user has explicitly removed all avatars including a Gravatar, this will be possible and the value will be "none"
if (user.Avatar == "none" || CryptoConfig.AllowOnlyFipsAlgorithms)
{
return new string[0];
@@ -70,8 +70,8 @@ namespace Umbraco.Core.Models
var gravatarHash = user.Email.ToMd5();
var gravatarUrl = "https://www.gravatar.com/avatar/" + gravatarHash + "?d=404";
- //try gravatar
- var gravatarAccess = staticCache.GetCacheItem("UserAvatar" + user.Id, () =>
+ //try Gravatar
+ var gravatarAccess = cache.GetCacheItem("UserAvatar" + user.Id, () =>
{
// Test if we can reach this URL, will fail when there's network or firewall errors
var request = (HttpWebRequest)WebRequest.Create(gravatarUrl);
@@ -136,7 +136,7 @@ namespace Umbraco.Core.Models
try
{
var culture = CultureInfo.GetCultureInfo(userLanguage.Replace("_", "-"));
- //TODO: This is a hack because we store the user language as 2 chars instead of the full culture
+ // TODO: This is a hack because we store the user language as 2 chars instead of the full culture
// which is actually stored in the language files (which are also named with 2 chars!) so we need to attempt
// to convert to a supported full culture
var result = textService.ConvertToSupportedCultureWithRegionCode(culture);
diff --git a/src/Umbraco.Core/NetworkHelper.cs b/src/Umbraco.Core/NetworkHelper.cs
index 8f310ccf0c..8f7c7c1eb8 100644
--- a/src/Umbraco.Core/NetworkHelper.cs
+++ b/src/Umbraco.Core/NetworkHelper.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Core
catch
{
//if we get here it means we cannot access the machine name
- throw new ApplicationException("Cannot resolve the current machine name eithe by Environment.MachineName or by Dns.GetHostname()");
+ throw new ApplicationException("Cannot resolve the current machine name either by Environment.MachineName or by Dns.GetHostname()");
}
}
}
diff --git a/src/Umbraco.Core/ObjectExtensions.cs b/src/Umbraco.Core/ObjectExtensions.cs
index 1bc2fb48a5..68bc9c923d 100644
--- a/src/Umbraco.Core/ObjectExtensions.cs
+++ b/src/Umbraco.Core/ObjectExtensions.cs
@@ -143,7 +143,7 @@ namespace Umbraco.Core
// Special case for empty strings for bools/dates which should return null if an empty string.
if (input is string inputString)
{
- //TODO: Why the check against only bool/date when a string is null/empty? In what scenario can we convert to another type when the string is null or empty other than just being null?
+ // TODO: Why the check against only bool/date when a string is null/empty? In what scenario can we convert to another type when the string is null or empty other than just being null?
if (string.IsNullOrEmpty(inputString) && (underlying == typeof(DateTime) || underlying == typeof(bool)))
{
return Attempt