From a188a0dd995431d65e6d9d0e5aa6b9f9e2a31f99 Mon Sep 17 00:00:00 2001 From: "L. Ellenbeck" Date: Fri, 27 Nov 2020 11:45:11 +0100 Subject: [PATCH 1/2] New: Add ApiToken Table --- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs.orig | 20 ++ src/Migrations/Migrations.csproj | 3 +- src/Migrations/Migrations.csproj.orig | 244 ++++++++++++++++++ .../Migration202010271100ApiTokens.cs | 28 ++ src/Migrations/Properties/AssemblyInfo.cs | 2 +- src/Migrator/Properties/AssemblyInfo.cs | 2 +- 7 files changed, 297 insertions(+), 4 deletions(-) create mode 100644 src/Migrations.Tests/Properties/AssemblyInfo.cs.orig create mode 100644 src/Migrations/Migrations.csproj.orig create mode 100644 src/Migrations/Migrations/Migration202010271100ApiTokens.cs diff --git a/src/Migrations.Tests/Properties/AssemblyInfo.cs b/src/Migrations.Tests/Properties/AssemblyInfo.cs index 3a4339c..60789b8 100644 --- a/src/Migrations.Tests/Properties/AssemblyInfo.cs +++ b/src/Migrations.Tests/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrations.Tests")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1051-basic0004")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0004")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrations.Tests/Properties/AssemblyInfo.cs.orig b/src/Migrations.Tests/Properties/AssemblyInfo.cs.orig new file mode 100644 index 0000000..2198b9c --- /dev/null +++ b/src/Migrations.Tests/Properties/AssemblyInfo.cs.orig @@ -0,0 +1,20 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by Cake. +// +//------------------------------------------------------------------------------ +using System.Reflection; + +[assembly: AssemblyTitle("Migrations.Tests")] +[assembly: AssemblyDescription("Migrations.Tests is a part of the CoScInE group.")] +[assembly: AssemblyCompany("IT Center, RWTH Aachen University")] +[assembly: AssemblyProduct("Migrations.Tests")] +[assembly: AssemblyVersion("1.8.0")] +[assembly: AssemblyFileVersion("1.8.0")] +<<<<<<< HEAD +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0004")] +======= +[assembly: AssemblyInformationalVersion("1.8.0-topic-1051-basic0004")] +>>>>>>> Product/903-ApiTokens +[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] + diff --git a/src/Migrations/Migrations.csproj b/src/Migrations/Migrations.csproj index f1e62af..f8b5cd3 100644 --- a/src/Migrations/Migrations.csproj +++ b/src/Migrations/Migrations.csproj @@ -206,6 +206,7 @@ + @@ -240,4 +241,4 @@ - \ No newline at end of file + diff --git a/src/Migrations/Migrations.csproj.orig b/src/Migrations/Migrations.csproj.orig new file mode 100644 index 0000000..f8b5cd3 --- /dev/null +++ b/src/Migrations/Migrations.csproj.orig @@ -0,0 +1,244 @@ + + + + + Debug + AnyCPU + {447E8BA5-30E3-4521-B6F6-51A064098026} + Library + Properties + Coscine.Migrations + Coscine.Migrations + v4.6.1 + 512 + true + + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Consul.0.7.2.6\lib\net45\Consul.dll + + + ..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll + + + ..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll + + + ..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll + + + ..\packages\FluentMigrator.Abstractions.3.2.8\lib\net461\FluentMigrator.Abstractions.dll + + + ..\packages\FluentMigrator.Extensions.Oracle.3.2.8\lib\net461\FluentMigrator.Extensions.Oracle.dll + + + ..\packages\FluentMigrator.Extensions.Postgres.3.2.8\lib\net461\FluentMigrator.Extensions.Postgres.dll + + + ..\packages\FluentMigrator.Extensions.SqlAnywhere.3.2.8\lib\net461\FluentMigrator.Extensions.SqlAnywhere.dll + + + ..\packages\FluentMigrator.Extensions.SqlServer.3.2.8\lib\net461\FluentMigrator.Extensions.SqlServer.dll + + + ..\packages\FluentMigrator.Runner.3.2.8\lib\net461\FluentMigrator.Runner.dll + + + ..\packages\FluentMigrator.Runner.Core.3.2.8\lib\net461\FluentMigrator.Runner.Core.dll + + + ..\packages\FluentMigrator.Runner.Db2.3.2.8\lib\net461\FluentMigrator.Runner.Db2.dll + + + ..\packages\FluentMigrator.Runner.Firebird.3.2.8\lib\net461\FluentMigrator.Runner.Firebird.dll + + + ..\packages\FluentMigrator.Runner.Hana.3.2.8\lib\net461\FluentMigrator.Runner.Hana.dll + + + ..\packages\FluentMigrator.Runner.Jet.3.2.8\lib\net461\FluentMigrator.Runner.Jet.dll + + + ..\packages\FluentMigrator.Runner.MySql.3.2.8\lib\net461\FluentMigrator.Runner.MySql.dll + + + ..\packages\FluentMigrator.Runner.Oracle.3.2.8\lib\net461\FluentMigrator.Runner.Oracle.dll + + + ..\packages\FluentMigrator.Runner.Postgres.3.2.8\lib\net461\FluentMigrator.Runner.Postgres.dll + + + ..\packages\FluentMigrator.Runner.Redshift.3.2.8\lib\net461\FluentMigrator.Runner.Redshift.dll + + + ..\packages\FluentMigrator.Runner.SqlAnywhere.3.2.8\lib\net461\FluentMigrator.Runner.SqlAnywhere.dll + + + ..\packages\FluentMigrator.Runner.SQLite.3.2.8\lib\net461\FluentMigrator.Runner.SQLite.dll + + + ..\packages\FluentMigrator.Runner.SqlServer.3.2.8\lib\net461\FluentMigrator.Runner.SqlServer.dll + + + ..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\lib\net461\FluentMigrator.Runner.SqlServerCe.dll + + + ..\packages\Microsoft.Data.Sqlite.Core.3.1.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll + + + ..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll + + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + ..\packages\Microsoft.Extensions.Logging.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll + + + ..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + + ..\packages\Microsoft.Extensions.Options.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll + + + ..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll + + + ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.2\lib\net461\SQLitePCLRaw.batteries_v2.dll + + + ..\packages\SQLitePCLRaw.core.2.0.2\lib\netstandard2.0\SQLitePCLRaw.core.dll + + + ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.2\lib\net461\SQLitePCLRaw.nativelibrary.dll + + + ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.2\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll + + + + ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + + ..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll + + + + + + ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + + + + + ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll + True + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + diff --git a/src/Migrations/Migrations/Migration202010271100ApiTokens.cs b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs new file mode 100644 index 0000000..4da3559 --- /dev/null +++ b/src/Migrations/Migrations/Migration202010271100ApiTokens.cs @@ -0,0 +1,28 @@ +using FluentMigrator; + +namespace Coscine.Migrations.Migrations +{ + //yyyymmddhhmm + [Migration(202010271100)] + public class Migration202010271100ApiTokens : Migration + { + public override void Down() + { + Delete.Table("ApiTokens"); + } + + public override void Up() + { + Create.Table("ApiTokens") + .WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid) + .WithColumn("Name").AsString().NotNullable() + .WithColumn("UserId").AsGuid().NotNullable() + .WithColumn("IssuedAt").AsDateTime().NotNullable() + .WithColumn("Expiration").AsDateTime().NotNullable(); + + Create.ForeignKey() + .FromTable("ApiTokens").ForeignColumn("UserId") + .ToTable("Users").PrimaryColumn("Id"); + } + } +} diff --git a/src/Migrations/Properties/AssemblyInfo.cs b/src/Migrations/Properties/AssemblyInfo.cs index a7ca251..97acc53 100644 --- a/src/Migrations/Properties/AssemblyInfo.cs +++ b/src/Migrations/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrations")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1051-basic0004")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0004")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrator/Properties/AssemblyInfo.cs b/src/Migrator/Properties/AssemblyInfo.cs index 34a8a9a..5355560 100644 --- a/src/Migrator/Properties/AssemblyInfo.cs +++ b/src/Migrator/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ using System.Reflection; [assembly: AssemblyProduct("Migrator")] [assembly: AssemblyVersion("1.8.0")] [assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1051-basic0004")] +[assembly: AssemblyInformationalVersion("1.8.0-topic-1125-apito0004")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] -- GitLab From b3ff0e5e829e8bce058a91c9b8aed4ef480fef1b Mon Sep 17 00:00:00 2001 From: Marcel Nellesen Date: Thu, 3 Dec 2020 13:09:13 +0100 Subject: [PATCH 2/2] Update: Included new Resource type and removed flags --- .../Properties/AssemblyInfo.cs | 6 ++--- src/Migrations/Migrations.csproj | 1 + ...ation202011161100ResourceTypeDefinition.cs | 22 +++++++++++++++++++ src/Migrations/Properties/AssemblyInfo.cs | 6 ++--- src/Migrator/Properties/AssemblyInfo.cs | 6 ++--- 5 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 src/Migrations/Migrations/Migration202011161100ResourceTypeDefinition.cs diff --git a/src/Migrations.Tests/Properties/AssemblyInfo.cs b/src/Migrations.Tests/Properties/AssemblyInfo.cs index 3a4339c..5901652 100644 --- a/src/Migrations.Tests/Properties/AssemblyInfo.cs +++ b/src/Migrations.Tests/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("Migrations.Tests is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("Migrations.Tests")] -[assembly: AssemblyVersion("1.8.0")] -[assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1051-basic0004")] +[assembly: AssemblyVersion("1.9.0")] +[assembly: AssemblyFileVersion("1.9.0")] +[assembly: AssemblyInformationalVersion("1.9.0-topic-1159-rtdap0002")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrations/Migrations.csproj b/src/Migrations/Migrations.csproj index f1e62af..e058985 100644 --- a/src/Migrations/Migrations.csproj +++ b/src/Migrations/Migrations.csproj @@ -205,6 +205,7 @@ + diff --git a/src/Migrations/Migrations/Migration202011161100ResourceTypeDefinition.cs b/src/Migrations/Migrations/Migration202011161100ResourceTypeDefinition.cs new file mode 100644 index 0000000..4e62537 --- /dev/null +++ b/src/Migrations/Migrations/Migration202011161100ResourceTypeDefinition.cs @@ -0,0 +1,22 @@ +using FluentMigrator; + +namespace Coscine.Migrations.Migrations +{ + //yyyymmddhhmm + [Migration(202011161100)] + public class Migration202011161100ResourceTypeDefinition : FluentMigrator.Migration + { + public override void Down() + { + Delete.FromTable("ResourceTypes").Row(new { DisplayName = "linked" }); + Delete.Table("LinkedResourceType"); + } + + public override void Up() + { + Insert.IntoTable("ResourceTypes").Row(new { DisplayName = "linked" }); + Create.Table("LinkedResourceType") + .WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid); + } + } +} diff --git a/src/Migrations/Properties/AssemblyInfo.cs b/src/Migrations/Properties/AssemblyInfo.cs index a7ca251..f510a47 100644 --- a/src/Migrations/Properties/AssemblyInfo.cs +++ b/src/Migrations/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("Migrations is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("Migrations")] -[assembly: AssemblyVersion("1.8.0")] -[assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1051-basic0004")] +[assembly: AssemblyVersion("1.9.0")] +[assembly: AssemblyFileVersion("1.9.0")] +[assembly: AssemblyInformationalVersion("1.9.0-topic-1159-rtdap0002")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] diff --git a/src/Migrator/Properties/AssemblyInfo.cs b/src/Migrator/Properties/AssemblyInfo.cs index 34a8a9a..3406938 100644 --- a/src/Migrator/Properties/AssemblyInfo.cs +++ b/src/Migrator/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("Migrator is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("Migrator")] -[assembly: AssemblyVersion("1.8.0")] -[assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0-topic-1051-basic0004")] +[assembly: AssemblyVersion("1.9.0")] +[assembly: AssemblyFileVersion("1.9.0")] +[assembly: AssemblyInformationalVersion("1.9.0-topic-1159-rtdap0002")] [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] -- GitLab