Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14269 from JPVenson/bugfix/BackupTableNames

Browse Source 
Fix schema name on backup
This commit is contained in:
Niels van Velzen 2025-06-10 17:34:16 +02:00 committed by GitHub
commit c8a51160b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs
View File

@ -292,12 +292,12 @@ public class BackupService : IBackupService
var historyRepository = dbContext.GetService<IHistoryRepository>(); var historyRepository = dbContext.GetService<IHistoryRepository>();
var migrations = await historyRepository.GetAppliedMigrationsAsync().ConfigureAwait(false); var migrations = await historyRepository.GetAppliedMigrationsAsync().ConfigureAwait(false);
ICollection<(Type Type, Func<IAsyncEnumerable<object>> ValueFactory)> entityTypes = [ ICollection<(Type Type, string SourceName, Func<IAsyncEnumerable<object>> ValueFactory)> entityTypes = [
.. typeof(JellyfinDbContext) .. typeof(JellyfinDbContext)
.GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance) .GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance)
.Where(e => e.PropertyType.IsAssignableTo(typeof(IQueryable))) .Where(e => e.PropertyType.IsAssignableTo(typeof(IQueryable)))
.Select(e => (Type: e.PropertyType, ValueFactory: new Func<IAsyncEnumerable<object>>(() => GetValues((IQueryable)e.GetValue(dbContext)!, e.PropertyType)))), .Select(e => (Type: e.PropertyType, dbContext.Model.FindEntityType(e.PropertyType.GetGenericArguments()[0])!.GetSchemaQualifiedTableName()!, ValueFactory: new Func<IAsyncEnumerable<object>>(() => GetValues((IQueryable)e.GetValue(dbContext)!, e.PropertyType)))),
(Type: typeof(HistoryRow), ValueFactory: new Func<IAsyncEnumerable<object>>(() => migrations.ToAsyncEnumerable())) (Type: typeof(HistoryRow), SourceName: nameof(HistoryRow), ValueFactory: new Func<IAsyncEnumerable<object>>(() => migrations.ToAsyncEnumerable()))
]; ];
manifest.DatabaseTables = entityTypes.Select(e => e.Type.Name).ToArray(); manifest.DatabaseTables = entityTypes.Select(e => e.Type.Name).ToArray();
var transaction = await dbContext.Database.BeginTransactionAsync().ConfigureAwait(false); var transaction = await dbContext.Database.BeginTransactionAsync().ConfigureAwait(false);
@ -308,8 +308,8 @@ public class BackupService : IBackupService
foreach (var entityType in entityTypes) foreach (var entityType in entityTypes)
{ {
_logger.LogInformation("Begin backup of entity {Table}", entityType.Type.Name); _logger.LogInformation("Begin backup of entity {Table}", entityType.SourceName);
var zipEntry = zipArchive.CreateEntry($"Database\\{entityType.Type.Name}.json"); var zipEntry = zipArchive.CreateEntry($"Database\\{entityType.SourceName}.json");
var entities = 0; var entities = 0;
var zipEntryStream = zipEntry.Open(); var zipEntryStream = zipEntry.Open();
await using (zipEntryStream.ConfigureAwait(false)) await using (zipEntryStream.ConfigureAwait(false))