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

34.78

/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationColumnSetQueryHelper.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.Linq;
using Rdmp.Core.DataLoad.Triggers;

namespace Rdmp.Core.DataLoad.Engine.Migration.QueryBuilding;

/// <summary>
/// Helper class for generating SQL fragments that relate to columns in a MigrationColumnSet.  This is used by MigrationQueryHelper to generate SQL
/// for merging STAGING into LIVE during a data load.
/// </summary>
public class MigrationColumnSetQueryHelper
{
    private readonly MigrationColumnSet _migrationColumnSet;

    public MigrationColumnSetQueryHelper(MigrationColumnSet migrationColumnSet)
    {
        _migrationColumnSet = migrationColumnSet;
    }

    public string BuildSelectListForAllColumnsExceptStandard(string tableAlias = "")
    {
        var sql = _migrationColumnSet.FieldsToDiff
            .Where(col => !SpecialFieldNames.IsHicPrefixed(col) && !col.IsAutoIncrement).Aggregate("", (current, col) =>
                $"{current}{tableAlias}[{col.GetRuntimeName()}],");

        return sql.TrimEnd(',');
    }

    public string BuildPrimaryKeyNotNullTest(string columnPrefix) => BuildPrimaryKeyCondition(columnPrefix, "NOT NULL");

    public string BuildPrimaryKeyNullTest(string columnPrefix) => BuildPrimaryKeyCondition(columnPrefix, "NULL");

    private string BuildPrimaryKeyCondition(string columnPrefix, string condition)
    {
        // Allow either 'prefix' or 'prefix.' to be passed through
        if (!columnPrefix.EndsWith("."))
            columnPrefix += ".";

        return string.Join(" AND ", _migrationColumnSet.PrimaryKeys.Select(col =>
            $"{columnPrefix}[{col.GetRuntimeName()}] IS {condition}"));
    }

    public string BuildJoinClause(string sourceAlias = "source", string destAlias = "dest")
    {
        return !_migrationColumnSet.PrimaryKeys.Any()
            ? throw new InvalidOperationException(
                "None of the columns to be migrated are configured as a Primary Key, the JOIN clause for migration cannot be created. Please ensure that at least one of the columns in the MigrationColumnSet is configured as a Primary Key.")
            : $"ON ({string.Join(" AND ", _migrationColumnSet.PrimaryKeys.Select(pk => string.Format(sourceAlias + ".[{0}] = " + destAlias + ".[{0}]", pk.GetRuntimeName())))})";
    }
}

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.Linq;
9	using Rdmp.Core.DataLoad.Triggers;
10
11	namespace Rdmp.Core.DataLoad.Engine.Migration.QueryBuilding;
12
13	/// <summary>
14	/// Helper class for generating SQL fragments that relate to columns in a MigrationColumnSet. This is used by MigrationQueryHelper to generate SQL
15	/// for merging STAGING into LIVE during a data load.
16	/// </summary>
17	public class MigrationColumnSetQueryHelper
18	{
19	private readonly MigrationColumnSet _migrationColumnSet;
20
21	public MigrationColumnSetQueryHelper(MigrationColumnSet migrationColumnSet)	116✔
22	{
23	_migrationColumnSet = migrationColumnSet;	116✔
24	}	116✔
25
26	public string BuildSelectListForAllColumnsExceptStandard(string tableAlias = "")
27	{
28	var sql = _migrationColumnSet.FieldsToDiff	×
29	.Where(col => !SpecialFieldNames.IsHicPrefixed(col) && !col.IsAutoIncrement).Aggregate("", (current, col) =>	×
30	$"{current}{tableAlias}[{col.GetRuntimeName()}],");	×
31
32	return sql.TrimEnd(',');	×
33	}
34
35	public string BuildPrimaryKeyNotNullTest(string columnPrefix) => BuildPrimaryKeyCondition(columnPrefix, "NOT NULL");	×
36
37	public string BuildPrimaryKeyNullTest(string columnPrefix) => BuildPrimaryKeyCondition(columnPrefix, "NULL");	×
38
39	private string BuildPrimaryKeyCondition(string columnPrefix, string condition)
40	{
41	// Allow either 'prefix' or 'prefix.' to be passed through
42	if (!columnPrefix.EndsWith("."))	×
43	columnPrefix += ".";	×
44
45	return string.Join(" AND ", _migrationColumnSet.PrimaryKeys.Select(col =>	×
46	$"{columnPrefix}[{col.GetRuntimeName()}] IS {condition}"));	×
47	}
48
49	public string BuildJoinClause(string sourceAlias = "source", string destAlias = "dest")
50	{
51	return !_migrationColumnSet.PrimaryKeys.Any()	116!
52	? throw new InvalidOperationException(	116✔
53	"None of the columns to be migrated are configured as a Primary Key, the JOIN clause for migration cannot be created. Please ensure that at least one of the columns in the MigrationColumnSet is configured as a Primary Key.")	116✔
54	: $"ON ({string.Join(" AND ", _migrationColumnSet.PrimaryKeys.Select(pk => string.Format(sourceAlias + ".[{0}] = " + destAlias + ".[{0}]", pk.GetRuntimeName())))})";	232✔
55	}
56	}

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