Migrate Auth/Brewery/Location repositories to pure Dapper; rename Timer to RowVersion (#237)

* Integrate Spectre.Console into seed application, use async data loading

* Replace stored-procedure repositories with Dapper-based repositories

Removes the USP_* stored procedures for Auth, Location, and Brewery
data access in favour of services built with Dapper.

Adds a new Features.Locations slice and optimistic concurrency support
for the Brewery slice.

* Add new documentation for Dapper migration/database schema

* Update FluentAssertions to most recent open source ver

* Update XML doc comment in backend projects

* Modify brewery location dto to include denormalized data

* - Updated column names from 'Timer' to 'RowVersion' in schema.sql for
- Introduced new BeerPost entity and updated BreweryPost and BreweryPostLocation entities to use 'RowVersion' for concurrency.
- Modified UserAccount, UserCredential, UserVerification, City, StateProvince, and Country entities to use 'RowVersion' instead of 'Timer'.
- Updated tests and command handlers to reflect changes in concurrency token from 'Timer' to 'RowVersion'.
- Adjusted BreweryDto and BreweryDtoMapper to include 'RowVersion' and updated mapping logic accordingly.
- Ensured all repository methods and interfaces are aligned with the new concurrency handling approach.

* updates

* Add BeerStyle entity and related properties; refactor BreweryDto to remove BeerPosts

* Fix Api.Specs test failures: stale Timer column refs and missing test.user fixture

* Remove repository tests, usages of registration dto used in repo

* archive old stored procs/functions

* update stale docs

* Add instructions for generating cryptographically secure base64 secrets on macOS/Linux and Windows

web/backend/Database/Database.Seed/Database.Seed.csproj

@@ -10,13 +10,8 @@
     <ItemGroup>
         <PackageReference Include="idunno.Password.Generator" Version="2.0.0" />
         <PackageReference Include="Microsoft.Data.SqlClient" Version="7.0.2" />
-        <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.0" />
-
-        <!--
-        remove this override once microsoft ships official fix to vulnerability
-        https:
-        -->
-        <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
+        <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.11" />
+        <PackageReference Include="Spectre.Console" Version="0.57.2" />
     </ItemGroup>
 
     <ItemGroup>
@@ -24,14 +19,9 @@
         <ProjectReference Include="..\..\Infrastructure\Infrastructure.Sql\Infrastructure.Sql.csproj" />
         <ProjectReference Include="..\..\Features\Features.Breweries\Features.Breweries.csproj" />
         <ProjectReference Include="..\..\Features\Features.Auth\Features.Auth.csproj" />
+        <ProjectReference Include="..\..\Features\Features.Locations\Features.Locations.csproj" />
     </ItemGroup>
-
     <ItemGroup>
-        <!-- Pipeline-generated seed data, copied to the output directory so it can be opened via
-             ConnectionStrings.SqliteConnectionString at runtime. -->
-        <None
-            CopyToOutputDirectory="PreserveNewest"
-            Include="SeedData\biergarten_seed_2026-07-20T05-46-02.993511Z.sqlite"
-        />
+        <None CopyToOutputDirectory="PreserveNewest" Include="SeedData\biergarten_seed_2026-07-20T05-46-02.993511Z.sqlite" />
     </ItemGroup>
 </Project>

web/backend/Database/Database.Seed/DatabaseHelpers/ConnectionStrings.cs

@@ -1,6 +1,6 @@
-#region
+#region
 
-using Microsoft.Data.SqlClient;
+using Infrastructure.Sql;
 
 #endregion
 
@@ -8,41 +8,7 @@ namespace Database.Seed.DatabaseHelpers;
 
 public class ConnectionStrings
 {
-    public static string SqlServerConnectionString => GetSqlServerConnectionString();
+    public static string SqlServerConnectionString => SqlConnectionStringHelper.BuildConnectionString();
     public static string SqliteConnectionString =>
         "Data Source=SeedData/biergarten_seed_2026-07-20T05-46-02.993511Z.sqlite";
-
-    private static string GetSqlServerConnectionString()
-    {
-        string server =
-            Environment.GetEnvironmentVariable("DB_SERVER")
-            ?? throw new InvalidOperationException("DB_SERVER environment variable is not set");
-
-        string dbName =
-            Environment.GetEnvironmentVariable("DB_NAME")
-            ?? throw new InvalidOperationException("DB_NAME environment variable is not set");
-
-        string user =
-            Environment.GetEnvironmentVariable("DB_USER")
-            ?? throw new InvalidOperationException("DB_USER environment variable is not set");
-
-        string password =
-            Environment.GetEnvironmentVariable("DB_PASSWORD")
-            ?? throw new InvalidOperationException("DB_PASSWORD environment variable is not set");
-
-        string trustServerCertificate =
-            Environment.GetEnvironmentVariable("DB_TRUST_SERVER_CERTIFICATE") ?? "True";
-
-        SqlConnectionStringBuilder builder = new()
-        {
-            DataSource = server,
-            InitialCatalog = dbName,
-            UserID = user,
-            Password = password,
-            TrustServerCertificate = bool.Parse(trustServerCertificate),
-            Encrypt = true,
-        };
-
-        return builder.ConnectionString;
-    }
 }

web/backend/Database/Database.Seed/Program.cs

@@ -7,112 +7,257 @@ using Features.Auth.Dtos;
 using Features.Auth.Repository;
 using Features.Breweries.DependencyInjection;
 using Features.Breweries.Repository;
+using Features.Locations.DependencyInjection;
+using Features.Locations.Dtos;
+using Features.Locations.Repository;
 using idunno.Password;
 using Infrastructure.PasswordHashing;
-using Infrastructure.Sql;
-using Microsoft.Data.Sqlite;
+using Infrastructure.Sql.DependencyInjection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console;
 
-static async Task<int> main()
+return await RunAsync();
+
+static async Task<int> RunAsync()
 {
-    IReadOnlyList<BreweryRecord> breweries;
-    IReadOnlyList<UserRecord> users;
     try
     {
-        PipelineSeedDataReader reader = new(ConnectionStrings.SqliteConnectionString);
-        breweries = reader.ReadBreweryRecords();
-        users = reader.ReadUserRecords();
+        ServiceCollection services = [];
+        services.AddSingleton<IConfiguration>(
+            new ConfigurationBuilder().Build());
+        services.AddInfrastructureSql();
+        services.AddFeaturesBreweries();
+        services.AddFeaturesLocations();
+        services.AddFeaturesAuth();
+
+        await using ServiceProvider provider = services.BuildServiceProvider();
+
+        IBreweryRepository breweryRepository =
+            provider.GetRequiredService<IBreweryRepository>();
+        ILocationRepository locationRepository =
+            provider.GetRequiredService<ILocationRepository>();
+        IAuthRepository authRepository =
+            provider.GetRequiredService<IAuthRepository>();
+        IPasswordInfrastructure passwordInfrastructure =
+            provider.GetRequiredService<IPasswordInfrastructure>();
+
+        AnsiConsole.Write(new Rule("[bold green]Database Seeder[/]")
+            .LeftJustified());
+        AnsiConsole.MarkupLine(
+            "[grey]Connecting to SQLite source and loading seed data...[/]");
+        AnsiConsole.WriteLine();
+
+        PipelineSeedDataReader reader =
+            new(ConnectionStrings.SqliteConnectionString);
+
+        SeedData seedData = null!;
+        IReadOnlyList<Guid> postedByIds = [];
+
+        await AnsiConsole
+            .Status()
+            .Spinner(Spinner.Known.Dots)
+            .SpinnerStyle(Style.Parse("green"))
+            .StartAsync(
+                "Loading seed data...",
+                async ctx =>
+                {
+                    seedData = await reader.ReadSeedDataAsync();
+                    ctx.Status(
+                        $"Loaded {seedData.Breweries.Count} breweries and {seedData.Users.Count} users."
+                    );
+                }
+            );
+
+        AnsiConsole.MarkupLine(
+            $"[green]✓[/] Loaded [bold]{seedData.Breweries.Count}[/] breweries."
+        );
+        AnsiConsole.Write(BuildBreweryTable(seedData.Breweries));
+        AnsiConsole.WriteLine();
+
+        AnsiConsole.MarkupLine(
+            $"[green]✓[/] Loaded [bold]{seedData.Users.Count}[/] users.");
+        AnsiConsole.Write(BuildUserTable(seedData.Users));
+        AnsiConsole.WriteLine();
+
+        AnsiConsole.WriteLine("Seed data loaded successfully.");
+
+        AnsiConsole.Write(
+            new Rule("[bold green]Loading seed data into target database.[/]")
+                .LeftJustified()
+        );
+
+        await AnsiConsole
+            .Status()
+            .Spinner(Spinner.Known.Dots)
+            .SpinnerStyle(Style.Parse("green"))
+            .StartAsync(
+                "Loading user data into target database...",
+                async ctx =>
+                {
+                    postedByIds = await LoadUsersIntoDatabaseAsync(
+                        authRepository,
+                        passwordInfrastructure,
+                        seedData.Users
+                    );
+                    ctx.Status("User data loaded into target database.");
+                }
+            );
+
+        await AnsiConsole
+            .Status()
+            .Spinner(Spinner.Known.Dots)
+            .SpinnerStyle(Style.Parse("green"))
+            .StartAsync(
+                "Loading brewery data into target database...",
+                async ctx =>
+                {
+                    await LoadBreweriesIntoDatabaseAsync(
+                        breweryRepository,
+                        locationRepository,
+                        seedData.Breweries,
+                        postedByIds
+                    );
+                    ctx.Status("Brewery data loaded into target database.");
+                }
+            );
+
+        return 0;
     }
-    catch (SqliteException ex)
+    catch (Exception ex)
     {
-        Console.ForegroundColor = ConsoleColor.Red;
-        Console.WriteLine($"Error opening database connection: {ex.Message}");
-        Console.ResetColor();
+        AnsiConsole.MarkupLine("[red]Seeding failed.[/]");
+        AnsiConsole.WriteException(ex);
         return 1;
     }
+}
 
-    ServiceCollection services = [];
-    services.AddSingleton<IConfiguration>(new ConfigurationBuilder().Build());
-    services.AddSingleton<ISqlConnectionFactory, DefaultSqlConnectionFactory>();
-    services.AddFeaturesBreweries();
-    services.AddFeaturesAuth();
+static async Task<IReadOnlyList<Guid>> LoadUsersIntoDatabaseAsync(
+    IAuthRepository authRepository,
+    IPasswordInfrastructure passwordInfrastructure,
+    IReadOnlyList<UserRecord> users
+)
+{
+    List<Guid> userAccountIds = [];
 
-    using ServiceProvider provider = services.BuildServiceProvider();
-
-    IBreweryRepository breweryRepository;
-    IAuthRepository authRepository;
-    IPasswordInfrastructure passwordInfrastructure;
-    try
+    foreach (UserRecord userRecord in users)
     {
-        breweryRepository = provider.GetRequiredService<IBreweryRepository>();
-        authRepository = provider.GetRequiredService<IAuthRepository>();
-        passwordInfrastructure = provider.GetRequiredService<IPasswordInfrastructure>();
-    }
-    catch (InvalidOperationException ex)
-    {
-        Console.ForegroundColor = ConsoleColor.Red;
-        Console.WriteLine($"Error configuring database connection: {ex.Message}");
-        Console.ResetColor();
-        return 1;
+        UserAccount userAccount = await authRepository.RegisterUserAsync(
+            new UserAccount()
+            {
+                FirstName = userRecord.User.FirstName,
+                LastName = userRecord.User.LastName,
+                DateOfBirth = DateTime.Parse(userRecord.DateOfBirth),
+                Username = userRecord.User.Username,
+                Email = userRecord.Email,
+                UserCredential = new UserCredential
+                {
+                    Hash = passwordInfrastructure.Hash(
+                        password: PasswordGenerator.Generate(64, 12, 12))
+                }
+            }
+        );
+        userAccountIds.Add(userAccount.UserAccountId);
     }
 
-    Console.ForegroundColor = ConsoleColor.Green;
-    Console.WriteLine($"Loaded {breweries.Count} breweries.");
-    Console.ResetColor();
+    return userAccountIds;
+}
+
+/// <summary>
+///     Persists each <paramref name="breweries" /> record, resolving (and creating, if needed) its
+///     Country/StateProvince/City chain via <paramref name="locationRepository" />. The pipeline
+///     data has no street-level address or a specific user tied to each brewery, so a placeholder
+///     address is used and <c>PostedById</c> is assigned round-robin from <paramref name="posterUserIds" />
+///     to keep seeding deterministic across runs.
+/// </summary>
+static async Task LoadBreweriesIntoDatabaseAsync(
+    IBreweryRepository breweryRepository,
+    ILocationRepository locationRepository,
+    IReadOnlyList<BreweryRecord> breweries,
+    IReadOnlyList<Guid> posterUserIds
+)
+{
+    if (posterUserIds.Count == 0)
+        throw new InvalidOperationException(
+            "Cannot load breweries without any registered users.");
 
     for (int i = 0; i < breweries.Count; i++)
     {
-        BreweryRecord brewery = breweries[i];
-        Console.WriteLine(
-            $"{i + 1}:\t{brewery.Brewery.NameEn}\t({brewery.Address.City.CityName}, {brewery.Address.City.Country})"
+        BreweryRecord breweryRecord = breweries[i];
+
+        Guid cityId = await locationRepository.GetOrCreateCityIdAsync(
+            new CityLocation(
+                breweryRecord.Address.City.CityName,
+                breweryRecord.Address.City.StateProvince,
+                breweryRecord.Address.City.Iso31662,
+                breweryRecord.Address.City.Country,
+                breweryRecord.Address.City.Iso31661
+            )
+        );
+
+        await breweryRepository.CreateAsync(
+            new BreweryPost
+            {
+                BreweryPostId = Guid.NewGuid(),
+                BreweryName = breweryRecord.Brewery.NameEn,
+                Description = breweryRecord.Brewery.DescriptionEn,
+                PostedById = posterUserIds[i % posterUserIds.Count],
+                Location = new BreweryPostLocation
+                {
+                    BreweryPostLocationId = Guid.NewGuid(),
+                    CityId = cityId,
+                    AddressLine1 = "Address unavailable",
+                    PostalCode = breweryRecord.Address.PostalCode,
+                },
+            }
+        );
+    }
+}
+
+static Table BuildBreweryTable(IReadOnlyList<BreweryRecord> breweries)
+{
+    Table table = new Table()
+        .AddColumn("Brewery Name (EN)")
+        .AddColumn("Brewery Name (Local)")
+        .AddColumn("City")
+        .AddColumn("State/Province")
+        .AddColumn("Country")
+        .AddColumn("Postal Code");
+
+    foreach (BreweryRecord brewery in breweries)
+    {
+        table.AddRow(
+            brewery.Brewery.NameEn,
+            brewery.Brewery.NameLocal,
+            brewery.Address.City.CityName,
+            brewery.Address.City.StateProvince,
+            brewery.Address.City.Country,
+            brewery.Address.PostalCode
         );
     }
 
-    Console.ForegroundColor = ConsoleColor.Green;
-    Console.WriteLine($"Loaded {users.Count} users.");
-    Console.ResetColor();
+    return table;
+}
+
+static Table BuildUserTable(IReadOnlyList<UserRecord> users)
+{
+    Table table = new Table()
+        .AddColumn("Username")
+        .AddColumn("First Name")
+        .AddColumn("Last Name")
+        .AddColumn("Email")
+        .AddColumn("Date of Birth");
 
     foreach (UserRecord user in users)
     {
-        string username = user.User.Username;
-        string firstName = user.User.FirstName;
-        string lastName = user.User.LastName;
-        string email = user.Email;
-        DateTime dateOfBirth = DateTime.Parse(user.DateOfBirth);
-
-        string generatedPassword = PasswordGenerator.Generate(
-            length: 64,
-            numberOfDigits: 10,
-            numberOfSymbols: 10
+        table.AddRow(
+            user.User.Username,
+            user.User.FirstName,
+            user.User.LastName,
+            user.Email,
+            user.DateOfBirth.ToString()
         );
-        string hashedPassword = passwordInfrastructure.Hash(generatedPassword);
-
-        UserRegistrationDto registrationDto = new(
-            username,
-            firstName,
-            lastName,
-            email,
-            dateOfBirth,
-            hashedPassword
-        );
-
-        try
-        {
-            UserAccount createdUser = await authRepository.RegisterUserAsync(registrationDto);
-            Console.WriteLine(
-                $"Created user: {createdUser.Username} ({createdUser.UserAccountId})"
-            );
-        }
-        catch (Exception ex)
-        {
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.WriteLine($"Error creating user {username}: {ex.Message}");
-            Console.ResetColor();
-        }
     }
 
-    return 0;
-}
-
-return await main();
+    return table;
+}

web/backend/Database/Database.Seed/Sqlite/PipelineSeedDataReader.cs

@@ -1,13 +1,14 @@
-#region
-
 using System.Text.Json;
 using Database.Seed.PipelineData;
 using Microsoft.Data.Sqlite;
 
-#endregion
-
 namespace Database.Seed.Sqlite;
 
+public sealed record SeedData(
+    IReadOnlyList<BreweryRecord> Breweries,
+    IReadOnlyList<UserRecord> Users
+);
+
 public sealed class PipelineSeedDataReader
 {
     private readonly string _connectionString;
@@ -17,13 +18,40 @@ public sealed class PipelineSeedDataReader
         _connectionString = connectionString;
     }
 
-    public IReadOnlyList<BreweryRecord> ReadBreweryRecords()
+    /// <summary>
+    /// Reads breweries and users in a single connection, loading the cities
+    /// lookup only once and sharing it between both reads.
+    /// </summary>
+    public async Task<SeedData> ReadSeedDataAsync(CancellationToken cancellationToken = default)
     {
-        using SqliteConnection connection = new(_connectionString);
-        connection.Open();
+        await using SqliteConnection connection = new(_connectionString);
+        await connection.OpenAsync(cancellationToken);
 
-        IReadOnlyDictionary<long, City> cities = ReadCities(connection);
+        IReadOnlyDictionary<long, City> cities = await ReadCitiesAsync(
+            connection,
+            cancellationToken
+        );
 
+        IReadOnlyList<BreweryRecord> breweries = await ReadBreweryRecordsAsync(
+            connection,
+            cities,
+            cancellationToken
+        );
+        IReadOnlyList<UserRecord> users = await ReadUserRecordsAsync(
+            connection,
+            cities,
+            cancellationToken
+        );
+
+        return new SeedData(breweries, users);
+    }
+
+    private static async Task<IReadOnlyList<BreweryRecord>> ReadBreweryRecordsAsync(
+        SqliteConnection connection,
+        IReadOnlyDictionary<long, City> cities,
+        CancellationToken cancellationToken
+    )
+    {
         const string sql = """
             SELECT b.name_en, b.description_en, b.name_local, b.description_local,
                    ba.city_id, ba.postal_code
@@ -31,25 +59,32 @@ public sealed class PipelineSeedDataReader
             JOIN brewery_addresses ba ON ba.brewery_id = b.id;
             """;
 
-        using SqliteCommand command = new(sql, connection);
-        using SqliteDataReader reader = command.ExecuteReader();
+        await using SqliteCommand command = new(sql, connection);
+        await using SqliteDataReader reader = await command.ExecuteReaderAsync(cancellationToken);
+
+        const int nameEnIndex = 0;
+        const int descriptionEnIndex = 1;
+        const int nameLocalIndex = 2;
+        const int descriptionLocalIndex = 3;
+        const int cityIdIndex = 4;
+        const int postalCodeIndex = 5;
 
         List<BreweryRecord> records = [];
-        while (reader.Read())
+        while (await reader.ReadAsync(cancellationToken))
             records.Add(
                 new BreweryRecord
                 {
                     Brewery = new BreweryResult
                     {
-                        NameEn = reader.GetString(0),
-                        DescriptionEn = reader.GetString(1),
-                        NameLocal = reader.GetString(2),
-                        DescriptionLocal = reader.GetString(3),
+                        NameEn = reader.GetString(nameEnIndex),
+                        DescriptionEn = reader.GetString(descriptionEnIndex),
+                        NameLocal = reader.GetString(nameLocalIndex),
+                        DescriptionLocal = reader.GetString(descriptionLocalIndex),
                     },
                     Address = new BreweryAddress
                     {
-                        City = cities[reader.GetInt64(4)],
-                        PostalCode = reader.GetString(5),
+                        City = cities[reader.GetInt64(cityIdIndex)],
+                        PostalCode = reader.GetString(postalCodeIndex),
                     },
                 }
             );
@@ -57,13 +92,12 @@ public sealed class PipelineSeedDataReader
         return records;
     }
 
-    public IReadOnlyList<UserRecord> ReadUserRecords()
+    private static async Task<IReadOnlyList<UserRecord>> ReadUserRecordsAsync(
+        SqliteConnection connection,
+        IReadOnlyDictionary<long, City> cities,
+        CancellationToken cancellationToken
+    )
     {
-        using SqliteConnection connection = new(_connectionString);
-        connection.Open();
-
-        IReadOnlyDictionary<long, City> cities = ReadCities(connection);
-
         const string sql = """
             SELECT u.first_name, u.last_name, u.gender, u.username, u.bio,
                    u.activity_weight, u.email, u.date_of_birth,
@@ -72,29 +106,40 @@ public sealed class PipelineSeedDataReader
             JOIN user_addresses ua ON ua.user_id = u.id;
             """;
 
-        using SqliteCommand command = new(sql, connection);
-        using SqliteDataReader reader = command.ExecuteReader();
+        await using SqliteCommand command = new(sql, connection);
+        await using SqliteDataReader reader = await command.ExecuteReaderAsync(cancellationToken);
+
+        const int firstNameIndex = 0;
+        const int lastNameIndex = 1;
+        const int genderIndex = 2;
+        const int usernameIndex = 3;
+        const int bioIndex = 4;
+        const int activityWeightIndex = 5;
+        const int emailIndex = 6;
+        const int dateOfBirthIndex = 7;
+        const int cityIdIndex = 8;
+        const int postalCodeIndex = 9;
 
         List<UserRecord> records = [];
-        while (reader.Read())
+        while (await reader.ReadAsync(cancellationToken))
             records.Add(
                 new UserRecord
                 {
                     User = new UserResult
                     {
-                        FirstName = reader.GetString(0),
-                        LastName = reader.GetString(1),
-                        Gender = reader.GetString(2),
-                        Username = reader.GetString(3),
-                        Bio = reader.GetString(4),
-                        ActivityWeight = (float)reader.GetDouble(5),
+                        FirstName = reader.GetString(firstNameIndex),
+                        LastName = reader.GetString(lastNameIndex),
+                        Gender = reader.GetString(genderIndex),
+                        Username = reader.GetString(usernameIndex),
+                        Bio = reader.GetString(bioIndex),
+                        ActivityWeight = (float)reader.GetDouble(activityWeightIndex),
                     },
-                    Email = reader.GetString(6),
-                    DateOfBirth = reader.GetString(7),
+                    Email = reader.GetString(emailIndex),
+                    DateOfBirth = reader.GetString(dateOfBirthIndex),
                     Address = new UserAddress
                     {
-                        City = cities[reader.GetInt64(8)],
-                        PostalCode = reader.GetString(9),
+                        City = cities[reader.GetInt64(cityIdIndex)],
+                        PostalCode = reader.GetString(postalCodeIndex),
                     },
                 }
             );
@@ -102,7 +147,10 @@ public sealed class PipelineSeedDataReader
         return records;
     }
 
-    private static IReadOnlyDictionary<long, City> ReadCities(SqliteConnection connection)
+    private static async Task<IReadOnlyDictionary<long, City>> ReadCitiesAsync(
+        SqliteConnection connection,
+        CancellationToken cancellationToken
+    )
     {
         const string sql = """
             SELECT
@@ -118,33 +166,34 @@ public sealed class PipelineSeedDataReader
             FROM cities;
             """;
 
-        using SqliteCommand command = new(sql, connection);
-        using SqliteDataReader reader = command.ExecuteReader();
+        await using SqliteCommand command = new(sql, connection);
+        await using SqliteDataReader reader = await command.ExecuteReaderAsync(cancellationToken);
 
         Dictionary<long, City> cities = [];
 
-        const int cityNameBindIndex = 1;
-        const int stateProvinceBindIndex = 2;
-        const int iso31662BindIndex = 3;
-        const int countryBindIndex = 4;
-        const int iso31661BindIndex = 5;
-        const int localLanguagesBindIndex = 6;
-        const int countryFormatRegexBindIndex = 7;
-        const int cityRegexesBindIndex = 8;
+        const int idIndex = 0;
+        const int cityNameIndex = 1;
+        const int stateProvinceIndex = 2;
+        const int iso31662Index = 3;
+        const int countryIndex = 4;
+        const int iso31661Index = 5;
+        const int localLanguagesIndex = 6;
+        const int countryFormatRegexIndex = 7;
+        const int cityRegexesIndex = 8;
 
-        while (reader.Read())
-            cities[reader.GetInt64(0)] = new City
+        while (await reader.ReadAsync(cancellationToken))
+            cities[reader.GetInt64(idIndex)] = new City
             {
-                CityName = reader.GetString(cityNameBindIndex),
-                StateProvince = reader.GetString(stateProvinceBindIndex),
-                Iso31662 = reader.GetString(iso31662BindIndex),
-                Country = reader.GetString(countryBindIndex),
-                Iso31661 = reader.GetString(iso31661BindIndex),
-                LocalLanguages = DeserializeStringArray(reader.GetString(localLanguagesBindIndex)),
+                CityName = reader.GetString(cityNameIndex),
+                StateProvince = reader.GetString(stateProvinceIndex),
+                Iso31662 = reader.GetString(iso31662Index),
+                Country = reader.GetString(countryIndex),
+                Iso31661 = reader.GetString(iso31661Index),
+                LocalLanguages = DeserializeStringArray(reader.GetString(localLanguagesIndex)),
                 PostalCode = new PostalCodeSpec
                 {
-                    CountryFormatRegex = reader.GetString(countryFormatRegexBindIndex),
-                    CityRegexes = DeserializeStringArray(reader.GetString(cityRegexesBindIndex)),
+                    CountryFormatRegex = reader.GetString(countryFormatRegexIndex),
+                    CityRegexes = DeserializeStringArray(reader.GetString(cityRegexesIndex)),
                 },
             };