Skip to content
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

Jump to bottom

Fix Dapper Provider #4998

Merged
merged 2 commits into from
Feb 25, 2024
Merged

Fix Dapper Provider #4998

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
bc962ac
Update Dapper for better support and pagination
sfmskywalker Feb 25, 2024
9c98e77
Toggle SQL Server usage in Elsa Server
sfmskywalker Feb 25, 2024
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
39 changes: 28 additions & 11 deletions src/bundles/Elsa.Server.Web/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,13 @@
if (useDapper)
elsa.UseDapper(dapper =>
{
dapper.UseMigrations();
dapper.UseMigrations(feature =>
{
if (useSqlServer)
feature.UseSqlServer();
else
feature.UseSqlite();
});
dapper.DbConnectionProvider = sp =>
{
if (useSqlServer)
Expand Down Expand Up @@ -108,8 +114,8 @@
else
ef.UseSqlite(sqliteConnectionString);
});
if(useZipCompression)

if (useZipCompression)
management.SetCompressionAlgorithm(nameof(Zstd));
})
.UseWorkflowRuntime(runtime =>
Expand Down Expand Up @@ -138,10 +144,11 @@
});
}

if(useMassTransit)
if (useMassTransit)
{
runtime.UseMassTransitDispatcher();
}

runtime.WorkflowInboxCleanupOptions = options => configuration.GetSection("Runtime:WorkflowInboxCleanup").Bind(options);
runtime.WorkflowDispatcherOptions = options => configuration.GetSection("Runtime:WorkflowDispatcher").Bind(options);
})
Expand Down Expand Up @@ -187,19 +194,29 @@
.UseEmail(email => email.ConfigureOptions = options => configuration.GetSection("Smtp").Bind(options))
.UseAlterations(alterations =>
{
alterations.UseEntityFrameworkCore(ef =>
if (useMongoDb)
{
if (useSqlServer)
ef.UseSqlServer(sqlServerConnectionString);
else
ef.UseSqlite(sqliteConnectionString);
});
// TODO: alterations.UseMongoDb();
}
else if (useDapper)
{
// TODO: alterations.UseDapper();
}
else
{
alterations.UseEntityFrameworkCore(ef =>
{
if (useSqlServer)
ef.UseSqlServer(sqlServerConnectionString);
else
ef.UseSqlite(sqliteConnectionString);
});
}

if (useMassTransit)
{
alterations.UseMassTransitDispatcher();
}

})
.UseWorkflowContexts();

Expand Down
7 changes: 4 additions & 3 deletions src/modules/Elsa.Dapper.Migrations/Identity/Initial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using FluentMigrator;
using JetBrains.Annotations;
using static System.Int32;

namespace Elsa.Dapper.Migrations.Identity;

Expand All @@ -17,13 +18,13 @@ public override void Up()
.WithColumn("Name").AsString().NotNullable()
.WithColumn("HashedPassword").AsString().NotNullable()
.WithColumn("HashedPasswordSalt").AsString().NotNullable()
.WithColumn("Roles").AsString().NotNullable();
.WithColumn("Roles").AsString(MaxValue).NotNullable();

Create
.Table("Roles")
.WithColumn("Id").AsString().PrimaryKey()
.WithColumn("Name").AsString().NotNullable()
.WithColumn("Permissions").AsString().NotNullable();
.WithColumn("Permissions").AsString(MaxValue).NotNullable();

Create
.Table("Applications")
Expand All @@ -34,7 +35,7 @@ public override void Up()
.WithColumn("Name").AsString().NotNullable()
.WithColumn("HashedApiKey").AsString().NotNullable()
.WithColumn("HashedApiKeySalt").AsString().NotNullable()
.WithColumn("Roles").AsString().NotNullable();
.WithColumn("Roles").AsString(MaxValue).NotNullable();
}

/// <inheritdoc />
Expand Down
23 changes: 12 additions & 11 deletions src/modules/Elsa.Dapper.Migrations/Management/Initial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using FluentMigrator;
using JetBrains.Annotations;
using static System.Int32;

namespace Elsa.Dapper.Migrations.Management;

Expand All @@ -18,14 +19,14 @@ public override void Up()
.WithColumn("DefinitionId").AsString().NotNullable()
.WithColumn("Name").AsString().Nullable()
.WithColumn("ToolVersion").AsString().Nullable()
.WithColumn("Description").AsString().Nullable()
.WithColumn("Description").AsString(MaxValue).Nullable()
.WithColumn("ProviderName").AsString().Nullable()
.WithColumn("MaterializerName").AsString().NotNullable()
.WithColumn("MaterializerContext").AsString().Nullable()
.WithColumn("Props").AsString().NotNullable()
.WithColumn("MaterializerContext").AsString(MaxValue).Nullable()
.WithColumn("Props").AsString(MaxValue).NotNullable()
.WithColumn("UsableAsActivity").AsBoolean().Nullable()
.WithColumn("StringData").AsString().Nullable()
.WithColumn("BinaryData").AsBinary().Nullable()
.WithColumn("StringData").AsString(MaxValue).Nullable()
.WithColumn("BinaryData").AsBinary(MaxValue).Nullable()
.WithColumn("CreatedAt").AsDateTimeOffset().NotNullable()
.WithColumn("Version").AsInt32().NotNullable()
.WithColumn("IsLatest").AsBoolean().NotNullable()
Expand All @@ -40,14 +41,14 @@ public override void Up()
.WithColumn("DefinitionId").AsString().NotNullable()
.WithColumn("Name").AsString().Nullable()
.WithColumn("ToolVersion").AsString().Nullable()
.WithColumn("Description").AsString().Nullable()
.WithColumn("Description").AsString(MaxValue).Nullable()
.WithColumn("ProviderName").AsString().Nullable()
.WithColumn("MaterializerName").AsString().NotNullable()
.WithColumn("MaterializerContext").AsString().Nullable()
.WithColumn("Props").AsString().NotNullable()
.WithColumn("Props").AsString(MaxValue).NotNullable()
.WithColumn("UsableAsActivity").AsBoolean().Nullable()
.WithColumn("StringData").AsString().Nullable()
.WithColumn("BinaryData").AsBinary().Nullable()
.WithColumn("StringData").AsString(MaxValue).Nullable()
.WithColumn("BinaryData").AsBinary(MaxValue).Nullable()
.WithColumn("CreatedAt").AsDateTime2().NotNullable()
.WithColumn("Version").AsInt32().NotNullable()
.WithColumn("IsLatest").AsBoolean().NotNullable()
Expand All @@ -61,7 +62,7 @@ public override void Up()
.WithColumn("DefinitionId").AsString().NotNullable()
.WithColumn("DefinitionVersionId").AsString().NotNullable()
.WithColumn("Version").AsInt32().NotNullable()
.WithColumn("WorkflowState").AsString().NotNullable()
.WithColumn("WorkflowState").AsString(MaxValue).NotNullable()
.WithColumn("Status").AsString().NotNullable()
.WithColumn("SubStatus").AsString().NotNullable()
.WithColumn("CorrelationId").AsString().Nullable()
Expand All @@ -78,7 +79,7 @@ public override void Up()
.WithColumn("DefinitionId").AsString().NotNullable()
.WithColumn("DefinitionVersionId").AsString().NotNullable()
.WithColumn("Version").AsInt32().NotNullable()
.WithColumn("WorkflowState").AsString().NotNullable()
.WithColumn("WorkflowState").AsString(MaxValue).NotNullable()
.WithColumn("Status").AsString().NotNullable()
.WithColumn("SubStatus").AsString().NotNullable()
.WithColumn("CorrelationId").AsString().Nullable()
Expand Down
62 changes: 32 additions & 30 deletions src/modules/Elsa.Dapper.Migrations/Runtime/Initial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using FluentMigrator;
using JetBrains.Annotations;
using static System.Int32;

namespace Elsa.Dapper.Migrations.Runtime;

Expand All @@ -8,6 +9,7 @@ namespace Elsa.Dapper.Migrations.Runtime;
[PublicAPI]
public class Initial : Migration
{
private const int MaxNodeIdColumnLength = 2048;
/// <inheritdoc />
public override void Up()
{
Expand All @@ -19,7 +21,7 @@ public override void Up()
.WithColumn("Name").AsString().NotNullable().Indexed()
.WithColumn("ActivityId").AsString().NotNullable().Indexed()
.WithColumn("Hash").AsString().Nullable().Indexed()
.WithColumn("SerializedPayload").AsString().Nullable();
.WithColumn("SerializedPayload").AsString(MaxValue).Nullable();

IfDatabase("SqlServer", "Oracle", "MySql", "Postgres")
.Create
Expand All @@ -30,8 +32,8 @@ public override void Up()
.WithColumn("CorrelationId").AsString().Nullable().Indexed()
.WithColumn("ActivityInstanceId").AsString().NotNullable().Indexed()
.WithColumn("Hash").AsString().Nullable().Indexed()
.WithColumn("SerializedPayload").AsString().Nullable()
.WithColumn("SerializedMetadata").AsString().Nullable()
.WithColumn("SerializedPayload").AsString(MaxValue).Nullable()
.WithColumn("SerializedMetadata").AsString(MaxValue).Nullable()
.WithColumn("CreatedAt").AsDateTimeOffset().NotNullable().Indexed();

IfDatabase("Sqlite")
Expand All @@ -43,8 +45,8 @@ public override void Up()
.WithColumn("CorrelationId").AsString().Nullable().Indexed()
.WithColumn("ActivityInstanceId").AsString().NotNullable().Indexed()
.WithColumn("Hash").AsString().Nullable().Indexed()
.WithColumn("SerializedPayload").AsString().Nullable()
.WithColumn("SerializedMetadata").AsString().Nullable()
.WithColumn("SerializedPayload").AsString(MaxValue).Nullable()
.WithColumn("SerializedMetadata").AsString(MaxValue).Nullable()
.WithColumn("CreatedAt").AsDateTime2().NotNullable().Indexed();

IfDatabase("SqlServer", "Oracle", "MySql", "Postgres")
Expand All @@ -61,13 +63,13 @@ public override void Up()
.WithColumn("ActivityType").AsString().NotNullable().Indexed()
.WithColumn("ActivityTypeVersion").AsInt32().NotNullable().Indexed()
.WithColumn("ActivityName").AsString().Nullable().Indexed()
.WithColumn("ActivityNodeId").AsString().NotNullable().Indexed()
.WithColumn("ActivityNodeId").AsString(MaxNodeIdColumnLength).NotNullable().Indexed()
.WithColumn("EventName").AsString().Nullable().Indexed()
.WithColumn("Message").AsString().Nullable()
.WithColumn("Message").AsString(MaxValue).Nullable()
.WithColumn("Source").AsString().Nullable()
.WithColumn("SerializedActivityState").AsString().Nullable()
.WithColumn("SerializedPayload").AsString().Nullable()
.WithColumn("SerializedException").AsString().Nullable()
.WithColumn("SerializedActivityState").AsString(MaxValue).Nullable()
.WithColumn("SerializedPayload").AsString(MaxValue).Nullable()
.WithColumn("SerializedException").AsString(MaxValue).Nullable()
.WithColumn("Timestamp").AsDateTimeOffset().NotNullable().Indexed()
.WithColumn("Sequence").AsInt64().NotNullable().Indexed()
;
Expand All @@ -86,14 +88,14 @@ public override void Up()
.WithColumn("ActivityType").AsString().NotNullable().Indexed()
.WithColumn("ActivityTypeVersion").AsInt32().NotNullable().Indexed()
.WithColumn("ActivityName").AsString().Nullable().Indexed()
.WithColumn("ActivityNodeId").AsString().NotNullable().Indexed()
.WithColumn("ActivityNodeId").AsString(MaxNodeIdColumnLength).NotNullable().Indexed()
.WithColumn("EventName").AsString().Nullable().Indexed()
.WithColumn("Message").AsString().Nullable()
.WithColumn("Message").AsString(MaxValue).Nullable()
.WithColumn("Source").AsString().Nullable()
.WithColumn("SerializedActivityState").AsString().Nullable()
.WithColumn("SerializedPayload").AsString().Nullable()
.WithColumn("SerializedOutputs").AsString().Nullable()
.WithColumn("SerializedException").AsString().Nullable()
.WithColumn("SerializedActivityState").AsString(MaxValue).Nullable()
.WithColumn("SerializedPayload").AsString(MaxValue).Nullable()
.WithColumn("SerializedOutputs").AsString(MaxValue).Nullable()
.WithColumn("SerializedException").AsString(MaxValue).Nullable()
.WithColumn("Timestamp").AsDateTime2().NotNullable().Indexed()
.WithColumn("Sequence").AsInt64().NotNullable().Indexed()
;
Expand All @@ -104,14 +106,14 @@ public override void Up()
.WithColumn("Id").AsString().PrimaryKey()
.WithColumn("WorkflowInstanceId").AsString().NotNullable().Indexed()
.WithColumn("ActivityId").AsString().NotNullable().Indexed()
.WithColumn("ActivityNodeId").AsString().NotNullable().Indexed()
.WithColumn("ActivityNodeId").AsString(MaxNodeIdColumnLength).NotNullable().Indexed()
.WithColumn("ActivityType").AsString().NotNullable().Indexed()
.WithColumn("ActivityTypeVersion").AsInt32().NotNullable().Indexed()
.WithColumn("ActivityName").AsString().Nullable().Indexed()
.WithColumn("SerializedActivityState").AsString().Nullable()
.WithColumn("SerializedPayload").AsString().Nullable()
.WithColumn("SerializedOutputs").AsString().Nullable()
.WithColumn("SerializedException").AsString().Nullable()
.WithColumn("SerializedActivityState").AsString(MaxValue).Nullable()
.WithColumn("SerializedPayload").AsString(MaxValue).Nullable()
.WithColumn("SerializedOutputs").AsString(MaxValue).Nullable()
.WithColumn("SerializedException").AsString(MaxValue).Nullable()
.WithColumn("StartedAt").AsDateTimeOffset().NotNullable().Indexed()
.WithColumn("CompletedAt").AsDateTimeOffset().Nullable().Indexed()
.WithColumn("HasBookmarks").AsBoolean().NotNullable().Indexed()
Expand All @@ -124,14 +126,14 @@ public override void Up()
.WithColumn("Id").AsString().PrimaryKey()
.WithColumn("WorkflowInstanceId").AsString().NotNullable().Indexed()
.WithColumn("ActivityId").AsString().NotNullable().Indexed()
.WithColumn("ActivityNodeId").AsString().NotNullable().Indexed()
.WithColumn("ActivityNodeId").AsString(MaxNodeIdColumnLength).NotNullable().Indexed()
.WithColumn("ActivityType").AsString().NotNullable().Indexed()
.WithColumn("ActivityTypeVersion").AsInt32().NotNullable().Indexed()
.WithColumn("ActivityName").AsString().Nullable().Indexed()
.WithColumn("SerializedActivityState").AsString().Nullable()
.WithColumn("SerializedPayload").AsString().Nullable()
.WithColumn("SerializedOutputs").AsString().Nullable()
.WithColumn("SerializedException").AsString().Nullable()
.WithColumn("SerializedActivityState").AsString(MaxValue).Nullable()
.WithColumn("SerializedPayload").AsString(MaxValue).Nullable()
.WithColumn("SerializedOutputs").AsString(MaxValue).Nullable()
.WithColumn("SerializedException").AsString(MaxValue).Nullable()
.WithColumn("StartedAt").AsDateTime2().NotNullable().Indexed()
.WithColumn("CompletedAt").AsDateTime2().Nullable().Indexed()
.WithColumn("HasBookmarks").AsBoolean().NotNullable().Indexed()
Expand All @@ -147,8 +149,8 @@ public override void Up()
.WithColumn("ActivityInstanceId").AsString().Nullable().Indexed()
.WithColumn("CorrelationId").AsString().Nullable().Indexed()
.WithColumn("Hash").AsString().NotNullable().Indexed()
.WithColumn("SerializedBookmarkPayload").AsString()
.WithColumn("SerializedInput").AsString().Nullable()
.WithColumn("SerializedBookmarkPayload").AsString(MaxValue)
.WithColumn("SerializedInput").AsString(MaxValue).Nullable()
.WithColumn("CreatedAt").AsDateTimeOffset().Indexed()
.WithColumn("ExpiresAt").AsDateTimeOffset().Indexed()
;
Expand All @@ -162,8 +164,8 @@ public override void Up()
.WithColumn("ActivityInstanceId").AsString().Nullable().Indexed()
.WithColumn("CorrelationId").AsString().Nullable().Indexed()
.WithColumn("Hash").AsString().NotNullable().Indexed()
.WithColumn("SerializedBookmarkPayload").AsString()
.WithColumn("SerializedInput").AsString().Nullable()
.WithColumn("SerializedBookmarkPayload").AsString(MaxValue)
.WithColumn("SerializedInput").AsString(MaxValue).Nullable()
.WithColumn("CreatedAt").AsDateTime2().Indexed()
.WithColumn("ExpiresAt").AsDateTime2().Indexed()
;
Expand Down
5 changes: 4 additions & 1 deletion src/modules/Elsa.Dapper.Migrations/Runtime/V3_1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
using System.Diagnostics.CodeAnalysis;
using FluentMigrator;
using JetBrains.Annotations;
using static System.Int32;

namespace Elsa.Dapper.Migrations.Runtime;

/// <inheritdoc />
[Migration(20002, "Elsa:Runtime:AddKeyValueStore")]
[PublicAPI]
[SuppressMessage("ReSharper", "InconsistentNaming")]
public class V3_1 : Migration
{
/// <inheritdoc />
Expand All @@ -14,7 +17,7 @@ public override void Up()
Create
.Table("KeyValuePairs")
.WithColumn("Key").AsString().PrimaryKey()
.WithColumn("Value").AsString().NotNullable();
.WithColumn("Value").AsString(MaxValue).NotNullable();
}

/// <inheritdoc />
Expand Down
32 changes: 29 additions & 3 deletions src/modules/Elsa.Dapper/Abstractions/SqlDialectBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.Text;
using Elsa.Common.Entities;
using Elsa.Common.Models;
using Elsa.Dapper.Contracts;

namespace Elsa.Dapper.Abstractions;
Expand Down Expand Up @@ -53,10 +55,25 @@ public virtual string OrderBy(string field, OrderDirection direction)
}

/// <inheritdoc />
public virtual string Skip(int count) => $"offset {count}";
public virtual string Skip(int count) => $"offset {count} rows";

/// <inheritdoc />
public virtual string Take(int count) => $"limit {count}";
public virtual string Take(int count) => $"fetch next {count} rows only";

/// <inheritdoc />
public virtual string Page(PageArgs pageArgs)
{
var sb = new StringBuilder();

// Attention: the order is important here for SQL Server (OFFSET before FETCH NEXT).
if (pageArgs.Offset != null)
sb.AppendLine(Skip(pageArgs.Offset.Value));

if (pageArgs.Limit != null)
sb.AppendLine(Take(pageArgs.Limit.Value));

return sb.ToString();
}

/// <inheritdoc />
public string Insert(string table, string[] fields, Func<string, string>? getParamName = default)
Expand All @@ -75,6 +92,15 @@ public virtual string Upsert(string table, string primaryKeyField, string[] fiel
var fieldList = string.Join(", ", fields);
var fieldParamNames = fields.Select(x => $"@{getParamName(x)}");
var fieldParamList = string.Join(", ", fieldParamNames);
return $"INSERT OR REPLACE INTO {table} ({primaryKeyField}, {fieldList}) VALUES (@{getParamName(primaryKeyField)}, {fieldParamList});";
return @$"
MERGE INTO {table} WITH (HOLDLOCK) AS Target
USING (VALUES (@{getParamName(primaryKeyField)}, {fieldParamList}))
AS Source ({primaryKeyField}, {fieldList})
ON Target.{primaryKeyField} = Source.{primaryKeyField}
WHEN MATCHED THEN
UPDATE SET {string.Join(", ", fields.Select(x => $"{x} = Source.{x}"))}
WHEN NOT MATCHED THEN
INSERT ({primaryKeyField}, {fieldList})
VALUES (Source.{primaryKeyField}, {string.Join(", ", fields.Select(x => $"Source.{x}"))});";
}
}
Loading
Loading