Replace empty array with Array.Empty<T>, add compound assignment, fix of grammar typo (#1459)

DamirAinullin · web-flow · commit 4fb1ea29d490 · 2020-05-10T06:52:06.000-04:00
Misc cleanup
diff --git a/Dapper.Rainbow/Database.cs b/Dapper.Rainbow/Database.cs
@@ -199,7 +199,7 @@ internal void InitDatabase(DbConnection connection, int commandTimeout)
         {
             _connection = connection;
             _commandTimeout = commandTimeout;
-            tableConstructor = tableConstructor ?? CreateTableConstructorForTable();
+            tableConstructor ??= CreateTableConstructorForTable();
 
             tableConstructor(this as TDatabase);
         }
@@ -320,7 +320,7 @@ private bool TableExists(string name)
             name = name.Replace("[", "");
             name = name.Replace("]", "");
 
-            if (name.Contains("."))
+            if (name.IndexOf('.') > 0)
             {
                 var parts = name.Split('.');
                 if (parts.Length == 2)
diff --git a/Dapper.Tests/ParameterTests.cs b/Dapper.Tests/ParameterTests.cs
@@ -197,8 +197,8 @@ public void PassInIntArray()
         public void PassInEmptyIntArray()
         {
             Assert.Equal(
-                new int[0],
-                connection.Query<int>("select * from (select 1 as Id union all select 2 union all select 3) as X where Id in @Ids", new { Ids = new int[0] })
+                Array.Empty<int>(),
+                connection.Query<int>("select * from (select 1 as Id union all select 2 union all select 3) as X where Id in @Ids", new { Ids = Array.Empty<int>() })
             );
         }
 
diff --git a/Dapper/CustomPropertyTypeMap.cs b/Dapper/CustomPropertyTypeMap.cs
@@ -29,7 +29,7 @@ public CustomPropertyTypeMap(Type type, Func<Type, string, PropertyInfo> propert
         /// <param name="types">DataReader column types</param>
         /// <returns>Default constructor</returns>
         public ConstructorInfo FindConstructor(string[] names, Type[] types) =>
-            _type.GetConstructor(new Type[0]);
+            _type.GetConstructor(Array.Empty<Type>());
 
         /// <summary>
         /// Always returns null
diff --git a/Dapper/DynamicParameters.cs b/Dapper/DynamicParameters.cs
@@ -55,7 +55,7 @@ public void AddDynamicParams(object param)
                     var dictionary = obj as IEnumerable<KeyValuePair<string, object>>;
                     if (dictionary == null)
                     {
-                        templates = templates ?? new List<object>();
+                        templates ??= new List<object>();
                         templates.Add(obj);
                     }
                     else
@@ -78,7 +78,7 @@ public void AddDynamicParams(object param)
 
                     if (subDynamic.templates != null)
                     {
-                        templates = templates ?? new List<object>();
+                        templates ??= new List<object>();
                         foreach (var t in subDynamic.templates)
                         {
                             templates.Add(t);
@@ -450,7 +450,7 @@ public DynamicParameters Output<T>(T target, Expression<Func<T, object>> express
 
         // Queue the preparation to be fired off when adding parameters to the DbCommand
         MAKECALLBACK:
-            (outputCallbacks ?? (outputCallbacks = new List<Action>())).Add(() =>
+            (outputCallbacks ??= new List<Action>()).Add(() =>
             {
                 // Finally, prep the parameter and attach the callback to it
                 var targetMemberType = lastMemberAccess?.Type;
diff --git a/Dapper/SqlMapper.cs b/Dapper/SqlMapper.cs
@@ -1132,7 +1132,7 @@ internal enum Row
             SingleOrDefault = 3
         }
 
-        private static readonly int[] ErrTwoRows = new int[2], ErrZeroRows = new int[0];
+        private static readonly int[] ErrTwoRows = new int[2], ErrZeroRows = Array.Empty<int>();
         private static void ThrowMultipleRows(Row row)
         {
             switch (row)
@@ -1214,7 +1214,7 @@ private static T QueryRowImpl<T>(IDbConnection cnn, Row row, ref CommandDefiniti
         }
 
         /// <summary>
-        /// Shared value deserilization path for QueryRowImpl and QueryRowAsync
+        /// Shared value deserialization path for QueryRowImpl and QueryRowAsync
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static T ReadRow<T>(CacheInfo info, Identity identity, ref CommandDefinition command, Type effectiveType, IDataReader reader)
@@ -1429,7 +1429,7 @@ private static IEnumerable<TReturn> MultiMap<TFirst, TSecond, TThird, TFourth, T
         private static IEnumerable<TReturn> MultiMapImpl<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh, TReturn>(this IDbConnection cnn, CommandDefinition command, Delegate map, string splitOn, IDataReader reader, Identity identity, bool finalize)
         {
             object param = command.Parameters;
-            identity = identity ?? new Identity<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh>(command.CommandText, command.CommandType, cnn, typeof(TFirst), param?.GetType());
+            identity ??= new Identity<TFirst, TSecond, TThird, TFourth, TFifth, TSixth, TSeventh>(command.CommandText, command.CommandType, cnn, typeof(TFirst), param?.GetType());
             CacheInfo cinfo = GetCacheInfo(identity, param, command.AddToCache);
 
             IDbCommand ownedCommand = null;
@@ -1499,7 +1499,7 @@ private static IEnumerable<TReturn> MultiMapImpl<TReturn>(this IDbConnection cnn
             }
 
             object param = command.Parameters;
-            identity = identity ?? new IdentityWithTypes(command.CommandText, command.CommandType, cnn, types[0], param?.GetType(), types);
+            identity ??= new IdentityWithTypes(command.CommandText, command.CommandType, cnn, types[0], param?.GetType(), types);
             CacheInfo cinfo = GetCacheInfo(identity, param, command.AddToCache);
 
             IDbCommand ownedCommand = null;
@@ -2386,8 +2386,8 @@ internal static IList<LiteralToken> GetLiteralTokens(string sql)
         public static Action<IDbCommand, object> CreateParamInfoGenerator(Identity identity, bool checkForDuplicates, bool removeUnused) =>
             CreateParamInfoGenerator(identity, checkForDuplicates, removeUnused, GetLiteralTokens(identity.sql));
 
-        private static bool IsValueTuple(Type type) => (type?.IsValueType == true 
-                                                       && type.FullName.StartsWith("System.ValueTuple`", StringComparison.Ordinal)) 
+        private static bool IsValueTuple(Type type) => (type?.IsValueType == true
+                                                       && type.FullName.StartsWith("System.ValueTuple`", StringComparison.Ordinal))
                                                        || (type != null && IsValueTuple(Nullable.GetUnderlyingType(type)));
 
         internal static Action<IDbCommand, object> CreateParamInfoGenerator(Identity identity, bool checkForDuplicates, bool removeUnused, IList<LiteralToken> literals)
@@ -2410,7 +2410,7 @@ internal static Action<IDbCommand, object> CreateParamInfoGenerator(Identity ide
 
             bool isStruct = type.IsValueType;
             var _sizeLocal = (LocalBuilder)null;
-            LocalBuilder GetSizeLocal() => _sizeLocal ?? (_sizeLocal = il.DeclareLocal(typeof(int)));
+            LocalBuilder GetSizeLocal() => _sizeLocal ??= il.DeclareLocal(typeof(int));
             il.Emit(OpCodes.Ldarg_1); // stack is now [untyped-param]
 
             LocalBuilder typedParameterLocal;
@@ -3055,7 +3055,7 @@ public static Func<IDataReader, object> GetTypeDeserializer(
         private static LocalBuilder GetTempLocal(ILGenerator il, ref Dictionary<Type, LocalBuilder> locals, Type type, bool initAndLoad)
         {
             if (type == null) throw new ArgumentNullException(nameof(type));
-            locals = locals ?? new Dictionary<Type, LocalBuilder>();
+            locals ??= new Dictionary<Type, LocalBuilder>();
             if (!locals.TryGetValue(type, out LocalBuilder found))
             {
                 found = il.DeclareLocal(type);
@@ -3193,7 +3193,7 @@ private static void GenerateValueTupleDeserializer(Type valueTupleType, IDataRea
             if (nullableUnderlyingType != null)
             {
                 var nullableTupleConstructor = valueTupleType.GetConstructor(new[] { nullableUnderlyingType });
-                
+
                 il.Emit(OpCodes.Newobj, nullableTupleConstructor);
             }
 
@@ -3777,7 +3777,7 @@ private static string __ToStringRecycle(this StringBuilder obj)
         {
             if (obj == null) return "";
             var s = obj.ToString();
-            perThreadStringBuilderCache = perThreadStringBuilderCache ?? obj;
+            perThreadStringBuilderCache ??= obj;
             return s;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ internal void InitDatabase(DbConnection connection, int commandTimeout)`
`199`	`199`	`{`
`200`	`200`	`_connection = connection;`
`201`	`201`	`_commandTimeout = commandTimeout;`
`202`		`- tableConstructor = tableConstructor ?? CreateTableConstructorForTable();`
	`202`	`+ tableConstructor ??= CreateTableConstructorForTable();`
`203`	`203`
`204`	`204`	`tableConstructor(this as TDatabase);`
`205`	`205`	`}`
`@@ -320,7 +320,7 @@ private bool TableExists(string name)`
`320`	`320`	`name = name.Replace("[", "");`
`321`	`321`	`name = name.Replace("]", "");`
`322`	`322`
`323`		`- if (name.Contains("."))`
	`323`	`+ if (name.IndexOf('.') > 0)`
`324`	`324`	`{`
`325`	`325`	`var parts = name.Split('.');`
`326`	`326`	`if (parts.Length == 2)`
Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,8 @@ public void PassInIntArray()`
`197`	`197`	`public void PassInEmptyIntArray()`
`198`	`198`	`{`
`199`	`199`	`Assert.Equal(`
`200`		`- new int[0],`
`201`		`- connection.Query<int>("select * from (select 1 as Id union all select 2 union all select 3) as X where Id in @Ids", new { Ids = new int[0] })`
	`200`	`+ Array.Empty<int>(),`
	`201`	`+ connection.Query<int>("select * from (select 1 as Id union all select 2 union all select 3) as X where Id in @Ids", new { Ids = Array.Empty<int>() })`
`202`	`202`	`);`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void AddDynamicParams(object param)`
`55`	`55`	`var dictionary = obj as IEnumerable<KeyValuePair<string, object>>;`
`56`	`56`	`if (dictionary == null)`
`57`	`57`	`{`
`58`		`- templates = templates ?? new List<object>();`
	`58`	`+ templates ??= new List<object>();`
`59`	`59`	`templates.Add(obj);`
`60`	`60`	`}`
`61`	`61`	`else`
`@@ -78,7 +78,7 @@ public void AddDynamicParams(object param)`
`78`	`78`
`79`	`79`	`if (subDynamic.templates != null)`
`80`	`80`	`{`
`81`		`- templates = templates ?? new List<object>();`
	`81`	`+ templates ??= new List<object>();`
`82`	`82`	`foreach (var t in subDynamic.templates)`
`83`	`83`	`{`
`84`	`84`	`templates.Add(t);`
`@@ -450,7 +450,7 @@ public DynamicParameters Output<T>(T target, Expression<Func<T, object>> express`
`450`	`450`
`451`	`451`	`// Queue the preparation to be fired off when adding parameters to the DbCommand`
`452`	`452`	`MAKECALLBACK:`
`453`		`- (outputCallbacks ?? (outputCallbacks = new List<Action>())).Add(() =>`
	`453`	`+ (outputCallbacks ??= new List<Action>()).Add(() =>`
`454`	`454`	`{`
`455`	`455`	`// Finally, prep the parameter and attach the callback to it`
`456`	`456`	`var targetMemberType = lastMemberAccess?.Type;`