Skip to content

Commit 4e63ba7

Browse files
committed
Fix broken merge and recreate migrations
1 parent 41d2b5b commit 4e63ba7

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

ProjectLighthouse.Tests/Helpers/MockHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static T2 CastTo<T1, T2>(this IActionResult result) where T1 : ObjectResu
5050
return finalResult;
5151
}
5252

53-
private static async Task<DbContextOptionsBuilder<DatabaseContext>> GetInMemoryDbOptions()
53+
public static async Task<DbContextOptionsBuilder<DatabaseContext>> GetInMemoryDbOptions()
5454
{
5555
DbConnection connection = new SqliteConnection("DataSource=:memory:");
5656
await connection.OpenAsync();

ProjectLighthouse/Migrations/20230725013522_InitialActivity.cs renamed to ProjectLighthouse/Migrations/20240120214525_InitialActivity.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
namespace ProjectLighthouse.Migrations
1010
{
1111
[DbContext(typeof(DatabaseContext))]
12-
[Migration("20230725013522_InitialActivity")]
12+
[Migration("20240120214525_InitialActivity")]
1313
public partial class InitialActivity : Migration
1414
{
15+
/// <inheritdoc />
1516
protected override void Up(MigrationBuilder migrationBuilder)
1617
{
1718
migrationBuilder.CreateTable(
@@ -140,6 +141,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
140141
column: "UserId");
141142
}
142143

144+
/// <inheritdoc />
143145
protected override void Down(MigrationBuilder migrationBuilder)
144146
{
145147
migrationBuilder.DropTable(

ProjectLighthouse/Migrations/20230814031609_AddPublishedAtToAnnouncements.cs renamed to ProjectLighthouse/Migrations/20240120214606_AddPublishedAtToWebAnnouncements.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
namespace ProjectLighthouse.Migrations
99
{
1010
[DbContext(typeof(DatabaseContext))]
11-
[Migration("20230814031609_AddPublishedAtToAnnouncements")]
12-
public partial class AddPublishedAtToAnnouncements : Migration
11+
[Migration("20240120214606_AddPublishedAtToWebAnnouncements")]
12+
public partial class AddPublishedAtToWebAnnouncements : Migration
1313
{
14+
/// <inheritdoc />
1415
protected override void Up(MigrationBuilder migrationBuilder)
1516
{
1617
migrationBuilder.AddColumn<DateTime>(
@@ -21,6 +22,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
2122
defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
2223
}
2324

25+
/// <inheritdoc />
2426
protected override void Down(MigrationBuilder migrationBuilder)
2527
{
2628
migrationBuilder.DropColumn(

ProjectLighthouse/Migrations/DatabaseContextModelSnapshot.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,6 +1107,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
11071107
b.Property<string>("Content")
11081108
.HasColumnType("longtext");
11091109

1110+
b.Property<DateTime>("PublishedAt")
1111+
.HasColumnType("datetime(6)");
1112+
11101113
b.Property<int?>("PublisherId")
11111114
.HasColumnType("int");
11121115

0 commit comments

Comments
 (0)