Skip to content

update to 6.0 #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

update to 6.0 #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
809c13b
update to 6.0 rc3
to11mtm Aug 16, 2025
710baed
fixup with statement
to11mtm Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Akka.Persistence.Sql.HelperLib/TagTableMigrator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using Akka.Persistence.Sql.Db;
using Akka.Persistence.Sql.Journal.Types;
using LinqToDB;
using LinqToDB.Async;
Copy link
Member Author

@to11mtm to11mtm Aug 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Things got moved, now this namespace is a thing for ToListAsync/ToDictionaryAsync etc.

using LinqToDB.Data;
using LinqToDB.Tools;

Expand Down
4 changes: 2 additions & 2 deletions src/Akka.Persistence.Sql.TagTableMigration/Options.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public static string ToHocon(this ProviderType type)
ProviderType.SqlServer2019 => ProviderName.SqlServer2019,
ProviderType.SqlServer2022 => ProviderName.SqlServer2022,
ProviderType.MySql => ProviderName.MySql,
ProviderType.MySqlOfficial => ProviderName.MySqlOfficial,
ProviderType.MySqlConnector => ProviderName.MySqlConnector,
ProviderType.MySqlOfficial => ProviderName.MySql80MySqlData,//.MySqlOfficial,
ProviderType.MySqlConnector => ProviderName.MySql80MySqlConnector,
Comment on lines +68 to +69
Copy link
Member Author

@to11mtm to11mtm Aug 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add ProviderType changes here for the Tag Table migration Big difference is things are now a bit more explicit for MySQL versions...

Not sure if this implies config updates required (We could always try to translate if needed I guess?

ProviderType.PostgreSql => ProviderName.PostgreSQL,
ProviderType.PostgreSql92 => ProviderName.PostgreSQL92,
ProviderType.PostgreSql93 => ProviderName.PostgreSQL93,
Expand Down
2 changes: 1 addition & 1 deletion src/Akka.Persistence.Sql.Tests.Common/Containers/MySqlContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public MySqlContainer() : base("mysql", "8", $"mysql-{Guid.NewGuid():N}")

public override string ConnectionString => _connectionStringBuilder.ToString();

public override string ProviderName => LinqToDB.ProviderName.MySqlOfficial;
public override string ProviderName => LinqToDB.ProviderName.MySql80MySqlConnector;//.MySqlOfficial;
Copy link
Member Author

@to11mtm to11mtm Aug 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly should actually be MySql80MySqlData ?


private int Port { get; } = ThreadLocalRandom.Current.Next(9000, 10000);

Expand Down
2 changes: 1 addition & 1 deletion src/Akka.Persistence.Sql/Db/AkkaDataConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void Dispose()
=> _connection.Dispose();

public AkkaDataConnection Clone()
=> new(_providerName, (DataConnection)_connection.Clone());
=> throw new NotSupportedException();//_providerName, (DataConnection)_connection.Clone());
Copy link
Member Author

@to11mtm to11mtm Aug 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have twothree options here...

Option 1 - Take what I did here and treat it as Not Supported.

Option 2 - Have AkkaDataConnection take in the actual connection string as well, and then just have Clone() use that

Option 3 - Just get rid of this method; -should- be a compile time break (bad) but should show up right away in most sane CI setups.

(If we go with 1 or 2, we'll still need to mark this as obsolete via attr)


public DatabaseSchema GetSchema()
=> _connection.DataProvider.GetSchemaProvider().GetSchema(_connection);
Expand Down
8 changes: 4 additions & 4 deletions src/Akka.Persistence.Sql/Db/AkkaPersistenceDataConnectionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public AkkaPersistenceDataConnectionFactory(IProviderConfig<JournalTableConfig>
_useCloneDataConnection = config.UseCloneConnection;

if (_opts.RetryPolicyOptions.RetryPolicy is null && _opts.RetryPolicyOptions.Factory is null && _opts.ConnectionOptions.ProviderName!.ToLowerInvariant().StartsWith("sqlserver"))
_opts = _opts.WithOptions( _opts.RetryPolicyOptions with { RetryPolicy = new SqlServerRetryPolicy() } );
_opts = _opts.WithOptions( _opts.RetryPolicyOptions.WithRetryPolicy(new SqlServerRetryPolicy()));

_cloneConnection = new Lazy<AkkaDataConnection>(
() => new AkkaDataConnection(
Expand Down Expand Up @@ -79,7 +79,7 @@ public AkkaPersistenceDataConnectionFactory(IProviderConfig<SnapshotTableConfigu
_useCloneDataConnection = config.UseCloneConnection;

if (_opts.RetryPolicyOptions.RetryPolicy is null && _opts.ConnectionOptions.ProviderName!.ToLowerInvariant().StartsWith("sqlserver"))
_opts = _opts.WithOptions( _opts.RetryPolicyOptions with { RetryPolicy = new AkkaSqlServerRetryPolicy() } );
_opts = _opts.WithOptions( _opts.RetryPolicyOptions.WithRetryPolicy(new AkkaSqlServerRetryPolicy()));

_cloneConnection = new Lazy<AkkaDataConnection>(
() => new AkkaDataConnection(
Expand Down Expand Up @@ -396,12 +396,12 @@ private static DataOptions BuildDataOptions<TTable>(IProviderConfig<TTable> conf

public AkkaDataConnection GetConnection()
{
if (!_useCloneDataConnection)
//if (!_useCloneDataConnection)
return new AkkaDataConnection(
_opts.ConnectionOptions.ProviderName!,
new DataConnection(_opts));

return _cloneConnection.Value.Clone();
// return _cloneConnection.Value.Clone();
}
}
}
1 change: 1 addition & 0 deletions src/Akka.Persistence.Sql/Journal/Dao/BaseByteArrayJournalDao.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using Akka.Streams.Supervision;
using LanguageExt;
using LinqToDB;
using LinqToDB.Async;
using LinqToDB.Data;
using static LanguageExt.Prelude;

Expand Down
1 change: 1 addition & 0 deletions src/Akka.Persistence.Sql/Query/Dao/BaseByteReadArrayJournalDao.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
using Akka.Streams.Dsl;
using Akka.Util;
using LinqToDB;
using LinqToDB.Async;

namespace Akka.Persistence.Sql.Query.Dao
{
Expand Down
1 change: 1 addition & 0 deletions src/Akka.Persistence.Sql/Snapshot/ByteArraySnapshotDao.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using Akka.Streams;
using Akka.Util;
using LinqToDB;
using LinqToDB.Async;

namespace Akka.Persistence.Sql.Snapshot
{
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="LanguageExt.Core" Version="4.4.9" />
<PackageVersion Include="linq2db" Version="5.4.1" />
<PackageVersion Include="linq2db" Version="6.0.0-rc.3" />
<PackageVersion Include="FluentMigrator" Version="$(FluentMigratorVersion)" />
<PackageVersion Include="FluentMigrator.Runner" Version="$(FluentMigratorVersion)" />
</ItemGroup>
Expand Down
Loading