Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r40fd72c934449688af1f36676fa88dc86c7cd5c9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 40fd72c934449688af1f36676fa88dc86c7cd5c9) @@ -19,17 +19,101 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Data.Entity; + namespace Application.Ringtoets.Storage.DbContext { /// - /// Partial implementation of that support a connection string and does not read the connection string from the configuration. + /// Partial implementation of that support a connection string + /// and does not read the connection string from the configuration. /// public partial class RingtoetsEntities { /// /// A new instance of . /// /// A connection string. - public RingtoetsEntities(string connString) : base(connString) {} + public RingtoetsEntities(string connString) : base(connString) + { + Configuration.LazyLoadingEnabled = false; + } + + /// + /// Loads all tables into the context. + /// + public void LoadTablesIntoContext() + { + AssessmentSectionEntities.Load(); + BackgroundDataEntities.Load(); + BackgroundDataMetaEntities.Load(); + CalculationGroupEntities.Load(); + CharacteristicPointEntities.Load(); + ClosingStructureEntities.Load(); + ClosingStructuresCalculationEntities.Load(); + ClosingStructuresFailureMechanismMetaEntities.Load(); + ClosingStructuresOutputEntities.Load(); + ClosingStructuresSectionResultEntities.Load(); + DikeProfileEntities.Load(); + DuneErosionFailureMechanismMetaEntities.Load(); + DuneErosionSectionResultEntities.Load(); + DuneLocationEntities.Load(); + DuneLocationOutputEntities.Load(); + DuneLocationOutputEntities.Load(); + FailureMechanismEntities.Load(); + FailureMechanismSectionEntities.Load(); + ForeshoreProfileEntities.Load(); + GrassCoverErosionInwardsCalculationEntities.Load(); + GrassCoverErosionInwardsDikeHeightOutputEntities.Load(); + GrassCoverErosionInwardsFailureMechanismMetaEntities.Load(); + GrassCoverErosionInwardsOutputEntities.Load(); + GrassCoverErosionInwardsOvertoppingRateOutputEntities.Load(); + GrassCoverErosionInwardsSectionResultEntities.Load(); + GrassCoverErosionOutwardsFailureMechanismMetaEntities.Load(); + GrassCoverErosionOutwardsHydraulicLocationEntities.Load(); + GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Load(); + GrassCoverErosionOutwardsSectionResultEntities.Load(); + GrassCoverErosionOutwardsWaveConditionsCalculationEntities.Load(); + GrassCoverErosionOutwardsWaveConditionsOutputEntities.Load(); + GrassCoverSlipOffInwardsSectionResultEntities.Load(); + GrassCoverSlipOffOutwardsSectionResultEntities.Load(); + HeightStructureEntities.Load(); + HeightStructuresCalculationEntities.Load(); + HeightStructuresFailureMechanismMetaEntities.Load(); + HeightStructuresOutputEntities.Load(); + HeightStructuresSectionResultEntities.Load(); + HydraulicLocationEntities.Load(); + HydraulicLocationOutputEntities.Load(); + MacrostabilityInwardsSectionResultEntities.Load(); + MacrostabilityOutwardsSectionResultEntities.Load(); + MicrostabilitySectionResultEntities.Load(); + ProjectEntities.Load(); + PipingCalculationEntities.Load(); + PipingCalculationOutputEntities.Load(); + PipingFailureMechanismMetaEntities.Load(); + PipingSectionResultEntities.Load(); + PipingSemiProbabilisticOutputEntities.Load(); + PipingStructureSectionResultEntities.Load(); + SoilLayerEntities.Load(); + SoilProfileEntities.Load(); + StabilityPointStructureEntities.Load(); + StabilityPointStructuresCalculationEntities.Load(); + StabilityPointStructuresFailureMechanismMetaEntities.Load(); + StabilityPointStructuresOutputEntities.Load(); + StabilityPointStructuresSectionResultEntities.Load(); + StabilityStoneCoverFailureMechanismMetaEntities.Load(); + StabilityStoneCoverSectionResultEntities.Load(); + StabilityStoneCoverWaveConditionsCalculationEntities.Load(); + StabilityStoneCoverWaveConditionsOutputEntities.Load(); + StochasticSoilModelEntities.Load(); + StochasticSoilProfileEntities.Load(); + StrengthStabilityLengthwiseConstructionSectionResultEntities.Load(); + SurfaceLineEntities.Load(); + TechnicalInnovationSectionResultEntities.Load(); + WaterPressureAsphaltCoverSectionResultEntities.Load(); + WaveImpactAsphaltCoverFailureMechanismMetaEntities.Load(); + WaveImpactAsphaltCoverSectionResultEntities.Load(); + WaveImpactAsphaltCoverWaveConditionsCalculationEntities.Load(); + WaveImpactAsphaltCoverWaveConditionsOutputEntities.Load(); + } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -rc001c83924455e2040eda334a044058f64d0f800 -r40fd72c934449688af1f36676fa88dc86c7cd5c9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision c001c83924455e2040eda334a044058f64d0f800) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 40fd72c934449688af1f36676fa88dc86c7cd5c9) @@ -2671,7 +2671,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r40fd72c934449688af1f36676fa88dc86c7cd5c9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs (.../StorageSqLite.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs (.../StorageSqLite.cs) (revision 40fd72c934449688af1f36676fa88dc86c7cd5c9) @@ -119,11 +119,12 @@ { ValidateDatabaseVersion(dbContext, databaseFilePath); - ProjectEntity projectEntity; + dbContext.LoadTablesIntoContext(); + ProjectEntity projectEntity; try { - projectEntity = dbContext.ProjectEntities.Single(); + projectEntity = dbContext.ProjectEntities.Local.Single(); } catch (InvalidOperationException exception) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/RingtoetsEntitiesTest.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r40fd72c934449688af1f36676fa88dc86c7cd5c9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/RingtoetsEntitiesTest.cs (.../RingtoetsEntitiesTest.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/RingtoetsEntitiesTest.cs (.../RingtoetsEntitiesTest.cs) (revision 40fd72c934449688af1f36676fa88dc86c7cd5c9) @@ -54,6 +54,7 @@ // Assert Assert.IsInstanceOf(ringtoetsEntities); Assert.AreEqual(connectionString, ringtoetsEntities.Database.Connection.ConnectionString); + Assert.IsFalse(ringtoetsEntities.Configuration.LazyLoadingEnabled); } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r40fd72c934449688af1f36676fa88dc86c7cd5c9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs (.../StorageSqLiteTest.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/StorageSqLiteTest.cs (.../StorageSqLiteTest.cs) (revision 40fd72c934449688af1f36676fa88dc86c7cd5c9) @@ -143,7 +143,7 @@ Assert.IsInstanceOf(exception.InnerException.InnerException); Assert.AreEqual($"SQL logic error or missing database{Environment.NewLine}" - + "no such table: ProjectEntity", exception.InnerException.InnerException.Message); + + "no such table: AssessmentSectionEntity", exception.InnerException.InnerException.Message); } [Test]