From 46fb31cb98130beda64b1c02d9198e06cc21a447 Mon Sep 17 00:00:00 2001 From: Victor Usoltsev Date: Wed, 7 Oct 2020 15:29:38 +1300 Subject: [PATCH 1/2] Fixes url output. --- src/Ombi/Program.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Ombi/Program.cs b/src/Ombi/Program.cs index a4354e230..49ed32d85 100644 --- a/src/Ombi/Program.cs +++ b/src/Ombi/Program.cs @@ -96,6 +96,10 @@ public static void Main(string[] args) urlValue = url.Value; } + else if (string.IsNullOrEmpty(urlValue)) + { + urlValue = host; + } if (dbBaseUrl == null) { From deb6881c33871da251777d3694d28aa03efbce2a Mon Sep 17 00:00:00 2001 From: Victor Usoltsev Date: Wed, 7 Oct 2020 15:29:53 +1300 Subject: [PATCH 2/2] Fixes unique constraint violation for SQLite database. --- src/Ombi.Store/Context/Sqlite/ExternalSqliteContext.cs | 2 +- src/Ombi.Store/Context/Sqlite/OmbiSqliteContext.cs | 2 +- src/Ombi.Store/Context/Sqlite/SettingsSqliteContext.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Ombi.Store/Context/Sqlite/ExternalSqliteContext.cs b/src/Ombi.Store/Context/Sqlite/ExternalSqliteContext.cs index adbf6e017..c85084d4a 100644 --- a/src/Ombi.Store/Context/Sqlite/ExternalSqliteContext.cs +++ b/src/Ombi.Store/Context/Sqlite/ExternalSqliteContext.cs @@ -24,7 +24,7 @@ private void Upgrade() { try { - Database.ExecuteSqlCommand(@"INSERT INTO __EFMigrationsHistory (MigrationId,ProductVersion) + Database.ExecuteSqlRaw(@"INSERT OR IGNORE INTO __EFMigrationsHistory (MigrationId,ProductVersion) VALUES('20191103205133_Inital', '2.2.6-servicing-10079'); "); } catch (Exception) diff --git a/src/Ombi.Store/Context/Sqlite/OmbiSqliteContext.cs b/src/Ombi.Store/Context/Sqlite/OmbiSqliteContext.cs index 5d6e29e31..c47694587 100644 --- a/src/Ombi.Store/Context/Sqlite/OmbiSqliteContext.cs +++ b/src/Ombi.Store/Context/Sqlite/OmbiSqliteContext.cs @@ -22,7 +22,7 @@ private void Upgrade() { try { - Database.ExecuteSqlCommand(@"INSERT INTO __EFMigrationsHistory (MigrationId,ProductVersion) + Database.ExecuteSqlRaw(@"INSERT OR IGNORE INTO __EFMigrationsHistory (MigrationId,ProductVersion) VALUES('20191102235658_Inital', '2.2.6-servicing-10079'); "); } catch (Exception) diff --git a/src/Ombi.Store/Context/Sqlite/SettingsSqliteContext.cs b/src/Ombi.Store/Context/Sqlite/SettingsSqliteContext.cs index 19e155a71..4245ecb1e 100644 --- a/src/Ombi.Store/Context/Sqlite/SettingsSqliteContext.cs +++ b/src/Ombi.Store/Context/Sqlite/SettingsSqliteContext.cs @@ -20,7 +20,7 @@ private void Upgrade() { try { - Database.ExecuteSqlCommand(@"INSERT INTO __EFMigrationsHistory (MigrationId,ProductVersion) + Database.ExecuteSqlRaw(@"INSERT OR IGNORE INTO __EFMigrationsHistory (MigrationId,ProductVersion) VALUES('20191103205204_Inital', '2.2.6-servicing-10079'); "); } catch (Exception)