Skip to content

Commit

Permalink
Core: peripheral cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
NickCraver committed Nov 25, 2015
1 parent ad0a262 commit 114bc10
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 34 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -12,4 +12,5 @@ NuGet.exe
*.ide/
*.lock.json
*.coverage
Test.DB.*
Test.DB.*
TestResults/
3 changes: 2 additions & 1 deletion Dapper.sln.DotSettings
@@ -1,4 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CE/@EntryIndexedValue">CE</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQ/@EntryIndexedValue">SQ</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TVP/@EntryIndexedValue">TVP</s:String></wpf:ResourceDictionary>
2 changes: 0 additions & 2 deletions Dapper/CustomPropertyTypeMap.cs
Expand Up @@ -71,6 +71,4 @@ public SqlMapper.IMemberMap GetMember(string columnName)
return prop != null ? new SimpleMemberMap(columnName, prop) : null;
}
}


}
1 change: 0 additions & 1 deletion Dapper/DbString.cs
Expand Up @@ -74,5 +74,4 @@ public void AddParameter(IDbCommand command, string name)
command.Parameters.Add(param);
}
}

}
4 changes: 1 addition & 3 deletions Dapper/DynamicParameters.CachedOutputSetters.cs
@@ -1,6 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections;

namespace Dapper
{
Expand Down
1 change: 0 additions & 1 deletion Dapper/DynamicParameters.ParamInfo.cs
Expand Up @@ -23,6 +23,5 @@ sealed class ParamInfo
public byte? Precision { get; set; }
public byte? Scale { get; set; }
}

}
}
20 changes: 4 additions & 16 deletions Dapper/DynamicParameters.cs
Expand Up @@ -108,7 +108,7 @@ public void AddDynamicParams(object param)
/// </summary>
public void Add(string name, object value, DbType? dbType, ParameterDirection? direction, int? size)
{
parameters[Clean(name)] = new ParamInfo()
parameters[Clean(name)] = new ParamInfo
{
Name = name,
Value = value,
Expand All @@ -125,7 +125,7 @@ public void Add(string name, object value, DbType? dbType, ParameterDirection? d
string name, object value = null, DbType? dbType = null, ParameterDirection? direction = null, int? size = null, byte? precision = null, byte? scale = null
)
{
parameters[Clean(name)] = new ParamInfo()
parameters[Clean(name)] = new ParamInfo
{
Name = name,
Value = value,
Expand Down Expand Up @@ -300,13 +300,7 @@ protected void AddParameters(IDbCommand command, SqlMapper.Identity identity)
/// <summary>
/// All the names of the param in the bag, use Get to yank them out
/// </summary>
public IEnumerable<string> ParameterNames
{
get
{
return parameters.Select(p => p.Key);
}
}
public IEnumerable<string> ParameterNames => parameters.Select(p => p.Key);


/// <summary>
Expand Down Expand Up @@ -490,11 +484,7 @@ public DynamicParameters Output<T>(T target, Expression<Func<T, object>> express
}

private List<Action> outputCallbacks;

private readonly Dictionary<string, Action<object, DynamicParameters>> cachedOutputSetters = new Dictionary<string, Action<object, DynamicParameters>>();




void SqlMapper.IParameterCallbacks.OnCompleted()
{
foreach (var param in (from p in parameters select p.Value))
Expand All @@ -503,6 +493,4 @@ void SqlMapper.IParameterCallbacks.OnCompleted()
}
}
}


}
1 change: 0 additions & 1 deletion Dapper/ExplicitConstructorAttribute.cs
Expand Up @@ -8,6 +8,5 @@ namespace Dapper
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false)]
public sealed class ExplicitConstructorAttribute : Attribute
{

}
}
9 changes: 4 additions & 5 deletions Dapper/FeatureSupport.cs
Expand Up @@ -12,17 +12,17 @@ namespace Dapper
class FeatureSupport
{
private static readonly FeatureSupport
@default = new FeatureSupport(false),
postgres = new FeatureSupport(true);
Default = new FeatureSupport(false),
Postgres = new FeatureSupport(true);

/// <summary>
/// Gets the feature set based on the passed connection
/// </summary>
public static FeatureSupport Get(IDbConnection connection)
{
string name = connection?.GetType().Name;
if (string.Equals(name, "npgsqlconnection", StringComparison.OrdinalIgnoreCase)) return postgres;
return @default;
if (string.Equals(name, "npgsqlconnection", StringComparison.OrdinalIgnoreCase)) return Postgres;
return Default;
}
private FeatureSupport(bool arrays)
{
Expand All @@ -33,5 +33,4 @@ private FeatureSupport(bool arrays)
/// </summary>
public bool Arrays { get; }
}

}
1 change: 0 additions & 1 deletion Dapper/SimpleMemberMap.cs
Expand Up @@ -84,5 +84,4 @@ public SimpleMemberMap(string columnName, ParameterInfo parameter)
/// </summary>
public ParameterInfo Parameter { get; }
}

}
2 changes: 0 additions & 2 deletions Dapper/SqlDataRecordListTVPParameter.cs
Expand Up @@ -5,7 +5,6 @@
#if !COREFX
namespace Dapper
{

/// <summary>
/// Used to pass a IEnumerable&lt;SqlDataRecord&gt; as a SqlDataRecordListTVPParameter
/// </summary>
Expand Down Expand Up @@ -49,6 +48,5 @@ internal static void Set(IDbDataParameter parameter, IEnumerable<Microsoft.SqlSe
}
}
}

}
#endif

0 comments on commit 114bc10

Please sign in to comment.