From 1fec52b3e993144fea1151e4149a2a4178f829f9 Mon Sep 17 00:00:00 2001 From: Diogo Barros Date: Fri, 27 Oct 2017 11:54:05 +0100 Subject: [PATCH 1/3] Changed the MySQL ConnectionString bilder. --- .../Cfg/Db/MySQLConnectionStringBuilder.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs b/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs index 7f9e34a2f..fd796f923 100644 --- a/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs +++ b/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs @@ -5,6 +5,7 @@ namespace FluentNHibernate.Cfg.Db public class MySQLConnectionStringBuilder : ConnectionStringBuilder { private string server; + private ushort port; private string database; private string username; private string password; @@ -16,6 +17,20 @@ public MySQLConnectionStringBuilder Server(string server) return this; } + public MySQLConnectionStringBuilder Server(string[] servers) + { + this.server = string.Join(", ", servers); + IsDirty = true; + return this; + } + + public MySQLConnectionStringBuilder Port(ushort port) + { + this.port = port; + IsDirty = true; + return this; + } + public MySQLConnectionStringBuilder Database(string database) { this.database = database; @@ -46,7 +61,7 @@ protected internal override string Create() var sb = new StringBuilder(); - sb.AppendFormat("Server={0};Database={1};User ID={2};Password={3}", server, database, username, password); + sb.AppendFormat("Server={0};Port={1};Database={2};User ID={3};Password={4}", server, port, database, username, password); return sb.ToString(); } From b6b4f67015ac38f39d6cc371069d31bc72608cfb Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 18 Sep 2020 14:44:43 +1200 Subject: [PATCH 2/3] Add port only when set --- src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs b/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs index fd796f923..7a9e7f8e1 100644 --- a/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs +++ b/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs @@ -5,7 +5,7 @@ namespace FluentNHibernate.Cfg.Db public class MySQLConnectionStringBuilder : ConnectionStringBuilder { private string server; - private ushort port; + private ushort? port; private string database; private string username; private string password; @@ -61,7 +61,9 @@ protected internal override string Create() var sb = new StringBuilder(); - sb.AppendFormat("Server={0};Port={1};Database={2};User ID={3};Password={4}", server, port, database, username, password); + sb.AppendFormat("Server={0};Database={1};User ID={2};Password={3}", server, database, username, password); + if (port.HasValue) + sb.AppendFormat(";Port={0}", port); return sb.ToString(); } From e759263b17e288e82b9020b934293ef18f0f59f3 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 18 Sep 2020 14:47:22 +1200 Subject: [PATCH 3/3] Change port to be int --- src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs b/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs index 7a9e7f8e1..7973adeff 100644 --- a/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs +++ b/src/FluentNHibernate/Cfg/Db/MySQLConnectionStringBuilder.cs @@ -5,7 +5,7 @@ namespace FluentNHibernate.Cfg.Db public class MySQLConnectionStringBuilder : ConnectionStringBuilder { private string server; - private ushort? port; + private int? port; private string database; private string username; private string password; @@ -24,7 +24,7 @@ public MySQLConnectionStringBuilder Server(string[] servers) return this; } - public MySQLConnectionStringBuilder Port(ushort port) + public MySQLConnectionStringBuilder Port(int port) { this.port = port; IsDirty = true;