Merge branch 'PomeloFoundation-main' into net9

Author: renemadsen

Development.props.sample

@@ -16,7 +16,7 @@
       referenced by Microsoft.AspNetCore.Identity.EntityFrameworkCore
       (e.g. "6.0.0.0").
 
-      To achive that, run the following command in your EntityFrameworkCore
+      To achieve that, run the following command in your EntityFrameworkCore
       base directory:
 
       dotnet build "/p:AssemblyVersion=6.0.0.0"

README.md

@@ -31,7 +31,7 @@ Release | Branch
 
 ### Supported Database Servers and Versions
 
-`Pomelo.EntityFrameworkCore.MySql` is tested against all actively maintained versions of `MySQL` and `MariaDB`. Older versions (e.g. MySQL 5.7) and other server implementations (e.g. Amazon Aurora) are usually compatible to a high degree as well, but are not tested as part of our CI. You can find the versions a release was tested against within its [release](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/releases) notes.
+`Pomelo.EntityFrameworkCore.MySql` is tested against all actively maintained versions of `MySQL` and `MariaDB`. Older versions (e.g. MySQL 5.7) and other server implementations (e.g. Amazon Aurora) are usually compatible to a high degree as well, but are not tested as part of our CI. You can find a list of the versions, a release was tested against, within its [release](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/releases) notes.
 
 Currently tested versions are:
 

Version.props

@@ -11,8 +11,8 @@
       rules.
     -->
     <VersionPrefix>9.0.0</VersionPrefix>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>4</PreReleaseVersionIteration>
+    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
 
     <!--
       A string like `.efcore.9.0.0` or `.efcore.9.0.0.preview.1` can be added to the version suffix, to indicate that this release targets

src/EFCore.MySql/Infrastructure/MariaDbServerVersion.cs

@@ -15,7 +15,7 @@ namespace Microsoft.EntityFrameworkCore
     public class MariaDbServerVersion : ServerVersion
     {
         public static readonly string MariaDbTypeIdentifier = nameof(ServerType.MariaDb).ToLowerInvariant();
-        public static readonly ServerVersion LatestSupportedServerVersion = new MariaDbServerVersion(new Version(11, 3, 2));
+        public static readonly ServerVersion LatestSupportedServerVersion = new MariaDbServerVersion(new Version(11, 6, 2));
 
         public override ServerVersionSupport Supports { get; }
 

src/EFCore.MySql/Infrastructure/MySqlServerVersion.cs

@@ -15,7 +15,7 @@ namespace Microsoft.EntityFrameworkCore
     public class MySqlServerVersion : ServerVersion
     {
         public static readonly string MySqlTypeIdentifier = nameof(ServerType.MySql).ToLowerInvariant();
-        public static readonly ServerVersion LatestSupportedServerVersion = new MySqlServerVersion(new Version(8, 0, 36));
+        public static readonly ServerVersion LatestSupportedServerVersion = new MySqlServerVersion(new Version(8, 4, 3));
 
         public override ServerVersionSupport Supports { get; }
 

src/EFCore.MySql/Query/Internal/MySqlQueryCompilationContext.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Pomelo Foundation. All rights reserved.
 // Licensed under the MIT. See LICENSE in the project root for license information.
 
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Query;
 
@@ -10,13 +11,27 @@ public class MySqlQueryCompilationContext : RelationalQueryCompilationContext
     {
         public MySqlQueryCompilationContext(
             [NotNull] QueryCompilationContextDependencies dependencies,
-            [NotNull] RelationalQueryCompilationContextDependencies relationalDependencies, bool async)
+            [NotNull] RelationalQueryCompilationContextDependencies relationalDependencies,
+            bool async)
             : base(dependencies, relationalDependencies, async)
         {
         }
 
+        public MySqlQueryCompilationContext(
+            [NotNull] QueryCompilationContextDependencies dependencies,
+            [NotNull] RelationalQueryCompilationContextDependencies relationalDependencies,
+            bool async,
+            bool precompiling,
+            IReadOnlySet<string> nonNullableReferenceTypeParameters)
+            : base(dependencies, relationalDependencies, async, precompiling, nonNullableReferenceTypeParameters)
+        {
+        }
+
         public override bool IsBuffering
             => base.IsBuffering ||
                QuerySplittingBehavior == Microsoft.EntityFrameworkCore.QuerySplittingBehavior.SplitQuery;
+
+        /// <inheritdoc />
+        public override bool SupportsPrecompiledQuery => false;
     }
 }

src/EFCore.MySql/Query/Internal/MySqlQueryCompilationContextFactory.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Pomelo Foundation. All rights reserved.
 // Licensed under the MIT. See LICENSE in the project root for license information.
 
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -25,5 +26,9 @@ public MySqlQueryCompilationContextFactory(
 
         public virtual QueryCompilationContext Create(bool async)
             => new MySqlQueryCompilationContext(_dependencies, _relationalDependencies, async);
+
+        public virtual QueryCompilationContext CreatePrecompiled(bool async, IReadOnlySet<string> nonNullableReferenceTypeParameters)
+            => new MySqlQueryCompilationContext(
+                _dependencies, _relationalDependencies, async, precompiling: true, nonNullableReferenceTypeParameters);
     }
 }

test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs

@@ -38,7 +38,6 @@ public class MySqlComplianceTest : RelationalComplianceTestBase
             // TODO: 9.0
             typeof(AdHocComplexTypeQueryTestBase),
             typeof(AdHocPrecompiledQueryRelationalTestBase),
-            typeof(JsonQueryRelationalTestBase<>),
             typeof(PrecompiledQueryRelationalTestBase),
             typeof(PrecompiledSqlPregenerationQueryRelationalTestBase),
 
@@ -48,7 +47,7 @@ public class MySqlComplianceTest : RelationalComplianceTestBase
 
             // We have our own JSON support for now
             typeof(AdHocJsonQueryTestBase),
-            typeof(AdHocJsonQueryRelationalTestBase),
+            typeof(JsonQueryRelationalTestBase<>),
             typeof(JsonQueryTestBase<>),
             typeof(JsonTypesRelationalTestBase),
             typeof(JsonTypesTestBase),

test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs

@@ -128,10 +128,11 @@ public static string MySqlBug96947Workaround(string innerSql, string type = "cha
 
         public static bool HasPrimitiveCollectionsSupport<TContext>(SharedStoreFixtureBase<TContext> fixture)
             where TContext : DbContext
-        {
-            return AppConfig.ServerVersion.Supports.JsonTable &&
-                   fixture.CreateOptions().GetExtension<MySqlOptionsExtension>().PrimitiveCollectionsSupport;
-        }
+            => HasPrimitiveCollectionsSupport(fixture.CreateOptions());
+
+        public static bool HasPrimitiveCollectionsSupport(DbContextOptions options)
+            => AppConfig.ServerVersion.Supports.JsonTable &&
+               options.GetExtension<MySqlOptionsExtension>().PrimitiveCollectionsSupport;
 
         /// <summary>
         /// Same implementation as EF Core base class, except that it can generate code for Task returning test without a `bool async`

test/EFCore.MySql.FunctionalTests/Update/StoredProcedureUpdateMySqlTest.cs

@@ -614,6 +614,37 @@ CREATE PROCEDURE EntityWithAdditionalProperty_Insert(pName text, OUT pId int, pA
 WHERE `Id` = @p2 AND `AdditionalProperty` = @p3;
 SELECT ROW_COUNT();
 
+SET @_out_p4 = NULL;
+CALL `EntityWithAdditionalProperty_Insert`(@p5, @_out_p4, @p6);
+SELECT @_out_p4;
+""");
+    }
+
+    public override async Task Non_sproc_followed_by_sproc_commands_in_the_same_batch(bool async)
+    {
+        await base.Non_sproc_followed_by_sproc_commands_in_the_same_batch(
+            async,
+            """
+            CREATE PROCEDURE EntityWithAdditionalProperty_Insert(pName text, OUT pId int, pAdditional_property int)
+            BEGIN
+                INSERT INTO EntityWithAdditionalProperty (`Name`, `AdditionalProperty`) VALUES (pName, pAdditional_property);
+                SET pId = LAST_INSERT_ID();
+            END
+            """);
+
+        AssertSql(
+"""
+@p2='1'
+@p0='2'
+@p3='1'
+@p1='Entity1_Modified' (Size = 4000)
+@p5='Entity2' (Size = 4000)
+@p6='0'
+
+UPDATE `EntityWithAdditionalProperty` SET `AdditionalProperty` = @p0, `Name` = @p1
+WHERE `Id` = @p2 AND `AdditionalProperty` = @p3;
+SELECT ROW_COUNT();
+
 SET @_out_p4 = NULL;
 CALL `EntityWithAdditionalProperty_Insert`(@p5, @_out_p4, @p6);
 SELECT @_out_p4;