Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs =================================================================== diff -u -r377ab5754aaebdd884c70b39bc44f1669d01efa8 -r07ff9cdf4b5f0a16b695306518ed9019020983c6 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision 377ab5754aaebdd884c70b39bc44f1669d01efa8) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision 07ff9cdf4b5f0a16b695306518ed9019020983c6) @@ -38,10 +38,10 @@ { private const string sectionIdParameterName = "@sectionId"; private readonly string workingDirectory; - private readonly SQLiteConnection connection; - private SQLiteDataReader reader; + private SQLiteConnection connection; private SQLiteCommand command; + private SQLiteDataReader reader; /// /// Creates a new instance of . @@ -77,7 +77,7 @@ this.workingDirectory = workingDirectory; - connection = CreateConnection(); + CreateConnection(); CreateCommand(query, sectionId); OpenConnection(); GetReader(); @@ -104,7 +104,7 @@ return results; } - throw new HydraRingDatabaseReaderException(Resources.HydraRingDatabaseReader_Execute_No_result_found_in_output_file); + throw new HydraRingDatabaseReaderException(Resources.HydraRingDatabaseReader_ReadLine_No_result_found_in_output_file); } public void Dispose() @@ -123,19 +123,18 @@ } } - private void GetReader() + private void CreateConnection() { - reader = command.ExecuteReader(); - } + string databaseFile = Path.Combine(workingDirectory, HydraRingFileConstants.OutputDatabaseFileName); - /// - /// Opens the connection. - /// - /// Thrown when - /// the connection could not be opened. - private void OpenConnection() - { - connection.Open(); + string connectionStringBuilder = new SQLiteConnectionStringBuilder + { + FailIfMissing = true, + DataSource = databaseFile, + ReadOnly = true + }.ConnectionString; + + connection = new SQLiteConnection(connectionStringBuilder); } private void CreateCommand(string query, int sectionId) @@ -149,18 +148,18 @@ }); } - private SQLiteConnection CreateConnection() + private void GetReader() { - string databaseFile = Path.Combine(workingDirectory, HydraRingFileConstants.OutputDatabaseFileName); + reader = command.ExecuteReader(); + } - string connectionStringBuilder = new SQLiteConnectionStringBuilder - { - FailIfMissing = true, - DataSource = databaseFile, - ReadOnly = true - }.ConnectionString; - - return new SQLiteConnection(connectionStringBuilder); + /// + /// Opens the connection. + /// + /// Thrown when the connection could not be opened. + private void OpenConnection() + { + connection.Open(); } } } \ No newline at end of file