Skip to content

D
Dapper
Commit 23547c9d authored by Nick Craver's avatar Nick Craver
Browse files
Options

DNXCORE50: Clean up usings and some missing C#6 conversions

parent e8dc7878
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 340 deletions
Dapper.DNX.Tests/Assert.cs
View file @ 23547c9d
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
#if DNXCORE50 #if DNXCORE50
using ApplicationException = global::System.InvalidOperationException; using ApplicationException = global::System.InvalidOperationException;
...@@ -16,7 +15,7 @@ public static void IsEqualTo<T>(this T obj, T other) ...@@ -16,7 +15,7 @@ public static void IsEqualTo<T>(this T obj, T other)
{ {
if (!Equals(obj, other)) if (!Equals(obj, other))
{ {
throw new ApplicationException(string.Format("{0} should be equals to {1}", obj, other)); throw new ApplicationException($"{obj} should be equals to {other}");
} }
} }
...@@ -24,7 +23,7 @@ public static void IsSequenceEqualTo<T>(this IEnumerable<T> obj, IEnumerable<T> ...@@ -24,7 +23,7 @@ public static void IsSequenceEqualTo<T>(this IEnumerable<T> obj, IEnumerable<T>
{ {
if (!(obj ?? new T[0]).SequenceEqual(other ?? new T[0])) if (!(obj ?? new T[0]).SequenceEqual(other ?? new T[0]))
{ {
throw new ApplicationException(string.Format("{0} should be equals to {1}", obj, other)); throw new ApplicationException($"{obj} should be equals to {other}");
} }
} }
......
Dapper.DNX.Tests/Program.cs
View file @ 23547c9d
...@@ -42,8 +42,10 @@ public static SqlConnection GetOpenConnection(bool mars = false) ...@@ -42,8 +42,10 @@ public static SqlConnection GetOpenConnection(bool mars = false)
var cs = ConnectionString; var cs = ConnectionString;
if (mars) if (mars)
{ {
SqlConnectionStringBuilder scsb = new SqlConnectionStringBuilder(cs); var scsb = new SqlConnectionStringBuilder(cs)
scsb.MultipleActiveResultSets = true; {
MultipleActiveResultSets = true
};
cs = scsb.ConnectionString; cs = scsb.ConnectionString;
} }
var connection = new SqlConnection(cs); var connection = new SqlConnection(cs);
......
Dapper.DNX.Tests/Tests.cs
View file @ 23547c9d
//#define POSTGRESQL // uncomment to run postgres tests //#define POSTGRESQL // uncomment to run postgres tests
#if DNXCORE50 #if DNXCORE50
using IDbCommand = global::System.Data.Common.DbCommand; using IDbCommand = System.Data.Common.DbCommand;
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbDataParameter = System.Data.Common.DbParameter;
using IDbConnection = global::System.Data.Common.DbConnection; using IDbConnection = System.Data.Common.DbConnection;
using IDbTransaction = global::System.Data.Common.DbTransaction; using IDbTransaction = System.Data.Common.DbTransaction;
using IDataReader = global::System.Data.Common.DbDataReader; using IDataReader = System.Data.Common.DbDataReader;
#endif #endif
using System; using System;
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
using System.Threading; using System.Threading;
using System.Data.SqlTypes; using System.Data.SqlTypes;
using System.Diagnostics; using System.Diagnostics;
#if EXTERNALS #if EXTERNALS
using FirebirdSql.Data.FirebirdClient; using FirebirdSql.Data.FirebirdClient;
using System.Data.Entity.Spatial; using System.Data.Entity.Spatial;
...@@ -78,7 +77,7 @@ public abstract class Order ...@@ -78,7 +77,7 @@ public abstract class Order
protected int Protected { get; set; } protected int Protected { get; set; }
public int Public { get; set; } public int Public { get; set; }
public int ProtectedVal { get { return Protected; } } public int ProtectedVal => Protected;
} }
public class ConcreteOrder : Order public class ConcreteOrder : Order
......
Dapper/CommandDefinition.cs
View file @ 23547c9d
...@@ -5,16 +5,9 @@ ...@@ -5,16 +5,9 @@
using System.Threading; using System.Threading;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbTransaction = System.Data.Common.DbTransaction;
using IDataParameter = global::System.Data.Common.DbParameter; using IDbConnection = System.Data.Common.DbConnection;
using IDbTransaction = global::System.Data.Common.DbTransaction; using IDbCommand = System.Data.Common.DbCommand;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/DbString.cs
View file @ 23547c9d
...@@ -2,16 +2,7 @@ ...@@ -2,16 +2,7 @@
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbCommand = System.Data.Common.DbCommand;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/DynamicParameters.CachedOutputSetters.cs
View file @ 23547c9d
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
#if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif
namespace Dapper namespace Dapper
{ {
partial class DynamicParameters partial class DynamicParameters
......
Dapper/DynamicParameters.ParamInfo.cs
View file @ 23547c9d
using System; using System;
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbDataParameter = System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
{ {
......
Dapper/DynamicParameters.cs
View file @ 23547c9d
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
...@@ -8,16 +7,9 @@ ...@@ -8,16 +7,9 @@
using System.Reflection.Emit; using System.Reflection.Emit;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbDataParameter = System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter; using IDbCommand = System.Data.Common.DbCommand;
using IDbTransaction = global::System.Data.Common.DbTransaction; using ApplicationException = System.InvalidOperationException;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/FeatureSupport.cs
View file @ 23547c9d
using System; using System;
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbConnection = System.Data.Common.DbConnection;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
{ {
......
Dapper/SqlMapper.Async.cs
View file @ 23547c9d
...@@ -10,16 +10,10 @@ ...@@ -10,16 +10,10 @@
using System.Threading.Tasks; using System.Threading.Tasks;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbTransaction = System.Data.Common.DbTransaction;
using IDataParameter = global::System.Data.Common.DbParameter; using IDbConnection = System.Data.Common.DbConnection;
using IDbTransaction = global::System.Data.Common.DbTransaction; using IDbCommand = System.Data.Common.DbCommand;
using IDbConnection = global::System.Data.Common.DbConnection; using IDataReader = System.Data.Common.DbDataReader;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/SqlMapper.CacheInfo.cs
View file @ 23547c9d
...@@ -3,16 +3,8 @@ ...@@ -3,16 +3,8 @@
using System.Threading; using System.Threading;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbCommand = System.Data.Common.DbCommand;
using IDataParameter = global::System.Data.Common.DbParameter; using IDataReader = System.Data.Common.DbDataReader;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/SqlMapper.DeserializerState.cs
View file @ 23547c9d
...@@ -2,16 +2,7 @@ ...@@ -2,16 +2,7 @@
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDataReader = System.Data.Common.DbDataReader;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/SqlMapper.GridReader.cs
View file @ 23547c9d
...@@ -4,16 +4,8 @@ ...@@ -4,16 +4,8 @@
using System.Linq; using System.Linq;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbCommand = System.Data.Common.DbCommand;
using IDataParameter = global::System.Data.Common.DbParameter; using IDataReader = System.Data.Common.DbDataReader;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/SqlMapper.ICustomQueryParameter.cs
View file @ 23547c9d
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbCommand = System.Data.Common.DbCommand;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
{ {
......
Dapper/SqlMapper.IDynamicParameters.cs
View file @ 23547c9d
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbCommand = System.Data.Common.DbCommand;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/SqlMapper.ITypeHandler.cs
View file @ 23547c9d
using System; using System;
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbDataParameter = System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
{ {
......
Dapper/SqlMapper.Identity.cs
View file @ 23547c9d
...@@ -2,16 +2,7 @@ ...@@ -2,16 +2,7 @@
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbConnection = System.Data.Common.DbConnection;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/SqlMapper.TypeHandler.cs
View file @ 23547c9d
...@@ -3,18 +3,11 @@ ...@@ -3,18 +3,11 @@
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbDataParameter = System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
{ {
partial class SqlMapper partial class SqlMapper
......
Dapper/SqlMapper.TypeHandlerCache.cs
View file @ 23547c9d
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbDataParameter = System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
{ {
partial class SqlMapper partial class SqlMapper
......
Dapper/SqlMapper.cs
View file @ 23547c9d
...@@ -4,16 +4,15 @@ ...@@ -4,16 +4,15 @@
*/ */
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbDataParameter = System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter; using IDataParameter = System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction; using IDbTransaction = System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection; using IDbConnection = System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand; using IDbCommand = System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader; using IDataReader = System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader; using IDataRecord = System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection; using IDataParameterCollection = System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException; using DataException = System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
using System; using System;
...@@ -37,8 +36,6 @@ namespace Dapper ...@@ -37,8 +36,6 @@ namespace Dapper
/// </summary> /// </summary>
public static partial class SqlMapper public static partial class SqlMapper
{ {
static int GetColumnHash(IDataReader reader) static int GetColumnHash(IDataReader reader)
{ {
unchecked unchecked
......
Dapper/TypeExtensions.cs
View file @ 23547c9d
using System; using System;
using System.Reflection; using System.Reflection;
using System.Collections.Generic; using System.Collections.Generic;
#if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter;
using IDataParameter = global::System.Data.Common.DbParameter;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif
namespace Dapper namespace Dapper
{ {
internal static class TypeExtensions internal static class TypeExtensions
......
Dapper/WrappedDataReader.cs
View file @ 23547c9d
using System.Data; using System.Data;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbCommand = System.Data.Common.DbCommand;
using IDataParameter = global::System.Data.Common.DbParameter; using IDataReader = System.Data.Common.DbDataReader;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
......
Dapper/WrappedReader.cs
View file @ 23547c9d
using System; using System;
using System.Data; using System.Data;
using System.Collections; using System.Collections;
#if DNXCORE50 #if DNXCORE50
using IDbDataParameter = global::System.Data.Common.DbParameter; using IDbCommand = System.Data.Common.DbCommand;
using IDataParameter = global::System.Data.Common.DbParameter; using IDataReader = System.Data.Common.DbDataReader;
using IDbTransaction = global::System.Data.Common.DbTransaction;
using IDbConnection = global::System.Data.Common.DbConnection;
using IDbCommand = global::System.Data.Common.DbCommand;
using IDataReader = global::System.Data.Common.DbDataReader;
using IDataRecord = global::System.Data.Common.DbDataReader;
using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
using DataException = global::System.InvalidOperationException;
using ApplicationException = global::System.InvalidOperationException;
#endif #endif
namespace Dapper namespace Dapper
...@@ -50,174 +43,86 @@ public override IDbCommand Command ...@@ -50,174 +43,86 @@ public override IDbCommand Command
} }
} }
public override int Depth public override int Depth => Reader.Depth;
{
get { return Reader.Depth; }
}
public override bool IsClosed public override bool IsClosed => reader?.IsClosed ?? true;
{
get { return reader == null ? true : reader.IsClosed; }
}
public override bool HasRows
{
get
{
return Reader.HasRows;
}
}
public override bool NextResult()
{
return Reader.NextResult();
}
public override bool Read() public override bool HasRows => Reader.HasRows;
{
return Reader.Read();
}
public override int RecordsAffected public override bool NextResult() => Reader.NextResult();
{
get { return Reader.RecordsAffected; } public override bool Read() => Reader.Read();
}
public override int RecordsAffected => Reader.RecordsAffected;
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
{ {
if (disposing) if (disposing)
{ {
if (reader != null) reader.Dispose(); reader?.Dispose();
reader = null; reader = null;
if (cmd != null) cmd.Dispose(); cmd?.Dispose();
cmd = null; cmd = null;
} }
base.Dispose(disposing); base.Dispose(disposing);
} }
public override int FieldCount public override int FieldCount => Reader.FieldCount;
{
get { return Reader.FieldCount; }
}
public override bool GetBoolean(int i) public override bool GetBoolean(int i) => Reader.GetBoolean(i);
{
return Reader.GetBoolean(i);
}
public override byte GetByte(int i) public override byte GetByte(int i) => Reader.GetByte(i);
{
return Reader.GetByte(i);
}
public override long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length) public override long GetBytes(int i, long fieldOffset, byte[] buffer, int bufferoffset, int length)
{ {
return Reader.GetBytes(i, fieldOffset, buffer, bufferoffset, length); return Reader.GetBytes(i, fieldOffset, buffer, bufferoffset, length);
} }
public override char GetChar(int i) public override char GetChar(int i) => Reader.GetChar(i);
{
return Reader.GetChar(i);
}
public override long GetChars(int i, long fieldoffset, char[] buffer, int bufferoffset, int length) public override long GetChars(int i, long fieldoffset, char[] buffer, int bufferoffset, int length)
{ {
return Reader.GetChars(i, fieldoffset, buffer, bufferoffset, length); return Reader.GetChars(i, fieldoffset, buffer, bufferoffset, length);
} }
protected override IDataReader GetDbDataReader(int ordinal) protected override IDataReader GetDbDataReader(int ordinal) => Reader.GetData(ordinal);
{
return Reader.GetData(ordinal);
}
public override string GetDataTypeName(int i) public override string GetDataTypeName(int i) => Reader.GetDataTypeName(i);
{
return Reader.GetDataTypeName(i);
}
public override DateTime GetDateTime(int i) public override DateTime GetDateTime(int i) => Reader.GetDateTime(i);
{
return Reader.GetDateTime(i);
}
public override decimal GetDecimal(int i) public override decimal GetDecimal(int i) => Reader.GetDecimal(i);
{
return Reader.GetDecimal(i);
}
public override double GetDouble(int i) public override double GetDouble(int i) => Reader.GetDouble(i);
{
return Reader.GetDouble(i);
}
public override Type GetFieldType(int i) public override Type GetFieldType(int i) => Reader.GetFieldType(i);
{
return Reader.GetFieldType(i);
}
public override float GetFloat(int i) public override float GetFloat(int i) => Reader.GetFloat(i);
{
return Reader.GetFloat(i);
}
public override Guid GetGuid(int i) public override Guid GetGuid(int i) => Reader.GetGuid(i);
{
return Reader.GetGuid(i);
}
public override short GetInt16(int i) public override short GetInt16(int i) => Reader.GetInt16(i);
{
return Reader.GetInt16(i);
}
public override int GetInt32(int i) public override int GetInt32(int i) => Reader.GetInt32(i);
{
return Reader.GetInt32(i);
}
public override long GetInt64(int i) public override long GetInt64(int i) => Reader.GetInt64(i);
{
return Reader.GetInt64(i);
}
public override string GetName(int i) public override string GetName(int i) => Reader.GetName(i);
{
return Reader.GetName(i);
}
public override int GetOrdinal(string name) public override int GetOrdinal(string name) => Reader.GetOrdinal(name);
{
return Reader.GetOrdinal(name);
}
public override string GetString(int i) public override string GetString(int i) => Reader.GetString(i);
{
return Reader.GetString(i);
}
public override object GetValue(int i) public override object GetValue(int i) => Reader.GetValue(i);
{
return Reader.GetValue(i);
}
public override int GetValues(object[] values) public override int GetValues(object[] values) => Reader.GetValues(values);
{
return Reader.GetValues(values);
}
public override bool IsDBNull(int i) public override bool IsDBNull(int i) => Reader.IsDBNull(i);
{
return Reader.IsDBNull(i);
}
public override object this[string name] public override object this[string name] => Reader[name];
{
get { return Reader[name]; }
}
public override object this[int i] public override object this[int i] => Reader[i];
{
get { return Reader[i]; }
}
} }
#else #else
......
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