Connection strings out of code, step 1

We should centralize these, but at least remove them from code for now.

Dapper.Tests.Contrib/TestSuite.cs

@@ -104,10 +104,11 @@ public class GenericType<T>
 
     public abstract partial class TestSuite
     {
-        protected static readonly bool IsAppVeyor = Environment.GetEnvironmentVariable("Appveyor")?.ToUpperInvariant() == "TRUE";
-
         public abstract IDbConnection GetConnection();
 
+        protected static string GetConnectionString(string name, string defaultConnectionString) =>
+            Environment.GetEnvironmentVariable(name) ?? defaultConnectionString;
+
         private IDbConnection GetOpenConnection()
         {
             var connection = GetConnection();

Dapper.Tests.Contrib/TestSuites.cs

@@ -23,9 +23,8 @@ public class SqlServerTestSuite : TestSuite
     {
         private const string DbName = "tempdb";
         public static string ConnectionString =>
-            IsAppVeyor
-                ? @"Server=(local)\SQL2016;Database=tempdb;User ID=sa;Password=Password12!"
-                : $"Data Source=.;Initial Catalog={DbName};Integrated Security=True";
+            GetConnectionString("SqlServerConnectionString", $"Data Source=.;Initial Catalog={DbName};Integrated Security=True");
+
         public override IDbConnection GetConnection() => new SqlConnection(ConnectionString);
 
         static SqlServerTestSuite()
@@ -62,9 +61,7 @@ static SqlServerTestSuite()
     public class MySqlServerTestSuite : TestSuite
     {
         public static string ConnectionString { get; } =
-            IsAppVeyor
-                ? "Server=localhost;Database=test;Uid=root;Pwd=Password12!;UseAffectedRows=false;"
-                : "Server=localhost;Database=tests;Uid=test;Pwd=pass;UseAffectedRows=false;";
+            GetConnectionString("MySqlConnectionString", "Server=localhost;Database=tests;Uid=test;Pwd=pass;UseAffectedRows=false;");
 
         public override IDbConnection GetConnection()
         {

Dapper.Tests/Providers/MySQLTests.cs

@@ -10,9 +10,8 @@ namespace Dapper.Tests
     public sealed class MySqlProvider : DatabaseProvider
     {
         public override DbProviderFactory Factory => MySql.Data.MySqlClient.MySqlClientFactory.Instance;
-        public override string GetConnectionString() => IsAppVeyor
-                ? "Server=localhost;Database=test;Uid=root;Pwd=Password12!;"
-                : "Server=localhost;Database=tests;Uid=test;Pwd=pass;";
+        public override string GetConnectionString() =>
+            GetConnectionString("MySqlConnectionString", "Server=localhost;Database=tests;Uid=test;Pwd=pass;");
 
         public DbConnection GetMySqlConnection(bool open = true,
             bool convertZeroDatetime = false, bool allowZeroDatetime = false)

Dapper.Tests/Providers/OLDEBTests.cs

@@ -11,9 +11,7 @@ public class OLEDBProvider : DatabaseProvider
     {
         public override DbProviderFactory Factory => OleDbFactory.Instance;
         public override string GetConnectionString() =>
-            IsAppVeyor
-                ? @"Provider=SQLOLEDB;Data Source=(local)\SQL2016;Initial Catalog=tempdb;User Id=sa;Password=Password12!"
-                : "Provider=SQLOLEDB;Data Source=.;Initial Catalog=tempdb;Integrated Security=SSPI";
+            GetConnectionString("OLEDBConnectionString", "Provider=SQLOLEDB;Data Source=.;Initial Catalog=tempdb;Integrated Security=SSPI");
     }
 
     public class OLDEBTests : TestBase<OLEDBProvider>

Dapper.Tests/Providers/PostgresqlTests.cs

@@ -9,9 +9,8 @@ namespace Dapper.Tests
     public class PostgresProvider : DatabaseProvider
     {
         public override DbProviderFactory Factory => Npgsql.NpgsqlFactory.Instance;
-        public override string GetConnectionString() => IsAppVeyor
-                ? "Server=localhost;Port=5432;User Id=postgres;Password=Password12!;Database=test"
-                : "Server=localhost;Port=5432;User Id=dappertest;Password=dapperpass;Database=dappertest"; // ;Encoding = UNICODE
+        public override string GetConnectionString() =>
+            GetConnectionString("PostgesConnectionString", "Server=localhost;Port=5432;User Id=dappertest;Password=dapperpass;Database=dappertest");
     }
     public class PostgresqlTests : TestBase<PostgresProvider>
     {

Dapper.Tests/TestBase.cs

@@ -15,10 +15,12 @@ public abstract class DatabaseProvider
     {
         public abstract DbProviderFactory Factory { get; }
 
-        public static bool IsAppVeyor { get; } = Environment.GetEnvironmentVariable("Appveyor")?.ToUpperInvariant() == "TRUE";
         public virtual void Dispose() { }
         public abstract string GetConnectionString();
 
+        protected string GetConnectionString(string name, string defaultConnectionString) =>
+            Environment.GetEnvironmentVariable(name) ?? defaultConnectionString;
+
         public DbConnection GetOpenConnection()
         {
             var conn = Factory.CreateConnection();
@@ -47,10 +49,8 @@ public DbParameter CreateRawParameter(string name, object value)
 
     public abstract class SqlServerDatabaseProvider : DatabaseProvider
     {
-        public override string GetConnectionString() =>
-            IsAppVeyor
-                ? @"Server=(local)\SQL2019;Database=tempdb;User ID=sa;Password=Password12!"
-                : "Data Source=.;Initial Catalog=tempdb;Integrated Security=True";
+        public override string GetConnectionString() => 
+            GetConnectionString("SqlServerConnectionString", "Data Source=.;Initial Catalog=tempdb;Integrated Security=True");
 
         public DbConnection GetOpenConnection(bool mars)
         {

appveyor.yml

@@ -21,6 +21,12 @@ environment:
   MYSQL_ENV_MYSQL_USER: root
   MYSQL_ENV_MYSQL_PASSWORD: Password12!
   MYSQL_ENV_MYSQL_DATABASE: test
+  # Connection strings for tests:
+  MySqlConnectionString: Server=localhost;Database=test;Uid=root;Pwd=Password12!;
+  OLEDBConnectionString: Provider=SQLOLEDB;Data Source=(local)\SQL2019;Initial Catalog=tempdb;User Id=sa;Password=Password12!
+  PostgesConnectionString: Server=localhost;Port=5432;User Id=postgres;Password=Password12!;Database=test
+  SqlServerConnectionString: Server=(local)\SQL2019;Database=tempdb;User ID=sa;Password=Password12!"
+
 services:
   - mssql2019
   - mysql