Commit 98c94c56 authored by Nick Craver's avatar Nick Craver

Misc build analyzer fixups

parent 071a3fd5
......@@ -18,6 +18,7 @@ public Post QueryBuffered()
Step();
return _connection.Query<Post>("select * from Posts where Id = @Id", new { Id = i }, buffered: true).First();
}
[Benchmark(Description = "Query<dyanmic> (buffered)")]
public dynamic QueryBufferedDynamic()
{
......@@ -31,6 +32,7 @@ public Post QueryUnbuffered()
Step();
return _connection.Query<Post>("select * from Posts where Id = @Id", new { Id = i }, buffered: false).First();
}
[Benchmark(Description = "Query<dyanmic> (unbuffered)")]
public dynamic QueryUnbufferedDynamic()
{
......@@ -44,6 +46,7 @@ public Post QueryFirstOrDefault()
Step();
return _connection.QueryFirstOrDefault<Post>("select * from Posts where Id = @Id", new { Id = i });
}
[Benchmark(Description = "QueryFirstOrDefault<dyanmic>")]
public dynamic QueryFirstOrDefaultDynamic()
{
......
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Attributes;
using Dapper.Tests.Performance.NHibernate;
using NHibernate;
using NHibernate.Criterion;
......@@ -28,7 +28,7 @@ public void Setup()
public Post SQL()
{
Step();
return _sql.CreateSQLQuery(@"select * from Posts where Id = :id")
return _sql.CreateSQLQuery("select * from Posts where Id = :id")
.SetInt32("id", i)
.SetResultTransformer(Transformers.AliasToBean<Post>())
.List<Post>()[0];
......@@ -38,7 +38,7 @@ public Post SQL()
public Post HQL()
{
Step();
return _hql.CreateQuery(@"from Post as p where p.Id = :id")
return _hql.CreateQuery("from Post as p where p.Id = :id")
.SetInt32("id", i)
.List<Post>()[0];
}
......
......@@ -210,12 +210,12 @@ public async Task RunAsync(int iterations)
Try(() =>
{
var nhSession1 = NHibernateHelper.OpenSession();
tests.Add(id => nhSession1.CreateSQLQuery(@"select * from Posts where Id = :id")
tests.Add(id => nhSession1.CreateSQLQuery("select * from Posts where Id = :id")
.SetInt32("id", id)
.List(), "NHibernate: SQL");
var nhSession2 = NHibernateHelper.OpenSession();
tests.Add(id => nhSession2.CreateQuery(@"from Post as p where p.Id = :id")
tests.Add(id => nhSession2.CreateQuery("from Post as p where p.Id = :id")
.SetInt32("id", id)
.List(), "NHibernate: HQL");
......
......@@ -409,7 +409,7 @@ public virtual IEnumerable<dynamic> All(string where = "", string orderBy = "",
string sql = limit > 0 ? "SELECT TOP " + limit + " {0} FROM {1} " : "SELECT {0} FROM {1} ";
if (!string.IsNullOrEmpty(where))
sql += where.Trim().StartsWith("where", StringComparison.CurrentCultureIgnoreCase) ? where : "WHERE " + where;
if (!String.IsNullOrEmpty(orderBy))
if (!string.IsNullOrEmpty(orderBy))
sql += orderBy.Trim().StartsWith("order by", StringComparison.CurrentCultureIgnoreCase) ? orderBy : " ORDER BY " + orderBy;
return Query(string.Format(sql, columns, TableName), args);
}
......@@ -421,7 +421,7 @@ public virtual dynamic Paged(string where = "", string orderBy = "", string colu
{
dynamic result = new ExpandoObject();
var countSQL = string.Format("SELECT COUNT({0}) FROM {1}", PrimaryKeyField, TableName);
if (String.IsNullOrEmpty(orderBy))
if (string.IsNullOrEmpty(orderBy))
orderBy = PrimaryKeyField;
if (!string.IsNullOrEmpty(where))
......
......@@ -1399,17 +1399,17 @@ public Sql Where(string sql, params object[] args)
public Sql OrderBy(params object[] args)
{
return Append(new Sql("ORDER BY " + String.Join(", ", (from x in args select x.ToString()).ToArray())));
return Append(new Sql("ORDER BY " + string.Join(", ", (from x in args select x.ToString()).ToArray())));
}
public Sql Select(params object[] args)
{
return Append(new Sql("SELECT " + String.Join(", ", (from x in args select x.ToString()).ToArray())));
return Append(new Sql("SELECT " + string.Join(", ", (from x in args select x.ToString()).ToArray())));
}
public Sql From(params object[] args)
{
return Append(new Sql("FROM " + String.Join(", ", (from x in args select x.ToString()).ToArray())));
return Append(new Sql("FROM " + string.Join(", ", (from x in args select x.ToString()).ToArray())));
}
private static bool Is(Sql sql, string sqltype)
......@@ -1419,7 +1419,7 @@ private static bool Is(Sql sql, string sqltype)
public void Build(StringBuilder sb, List<object> args, Sql lhs)
{
if (!String.IsNullOrEmpty(_sql))
if (!string.IsNullOrEmpty(_sql))
{
// Add SQL to the string
if (sb.Length > 0)
......
......@@ -111,6 +111,7 @@ public static void WriteLineColor(string message, ConsoleColor color)
WriteLine(message);
ForegroundColor = orig;
}
public static void WriteColor(string message, ConsoleColor color)
{
var orig = ForegroundColor;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment