Commit 1c43afb0 authored by Savorboard's avatar Savorboard

Improve build script

parent fe22904c
...@@ -4,17 +4,11 @@ dist: xenial ...@@ -4,17 +4,11 @@ dist: xenial
solution: CAP.sln solution: CAP.sln
dotnet: 3.1.100 dotnet: 3.1.100
mono: none mono: none
env:
- Cap_MySql_ConnectionString="Server=127.0.0.1;Database=cap_test;Uid=root;Pwd=;Allow User Variables=True;SslMode=none"
#matrix: services:
# include: - mysql
# - dotnet: 2.2
# - os: linux
# dist: trusty # Ubuntu 14.04
# sudo: required
# - os: osx
# osx_image: xcode8.3 # macOS 10.12
# Run the build script
script: script:
- export PATH="$PATH:$HOME/.dotnet/tools" - export PATH="$PATH:$HOME/.dotnet/tools"
......
...@@ -3,7 +3,7 @@ os: Visual Studio 2019 ...@@ -3,7 +3,7 @@ os: Visual Studio 2019
environment: environment:
BUILDING_ON_PLATFORM: win BUILDING_ON_PLATFORM: win
BuildEnvironment: appveyor BuildEnvironment: appveyor
Cap_MySql_ConnectionStringTemplate: Server=localhost;Database={0};Uid=root;Pwd=Password12!;Allow User Variables=True;SslMode=none Cap_MySql_ConnectionString: Server=localhost;Database=cap_test;Uid=root;Pwd=Password12!;Allow User Variables=True;SslMode=none
services: services:
- mysql - mysql
before_build: before_build:
......
...@@ -5,35 +5,29 @@ namespace DotNetCore.CAP.MySql.Test ...@@ -5,35 +5,29 @@ namespace DotNetCore.CAP.MySql.Test
{ {
public static class ConnectionUtil public static class ConnectionUtil
{ {
private const string DatabaseVariable = "Cap_MySql_DatabaseName"; private const string ConnectionStringTemplateVariable = "Cap_MySql_ConnectionString";
private const string ConnectionStringTemplateVariable = "Cap_MySql_ConnectionStringTemplate";
private const string MasterDatabaseName = "information_schema"; private const string MasterDatabaseName = "information_schema";
private const string DefaultDatabaseName = @"DotNetCore.CAP.MySql.Test"; private const string DefaultDatabaseName = "cap_test";
private const string DefaultConnectionStringTemplate = private const string DefaultConnectionString =
@"Server=localhost;Database={0};Uid=root;Pwd=123123;Allow User Variables=True;SslMode=none;"; @"Server=localhost;Database=cap_test;Uid=root;Pwd=123123;Allow User Variables=True;SslMode=none;";
public static string GetDatabaseName() public static string GetDatabaseName()
{ {
return Environment.GetEnvironmentVariable(DatabaseVariable) ?? DefaultDatabaseName; return DefaultDatabaseName;
} }
public static string GetMasterConnectionString() public static string GetMasterConnectionString()
{ {
return string.Format(GetConnectionStringTemplate(), MasterDatabaseName); return GetConnectionString().Replace(DefaultDatabaseName, MasterDatabaseName);
} }
public static string GetConnectionString() public static string GetConnectionString()
{
return string.Format(GetConnectionStringTemplate(), GetDatabaseName());
}
private static string GetConnectionStringTemplate()
{ {
return return
Environment.GetEnvironmentVariable(ConnectionStringTemplateVariable) ?? Environment.GetEnvironmentVariable(ConnectionStringTemplateVariable) ??
DefaultConnectionStringTemplate; DefaultConnectionString;
} }
public static MySqlConnection CreateConnection(string connectionString = null) public static MySqlConnection CreateConnection(string connectionString = null)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment