Merge branch 'develop'

.github/workflows/dotnet-core.yml

@@ -56,4 +56,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
-          asset_paths: '["./Rdmp.Dicom.${{ steps.version.outputs.version }}.nupkg"]'
+          asset_paths: '["Rdmp.Dicom.${{ steps.version.outputs.version }}.nupkg"]'

CHANGELOG.md

@@ -8,6 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ...
 
+## [2.2.2] 2021-01-19
+
+## Fixed
+
+- Fixed bug with `AutoRoutingAttacherWithPersistentRaw` data load module when used with RDMP 4.2.1 API
+
+
 ## [2.2.1] 2021-01-14
 
 Updated to be compatible with RDMP 4.2
@@ -242,7 +249,8 @@ Updated to be compatible with RDMP 4.2
 
 - Initial commit from private repo
 
-[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v2.2.1...develop
+[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v2.2.2...develop
+[2.2.2]: https://github.com/HicServices/RdmpDicom/compare/v2.2.1...v2.2.2
 [2.2.1]: https://github.com/HicServices/RdmpDicom/compare/v2.1.11...v2.2.1
 [2.1.11]: https://github.com/HicServices/RdmpDicom/compare/v2.1.10...v2.1.11
 [2.1.10]: https://github.com/HicServices/RdmpDicom/compare/v2.1.9...v2.1.10

Rdmp.Dicom/Attachers/Routing/PersistentRawTableCreator.cs

@@ -10,6 +10,7 @@
 using Rdmp.Core.Curation.Data.DataLoad;
 using Rdmp.Core.DataLoad;
 using Rdmp.Core.DataLoad.Engine.DatabaseManagement.Operations;
+using Rdmp.Core.DataLoad.Engine.DatabaseManagement.EntityNaming;
 
 namespace Rdmp.Dicom.Attachers.Routing
 {
@@ -36,7 +37,7 @@ public void CreateRAWTablesInDatabase(DiscoveredDatabase rawDb, IDataLoadJob job
 
                 var discardedColumns = tableInfo.PreLoadDiscardedColumns.Where(c => c.Destination == DiscardedColumnDestination.Dilute).ToArray();
 
-                var clone = new TableInfoCloneOperation(null,null,LoadBubble.Raw,job);
+                var clone = new TableInfoCloneOperation(job.Configuration,(TableInfo)tableInfo,LoadBubble.Raw,job);
 
                 clone.CloneTable(liveTable.Database, rawDb, tableInfo.Discover(DataAccessContext.DataLoad), rawTableName, true,true, true, discardedColumns);
 

SharedAssemblyInfo.cs

@@ -8,7 +8,7 @@
 [assembly: AssemblyCulture("")]
 
 // These should be replaced with correct values by the release process
-[assembly: AssemblyVersion("2.2.1")]
-[assembly: AssemblyFileVersion("2.2.1")]
-[assembly: AssemblyInformationalVersion("2.2.1")]
+[assembly: AssemblyVersion("2.2.2")]
+[assembly: AssemblyFileVersion("2.2.2")]
+[assembly: AssemblyInformationalVersion("2.2.2")]
 [assembly: InternalsVisibleTo("Rdmp.Dicom.Tests")]