Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/rdmp 185 table import check fail #1836

Merged
merged 5 commits into from
May 23, 2024
Merged

Bugfix/rdmp 185 table import check fail #1836

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24fb52b
use server db
JFriel May 22, 2024
b443c36
tidy up
JFriel May 22, 2024
e6df6f1
bump to 8.1.7
JFriel May 22, 2024
d48ab62
Update Catalogue.cs
jas88 May 22, 2024
a7170b9
Merge branch 'release/8.1.7' into bugfix/RDMP-185-table-import-check-…
jas88 May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [8.1.7] - Unreleased

## Changed

- Fix issue with non-default named PostgreSQL Table Info not being checkable

## [8.1.6] - Unreleased

## Changed
Expand Down
8 changes: 4 additions & 4 deletions Rdmp.Core/Curation/Data/Catalogue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ public DateTime? DatasetStartDate
/// <inheritdoc/>
public LoadMetadata[] LoadMetadatas()
{
var loadMetadataLinkIDs = Repository.GetAllObjectsWhere<LoadMetadataCatalogueLinkage>("CatalogueID",ID).Select(l => l.LoadMetadataID);
var loadMetadataLinkIDs = Repository.GetAllObjectsWhere<LoadMetadataCatalogueLinkage>("CatalogueID", ID).Select(l => l.LoadMetadataID);

return Repository.GetAllObjects<LoadMetadata>().Where(cat => loadMetadataLinkIDs.Contains(cat.ID)).ToArray();
}
Expand All @@ -511,7 +511,7 @@ public LoadMetadata[] LoadMetadatas()

/// <inheritdoc/>
[NoMappingToDatabase]
public ExternalDatabaseServer LiveLoggingServer =>
public ExternalDatabaseServer LiveLoggingServer =>
LiveLoggingServer_ID == null
? null
: Repository.GetObjectByID<ExternalDatabaseServer>((int)LiveLoggingServer_ID);
Expand Down Expand Up @@ -893,8 +893,8 @@ public void Check(ICheckNotifier notifier)

try
{
var server = DataAccessPortal.ExpectDistinctServer(tables, accessContext, false);

var setInitialDatabase = tables.Where(t => t.Database != null).Any();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to write Where(x).Any() as Any(x) - one less step.

var server = DataAccessPortal.ExpectDistinctServer(tables, accessContext, setInitialDatabase);
using var con = server.GetConnection();
con.Open();

Expand Down
6 changes: 3 additions & 3 deletions SharedAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("8.1.6")]
[assembly: AssemblyFileVersion("8.1.6")]
[assembly: AssemblyInformationalVersion("8.1.6-rc1")]
[assembly: AssemblyVersion("8.1.7")]
[assembly: AssemblyFileVersion("8.1.7")]
[assembly: AssemblyInformationalVersion("8.1.7")]
2 changes: 1 addition & 1 deletion directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>11.0</LangVersion>
<Version>8.1.6</Version>
<Version>8.1.7</Version>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
</Project>