Cleanup

NickCraver · NickCraver · commit ad48bed2ce2f · 2015-11-27T19:41:48.000-05:00
Remove some unused casts, variables, and warnings
diff --git a/Dapper/DynamicParameters.CachedOutputSetters.cs b/Dapper/DynamicParameters.CachedOutputSetters.cs
@@ -4,8 +4,12 @@ namespace Dapper
 {
     partial class DynamicParameters
     {
+        // The type here is used to differentiate the cache by type via generics
+        // ReSharper disable once UnusedTypeParameter
         internal static class CachedOutputSetters<T>
         {
+            // Intentional, abusing generics to get our cache splits
+            // ReSharper disable once StaticMemberInGenericType
             public static readonly Hashtable Cache = new Hashtable();
         }
     }
diff --git a/Dapper/DynamicParameters.cs b/Dapper/DynamicParameters.cs
@@ -61,7 +61,7 @@ public DynamicParameters(object template)
         /// <param name="param"></param>
         public void AddDynamicParams(object param)
         {
-            var obj = param as object;
+            var obj = param;
             if (obj != null)
             {
                 var subDynamic = obj as DynamicParameters;
@@ -394,7 +394,7 @@ public DynamicParameters Output<T>(T target, Expression<Func<T, object>> express
             var lookup = string.Join("|", names.ToArray());
 
             var cache = CachedOutputSetters<T>.Cache;
-            Action<object, DynamicParameters> setter = (Action<object, DynamicParameters>)cache[lookup];
+            var setter = (Action<object, DynamicParameters>)cache[lookup];
             if (setter != null) goto MAKECALLBACK;
 
             // Come on let's build a method, let's build it, let's build it now!
diff --git a/Dapper/SqlMapper.cs b/Dapper/SqlMapper.cs
@@ -884,7 +884,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TReturn>(
             this IDbConnection cnn, string sql, Func<TFirst, TSecond, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null
         )
         {
-            return MultiMap<TFirst, TSecond, DontMap, DontMap, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);
+            return MultiMap<TFirst, TSecond, DontMap, DontMap, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);
         }
 
         /// <summary>
@@ -908,7 +908,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TReturn>(
             this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null
         )
         {
-            return MultiMap<TFirst, TSecond, TThird, DontMap, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);
+            return MultiMap<TFirst, TSecond, TThird, DontMap, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);
         }
 
         /// <summary>
@@ -933,7 +933,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TRetu
             this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null
         )
         {
-            return MultiMap<TFirst, TSecond, TThird, TFourth, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);
+            return MultiMap<TFirst, TSecond, TThird, TFourth, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);
         }
 
         /// <summary>
@@ -959,7 +959,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TFift
             this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TFifth, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null
 )
         {
-            return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, DontMap, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);
+            return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, DontMap, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);
         }
 
         /// <summary>
@@ -986,7 +986,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TFift
             this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null
 )
         {
-            return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);
+            return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);
         }
 
 
@@ -1013,7 +1013,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TFift
         /// <returns></returns>
         public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null)
         {
-            return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);
+            return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);
         }
 
         /// <summary>
@@ -1066,12 +1066,12 @@ static IEnumerable<TReturn> MultiMapImpl<TFirst, TSecond, TThird, TFourth, TFift
                     reader = ownedReader;
                 }
                 DeserializerState deserializer = default(DeserializerState);
-                Func<IDataReader, object>[] otherDeserializers = null;
+                Func<IDataReader, object>[] otherDeserializers;
 
                 int hash = GetColumnHash(reader);
                 if ((deserializer = cinfo.Deserializer).Func == null || (otherDeserializers = cinfo.OtherDeserializers) == null || hash != deserializer.Hash)
                 {
-                    var deserializers = GenerateDeserializers(new Type[] { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh) }, splitOn, reader);
+                    var deserializers = GenerateDeserializers(new [] { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh) }, splitOn, reader);
                     deserializer = cinfo.Deserializer = new DeserializerState(hash, deserializers[0]);
                     otherDeserializers = cinfo.OtherDeserializers = deserializers.Skip(1).ToArray();
                     if(command.AddToCache) SetQueryCache(identity, cinfo);
@@ -1133,7 +1133,7 @@ static IEnumerable<TReturn> MultiMapImpl<TReturn>(this IDbConnection cnn, Comman
                     ownedReader = ownedCommand.ExecuteReader(GetBehavior(wasClosed, CommandBehavior.SequentialAccess | CommandBehavior.SingleResult));
                     reader = ownedReader;
                 }
-                DeserializerState deserializer = default(DeserializerState);
+                DeserializerState deserializer;
                 Func<IDataReader, object>[] otherDeserializers;
 
                 int hash = GetColumnHash(reader);
@@ -1350,7 +1350,6 @@ private static CacheInfo GetCacheInfo(Identity identity, object exampleParameter
                     if((identity.commandType == null || identity.commandType == CommandType.Text) && ShouldPassByPosition(identity.sql))
                     {
                         var tail = reader;
-                        var sql = identity.sql;
                         reader = (cmd, obj) =>
                         {
                             tail(cmd, obj);

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,12 @@ namespace Dapper`
`4`	`4`	`{`
`5`	`5`	`partial class DynamicParameters`
`6`	`6`	`{`
	`7`	`+ // The type here is used to differentiate the cache by type via generics`
	`8`	`+ // ReSharper disable once UnusedTypeParameter`
`7`	`9`	`internal static class CachedOutputSetters<T>`
`8`	`10`	`{`
	`11`	`+ // Intentional, abusing generics to get our cache splits`
	`12`	`+ // ReSharper disable once StaticMemberInGenericType`
`9`	`13`	`public static readonly Hashtable Cache = new Hashtable();`
`10`	`14`	`}`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -884,7 +884,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TReturn>(`
`884`	`884`	`this IDbConnection cnn, string sql, Func<TFirst, TSecond, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null`
`885`	`885`	`)`
`886`	`886`	`{`
`887`		`- return MultiMap<TFirst, TSecond, DontMap, DontMap, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);`
	`887`	`+ return MultiMap<TFirst, TSecond, DontMap, DontMap, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);`
`888`	`888`	`}`
`889`	`889`
`890`	`890`	`/// <summary>`
`@@ -908,7 +908,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TReturn>(`
`908`	`908`	`this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null`
`909`	`909`	`)`
`910`	`910`	`{`
`911`		`- return MultiMap<TFirst, TSecond, TThird, DontMap, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);`
	`911`	`+ return MultiMap<TFirst, TSecond, TThird, DontMap, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);`
`912`	`912`	`}`
`913`	`913`
`914`	`914`	`/// <summary>`
`@@ -933,7 +933,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TRetu`
`933`	`933`	`this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null`
`934`	`934`	`)`
`935`	`935`	`{`
`936`		`- return MultiMap<TFirst, TSecond, TThird, TFourth, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);`
	`936`	`+ return MultiMap<TFirst, TSecond, TThird, TFourth, DontMap, DontMap, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);`
`937`	`937`	`}`
`938`	`938`
`939`	`939`	`/// <summary>`
`@@ -959,7 +959,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TFift`
`959`	`959`	`this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TFifth, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null`
`960`	`960`	`)`
`961`	`961`	`{`
`962`		`- return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, DontMap, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);`
	`962`	`+ return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, DontMap, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);`
`963`	`963`	`}`
`964`	`964`
`965`	`965`	`/// <summary>`
`@@ -986,7 +986,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TFift`
`986`	`986`	`this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null`
`987`	`987`	`)`
`988`	`988`	`{`
`989`		`- return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, DontMap, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);`
	`989`	`+ return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, DontMap, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);`
`990`	`990`	`}`
`991`	`991`
`992`	`992`
`@@ -1013,7 +1013,7 @@ public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TFift`
`1013`	`1013`	`/// <returns></returns>`
`1014`	`1014`	`public static IEnumerable<TReturn> Query<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(this IDbConnection cnn, string sql, Func<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null)`
`1015`	`1015`	`{`
`1016`		`- return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(cnn, sql, map, param as object, transaction, buffered, splitOn, commandTimeout, commandType);`
	`1016`	`+ return MultiMap<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(cnn, sql, map, param, transaction, buffered, splitOn, commandTimeout, commandType);`
`1017`	`1017`	`}`
`1018`	`1018`
`1019`	`1019`	`/// <summary>`
`@@ -1066,12 +1066,12 @@ static IEnumerable<TReturn> MultiMapImpl<TFirst, TSecond, TThird, TFourth, TFift`
`1066`	`1066`	`reader = ownedReader;`
`1067`	`1067`	`}`
`1068`	`1068`	`DeserializerState deserializer = default(DeserializerState);`
`1069`		`- Func<IDataReader, object>[] otherDeserializers = null;`
	`1069`	`+ Func<IDataReader, object>[] otherDeserializers;`
`1070`	`1070`
`1071`	`1071`	`int hash = GetColumnHash(reader);`
`1072`	`1072`	`if ((deserializer = cinfo.Deserializer).Func == null \|\| (otherDeserializers = cinfo.OtherDeserializers) == null \|\| hash != deserializer.Hash)`
`1073`	`1073`	`{`
`1074`		`- var deserializers = GenerateDeserializers(new Type[] { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh) }, splitOn, reader);`
	`1074`	`+ var deserializers = GenerateDeserializers(new [] { typeof(TFirst), typeof(TSecond), typeof(TThird), typeof(TFourth), typeof(TFifth), typeof(TSixth), typeof(TSeventh) }, splitOn, reader);`
`1075`	`1075`	`deserializer = cinfo.Deserializer = new DeserializerState(hash, deserializers[0]);`
`1076`	`1076`	`otherDeserializers = cinfo.OtherDeserializers = deserializers.Skip(1).ToArray();`
`1077`	`1077`	`if(command.AddToCache) SetQueryCache(identity, cinfo);`
`@@ -1133,7 +1133,7 @@ static IEnumerable<TReturn> MultiMapImpl<TReturn>(this IDbConnection cnn, Comman`
`1133`	`1133`	`ownedReader = ownedCommand.ExecuteReader(GetBehavior(wasClosed, CommandBehavior.SequentialAccess \| CommandBehavior.SingleResult));`
`1134`	`1134`	`reader = ownedReader;`
`1135`	`1135`	`}`
`1136`		`- DeserializerState deserializer = default(DeserializerState);`
	`1136`	`+ DeserializerState deserializer;`
`1137`	`1137`	`Func<IDataReader, object>[] otherDeserializers;`
`1138`	`1138`
`1139`	`1139`	`int hash = GetColumnHash(reader);`
`@@ -1350,7 +1350,6 @@ private static CacheInfo GetCacheInfo(Identity identity, object exampleParameter`
`1350`	`1350`	`if((identity.commandType == null \|\| identity.commandType == CommandType.Text) && ShouldPassByPosition(identity.sql))`
`1351`	`1351`	`{`
`1352`	`1352`	`var tail = reader;`
`1353`		`- var sql = identity.sql;`
`1354`	`1353`	`reader = (cmd, obj) =>`
`1355`	`1354`	`{`
`1356`	`1355`	`tail(cmd, obj);`