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

15.38

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewDataBase.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.IO;
using Rdmp.Core.DataExport.DataExtraction;
using Rdmp.Core.DataViewing;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

/// <summary>
/// Abstract base class for all 'view data' style CLI compatible commands
/// </summary>
public abstract class ExecuteCommandViewDataBase : BasicCommandExecution
{
    public const string ToFileDescription = "Optional file to output the results of the query to.  Or null";

    public FileInfo ToFile { get; private set; }

    /// <summary>
    /// Set to true to prompt user to pick a <see cref="ToFile"/> at command execution time.
    /// </summary>
    public bool AskForFile { get; set; }

    public ExecuteCommandViewDataBase(IBasicActivateItems activator, FileInfo toFile) : base(activator)
    {
        ToFile = toFile;
    }

    /// <summary>
    /// Get the SQL query to run and where to run it.  Return null to cancel
    /// data fetching.
    /// </summary>
    /// <returns></returns>
    protected abstract IViewSQLAndResultsCollection GetCollection();


    public override void Execute()
    {
        base.Execute();

        var collection = GetCollection();

        if (collection == null)
            return;


        var toFile = ToFile;

        if (AskForFile)
        {
            toFile = BasicActivator.SelectFile("Save as", "Comma Separated Values", "*.csv");
            if (toFile == null)
                // user cancelled selecting a file
                return;
        }

        if (toFile != null)
            ExtractTableVerbatim.ExtractDataToFile(collection, toFile);
        else
            BasicActivator.ShowData(collection);
    }
}

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.IO;
8	using Rdmp.Core.DataExport.DataExtraction;
9	using Rdmp.Core.DataViewing;
10
11	namespace Rdmp.Core.CommandExecution.AtomicCommands;
12
13	/// <summary>
14	/// Abstract base class for all 'view data' style CLI compatible commands
15	/// </summary>
16	public abstract class ExecuteCommandViewDataBase : BasicCommandExecution
17	{
18	public const string ToFileDescription = "Optional file to output the results of the query to. Or null";
19
20	public FileInfo ToFile { get; private set; }	10✔
21
22	/// <summary>
23	/// Set to true to prompt user to pick a <see cref="ToFile"/> at command execution time.
24	/// </summary>
25	public bool AskForFile { get; set; }	×
26
27	public ExecuteCommandViewDataBase(IBasicActivateItems activator, FileInfo toFile) : base(activator)	10✔
28	{
29	ToFile = toFile;	10✔
30	}	10✔
31
32	/// <summary>
33	/// Get the SQL query to run and where to run it. Return null to cancel
34	/// data fetching.
35	/// </summary>
36	/// <returns></returns>
37	protected abstract IViewSQLAndResultsCollection GetCollection();
38
39
40	public override void Execute()
41	{
42	base.Execute();	×
43
44	var collection = GetCollection();	×
45
46	if (collection == null)	×
47	return;	×
48
49
50	var toFile = ToFile;	×
51
52	if (AskForFile)	×
53	{
54	toFile = BasicActivator.SelectFile("Save as", "Comma Separated Values", "*.csv");	×
55	if (toFile == null)	×
56	// user cancelled selecting a file
57	return;	×
58	}
59
60	if (toFile != null)	×
61	ExtractTableVerbatim.ExtractDataToFile(collection, toFile);	×
62	else
63	BasicActivator.ShowData(collection);	×
64	}	×
65	}

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