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

Kill sql.WriteToConsole

Browse Source
This commit is contained in:
Stephan
2018-12-06 07:54:53 +01:00
parent 376203a4e1
commit 54c352f1f9
7 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Persistence/NPocoSqlExtensions.cs
View File

@@ -1115,11 +1115,6 @@ namespace Umbraco.Core.Persistence
return string.IsNullOrWhiteSpace(attr?.Name) ? column.Name : attr.Name;
}
internal static void WriteToConsole(this Sql sql)
{
Console.Write(sql.ToText());
}
internal static string ToText(this Sql sql)
{
var text = new StringBuilder();

5
src/Umbraco.Core/Persistence/SqlTemplate.cs
View File

@@ -95,9 +95,10 @@ namespace Umbraco.Core.Persistence
return new Sql<ISqlContext>(_sqlContext, isBuilt, _sql, args);
}
internal void WriteToConsole()
internal string ToText()
{
new Sql<ISqlContext>(_sqlContext, _sql, _args.Values.ToArray()).WriteToConsole();
var sql = new Sql<ISqlContext>(_sqlContext, _sql, _args.Values.ToArray());
return sql.ToText();
}
/// <summary>

2
src/Umbraco.Tests/Persistence/NPocoTests/NPocoFetchTests.cs
View File

@@ -403,7 +403,6 @@ namespace Umbraco.Tests.Persistence.NPocoTests
.From<Thing1Dto>()
.Where<Thing1Dto>(x => x.Id == 1);
sql.WriteToConsole();
var dto = scope.Database.Fetch<Thing1Dto>(sql).FirstOrDefault();
Assert.IsNotNull(dto);
Assert.AreEqual("one", dto.Name);
@@ -415,7 +414,6 @@ namespace Umbraco.Tests.Persistence.NPocoTests
//Assert.AreEqual("one", dto.Name);
var sql3 = new Sql(sql.SQL, 1);
sql.WriteToConsole();
dto = scope.Database.Fetch<Thing1Dto>(sql3).FirstOrDefault();
Assert.IsNotNull(dto);
Assert.AreEqual("one", dto.Name);

1
src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
View File

@@ -117,7 +117,6 @@ INNER JOIN [dto2] ON [dto1].[id] = [dto2].[dto1id]".NoCrLf(), sql.SQL.NoCrLf());
var sql = Sql()
.Update<DataTypeDto>(u => u.Set(x => x.EditorAlias, "Umbraco.ColorPicker"))
.Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.ColorPickerAlias");
sql.WriteToConsole();
}
[TableName("dto1")]

14
src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
View File

@@ -27,15 +27,9 @@ namespace Umbraco.Tests.Persistence.NPocoTests
.From("zbThing1")
.Where("id=@id", new { id = SqlTemplate.Arg("id") })).Sql(new { id = 1 });
sql.WriteToConsole();
var sql2 = sqlTemplates.Get("xxx", x => throw new InvalidOperationException("Should be cached.")).Sql(1);
sql2.WriteToConsole();
var sql3 = sqlTemplates.Get("xxx", x => throw new InvalidOperationException("Should be cached.")).Sql(new { id = 1 });
sql3.WriteToConsole();
}
[Test]
@@ -75,8 +69,8 @@ namespace Umbraco.Tests.Persistence.NPocoTests
Assert.AreEqual(1, sql.Arguments.Length);
Assert.AreEqual(123, sql.Arguments[0]);
Assert.Throws<InvalidOperationException>(() => template.Sql(new { xvalue = 123 }).WriteToConsole());
Assert.Throws<InvalidOperationException>(() => template.Sql(new { value = 123, xvalue = 456 }).WriteToConsole());
Assert.Throws<InvalidOperationException>(() => template.Sql(new { xvalue = 123 }));
Assert.Throws<InvalidOperationException>(() => template.Sql(new { value = 123, xvalue = 456 }));
var i = 666;
@@ -121,8 +115,8 @@ namespace Umbraco.Tests.Persistence.NPocoTests
Assert.AreEqual(1, sql.Arguments.Length);
Assert.AreEqual(123, sql.Arguments[0]);
Assert.Throws<InvalidOperationException>(() => template.Sql(new { j = 123 }).WriteToConsole());
Assert.Throws<InvalidOperationException>(() => template.Sql(new { i = 123, j = 456 }).WriteToConsole());
Assert.Throws<InvalidOperationException>(() => template.Sql(new { j = 123 }));
Assert.Throws<InvalidOperationException>(() => template.Sql(new { i = 123, j = 456 }));
// now with more arguments

2
src/Umbraco.Tests/Persistence/NPocoTests/NPocoSqlTests.cs
View File

@@ -305,12 +305,10 @@ namespace Umbraco.Tests.Persistence.NPocoTests
.From<UserLoginDto>()
.Where<UserLoginDto>(x => x.SessionId == sessionId);
sql.WriteToConsole();
Assert.AreEqual("SELECT * FROM [umbracoUserLogin] WHERE (([umbracoUserLogin].[sessionId] = @0))", sql.SQL.NoCrLf());
sql = sql.ForUpdate();
sql.WriteToConsole();
Assert.AreEqual("SELECT * FROM [umbracoUserLogin] WITH (UPDLOCK) WHERE (([umbracoUserLogin].[sessionId] = @0))", sql.SQL.NoCrLf());
}
}

2
src/Umbraco.Tests/Persistence/Querying/QueryBuilderTests.cs
View File

@@ -107,8 +107,6 @@ namespace Umbraco.Tests.Persistence.Querying
var translator = new SqlTranslator<IContent>(sql, query);
var result = translator.Translate();
result.WriteToConsole();
Assert.AreEqual("-1,1046,1076,1089%", result.Arguments[0]);
Assert.AreEqual(1046, result.Arguments[1]);
Assert.AreEqual(true, result.Arguments[2]);