Merge remote-tracking branch 'upstream/master' into patch-154

This commit is contained in:
Azure Pipelines EF Migration Bot 2020-09-10 08:39:29 +00:00
commit 621ae7337b
2 changed files with 7 additions and 2 deletions

View file

@ -10,6 +10,8 @@ services:
- directory-migrations-tests-results:/tests/FilterLists.Directory.Infrastructure.Migrations.Tests/TestResults
depends_on:
- directory-db
environment:
ConnectionStrings__DirectoryConnection: ${DIRECTORY_CONNECTION_STRING}
directory-db:
image: postgres:alpine

View file

@ -1,4 +1,6 @@
using System;
using System.Threading.Tasks;
using FilterLists.Directory.Infrastructure.Migrations.Migrations;
using FilterLists.Directory.Infrastructure.Persistence.Queries.Context;
using Microsoft.EntityFrameworkCore;
using Xunit;
@ -12,9 +14,10 @@ public async Task Migrate_DoesNotThrowException()
{
var exception = await Record.ExceptionAsync(async () =>
{
const string connString = "Server=directory-db;Database=filterlists;Uid=filterlists;Pwd=filterlists;";
var connString = Environment.GetEnvironmentVariable("ConnectionStrings__DirectoryConnection") ??
throw new Exception();
var options = new DbContextOptionsBuilder<QueryDbContext>()
.UseNpgsql(connString, m => m.MigrationsAssembly("FilterLists.Directory.Infrastructure.Migrations"))
.UseNpgsql(connString, m => m.MigrationsAssembly(typeof(Initial).Assembly.GetName().Name))
.EnableSensitiveDataLogging()
.Options;
await using var context = new QueryDbContext(options);