Move CreateStatementPreparerOptions to MySqlCommand.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

src/MySqlConnector/Core/TextCommandExecutor.cs

@@ -53,36 +53,7 @@ public virtual async Task<DbDataReader> ExecuteReaderAsync(string commandText, M
 
 		private PayloadData CreateQueryPayload(string commandText, MySqlParameterCollection parameterCollection)
 		{
-			var statementPreparerOptions = StatementPreparerOptions.None;
-			if (m_command.Connection.AllowUserVariables || m_command.CommandType == CommandType.StoredProcedure)
-				statementPreparerOptions |= StatementPreparerOptions.AllowUserVariables;
-			if (m_command.Connection.DateTimeKind == DateTimeKind.Utc)
-				statementPreparerOptions |= StatementPreparerOptions.DateTimeUtc;
-			else if (m_command.Connection.DateTimeKind == DateTimeKind.Local)
-				statementPreparerOptions |= StatementPreparerOptions.DateTimeLocal;
-			if (m_command.CommandType == CommandType.StoredProcedure)
-				statementPreparerOptions |= StatementPreparerOptions.AllowOutputParameters;
-
-			switch (m_command.Connection.GuidFormat)
-			{
-			case MySqlGuidFormat.Char36:
-				statementPreparerOptions |= StatementPreparerOptions.GuidFormatChar36;
-				break;
-			case MySqlGuidFormat.Char32:
-				statementPreparerOptions |= StatementPreparerOptions.GuidFormatChar32;
-				break;
-			case MySqlGuidFormat.Binary16:
-				statementPreparerOptions |= StatementPreparerOptions.GuidFormatBinary16;
-				break;
-			case MySqlGuidFormat.TimeSwapBinary16:
-				statementPreparerOptions |= StatementPreparerOptions.GuidFormatTimeSwapBinary16;
-				break;
-			case MySqlGuidFormat.LittleEndianBinary16:
-				statementPreparerOptions |= StatementPreparerOptions.GuidFormatLittleEndianBinary16;
-				break;
-			}
-
-			var preparer = new StatementPreparer(commandText, parameterCollection, statementPreparerOptions);
+			var preparer = new StatementPreparer(commandText, parameterCollection, m_command.CreateStatementPreparerOptions());
 			return new PayloadData(preparer.ParseAndBindParameters(), isPooled: true);
 		}
 

src/MySqlConnector/MySql.Data.MySqlClient/MySqlCommand.cs

@@ -267,6 +267,40 @@ internal void ResetCommandTimeout()
 			Connection?.Session?.SetTimeout(commandTimeout == 0 ? Constants.InfiniteTimeout : commandTimeout * 1000);
 		}
 
+		internal StatementPreparerOptions CreateStatementPreparerOptions()
+		{
+			var statementPreparerOptions = StatementPreparerOptions.None;
+			if (Connection.AllowUserVariables || CommandType == CommandType.StoredProcedure)
+				statementPreparerOptions |= StatementPreparerOptions.AllowUserVariables;
+			if (Connection.DateTimeKind == DateTimeKind.Utc)
+				statementPreparerOptions |= StatementPreparerOptions.DateTimeUtc;
+			else if (Connection.DateTimeKind == DateTimeKind.Local)
+				statementPreparerOptions |= StatementPreparerOptions.DateTimeLocal;
+			if (CommandType == CommandType.StoredProcedure)
+				statementPreparerOptions |= StatementPreparerOptions.AllowOutputParameters;
+
+			switch (Connection.GuidFormat)
+			{
+			case MySqlGuidFormat.Char36:
+				statementPreparerOptions |= StatementPreparerOptions.GuidFormatChar36;
+				break;
+			case MySqlGuidFormat.Char32:
+				statementPreparerOptions |= StatementPreparerOptions.GuidFormatChar32;
+				break;
+			case MySqlGuidFormat.Binary16:
+				statementPreparerOptions |= StatementPreparerOptions.GuidFormatBinary16;
+				break;
+			case MySqlGuidFormat.TimeSwapBinary16:
+				statementPreparerOptions |= StatementPreparerOptions.GuidFormatTimeSwapBinary16;
+				break;
+			case MySqlGuidFormat.LittleEndianBinary16:
+				statementPreparerOptions |= StatementPreparerOptions.GuidFormatLittleEndianBinary16;
+				break;
+			}
+
+			return statementPreparerOptions;
+		}
+
 		private IOBehavior AsyncIOBehavior => Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous;
 
 		private void VerifyNotDisposed()