tom/hermes-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tom:61151bef0ce03c47e183e6211cdfc3c03e78107f
Branches Tags
tom:master
...
compare: tom:4979553c74dbb0bbe8fa6e89340e7ad14f007823
Branches Tags
tom:master

2 Commits
61151bef0c ... 4979553c74

Author SHA1 Message Date
Tom
4979553c74 Fixed server crashes from stores' prepared statements. 2024-10-31 19:09:46 +00:00
Tom
5618b28c49 Fixed delete prepared statements from stores 2024-10-31 15:42:43 +00:00
5 changed files with 44 additions and 14 deletions
Show Stats Expand all files Collapse all files

2
Store/ChatterStore.cs
View File

@ -101,7 +101,7 @@ namespace HermesSocketServer.Store
sql = _generator.GeneratePreparedDeleteSql("TtsChatVoice", count, ["userId", "chatterId"]);
_logger.Debug($"User - Deleting {count} rows from database: {sql}");
await _generator.DoPreparedStatement(_database, sql, list, ["id"]);
await _generator.DoPreparedStatementRaw(_database, sql, list, ["id"]);
}
}
}

32
Store/GroupSaveSqlGenerator.cs
View File

@ -21,6 +21,8 @@ namespace HermesSocketServer.Store
}
public async Task DoPreparedStatement<V>(Database database, string sql, IEnumerable<V> values, string[] columns)
{
try
{
await database.Execute(sql, (c) =>
{
@ -30,13 +32,41 @@ namespace HermesSocketServer.Store
foreach (var column in columns)
{
var propValue = columnPropertyRelations[column]!.GetValue(value);
var propType = columnPropertyRelations[column]!.PropertyType;
c.Parameters.AddWithValue(column.ToLower() + valueCounter, propValue ?? DBNull.Value);
}
valueCounter++;
}
});
}
catch (Exception ex)
{
_logger.Error(ex, "Failed to execute a prepared statement: " + sql);
}
}
public async Task DoPreparedStatementRaw<V>(Database database, string sql, IEnumerable<V> values, string[] columns)
{
try
{
await database.Execute(sql, (c) =>
{
var valueCounter = 0;
foreach (var value in values)
{
foreach (var column in columns)
{
object? propValue = value;
c.Parameters.AddWithValue(column.ToLower() + valueCounter, propValue ?? DBNull.Value);
}
valueCounter++;
}
});
}
catch (Exception ex)
{
_logger.Error(ex, "Failed to execute a prepared statement: " + sql);
}
}
public string GenerateInsertSql(string table, IEnumerable<T> values, IEnumerable<string> columns)
{

2
Store/PolicyStore.cs
View File

@ -107,7 +107,7 @@ namespace HermesSocketServer.Store
sql = _generator.GeneratePreparedDeleteSql("GroupPermissionPolicy", count, ["id"]);
_logger.Debug($"GroupPermissionPolicy - Deleting {count} rows from database: {sql}");
await _generator.DoPreparedStatement(_database, sql, list, ["id"]);
await _generator.DoPreparedStatementRaw(_database, sql, list.Select(id => new Guid(id)), ["id"]);
}
}
}

2
Store/UserStore.cs
View File

@ -102,7 +102,7 @@ namespace HermesSocketServer.Store
sql = _generator.GeneratePreparedDeleteSql("User", count, ["id"]);
_logger.Debug($"User - Deleting {count} rows from database: {sql}");
await _generator.DoPreparedStatement(_database, sql, list, ["id"]);
await _generator.DoPreparedStatementRaw(_database, sql, list, ["id"]);
}
}
}

2
Store/VoiceStore.cs
View File

@ -104,7 +104,7 @@ namespace HermesSocketServer.Store
sql = _generator.GeneratePreparedDeleteSql("TtsVoice", count, ["id"]);
_logger.Debug($"User - Deleting {count} rows from database: {sql}");
await _generator.DoPreparedStatement(_database, sql, list, ["id"]);
await _generator.DoPreparedStatementRaw(_database, sql, list, ["id"]);
}
}
}