diff --git a/src/Umbraco.Compat7/Core/DatabaseContext.cs b/src/Umbraco.Compat7/Core/DatabaseContext.cs index 96cba04a53..35a5829a56 100644 --- a/src/Umbraco.Compat7/Core/DatabaseContext.cs +++ b/src/Umbraco.Compat7/Core/DatabaseContext.cs @@ -32,12 +32,12 @@ namespace Umbraco.Core /// /// Creates a Sql statement. /// - public Sql Sql() => _databaseFactory.SqlContext.Sql(); + public Sql Sql() => _databaseFactory.SqlContext.Sql(); /// /// Creates a Sql statement. /// - public Sql Sql(string sql, params object[] args) => _databaseFactory.SqlContext.Sql(sql, args); + public Sql Sql(string sql, params object[] args) => _databaseFactory.SqlContext.Sql(sql, args); /// /// Creates a Query expression. diff --git a/src/Umbraco.Core/Persistence/ISqlContext.cs b/src/Umbraco.Core/Persistence/ISqlContext.cs index 45b3da40b2..7ac28c2364 100644 --- a/src/Umbraco.Core/Persistence/ISqlContext.cs +++ b/src/Umbraco.Core/Persistence/ISqlContext.cs @@ -23,12 +23,12 @@ namespace Umbraco.Core.Persistence /// /// Creates a new Sql expression. /// - Sql Sql(); + Sql Sql(); /// /// Creates a new Sql expression. /// - Sql Sql(string sql, params object[] args); + Sql Sql(string sql, params object[] args); /// /// Creates a new query expression. diff --git a/src/Umbraco.Core/Persistence/IUmbracoDatabase.cs b/src/Umbraco.Core/Persistence/IUmbracoDatabase.cs index feef6a23bd..899a1d0de6 100644 --- a/src/Umbraco.Core/Persistence/IUmbracoDatabase.cs +++ b/src/Umbraco.Core/Persistence/IUmbracoDatabase.cs @@ -7,7 +7,7 @@ namespace Umbraco.Core.Persistence /// /// Gets the Sql context. /// - SqlContext SqlContext { get; } + ISqlContext SqlContext { get; } /// /// Gets the database instance unique identifier as a string. diff --git a/src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs b/src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs index b370cc0c00..3bceb0b544 100644 --- a/src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs +++ b/src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs @@ -52,9 +52,9 @@ namespace Umbraco.Core.Persistence.Migrations public IUpdateBuilder Update => new UpdateBuilder(Context); - protected Sql Sql() => Context.SqlContext.Sql(); + protected Sql Sql() => Context.SqlContext.Sql(); - protected Sql Sql(string sql, params object[] args) => Context.SqlContext.Sql(sql, args); + protected Sql Sql(string sql, params object[] args) => Context.SqlContext.Sql(sql, args); public IIfDatabaseBuilder IfDatabase(params DatabaseType[] supportedDatabaseTypes) { diff --git a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs index 8a69df36e3..b81e68e567 100644 --- a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs +++ b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions.cs @@ -218,7 +218,7 @@ namespace Umbraco.Core.Persistence return transaction?.IsolationLevel ?? IsolationLevel.Unspecified; } - public static IEnumerable FetchByGroups(this IDatabase db, IEnumerable source, int groupSize, Func, Sql> sqlFactory) + public static IEnumerable FetchByGroups(this IDatabase db, IEnumerable source, int groupSize, Func, Sql> sqlFactory) { return source.SelectByGroups(x => db.Fetch(sqlFactory(x)), groupSize); } diff --git a/src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs b/src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs index aa16a30591..749b112adf 100644 --- a/src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs +++ b/src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs @@ -26,7 +26,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// A predicate to transform and append to the Sql statement. /// The Sql statement. - public static Sql Where(this Sql sql, Expression> predicate) + public static Sql Where(this Sql sql, Expression> predicate) { var expresionist = new PocoToSqlExpressionVisitor(sql.SqlContext); var whereExpression = expresionist.Visit(predicate); @@ -44,7 +44,7 @@ namespace Umbraco.Core.Persistence /// An optional alias for Dto 1 table. /// An optional alias for Dto 2 table. /// The Sql statement. - public static Sql Where(this Sql sql, Expression> predicate, string alias1 = null, string alias2 = null) + public static Sql Where(this Sql sql, Expression> predicate, string alias1 = null, string alias2 = null) { var expresionist = new PocoToSqlExpressionVisitor(sql.SqlContext, alias1, alias2); var whereExpression = expresionist.Visit(predicate); @@ -60,7 +60,7 @@ namespace Umbraco.Core.Persistence /// An expression specifying the field. /// The values. /// The Sql statement. - public static Sql WhereIn(this Sql sql, Expression> field, IEnumerable values) + public static Sql WhereIn(this Sql sql, Expression> field, IEnumerable values) { var fieldName = GetFieldName(field, sql.SqlContext.SqlSyntax); sql.Where(fieldName + " IN (@values)", new { values }); @@ -75,7 +75,7 @@ namespace Umbraco.Core.Persistence /// An expression specifying the field. /// A subquery returning the value. /// The Sql statement. - public static Sql WhereIn(this Sql sql, Expression> field, Sql values) + public static Sql WhereIn(this Sql sql, Expression> field, Sql values) { return sql.WhereIn(field, values, false); } @@ -88,7 +88,7 @@ namespace Umbraco.Core.Persistence /// An expression specifying the field. /// The values. /// The Sql statement. - public static Sql WhereNotIn(this Sql sql, Expression> field, IEnumerable values) + public static Sql WhereNotIn(this Sql sql, Expression> field, IEnumerable values) { var fieldName = GetFieldName(field, sql.SqlContext.SqlSyntax); sql.Where(fieldName + " NOT IN (@values)", new { values }); @@ -103,7 +103,7 @@ namespace Umbraco.Core.Persistence /// An expression specifying the field. /// A subquery returning the value. /// The Sql statement. - public static Sql WhereNotIn(this Sql sql, Expression> field, Sql values) + public static Sql WhereNotIn(this Sql sql, Expression> field, Sql values) { return sql.WhereIn(field, values, true); } @@ -116,7 +116,7 @@ namespace Umbraco.Core.Persistence /// Expressions specifying the fields. /// The values. /// The Sql statement. - public static Sql WhereAnyIn(this Sql sql, Expression>[] fields, IEnumerable values) + public static Sql WhereAnyIn(this Sql sql, Expression>[] fields, IEnumerable values) { var fieldNames = fields.Select(x => GetFieldName(x, sql.SqlContext.SqlSyntax)).ToArray(); var sb = new StringBuilder(); @@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence return sql; } - private static Sql WhereIn(this Sql sql, Expression> fieldSelector, Sql valuesSql, bool not) + private static Sql WhereIn(this Sql sql, Expression> fieldSelector, Sql valuesSql, bool not) { var fieldName = GetFieldName(fieldSelector, sql.SqlContext.SqlSyntax); sql.Where(fieldName + (not ? " NOT" : "") +" IN (" + valuesSql.SQL + ")", valuesSql.Arguments); @@ -149,7 +149,7 @@ namespace Umbraco.Core.Persistence /// The type of the Dto. /// The Sql statement. /// The Sql statement. - public static Sql From(this Sql sql) + public static Sql From(this Sql sql) { var type = typeof (TDto); var tableName = type.GetTableName(); @@ -169,7 +169,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// An expression specifying the field. /// The Sql statement. - public static Sql OrderBy(this Sql sql, Expression> field) + public static Sql OrderBy(this Sql sql, Expression> field) { return sql.OrderBy("(" + GetFieldName(field, sql.SqlContext.SqlSyntax) + ")"); // fixme - explain (...) } @@ -181,7 +181,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// Expression specifying the fields. /// The Sql statement. - public static Sql OrderBy(this Sql sql, params Expression>[] fields) + public static Sql OrderBy(this Sql sql, params Expression>[] fields) { var columns = fields.Length == 0 ? sql.GetColumns(withAlias: false) @@ -196,7 +196,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// An expression specifying the field. /// The Sql statement. - public static Sql OrderByDescending(this Sql sql, Expression> field) + public static Sql OrderByDescending(this Sql sql, Expression> field) { return sql.OrderBy("(" + GetFieldName(field, sql.SqlContext.SqlSyntax) + ") DESC"); // fixme - explain (...) } @@ -208,7 +208,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// Expression specifying the fields. /// The Sql statement. - public static Sql OrderByDescending(this Sql sql, params Expression>[] fields) + public static Sql OrderByDescending(this Sql sql, params Expression>[] fields) { var columns = fields.Length == 0 ? sql.GetColumns(withAlias: false) @@ -222,7 +222,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// Expression specifying the fields. /// The Sql statement. - public static Sql OrderByDescending(this Sql sql, params object[] fields) + public static Sql OrderByDescending(this Sql sql, params object[] fields) { return sql.Append("ORDER BY " + string.Join(", ", fields.Select(x => x + " DESC"))); } @@ -234,7 +234,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// An expression specifying the field. /// The Sql statement. - public static Sql GroupBy(this Sql sql, Expression> field) + public static Sql GroupBy(this Sql sql, Expression> field) { return sql.GroupBy(GetFieldName(field, sql.SqlContext.SqlSyntax)); } @@ -246,7 +246,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// Expression specifying the fields. /// The Sql statement. - public static Sql GroupBy(this Sql sql, params Expression>[] fields) + public static Sql GroupBy(this Sql sql, params Expression>[] fields) { var columns = fields.Length == 0 ? sql.GetColumns(withAlias: false) @@ -261,7 +261,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// Expressions specifying the fields. /// The Sql statement. - public static Sql AndBy(this Sql sql, params Expression>[] fields) + public static Sql AndBy(this Sql sql, params Expression>[] fields) { var columns = fields.Length == 0 ? sql.GetColumns(withAlias: false) @@ -276,7 +276,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// Expressions specifying the fields. /// The Sql statement. - public static Sql AndByDesc(this Sql sql, params Expression>[] fields) + public static Sql AndByDesc(this Sql sql, params Expression>[] fields) { var columns = fields.Length == 0 ? sql.GetColumns(withAlias: false) @@ -295,7 +295,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// An optional alias for the joined table. /// A SqlJoin statement. - public static Sql.SqlJoinClause InnerJoin(this Sql sql, string alias = null) + public static Sql.SqlJoinClause InnerJoin(this Sql sql, string alias = null) { var type = typeof(TDto); var tableName = type.GetTableName(); @@ -312,7 +312,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// An optional alias for the joined table. /// A SqlJoin statement. - public static Sql.SqlJoinClause LeftJoin(this Sql sql, string alias = null) + public static Sql.SqlJoinClause LeftJoin(this Sql sql, string alias = null) { var type = typeof(TDto); var tableName = type.GetTableName(); @@ -329,7 +329,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// An optional alias for the joined table. /// A SqlJoin statement. - public static Sql.SqlJoinClause RightJoin(this Sql sql, string alias = null) + public static Sql.SqlJoinClause RightJoin(this Sql sql, string alias = null) { var type = typeof(TDto); var tableName = type.GetTableName(); @@ -348,13 +348,13 @@ namespace Umbraco.Core.Persistence /// An expression specifying the left field. /// An expression specifying the right field. /// The Sql statement. - public static Sql On(this Sql.SqlJoinClause sqlJoin, + public static Sql On(this Sql.SqlJoinClause sqlJoin, Expression> leftField, Expression> rightField) { // fixme - ugly - should define on SqlContext! - var xLeft = new Sql(sqlJoin.SqlContext).Columns(leftField); - var xRight = new Sql(sqlJoin.SqlContext).Columns(rightField); + var xLeft = new Sql(sqlJoin.SqlContext).Columns(leftField); + var xRight = new Sql(sqlJoin.SqlContext).Columns(rightField); return sqlJoin.On(xLeft + " = " + xRight); //var sqlSyntax = clause.SqlContext.SqlSyntax; @@ -380,9 +380,9 @@ namespace Umbraco.Core.Persistence /// The Sql join statement. /// A Sql fragment to use as the ON clause body. /// The Sql statement. - public static Sql On(this Sql.SqlJoinClause sqlJoin, Func, Sql> on) + public static Sql On(this Sql.SqlJoinClause sqlJoin, Func, Sql> on) { - var sql = new Sql(sqlJoin.SqlContext); + var sql = new Sql(sqlJoin.SqlContext); sql = on(sql); return sqlJoin.On(sql.SQL, sql.Arguments); } @@ -397,7 +397,7 @@ namespace Umbraco.Core.Persistence /// An optional alias for Dto 1 table. /// An optional alias for Dto 2 table. /// The Sql statement. - public static Sql On(this Sql.SqlJoinClause sqlJoin, Expression> predicate, string alias1 = null, string alias2 = null) + public static Sql On(this Sql.SqlJoinClause sqlJoin, Expression> predicate, string alias1 = null, string alias2 = null) { var expresionist = new PocoToSqlExpressionVisitor(sqlJoin.SqlContext, alias1, alias2); var onExpression = expresionist.Visit(predicate); @@ -414,7 +414,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// The maximum number of rows to return. /// The Sql statement. - public static Sql SelectTop(this Sql sql, int count) + public static Sql SelectTop(this Sql sql, int count) { return sql.SqlContext.SqlSyntax.SelectTop(sql, count); } @@ -424,7 +424,7 @@ namespace Umbraco.Core.Persistence /// /// The origin sql. /// The Sql statement. - public static Sql SelectCount(this Sql sql) + public static Sql SelectCount(this Sql sql) { return sql.Select("COUNT(*)"); } @@ -439,7 +439,7 @@ namespace Umbraco.Core.Persistence /// /// If is empty, all columns are counted. /// - public static Sql SelectCount(this Sql sql, params Expression>[] fields) + public static Sql SelectCount(this Sql sql, params Expression>[] fields) { var columns = fields.Length == 0 ? sql.GetColumns(withAlias: false) @@ -452,7 +452,7 @@ namespace Umbraco.Core.Persistence /// /// The origin sql. /// The Sql statement. - public static Sql SelectAll(this Sql sql) + public static Sql SelectAll(this Sql sql) { return sql.Select("*"); } @@ -467,7 +467,7 @@ namespace Umbraco.Core.Persistence /// /// If is empty, all columns are selected. /// - public static Sql Select(this Sql sql, params Expression>[] fields) + public static Sql Select(this Sql sql, params Expression>[] fields) { return sql.Select(sql.GetColumns(columnExpressions: fields)); } @@ -479,7 +479,7 @@ namespace Umbraco.Core.Persistence /// The origin Sql. /// An expression specifying the reference. /// The Sql statement. - public static Sql Select(this Sql sql, Func, SqlRef> reference) + public static Sql Select(this Sql sql, Func, SqlRef> reference) { sql.Select(sql.GetColumns()); @@ -497,7 +497,7 @@ namespace Umbraco.Core.Persistence /// The Sql statement. /// The expression applies to the Sql statement before the reference selection /// is added, so that it is possible to add (e.g. calculated) columns to the referencing Dto. - public static Sql Select(this Sql sql, Func, SqlRef> reference, Func, Sql> sqlexpr) + public static Sql Select(this Sql sql, Func, SqlRef> reference, Func, Sql> sqlexpr) { sql.Select(sql.GetColumns()); @@ -518,7 +518,7 @@ namespace Umbraco.Core.Persistence /// /// The original Sql expression. /// The current Dtos prefix. - public SqlRef(Sql sql, string prefix) + public SqlRef(Sql sql, string prefix) { Sql = sql; Prefix = prefix; @@ -527,7 +527,7 @@ namespace Umbraco.Core.Persistence /// /// Gets the original Sql expression. /// - public Sql Sql { get; } + public Sql Sql { get; } /// /// Gets the current Dtos prefix. @@ -611,7 +611,7 @@ namespace Umbraco.Core.Persistence /// /// If is empty, all fields are selected. /// - public static string Columns(this Sql sql, params Expression>[] fields) + public static string Columns(this Sql sql, params Expression>[] fields) { return string.Join(", ", sql.GetColumns(columnExpressions: fields, withAlias: false)); } @@ -627,7 +627,7 @@ namespace Umbraco.Core.Persistence /// /// If is empty, all fields are selected. /// - public static string Columns(this Sql sql, string alias, params Expression>[] fields) + public static string Columns(this Sql sql, string alias, params Expression>[] fields) { return string.Join(", ", sql.GetColumns(columnExpressions: fields, withAlias: false, tableAlias: alias)); } @@ -636,7 +636,7 @@ namespace Umbraco.Core.Persistence #region Utilities - private static object[] GetColumns(this Sql sql, string tableAlias = null, string referenceName = null, Expression>[] columnExpressions = null, bool withAlias = true) + private static object[] GetColumns(this Sql sql, string tableAlias = null, string referenceName = null, Expression>[] columnExpressions = null, bool withAlias = true) { var pd = sql.SqlContext.PocoDataFactory.ForType(typeof (TDto)); var tableName = tableAlias ?? pd.TableInfo.TableName; diff --git a/src/Umbraco.Core/Persistence/Querying/PocoToSqlExpressionVisitor.cs b/src/Umbraco.Core/Persistence/Querying/PocoToSqlExpressionVisitor.cs index 7fe623a2fa..6846ea1e30 100644 --- a/src/Umbraco.Core/Persistence/Querying/PocoToSqlExpressionVisitor.cs +++ b/src/Umbraco.Core/Persistence/Querying/PocoToSqlExpressionVisitor.cs @@ -14,7 +14,7 @@ namespace Umbraco.Core.Persistence.Querying { private readonly PocoData _pd; - public PocoToSqlExpressionVisitor(SqlContext sqlContext) + public PocoToSqlExpressionVisitor(ISqlContext sqlContext) : base(sqlContext.SqlSyntax) { _pd = sqlContext.PocoDataFactory.ForType(typeof(TDto)); @@ -79,7 +79,7 @@ namespace Umbraco.Core.Persistence.Querying private readonly string _alias1, _alias2; private string _parameterName1, _parameterName2; - public PocoToSqlExpressionVisitor(SqlContext sqlContext, string alias1, string alias2) + public PocoToSqlExpressionVisitor(ISqlContext sqlContext, string alias1, string alias2) : base(sqlContext.SqlSyntax) { _pocoData1 = sqlContext.PocoDataFactory.ForType(typeof (TDto1)); diff --git a/src/Umbraco.Core/Persistence/Querying/Query.cs b/src/Umbraco.Core/Persistence/Querying/Query.cs index dd84d283f6..cb81965659 100644 --- a/src/Umbraco.Core/Persistence/Querying/Query.cs +++ b/src/Umbraco.Core/Persistence/Querying/Query.cs @@ -13,10 +13,10 @@ namespace Umbraco.Core.Persistence.Querying /// public class Query : IQuery { - private readonly SqlContext _sqlContext; + private readonly ISqlContext _sqlContext; private readonly List> _wheres = new List>(); - public Query(SqlContext sqlContext) + public Query(ISqlContext sqlContext) { _sqlContext = sqlContext; } @@ -57,7 +57,7 @@ namespace Umbraco.Core.Persistence.Querying StringBuilder sb = null; List parameters = null; - Sql sql = null; + Sql sql = null; foreach (var predicate in predicates) { // see notes in Where() diff --git a/src/Umbraco.Core/Persistence/Querying/SqlTranslator.cs b/src/Umbraco.Core/Persistence/Querying/SqlTranslator.cs index f9a2ee7698..420b71b4eb 100644 --- a/src/Umbraco.Core/Persistence/Querying/SqlTranslator.cs +++ b/src/Umbraco.Core/Persistence/Querying/SqlTranslator.cs @@ -9,21 +9,16 @@ namespace Umbraco.Core.Persistence.Querying /// internal class SqlTranslator { - private readonly Sql _sql; + private readonly Sql _sql; - public SqlTranslator(Sql sql, IQuery query) + public SqlTranslator(Sql sql, IQuery query) { - if (sql == null) - throw new Exception("Sql cannot be null"); - - _sql = sql; + _sql = sql ?? throw new ArgumentNullException(nameof(sql)); foreach (var clause in query.GetWhereClauses()) - { _sql.Where(clause.Item1, clause.Item2); - } } - public Sql Translate() + public Sql Translate() { return _sql; } diff --git a/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs index 849fe8ca45..9365eab74f 100644 --- a/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs @@ -64,7 +64,7 @@ namespace Umbraco.Core.Persistence.Repositories return dtos.Select(x => new AuditItem(x.NodeId, x.Comment, Enum.Parse(x.Header), x.UserId)).ToArray(); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = SqlContext.Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs index 89e865eece..a6bd19e708 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs @@ -73,7 +73,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override IEnumerable PerformGetAll(params int[] ids) { - Sql Translate(Sql tsql) + Sql Translate(Sql tsql) { if (ids.Any()) tsql.Where("umbracoNode.id in (@ids)", new { /*ids =*/ ids }); @@ -111,7 +111,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(QueryType queryType) + protected override Sql GetBaseQuery(QueryType queryType) { var sql = SqlContext.Sql(); @@ -169,7 +169,7 @@ namespace Umbraco.Core.Persistence.Repositories } // fixme - move that one up to Versionable! - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single); } @@ -823,7 +823,7 @@ namespace Umbraco.Core.Persistence.Repositories protected override IEnumerable PerformGetAll(params Guid[] ids) { - Sql Translate(Sql s) + Sql Translate(Sql s) { if (ids.Any()) { @@ -838,7 +838,7 @@ namespace Umbraco.Core.Persistence.Repositories return _outerRepo.MapQueryDtos(Database.Fetch(sql), many: true); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return _outerRepo.GetBaseQuery(isCount); } diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs index a5c48b06b2..f9304ee9c1 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs @@ -153,7 +153,7 @@ namespace Umbraco.Core.Persistence.Repositories return Database.Fetch(sql); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs index ee129cb2e9..318bab773a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs @@ -121,7 +121,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); @@ -498,7 +498,7 @@ AND umbracoNode.id <> @id", throw new NotImplementedException(); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { throw new NotImplementedException(); } diff --git a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs index 4adb11601f..0c1dacdd4f 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs @@ -88,7 +88,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); if (isCount) @@ -312,7 +312,7 @@ namespace Umbraco.Core.Persistence.Repositories .FetchOneToMany(x => x.LanguageTextDtos, sql); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return _dictionaryRepository.GetBaseQuery(isCount); } @@ -366,7 +366,7 @@ namespace Umbraco.Core.Persistence.Repositories .FetchOneToMany(x => x.LanguageTextDtos, sql); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return _dictionaryRepository.GetBaseQuery(isCount); } diff --git a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs index 717ef3fec6..9571338263 100644 --- a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs @@ -49,7 +49,7 @@ namespace Umbraco.Core.Persistence.Repositories throw new NotSupportedException("This repository does not support this method"); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); if (isCount) diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs index 0e4dade398..8e17b1b251 100644 --- a/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs @@ -103,7 +103,7 @@ namespace Umbraco.Core.Persistence.Repositories return entity; } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); if (isCount) diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs index e4d2c12a81..5e8a5c84c5 100644 --- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs @@ -31,7 +31,7 @@ namespace Umbraco.Core.Persistence.Repositories /// protected internal IScopeUnitOfWork UnitOfWork { get; } - protected Sql Sql() => UnitOfWork.SqlContext.Sql(); + protected Sql Sql() => UnitOfWork.SqlContext.Sql(); #region Query Methods @@ -388,7 +388,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Sql Statements - protected Sql GetFullSqlForEntityType(Guid key, bool isContent, bool isMedia, Guid objectTypeId) + protected Sql GetFullSqlForEntityType(Guid key, bool isContent, bool isMedia, Guid objectTypeId) { var entitySql = GetBaseWhere(GetBase, isContent, isMedia, objectTypeId, key); @@ -397,7 +397,7 @@ namespace Umbraco.Core.Persistence.Repositories : entitySql.Append(GetGroupBy(isContent, false)); } - protected Sql GetFullSqlForEntityType(int id, bool isContent, bool isMedia, Guid objectTypeId) + protected Sql GetFullSqlForEntityType(int id, bool isContent, bool isMedia, Guid objectTypeId) { var entitySql = GetBaseWhere(GetBase, isContent, isMedia, objectTypeId, id); @@ -406,7 +406,7 @@ namespace Umbraco.Core.Persistence.Repositories : entitySql.Append(GetGroupBy(isContent, false)); } - protected Sql GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectTypeId, Action> filter) + protected Sql GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectTypeId, Action> filter) { var entitySql = GetBaseWhere(GetBase, isContent, isMedia, filter, objectTypeId); @@ -415,7 +415,7 @@ namespace Umbraco.Core.Persistence.Repositories : entitySql.Append(GetGroupBy(isContent, false)); } - private Sql GetPropertySql(Guid nodeObjectType) + private Sql GetPropertySql(Guid nodeObjectType) { var sql = Sql() .Select("contentNodeId, versionId, dataNvarchar, dataNtext, propertyEditorAlias, alias as propertyTypeAlias") @@ -431,7 +431,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - private Sql GetFullSqlForMedia(Sql entitySql, Action> filter = null) + private Sql GetFullSqlForMedia(Sql entitySql, Action> filter = null) { //this will add any dataNvarchar property to the output which can be added to the additional properties @@ -454,12 +454,12 @@ namespace Umbraco.Core.Persistence.Repositories return wrappedSql; } - protected virtual Sql GetBase(bool isContent, bool isMedia, Action> customFilter) + protected virtual Sql GetBase(bool isContent, bool isMedia, Action> customFilter) { return GetBase(isContent, isMedia, customFilter, false); } - protected virtual Sql GetBase(bool isContent, bool isMedia, Action> customFilter, bool isCount) + protected virtual Sql GetBase(bool isContent, bool isMedia, Action> customFilter, bool isCount) { var columns = new List(); @@ -536,7 +536,7 @@ namespace Umbraco.Core.Persistence.Repositories return entitySql; } - protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, Action> filter, Guid nodeObjectType) + protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, Action> filter, Guid nodeObjectType) { var sql = baseQuery(isContent, isMedia, filter) .Where("umbracoNode.nodeObjectType = @nodeObjectType", new { nodeObjectType }); @@ -545,7 +545,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, int id) + protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, int id) { var sql = baseQuery(isContent, isMedia, null) .Where("umbracoNode.id = @id", new { id }); @@ -555,7 +555,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, Guid key) + protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, Guid key) { var sql = baseQuery(isContent, isMedia, null) .Where("umbracoNode.uniqueID = @uniqueID", new { uniqueID = key }); @@ -565,7 +565,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, Guid nodeObjectType, int id) + protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, Guid nodeObjectType, int id) { var sql = baseQuery(isContent, isMedia, null) .Where("umbracoNode.id = @id AND umbracoNode.nodeObjectType = @nodeObjectType", new { id, nodeObjectType}); @@ -574,7 +574,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, Guid nodeObjectType, Guid key) + protected virtual Sql GetBaseWhere(Func>, Sql> baseQuery, bool isContent, bool isMedia, Guid nodeObjectType, Guid key) { var sql = baseQuery(isContent, isMedia, null) .Where("umbracoNode.uniqueID = @uniqueID AND umbracoNode.nodeObjectType = @nodeObjectType", new { uniqueID = key, nodeObjectType }); @@ -583,7 +583,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - protected virtual Sql GetGroupBy(bool isContent, bool isMedia, bool includeSort = true) + protected virtual Sql GetGroupBy(bool isContent, bool isMedia, bool includeSort = true) { var columns = new List { diff --git a/src/Umbraco.Core/Persistence/Repositories/ExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ExternalLoginRepository.cs index e7e3d0d3ad..fc55bd7f39 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ExternalLoginRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ExternalLoginRepository.cs @@ -112,7 +112,7 @@ namespace Umbraco.Core.Persistence.Repositories } } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); if (isCount) diff --git a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs index 8ea11e835e..5c7f8fd7a0 100644 --- a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs @@ -66,7 +66,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/MacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MacroRepository.cs index 37c7d126a2..a9c503d0a4 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MacroRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MacroRepository.cs @@ -103,12 +103,12 @@ namespace Umbraco.Core.Persistence.Repositories .Select(x => Get(x.Id)); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return isCount ? Sql().SelectCount().From() : GetBaseQuery(); } - private Sql GetBaseQuery() + private Sql GetBaseQuery() { return Sql() .SelectAll() diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs index bf8bf2d439..c5885056d9 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs @@ -82,12 +82,12 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single); } - protected override Sql GetBaseQuery(QueryType queryType) + protected override Sql GetBaseQuery(QueryType queryType) { var sql = Sql(); @@ -101,8 +101,8 @@ namespace Umbraco.Core.Persistence.Repositories break; case QueryType.Many: case QueryType.Single: - sql = sql.Select(r => - r.Select(x => x.ContentDto, r1 => + sql = sql.Select(r => + r.Select(x => x.ContentDto, r1 => r1.Select(x => x.NodeDto))); break; } @@ -479,7 +479,7 @@ namespace Umbraco.Core.Persistence.Repositories return _outerRepo.MapQueryDtos(Database.Fetch(sql)); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return _outerRepo.GetBaseQuery(isCount); } @@ -528,7 +528,7 @@ namespace Umbraco.Core.Persistence.Repositories public IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter = null, bool newest = true) { - Sql filterSql = null; + Sql filterSql = null; if (filter != null) { filterSql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs index 24cdad2dda..a38b7c9118 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs @@ -106,7 +106,7 @@ namespace Umbraco.Core.Persistence.Repositories : Enumerable.Empty(); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs index 3b7665f6a8..f8936f413d 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs @@ -53,7 +53,7 @@ namespace Umbraco.Core.Persistence.Repositories return Database.Fetch(sql).Select(x => _modelFactory.BuildEntity(x)); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs index 501e04344c..016aa14d0a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs @@ -101,12 +101,12 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single); } - protected override Sql GetBaseQuery(QueryType queryType) + protected override Sql GetBaseQuery(QueryType queryType) { var sql = Sql(); @@ -149,7 +149,7 @@ namespace Umbraco.Core.Persistence.Repositories return "umbracoNode.id = @Id"; } - protected Sql GetNodeIdQueryWithPropertyData() + protected Sql GetNodeIdQueryWithPropertyData() { return Sql() .Select("DISTINCT(umbracoNode.id)") @@ -574,7 +574,7 @@ namespace Umbraco.Core.Persistence.Repositories public IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery filter = null, bool newest = true) { - Sql filterSql = null; + Sql filterSql = null; if (filter != null) { filterSql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs index 2d175abbf8..6a727b46fa 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs @@ -134,7 +134,7 @@ namespace Umbraco.Core.Persistence.Repositories yield return acc; } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { if (isCount) { @@ -164,7 +164,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - protected Sql GetSubquery() + protected Sql GetSubquery() { var sql = Sql() .Select("DISTINCT(umbracoNode.id)") diff --git a/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs index 36606f1064..e8135334ac 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs @@ -66,7 +66,7 @@ namespace Umbraco.Core.Persistence.Repositories return Database.Fetch(sql).Select(x => factory.BuildEntity(x)); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs index 089f64c79c..6e719e74c5 100644 --- a/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs @@ -43,14 +43,14 @@ namespace Umbraco.Core.Persistence.Repositories /// protected ISqlContext SqlContext=> UnitOfWork.SqlContext; - protected Sql Sql() => SqlContext.Sql(); - protected Sql Sql(string sql, params object[] args) => SqlContext.Sql(sql, args); + protected Sql Sql() => SqlContext.Sql(); + protected Sql Sql(string sql, params object[] args) => SqlContext.Sql(sql, args); protected ISqlSyntaxProvider SqlSyntax => SqlContext.SqlSyntax; protected IQuery Query() => SqlContext.Query(); #region Abstract Methods - protected abstract Sql GetBaseQuery(bool isCount); // fixme obsolete, use QueryType instead everywhere + protected abstract Sql GetBaseQuery(bool isCount); // fixme obsolete, use QueryType instead everywhere protected abstract string GetBaseWhereClause(); protected abstract IEnumerable GetDeleteClauses(); protected abstract Guid NodeObjectTypeId { get; } diff --git a/src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs index e2732f04b1..68a742afe5 100644 --- a/src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs @@ -265,7 +265,7 @@ namespace Umbraco.Core.Persistence.Repositories throw new WontImplementException(); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { throw new WontImplementException(); } diff --git a/src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs b/src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs index 1f6f7388db..2593f59304 100644 --- a/src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs @@ -56,7 +56,7 @@ namespace Umbraco.Core.Persistence.Repositories return dtos.Select(factory.BuildEntity); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return Sql() .SelectAll() diff --git a/src/Umbraco.Core/Persistence/Repositories/RedirectUrlRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RedirectUrlRepository.cs index a51c52703d..14b19d5eff 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RedirectUrlRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RedirectUrlRepository.cs @@ -48,7 +48,7 @@ namespace Umbraco.Core.Persistence.Repositories throw new NotSupportedException("This repository does not support this method."); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); if (isCount) diff --git a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs index 7cc6b14bf1..5b6a2b06f0 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs @@ -100,7 +100,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs index e9ba3cb0bd..57fcc8541e 100644 --- a/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs @@ -94,7 +94,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs index 2a1eb86aa8..097e0fc471 100644 --- a/src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs @@ -66,7 +66,7 @@ namespace Umbraco.Core.Persistence.Repositories throw new NotSupportedException("This repository does not support this method."); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs index c4ddab3ac5..f666f572a3 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs @@ -91,12 +91,12 @@ namespace Umbraco.Core.Persistence.Repositories } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return isCount ? Sql().SelectCount().From() : GetBaseQuery(); } - private Sql GetBaseQuery() + private Sql GetBaseQuery() { return Sql().SelectAll().From(); } @@ -340,7 +340,7 @@ namespace Umbraco.Core.Persistence.Repositories return ExecuteTagsQuery(sql); } - private Sql GetTagsQuerySelect(bool withGrouping = false) + private Sql GetTagsQuerySelect(bool withGrouping = false) { var sql = Sql(); @@ -356,7 +356,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - private Sql ApplyRelationshipJoinToTagsQuery(Sql sql) + private Sql ApplyRelationshipJoinToTagsQuery(Sql sql) { return sql .From() @@ -368,7 +368,7 @@ namespace Umbraco.Core.Persistence.Repositories .On(left => left.NodeId, right => right.NodeId); } - private Sql ApplyGroupFilterToTagsQuery(Sql sql, string group) + private Sql ApplyGroupFilterToTagsQuery(Sql sql, string group) { if (group.IsNullOrWhiteSpace() == false) { @@ -378,7 +378,7 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - private Sql ApplyGroupByToTagsQuery(Sql sql) + private Sql ApplyGroupByToTagsQuery(Sql sql) { return sql.GroupBy("cmsTags.id", "cmsTags.tag", "cmsTags." + SqlSyntax.GetQuotedColumnName("group") + @""); } diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs index 537a73fab7..1058783b66 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs @@ -59,12 +59,12 @@ namespace Umbraco.Core.Persistence.Repositories return dtos.Select(factory.BuildEntity); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return isCount ? SqlContext.Sql().SelectCount().From() : GetBaseQuery(); } - private Sql GetBaseQuery() + private Sql GetBaseQuery() { return SqlContext.Sql() .Select("cmsTask.closed,cmsTask.id,cmsTask.taskTypeId,cmsTask.nodeId,cmsTask.parentUserId,cmsTask.userId,cmsTask." + SqlContext.SqlSyntax.GetQuotedColumnName("DateTime") + ",cmsTask.Comment,cmsTaskType.id, cmsTaskType.alias") @@ -144,7 +144,7 @@ namespace Umbraco.Core.Persistence.Repositories return dtos.Select(factory.BuildEntity); } - private Sql GetGetTasksQuery(int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false) + private Sql GetGetTasksQuery(int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false) { var sql = GetBaseQuery(false); diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs index 75c745709b..770a83b535 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs @@ -60,7 +60,7 @@ namespace Umbraco.Core.Persistence.Repositories return dtos.Select(factory.BuildEntity); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return SqlContext.Sql().SelectAll().From(); } diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs index 8a4ecf3264..e5f7820044 100644 --- a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs @@ -105,7 +105,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { var sql = SqlContext.Sql(); diff --git a/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs index c8d6b2440c..eba18fbc77 100644 --- a/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs @@ -216,7 +216,7 @@ namespace Umbraco.Core.Persistence.Repositories #region Overrides of NPocoRepositoryBase - protected Sql GetBaseQuery(QueryType type) + protected Sql GetBaseQuery(QueryType type) { var sql = Sql(); var addFrom = false; @@ -256,12 +256,12 @@ namespace Umbraco.Core.Persistence.Repositories return sql; } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { return GetBaseQuery(isCount ? QueryType.Count : QueryType.Many); } - private static void AppendGroupBy(Sql sql) + private static void AppendGroupBy(Sql sql) { sql .GroupBy(x => x.CreateDate, x => x.Icon, x => x.Id, x => x.StartContentId, x => x.StartMediaId, @@ -293,7 +293,7 @@ namespace Umbraco.Core.Persistence.Repositories ((UserGroup) entity).AddingEntity(); var userGroupDto = UserGroupFactory.BuildDto(entity); - + var id = Convert.ToInt32(Database.Insert(userGroupDto)); entity.Id = id; @@ -383,7 +383,7 @@ namespace Umbraco.Core.Persistence.Repositories throw new WontImplementException(); } - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { throw new WontImplementException(); } diff --git a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs index 079a658766..667a102972 100644 --- a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs @@ -168,19 +168,19 @@ ORDER BY colName"; return users; } - private IUser GetWith(Action> with, bool includeReferences) + private IUser GetWith(Action> with, bool includeReferences) { var dto = GetDtoWith(with, includeReferences); return dto == null ? null : UserFactory.BuildEntity(dto); } - private UserDto GetDtoWith(Action> with, bool includeReferences) + private UserDto GetDtoWith(Action> with, bool includeReferences) { var dtos = GetDtosWith(with, includeReferences); return dtos.FirstOrDefault(); } - private List GetDtosWith(Action> with, bool includeReferences) + private List GetDtosWith(Action> with, bool includeReferences) { var sql = SqlContext.Sql() .Select() @@ -279,7 +279,7 @@ ORDER BY colName"; #region Overrides of NPocoRepositoryBase - protected override Sql GetBaseQuery(bool isCount) + protected override Sql GetBaseQuery(bool isCount) { if (isCount) return SqlContext.Sql() @@ -291,7 +291,7 @@ ORDER BY colName"; .From(); } - private static void AddGroupLeftJoin(Sql sql) + private static void AddGroupLeftJoin(Sql sql) { sql .LeftJoin() @@ -304,7 +304,7 @@ ORDER BY colName"; .On(left => left.UserId, right => right.Id); } - private Sql GetBaseQuery(string columns) + private Sql GetBaseQuery(string columns) { return SqlContext.Sql() .Select(columns) @@ -623,7 +623,7 @@ ORDER BY colName"; { if (string.IsNullOrWhiteSpace(orderBy)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(orderBy)); - Sql filterSql = null; + Sql filterSql = null; var customFilterWheres = filter != null ? filter.GetWhereClauses().ToArray() : null; var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0; if (hasCustomFilter @@ -717,7 +717,7 @@ ORDER BY colName"; return pagedResult.Items.Select(UserFactory.BuildEntity); } - private Sql ApplyFilter(Sql sql, Sql filterSql) + private Sql ApplyFilter(Sql sql, Sql filterSql) { if (filterSql == null) return sql; @@ -726,7 +726,7 @@ ORDER BY colName"; return sql; } - private static Sql ApplySort(Sql sql, Direction orderDirection, string orderBy) + private static Sql ApplySort(Sql sql, Direction orderDirection, string orderBy) { if (string.IsNullOrEmpty(orderBy)) return sql; diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs index 65d764c0f8..3174e8af3a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs +++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs @@ -246,12 +246,12 @@ namespace Umbraco.Core.Persistence.Repositories return entity.Properties.Any(x => x.TagSupport.Enable); } - private Sql PrepareSqlForPagedResults(Sql sql, Sql filterSql, string orderBy, Direction orderDirection, bool orderBySystemField, string table) + private Sql PrepareSqlForPagedResults(Sql sql, Sql filterSql, string orderBy, Direction orderDirection, bool orderBySystemField, string table) { if (filterSql == null && string.IsNullOrEmpty(orderBy)) return sql; // preserve original - var psql = new Sql(sql.SqlContext, sql.SQL, sql.Arguments); + var psql = new Sql(sql.SqlContext, sql.SQL, sql.Arguments); // apply filter if (filterSql != null) @@ -288,12 +288,12 @@ namespace Umbraco.Core.Persistence.Repositories } // fixme - temp - for the time being NPoco PagingHelper cannot deal with multiline - psql = new Sql(psql.SqlContext, psql.SQL.Replace("\r\n", " ").Replace("\r", " ").Replace("\n", " "), psql.Arguments); + psql = new Sql(psql.SqlContext, psql.SQL.Replace("\r\n", " ").Replace("\r", " ").Replace("\n", " "), psql.Arguments); return psql; } - private string GetOrderBySystemField(ref Sql sql, string orderBy) + private string GetOrderBySystemField(ref Sql sql, string orderBy) { // get the database field eg "[table].[column]" var dbfield = GetDatabaseFieldNameForOrderBy(orderBy); @@ -318,7 +318,7 @@ namespace Umbraco.Core.Persistence.Repositories return dbfield; } - private string GetOrderByNonSystemField(ref Sql sql, string orderBy, string table) + private string GetOrderByNonSystemField(ref Sql sql, string orderBy, string table) { // Sorting by a custom field, so set-up sub-query for ORDER BY clause to pull through value // from most recent content version for the given order by field @@ -377,7 +377,7 @@ namespace Umbraco.Core.Persistence.Repositories if (sql.SQL.StartsWith("SELECT ") == false) throw new Exception("Oops, SELECT not found."); newSql = newSql.Insert("SELECT ".Length, "CustomPropData.CustomPropVal, "); - sql = new Sql(sql.SqlContext, newSql, newArgs.ToArray()); + sql = new Sql(sql.SqlContext, newSql, newArgs.ToArray()); // and order by the custom field return "CustomPropData.CustomPropVal"; @@ -411,7 +411,7 @@ namespace Umbraco.Core.Persistence.Repositories protected IEnumerable GetPagedResultsByQuery(IQuery query, long pageIndex, int pageSize, out long totalRecords, Func, IEnumerable> mapper, string orderBy, Direction orderDirection, bool orderBySystemField, string table, - Sql filterSql = null) + Sql filterSql = null) { if (orderBy == null) throw new ArgumentNullException(nameof(orderBy)); @@ -960,7 +960,7 @@ ORDER BY contentNodeId, versionId, propertytypeid /// /// /// - protected abstract Sql GetBaseQuery(QueryType queryType); + protected abstract Sql GetBaseQuery(QueryType queryType); /* internal class DocumentDefinitionCollection : KeyedCollection diff --git a/src/Umbraco.Core/Persistence/SqlContext.cs b/src/Umbraco.Core/Persistence/SqlContext.cs index f3b21a33a7..8bf59b7d24 100644 --- a/src/Umbraco.Core/Persistence/SqlContext.cs +++ b/src/Umbraco.Core/Persistence/SqlContext.cs @@ -37,10 +37,10 @@ namespace Umbraco.Core.Persistence public DatabaseType DatabaseType { get; } /// - public Sql Sql() => NPoco.Sql.BuilderFor(this); + public Sql Sql() => NPoco.Sql.BuilderFor((ISqlContext) this); /// - public Sql Sql(string sql, params object[] args) => Sql().Append(sql, args); + public Sql Sql(string sql, params object[] args) => Sql().Append(sql, args); /// public IQuery Query() => new Query(this); diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs index 6cd8cbf46c..2ae84f1c9c 100644 --- a/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs +++ b/src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs @@ -69,7 +69,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax string FormatColumnRename(string tableName, string oldName, string newName); string FormatTableRename(string oldName, string newName); - Sql SelectTop(Sql sql, int top); + Sql SelectTop(Sql sql, int top); bool SupportsClustered(); bool SupportsIdentityInsert(); diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs index 2ecbd2c9c6..53da08ae4c 100644 --- a/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs +++ b/src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs @@ -179,9 +179,9 @@ ORDER BY TABLE_NAME, INDEX_NAME", return result > 0; } - public override Sql SelectTop(Sql sql, int top) + public override Sql SelectTop(Sql sql, int top) { - return new Sql(sql.SqlContext, string.Concat(sql.SQL, " LIMIT ", top), sql.Arguments); + return new Sql(sql.SqlContext, string.Concat(sql.SQL, " LIMIT ", top), sql.Arguments); } public override bool SupportsClustered() diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs index 81b13c15eb..8759ae2554 100644 --- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs +++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs @@ -14,9 +14,9 @@ namespace Umbraco.Core.Persistence.SqlSyntax [SqlSyntaxProvider(Constants.DbProviderNames.SqlCe)] public class SqlCeSyntaxProvider : MicrosoftSqlSyntaxProviderBase { - public override Sql SelectTop(Sql sql, int top) + public override Sql SelectTop(Sql sql, int top) { - return new Sql(sql.SqlContext, sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments); + return new Sql(sql.SqlContext, sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments); } public override bool SupportsClustered() diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs index 5e12aea1f5..0d22ee5171 100644 --- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs +++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs @@ -219,9 +219,9 @@ order by T.name, I.name"); return column.IsIdentity ? GetIdentityString(column) : string.Empty; } - public override Sql SelectTop(Sql sql, int top) + public override Sql SelectTop(Sql sql, int top) { - return new Sql(sql.SqlContext, sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments); + return new Sql(sql.SqlContext, sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments); } private static string GetIdentityString(ColumnDefinition column) diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs index 0bbae1104d..ca795c7bf7 100644 --- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs +++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs @@ -495,15 +495,9 @@ namespace Umbraco.Core.Persistence.SqlSyntax protected abstract string FormatIdentity(ColumnDefinition column); - public abstract Sql SelectTop(Sql sql, int top); + public abstract Sql SelectTop(Sql sql, int top); - public virtual string DeleteDefaultConstraint - { - get - { - throw new NotSupportedException("Default constraints are not supported"); - } - } + public virtual string DeleteDefaultConstraint => throw new NotSupportedException("Default constraints are not supported"); public virtual string CreateTable => "CREATE TABLE {0} ({1})"; public virtual string DropTable => "DROP TABLE {0}"; diff --git a/src/Umbraco.Core/Persistence/SqlTemplate.cs b/src/Umbraco.Core/Persistence/SqlTemplate.cs index 1e4f429fc5..e61ed9d996 100644 --- a/src/Umbraco.Core/Persistence/SqlTemplate.cs +++ b/src/Umbraco.Core/Persistence/SqlTemplate.cs @@ -7,11 +7,11 @@ namespace Umbraco.Core.Persistence { public class SqlTemplate { - private readonly SqlContext _sqlContext; + private readonly ISqlContext _sqlContext; private readonly string _sql; private readonly Dictionary _args; - internal SqlTemplate(SqlContext sqlContext, string sql, object[] args) + internal SqlTemplate(ISqlContext sqlContext, string sql, object[] args) { _sqlContext = sqlContext; _sql = sql; @@ -21,20 +21,20 @@ namespace Umbraco.Core.Persistence _args[i] = args[i].ToString(); } - public Sql Sql() + public Sql Sql() { - return new Sql(_sqlContext, _sql); + return new Sql(_sqlContext, _sql); } // must pass the args in the proper order, faster - public Sql Sql(params object[] args) + public Sql Sql(params object[] args) { - return new Sql(_sqlContext, _sql, args); + return new Sql(_sqlContext, _sql, args); } // can pass named args, slower // so, not much different from what Where(...) does (ie reflection) - public Sql SqlNamed(object nargs) + public Sql SqlNamed(object nargs) { var args = new object[_args.Count]; var properties = nargs.GetType().GetProperties().ToDictionary(x => x.Name, x => x.GetValue(nargs)); @@ -44,7 +44,7 @@ namespace Umbraco.Core.Persistence throw new InvalidOperationException($"Invalid argument name \"{_args[i]}\"."); args[i] = value; } - return new Sql(_sqlContext, _sql, args); + return new Sql(_sqlContext, _sql, args); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/SqlTemplates.cs b/src/Umbraco.Core/Persistence/SqlTemplates.cs index d1b2b9ac82..255fade615 100644 --- a/src/Umbraco.Core/Persistence/SqlTemplates.cs +++ b/src/Umbraco.Core/Persistence/SqlTemplates.cs @@ -7,9 +7,9 @@ namespace Umbraco.Core.Persistence public class SqlTemplates { private readonly Dictionary _templates = new Dictionary(); - private readonly SqlContext _sqlContext; + private readonly ISqlContext _sqlContext; - public SqlTemplates(SqlContext sqlContext) + public SqlTemplates(ISqlContext sqlContext) { _sqlContext = sqlContext; } @@ -20,10 +20,10 @@ namespace Umbraco.Core.Persistence _templates.Clear(); } - public SqlTemplate Get(string key, Func, Sql> sqlBuilder) + public SqlTemplate Get(string key, Func, Sql> sqlBuilder) { if (_templates.TryGetValue(key, out var template)) return template; - var sql = sqlBuilder(new Sql(_sqlContext)); + var sql = sqlBuilder(new Sql(_sqlContext)); return _templates[key] = new SqlTemplate(_sqlContext, sql.SQL, sql.Arguments); } } diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs index acfba9f1a2..28b920a269 100644 --- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs +++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs @@ -40,7 +40,7 @@ namespace Umbraco.Core.Persistence /// Used by UmbracoDatabaseFactory to create databases. /// Also used by DatabaseBuilder for creating databases and installing/upgrading. /// - public UmbracoDatabase(string connectionString, SqlContext sqlContext, DbProviderFactory provider, ILogger logger, RetryPolicy connectionRetryPolicy = null, RetryPolicy commandRetryPolicy = null) + public UmbracoDatabase(string connectionString, ISqlContext sqlContext, DbProviderFactory provider, ILogger logger, RetryPolicy connectionRetryPolicy = null, RetryPolicy commandRetryPolicy = null) : base(connectionString, sqlContext.DatabaseType, provider, DefaultIsolationLevel) { SqlContext = sqlContext; @@ -56,7 +56,7 @@ namespace Umbraco.Core.Persistence /// Initializes a new instance of the class. /// /// Internal for unit tests only. - internal UmbracoDatabase(DbConnection connection, SqlContext sqlContext, ILogger logger) + internal UmbracoDatabase(DbConnection connection, ISqlContext sqlContext, ILogger logger) : base(connection, sqlContext.DatabaseType, DefaultIsolationLevel) { SqlContext = sqlContext; @@ -68,7 +68,7 @@ namespace Umbraco.Core.Persistence #endregion /// - public SqlContext SqlContext { get; } + public ISqlContext SqlContext { get; } #region Testing, Debugging and Troubleshooting diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs index afb83b3169..5e5451c644 100644 --- a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs +++ b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs @@ -37,7 +37,7 @@ namespace Umbraco.Core.Persistence private DbProviderFactory _dbProviderFactory; private DatabaseType _databaseType; private ISqlSyntaxProvider _sqlSyntax; - private SqlContext _sqlContext; + private ISqlContext _sqlContext; private RetryPolicy _connectionRetryPolicy; private RetryPolicy _commandRetryPolicy; private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim(); diff --git a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs index d6cfa70eb9..4ad462d93a 100644 --- a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs +++ b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs @@ -62,7 +62,7 @@ namespace Umbraco.Core.Sync protected IScopeProvider ScopeProvider { get; } - protected Sql Sql() => _sqlContext.Sql(); + protected Sql Sql() => _sqlContext.Sql(); #region Messenger diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index a99dad0e5f..5615339fb3 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -837,6 +837,7 @@ + diff --git a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs index 4132810d8e..2fd872a9bb 100644 --- a/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs +++ b/src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs @@ -13,7 +13,7 @@ namespace Umbraco.Tests.Persistence.NPocoTests [Test] public void WhereInValueFieldTest() { - var sql = new Sql(SqlContext) + var sql = new Sql(SqlContext) .Select("*") .From() .WhereIn(x => x.NodeId, new[] { 1, 2, 3 }); @@ -26,7 +26,7 @@ namespace Umbraco.Tests.Persistence.NPocoTests // this test used to fail because x => x.Text was evaluated as a lambda // and returned "[umbracoNode].[text] = @0"... had to fix WhereIn. - var sql = new Sql(SqlContext) + var sql = new Sql(SqlContext) .Select("*") .From() .WhereIn(x => x.Text, new[] { "a", "b", "c" }); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs index f75be7cc1a..dc08296e22 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs @@ -307,7 +307,7 @@ namespace Umbraco.Tests.Persistence.Repositories } } - private Sql GetBaseQuery(bool isCount) + private Sql GetBaseQuery(bool isCount) { var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); if (isCount) @@ -345,7 +345,7 @@ namespace Umbraco.Tests.Persistence.Repositories return sql; } - private Sql GetSubquery() + private Sql GetSubquery() { var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger); var sql = provider.SqlContext.Sql(); diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs index ad319e85e7..1c2e41bdc7 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs @@ -18,11 +18,11 @@ namespace Umbraco.Tests.TestHelpers { protected IMapperCollection Mappers { get; private set; } - protected SqlContext SqlContext { get; private set; } + protected ISqlContext SqlContext { get; private set; } internal TestObjects TestObjects = new TestObjects(null); - protected Sql Sql() + protected Sql Sql() { return NPoco.Sql.BuilderFor(SqlContext); } diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs index 9b1f14ae3d..c250cb4a9c 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs @@ -36,6 +36,7 @@ namespace Umbraco.Tests.TestHelpers var databaseFactoryMock = new Mock(); databaseFactoryMock.Setup(x => x.Configured).Returns(configured); databaseFactoryMock.Setup(x => x.CanConnect).Returns(canConnect); + databaseFactoryMock.Setup(x => x.SqlContext).Returns(Mock.Of()); // can create a database - but don't try to use it! if (configured && canConnect)