Merge master into net10.

Conflicts:
	tests/IntegrationTests/IntegrationTests.csproj

Author: bgrainger

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
 
     - name: Restore
       run: dotnet restore
@@ -48,7 +48,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
 
       - name: Publish
         run: dotnet publish -c Release -r linux-x64 -f ${{ matrix.tfm }} tests/MySqlConnector.NativeAot.Tests/MySqlConnector.NativeAot.Tests.csproj

.github/workflows/codeql-analysis.yml

@@ -27,7 +27,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

src/MySqlConnector/Core/XaEnlistedTransaction.cs

@@ -30,23 +30,25 @@ protected override void OnCommit(Enlistment enlistment)
 
 	protected override void OnRollback(Enlistment enlistment)
 	{
-		try
+		if (!IsPrepared)
 		{
 			try
 			{
-				if (!IsPrepared)
-					ExecuteXaCommand("END");
+				ExecuteXaCommand("END");
 			}
-			catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XAERRemoveFail && ex.Message.Contains("ROLLBACK ONLY"))
+			catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XARBDeadlock || (ex.ErrorCode is MySqlErrorCode.XAERRemoveFail && ex.Message.Contains("ROLLBACK ONLY")))
 			{
-				// ignore unprepared end failure when XAERRemoveFail is returned telling us the XA state is ROLLBACK ONLY.
+				// ignore deadlock notification AND any unprepared end failure when XAERRemoveFail is returned telling us the XA state is ROLLBACK ONLY.
 			}
+		}
 
+		try
+		{
 			ExecuteXaCommand("ROLLBACK");
 		}
 		catch (MySqlException ex) when (ex.ErrorCode is MySqlErrorCode.XARBDeadlock)
 		{
-			// ignore deadlock when rolling back
+			// ignore deadlock notification when rolling back.
 		}
 	}
 

src/MySqlConnector/MySqlBulkCopy.cs

@@ -231,7 +231,7 @@ private async ValueTask<MySqlBulkCopyResult> WriteToServerAsync(IOBehavior ioBeh
 		using (var reader = await cmd.ExecuteReaderAsync(CommandBehavior.SchemaOnly, ioBehavior, cancellationToken).ConfigureAwait(false))
 		{
 			var schema = reader.GetColumnSchema();
-			for (var i = 0; i < Math.Min(m_valuesEnumerator!.FieldCount, schema.Count); i++)
+			for (var i = 0; i < schema.Count; i++)
 			{
 				var destinationColumn = reader.GetName(i);
 				if (schema[i].DataTypeName == "BIT")
@@ -260,7 +260,7 @@ private async ValueTask<MySqlBulkCopyResult> WriteToServerAsync(IOBehavior ioBeh
 		}
 
 		// set columns and expressions from the column mappings
-		for (var i = 0; i < m_valuesEnumerator.FieldCount; i++)
+		for (var i = 0; i < m_valuesEnumerator!.FieldCount; i++)
 		{
 			var columnMapping = columnMappings.FirstOrDefault(x => x.SourceOrdinal == i);
 			if (columnMapping is null)

src/MySqlConnector/MySqlBulkLoader.cs

@@ -183,7 +183,7 @@ internal async ValueTask<int> LoadAsync(IOBehavior ioBehavior, CancellationToken
 		else
 		{
 			if (!Local)
-				throw new InvalidOperationException("Local must be true to use SourceStream, SourceDataTable, or SourceDataReader.");
+				throw new InvalidOperationException("Local must be true to use SourceStream.");
 
 			FileName = GenerateSourceFileName();
 			AddSource(FileName, Source!);

tests/IntegrationTests/BulkLoaderAsync.cs

@@ -635,6 +635,45 @@ public async Task BulkCopyNullDataReader()
 		var bulkCopy = new MySqlBulkCopy(connection);
 		await Assert.ThrowsAsync<ArgumentNullException>(async () => await bulkCopy.WriteToServerAsync(default(DbDataReader)));
 	}
+
+	[Fact]
+	public async Task BulkCopyGeometryAsync()
+	{
+		var dataTable = new DataTable()
+		{
+			Columns =
+			{
+				new DataColumn("geo_data", typeof(MySqlGeometry)),
+			},
+			Rows =
+			{
+				new object[] { MySqlGeometry.FromWkb(0, [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 240, 63]) },
+			},
+		};
+
+		using var connection = new MySqlConnection(GetLocalConnectionString());
+		await connection.OpenAsync();
+		using (var cmd = new MySqlCommand(@"drop table if exists bulk_load_data_table;
+create table bulk_load_data_table(id BIGINT UNIQUE NOT NULL AUTO_INCREMENT, geo_data GEOMETRY NOT NULL);", connection))
+		{
+			await cmd.ExecuteNonQueryAsync();
+		}
+
+		var bc = new MySqlBulkCopy(connection)
+		{
+			DestinationTableName = "bulk_load_data_table",
+			ColumnMappings =
+			{
+				new()
+				{
+					SourceOrdinal = 0,
+					DestinationColumn = "geo_data",
+				},
+			},
+		};
+
+		await bc.WriteToServerAsync(dataTable);
+	}
 #endif
 
 	private static string GetConnectionString() => BulkLoaderSync.GetConnectionString();

tests/IntegrationTests/BulkLoaderSync.cs

@@ -1284,6 +1284,45 @@ public void BulkCopyDataTableConflictOption(MySqlBulkLoaderConflictOption confli
 		using (var cmd = new MySqlCommand("select b from bulk_load_data_table;", connection))
 			Assert.Equal(expected, cmd.ExecuteScalar());
 	}
+
+	[Fact]
+	public void BulkCopyGeometry()
+	{
+		var dataTable = new DataTable()
+		{
+			Columns =
+			{
+				new DataColumn("geo_data", typeof(MySqlGeometry)),
+			},
+			Rows =
+			{
+				new object[] { MySqlGeometry.FromWkb(0, [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 240, 63]) },
+			},
+		};
+
+		using var connection = new MySqlConnection(GetLocalConnectionString());
+		connection.Open();
+		using (var cmd = new MySqlCommand(@"drop table if exists bulk_load_data_table;
+create table bulk_load_data_table(id BIGINT UNIQUE NOT NULL AUTO_INCREMENT, geo_data GEOMETRY NOT NULL);", connection))
+		{
+			cmd.ExecuteNonQuery();
+		}
+
+		var bc = new MySqlBulkCopy(connection)
+		{
+			DestinationTableName = "bulk_load_data_table",
+			ColumnMappings =
+			{
+				new()
+				{
+					SourceOrdinal = 0,
+					DestinationColumn = "geo_data",
+				},
+			},
+		};
+
+		bc.WriteToServer(dataTable);
+	}
 #endif
 
 	internal static string GetConnectionString() => AppConfig.ConnectionString;