6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.0)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/Rdmp.Core/DataLoad/Modules/DataFlowOperations/TableVersionNamer.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.Data;
using System.Linq;
using FAnsi.Discovery;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.DataFlowPipeline;
using Rdmp.Core.DataFlowPipeline.Requirements;
using Rdmp.Core.ReusableLibraryCode.Checks;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations;

/// <summary>
/// Renames DataTables in the pipeline so that they do not collide with any tables at the destination database.  This is done by appending V1,V2,V3 etc to the table
/// </summary>
public class TableVersionNamer : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<DiscoveredDatabase>
{
    private string[] _tableNamesAtDestination;

    [DemandsInitialization("Suffix pattern, $v is the version, default is _V$v as in MyTable_V1, MyTable_V2 etc",
        DemandType.Unspecified, "_V$v")]
    public string Suffix { get; set; }

    [DemandsInitialization("The maximum number of tables to allow, defaults to 1000 so MyTable_V1 up to MyTable_V1000",
        DemandType.Unspecified, 1000)]
    public int MaximumNumberOfVersionsAllowed { get; set; }

    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
        GracefulCancellationToken cancellationToken)
    {
        toProcess.TableName = GetVersionedTableName(toProcess.TableName);
        return toProcess;
    }

    private string GetVersionedTableName(string tableName)
    {
        for (var i = 1; i <= MaximumNumberOfVersionsAllowed; i++)
        {
            var candidate = tableName + Suffix.Replace("$v", i.ToString());
            if (!_tableNamesAtDestination.Any(t => t.Equals(candidate, StringComparison.CurrentCultureIgnoreCase)))
                return candidate;
        }

        throw new Exception(
            $"Unable to find unique table name after {MaximumNumberOfVersionsAllowed} TableNames were tried");
    }

    public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
    {
    }

    public void Abort(IDataLoadEventListener listener)
    {
    }

    public void Check(ICheckNotifier notifier)
    {
        if (MaximumNumberOfVersionsAllowed == 0)
            notifier.OnCheckPerformed(
                new CheckEventArgs("MaximumNumberOfVersionsAllowed cannot be 0", CheckResult.Fail));
    }

    public void PreInitialize(DiscoveredDatabase value, IDataLoadEventListener listener)
    {
        _tableNamesAtDestination = value.DiscoverTables(true).Select(t => t.GetRuntimeName()).ToArray();
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System;
8	using System.Data;
9	using System.Linq;
10	using FAnsi.Discovery;
11	using Rdmp.Core.Curation.Data;
12	using Rdmp.Core.DataFlowPipeline;
13	using Rdmp.Core.DataFlowPipeline.Requirements;
14	using Rdmp.Core.ReusableLibraryCode.Checks;
15	using Rdmp.Core.ReusableLibraryCode.Progress;
16
17	namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations;
18
19	/// <summary>
20	/// Renames DataTables in the pipeline so that they do not collide with any tables at the destination database. This is done by appending V1,V2,V3 etc to the table
21	/// </summary>
22	public class TableVersionNamer : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<DiscoveredDatabase>
23	{
24	private string[] _tableNamesAtDestination;
25
26	[DemandsInitialization("Suffix pattern, $v is the version, default is _V$v as in MyTable_V1, MyTable_V2 etc",
27	DemandType.Unspecified, "_V$v")]
28	public string Suffix { get; set; }	×
29
30	[DemandsInitialization("The maximum number of tables to allow, defaults to 1000 so MyTable_V1 up to MyTable_V1000",
31	DemandType.Unspecified, 1000)]
32	public int MaximumNumberOfVersionsAllowed { get; set; }	×
33
34	public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
35	GracefulCancellationToken cancellationToken)
36	{
37	toProcess.TableName = GetVersionedTableName(toProcess.TableName);	×
38	return toProcess;	×
39	}
40
41	private string GetVersionedTableName(string tableName)
42	{
43	for (var i = 1; i <= MaximumNumberOfVersionsAllowed; i++)	×
44	{
45	var candidate = tableName + Suffix.Replace("$v", i.ToString());	×
46	if (!_tableNamesAtDestination.Any(t => t.Equals(candidate, StringComparison.CurrentCultureIgnoreCase)))	×
47	return candidate;	×
48	}
49
50	throw new Exception(	×
51	$"Unable to find unique table name after {MaximumNumberOfVersionsAllowed} TableNames were tried");	×
52	}
53
54	public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
55	{
56	}	×
57
58	public void Abort(IDataLoadEventListener listener)
59	{
60	}	×
61
62	public void Check(ICheckNotifier notifier)
63	{
64	if (MaximumNumberOfVersionsAllowed == 0)	×
65	notifier.OnCheckPerformed(	×
66	new CheckEventArgs("MaximumNumberOfVersionsAllowed cannot be 0", CheckResult.Fail));	×
67	}	×
68
69	public void PreInitialize(DiscoveredDatabase value, IDataLoadEventListener listener)
70	{
71	_tableNamesAtDestination = value.DiscoverTables(true).Select(t => t.GetRuntimeName()).ToArray();	×
72	}	×
73	}

HicServices / RDMP / 6245535001

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous