tables

Author: JFriel

Rdmp.Core/Caching/CachingPreExecutionChecker.cs

@@ -34,7 +34,7 @@ public void Check(ICheckNotifier notifier)
             if (_cacheProgress.Pipeline_ID == null)
                 throw new Exception($"CacheProgress {_cacheProgress.ID} doesn't have a caching pipeline!");
 
-            IPipeline pipeline = null;
+            EntityFramework.Models.Pipeline pipeline = null;
             try
             {
                 pipeline = _cacheProgress.Pipeline;

Rdmp.Core/Caching/Pipeline/CachingPipelineUseCase.cs

@@ -32,7 +32,7 @@ namespace Rdmp.Core.Caching.Pipeline;
 public sealed class CachingPipelineUseCase : PipelineUseCase
 {
     private readonly ICacheProgress _cacheProgress;
-    private readonly IPipeline _pipeline;
+    private readonly EntityFramework.Models.Pipeline _pipeline;
 
     /// <summary>
     /// Class for helping you to construct a caching pipeline engine instance with the correct context and initialization objects

Rdmp.Core/CommandExecution/AtomicCommandFactory.cs

@@ -992,13 +992,13 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
         if (Is(o, out INamed n))
             yield return new ExecuteCommandRename(_activator, n) { SuggestedShortcut = "F2" };
 
-        if (Is(o, out PipelineCompatibleWithUseCaseNode pcu))
-        {
-            yield return new ExecuteCommandNewObject(_activator, typeof(Pipeline))
-            { OverrideCommandName = "New Pipeline" };
-            yield return new ExecuteCommandClonePipeline(_activator, pcu.Pipeline);
-            yield return new ExecuteCommandAddPipelineComponent(_activator, pcu.Pipeline, pcu.UseCase);
-        }
+        //if (Is(o, out PipelineCompatibleWithUseCaseNode pcu))
+        //{
+        //    yield return new ExecuteCommandNewObject(_activator, typeof(Pipeline))
+        //    { OverrideCommandName = "New Pipeline" };
+        //    yield return new ExecuteCommandClonePipeline(_activator, pcu.Pipeline);
+        //    yield return new ExecuteCommandAddPipelineComponent(_activator, pcu.Pipeline, pcu.UseCase);
+        //}
         else if (Is(o, out Pipeline pipeline))
         {
             yield return new ExecuteCommandNewObject(_activator, typeof(Pipeline))

Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingFile.cs

@@ -30,7 +30,7 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands.CatalogueCreationCommands;
 public class ExecuteCommandCreateNewCatalogueByImportingFile : CatalogueCreationCommandExecution
 {
     private readonly DiscoveredDatabase _targetDatabase;
-    private IPipeline _pipeline;
+    private EntityFramework.Models.Pipeline _pipeline;
     private readonly string _extractionIdentifier;
     private readonly string _initialDescription;
 
@@ -62,7 +62,7 @@ public ExecuteCommandCreateNewCatalogueByImportingFile(IBasicActivateItems activ
         DiscoveredDatabase targetDatabase,
         [DemandsInitialization(
             "Pipeline for reading the source file, applying any transforms and writing to the database")]
-        Pipeline pipeline,
+        EntityFramework.Models.Pipeline pipeline,
         [DemandsInitialization(Desc_ProjectSpecificParameter)]
         Project projectSpecific,
         string initialDescription=null) : base(activator, projectSpecific, null)
@@ -99,11 +99,11 @@ public override void Execute()
 
         if (_pipeline == null)
         {
-            var pipelines = BasicActivator.RepositoryLocator.CatalogueDbContext.GetAllObjects<Pipeline>();
+            var pipelines = BasicActivator.RepositoryLocator.CatalogueDbContext.Pipelines;
 
             var compatible = UploadFileUseCase.DesignTime().FilterCompatiblePipelines(pipelines).ToArray();
 
-            _pipeline = (IPipeline)BasicActivator.SelectOne("File Upload Pipeline", compatible);
+            _pipeline = (EntityFramework.Models.Pipeline)BasicActivator.SelectOne("File Upload Pipeline", compatible);
 
             if (_pipeline == null)
                 throw new Exception("No pipeline selected for upload");

Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/CohortCreationCommandExecution.cs

@@ -31,7 +31,7 @@ public abstract class CohortCreationCommandExecution : BasicCommandExecution, IA
 
     protected ExternalCohortTable ExternalCohortTable;
     protected IProject Project;
-    protected readonly IPipeline Pipeline;
+    protected readonly EntityFramework.Models.Pipeline Pipeline;
     private readonly string _explicitCohortName;
 
     /// <summary>
@@ -52,7 +52,7 @@ protected CohortCreationCommandExecution(IBasicActivateItems activator)
     /// <param name="project"></param>
     /// <param name="pipeline"></param>
     protected CohortCreationCommandExecution(IBasicActivateItems activator, ExternalCohortTable externalCohortTable,
-        string cohortName, Project project, IPipeline pipeline) : base(activator)
+        string cohortName, Project project, EntityFramework.Models.Pipeline pipeline) : base(activator)
     {
         //May be null
         _explicitCohortName = cohortName;

Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration.cs

@@ -51,7 +51,7 @@ public ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguratio
         Project project,
         [DemandsInitialization(
             "Pipeline for executing the query, performing any required transforms on the output list and allocating release identifiers")]
-        IPipeline pipeline) :
+        EntityFramework.Models.Pipeline pipeline) :
         base(activator, ect, cohortName, project, pipeline)
     {
         _cic = cic;

Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromCatalogue.cs

@@ -58,7 +58,7 @@ public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator,
         Project project,
         [DemandsInitialization(
             "Pipeline for executing the query, performing any required transforms on the output list and allocating release identifiers")]
-        IPipeline pipeline) : base(activator, ect, cohortName, project, pipeline)
+        EntityFramework.Models.Pipeline pipeline) : base(activator, ect, cohortName, project, pipeline)
     {
         UseTripleDotSuffix = true;
 

Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromFile.cs

@@ -48,7 +48,7 @@ public ExecuteCommandCreateNewCohortFromFile(IBasicActivateItems activator,
         [DemandsInitialization(Desc_ProjectParameter)]
         Project project,
         [DemandsInitialization("Pipeline for reading from the file and allocating release identifiers")]
-        IPipeline pipeline)
+        EntityFramework.Models.Pipeline pipeline)
         : base(activator, externalCohortTable, cohortName, project, pipeline)
     {
         _file = file;

Rdmp.Core/CommandExecution/Combining/PipelineCombineable.cs

@@ -13,10 +13,10 @@ namespace Rdmp.Core.CommandExecution.Combining;
 /// </summary>
 public class PipelineCombineable : ICombineToMakeCommand
 {
-    public Pipeline Pipeline { get; private set; }
+    public IPipeline Pipeline { get; private set; }
     public bool IsEmpty { get; private set; }
 
-    public PipelineCombineable(Pipeline pipeline)
+    public PipelineCombineable(IPipeline pipeline)
     {
         Pipeline = pipeline;
 

Rdmp.Core/CommandLine/DatabaseCreation/ExampleDatasetsCreation.cs

@@ -197,8 +197,8 @@ WHERE Operation <> 'NULL' AND Operation <> 'Nul'
 
         //Find the pipeline for committing cohorts
         var cohortCreationPipeline =
-            _repos.CatalogueDbContext.GetAllObjects<Pipeline>().FirstOrDefault(p =>
-                p?.Source?.Class == typeof(CohortIdentificationConfigurationSource).FullName) ??
+            _repos.CatalogueDbContext.Pipelines.FirstOrDefault( p =>
+                p.Source.Class == typeof(CohortIdentificationConfigurationSource).FullName) ??
             throw new Exception("Could not find a cohort committing pipeline");
 
         //A cohort creation query
@@ -379,7 +379,7 @@ private ExtractionConfiguration CreateExtractionConfiguration(Project project, E
     }
 
     private ExtractableCohort CommitCohortToNewProject(CohortIdentificationConfiguration cic,
-        ExternalCohortTable externalCohortTable, IPipeline cohortCreationPipeline, string projectName,
+        ExternalCohortTable externalCohortTable, EntityFramework.Models.Pipeline cohortCreationPipeline, string projectName,
         string cohortName, int projectNumber, out Project project)
     {
         //create a new data extraction Project