소스 검색

Fixed collation and pgsql container

JPVenson 4 달 전
부모
커밋
ebe89c07b3

+ 1 - 1
.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

+ 4 - 2
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",

+ 1 - 2
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");