From 5639d6511318c6398b4db7c81fe319a36eda147d Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 9 Jan 2023 16:14:09 +0800 Subject: [PATCH] Set `DatabaseExists` before closing. --- .../AbpEfCoreMySqlConnectionStringChecker.cs | 4 +++- .../AbpEfCoreSqlServerConnectionStringChecker.cs | 4 +++- .../AbpEfCoreSqliteConnectionStringChecker.cs | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreMySqlConnectionStringChecker.cs b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreMySqlConnectionStringChecker.cs index 75713635fe..1f291c60c7 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreMySqlConnectionStringChecker.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreMySqlConnectionStringChecker.cs @@ -25,8 +25,10 @@ public class AbpEfCoreMySqlConnectionStringChecker : IAbpConnectionStringChecker await conn.OpenAsync(); result.Connected = true; await conn.ChangeDatabaseAsync(oldDatabaseName); - await conn.CloseAsync(); result.DatabaseExists = true; + + await conn.CloseAsync(); + return result; } catch (Exception e) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreSqlServerConnectionStringChecker.cs b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreSqlServerConnectionStringChecker.cs index 4265193faa..5473dd95d0 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreSqlServerConnectionStringChecker.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreSqlServerConnectionStringChecker.cs @@ -25,8 +25,10 @@ public class AbpEfCoreSqlServerConnectionStringChecker : IAbpConnectionStringChe await conn.OpenAsync(); result.Connected = true; await conn.ChangeDatabaseAsync(oldDatabaseName); - await conn.CloseAsync(); result.DatabaseExists = true; + + await conn.CloseAsync(); + return result; } catch (Exception e) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreSqliteConnectionStringChecker.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreSqliteConnectionStringChecker.cs index c11b4357b8..bc168973d9 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreSqliteConnectionStringChecker.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/ConnectionStrings/AbpEfCoreSqliteConnectionStringChecker.cs @@ -18,6 +18,7 @@ public class AbpEfCoreSqliteConnectionStringChecker : IAbpConnectionStringChecke await conn.OpenAsync(); result.Connected = true; result.DatabaseExists = true; + await conn.CloseAsync(); return result;