Merge master into net6.

Conflicts:
	src/MySqlConnector/MySqlConnector.csproj

Author: bgrainger

README.md

@@ -1,6 +1,6 @@
 # Async MySQL Connector for .NET and .NET Core
 
-This is an [ADO.NET](https://msdn.microsoft.com/en-us/library/e80y5yhx.aspx) data
+This is an [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/) data
 provider for [MySQL](https://www.mysql.com/). It provides implementations of
 `DbConnection`, `DbCommand`, `DbDataReader`, `DbTransaction`—the classes
 needed to query and update databases from managed code.

azure-pipelines.yml

@@ -204,7 +204,7 @@ jobs:
         unsupportedFeatures: 'Ed25519,CachingSha2Password,Tls11,Tls13,UuidToBin'
       'MySQL 8.0':
         image: 'mysql:8.0'
-        unsupportedFeatures: 'Ed25519,Tls11'
+        unsupportedFeatures: 'Ed25519,Tls11,ZeroDateTime'
       'MariaDB 10.2':
         image: 'mariadb:10.2'
         unsupportedFeatures: 'Ed25519,Json,Sha256Password,CachingSha2Password,RoundDateTime,Tls11,UuidToBin'

docs/content/overview/version-history.md

@@ -1,5 +1,5 @@
 ---
-lastmod: 2021-03-07
+lastmod: 2021-04-24
 date: 2017-03-27
 menu:
   main:
@@ -10,6 +10,32 @@ weight: 30
 
 # Version History
 
+### 1.3.7
+
+* Add support for [SingleStore](https://www.singlestore.com/): [#968](https://github.com/mysql-net/MySqlConnector/pull/968).
+* Thanks to [Carl Sverre](https://github.com/carlsverre) and [Tigran Avanesov](https://github.com/tavanesov-ua) for contributions to this release.
+
+### 1.3.6
+
+* Add NuGet Package ReadMe: [#978](https://github.com/mysql-net/MySqlConnector/issues/978).
+
+### 1.3.5
+
+* Support `StringBuilder`, `Memory<char>`, and `ReadOnlyMemory<char>` as `MySqlParameter.Value` values: [#975](https://github.com/mysql-net/MySqlConnector/issues/975).
+* Fix `ArgumentException` in `MySqlBulkCopy`: [#974](https://github.com/mysql-net/MySqlConnector/issues/974).
+
+### 1.3.4
+
+* Improve compatibility with MySQL Server 8.0.24:
+  * Ignore new `ER_CLIENT_INTERACTION_TIMEOUT` error packet sent to timed-out connections: [#970](https://github.com/mysql-net/MySqlConnector/issues/970).
+  * Known Issue: Connections with `UseCompression=true` may throw a `MySqlProtocolException` when timed out.
+
+### 1.3.3
+
+* Support `Enum` parameters in prepared commands: [#965](https://github.com/mysql-net/MySqlConnector/issues/965).
+* Fix `OverflowException` reading `OkPayload`: [#966](https://github.com/mysql-net/MySqlConnector/issues/966).
+* Fix internal SQL parsing error with C-style comments.
+
 ### 1.3.2
 
 * Fix a bug that could cause a timed-out query to still throw a `QueryInterrupted` `MySqlException` instead of `CommandTimeoutExpired`.

docs/content/troubleshooting/parameter-types.md

@@ -1,5 +1,5 @@
 ---
-lastmod: 2021-01-16
+lastmod: 2021-04-23
 date: 2021-01-15
 title: MySqlParameter Types
 customtitle: "Type of value supplied to MySqlParameter.Value isn’t supported"
@@ -38,4 +38,5 @@ In some cases, this may be as simple as calling `.ToString()` or `.ToString(Cult
 * .NET primitives: `bool`, `byte`, `char`, `double`, `float`, `int`, `long`, `sbyte`, `short`, `uint`, `ulong`, `ushort`
 * Common types: `DateTime`, `DateTimeOffset`, `decimal`, `enum`, `Guid`, `string`, `TimeSpan`
 * BLOB types: `ArraySegment<byte>`, `byte[]`, `Memory<byte>`, `ReadOnlyMemory<byte>`
+* String types: `Memory<char>`, `ReadOnlyMemory<char>`, `StringBuilder`
 * Custom MySQL types: `MySqlDateTime`, `MySqlGeometry`

docs/content/tutorials/connect-ssh.md

@@ -1,5 +1,5 @@
 ---
-lastmod: 2019-08-01
+lastmod: 2021-04-22
 date: 2019-07-30
 menu:
   main:
@@ -99,10 +99,8 @@ using (sshClient)
 		Password = databasePassword,
 	};
 
-	using (var connection = new MySqlConnection(csb.ConnectionString))
-	{
-		connection.Open();
-	}
+	using var connection = new MySqlConnection(csb.ConnectionString);
+	connection.Open();
 }
 ```
 
@@ -115,7 +113,7 @@ is reachable from the SSH Server, but not from the client computer), use the fol
 var sshServer = "your ssh server";
 var sshUserName = "your SSH user name";
 var sshPassword = "your SSH password";
-var databaseServer = "your ssh server";
+var databaseServer = "your database server";
 var databaseUserName = "your database user name";
 var databasePassword = "your database password";
 
@@ -130,9 +128,7 @@ using (sshClient)
 		Password = databasePassword,
 	};
 
-	using (var connection = new MySqlConnection(csb.ConnectionString))
-	{
-		connection.Open();
-	}
+	using var connection = new MySqlConnection(csb.ConnectionString);
+	connection.Open();
 }
 ```

docs/content/tutorials/migrating-from-connector-net.md

@@ -274,10 +274,11 @@ The following bugs in Connector/NET are fixed by switching to MySqlConnector. (~
 * ~~[#100218](https://bugs.mysql.com/bug.php?id=100218): `TIME(n)` microsecond values deserialized incorrectly with prepared command~~
 * ~~[#100306](https://bugs.mysql.com/bug.php?id=100306): `Command.Prepare` sends wrong statement to server~~
 * ~~[#100522](https://bugs.mysql.com/bug.php?id=100522): `	MySqlCommand.Parameters.Insert(-1)` succeeds but should fail~~
-* [#101252](https://bugs.mysql.com/bug.php?id=101252): Can't query `CHAR(36)` column containing `NULL`
+* ~~[#101252](https://bugs.mysql.com/bug.php?id=101252): Can't query `CHAR(36)` column containing `NULL`~~
 * [#101253](https://bugs.mysql.com/bug.php?id=101253): Default value for `MySqlParameter.Value` changed from null to `0`
 * ~~[#101302](https://bugs.mysql.com/bug.php?id=101302): Stored Procedure `BOOL` parameter can only be mapped to `MySqlDbType.Byte`~~
 * [#101485](https://bugs.mysql.com/bug.php?id=101485): Stored Procedure `JSON` parameter throws “Unhandled type encountered” `MySqlException`
 * [#101507](https://bugs.mysql.com/bug.php?id=101507): `MySqlCommand.Cancel` throws `NullReferenceException` for a closed connection
-* [#101714](https://bugs.mysql.com/bug.php?id=101714): Extremely slow performance reading result sets
+* ~~[#101714](https://bugs.mysql.com/bug.php?id=101714): Extremely slow performance reading result sets~~
 * [#102593](https://bugs.mysql.com/bug.php?id=102593): Can't use `MemoryStream` as `MySqlParameter.Value`
+* [#103390](https://bugs.mysql.com/bug.php?id=103390): Can't query `CHAR(36)` column if `MySqlCommand` is prepared

src/MySqlConnector/Core/BackgroundConnectionResetHelper.cs

@@ -124,7 +124,7 @@ public static async Task ReturnSessionsAsync()
 			}
 		}
 
-		internal struct SessionResetTask
+		internal readonly struct SessionResetTask
 		{
 			public SessionResetTask(ServerSession session, Task<bool> resetTask, MySqlConnection? owningConnection)
 			{

src/MySqlConnector/Core/CachedProcedure.cs

@@ -154,7 +154,7 @@ internal static List<CachedParameter> ParseParameters(string parametersSql)
 				return new List<CachedParameter>();
 
 			// strip precision specifier containing comma
-			parametersSql = Regex.Replace(parametersSql, @"(DECIMAL|DEC|FIXED|NUMERIC|FLOAT|DOUBLE PRECISION|DOUBLE|REAL)\s*\(\d+(,\s*\d+)\)", @"$1", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
+			parametersSql = Regex.Replace(parametersSql, @"(DECIMAL|DEC|FIXED|NUMERIC|FLOAT|DOUBLE PRECISION|DOUBLE|REAL)\s*\([0-9]+(,\s*[0-9]+)\)", @"$1", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
 
 			// strip enum values containing commas (these would have been stripped by ParseDataType anyway)
 			parametersSql = Regex.Replace(parametersSql, @"ENUM\s*\([^)]+\)", "ENUM", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
@@ -194,60 +194,34 @@ internal static List<CachedParameter> ParseParameters(string parametersSql)
 
 		internal static string ParseDataType(string sql, out bool unsigned, out int length)
 		{
-			if (sql.EndsWith(" ZEROFILL", StringComparison.OrdinalIgnoreCase))
-				sql = sql.Substring(0, sql.Length - 9);
-			unsigned = false;
-			if (sql.EndsWith(" UNSIGNED", StringComparison.OrdinalIgnoreCase))
-			{
-				unsigned = true;
-				sql = sql.Substring(0, sql.Length - 9);
-			}
 			sql = Regex.Replace(sql, " (CHARSET|CHARACTER SET) [A-Za-z0-9_]+", "", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
 			sql = Regex.Replace(sql, " (COLLATE) [A-Za-z0-9_]+", "", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
 			sql = Regex.Replace(sql, @"ENUM\s*\([^)]+\)", "ENUM", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
 
 			length = 0;
-			var match = Regex.Match(sql, @"\s*\(\s*(\d+)\s*(?:,\s*\d+\s*)?\)");
+			var match = Regex.Match(sql, @"\s*\(\s*([0-9]+)\s*(?:,\s*[0-9]+\s*)?\)");
 			if (match.Success)
 			{
 				length = int.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
-				sql = Regex.Replace(sql, @"\s*\(\s*\d+\s*(?:,\s*\d+\s*)?\)", "");
+				sql = Regex.Replace(sql, @"\s*\(\s*[0-9]+\s*(?:,\s*[0-9]+\s*)?\)", "");
 			}
 
-			sql = sql.Trim();
+			var list = sql.Trim().Split(new char[] {' '});
+			var type = string.Empty;
 
-			// normalize alternate data type names
-			if (sql.Equals("BOOL", StringComparison.OrdinalIgnoreCase) || sql.Equals("BOOLEAN", StringComparison.OrdinalIgnoreCase))
-			{
-				sql = "TINYINT";
-				length = 1;
-			}
-			else if (sql.Equals("INTEGER", StringComparison.OrdinalIgnoreCase))
-			{
-				sql = "INT";
-			}
-			else if (sql.Equals("NUMERIC", StringComparison.OrdinalIgnoreCase) || sql.Equals("FIXED", StringComparison.OrdinalIgnoreCase))
-			{
-				sql = "DECIMAL";
-			}
-			else if (sql.Equals("REAL", StringComparison.OrdinalIgnoreCase) || sql.Equals("DOUBLE PRECISION", StringComparison.OrdinalIgnoreCase))
-			{
-				sql = "DOUBLE";
-			}
-			else if (sql.Equals("NVARCHAR", StringComparison.OrdinalIgnoreCase) || sql.Equals("CHARACTER VARYING", StringComparison.OrdinalIgnoreCase) || sql.Equals("NATIONAL VARCHAR", StringComparison.OrdinalIgnoreCase))
+			if (list.Length < 2 || !s_typeMapping.TryGetValue(list[0] + ' ' + list[1], out type))
 			{
-				sql = "VARCHAR";
-			}
-			else if (sql.Equals("NCHAR", StringComparison.OrdinalIgnoreCase) || sql.Equals("CHARACTER", StringComparison.OrdinalIgnoreCase) || sql.Equals("NATIONAL CHAR", StringComparison.OrdinalIgnoreCase))
-			{
-				sql = "CHAR";
-			}
-			else if (sql.Equals("CHAR BYTE", StringComparison.OrdinalIgnoreCase))
-			{
-				sql = "BINARY";
+				if (s_typeMapping.TryGetValue(list[0], out type))
+				{
+					if (list[0].StartsWith("BOOL", StringComparison.OrdinalIgnoreCase))
+					{
+						length = 1;
+					}
+				}
 			}
 
-			return sql;
+			unsigned = list.Contains("UNSIGNED", StringComparer.OrdinalIgnoreCase);
+			return type ?? list[0];
 		}
 
 		private static CachedParameter CreateCachedParameter(int ordinal, string? direction, string name, string dataType, bool unsigned, int length, string originalSql)
@@ -265,6 +239,23 @@ private static CachedParameter CreateCachedParameter(int ordinal, string? direct
 		string FullyQualified => $"`{m_schema}`.`{m_component}`";
 
 		static readonly IMySqlConnectorLogger Log = MySqlConnectorLogManager.CreateLogger(nameof(CachedProcedure));
+		static readonly IReadOnlyDictionary<string, string> s_typeMapping = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+		{
+			{ "BOOL", "TINYINT" },
+			{ "BOOLEAN", "TINYINT" },
+			{ "INTEGER", "INT" },
+			{ "NUMERIC", "DECIMAL" },
+			{ "FIXED", "DECIMAL" },
+			{ "REAL", "DOUBLE" },
+			{ "DOUBLE PRECISION", "DOUBLE" },
+			{ "NVARCHAR", "VARCHAR" },
+			{ "CHARACTER VARYING", "VARCHAR" },
+			{ "NATIONAL VARCHAR", "VARCHAR" },
+			{ "NCHAR", "CHAR" },
+			{ "CHARACTER", "CHAR" },
+			{ "NATIONAL CHAR", "CHAR" },
+			{ "CHAR BYTE", "BINARY" }
+		};
 
 		readonly string m_schema;
 		readonly string m_component;

src/MySqlConnector/Core/ServerSession.cs

@@ -584,6 +584,10 @@ public async Task<bool> TryResetConnectionAsync(ConnectionSettings cs, IOBehavio
 			{
 				Log.Debug(ex, "Session{0} ignoring IOException in TryResetConnectionAsync", m_logArguments);
 			}
+			catch (MySqlException ex) when (ex.ErrorCode == MySqlErrorCode.ClientInteractionTimeout)
+			{
+				Log.Debug(ex, "Session{0} ignoring ClientInteractionTimeout MySqlException in TryResetConnectionAsync", m_logArguments);
+			}
 			catch (ObjectDisposedException ex)
 			{
 				Log.Debug(ex, "Session{0} ignoring ObjectDisposedException in TryResetConnectionAsync", m_logArguments);
@@ -795,6 +799,10 @@ public async ValueTask<bool> TryPingAsync(bool logInfo, IOBehavior ioBehavior, C
 			{
 				Log.Debug(ex, "Session{0} ping failed due to IOException", m_logArguments);
 			}
+			catch (MySqlException ex) when (ex.ErrorCode == MySqlErrorCode.ClientInteractionTimeout)
+			{
+				Log.Debug(ex, "Session{0} ping failed due to ClientInteractionTimeout MySqlException", m_logArguments);
+			}
 			catch (SocketException ex)
 			{
 				Log.Debug(ex, "Session{0} ping failed due to SocketException", m_logArguments);
@@ -1584,7 +1592,6 @@ private static void SafeDispose<T>(ref T? disposable)
 
 		internal void SetFailed(Exception exception)
 		{
-			m_logArguments[1] = exception.Message;
 			Log.Info(exception, "Session{0} setting state to Failed", m_logArguments);
 			lock (m_lock)
 				m_state = State.Failed;
@@ -1677,7 +1684,10 @@ private Exception CreateExceptionForErrorPayload(ReadOnlySpan<byte> span)
 			var errorPayload = ErrorPayload.Create(span);
 			if (Log.IsDebugEnabled())
 				Log.Debug("Session{0} got error payload: Code={1}, State={2}, Message={3}", m_logArguments[0], errorPayload.ErrorCode, errorPayload.State, errorPayload.Message);
-			return errorPayload.ToException();
+			var exception = errorPayload.ToException();
+			if (exception.ErrorCode is MySqlErrorCode.ClientInteractionTimeout)
+				SetFailed(exception);
+			return exception;
 		}
 
 		private void ClearPreparedStatements()

src/MySqlConnector/Core/TypeMapper.cs

@@ -151,6 +151,10 @@ private void AddColumnTypeMetadata(ColumnTypeMetadata columnTypeMetadata)
 
 		internal DbTypeMapping? GetDbTypeMapping(Type clrType)
 		{
+#if !NETSTANDARD1_3
+			if (clrType.IsEnum)
+				clrType = Enum.GetUnderlyingType(clrType);
+#endif
 			m_dbTypeMappingsByClrType.TryGetValue(clrType, out var dbTypeMapping);
 			return dbTypeMapping;
 		}