liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(import): add AddAccount to tx

Browse Source
This commit is contained in:
spiral 2021-10-06 20:24:29 -04:00
parent 655d0d6c44
commit 2e89310129
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PluralKit.Core/Database/Database.cs
View File

@ -186,6 +186,16 @@ namespace PluralKit.Core
return await conn.ExecuteAsync(query.Sql + $" {extraSql}", query.NamedBindings);
}
public async Task<int> ExecuteQuery(IPKConnection? conn, Query q, string extraSql = "", [CallerMemberName] string queryName = "")
{
if (conn == null)
return await ExecuteQuery(q, extraSql, queryName);
var query = _compiler.Compile(q);
using (_metrics.Measure.Timer.Time(CoreMetrics.DatabaseQuery, new MetricTags("Query", queryName)))
return await conn.ExecuteAsync(query.Sql + $" {extraSql}", query.NamedBindings);
}
public async Task<T> QueryFirst<T>(Query q, string extraSql = "", [CallerMemberName] string queryName = "")
{
var query = _compiler.Compile(q);

1
PluralKit.Core/Database/IDatabase.cs
View File

@ -15,6 +15,7 @@ namespace PluralKit.Core
Task<T> Execute<T>(Func<IPKConnection, Task<T>> func);
IAsyncEnumerable<T> Execute<T>(Func<IPKConnection, IAsyncEnumerable<T>> func);
Task<int> ExecuteQuery(Query q, string extraSql = "", [CallerMemberName] string queryName = "");
Task<int> ExecuteQuery(IPKConnection? conn, Query q, string extraSql = "", [CallerMemberName] string queryName = "");
Task<T> QueryFirst<T>(Query q, string extraSql = "", [CallerMemberName] string queryName = "");
Task<T> QueryFirst<T>(IPKConnection? conn, Query q, string extraSql = "", [CallerMemberName] string queryName = "");
Task<IEnumerable<T>> Query<T>(Query q, [CallerMemberName] string queryName = "");

4
PluralKit.Core/Database/Repository/ModelRepository.System.cs
View File

@ -88,7 +88,7 @@ namespace PluralKit.Core
return _db.QueryFirst<PKSystem>(conn, query, extraSql: "returning *");
}
public Task AddAccount(SystemId system, ulong accountId)
public Task AddAccount(SystemId system, ulong accountId, IPKConnection? conn = null)
{
// We have "on conflict do nothing" since linking an account when it's already linked to the same system is idempotent
// This is used in import/export, although the pk;link command checks for this case beforehand
@ -100,7 +100,7 @@ namespace PluralKit.Core
});
_logger.Information("Linked account {UserId} to {SystemId}", accountId, system);
return _db.ExecuteQuery(query, extraSql: "on conflict do nothing");
return _db.ExecuteQuery(conn, query, extraSql: "on conflict do nothing");
}
public async Task RemoveAccount(SystemId system, ulong accountId)

2
PluralKit.Core/Utils/BulkImporter/BulkImporter.cs
View File

@ -49,7 +49,7 @@ namespace PluralKit.Core
if (system == null)
{
system = await repo.CreateSystem(null, importer._conn);
await repo.AddAccount(system.Id, userId);
await repo.AddAccount(system.Id, userId, importer._conn);
importer._result.CreatedSystem = system.Hid;
importer._system = system;
}