From 222157150ca59a2543daee521b71ae72454d0a23 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 12 Jul 2020 22:07:45 +0100 Subject: [PATCH] Use new fluentmigrator prerelease feed, update to alpha 289 --- src/NuGet.config | 2 +- .../SqliteSchemaDumperTests/SqliteSchemaDumperFixture.cs | 4 ++-- .../Datastore/Migration/001_initial_setup.cs | 2 +- .../Datastore/Migration/Framework/SqliteSchemaDumper.cs | 8 +++++++- src/NzbDrone.Core/Readarr.Core.csproj | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/NuGet.config b/src/NuGet.config index fe2786db8..48bad0510 100644 --- a/src/NuGet.config +++ b/src/NuGet.config @@ -3,6 +3,6 @@ - + diff --git a/src/NzbDrone.Core.Test/Datastore/SqliteSchemaDumperTests/SqliteSchemaDumperFixture.cs b/src/NzbDrone.Core.Test/Datastore/SqliteSchemaDumperTests/SqliteSchemaDumperFixture.cs index 64efa19ba..c476be133 100644 --- a/src/NzbDrone.Core.Test/Datastore/SqliteSchemaDumperTests/SqliteSchemaDumperFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/SqliteSchemaDumperTests/SqliteSchemaDumperFixture.cs @@ -73,9 +73,9 @@ namespace NzbDrone.Core.Test.Datastore.SqliteSchemaDumperTests result.Name.Should().Be("TestTable"); result.Columns.Count.Should().Be(2); result.Columns.First().Name.Should().Be("MyId"); - result.Columns.First().Type.Should().Be(DbType.Int64); + result.Columns.First().Type.Should().Be(DbType.Int32); result.Columns.Last().Name.Should().Be("MyCol"); - result.Columns.Last().Type.Should().Be(DbType.Int64); + result.Columns.Last().Type.Should().Be(DbType.Int32); } } } diff --git a/src/NzbDrone.Core/Datastore/Migration/001_initial_setup.cs b/src/NzbDrone.Core/Datastore/Migration/001_initial_setup.cs index eb9c15be1..a152edc4d 100644 --- a/src/NzbDrone.Core/Datastore/Migration/001_initial_setup.cs +++ b/src/NzbDrone.Core/Datastore/Migration/001_initial_setup.cs @@ -162,7 +162,7 @@ namespace NzbDrone.Core.Datastore.Migration .WithColumn("Name").AsString().Unique() .WithColumn("Cutoff").AsInt32() .WithColumn("Items").AsString().NotNullable() - .WithColumn("UpgradeAllowed").AsInt32().Nullable(); + .WithColumn("UpgradeAllowed").AsBoolean().Nullable(); Create.TableForModel("MetadataProfiles") .WithColumn("Name").AsString().Unique() diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteSchemaDumper.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteSchemaDumper.cs index 57b984c5a..358dc52b1 100644 --- a/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteSchemaDumper.cs +++ b/src/NzbDrone.Core/Datastore/Migration/Framework/SqliteSchemaDumper.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Data; using FluentMigrator.Model; using FluentMigrator.Runner.Processors.SQLite; @@ -228,6 +228,8 @@ namespace NzbDrone.Core.Datastore.Migration.Framework case "BLOB": return DbType.Binary; case "INTEGER": + return DbType.Int32; + case "BIGINT": return DbType.Int64; case "NUMERIC": return DbType.Double; @@ -237,6 +239,10 @@ namespace NzbDrone.Core.Datastore.Migration.Framework return DbType.DateTime; case "UNIQUEIDENTIFIER": return DbType.Guid; + case "SMALLINT": + return DbType.Int16; + case "TINYINT": + return DbType.Boolean; default: return null; } diff --git a/src/NzbDrone.Core/Readarr.Core.csproj b/src/NzbDrone.Core/Readarr.Core.csproj index 36802952d..75f65cad5 100644 --- a/src/NzbDrone.Core/Readarr.Core.csproj +++ b/src/NzbDrone.Core/Readarr.Core.csproj @@ -9,8 +9,8 @@ - - + +