Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit ee33f4d

Browse files
committed
C#6-ify SqlServerOrmLiteDialectProvider.cs
1 parent a6a9955 commit ee33f4d

File tree

1 file changed

+10
-44
lines changed

1 file changed

+10
-44
lines changed

src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
using System.Collections.Generic;
33
using System.Data;
44
using System.Data.SqlClient;
5-
using System.Globalization;
65
using System.IO;
7-
using System.Text;
8-
using System.Threading;
9-
using System.Threading.Tasks;
106
using ServiceStack.OrmLite.SqlServer.Converters;
117
using ServiceStack.Text;
128
#if NETSTANDARD1_3
@@ -108,15 +104,9 @@ public void EnsureUtc(bool shouldEnsureUtc)
108104
this.GetDateTimeConverter().DateStyle = DateTimeKind.Utc;
109105
}
110106

111-
public override SqlExpression<T> SqlExpression<T>()
112-
{
113-
return new SqlServerExpression<T>(this);
114-
}
107+
public override SqlExpression<T> SqlExpression<T>() => new SqlServerExpression<T>(this);
115108

116-
public override IDbDataParameter CreateParam()
117-
{
118-
return new SqlParameter();
119-
}
109+
public override IDbDataParameter CreateParam() => new SqlParameter();
120110

121111
public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
122112
{
@@ -327,46 +317,22 @@ public override string GetLoadChildrenSubSelect<From>(SqlExpression<From> expr)
327317
return base.GetLoadChildrenSubSelect(expr);
328318
}
329319

330-
protected SqlConnection Unwrap(IDbConnection db)
331-
{
332-
return (SqlConnection)db.ToDbConnection();
333-
}
320+
protected SqlConnection Unwrap(IDbConnection db) => (SqlConnection)db.ToDbConnection();
334321

335-
protected SqlCommand Unwrap(IDbCommand cmd)
336-
{
337-
return (SqlCommand)cmd.ToDbCommand();
338-
}
322+
protected SqlCommand Unwrap(IDbCommand cmd) => (SqlCommand)cmd.ToDbCommand();
339323

340-
protected SqlDataReader Unwrap(IDataReader reader)
341-
{
342-
return (SqlDataReader)reader;
343-
}
324+
protected SqlDataReader Unwrap(IDataReader reader) => (SqlDataReader)reader;
344325

345326
#if ASYNC
346-
public override Task OpenAsync(IDbConnection db, CancellationToken token)
347-
{
348-
return Unwrap(db).OpenAsync(token);
349-
}
327+
public override Task OpenAsync(IDbConnection db, CancellationToken token) => Unwrap(db).OpenAsync(token);
350328

351-
public override Task<IDataReader> ExecuteReaderAsync(IDbCommand cmd, CancellationToken token)
352-
{
353-
return Unwrap(cmd).ExecuteReaderAsync(token).Then(x => (IDataReader)x);
354-
}
329+
public override Task<IDataReader> ExecuteReaderAsync(IDbCommand cmd, CancellationToken token) => Unwrap(cmd).ExecuteReaderAsync(token).Then(x => (IDataReader)x);
355330

356-
public override Task<int> ExecuteNonQueryAsync(IDbCommand cmd, CancellationToken token)
357-
{
358-
return Unwrap(cmd).ExecuteNonQueryAsync(token);
359-
}
331+
public override Task<int> ExecuteNonQueryAsync(IDbCommand cmd, CancellationToken token) => Unwrap(cmd).ExecuteNonQueryAsync(token);
360332

361-
public override Task<object> ExecuteScalarAsync(IDbCommand cmd, CancellationToken token)
362-
{
363-
return Unwrap(cmd).ExecuteScalarAsync(token);
364-
}
333+
public override Task<object> ExecuteScalarAsync(IDbCommand cmd, CancellationToken token) => Unwrap(cmd).ExecuteScalarAsync(token);
365334

366-
public override Task<bool> ReadAsync(IDataReader reader, CancellationToken token)
367-
{
368-
return Unwrap(reader).ReadAsync(token);
369-
}
335+
public override Task<bool> ReadAsync(IDataReader reader, CancellationToken token) => Unwrap(reader).ReadAsync(token);
370336

371337
public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn, CancellationToken token)
372338
{

0 commit comments

Comments
 (0)