diff --git a/src/PostIt/PostIt/Views/Blogs/MainPage.axaml b/src/PostIt/PostIt/Views/Blogs/MainPage.axaml
index 9c5c7715e..2ded71b94 100644
--- a/src/PostIt/PostIt/Views/Blogs/MainPage.axaml
+++ b/src/PostIt/PostIt/Views/Blogs/MainPage.axaml
@@ -12,132 +12,118 @@
x:DataType="vm:BlogsViewModel"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Yavsc.Org.Tests/NonRegression/Database.cs b/src/Yavsc.Org.Tests/NonRegression/Database.cs
index 4633ce177..01cd0a5dc 100644
--- a/src/Yavsc.Org.Tests/NonRegression/Database.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/Database.cs
@@ -1,44 +1,34 @@
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
-using Yavsc.Models;
namespace Yavsc.Org.Tests.Mandatory
-{[Collection("Database")]
+{
+
+ [Collection("Database")]
[Trait("regression", "II")]
[Trait("dev", "wip")]
public class Database: IClassFixture, IDisposable
{
- readonly ITestOutputHelper output;
readonly WebServerFixture _serverFixture;
-
- public Database(ITestOutputHelper output, WebServerFixture _serverFixture)
+ readonly ITestOutputHelper output;
+ public Database(WebServerFixture serverFixture, ITestOutputHelper output)
{
this.output = output;
- this._serverFixture = _serverFixture;
+ _serverFixture = serverFixture;
+
}
///
- /// Assuming we're using an account that may create databases,
+ /// Assuming we're using an account that may create databases,
/// Install all our migrations in a fresh new database.
///
public void Dispose()
{
- if (_serverFixture!=null)
+ if (_serverFixture!=null)
{
_serverFixture.Dispose();
}
}
-
- [Fact]
- public void TestDatabaseMigration()
- {
- // Test logic goes here
- _serverFixture.ResetAndMigrateDatabase();
- }
}
-
}
diff --git a/src/Yavsc.Org.Tests/WebServerFixture.cs b/src/Yavsc.Org.Tests/WebServerFixture.cs
index f82771ec6..4f736ecfe 100644
--- a/src/Yavsc.Org.Tests/WebServerFixture.cs
+++ b/src/Yavsc.Org.Tests/WebServerFixture.cs
@@ -189,20 +189,6 @@ public sealed class WebServerFixture : WebHostFixture
return app;
}
- public void ResetAndMigrateDatabase()
- {
- using var scope = Services.CreateScope();
- var db = scope.ServiceProvider.GetRequiredService();
- db.Database.EnsureDeleted();
- if (db.Database.IsRelational())
- {
- db.Database.Migrate();
- return;
- }
-
- db.Database.EnsureCreated();
- }
-
protected override async Task ConfigurePipelineAsync(WebApplication app)
{
// The MSBuild target CopyYavscOrgStaticAssets in
diff --git a/src/Yavsc.Org/Migrations/20260309015232_init.cs b/src/Yavsc.Org/Migrations/20260309015232_init.cs
index a61679882..8780da0d5 100644
--- a/src/Yavsc.Org/Migrations/20260309015232_init.cs
+++ b/src/Yavsc.Org/Migrations/20260309015232_init.cs
@@ -11,10 +11,6 @@ namespace Yavsc.Migrations
///
protected override void Up(MigrationBuilder migrationBuilder)
{
- var declarationDateDefaultSql = ActiveProvider == "Microsoft.EntityFrameworkCore.Sqlite"
- ? "CURRENT_TIMESTAMP"
- : "LOCALTIMESTAMP";
-
migrationBuilder.CreateTable(
name: "Activities",
columns: table => new
@@ -1488,7 +1484,7 @@ namespace Yavsc.Migrations
Platform = table.Column(type: "text", nullable: true),
Version = table.Column(type: "text", nullable: true),
DeviceOwnerId = table.Column(type: "text", nullable: true),
- DeclarationDate = table.Column(type: "timestamp with time zone", nullable: false, defaultValueSql: declarationDateDefaultSql),
+ DeclarationDate = table.Column(type: "timestamp with time zone", nullable: false, defaultValueSql: "LOCALTIMESTAMP"),
LatestActivityUpdate = table.Column(type: "timestamp with time zone", nullable: true)
},
constraints: table =>