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

54.35

/Rdmp.Core/DataViewing/ViewCatalogueDataCollection.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.Collections.Generic;
using System.Linq;
using FAnsi.Discovery.QuerySyntax;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Dashboarding;
using Rdmp.Core.Curation.Data.Spontaneous;
using Rdmp.Core.QueryBuilding;
using Rdmp.Core.Repositories;
using Rdmp.Core.ReusableLibraryCode.DataAccess;

namespace Rdmp.Core.DataViewing;

/// <summary>
/// Collection for generating SQL around the extractable columns of a catalogue
/// </summary>
public class ViewCatalogueDataCollection : PersistableObjectCollection, IViewSQLAndResultsCollection
{
    private QueryBuilder builder;

    public Catalogue Catalogue => DatabaseObjects.OfType<Catalogue>().FirstOrDefault();

    public IFilter[] Filters => DatabaseObjects.OfType<IFilter>().ToArray();

    public ExtractionInformation[] ExtractionInformations => DatabaseObjects.OfType<ExtractionInformation>().ToArray();

    /// <summary>
    /// The number of records to fetch (or null to fetch all records)
    /// </summary>
    public int? TopX { get; set; }

    public ViewCatalogueDataCollection(Catalogue catalogue)
    {
        DatabaseObjects.Add(catalogue);
    }

    /// <summary>
    /// Persistence constructor
    /// </summary>
    public ViewCatalogueDataCollection()
    {
    }

    private void BuildBuilder()
    {
        if (builder != null)
            return;

        builder = new QueryBuilder(null, null);

        if (TopX.HasValue)
            builder.TopX = TopX.Value;

        var cols = ExtractionInformations;

        // if there are no explicit columns use all
        if (!cols.Any())
            cols =
                Catalogue.GetAllExtractionInformation(ExtractionCategory.Core)
                    .Union(Catalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific))
                    .ToArray();

        builder.AddColumnRange(cols);

        builder.RootFilterContainer = new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(), null,
            Filters, FilterContainerOperation.AND);
        builder.RegenerateSQL();
    }

    public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
    {
        BuildBuilder();

        foreach (var t in builder.TablesUsedInQuery)
            autoComplete.Add(t);
    }

    public IDataAccessPoint GetDataAccessPoint()
    {
        BuildBuilder();
        return builder.TablesUsedInQuery.FirstOrDefault();
    }

    public IQuerySyntaxHelper GetQuerySyntaxHelper()
    {
        BuildBuilder();
        return builder.QuerySyntaxHelper;
    }

    public string GetSql()
    {
        BuildBuilder();
        return builder.SQL;
    }

    public string GetTabName() => Catalogue.Name;

    public IEnumerable<DatabaseEntity> GetToolStripObjects()
    {
        yield return Catalogue;
    }
}

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.Collections.Generic;
8	using System.Linq;
9	using FAnsi.Discovery.QuerySyntax;
10	using Rdmp.Core.Curation.Data;
11	using Rdmp.Core.Curation.Data.Dashboarding;
12	using Rdmp.Core.Curation.Data.Spontaneous;
13	using Rdmp.Core.QueryBuilding;
14	using Rdmp.Core.Repositories;
15	using Rdmp.Core.ReusableLibraryCode.DataAccess;
16
17	namespace Rdmp.Core.DataViewing;
18
19	/// <summary>
20	/// Collection for generating SQL around the extractable columns of a catalogue
21	/// </summary>
22	public class ViewCatalogueDataCollection : PersistableObjectCollection, IViewSQLAndResultsCollection
23	{
24	private QueryBuilder builder;
25
26	public Catalogue Catalogue => DatabaseObjects.OfType<Catalogue>().FirstOrDefault();	4✔
27
28	public IFilter[] Filters => DatabaseObjects.OfType<IFilter>().ToArray();	2✔
29
30	public ExtractionInformation[] ExtractionInformations => DatabaseObjects.OfType<ExtractionInformation>().ToArray();	2✔
31
32	/// <summary>
33	/// The number of records to fetch (or null to fetch all records)
34	/// </summary>
35	public int? TopX { get; set; }	2✔
36
37	public ViewCatalogueDataCollection(Catalogue catalogue)	2✔
38	{
39	DatabaseObjects.Add(catalogue);	2✔
40	}	2✔
41
42	/// <summary>
43	/// Persistence constructor
44	/// </summary>
45	public ViewCatalogueDataCollection()	×
46	{
47	}	×
48
49	private void BuildBuilder()
50	{
51	if (builder != null)	2!
52	return;	×
53
54	builder = new QueryBuilder(null, null);	2✔
55
56	if (TopX.HasValue)	2!
57	builder.TopX = TopX.Value;	×
58
59	var cols = ExtractionInformations;	2✔
60
61	// if there are no explicit columns use all
62	if (!cols.Any())	2✔
63	cols =	2✔
64	Catalogue.GetAllExtractionInformation(ExtractionCategory.Core)	2✔
65	.Union(Catalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific))	2✔
66	.ToArray();	2✔
67
68	builder.AddColumnRange(cols);	2✔
69
70	builder.RootFilterContainer = new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(), null,	2✔
71	Filters, FilterContainerOperation.AND);	2✔
72	builder.RegenerateSQL();	2✔
73	}	×
74
75	public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
76	{
77	BuildBuilder();	×
78
79	foreach (var t in builder.TablesUsedInQuery)	×
80	autoComplete.Add(t);	×
81	}	×
82
83	public IDataAccessPoint GetDataAccessPoint()
84	{
85	BuildBuilder();	×
86	return builder.TablesUsedInQuery.FirstOrDefault();	×
87	}
88
89	public IQuerySyntaxHelper GetQuerySyntaxHelper()
90	{
91	BuildBuilder();	×
92	return builder.QuerySyntaxHelper;	×
93	}
94
95	public string GetSql()
96	{
97	BuildBuilder();	2✔
98	return builder.SQL;	×
99	}
100
101	public string GetTabName() => Catalogue.Name;	×
102
103	public IEnumerable<DatabaseEntity> GetToolStripObjects()
104	{
105	yield return Catalogue;	×
106	}	×
107	}

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