Browse Source

Refactor connection string checkers to initialize connection settings within try blocks.

pull/22185/head
maliming 2 years ago
parent
commit
0782080a8f
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 14
      framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/ConnectionStrings/MySqlConnectionStringChecker.cs
  2. 10
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/ConnectionStrings/OracleDevartConnectionStringChecker.cs
  3. 10
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/ConnectionStrings/OracleConnectionStringChecker.cs
  4. 14
      framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/ConnectionStrings/NpgsqlConnectionStringChecker.cs
  5. 14
      framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/ConnectionStrings/SqlServerConnectionStringChecker.cs
  6. 1
      framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/ConnectionStrings/SqliteConnectionStringChecker.cs

14
framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/ConnectionStrings/MySqlConnectionStringChecker.cs

@ -12,16 +12,16 @@ public class MySqlConnectionStringChecker : IConnectionStringChecker, ITransient
public virtual async Task<AbpConnectionStringCheckResult> CheckAsync(string connectionString)
{
var result = new AbpConnectionStringCheckResult();
var connString = new MySqlConnectionStringBuilder(connectionString)
try
{
ConnectionLifeTime = 1
};
var connString = new MySqlConnectionStringBuilder(connectionString)
{
ConnectionLifeTime = 1
};
var oldDatabaseName = connString.Database;
connString.Database = "mysql";
var oldDatabaseName = connString.Database;
connString.Database = "mysql";
try
{
await using var conn = new MySqlConnection(connString.ConnectionString);
await conn.OpenAsync();
result.Connected = true;

10
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/ConnectionStrings/OracleDevartConnectionStringChecker.cs

@ -12,13 +12,13 @@ public class OracleDevartConnectionStringChecker : IConnectionStringChecker, ITr
public virtual async Task<AbpConnectionStringCheckResult> CheckAsync(string connectionString)
{
var result = new AbpConnectionStringCheckResult();
var connString = new OracleConnectionStringBuilder(connectionString)
{
ConnectionTimeout = 1
};
try
{
var connString = new OracleConnectionStringBuilder(connectionString)
{
ConnectionTimeout = 1
};
await using var conn = new OracleConnection(connString.ConnectionString);
await conn.OpenAsync();
result.Connected = true;

10
framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/ConnectionStrings/OracleConnectionStringChecker.cs

@ -12,13 +12,13 @@ public class OracleConnectionStringChecker : IConnectionStringChecker, ITransien
public virtual async Task<AbpConnectionStringCheckResult> CheckAsync(string connectionString)
{
var result = new AbpConnectionStringCheckResult();
var connString = new OracleConnectionStringBuilder(connectionString)
{
ConnectionTimeout = 1
};
try
{
var connString = new OracleConnectionStringBuilder(connectionString)
{
ConnectionTimeout = 1
};
await using var conn = new OracleConnection(connString.ConnectionString);
await conn.OpenAsync();
result.Connected = true;

14
framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/ConnectionStrings/NpgsqlConnectionStringChecker.cs

@ -12,16 +12,16 @@ public class NpgsqlConnectionStringChecker : IConnectionStringChecker, ITransien
public virtual async Task<AbpConnectionStringCheckResult> CheckAsync(string connectionString)
{
var result = new AbpConnectionStringCheckResult();
var connString = new NpgsqlConnectionStringBuilder(connectionString)
try
{
Timeout = 1
};
var connString = new NpgsqlConnectionStringBuilder(connectionString)
{
Timeout = 1
};
var oldDatabaseName = connString.Database;
connString.Database = "postgres";
var oldDatabaseName = connString.Database;
connString.Database = "postgres";
try
{
await using var conn = new NpgsqlConnection(connString.ConnectionString);
await conn.OpenAsync();
result.Connected = true;

14
framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/ConnectionStrings/SqlServerConnectionStringChecker.cs

@ -12,16 +12,16 @@ public class SqlServerConnectionStringChecker : IConnectionStringChecker, ITrans
public virtual async Task<AbpConnectionStringCheckResult> CheckAsync(string connectionString)
{
var result = new AbpConnectionStringCheckResult();
var connString = new SqlConnectionStringBuilder(connectionString)
try
{
ConnectTimeout = 1
};
var connString = new SqlConnectionStringBuilder(connectionString)
{
ConnectTimeout = 1
};
var oldDatabaseName = connString.InitialCatalog;
connString.InitialCatalog = "master";
var oldDatabaseName = connString.InitialCatalog;
connString.InitialCatalog = "master";
try
{
await using var conn = new SqlConnection(connString.ConnectionString);
await conn.OpenAsync();
result.Connected = true;

1
framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/ConnectionStrings/SqliteConnectionStringChecker.cs

@ -12,7 +12,6 @@ public class SqliteConnectionStringChecker : IConnectionStringChecker, ITransien
public virtual async Task<AbpConnectionStringCheckResult> CheckAsync(string connectionString)
{
var result = new AbpConnectionStringCheckResult();
try
{
await using var conn = new SqliteConnection(connectionString);

Loading…
Cancel
Save