Skip to content

Commit 2ae3316

Browse files
ejballejball
committed
Code style tweaks.
1 parent bd9ea72 commit 2ae3316

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎src/MySqlConnector/Core/ConnectionSettings.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ public ConnectionSettings(MySqlConnectionStringBuilder csb)
4343
ConnectionLifeTime = Math.Min(csb.ConnectionLifeTime, uint.MaxValue / 1000) * 1000;
4444
ConnectionReset = csb.ConnectionReset;
4545
ConnectionIdlePingTime = Math.Min(csb.ConnectionIdlePingTime, uint.MaxValue / 1000) * 1000;
46-
ConnectionIdleTimeout = (int)csb.ConnectionIdleTimeout;
46+
ConnectionIdleTimeout = (int) csb.ConnectionIdleTimeout;
4747
if (csb.MinimumPoolSize > csb.MaximumPoolSize)
4848
throw new MySqlException("MaximumPoolSize must be greater than or equal to MinimumPoolSize");
49-
MinimumPoolSize = (int)csb.MinimumPoolSize;
50-
MaximumPoolSize = (int)csb.MaximumPoolSize;
49+
MinimumPoolSize = (int) csb.MinimumPoolSize;
50+
MaximumPoolSize = (int) csb.MaximumPoolSize;
5151

5252
// Other Options
5353
AllowPublicKeyRetrieval = csb.AllowPublicKeyRetrieval;
5454
AllowUserVariables = csb.AllowUserVariables;
5555
AutoEnlist = csb.AutoEnlist;
56-
ConnectionTimeout = (int)csb.ConnectionTimeout;
56+
ConnectionTimeout = (int) csb.ConnectionTimeout;
5757
ConvertZeroDateTime = csb.ConvertZeroDateTime;
5858
DefaultCommandTimeout = (int) csb.DefaultCommandTimeout;
5959
ForceSynchronous = csb.ForceSynchronous;

‎tests/SideBySide/DataTypes.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ public void QueryBoolean(string column, string dataTypeName, object[] expected)
212212
}
213213

214214
[Theory]
215-
[InlineData("TinyInt1", "TINYINT", new object[] { null, (sbyte)0, (sbyte)1, (sbyte)0, (sbyte)1, (sbyte)-1, (sbyte)123 })]
216-
[InlineData("Boolean", "TINYINT", new object[] { null, (sbyte)0, (sbyte)1, (sbyte)0, (sbyte)1, (sbyte)-1, (sbyte)123 })]
215+
[InlineData("TinyInt1", "TINYINT", new object[] { null, (sbyte) 0, (sbyte) 1, (sbyte) 0, (sbyte) 1, (sbyte) -1, (sbyte) 123 })]
216+
[InlineData("Boolean", "TINYINT", new object[] { null, (sbyte) 0, (sbyte) 1, (sbyte) 0, (sbyte) 1, (sbyte) -1, (sbyte) 123 })]
217217
public void QueryTinyIntSbyte(string column, string dataTypeName, object[] expected)
218218
{
219219
var csb = AppConfig.CreateConnectionStringBuilder();
@@ -288,9 +288,9 @@ public void QueryUInt64(string column, string dataTypeName, object[] expected)
288288
}
289289

290290
[Theory]
291-
[InlineData("Bit1", new object[] { null, 0UL, 1UL, 1UL })]
292-
[InlineData("Bit32", new object[] { null, 0UL, 1UL, (ulong) uint.MaxValue })]
293-
[InlineData("Bit64", new object[] { null, 0UL, 1UL, ulong.MaxValue })]
291+
[InlineData("Bit1", new object[] { null, 0UL, 1UL, 1UL })]
292+
[InlineData("Bit32", new object[] { null, 0UL, 1UL, (ulong) uint.MaxValue })]
293+
[InlineData("Bit64", new object[] { null, 0UL, 1UL, ulong.MaxValue })]
294294
public void QueryBits(string column, object[] expected)
295295
{
296296
DoQuery("bits", column, "BIT", expected, reader => reader.GetUInt64(column));
@@ -348,7 +348,7 @@ public void QueryGuid(string column, string dataTypeName, object[] expected)
348348
}
349349

350350
[Theory]
351-
[InlineData("utf8", new[] {null, "", "ASCII", "Ũńıċōđĕ", c_251ByteString})]
351+
[InlineData("utf8", new[] { null, "", "ASCII", "Ũńıċōđĕ", c_251ByteString })]
352352
[InlineData("cp1251", new[] { null, "", "ASCII", "АБВГабвг", c_251ByteString })]
353353
public void QueryChar(string column, string[] expected)
354354
{
@@ -443,7 +443,7 @@ public async Task QueryWithGuidParameter(bool oldGuids)
443443
using (var connection = new MySqlConnection(csb.ConnectionString))
444444
{
445445
await connection.OpenAsync().ConfigureAwait(false);
446-
Assert.Equal(oldGuids? 0L : 1L, (await connection.QueryAsync<long>(@"select count(*) from datatypes_strings where guid = @guid", new { guid = new Guid("fd24a0e8-c3f2-4821-a456-35da2dc4bb8f") }).ConfigureAwait(false)).SingleOrDefault());
446+
Assert.Equal(oldGuids ? 0L : 1L, (await connection.QueryAsync<long>(@"select count(*) from datatypes_strings where guid = @guid", new { guid = new Guid("fd24a0e8-c3f2-4821-a456-35da2dc4bb8f") }).ConfigureAwait(false)).SingleOrDefault());
447447
Assert.Equal(oldGuids ? 0L : 1L, (await connection.QueryAsync<long>(@"select count(*) from datatypes_strings where guidbin = @guid", new { guid = new Guid("fd24a0e8-c3f2-4821-a456-35da2dc4bb8f") }).ConfigureAwait(false)).SingleOrDefault());
448448
Assert.Equal(oldGuids ? 1L : 0L, (await connection.QueryAsync<long>(@"select count(*) from datatypes_blobs where guidbin = @guid", new { guid = new Guid(0x33221100, 0x5544, 0x7766, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF) }).ConfigureAwait(false)).SingleOrDefault());
449449
}
@@ -927,7 +927,7 @@ private static byte[] CreateByteArray(int size)
927927
}
928928

929929
[SkippableTheory(ServerFeatures.Json)]
930-
[InlineData(new object[] { new[] { null, "NULL", "BOOLEAN", "ARRAY", "ARRAY", "ARRAY", "INTEGER", "INTEGER", "OBJECT", "OBJECT" }})]
930+
[InlineData(new object[] { new[] { null, "NULL", "BOOLEAN", "ARRAY", "ARRAY", "ARRAY", "INTEGER", "INTEGER", "OBJECT", "OBJECT" } })]
931931
public void JsonType(string[] expectedTypes)
932932
{
933933
var types = m_database.Connection.Query<string>(@"select JSON_TYPE(value) from datatypes_json_core order by rowid;").ToList();
@@ -963,7 +963,7 @@ private void DoQuery(
963963
object baselineCoercedNullValue = null,
964964
bool omitWhereTest = false,
965965
bool matchesDefaultType = true,
966-
MySqlConnection connection=null)
966+
MySqlConnection connection = null)
967967
{
968968
DoQuery<GetValueWhenNullException>(table, column, dataTypeName, expected, getValue, baselineCoercedNullValue, omitWhereTest, matchesDefaultType, connection);
969969
}
@@ -979,7 +979,7 @@ private void DoQuery<TException>(
979979
object baselineCoercedNullValue = null,
980980
bool omitWhereTest = false,
981981
bool matchesDefaultType = true,
982-
MySqlConnection connection=null)
982+
MySqlConnection connection = null)
983983
where TException : Exception
984984
{
985985
connection = connection ?? m_database.Connection;
@@ -1020,19 +1020,19 @@ private void DoQuery<TException>(
10201020
var syncMethod = typeof(MySqlDataReader)
10211021
.GetMethod("GetFieldValue")
10221022
.MakeGenericMethod(value.GetType());
1023-
Assert.Equal(value, syncMethod.Invoke(reader, new object[]{ 0 }));
1023+
Assert.Equal(value, syncMethod.Invoke(reader, new object[] { 0 }));
10241024

10251025
// test `reader.GetFieldValueAsync<value.GetType()>`
10261026
var asyncMethod = typeof(MySqlDataReader)
1027-
.GetMethod("GetFieldValueAsync", new []{ typeof(int) })
1027+
.GetMethod("GetFieldValueAsync", new[] { typeof(int) })
10281028
.MakeGenericMethod(value.GetType());
1029-
var asyncMethodValue = asyncMethod.Invoke(reader, new object[]{ 0 });
1029+
var asyncMethodValue = asyncMethod.Invoke(reader, new object[] { 0 });
10301030
var asyncMethodGetAwaiter = asyncMethodValue.GetType()
10311031
.GetMethod("GetAwaiter");
1032-
var asyncMethodGetAwaiterValue = asyncMethodGetAwaiter.Invoke(asyncMethodValue, new object[]{ });
1032+
var asyncMethodGetAwaiterValue = asyncMethodGetAwaiter.Invoke(asyncMethodValue, new object[] { });
10331033
var asyncMethodGetResult = asyncMethodGetAwaiterValue.GetType()
10341034
.GetMethod("GetResult");
1035-
var asyncMethodGetResultValue = asyncMethodGetResult.Invoke(asyncMethodGetAwaiterValue, new object[]{ });
1035+
var asyncMethodGetResultValue = asyncMethodGetResult.Invoke(asyncMethodGetAwaiterValue, new object[] { });
10361036
Assert.Equal(value, asyncMethodGetResultValue);
10371037
}
10381038
}

0 commit comments

Comments
 (0)