From c16e2ad977499ef25c33a06a26f9b5b3e80916f6 Mon Sep 17 00:00:00 2001 From: James Friel Date: Mon, 8 Jun 2026 11:57:16 +0100 Subject: [PATCH 1/2] add check --- Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs | 6 +++++- SharedAssemblyInfo.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs b/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs index da6b040089..4cc6b24114 100644 --- a/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs +++ b/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Data.Common; using System.Linq; +using System.Text.RegularExpressions; using Rdmp.Core.CommandExecution; using Rdmp.Core.Curation; using Rdmp.Core.Curation.Data; @@ -305,8 +306,11 @@ private void ComplainIfUserHasHotSwappedCohort(ICheckNotifier notifier, IExtract var whereSql = cohort.WhereSQL(); - if (!rp.SqlExtracted.Contains(whereSql)) + + if (!rp.SqlExtracted.Contains(whereSql) && !rp.SqlExtracted.Contains("The ID of the cohort in #"))//If the Cohort starts with a #, then a temp table was used and we can' use it as a check + { notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.CohortSwappedMidExtraction, progress, whereSql)); + } } /// diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 6ec4fd0a2d..c41df5615e 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -12,4 +12,4 @@ [assembly: AssemblyVersion("9.2.4")] [assembly: AssemblyFileVersion("9.2.4")] -[assembly: AssemblyInformationalVersion("9.2.4")] +[assembly: AssemblyInformationalVersion("9.2.4-rc1")] From 3c171d01a16c52ccadb5c3df4973f18fb9a01982 Mon Sep 17 00:00:00 2001 From: James Friel Date: Tue, 9 Jun 2026 10:46:08 +0100 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs | 1 - SharedAssemblyInfo.cs | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc4fe47243..7e65aab153 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Allow Merge code to be viewed in UI - Fix bug with catalogues not becoming project specific when commit from another project - Improve displayed reason for being unable to make Catalogue Project Specific +- Fix issue with extraction progresses being unable to use temp cohort tables ## [9.2.3] - 2026-05-28 - Fix issue with extractable project data set creation for project specific catalogues diff --git a/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs b/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs index 4cc6b24114..5efdcf5946 100644 --- a/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs +++ b/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs @@ -8,7 +8,6 @@ using System.Collections.Generic; using System.Data.Common; using System.Linq; -using System.Text.RegularExpressions; using Rdmp.Core.CommandExecution; using Rdmp.Core.Curation; using Rdmp.Core.Curation.Data; diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index c41df5615e..6ec4fd0a2d 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -12,4 +12,4 @@ [assembly: AssemblyVersion("9.2.4")] [assembly: AssemblyFileVersion("9.2.4")] -[assembly: AssemblyInformationalVersion("9.2.4-rc1")] +[assembly: AssemblyInformationalVersion("9.2.4")]