winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

AppDbContext: Add ExecuteEmbeddedScript()

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-01-05 13:55:50 +01:00
parent e75e2ddbda
commit 3f6a94e773
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Elwig/Helpers/AppDbContext.cs
View File

@ -10,6 +10,7 @@ using Microsoft.Data.Sqlite;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Collections.Generic; using System.Collections.Generic;
using Elwig.Models.Dtos; using Elwig.Models.Dtos;
using System.Reflection;
namespace Elwig.Helpers { namespace Elwig.Helpers {
@ -106,6 +107,12 @@ namespace Elwig.Helpers {
await (await cmd.ExecuteReaderAsync()).CloseAsync(); await (await cmd.ExecuteReaderAsync()).CloseAsync();
} }
public static async Task ExecuteEmbeddedScript(SqliteConnection cnx, Assembly asm, string name) {
using var stream = asm.GetManifestResourceStream(name) ?? throw new FileNotFoundException("Unable to load embedded resource");
using var reader = new StreamReader(stream);
await ExecuteBatch(cnx, await reader.ReadToEndAsync());
}
public static async Task<object?> ExecuteScalar(SqliteConnection cnx, string sql) { public static async Task<object?> ExecuteScalar(SqliteConnection cnx, string sql) {
using var cmd = cnx.CreateCommand(); using var cmd = cnx.CreateCommand();
cmd.CommandText = sql; cmd.CommandText = sql;

7
Elwig/Helpers/AppDbUpdater.cs
View File

@ -1,7 +1,6 @@
using Microsoft.Data.Sqlite; using Microsoft.Data.Sqlite;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -44,7 +43,7 @@ namespace Elwig.Helpers {
private static async Task UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) { private static async Task UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) {
if (fromVersion == toVersion) { if (fromVersion == toVersion) {
//return; return;
} else if (fromVersion > toVersion) { } else if (fromVersion > toVersion) {
throw new Exception("schema_version of database is too new"); throw new Exception("schema_version of database is too new");
} else if (fromVersion <= 0) { } else if (fromVersion <= 0) {
@ -77,9 +76,7 @@ namespace Elwig.Helpers {
BEGIN EXCLUSIVE; BEGIN EXCLUSIVE;
"""); """);
foreach (var script in toExecute) { foreach (var script in toExecute) {
using var stream = asm.GetManifestResourceStream(script) ?? throw new Exception("Unable to load embedded resource"); await AppDbContext.ExecuteEmbeddedScript(cnx, asm, script);
using var reader = new StreamReader(stream);
await AppDbContext.ExecuteBatch(cnx, await reader.ReadToEndAsync());
} }
await AppDbContext.ExecuteBatch(cnx, $""" await AppDbContext.ExecuteBatch(cnx, $"""
PRAGMA foreign_key_check; PRAGMA foreign_key_check;