Skip to content

Commit 883909d

Browse files
committed
Rename Boolean property to begin with 'Is'.
1 parent 89e620d commit 883909d

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/MySqlConnector/Core/CachedProcedure.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal sealed class CachedProcedure
1111
public static async Task<CachedProcedure?> FillAsync(IOBehavior ioBehavior, MySqlConnection connection, string schema, string component, CancellationToken cancellationToken)
1212
{
1313
// try to use mysql.proc first, as it is much faster
14-
if (!connection.Session.ServerVersion.MariaDb
14+
if (!connection.Session.ServerVersion.IsMariaDb
1515
&& connection.Session.ServerVersion.Version < ServerVersions.RemovesMySqlProcTable
1616
&& !connection.Session.ProcAccessDenied)
1717
{

src/MySqlConnector/Core/ServerSession.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,8 @@ public async Task<bool> TryResetConnectionAsync(ConnectionSettings cs, MySqlConn
614614

615615
PayloadData payload;
616616
if (DatabaseOverride is null
617-
&& ((!ServerVersion.MariaDb && ServerVersion.Version.CompareTo(ServerVersions.SupportsResetConnection) >= 0)
618-
|| (ServerVersion.MariaDb && ServerVersion.Version.CompareTo(ServerVersions.MariaDbSupportsResetConnection) >= 0)))
617+
&& ((!ServerVersion.IsMariaDb && ServerVersion.Version.CompareTo(ServerVersions.SupportsResetConnection) >= 0)
618+
|| (ServerVersion.IsMariaDb && ServerVersion.Version.CompareTo(ServerVersions.MariaDbSupportsResetConnection) >= 0)))
619619
{
620620
m_logArguments[1] = ServerVersion.OriginalString;
621621

src/MySqlConnector/Core/ServerVersion.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ public ServerVersion(ReadOnlySpan<byte> versionString)
1313
{
1414
// for MariaDB < 11.0.1
1515
versionString = versionString[6..];
16-
MariaDb = true;
16+
IsMariaDb = true;
1717
}
1818
else if (versionString.IndexOf("MariaDB"u8) != -1)
1919
{
20-
MariaDb = true;
20+
IsMariaDb = true;
2121
}
2222

2323
var minor = 0;
2424
var build = 0;
2525
if (Utf8Parser.TryParse(versionString, out int major, out var bytesConsumed))
2626
{
2727
versionString = versionString[bytesConsumed..];
28-
if (versionString is [ 0x2E, ..])
28+
if (versionString is [ 0x2E, .. ])
2929
{
3030
versionString = versionString[1..];
3131
if (Utf8Parser.TryParse(versionString, out minor, out bytesConsumed))
@@ -46,9 +46,9 @@ public ServerVersion(ReadOnlySpan<byte> versionString)
4646
Version = new Version(major, minor, build);
4747
}
4848

49-
public bool MariaDb { get; }
5049
public string OriginalString { get; }
5150
public Version Version { get; }
51+
public bool IsMariaDb { get; }
5252

5353
public static ServerVersion Empty { get; } = new();
5454

tests/MySqlConnector.Tests/ServerVersionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ public void ParseServerVersion(string input, string expectedString, bool expecte
3434
var serverVersion = new ServerVersion(Encoding.UTF8.GetBytes(input));
3535
var expected = Version.Parse(expectedString);
3636
Assert.Equal(expected, serverVersion.Version);
37-
Assert.Equal(expectedMariaDb, serverVersion.MariaDb);
37+
Assert.Equal(expectedMariaDb, serverVersion.IsMariaDb);
3838
}
3939
}

0 commit comments

Comments
 (0)