diff options
| author | JPVenson <github@jpb.email> | 2025-02-02 02:07:04 +0000 |
|---|---|---|
| committer | JPVenson <github@jpb.email> | 2025-02-02 02:07:04 +0000 |
| commit | ebe89c07b39702a3b8205d2070d95a5f79d3b1d2 (patch) | |
| tree | d7a2204ac4619c76c38da505840b3cce77681774 | |
| parent | 379a104cfbeaf3c3db5988865aa2db67875a76f1 (diff) | |
Fixed collation and pgsql container
3 files changed, 6 insertions, 5 deletions
diff --git a/.devcontainer/pgsql/docker-compose.yaml b/.devcontainer/pgsql/docker-compose.yaml index 7aa56dd0d..dda6deda6 100644 --- a/.devcontainer/pgsql/docker-compose.yaml +++ b/.devcontainer/pgsql/docker-compose.yaml @@ -25,7 +25,7 @@ services: image: postgres:17.2 restart: unless-stopped volumes: - - ./pgdata/var/lib/postgresql/data + - ./pgdata:/var/lib/postgresql/data environment: POSTGRES_PASSWORD: jellyfin POSTGRES_USER: jellyfin diff --git a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/20250127174201_InitMigration.cs b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/20250127174201_InitMigration.cs index ac9ce3be5..ad1d28b13 100644 --- a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/20250127174201_InitMigration.cs +++ b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/20250127174201_InitMigration.cs @@ -964,19 +964,21 @@ namespace Jellyfin.Database.Providers.PgSql.Migrations table: "Peoples", column: "Name"); + // this was edited manually because "UserId" is a reserved name in pgsql migrationBuilder.CreateIndex( name: "IX_Permissions_UserId_Kind", table: "Permissions", columns: new[] { "UserId", "Kind" }, unique: true, - filter: "[UserId] IS NOT NULL"); + filter: "\"Permissions\".\"UserId\" IS NOT NULL"); + // this was edited manually because "UserId" is a reserved name in pgsql migrationBuilder.CreateIndex( name: "IX_Preferences_UserId_Kind", table: "Preferences", columns: new[] { "UserId", "Kind" }, unique: true, - filter: "[UserId] IS NOT NULL"); + filter: "\"Preferences\".\"UserId\" IS NOT NULL"); migrationBuilder.CreateIndex( name: "IX_UserData_ItemId_UserId_IsFavorite", diff --git a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/JellyfinDbContextModelSnapshot.cs b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/JellyfinDbContextModelSnapshot.cs index cdaf257d4..2d0c783be 100644 --- a/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/JellyfinDbContextModelSnapshot.cs +++ b/Jellyfin.Database/Jellyfin.Database.Providers.PgSql/Migrations/JellyfinDbContextModelSnapshot.cs @@ -1273,8 +1273,7 @@ namespace Jellyfin.Database.Providers.PgSql.Migrations b.Property<string>("Username") .IsRequired() .HasMaxLength(255) - .HasColumnType("character varying(255)") - .UseCollation("NOCASE"); + .HasColumnType("character varying(255)"); b.HasKey("Id"); |