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

Use data binding instead of raw SQL

Browse Source
This commit is contained in:
Patrick Barron 2020-06-04 14:54:43 -04:00
parent b0281b79fd
commit ef7bbb3b84
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using Emby.Server.Implementations.Data; using Emby.Server.Implementations.Data;
using Jellyfin.Data.Entities; using Jellyfin.Data.Entities;
using Jellyfin.Server.Implementations; using Jellyfin.Server.Implementations;
@ -68,7 +67,7 @@ namespace Jellyfin.Server.Migrations.Routines
_logger.LogWarning("Migrating the activity database may take a while, do not stop Jellyfin."); _logger.LogWarning("Migrating the activity database may take a while, do not stop Jellyfin.");
using var dbContext = _provider.CreateContext(); using var dbContext = _provider.CreateContext();
var queryResult = connection.Query("SELECT * FROM ActivityLog ORDER BY Id ASC"); var queryResult = connection.Query("SELECT * FROM ActivityLog ORDER BY Id");
// Make sure that the database is empty in case of failed migration due to power outages, etc. // Make sure that the database is empty in case of failed migration due to power outages, etc.
dbContext.ActivityLogs.RemoveRange(dbContext.ActivityLogs); dbContext.ActivityLogs.RemoveRange(dbContext.ActivityLogs);
@ -86,29 +85,26 @@ namespace Jellyfin.Server.Migrations.Routines
severity = LogLevel.Trace; severity = LogLevel.Trace;
} }
Guid guid; var guid = Guid.Empty;
if (entry[6].SQLiteType == SQLiteType.Null) if (entry[6].SQLiteType != SQLiteType.Null && !Guid.TryParse(entry[6].ToString(), out guid))
{
guid = Guid.Empty;
}
else if (!Guid.TryParse(entry[6].ToString(), out guid))
{ {
// This is not a valid Guid, see if it is an internal ID from an old Emby schema // This is not a valid Guid, see if it is an internal ID from an old Emby schema
var userEntry = userDbConnection _logger.LogWarning("Invalid Guid in UserId column: ", entry[6].ToString());
.Query($"SELECT guid FROM LocalUsersv2 WHERE Id = {entry[6].ToString()}")
.FirstOrDefault();
if (userEntry.Count == 0 || !Guid.TryParse(userEntry[0].ToString(), out guid)) using var statement = userDbConnection.PrepareStatement("SELECT guid FROM LocalUsersv2 WHERE Id=@Id");
statement.TryBind("@Id", entry[6].ToString());
foreach (var row in statement.Query())
{ {
// Give up, just use Guid.Empty if (row.Count > 0 && Guid.TryParse(row[0].ToString(), out guid))
guid = Guid.Empty; {
// Successfully parsed a Guid from the user table.
break;
}
} }
} }
var newEntry = new ActivityLog( var newEntry = new ActivityLog(entry[1].ToString(), entry[4].ToString(), guid)
entry[1].ToString(),
entry[4].ToString(),
guid)
{ {
DateCreated = entry[7].ReadDateTime(), DateCreated = entry[7].ReadDateTime(),
LogSeverity = severity LogSeverity = severity