Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target since source was created

Commits on Source 4

Chore: 1.5.1 · c7e3fef0

Benedikt Heinrichs authored Sep 30, 2019

## [1.5.1](https://git.rwth-aachen.de/coscine/cs/database/compare/v1.5.0...v1.5.1) (2019-09-16)

### Fix

* Add Givenname and Surname to Users Table (coscine/issues#280) ([22d9f765](https://git.rwth-aachen.de/coscine/cs/database/commit/22d9f7659779bff15d45b00553f1328a26438f03)), closes [coscine/issues#280](https://git.rwth-aachen.de/coscine/issues/issues/280)

c7e3fef0

Merge branch 'Product/243-addEditProject' into 'master' · 442f0c64
Benedikt Heinrichs authored Sep 30, 2019
```
Update: Project and Resource Table Enhancement

See merge request coscine/cs/database!20
```
442f0c64
Update: Project and Resource Table Enhancement · 296c8eb2
Benedikt Heinrichs authored Sep 30, 2019

296c8eb2

Chore: 1.6.0 · f2b5b482

RWTHApp Service authored Sep 30, 2019 and

RWTH App committed Sep 30, 2019

# [1.6.0](https://git.rwth-aachen.de/coscine/cs/database/compare/v1.5.1...v1.6.0) (2019-09-30)

### Chore

* 1.5.1 ([c7e3fef0](https://git.rwth-aachen.de/coscine/cs/database/commit/c7e3fef047129db75e91b9153fd67a5084001b62)), closes [coscine/issues#280](https://git.rwth-aachen.de/coscine/issues/issues/280)

### Update

* Project and Resource Table Enhancement ([296c8eb2](https://git.rwth-aachen.de/coscine/cs/database/commit/296c8eb24ca8411b4db0a69d1ffeef484907f09d))

f2b5b482

docs/testdoc.md→docs/markup.md

+0 −0

File moved.

src/Database.Tests/Properties/AssemblyInfo.cs

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,8 +9,8 @@ using System.Reflection;
		[assembly: AssemblyDescription("Database.Tests is a part of the CoScInE group.")]
		[assembly: AssemblyCompany("IT Center, RWTH Aachen University")]
		[assembly: AssemblyProduct("Database.Tests")]
		[assembly: AssemblyVersion("1.5.1.0")]
		[assembly: AssemblyFileVersion("1.5.1.0")]
		[assembly: AssemblyInformationalVersion("1.5.1.0")]
		[assembly: AssemblyVersion("1.6.0.0")]
		[assembly: AssemblyFileVersion("1.6.0.0")]
		[assembly: AssemblyInformationalVersion("1.6.0.0")]
		[assembly: AssemblyCopyright("2019 IT Center, RWTH Aachen University")]

src/Database/Properties/AssemblyInfo.cs

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,8 +9,8 @@ using System.Reflection;
		[assembly: AssemblyDescription("Database is a part of the CoScInE group.")]
		[assembly: AssemblyCompany("IT Center, RWTH Aachen University")]
		[assembly: AssemblyProduct("Database")]
		[assembly: AssemblyVersion("1.5.1.0")]
		[assembly: AssemblyFileVersion("1.5.1.0")]
		[assembly: AssemblyInformationalVersion("1.5.1.0")]
		[assembly: AssemblyVersion("1.6.0.0")]
		[assembly: AssemblyFileVersion("1.6.0.0")]
		[assembly: AssemblyInformationalVersion("1.6.0.0")]
		[assembly: AssemblyCopyright("2019 IT Center, RWTH Aachen University")]

src/Migrator/Migrations/Migration201909111125ProjectEnhancement.cs

0 → 100644

+111 −0

Original line number	Diff line number	Diff line
		using FluentMigrator;
		namespace Coscine.Database.Migration.Migrations
		{
		//yyyymmddhhmm
		[Migration(201909111125)]
		public class Migration201909111125ProjectEnhancement : FluentMigrator.Migration
		{
		public override void Down()
		{
		#region Foreign Keys
		Delete.ForeignKey()
		.FromTable("ProjectDiscipline").ForeignColumn("DisciplineId")
		.ToTable("Disciplines").PrimaryColumn("Id");
		Delete.ForeignKey()
		.FromTable("ProjectDiscipline").ForeignColumn("ProjectId")
		.ToTable("Projects").PrimaryColumn("Id");

		Delete.ForeignKey()
		.FromTable("ProjectInstitute").ForeignColumn("InstituteId")
		.ToTable("Institutes").PrimaryColumn("Id");
		Delete.ForeignKey()
		.FromTable("ProjectInstitute").ForeignColumn("ProjectId")
		.ToTable("Projects").PrimaryColumn("Id");

		Delete.ForeignKey()
		.FromTable("Projects").ForeignColumn("VisibilityId")
		.ToTable("Visibilities").PrimaryColumn("Id");
		#endregion

		Delete.Column("DisplayName").FromTable("Projects");
		Delete.Column("PrincipleInvestigators").FromTable("Projects");
		Delete.Column("GrantId").FromTable("Projects");

		Alter.Table("Projects").AlterColumn("Description").AsString(1000).NotNullable();

		Rename.Column("ProjectName").OnTable("Projects").To("DisplayName");

		Delete.Column("VisibilityId").FromTable("Projects");

		Delete.Table("ProjectDiscipline");
		Delete.Table("Disciplines");
		Delete.Table("ProjectInstitute");
		Delete.Table("Institutes");
		Delete.Table("Visibilities");

		Alter.Table("Projects").AddColumn("Organization").AsString(50).Nullable();
		}

		public override void Up()
		{
		Rename.Column("DisplayName").OnTable("Projects").To("ProjectName");

		Delete.Column("Organization").FromTable("Projects");

		Alter.Table("Projects").AlterColumn("Description").AsString(5000).NotNullable();

		Alter.Table("Projects").AddColumn("DisplayName").AsString(25).Nullable();
		Alter.Table("Projects").AddColumn("PrincipleInvestigators").AsString(500).Nullable();
		Alter.Table("Projects").AddColumn("GrantId").AsString(500).Nullable();

		Create.Table("Disciplines")
		.WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("DisplayName").AsString(200).NotNullable()
		.WithColumn("Url").AsString(200).NotNullable();

		Create.Table("ProjectDiscipline")
		.WithColumn("RelationId").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("DisciplineId").AsGuid().NotNullable()
		.WithColumn("ProjectId").AsGuid().NotNullable();

		Create.ForeignKey()
		.FromTable("ProjectDiscipline").ForeignColumn("DisciplineId")
		.ToTable("Disciplines").PrimaryColumn("Id");
		Create.ForeignKey()
		.FromTable("ProjectDiscipline").ForeignColumn("ProjectId")
		.ToTable("Projects").PrimaryColumn("Id");

		Create.Table("Institutes")
		.WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("DisplayName").AsString(200).NotNullable()
		.WithColumn("IKZ").AsString(20).NotNullable();

		Create.Table("ProjectInstitute")
		.WithColumn("RelationId").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("InstituteId").AsGuid().NotNullable()
		.WithColumn("ProjectId").AsGuid().NotNullable();

		Create.ForeignKey()
		.FromTable("ProjectInstitute").ForeignColumn("InstituteId")
		.ToTable("Institutes").PrimaryColumn("Id");
		Create.ForeignKey()
		.FromTable("ProjectInstitute").ForeignColumn("ProjectId")
		.ToTable("Projects").PrimaryColumn("Id");

		Alter.Table("Projects").AddColumn("VisibilityId").AsGuid().Nullable();

		Create.Table("Visibilities")
		.WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("DisplayName").AsString(50).NotNullable();

		Insert.IntoTable("Visibilities").Row(new { DisplayName = "Project Members" });
		Insert.IntoTable("Visibilities").Row(new { DisplayName = "Public" });

		Create.ForeignKey()
		.FromTable("Projects").ForeignColumn("VisibilityId")
		.ToTable("Visibilities").PrimaryColumn("Id");

		Alter.Column("Keywords").OnTable("Projects").AsString(1000).Nullable();
		}
		}
		}

src/Migrator/Migrations/Migration201909190938ResourceEnhancement.cs

0 → 100644

+102 −0

Original line number	Diff line number	Diff line
		using FluentMigrator;
		namespace Coscine.Database.Migration.Migrations
		{
		//yyyymmddhhmm
		[Migration(201909190938)]
		public class Migration201909190938ResourceEnhancement : FluentMigrator.Migration
		{
		public override void Down()
		{
		#region Foreign Keys
		Delete.ForeignKey()
		.FromTable("ResourceDiscipline").ForeignColumn("DisciplineId")
		.ToTable("Disciplines").PrimaryColumn("Id");
		Delete.ForeignKey()
		.FromTable("ResourceDiscipline").ForeignColumn("ResourceId")
		.ToTable("Resources").PrimaryColumn("Id");

		Delete.ForeignKey()
		.FromTable("Resources").ForeignColumn("VisibilityId")
		.ToTable("Visibilities").PrimaryColumn("Id");

		Delete.ForeignKey()
		.FromTable("Resources").ForeignColumn("LicenseId")
		.ToTable("Licenses").PrimaryColumn("Id");
		#endregion

		Delete.Column("DisplayName").FromTable("Resources");

		Rename.Column("ResourceName").OnTable("Resources").To("DisplayName");

		Delete.Column("VisibilityId").FromTable("Resources");
		Delete.Column("LicenseId").FromTable("Resources");
		Delete.Column("Keywords").FromTable("Resources");
		Delete.Column("UsageRights").FromTable("Resources");
		Delete.Column("ResourceTypeOptionId").FromTable("Resources");

		Alter.Table("Resources")
		.AddColumn("Url").AsString(200).Nullable()
		.AddColumn("ExternalId").AsString(200).Nullable();

		Delete.Table("ResourceDiscipline");
		Delete.Table("Licenses");
		Delete.Table("RDSResourceType");
		Delete.Table("GitlabResourceType");
		}

		public override void Up()
		{
		Rename.Column("DisplayName").OnTable("Resources").To("ResourceName");

		Alter.Table("Resources").AddColumn("DisplayName").AsString(25).Nullable();

		Create.Table("ResourceDiscipline")
		.WithColumn("RelationId").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("DisciplineId").AsGuid().NotNullable()
		.WithColumn("ResourceId").AsGuid().NotNullable();

		Create.ForeignKey()
		.FromTable("ResourceDiscipline").ForeignColumn("DisciplineId")
		.ToTable("Disciplines").PrimaryColumn("Id");
		Create.ForeignKey()
		.FromTable("ResourceDiscipline").ForeignColumn("ResourceId")
		.ToTable("Resources").PrimaryColumn("Id");

		Alter.Table("Resources").AddColumn("VisibilityId").AsGuid().Nullable();

		Create.ForeignKey()
		.FromTable("Resources").ForeignColumn("VisibilityId")
		.ToTable("Visibilities").PrimaryColumn("Id");

		Alter.Table("Resources").AddColumn("LicenseId").AsGuid().Nullable();

		Create.Table("Licenses")
		.WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("DisplayName").AsString(50).NotNullable();

		Create.ForeignKey()
		.FromTable("Resources").ForeignColumn("LicenseId")
		.ToTable("Licenses").PrimaryColumn("Id");

		Alter.Table("Resources").AddColumn("Keywords").AsString(1000).Nullable();
		Alter.Table("Resources").AddColumn("UsageRights").AsString(200).Nullable();

		Create.Table("RDSResourceType")
		.WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("BucketName").AsString(63).NotNullable()
		.WithColumn("AccessKey").AsString(200).Nullable()
		.WithColumn("SecretKey").AsString(200).Nullable();

		Create.Table("GitlabResourceType")
		.WithColumn("Id").AsGuid().PrimaryKey().WithDefault(SystemMethods.NewGuid)
		.WithColumn("RepositoryNumber").AsInt32().NotNullable()
		.WithColumn("RepositoryUrl").AsString(500).NotNullable()
		.WithColumn("Token").AsString(100).NotNullable();

		Alter.Table("Resources").AddColumn("ResourceTypeOptionId").AsGuid().Nullable();

		Delete.Column("ExternalId").FromTable("Resources");
		Delete.Column("Url").FromTable("Resources");
		}
		}
		}

src/Migrator/Migrator.csproj

+2 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,8 @@
		<ItemGroup>
		<Compile Include="Migrations\Migration201907011352ProjectApi.cs" />
		<Compile Include="Migrations\Migration201907081510EnhanceProjectApi.cs" />
		<Compile Include="Migrations\Migration201909190938ResourceEnhancement.cs" />
		<Compile Include="Migrations\Migration201909111125ProjectEnhancement.cs" />
		<Compile Include="Migrations\Migration201909160919UserEnhancement.cs" />
		<Compile Include="Migrations\Migration201908290941ORCiD.cs" />
		<Compile Include="Migrations\Migration201908121401GitlabResource.cs" />

src/Migrator/Properties/AssemblyInfo.cs

+3 −3

Original line number	Diff line number	Diff line
		@@ -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.5.1.0")]
		[assembly: AssemblyFileVersion("1.5.1.0")]
		[assembly: AssemblyInformationalVersion("1.5.1.0")]
		[assembly: AssemblyVersion("1.6.0.0")]
		[assembly: AssemblyFileVersion("1.6.0.0")]
		[assembly: AssemblyInformationalVersion("1.6.0.0")]
		[assembly: AssemblyCopyright("2019 IT Center, RWTH Aachen University")]

Admin message

Source

Target

Files