Commit f0273d64 authored by Marc Gravell's avatar Marc Gravell

Standardize on test db for appveyor

parent 4d7a0139
...@@ -93,6 +93,8 @@ public class Result ...@@ -93,6 +93,8 @@ public class Result
public abstract partial class TestSuite public abstract partial class TestSuite
{ {
protected static readonly bool IsAppVeyor = Environment.GetEnvironmentVariable("Appveyor")?.ToUpperInvariant() == "TRUE";
public abstract IDbConnection GetConnection(); public abstract IDbConnection GetConnection();
private IDbConnection GetOpenConnection() private IDbConnection GetOpenConnection()
......
...@@ -29,7 +29,7 @@ public class SqlServerTestSuite : TestSuite ...@@ -29,7 +29,7 @@ public class SqlServerTestSuite : TestSuite
{ {
const string DbName = "tempdb"; const string DbName = "tempdb";
public static string ConnectionString => public static string ConnectionString =>
!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR")) IsAppVeyor
? @"Server=(local)\SQL2014;Database=tempdb;User ID=sa;Password=Password12!" ? @"Server=(local)\SQL2014;Database=tempdb;User ID=sa;Password=Password12!"
: $"Data Source=.;Initial Catalog={DbName};Integrated Security=True"; : $"Data Source=.;Initial Catalog={DbName};Integrated Security=True";
public override IDbConnection GetConnection() => new SqlConnection(ConnectionString); public override IDbConnection GetConnection() => new SqlConnection(ConnectionString);
...@@ -67,7 +67,7 @@ public class MySqlServerTestSuite : TestSuite ...@@ -67,7 +67,7 @@ public class MySqlServerTestSuite : TestSuite
const string DbName = "DapperContribTests"; const string DbName = "DapperContribTests";
public static string ConnectionString => public static string ConnectionString =>
!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR")) IsAppVeyor
? @"Server=localhost;Uid=root;Pwd=Password12!;" ? @"Server=localhost;Uid=root;Pwd=Password12!;"
: $"Server=localhost;Uid=root;Pwd=Password12!;"; : $"Server=localhost;Uid=root;Pwd=Password12!;";
......
...@@ -74,12 +74,12 @@ namespace Dapper.Tests ...@@ -74,12 +74,12 @@ namespace Dapper.Tests
public partial class TestSuite : IDisposable public partial class TestSuite : IDisposable
{ {
public static string ConnectionString => public static string ConnectionString =>
!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR")) IsAppVeyor
? @"Server=(local)\SQL2014;Database=tempdb;User ID=sa;Password=Password12!" ? @"Server=(local)\SQL2014;Database=tempdb;User ID=sa;Password=Password12!"
: "Data Source=.;Initial Catalog=tempdb;Integrated Security=True"; : "Data Source=.;Initial Catalog=tempdb;Integrated Security=True";
public static string OleDbConnectionString => public static string OleDbConnectionString =>
!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR")) IsAppVeyor
? @"Provider=SQLOLEDB;Data Source=(local)\SQL2014;Initial Catalog=tempdb;User Id=sa;Password=Password12!" ? @"Provider=SQLOLEDB;Data Source=(local)\SQL2014;Initial Catalog=tempdb;User Id=sa;Password=Password12!"
: "Provider=SQLOLEDB;Data Source=.;Initial Catalog=tempdb;Integrated Security=SSPI"; : "Provider=SQLOLEDB;Data Source=.;Initial Catalog=tempdb;Integrated Security=SSPI";
...@@ -2931,7 +2931,7 @@ public void Issue295_NullableDateTime_SqlServer() ...@@ -2931,7 +2931,7 @@ public void Issue295_NullableDateTime_SqlServer()
bool convertZeroDatetime = false, bool allowZeroDatetime = false) bool convertZeroDatetime = false, bool allowZeroDatetime = false)
{ {
string cs = IsAppVeyor string cs = IsAppVeyor
? "Server=localhost;Database=tests;Uid=root;Pwd=Password12!;" ? "Server=localhost;Database=test;Uid=root;Pwd=Password12!;"
: "Server=localhost;Database=tests;Uid=test;Pwd=pass;"; : "Server=localhost;Database=tests;Uid=test;Pwd=pass;";
var csb = new MySql.Data.MySqlClient.MySqlConnectionStringBuilder(cs); var csb = new MySql.Data.MySqlClient.MySqlConnectionStringBuilder(cs);
csb.AllowZeroDateTime = allowZeroDatetime; csb.AllowZeroDateTime = allowZeroDatetime;
...@@ -3360,7 +3360,7 @@ public void TestPostgresqlArrayParameters() ...@@ -3360,7 +3360,7 @@ public void TestPostgresqlArrayParameters()
static NpgsqlConnection OpenPostgresqlConnection() static NpgsqlConnection OpenPostgresqlConnection()
{ {
string cs = IsAppVeyor string cs = IsAppVeyor
? "Server=localhost;Port=5432;User Id=postgres;Password=Password12!;Database=dappertest" ? "Server=localhost;Port=5432;User Id=postgres;Password=Password12!;Database=test"
: "Server=localhost;Port=5432;User Id=dappertest;Password=dapperpass;Database=dappertest"; // ;Encoding = UNICODE : "Server=localhost;Port=5432;User Id=dappertest;Password=dapperpass;Database=dappertest"; // ;Encoding = UNICODE
var conn = new NpgsqlConnection(cs); var conn = new NpgsqlConnection(cs);
conn.Open(); conn.Open();
......
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