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

Misc build analyzer fixups

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