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/DataViewing/ViewCohortIdentificationConfigurationSqlCollection.cs

﻿// Copyright (c) The University of Dundee 2018-2021
// 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.Collections.Generic;
using System.Linq;
using FAnsi.Discovery.QuerySyntax;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Cohort;
using Rdmp.Core.Curation.Data.Dashboarding;
using Rdmp.Core.QueryBuilding;
using Rdmp.Core.ReusableLibraryCode.DataAccess;


namespace Rdmp.Core.DataViewing;

internal class ViewCohortIdentificationConfigurationSqlCollection : PersistableObjectCollection,
    IViewSQLAndResultsCollection
{
    public bool UseQueryCache { get; set; }

    public ViewCohortIdentificationConfigurationSqlCollection()
    {
    }

    public ViewCohortIdentificationConfigurationSqlCollection(CohortIdentificationConfiguration config) : this()
    {
        DatabaseObjects.Add(config);
    }

    public IEnumerable<DatabaseEntity> GetToolStripObjects()
    {
        if (UseQueryCache)
        {
            var cache = GetCacheServer();
            if (cache != null)
                yield return cache;
        }
    }

    private ExternalDatabaseServer GetCacheServer() =>
        CohortIdentificationConfiguration is { QueryCachingServer_ID: not null }
            ? CohortIdentificationConfiguration.QueryCachingServer
            : null;


    public IDataAccessPoint GetDataAccessPoint()
    {
        var cache = GetCacheServer();

        if (UseQueryCache && cache != null)
            return cache;

        var builder = new CohortQueryBuilder(CohortIdentificationConfiguration, null);
        builder.RegenerateSQL();
        return new SelfCertifyingDataAccessPoint(builder.Results.TargetServer);
    }

    public string GetSql()
    {
        var builder = new CohortQueryBuilder(CohortIdentificationConfiguration, null);

        if (!UseQueryCache && CohortIdentificationConfiguration.QueryCachingServer_ID.HasValue)
            builder.CacheServer = null;


        return builder.SQL;
    }

    public string GetTabName() => $"View {CohortIdentificationConfiguration}";

    public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
    {
    }

    private CohortIdentificationConfiguration CohortIdentificationConfiguration =>
        DatabaseObjects.OfType<CohortIdentificationConfiguration>().SingleOrDefault();

    public IQuerySyntaxHelper GetQuerySyntaxHelper() => GetDataAccessPoint()?.GetQuerySyntaxHelper();
}

1	// Copyright (c) The University of Dundee 2018-2021
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.Collections.Generic;
8	using System.Linq;
9	using FAnsi.Discovery.QuerySyntax;
10	using Rdmp.Core.Curation.Data;
11	using Rdmp.Core.Curation.Data.Cohort;
12	using Rdmp.Core.Curation.Data.Dashboarding;
13	using Rdmp.Core.QueryBuilding;
14	using Rdmp.Core.ReusableLibraryCode.DataAccess;
15
16
17	namespace Rdmp.Core.DataViewing;
18
19	internal class ViewCohortIdentificationConfigurationSqlCollection : PersistableObjectCollection,
20	IViewSQLAndResultsCollection
21	{
22	public bool UseQueryCache { get; set; }	×
23
24	public ViewCohortIdentificationConfigurationSqlCollection()	×
25	{
26	}	×
27
28	public ViewCohortIdentificationConfigurationSqlCollection(CohortIdentificationConfiguration config) : this()	×
29	{
30	DatabaseObjects.Add(config);	×
31	}	×
32
33	public IEnumerable<DatabaseEntity> GetToolStripObjects()
34	{
35	if (UseQueryCache)	×
36	{
37	var cache = GetCacheServer();	×
38	if (cache != null)	×
39	yield return cache;	×
40	}
41	}	×
42
43	private ExternalDatabaseServer GetCacheServer() =>
44	CohortIdentificationConfiguration is { QueryCachingServer_ID: not null }	×
45	? CohortIdentificationConfiguration.QueryCachingServer	×
46	: null;	×
47
48
49	public IDataAccessPoint GetDataAccessPoint()
50	{
51	var cache = GetCacheServer();	×
52
53	if (UseQueryCache && cache != null)	×
54	return cache;	×
55
56	var builder = new CohortQueryBuilder(CohortIdentificationConfiguration, null);	×
57	builder.RegenerateSQL();	×
58	return new SelfCertifyingDataAccessPoint(builder.Results.TargetServer);	×
59	}
60
61	public string GetSql()
62	{
63	var builder = new CohortQueryBuilder(CohortIdentificationConfiguration, null);	×
64
65	if (!UseQueryCache && CohortIdentificationConfiguration.QueryCachingServer_ID.HasValue)	×
66	builder.CacheServer = null;	×
67
68
69	return builder.SQL;	×
70	}
71
72	public string GetTabName() => $"View {CohortIdentificationConfiguration}";	×
73
74	public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
75	{
76	}	×
77
78	private CohortIdentificationConfiguration CohortIdentificationConfiguration =>
79	DatabaseObjects.OfType<CohortIdentificationConfiguration>().SingleOrDefault();	×
80
81	public IQuerySyntaxHelper GetQuerySyntaxHelper() => GetDataAccessPoint()?.GetQuerySyntaxHelper();	×
82	}

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