Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -r64f3bfefcf39af1aa2d317f499f0e7b31137e9ae -r00cd167e5b3fe6e817e063ab654459c90e550aea --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 64f3bfefcf39af1aa2d317f499f0e7b31137e9ae) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 00cd167e5b3fe6e817e063ab654459c90e550aea) @@ -151,7 +151,6 @@ try { string version = hydraulicBoundaryDatabaseReader.GetVersion(); - bool canUsePreprocessor = hydraulicLocationConfigurationDatabaseReader.GetCanUsePreprocessorByTrackId(trackId); var hydraulicBoundaryLocations = new List(); Dictionary locationIdsDictionary = hydraulicLocationConfigurationDatabaseReader.GetLocationIdsByTrackId(trackId); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilder.cs =================================================================== diff -u -r85fb38b5ff4ef61c053ffef928570cd75cfa9357 -r00cd167e5b3fe6e817e063ab654459c90e550aea --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilder.cs (.../HydraulicLocationConfigurationDatabaseQueryBuilder.cs) (revision 85fb38b5ff4ef61c053ffef928570cd75cfa9357) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilder.cs (.../HydraulicLocationConfigurationDatabaseQueryBuilder.cs) (revision 00cd167e5b3fe6e817e063ab654459c90e550aea) @@ -37,17 +37,5 @@ $"WHERE {LocationsTableDefinitions.TrackId} = @{LocationsTableDefinitions.TrackId} " + $"ORDER BY {LocationsTableDefinitions.HrdLocationId};"; } - - /// - /// Gets the query to get region information from the database. - /// - /// The query to get region information from the database. - public static string GetRegionByTrackIdQuery() - { - return $"SELECT * FROM {RegionsTableDefinitions.TableName} " + - $"LEFT JOIN {TracksTableDefinitions.TableName} " + - $"ON {RegionsTableDefinitions.TableName}.{RegionsTableDefinitions.RegionId} = {TracksTableDefinitions.TableName}.{TracksTableDefinitions.RegionId} " + - $"WHERE {TracksTableDefinitions.TableName}.{TracksTableDefinitions.TrackId} = @{TracksTableDefinitions.TrackId}"; - } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r00cd167e5b3fe6e817e063ab654459c90e550aea --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 00cd167e5b3fe6e817e063ab654459c90e550aea) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.Data; using System.Data.SQLite; -using System.Linq; using Core.Common.Base.IO; using Core.Common.IO.Exceptions; using Core.Common.IO.Readers; @@ -87,40 +86,6 @@ } /// - /// Gets whether the preprocessor can be used for the given . - /// - /// The hydraulic boundary track id. - /// The value found in the database; or false when the database - /// is valid but outdated (no UsePreprocessor column present). - /// Thrown when the database query failed or when no results could be found. - /// Thrown when the database returned incorrect values for - /// required properties. - public bool GetCanUsePreprocessorByTrackId(long trackId) - { - var trackParameter = new SQLiteParameter - { - DbType = DbType.String, - ParameterName = TracksTableDefinitions.TrackId, - Value = trackId - }; - - try - { - return GetCanUsePreprocessorFromDatabase(trackParameter); - } - catch (SQLiteException exception) - { - string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicLocationConfigurationDatabaseReader_Critical_Unexpected_Exception); - throw new CriticalFileReadException(message, exception); - } - catch (FormatException exception) - { - string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column); - throw new LineParseException(message, exception); - } - } - - /// /// Gets the location ids from the database, based upon . /// /// A parameter containing the hydraulic boundary track id. @@ -150,40 +115,8 @@ } } } + return dictionary; } - - /// - /// Gets whether the preprocessor can be used for the given . - /// - /// A parameter containing the hydraulic boundary track id. - /// The value found in the database; or false when the database - /// is valid but outdated (no UsePreprocessor column present). - /// Thrown when the database query failed. - /// Thrown when the database returned incorrect values for - /// required properties. - /// Thrown when no results could be found. - private bool GetCanUsePreprocessorFromDatabase(SQLiteParameter trackParameter) - { - string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetRegionByTrackIdQuery(); - using (IDataReader dataReader = CreateDataReader(query, trackParameter)) - { - DataTable schemaTable = dataReader.GetSchemaTable(); - DataColumn columnName = schemaTable.Columns[schemaTable.Columns.IndexOf("ColumnName")]; - - if (schemaTable.Rows.Cast().All(row => row[columnName].ToString() != RegionsTableDefinitions.UsePreprocessor)) - { - return false; - } - - if (MoveNext(dataReader)) - { - return Convert.ToBoolean(dataReader[RegionsTableDefinitions.UsePreprocessor]); - } - - string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicLocationConfigurationDatabaseReader_Critical_Unexpected_Exception); - throw new CriticalFileReadException(message); - } - } } } \ No newline at end of file Fisheye: Tag 00cd167e5b3fe6e817e063ab654459c90e550aea refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/RegionsTableDefinitions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 00cd167e5b3fe6e817e063ab654459c90e550aea refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/TracksTableDefinitions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj =================================================================== diff -u -r1ad608d6d74fd2ee54be546f1ea368baf4c5db1d -r00cd167e5b3fe6e817e063ab654459c90e550aea --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj (.../Ringtoets.HydraRing.IO.csproj) (revision 1ad608d6d74fd2ee54be546f1ea368baf4c5db1d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj (.../Ringtoets.HydraRing.IO.csproj) (revision 00cd167e5b3fe6e817e063ab654459c90e550aea) @@ -18,7 +18,6 @@ ..\..\..\..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net40\System.Data.SQLite.dll True - @@ -29,8 +28,6 @@ - - True Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs =================================================================== diff -u -r85fb38b5ff4ef61c053ffef928570cd75cfa9357 -r00cd167e5b3fe6e817e063ab654459c90e550aea --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs (.../HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs) (revision 85fb38b5ff4ef61c053ffef928570cd75cfa9357) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs (.../HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs) (revision 00cd167e5b3fe6e817e063ab654459c90e550aea) @@ -37,16 +37,5 @@ const string expectedQuery = "SELECT LocationId, HRDLocationId FROM Locations WHERE TrackId = @TrackId ORDER BY HRDLocationId;"; Assert.AreEqual(expectedQuery, query); } - - [Test] - public void GetRegionByTrackIdQuery_Always_ReturnsExpectedValues() - { - // Call - string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetRegionByTrackIdQuery(); - - // Assert - const string expectedQuery = "SELECT * FROM Regions LEFT JOIN Tracks ON Regions.RegionId = Tracks.RegionId WHERE Tracks.TrackId = @TrackId"; - Assert.AreEqual(expectedQuery, query); - } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r00cd167e5b3fe6e817e063ab654459c90e550aea --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 00cd167e5b3fe6e817e063ab654459c90e550aea) @@ -153,100 +153,5 @@ Assert.IsInstanceOf(exception.InnerException); } } - - [Test] - [TestCase(1000, true)] - [TestCase(11, false)] - public void GetCanUsePreprocessorByTrackId_ValidFile_ExpectedValues(long trackId, bool expectedUsePreprocessor) - { - // Setup - string dbFile = Path.Combine(testDataPath, "complete.sqlite"); - - using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile)) - { - // Call - bool usePreprocessor = hydraulicBoundaryDatabaseReader.GetCanUsePreprocessorByTrackId(trackId); - - // Assert - Assert.AreEqual(expectedUsePreprocessor, usePreprocessor); - } - } - - [Test] - public void GetCanUsePreprocessorByTrackId_ValidFileWithoutUsePreprocessorColumn_ReturnFalse() - { - // Setup - string dbFile = Path.Combine(testDataPath, "noUsePreprocessorColumn.sqlite"); - const int trackId = 1000; - - using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile)) - { - // Call - bool usePreprocessor = hydraulicBoundaryDatabaseReader.GetCanUsePreprocessorByTrackId(trackId); - - // Assert - Assert.IsFalse(usePreprocessor); - } - } - - [Test] - public void GetCanUsePreprocessorByTrackId_UnknownRegionIdForTrackId_ThrowsCriticalFileReadException() - { - // Setup - string dbFile = Path.Combine(testDataPath, "complete.sqlite"); - const int trackId = 1; - - using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile)) - { - // Call - TestDelegate test = () => hydraulicBoundaryDatabaseReader.GetCanUsePreprocessorByTrackId(trackId); - - // Assert - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Het bevragen van de database is mislukt."); - var exception = Assert.Throws(test); - Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsNull(exception.InnerException); - } - } - - [Test] - public void GetCanUsePreprocessorByTrackId_EmptyFile_ThrowsCriticalFileReadException() - { - // Setup - string dbFile = Path.Combine(testDataPath, "empty.sqlite"); - const int trackId = 1; - - using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile)) - { - // Call - TestDelegate test = () => hydraulicBoundaryDatabaseReader.GetCanUsePreprocessorByTrackId(trackId); - - // Assert - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Het bevragen van de database is mislukt."); - var exception = Assert.Throws(test); - Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsInstanceOf(exception.InnerException); - } - } - - [Test] - public void GetCanUsePreprocessorByTrackId_InvalidColumns_ThrowsLineParseException() - { - // Setup - string dbFile = Path.Combine(testDataPath, "corruptschema.sqlite"); - const int trackId = 1000; - - using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile)) - { - // Call - TestDelegate test = () => hydraulicBoundaryDatabaseReader.GetCanUsePreprocessorByTrackId(trackId); - - // Assert - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); - var exception = Assert.Throws(test); - Assert.AreEqual(expectedMessage, exception.Message); - Assert.IsInstanceOf(exception.InnerException); - } - } } } \ No newline at end of file Fisheye: Tag 00cd167e5b3fe6e817e063ab654459c90e550aea refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/RegionsTableDefinitionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 00cd167e5b3fe6e817e063ab654459c90e550aea refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/TracksTableDefinitionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj =================================================================== diff -u -r1ad608d6d74fd2ee54be546f1ea368baf4c5db1d -r00cd167e5b3fe6e817e063ab654459c90e550aea --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj (.../Ringtoets.HydraRing.IO.Test.csproj) (revision 1ad608d6d74fd2ee54be546f1ea368baf4c5db1d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj (.../Ringtoets.HydraRing.IO.Test.csproj) (revision 00cd167e5b3fe6e817e063ab654459c90e550aea) @@ -28,8 +28,6 @@ - -