TFM: netstandard2.0, net462. Updated libraries.

Changelog.md

@@ -1,5 +1,17 @@
 # NEventStore.Persistence.Sql
 
+## 9.1.1
+
+- Target Framework supported: netstandard2.0, net462
+- Updated System.Data.SqlClient 4.8.5
+- Fix: NEventStore constraint failed with MySql 8.x (works with 5.7) [#487](https://github.com/NEventStore/NEventStore/issues/487)
+
+### Breaking Change
+
+- The fix for [#487](https://github.com/NEventStore/NEventStore/issues/487) changed how the `Commits` table is created for MySql 8.x:
+  to update an existing database in order to run on 8.x you need to manually update the `Commits` table schema and change the constraint of the `CommitId` column
+  from: `CommitId binary(16) NOT NULL CHECK (CommitId != 0)` to: `CommitId binary(16) NOT NULL CHECK (CommitId <> 0x00)`.
+
 ## 9.0.1 
 
 - Added documentation files to NuGet packages (improved intellisense support) [#36](https://github.com/NEventStore/NEventStore.Persistence.SQL/issues/36)

README.md

@@ -5,10 +5,8 @@ SQL Persistence Engine for NEventStore
 
 NEventStore.Persistence.Sql currently supports:
 
-- .net framework 4.6.1
+- .net framework 4.6.2
 - .net standard 2.0
-- .net 5.0
-- .net 6.0
 - MsSql
 - SqlLite
 - MySql
@@ -57,6 +55,18 @@ To build the project locally on a Windows Machine:
 - Optional: update `.\src\.nuget\NEventStore.Persistence.Sql.nuspec` file if needed (before creating relase packages).
 - Open a Powershell console in Administrative mode and run the build script `build.ps1` in the root of the repository.
 
+## How to Run Unit Tests (locally)
+
+- Install Database engines or use Docker to run them in a container (you can use the scripts in `./docker` folder).
+- Define the following environment variables:
+
+  ```
+  NEventStore.MsSql="Server=localhost,50001;Database=NEventStore;User Id=sa;Password=Password1;"
+  NEventStore.MySql="Server=localhost;Port=50003;Database=NEventStore;Uid=sa;Pwd=Password1;AutoEnlist=false;"
+  NEventStore.PostgreSql="Server=localhost;Port=50004;Database=NEventStore;Uid=sa;Pwd=Password1;Enlist=false;"
+  NEventStore.Oracle="Data Source=localhost:1521/XE;User Id=system;Password=Password1;Persist Security Info=True;"
+  ```
+
 ## How to contribute
 
 ### Git-Flow

docker/docker-compose.ci.linux.db.yml

@@ -32,7 +32,7 @@ services:
   mysql:
     container_name: nesci-mysql-1
     platform: linux
-    image: mysql:5.7
+    image: mysql:8.0 #5.7
     command: --default-authentication-plugin=mysql_native_password
     restart: always
     environment:

docker/docker-compose.ci.windows.db.yml

@@ -32,7 +32,7 @@ services:
   mysql:
     container_name: nesci-mysql-1
     platform: windows
-    image: mysql:5.7
+    image: mysql:8.0 #5.7
     command: --default-authentication-plugin=mysql_native_password
     restart: always
     environment:

src/NEventStore.Persistence.MsSql.Tests/NEventStore.Persistence.MsSql.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net7.0;net462</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>NEventStore.Persistence.MsSql.Tests</AssemblyName>
@@ -14,16 +14,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/NEventStore.Persistence.MsSql.Tests/PersistenceEngineFixture.cs

@@ -18,7 +18,7 @@ public partial class PersistenceEngineFixture
 
         public PersistenceEngineFixture()
         {
-#if NET461
+#if NET462
             _createPersistence = pageSize =>
                 new SqlPersistenceFactory(new EnviromentConnectionFactory("MsSql", "System.Data.SqlClient"),
                     new BinarySerializer(),

src/NEventStore.Persistence.MsSql.Tests/TransactionIsolationLevelTests.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Transactions;
 using FluentAssertions;
-#if NET461
+#if NET462
 using NEventStore.Diagnostics;
 #endif
 using NEventStore.Persistence.AcceptanceTests.BDD;
@@ -123,7 +123,7 @@ public class IsolationLevelPersistenceEngineFixture
         public IsolationLevelPersistenceEngineFixture()
         {
             _recorder = new IsolationLevelRecorder();
-#if NET461
+#if NET462
             _connectionFactory = new EnviromentConnectionFactory("MsSql", "System.Data.SqlClient");
 #else
             _connectionFactory = new EnviromentConnectionFactory("MsSql", System.Data.SqlClient.SqlClientFactory.Instance);
@@ -141,7 +141,7 @@ public void Initialize()
                 _persistence.Drop();
                 _persistence.Dispose();
             }
-#if NET461
+#if NET462
             _persistence = new PerformanceCounterPersistenceEngine(_createPersistence(), "tests");
 #else
             _persistence = _createPersistence();

src/NEventStore.Persistence.MsSql.Tests/WireupTests.cs

@@ -31,7 +31,7 @@ protected override void Context()
         {
             _eventStore = Wireup
                 .Init()
-#if NET461
+#if NET462
                 .UsingSqlPersistence(new EnviromentConnectionFactory("MsSql", "System.Data.SqlClient"))
 #else
                 .UsingSqlPersistence(new EnviromentConnectionFactory("MsSql", System.Data.SqlClient.SqlClientFactory.Instance))

src/NEventStore.Persistence.MySql.Tests/NEventStore.Persistence.MySql.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net7.0;net462</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>NEventStore.Persistence.MySql.Tests</AssemblyName>
@@ -14,17 +14,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MySql.Data" Version="8.0.27" />
+    <PackageReference Include="MySql.Data" Version="8.1.0" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Data" />
     <Reference Include="System.Transactions" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/NEventStore.Persistence.MySql.Tests/PersistenceEngineFixture.cs

@@ -11,7 +11,7 @@ public partial class PersistenceEngineFixture
     {
         public PersistenceEngineFixture()
         {
-#if NET461
+#if NET462
             _createPersistence = pageSize =>
                     new SqlPersistenceFactory(
                         new EnviromentConnectionFactory("MySql", "MySql.Data.MySqlClient"),

src/NEventStore.Persistence.MySql.Tests/app.config

@@ -3,7 +3,7 @@
     <system.data>
         <DbProviderFactories>
             <remove invariant="MySql.Data.MySqlClient"/>
-            <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.0.27.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+            <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=8.1.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
         </DbProviderFactories>
     </system.data>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

src/NEventStore.Persistence.PostgreSql.Tests/NEventStore.Persistence.PostgreSql.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>net7.0;net462</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>NEventStore.Persistence.PostgreSql.Tests</AssemblyName>
@@ -13,15 +13,15 @@
     <DefineConstants Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">NUNIT</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Npgsql" Version="6.0.0" />
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="Npgsql" Version="7.0.4" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/NEventStore.Persistence.PostgreSql.Tests/PersistenceEngineFixture.cs

@@ -14,7 +14,7 @@ public PersistenceEngineFixture()
             // It will be done when creating the PostgreNpgsql6Dialect dialect
             // AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
 
-#if NET461
+#if NET462
             _createPersistence = pageSize =>
                 new SqlPersistenceFactory(
                     new EnviromentConnectionFactory("PostgreSql", "Npgsql"),

src/NEventStore.Persistence.Sql.Core.sln

@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		..\appveyor.yml = ..\appveyor.yml
+		..\build.ps1 = ..\build.ps1
 		..\Changelog.md = ..\Changelog.md
 		.nuget\NEventStore.Persistence.Sql.nuspec = .nuget\NEventStore.Persistence.Sql.nuspec
 		..\README.md = ..\README.md

src/NEventStore.Persistence.Sql.Tests/EnviromentConnectionFactory.cs

@@ -10,7 +10,7 @@ public class EnviromentConnectionFactory : IConnectionFactory
         private readonly string _envVarKey;
         private readonly DbProviderFactory _dbProviderFactory;
 
-#if NET461
+#if NET462
         public EnviromentConnectionFactory(string envDatabaseName, string providerInvariantName)
         {
             _envVarKey = string.Format("NEventStore.{0}", envDatabaseName);

src/NEventStore.Persistence.Sql.Tests/NEventStore.Persistence.Sql.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net7.0;net462</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>NEventStore.Persistence.Sql.Tests</AssemblyName>
     <RootNamespace>NEventStore.Persistence.Sql.Tests</RootNamespace>

src/NEventStore.Persistence.Sql.Tests/PersistenceTests.Transactions.cs

@@ -557,7 +557,7 @@ IsolationLevel transationIsolationLevel
             ) : base(enlistInAmbientTransaction, transationIsolationLevel, completeTransaction: true)
         { }
 
-#if NET461
+#if NET462
         // some of these tests fails with a local instance of sql sever
         [Fact]
         public void should_throw_an_StorageUnavailableException()

src/NEventStore.Persistence.Sql/ConfigurationConnectionFactory.cs

@@ -1,5 +1,5 @@
 // netstandard does not have support for DbFactoryProviders, we need a totally different way to initialize the driver
-#if NET461
+#if NET462
 namespace NEventStore.Persistence.Sql
 {
     using System;

src/NEventStore.Persistence.Sql/NEventStore.Persistence.Sql.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net5.0;netstandard2.0;net461</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <RootNamespace>NEventStore.Persistence.Sql</RootNamespace>
         <AssemblyName>NEventStore.Persistence.Sql</AssemblyName>
@@ -27,10 +27,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+        <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
     </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
         <Reference Include="System.Configuration" />
         <Reference Include="System.Transactions" />
         <Reference Include="System.Web" />

src/NEventStore.Persistence.Sql/SqlDialects/MySqlStatements.resx

@@ -125,7 +125,7 @@
     StreamIdOriginal varchar(1000) charset utf8 NOT NULL,
     StreamRevision int NOT NULL CHECK (StreamRevision > 0),
     Items int NOT NULL CHECK (Items > 0),
-    CommitId binary(16) NOT NULL CHECK (CommitId != 0),
+    CommitId binary(16) NOT NULL CHECK (CommitId <> 0x00),
     CommitSequence int NOT NULL CHECK (CommitSequence > 0),
     CommitStamp bigint NOT NULL,
     CheckpointNumber bigint AUTO_INCREMENT,

src/NEventStore.Persistence.Sql/SqlPersistenceFactory.cs

@@ -11,7 +11,7 @@ public class SqlPersistenceFactory : IPersistenceFactory
         private const int DefaultPageSize = 128;
         private readonly TransactionScopeOption? _scopeOption;
 
-#if NET461
+#if NET462
         public SqlPersistenceFactory(
             string connectionName,
             ISerialize serializer,
@@ -60,7 +60,7 @@ public virtual IPersistStreams Build()
             return new SqlPersistenceEngine(ConnectionFactory, Dialect, Serializer, PageSize, StreamIdHasher, _scopeOption);
         }
 
-#if NET461
+#if NET462
         protected static ISqlDialect ResolveDialect(ConnectionStringSettings settings)
         {
             string providerName = settings.ProviderName.ToUpperInvariant();

src/NEventStore.Persistence.Sql/SqlPersistenceWireupExtensions.cs

@@ -7,7 +7,7 @@ namespace NEventStore
     public static class SqlPersistenceWireupExtensions
     {
         // netstandard does not have support for DbFactoryProviders, we need a totally different way to initialize the driver
-#if NET461
+#if NET462
         public static SqlPersistenceWireup UsingSqlPersistence(this Wireup wireup, string connectionName)
         {
             var factory = new ConfigurationConnectionFactory(connectionName);
@@ -29,7 +29,7 @@ public static SqlPersistenceWireup UsingSqlPersistence(this Wireup wireup, DbPro
 
         public static SqlPersistenceWireup UsingSqlPersistence(this Wireup wireup, IConnectionFactory factory)
         {
-#if NET461
+#if NET462
             // init the global seetings if needed
             int timeout = 0;
             if (int.TryParse(System.Configuration.ConfigurationManager.AppSettings["NEventStore.SqlCommand.Timeout"], out timeout))

src/NEventStore.Persistence.Sql/ThreadScope.cs

@@ -11,7 +11,7 @@ namespace NEventStore.Persistence.Sql
 
     public class ThreadScope<T> : IDisposable where T : class
     {
-#if NET461
+#if NET462
         private readonly HttpContext _context = HttpContext.Current;
 #endif
 
@@ -77,7 +77,7 @@ protected virtual void Dispose(bool disposing)
 
         private T Load()
         {
-#if NET461
+#if NET462
             if (_context != null)
             {
                 return _context.Items[_threadKey] as T;
@@ -88,7 +88,7 @@ private T Load()
 
         private void Store(T value)
         {
-#if NET461
+#if NET462
             if (_context != null)
             {
                 _context.Items[_threadKey] = value;