Regenerate EF Core migrations for Runtime

This commit is contained in:
Sipke Schoorstra 2024-12-31 13:54:19 +01:00
parent c5bf6fd0e3
commit e07ece5875
34 changed files with 91 additions and 261 deletions

View file

@ -13,7 +13,7 @@
- "5432:5432"
mysql:
image: mysql:9.1.0
image: mysql:8.0
container_name: mysql
environment:
MYSQL_ROOT_PASSWORD: password
@ -23,7 +23,7 @@
ports:
- "3306:3306"
volumes:
- mysql_data1:/var/lib/mysql
- mysql_data2:/var/lib/mysql
mongodb:
image: mongo:latest
@ -104,6 +104,6 @@
volumes:
postgres-data:
mysql_data1:
mysql_data2:
cockroachdb-data:
mongodb_data:

View file

@ -16,6 +16,6 @@ for module in "${mods[@]}"; do
echo "Updating migrations for $provider..."
echo "Provider path: ${providerPath:?}/${migrationsPath}"
echo "Migrations path: $migrationsPath"
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.Common.Contracts.IElsaDbContextSchema --efOptions "migrations add V3_1 -c ""$module""ElsaDbContext -p ""$providerPath"" -o ""$migrationsPath"""
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.IElsaDbContextSchema --efOptions "migrations add V3_1 -c ""$module""ElsaDbContext -p ""$providerPath"" -o ""$migrationsPath"""
done
done

View file

@ -16,6 +16,6 @@ for module in "${mods[@]}"; do
echo "Updating migrations for $provider..."
echo "Provider path: ${providerPath:?}/${migrationsPath}"
echo "Migrations path: $migrationsPath"
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.Common.Contracts.IElsaDbContextSchema --efOptions "migrations add V3_2 -c ""$module""ElsaDbContext -p ""$providerPath"" -o ""$migrationsPath"""
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.IElsaDbContextSchema --efOptions "migrations add V3_2 -c ""$module""ElsaDbContext -p ""$providerPath"" -o ""$migrationsPath"""
done
done

View file

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>

View file

@ -1,4 +1,4 @@

using Elsa.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

View file

@ -7,10 +7,10 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
/// <inheritdoc />
public partial class V3_1 : Migration
{
private readonly IElsaDbContextSchema _schema;
private readonly Elsa.EntityFrameworkCore.IElsaDbContextSchema _schema;
/// <inheritdoc />
public V3_1(IElsaDbContextSchema schema)
public V3_1(Elsa.EntityFrameworkCore.IElsaDbContextSchema schema)
{
_schema = schema;
}

View file

@ -7,10 +7,10 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
/// <inheritdoc />
public partial class V3_2 : Migration
{
private readonly IElsaDbContextSchema _schema;
private readonly Elsa.EntityFrameworkCore.IElsaDbContextSchema _schema;
/// <inheritdoc />
public V3_2(IElsaDbContextSchema schema)
public V3_2(Elsa.EntityFrameworkCore.IElsaDbContextSchema schema)
{
_schema = schema;
}

View file

@ -3,6 +3,7 @@ using System;
using Elsa.EntityFrameworkCore.Modules.Runtime;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
@ -11,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
{
[DbContext(typeof(RuntimeElsaDbContext))]
[Migration("20241212211632_V3_3")]
[Migration("20241231124504_V3_3")]
partial class V3_3
{
/// <inheritdoc />
@ -20,9 +21,11 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Elsa")
.HasAnnotation("ProductVersion", "7.0.20")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
modelBuilder.Entity("Elsa.KeyValues.Entities.SerializedKeyValuePair", b =>
{
b.Property<string>("Id")
@ -213,10 +216,6 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
.IsRequired()
.HasColumnType("varchar(255)");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("CorrelationId")
.HasColumnType("longtext");

View file

@ -24,10 +24,11 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropPrimaryKey(
name: "PK_Bookmarks",
migrationBuilder.RenameColumn(
name: "BookmarkId",
schema: _schema.Schema,
table: "Bookmarks");
table: "Bookmarks",
newName: "Id");
migrationBuilder.AddColumn<string>(
name: "TenantId",
@ -81,26 +82,6 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "BookmarkId",
schema: _schema.Schema,
table: "Bookmarks",
type: "longtext",
nullable: false,
oldClrType: typeof(string),
oldType: "varchar(255)")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks",
type: "varchar(255)",
nullable: false,
defaultValue: "")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "TenantId",
schema: _schema.Schema,
@ -123,12 +104,6 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
table: "KeyValuePairs",
column: "Id");
migrationBuilder.AddPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks",
column: "Id");
migrationBuilder.CreateTable(
name: "BookmarkQueueItems",
schema: _schema.Schema,
@ -266,11 +241,6 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks");
migrationBuilder.DropIndex(
name: "IX_StoredBookmark_TenantId",
schema: _schema.Schema,
@ -306,11 +276,6 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropColumn(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks");
migrationBuilder.DropColumn(
name: "TenantId",
schema: _schema.Schema,
@ -321,6 +286,12 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
schema: _schema.Schema,
table: "ActivityExecutionRecords");
migrationBuilder.RenameColumn(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks",
newName: "BookmarkId");
migrationBuilder.AlterColumn<string>(
name: "Key",
schema: _schema.Schema,
@ -332,28 +303,11 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "BookmarkId",
schema: _schema.Schema,
table: "Bookmarks",
type: "varchar(255)",
nullable: false,
oldClrType: typeof(string),
oldType: "longtext")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddPrimaryKey(
name: "PK_KeyValuePairs",
schema: _schema.Schema,
table: "KeyValuePairs",
column: "Key");
migrationBuilder.AddPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks",
column: "BookmarkId");
}
}
}

View file

@ -3,6 +3,7 @@ using System;
using Elsa.EntityFrameworkCore.Modules.Runtime;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
@ -17,9 +18,11 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Elsa")
.HasAnnotation("ProductVersion", "7.0.20")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
modelBuilder.Entity("Elsa.KeyValues.Entities.SerializedKeyValuePair", b =>
{
b.Property<string>("Id")
@ -210,10 +213,6 @@ namespace Elsa.EntityFrameworkCore.MySql.Migrations.Runtime
.IsRequired()
.HasColumnType("varchar(255)");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("CorrelationId")
.HasColumnType("longtext");

View file

@ -12,7 +12,7 @@ using Oracle.EntityFrameworkCore.Metadata;
namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
{
[DbContext(typeof(RuntimeElsaDbContext))]
[Migration("20241212211722_V3_3")]
[Migration("20241231124811_V3_3")]
partial class V3_3
{
/// <inheritdoc />
@ -21,7 +21,7 @@ namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Elsa")
.HasAnnotation("ProductVersion", "7.0.20")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
OracleModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@ -76,7 +76,7 @@ namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
.HasColumnType("TIMESTAMP(7) WITH TIME ZONE");
b.Property<bool>("HasBookmarks")
.HasColumnType("NUMBER(1)");
.HasColumnType("BOOLEAN");
b.Property<string>("SerializedActivityState")
.HasColumnType("NVARCHAR2(2000)");
@ -216,10 +216,6 @@ namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
.IsRequired()
.HasColumnType("NVARCHAR2(450)");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("NVARCHAR2(2000)");
b.Property<string>("CorrelationId")
.HasColumnType("NVARCHAR2(2000)");

View file

@ -35,7 +35,7 @@ namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
ActivityTypeVersion = table.Column<int>(type: "NUMBER(10)", nullable: false),
ActivityName = table.Column<string>(type: "NVARCHAR2(450)", nullable: true),
StartedAt = table.Column<DateTimeOffset>(type: "TIMESTAMP(7) WITH TIME ZONE", nullable: false),
HasBookmarks = table.Column<bool>(type: "NUMBER(1)", nullable: false),
HasBookmarks = table.Column<bool>(type: "BOOLEAN", nullable: false),
Status = table.Column<string>(type: "NVARCHAR2(450)", nullable: false),
CompletedAt = table.Column<DateTimeOffset>(type: "TIMESTAMP(7) WITH TIME ZONE", nullable: true),
SerializedActivityState = table.Column<string>(type: "NVARCHAR2(2000)", nullable: true),
@ -78,7 +78,6 @@ namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
columns: table => new
{
Id = table.Column<string>(type: "NVARCHAR2(450)", nullable: false),
BookmarkId = table.Column<string>(type: "NVARCHAR2(2000)", nullable: false),
ActivityTypeName = table.Column<string>(type: "NVARCHAR2(450)", nullable: false),
Hash = table.Column<string>(type: "NVARCHAR2(450)", nullable: false),
WorkflowInstanceId = table.Column<string>(type: "NVARCHAR2(450)", nullable: false),

View file

@ -18,7 +18,7 @@ namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Elsa")
.HasAnnotation("ProductVersion", "7.0.20")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
OracleModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@ -73,7 +73,7 @@ namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
.HasColumnType("TIMESTAMP(7) WITH TIME ZONE");
b.Property<bool>("HasBookmarks")
.HasColumnType("NUMBER(1)");
.HasColumnType("BOOLEAN");
b.Property<string>("SerializedActivityState")
.HasColumnType("NVARCHAR2(2000)");
@ -213,10 +213,6 @@ namespace Elsa.EntityFrameworkCore.Oracle.Migrations.Runtime
.IsRequired()
.HasColumnType("NVARCHAR2(450)");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("NVARCHAR2(2000)");
b.Property<string>("CorrelationId")
.HasColumnType("NVARCHAR2(2000)");

View file

@ -1,4 +1,4 @@

using Elsa.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

View file

@ -7,10 +7,10 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
/// <inheritdoc />
public partial class V3_1 : Migration
{
private readonly IElsaDbContextSchema _schema;
private readonly Elsa.EntityFrameworkCore.IElsaDbContextSchema _schema;
/// <inheritdoc />
public V3_1(IElsaDbContextSchema schema)
public V3_1(Elsa.EntityFrameworkCore.IElsaDbContextSchema schema)
{
_schema = schema;
}

View file

@ -7,10 +7,10 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
/// <inheritdoc />
public partial class V3_2 : Migration
{
private readonly IElsaDbContextSchema _schema;
private readonly Elsa.EntityFrameworkCore.IElsaDbContextSchema _schema;
/// <inheritdoc />
public V3_2(IElsaDbContextSchema schema)
public V3_2(Elsa.EntityFrameworkCore.IElsaDbContextSchema schema)
{
_schema = schema;
}

View file

@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
{
[DbContext(typeof(RuntimeElsaDbContext))]
[Migration("20241212211710_V3_3")]
[Migration("20241231124728_V3_3")]
partial class V3_3
{
/// <inheritdoc />
@ -21,7 +21,7 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Elsa")
.HasAnnotation("ProductVersion", "7.0.20")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@ -216,10 +216,6 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
.IsRequired()
.HasColumnType("text");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("text");
b.Property<string>("CorrelationId")
.HasColumnType("text");

View file

@ -24,10 +24,11 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropPrimaryKey(
name: "PK_Bookmarks",
migrationBuilder.RenameColumn(
name: "BookmarkId",
schema: _schema.Schema,
table: "Bookmarks");
table: "Bookmarks",
newName: "Id");
migrationBuilder.AddColumn<string>(
name: "TenantId",
@ -65,14 +66,6 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
type: "text",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks",
type: "text",
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "TenantId",
schema: _schema.Schema,
@ -93,12 +86,6 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
table: "KeyValuePairs",
column: "Id");
migrationBuilder.AddPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks",
column: "Id");
migrationBuilder.CreateTable(
name: "BookmarkQueueItems",
schema: _schema.Schema,
@ -226,11 +213,6 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks");
migrationBuilder.DropIndex(
name: "IX_StoredBookmark_TenantId",
schema: _schema.Schema,
@ -266,11 +248,6 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropColumn(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks");
migrationBuilder.DropColumn(
name: "TenantId",
schema: _schema.Schema,
@ -281,17 +258,17 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
schema: _schema.Schema,
table: "ActivityExecutionRecords");
migrationBuilder.RenameColumn(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks",
newName: "BookmarkId");
migrationBuilder.AddPrimaryKey(
name: "PK_KeyValuePairs",
schema: _schema.Schema,
table: "KeyValuePairs",
column: "Key");
migrationBuilder.AddPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks",
column: "BookmarkId");
}
}
}

View file

@ -18,7 +18,7 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Elsa")
.HasAnnotation("ProductVersion", "7.0.20")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@ -213,10 +213,6 @@ namespace Elsa.EntityFrameworkCore.PostgreSql.Migrations.Runtime
.IsRequired()
.HasColumnType("text");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("text");
b.Property<string>("CorrelationId")
.HasColumnType("text");

View file

@ -1,4 +1,4 @@

using Elsa.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

View file

@ -7,10 +7,10 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
/// <inheritdoc />
public partial class V3_1 : Migration
{
private readonly IElsaDbContextSchema _schema;
private readonly Elsa.EntityFrameworkCore.IElsaDbContextSchema _schema;
/// <inheritdoc />
public V3_1(IElsaDbContextSchema schema)
public V3_1(Elsa.EntityFrameworkCore.IElsaDbContextSchema schema)
{
_schema = schema;
}

View file

@ -7,10 +7,10 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
/// <inheritdoc />
public partial class V3_2 : Migration
{
private readonly IElsaDbContextSchema _schema;
private readonly Elsa.EntityFrameworkCore.IElsaDbContextSchema _schema;
/// <inheritdoc />
public V3_2(IElsaDbContextSchema schema)
public V3_2(Elsa.EntityFrameworkCore.IElsaDbContextSchema schema)
{
_schema = schema;
}

View file

@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
{
[DbContext(typeof(RuntimeElsaDbContext))]
[Migration("20241212211646_V3_3")]
[Migration("20241231124643_V3_3")]
partial class V3_3
{
/// <inheritdoc />
@ -21,7 +21,7 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Elsa")
.HasAnnotation("ProductVersion", "7.0.20")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@ -216,10 +216,6 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
.IsRequired()
.HasColumnType("nvarchar(450)");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("CorrelationId")
.HasColumnType("nvarchar(max)");

View file

@ -24,10 +24,11 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropPrimaryKey(
name: "PK_Bookmarks",
migrationBuilder.RenameColumn(
name: "BookmarkId",
schema: _schema.Schema,
table: "Bookmarks");
table: "Bookmarks",
newName: "Id");
migrationBuilder.AddColumn<string>(
name: "TenantId",
@ -74,23 +75,6 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
type: "nvarchar(450)",
nullable: true);
migrationBuilder.AlterColumn<string>(
name: "BookmarkId",
schema: _schema.Schema,
table: "Bookmarks",
type: "nvarchar(max)",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AddColumn<string>(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks",
type: "nvarchar(450)",
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "TenantId",
schema: _schema.Schema,
@ -111,12 +95,6 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
table: "KeyValuePairs",
column: "Id");
migrationBuilder.AddPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks",
column: "Id");
migrationBuilder.CreateTable(
name: "BookmarkQueueItems",
schema: _schema.Schema,
@ -244,11 +222,6 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks");
migrationBuilder.DropIndex(
name: "IX_StoredBookmark_TenantId",
schema: _schema.Schema,
@ -284,11 +257,6 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
schema: _schema.Schema,
table: "KeyValuePairs");
migrationBuilder.DropColumn(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks");
migrationBuilder.DropColumn(
name: "TenantId",
schema: _schema.Schema,
@ -299,6 +267,12 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
schema: _schema.Schema,
table: "ActivityExecutionRecords");
migrationBuilder.RenameColumn(
name: "Id",
schema: _schema.Schema,
table: "Bookmarks",
newName: "BookmarkId");
migrationBuilder.AlterColumn<string>(
name: "Key",
schema: _schema.Schema,
@ -308,26 +282,11 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
oldClrType: typeof(string),
oldType: "nvarchar(max)");
migrationBuilder.AlterColumn<string>(
name: "BookmarkId",
schema: _schema.Schema,
table: "Bookmarks",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(max)");
migrationBuilder.AddPrimaryKey(
name: "PK_KeyValuePairs",
schema: _schema.Schema,
table: "KeyValuePairs",
column: "Key");
migrationBuilder.AddPrimaryKey(
name: "PK_Bookmarks",
schema: _schema.Schema,
table: "Bookmarks",
column: "BookmarkId");
}
}
}

View file

@ -18,7 +18,7 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Elsa")
.HasAnnotation("ProductVersion", "7.0.20")
.HasAnnotation("ProductVersion", "9.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@ -213,10 +213,6 @@ namespace Elsa.EntityFrameworkCore.SqlServer.Migrations.Runtime
.IsRequired()
.HasColumnType("nvarchar(450)");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("CorrelationId")
.HasColumnType("nvarchar(max)");

View file

@ -7,10 +7,10 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
/// <inheritdoc />
public partial class V3_1 : Migration
{
private readonly IElsaDbContextSchema _schema;
private readonly Elsa.EntityFrameworkCore.IElsaDbContextSchema _schema;
/// <inheritdoc />
public V3_1(IElsaDbContextSchema schema)
public V3_1(Elsa.EntityFrameworkCore.IElsaDbContextSchema schema)
{
_schema = schema;
}

View file

@ -7,10 +7,10 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
/// <inheritdoc />
public partial class V3_2 : Migration
{
private readonly IElsaDbContextSchema _schema;
private readonly Elsa.EntityFrameworkCore.IElsaDbContextSchema _schema;
/// <inheritdoc />
public V3_2(IElsaDbContextSchema schema)
public V3_2(Elsa.EntityFrameworkCore.IElsaDbContextSchema schema)
{
_schema = schema;
}

View file

@ -11,14 +11,14 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
{
[DbContext(typeof(RuntimeElsaDbContext))]
[Migration("20241212211658_V3_3")]
[Migration("20241231122946_V3_3")]
partial class V3_3
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "7.0.20");
modelBuilder.HasAnnotation("ProductVersion", "9.0.0");
modelBuilder.Entity("Elsa.KeyValues.Entities.SerializedKeyValuePair", b =>
{
@ -210,10 +210,6 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("CorrelationId")
.HasColumnType("TEXT");

View file

@ -23,9 +23,10 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
name: "PK_KeyValuePairs",
table: "KeyValuePairs");
migrationBuilder.DropPrimaryKey(
name: "PK_Bookmarks",
table: "Bookmarks");
migrationBuilder.RenameColumn(
name: "BookmarkId",
table: "Bookmarks",
newName: "Id");
migrationBuilder.AddColumn<string>(
name: "TenantId",
@ -58,13 +59,6 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
type: "TEXT",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Id",
table: "Bookmarks",
type: "TEXT",
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "TenantId",
table: "Bookmarks",
@ -82,11 +76,6 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
table: "KeyValuePairs",
column: "Id");
migrationBuilder.AddPrimaryKey(
name: "PK_Bookmarks",
table: "Bookmarks",
column: "Id");
migrationBuilder.CreateTable(
name: "BookmarkQueueItems",
columns: table => new
@ -195,10 +184,6 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
name: "IX_SerializedKeyValuePair_TenantId",
table: "KeyValuePairs");
migrationBuilder.DropPrimaryKey(
name: "PK_Bookmarks",
table: "Bookmarks");
migrationBuilder.DropIndex(
name: "IX_StoredBookmark_TenantId",
table: "Bookmarks");
@ -227,10 +212,6 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
name: "TenantId",
table: "KeyValuePairs");
migrationBuilder.DropColumn(
name: "Id",
table: "Bookmarks");
migrationBuilder.DropColumn(
name: "TenantId",
table: "Bookmarks");
@ -239,15 +220,15 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
name: "TenantId",
table: "ActivityExecutionRecords");
migrationBuilder.RenameColumn(
name: "Id",
table: "Bookmarks",
newName: "BookmarkId");
migrationBuilder.AddPrimaryKey(
name: "PK_KeyValuePairs",
table: "KeyValuePairs",
column: "Key");
migrationBuilder.AddPrimaryKey(
name: "PK_Bookmarks",
table: "Bookmarks",
column: "BookmarkId");
}
}
}

View file

@ -15,7 +15,7 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "7.0.20");
modelBuilder.HasAnnotation("ProductVersion", "9.0.0");
modelBuilder.Entity("Elsa.KeyValues.Entities.SerializedKeyValuePair", b =>
{
@ -207,10 +207,6 @@ namespace Elsa.EntityFrameworkCore.Sqlite.Migrations.Runtime
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("BookmarkId")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("CorrelationId")
.HasColumnType("TEXT");

View file

@ -1 +1 @@
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.Common.Contracts.IElsaDbContextSchema --efOptions "migrations add V3_3 -c SecretsDbContext -o Migrations"
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.IElsaDbContextSchema --efOptions "migrations add V3_3 -c SecretsDbContext -o Migrations"

View file

@ -1 +1 @@
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.Common.Contracts.IElsaDbContextSchema --efOptions "migrations add V3_3 -c SecretsDbContext -o Migrations"
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.IElsaDbContextSchema --efOptions "migrations add V3_3 -c SecretsDbContext -o Migrations"

View file

@ -1 +1 @@
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.Common.Contracts.IElsaDbContextSchema --efOptions "migrations add V3_3 -c SecretsDbContext -o Migrations"
ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.IElsaDbContextSchema --efOptions "migrations add V3_3 -c SecretsDbContext -o Migrations"

View file

@ -7,12 +7,6 @@ namespace Elsa.Workflows.Runtime.Entities;
/// </summary>
public class StoredBookmark : Entity
{
[Obsolete("Use Id instead.")] public string BookmarkId
{
get => Id;
set => Id = value;
}
/// <summary>
/// The name of the activity type associated with the bookmark.
/// </summary>