diff --git a/Elsa.Extensions.sln b/Elsa.Extensions.sln index 7a22cadf..30e865ba 100644 --- a/Elsa.Extensions.sln +++ b/Elsa.Extensions.sln @@ -302,6 +302,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agents", "agents", "{0125BA .github\agents\release-notes.agent.md = .github\agents\release-notes.agent.md EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Persistence.Dapper.Sqlite", "src\modules\persistence\Elsa.Persistence.Dapper.Sqlite\Elsa.Persistence.Dapper.Sqlite.csproj", "{1944944F-0F12-C21D-34BF-355DE6AE5C47}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Persistence.Dapper.SqlServer", "src\modules\persistence\Elsa.Persistence.Dapper.SqlServer\Elsa.Persistence.Dapper.SqlServer.csproj", "{849E5AE5-363C-BE84-F82E-031CD73C8C80}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Persistence.Dapper.PostgreSql", "src\modules\persistence\Elsa.Persistence.Dapper.PostgreSql\Elsa.Persistence.Dapper.PostgreSql.csproj", "{2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1456,6 +1462,42 @@ Global {50798373-8A89-4159-BFD9-830D259538D6}.Release|x64.Build.0 = Release|Any CPU {50798373-8A89-4159-BFD9-830D259538D6}.Release|x86.ActiveCfg = Release|Any CPU {50798373-8A89-4159-BFD9-830D259538D6}.Release|x86.Build.0 = Release|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Debug|x64.ActiveCfg = Debug|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Debug|x64.Build.0 = Debug|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Debug|x86.ActiveCfg = Debug|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Debug|x86.Build.0 = Debug|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Release|Any CPU.Build.0 = Release|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Release|x64.ActiveCfg = Release|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Release|x64.Build.0 = Release|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Release|x86.ActiveCfg = Release|Any CPU + {1944944F-0F12-C21D-34BF-355DE6AE5C47}.Release|x86.Build.0 = Release|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Debug|x64.ActiveCfg = Debug|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Debug|x64.Build.0 = Debug|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Debug|x86.ActiveCfg = Debug|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Debug|x86.Build.0 = Debug|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Release|Any CPU.Build.0 = Release|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Release|x64.ActiveCfg = Release|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Release|x64.Build.0 = Release|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Release|x86.ActiveCfg = Release|Any CPU + {849E5AE5-363C-BE84-F82E-031CD73C8C80}.Release|x86.Build.0 = Release|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Debug|x64.ActiveCfg = Debug|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Debug|x64.Build.0 = Debug|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Debug|x86.ActiveCfg = Debug|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Debug|x86.Build.0 = Debug|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Release|Any CPU.Build.0 = Release|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Release|x64.ActiveCfg = Release|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Release|x64.Build.0 = Release|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Release|x86.ActiveCfg = Release|Any CPU + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1587,6 +1629,9 @@ Global {65B9F528-568B-4E0E-894E-F22E0B7C64BB} = {6E46B8AD-FA47-474F-B959-0B530771C28C} {50798373-8A89-4159-BFD9-830D259538D6} = {6E46B8AD-FA47-474F-B959-0B530771C28C} {0125BAC5-45B7-4E9B-8A2B-55F075BF537A} = {D0212324-351E-4CA6-95EE-27754B5367CC} + {1944944F-0F12-C21D-34BF-355DE6AE5C47} = {91656D55-A0E6-45B6-B48D-24DF192DAD02} + {849E5AE5-363C-BE84-F82E-031CD73C8C80} = {91656D55-A0E6-45B6-B48D-24DF192DAD02} + {2A5DDC60-D1D4-4B03-92AC-A0F2F15007E2} = {91656D55-A0E6-45B6-B48D-24DF192DAD02} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {11A771DA-B728-445E-8A88-AE1C84C3B3A6} diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Dialects/PostgreSqlDialect.cs b/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Dialects/PostgreSqlDialect.cs similarity index 89% rename from src/modules/persistence/Elsa.Persistence.Dapper/Dialects/PostgreSqlDialect.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Dialects/PostgreSqlDialect.cs index fcd37df5..59841c69 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Dialects/PostgreSqlDialect.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Dialects/PostgreSqlDialect.cs @@ -1,9 +1,9 @@ using Elsa.Persistence.Dapper.Abstractions; -namespace Elsa.Persistence.Dapper.Dialects; +namespace Elsa.Persistence.Dapper.PostgreSql.Dialects; /// -/// Represents a SQL Server dialect. +/// Represents a PostgreSQL dialect. /// public class PostgreSqlDialect : SqlDialectBase { diff --git a/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Elsa.Persistence.Dapper.PostgreSql.csproj b/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Elsa.Persistence.Dapper.PostgreSql.csproj new file mode 100644 index 00000000..a4a5645c --- /dev/null +++ b/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Elsa.Persistence.Dapper.PostgreSql.csproj @@ -0,0 +1,18 @@ + + + + + Provides Dapper implementations of PostgreSQL. + + elsa extension module persistence dapper postgresql + + + + + + + + + + + diff --git a/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/FodyWeavers.xml b/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/FodyWeavers.xml new file mode 100644 index 00000000..00e1d9a1 --- /dev/null +++ b/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Services/PostgreSqlDbConnectionProvider.cs b/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Services/PostgreSqlDbConnectionProvider.cs similarity index 86% rename from src/modules/persistence/Elsa.Persistence.Dapper/Services/PostgreSqlDbConnectionProvider.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Services/PostgreSqlDbConnectionProvider.cs index 39b62723..61408927 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Services/PostgreSqlDbConnectionProvider.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.PostgreSql/Services/PostgreSqlDbConnectionProvider.cs @@ -1,10 +1,10 @@ using System.Data; using Elsa.Persistence.Dapper.Contracts; -using Elsa.Persistence.Dapper.Dialects; +using Elsa.Persistence.Dapper.PostgreSql.Dialects; using JetBrains.Annotations; using Npgsql; -namespace Elsa.Persistence.Dapper.Services; +namespace Elsa.Persistence.Dapper.PostgreSql.Services; /// /// Provides a PostgreSql connection to the database. @@ -44,5 +44,5 @@ public IDbConnection GetConnection() } /// - public ISqlDialect Dialect => new PostgreSqlDialect(); + public ISqlDialect Dialect { get; } = new PostgreSqlDialect(); } \ No newline at end of file diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Dialects/SqlServerDialect.cs b/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Dialects/SqlServerDialect.cs similarity index 75% rename from src/modules/persistence/Elsa.Persistence.Dapper/Dialects/SqlServerDialect.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Dialects/SqlServerDialect.cs index c54ba8b8..74718c6e 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Dialects/SqlServerDialect.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Dialects/SqlServerDialect.cs @@ -1,6 +1,6 @@ using Elsa.Persistence.Dapper.Abstractions; -namespace Elsa.Persistence.Dapper.Dialects; +namespace Elsa.Persistence.Dapper.SqlServer.Dialects; /// /// Represents a SQL Server dialect. diff --git a/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Elsa.Persistence.Dapper.SqlServer.csproj b/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Elsa.Persistence.Dapper.SqlServer.csproj new file mode 100644 index 00000000..f76c95f8 --- /dev/null +++ b/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Elsa.Persistence.Dapper.SqlServer.csproj @@ -0,0 +1,18 @@ + + + + + Provides Dapper implementations of SQL Server. + + elsa extension module persistence dapper sqlserver + + + + + + + + + + + diff --git a/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/FodyWeavers.xml b/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/FodyWeavers.xml new file mode 100644 index 00000000..00e1d9a1 --- /dev/null +++ b/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Services/SqlServerDbConnectionProvider.cs b/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Services/SqlServerDbConnectionProvider.cs similarity index 79% rename from src/modules/persistence/Elsa.Persistence.Dapper/Services/SqlServerDbConnectionProvider.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Services/SqlServerDbConnectionProvider.cs index a1981844..253f165a 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Services/SqlServerDbConnectionProvider.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.SqlServer/Services/SqlServerDbConnectionProvider.cs @@ -1,13 +1,13 @@ using System.Data; using Elsa.Persistence.Dapper.Contracts; -using Elsa.Persistence.Dapper.Dialects; +using Elsa.Persistence.Dapper.SqlServer.Dialects; using JetBrains.Annotations; using Microsoft.Data.SqlClient; -namespace Elsa.Persistence.Dapper.Services; +namespace Elsa.Persistence.Dapper.SqlServer.Services; /// -/// Provides a SQLite connection to the database. +/// Provides a SQL Server connection to the database. /// [PublicAPI] public class SqlServerDbConnectionProvider : IDbConnectionProvider @@ -29,9 +29,9 @@ public SqlServerDbConnectionProvider(string connectionString) { _connectionString = connectionString; } - + /// - public string GetConnectionString() =>_connectionString; + public string GetConnectionString() => _connectionString; /// public IDbConnection GetConnection() @@ -43,5 +43,5 @@ public IDbConnection GetConnection() } /// - public ISqlDialect Dialect => new SqlServerDialect(); + public ISqlDialect Dialect { get; } = new SqlServerDialect(); } \ No newline at end of file diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Dialects/SqliteDialect.cs b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Dialects/SqliteDialect.cs similarity index 96% rename from src/modules/persistence/Elsa.Persistence.Dapper/Dialects/SqliteDialect.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Dialects/SqliteDialect.cs index c6857451..968a7a79 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Dialects/SqliteDialect.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Dialects/SqliteDialect.cs @@ -2,7 +2,7 @@ using Elsa.Common.Models; using Elsa.Persistence.Dapper.Abstractions; -namespace Elsa.Persistence.Dapper.Dialects; +namespace Elsa.Persistence.Dapper.Sqlite.Dialects; /// /// Represents a SQLite dialect. diff --git a/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Elsa.Persistence.Dapper.Sqlite.csproj b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Elsa.Persistence.Dapper.Sqlite.csproj new file mode 100644 index 00000000..2b780b94 --- /dev/null +++ b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Elsa.Persistence.Dapper.Sqlite.csproj @@ -0,0 +1,18 @@ + + + + + Provides Dapper implementations of SQLite. + + elsa extension module persistence dapper sqlite + + + + + + + + + + + diff --git a/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/FodyWeavers.xml b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/FodyWeavers.xml new file mode 100644 index 00000000..00e1d9a1 --- /dev/null +++ b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Services/SqliteDbConnectionProvider.cs b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Services/SqliteDbConnectionProvider.cs similarity index 84% rename from src/modules/persistence/Elsa.Persistence.Dapper/Services/SqliteDbConnectionProvider.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Services/SqliteDbConnectionProvider.cs index 9cc71890..9d6fc10d 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Services/SqliteDbConnectionProvider.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/Services/SqliteDbConnectionProvider.cs @@ -1,12 +1,12 @@ using System.Data; using Dapper; using Elsa.Persistence.Dapper.Contracts; -using Elsa.Persistence.Dapper.Dialects; -using Elsa.Persistence.Dapper.TypeHandlers.Sqlite; +using Elsa.Persistence.Dapper.Sqlite.Dialects; +using Elsa.Persistence.Dapper.Sqlite.TypeHandlers; using JetBrains.Annotations; using Microsoft.Data.Sqlite; -namespace Elsa.Persistence.Dapper.Services; +namespace Elsa.Persistence.Dapper.Sqlite.Services; /// /// Provides a SQLite connection to the database. @@ -19,6 +19,7 @@ public class SqliteDbConnectionProvider : IDbConnectionProvider static SqliteDbConnectionProvider() { // See: https://learn.microsoft.com/en-us/dotnet/standard/data/sqlite/dapper-limitations#data-types + SqlMapper.AddTypeHandler(new GuidHandler()); SqlMapper.AddTypeHandler(new DateTimeOffsetHandler()); SqlMapper.AddTypeHandler(new TimeSpanHandler()); } @@ -52,5 +53,5 @@ public IDbConnection GetConnection() } /// - public ISqlDialect Dialect => new SqliteDialect(); + public ISqlDialect Dialect { get; } = new SqliteDialect(); } \ No newline at end of file diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/DateTimeOffsetHandler.cs b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/DateTimeOffsetHandler.cs similarity index 83% rename from src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/DateTimeOffsetHandler.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/DateTimeOffsetHandler.cs index 9b69a2cb..b80ad3cd 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/DateTimeOffsetHandler.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/DateTimeOffsetHandler.cs @@ -1,4 +1,4 @@ -namespace Elsa.Persistence.Dapper.TypeHandlers.Sqlite; +namespace Elsa.Persistence.Dapper.Sqlite.TypeHandlers; /// /// Represents a SQLite type handler for . diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/GuidHandler.cs b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/GuidHandler.cs similarity index 80% rename from src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/GuidHandler.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/GuidHandler.cs index 0ebe75f2..da762b53 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/GuidHandler.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/GuidHandler.cs @@ -1,4 +1,4 @@ -namespace Elsa.Persistence.Dapper.TypeHandlers.Sqlite; +namespace Elsa.Persistence.Dapper.Sqlite.TypeHandlers; /// /// Represents a SQLite type handler for . diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/SqliteTypeHandler.cs b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/SqliteTypeHandler.cs similarity index 87% rename from src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/SqliteTypeHandler.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/SqliteTypeHandler.cs index cb9132fe..b98dcfd3 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/SqliteTypeHandler.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/SqliteTypeHandler.cs @@ -1,7 +1,7 @@ using System.Data; using Dapper; -namespace Elsa.Persistence.Dapper.TypeHandlers.Sqlite; +namespace Elsa.Persistence.Dapper.Sqlite.TypeHandlers; /// /// Represents a SQLite type handler. diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/TimeSpanHandler.cs b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/TimeSpanHandler.cs similarity index 81% rename from src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/TimeSpanHandler.cs rename to src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/TimeSpanHandler.cs index 800fcddc..ef4419ba 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/TypeHandlers/Sqlite/TimeSpanHandler.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper.Sqlite/TypeHandlers/TimeSpanHandler.cs @@ -1,4 +1,4 @@ -namespace Elsa.Persistence.Dapper.TypeHandlers.Sqlite; +namespace Elsa.Persistence.Dapper.Sqlite.TypeHandlers; /// /// Represents a SQLite type handler for . diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Abstractions/SqlDialectBase.cs b/src/modules/persistence/Elsa.Persistence.Dapper/Abstractions/SqlDialectBase.cs index e06b72ef..616893fc 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Abstractions/SqlDialectBase.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper/Abstractions/SqlDialectBase.cs @@ -6,7 +6,7 @@ namespace Elsa.Persistence.Dapper.Abstractions; /// -/// Provides a base implementation of , where the dialect defaults to SQLite. +/// Provides a base implementation of , where the dialect defaults to SQL Server. /// public abstract class SqlDialectBase : ISqlDialect { diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Elsa.Persistence.Dapper.csproj b/src/modules/persistence/Elsa.Persistence.Dapper/Elsa.Persistence.Dapper.csproj index 2fce2723..21b82996 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Elsa.Persistence.Dapper.csproj +++ b/src/modules/persistence/Elsa.Persistence.Dapper/Elsa.Persistence.Dapper.csproj @@ -12,15 +12,9 @@ - - - - - - - - - + + + diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Features/DapperFeature.cs b/src/modules/persistence/Elsa.Persistence.Dapper/Features/DapperFeature.cs index 42bdbe07..a4ddca0a 100644 --- a/src/modules/persistence/Elsa.Persistence.Dapper/Features/DapperFeature.cs +++ b/src/modules/persistence/Elsa.Persistence.Dapper/Features/DapperFeature.cs @@ -1,9 +1,6 @@ -using Dapper; -using Elsa.Persistence.Dapper.Contracts; -using Elsa.Persistence.Dapper.Services; -using Elsa.Persistence.Dapper.TypeHandlers.Sqlite; using Elsa.Features.Abstractions; using Elsa.Features.Services; +using Elsa.Persistence.Dapper.Contracts; using Microsoft.Extensions.DependencyInjection; namespace Elsa.Persistence.Dapper.Features; @@ -16,14 +13,12 @@ public class DapperFeature : FeatureBase /// public DapperFeature(IModule module) : base(module) { - // See: https://learn.microsoft.com/en-us/dotnet/standard/data/sqlite/dapper-limitations#data-types - SqlMapper.AddTypeHandler(new GuidHandler()); } /// /// Gets or sets a factory that provides an instance. /// - public Func DbConnectionProvider { get; set; } = _ => new SqliteDbConnectionProvider(); + public Func DbConnectionProvider { get; set; } /// public override void Apply() diff --git a/src/modules/persistence/Elsa.Persistence.Dapper/Modules/Runtime/Extensions/DapperWorkflowManagementFeatureExtensions.cs b/src/modules/persistence/Elsa.Persistence.Dapper/Modules/Runtime/Extensions/DapperWorkflowRuntimeExtensions.cs similarity index 100% rename from src/modules/persistence/Elsa.Persistence.Dapper/Modules/Runtime/Extensions/DapperWorkflowManagementFeatureExtensions.cs rename to src/modules/persistence/Elsa.Persistence.Dapper/Modules/Runtime/Extensions/DapperWorkflowRuntimeExtensions.cs diff --git a/src/workbench/Elsa.Server.Web/Elsa.Server.Web.csproj b/src/workbench/Elsa.Server.Web/Elsa.Server.Web.csproj index 2e37fc91..36640de5 100644 --- a/src/workbench/Elsa.Server.Web/Elsa.Server.Web.csproj +++ b/src/workbench/Elsa.Server.Web/Elsa.Server.Web.csproj @@ -62,6 +62,9 @@ + + + diff --git a/src/workbench/Elsa.Server.Web/Program.cs b/src/workbench/Elsa.Server.Web/Program.cs index af9a2e30..7229a3f9 100644 --- a/src/workbench/Elsa.Server.Web/Program.cs +++ b/src/workbench/Elsa.Server.Web/Program.cs @@ -13,7 +13,8 @@ using Elsa.OpenTelemetry.Middleware; using Elsa.Persistence.Dapper.Extensions; using Elsa.Persistence.Dapper.Contracts; -using Elsa.Persistence.Dapper.Services; +using Elsa.Persistence.Dapper.Sqlite.Services; +using Elsa.Persistence.Dapper.SqlServer.Services; using Elsa.Persistence.EFCore.Extensions; using Elsa.Persistence.EFCore.Modules.Alterations; using Elsa.Persistence.EFCore.Modules.Identity;