Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilder.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rdcc0cfdb33874458e6faf61a5ea34d18680399ba
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilder.cs	(.../HydraulicLocationConfigurationDatabaseQueryBuilder.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilder.cs	(.../HydraulicLocationConfigurationDatabaseQueryBuilder.cs)	(revision dcc0cfdb33874458e6faf61a5ea34d18680399ba)
@@ -27,15 +27,13 @@
     public static class HydraulicLocationConfigurationDatabaseQueryBuilder
     {
         /// <summary>
-        /// Gets the query to get location ids from the database.
+        /// Gets the query to get locations from the database.
         /// </summary>
-        /// <returns>The query to get location ids from the database.</returns>
-        public static string GetLocationIdsByTrackIdQuery()
+        /// <returns>The query to get locations from the database.</returns>
+        public static string GetLocationsQuery()
         {
-            return $"SELECT {LocationsTableDefinitions.LocationId}, {LocationsTableDefinitions.HrdLocationId} " +
-                   $"FROM {LocationsTableDefinitions.TableName} " +
-                   $"WHERE {LocationsTableDefinitions.TrackId} = @{LocationsTableDefinitions.TrackId} " +
-                   $"ORDER BY {LocationsTableDefinitions.HrdLocationId};";
+            return $"SELECT {LocationsTableDefinitions.LocationId}, {LocationsTableDefinitions.HrdLocationId}, {LocationsTableDefinitions.TrackId} " +
+                   $"FROM {LocationsTableDefinitions.TableName};";
         }
 
         /// <summary>
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs
===================================================================
diff -u -r07a41d094be62c976b11a052a1baf5781a534dbc -rdcc0cfdb33874458e6faf61a5ea34d18680399ba
--- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs	(.../HydraulicLocationConfigurationDatabaseReader.cs)	(revision 07a41d094be62c976b11a052a1baf5781a534dbc)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs	(.../HydraulicLocationConfigurationDatabaseReader.cs)	(revision dcc0cfdb33874458e6faf61a5ea34d18680399ba)
@@ -28,7 +28,6 @@
 using Core.Common.IO.Exceptions;
 using Core.Common.IO.Readers;
 using Core.Common.Util.Builders;
-using log4net;
 using Riskeer.HydraRing.IO.Properties;
 
 namespace Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase
@@ -38,8 +37,6 @@
     /// </summary>
     public class HydraulicLocationConfigurationDatabaseReader : SqLiteDatabaseReaderBase
     {
-        private static readonly ILog log = LogManager.GetLogger(typeof(HydraulicLocationConfigurationDatabaseReader));
-
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicLocationConfigurationDatabaseReader"/>, which will use the
         /// <paramref name="databaseFilePath"/> as its source.
@@ -63,35 +60,28 @@
         /// <exception cref="LineParseException">Thrown when the database returned incorrect values for required properties.</exception>
         public ReadHydraulicLocationConfigurationDatabase Read(long trackId)
         {
-            return new ReadHydraulicLocationConfigurationDatabase(GetFromDatabase(() => GetHydraulicLocationsFromDatabase(new SQLiteParameter
-                                                                  {
-                                                                      DbType = DbType.String,
-                                                                      ParameterName = LocationsTableDefinitions.TrackId,
-                                                                      Value = trackId
-                                                                  })).Where(rhl => rhl.TrackId == trackId),
+            return new ReadHydraulicLocationConfigurationDatabase(GetFromDatabase(GetLocations).Where(rhl => rhl.TrackId == trackId),
                                                                   IsScenarioInformationTablePresent()
                                                                       ? GetConfigurationSettings()
                                                                       : null,
                                                                   GetUsePreprocessorClosureByTrackId(trackId));
         }
 
         /// <summary>
-        /// Gets the hydraulic locations from the database.
+        /// Gets the locations from the database.
         /// </summary>
-        /// <param name="trackParameter">A parameter containing the track id.</param>
         /// <returns>A collection of <see cref="ReadHydraulicLocation"/> as found in the database.</returns>
         /// <exception cref="SQLiteException">Thrown when the database query failed.</exception>
         /// <exception cref="ConversionException">Thrown when the database returned incorrect values for required properties.</exception>
-        private IEnumerable<ReadHydraulicLocation> GetHydraulicLocationsFromDatabase(SQLiteParameter trackParameter)
+        private IEnumerable<ReadHydraulicLocation> GetLocations()
         {
-            using (IDataReader dataReader = CreateDataReader(HydraulicLocationConfigurationDatabaseQueryBuilder.GetLocationIdsByTrackIdQuery(),
-                                                             trackParameter))
+            using (IDataReader dataReader = CreateDataReader(HydraulicLocationConfigurationDatabaseQueryBuilder.GetLocationsQuery()))
             {
                 while (MoveNext(dataReader))
                 {
                     yield return new ReadHydraulicLocation(dataReader.Read<long>(LocationsTableDefinitions.LocationId),
                                                            dataReader.Read<long>(LocationsTableDefinitions.HrdLocationId),
-                                                           1);
+                                                           dataReader.Read<long>(LocationsTableDefinitions.TrackId));
                 }
             }
         }
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rdcc0cfdb33874458e6faf61a5ea34d18680399ba
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs	(.../HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs	(.../HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs)	(revision dcc0cfdb33874458e6faf61a5ea34d18680399ba)
@@ -28,13 +28,13 @@
     public class HydraulicLocationConfigurationDatabaseQueryBuilderTest
     {
         [Test]
-        public void GetLocationIdsByTrackIdQuery_Always_ReturnsExpectedValue()
+        public void GetLocationsQuery_Always_ReturnsExpectedValue()
         {
             // Call
-            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetLocationIdsByTrackIdQuery();
+            string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetLocationsQuery();
 
             // Assert
-            const string expectedQuery = "SELECT LocationId, HRDLocationId FROM Locations WHERE TrackId = @TrackId ORDER BY HRDLocationId;";
+            const string expectedQuery = "SELECT LocationId, HRDLocationId, TrackId FROM Locations;";
             Assert.AreEqual(expectedQuery, query);
         }
 
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs
===================================================================
diff -u -r80fcfa0be41284da6884f73a152fbd4ef57b6f63 -rdcc0cfdb33874458e6faf61a5ea34d18680399ba
--- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs	(.../HydraulicLocationConfigurationDatabaseReaderTest.cs)	(revision 80fcfa0be41284da6884f73a152fbd4ef57b6f63)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs	(.../HydraulicLocationConfigurationDatabaseReaderTest.cs)	(revision dcc0cfdb33874458e6faf61a5ea34d18680399ba)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Data.SQLite;
 using System.IO;
@@ -241,31 +240,6 @@
         }
 
         [Test]
-        public void Read_AmbiguousLocations_ReturnsFirstLocationIdAndLogsWarning()
-        {
-            // Setup
-            string dbFile = Path.Combine(testDataPath, "ambigousLocation.sqlite");
-            const int trackId = 11;
-            const int hrdLocationId = 1;
-            ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = null;
-
-            using (var hydraulicBoundaryDatabaseReader = new HydraulicLocationConfigurationDatabaseReader(dbFile))
-            {
-                // Call
-                Action call = () => readHydraulicLocationConfigurationDatabase = hydraulicBoundaryDatabaseReader.Read(trackId);
-
-                // Assert
-                const int expectedLocationId = 1800001;
-                const string expectedMessage = "Er zijn meerdere resultaten gevonden, wat niet voor zou mogen komen. Neem contact op met de leverancier. Het eerste resultaat zal worden gebruikt.";
-                TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
-                long actualLocationId = readHydraulicLocationConfigurationDatabase.LocationIdMappings.Where(m => m.HrdLocationId == hrdLocationId)
-                                                                                  .Select(m => m.HlcdLocationId)
-                                                                                  .Single();
-                Assert.AreEqual(expectedLocationId, actualLocationId);
-            }
-        }
-
-        [Test]
         public void Read_InvalidColumns_ThrowsLineParseException()
         {
             // Setup
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/test-data/HydraulicLocationConfigurationDatabase/ambigousLocation.sqlite
===================================================================
diff -u -r214992131e8f6b96f2504c706bc340247e77a813 -rdcc0cfdb33874458e6faf61a5ea34d18680399ba
Binary files differ