Rename MySqlClientFactory to MySqlConnectorFactory. Fixes #839

bgrainger · bgrainger · commit 5d925616b5fa · 2020-06-25T11:30:46.000-07:00
diff --git a/docs/content/api/MySqlConnector/MySqlClientFactory/Instance.md b/docs/content/api/MySqlConnector/MySqlClientFactory/Instance.md
diff --git a/docs/content/api/MySqlConnector/MySqlClientFactoryType.md b/docs/content/api/MySqlConnector/MySqlClientFactoryType.md
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CanCreateBatch.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CanCreateBatch.md
@@ -2,16 +2,16 @@
 title: CanCreateBatch
 ---
 
-# MySqlClientFactory.CanCreateBatch property
+# MySqlConnectorFactory.CanCreateBatch property
 
 ```csharp
 public bool CanCreateBatch { get; }
 ```
 
 ## See Also
 
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateBatch.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateBatch.md
@@ -2,7 +2,7 @@
 title: CreateBatch
 ---
 
-# MySqlClientFactory.CreateBatch method
+# MySqlConnectorFactory.CreateBatch method
 
 ```csharp
 public MySqlBatch CreateBatch()
@@ -11,8 +11,8 @@ public MySqlBatch CreateBatch()
 ## See Also
 
 * class [MySqlBatch](../../MySqlBatchType/)
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateBatchCommand.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateBatchCommand.md
@@ -2,7 +2,7 @@
 title: CreateBatchCommand
 ---
 
-# MySqlClientFactory.CreateBatchCommand method
+# MySqlConnectorFactory.CreateBatchCommand method
 
 ```csharp
 public MySqlBatchCommand CreateBatchCommand()
@@ -11,8 +11,8 @@ public MySqlBatchCommand CreateBatchCommand()
 ## See Also
 
 * class [MySqlBatchCommand](../../MySqlBatchCommandType/)
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateCommand.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateCommand.md
@@ -2,16 +2,16 @@
 title: CreateCommand
 ---
 
-# MySqlClientFactory.CreateCommand method
+# MySqlConnectorFactory.CreateCommand method
 
 ```csharp
 public override DbCommand CreateCommand()
 ```
 
 ## See Also
 
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateCommandBuilder.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateCommandBuilder.md
@@ -2,16 +2,16 @@
 title: CreateCommandBuilder
 ---
 
-# MySqlClientFactory.CreateCommandBuilder method
+# MySqlConnectorFactory.CreateCommandBuilder method
 
 ```csharp
 public override DbCommandBuilder CreateCommandBuilder()
 ```
 
 ## See Also
 
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateConnection.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateConnection.md
@@ -2,16 +2,16 @@
 title: CreateConnection
 ---
 
-# MySqlClientFactory.CreateConnection method
+# MySqlConnectorFactory.CreateConnection method
 
 ```csharp
 public override DbConnection CreateConnection()
 ```
 
 ## See Also
 
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateConnectionStringBuilder.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateConnectionStringBuilder.md
@@ -2,16 +2,16 @@
 title: CreateConnectionStringBuilder
 ---
 
-# MySqlClientFactory.CreateConnectionStringBuilder method
+# MySqlConnectorFactory.CreateConnectionStringBuilder method
 
 ```csharp
 public override DbConnectionStringBuilder CreateConnectionStringBuilder()
 ```
 
 ## See Also
 
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateDataAdapter.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateDataAdapter.md
@@ -2,16 +2,16 @@
 title: CreateDataAdapter
 ---
 
-# MySqlClientFactory.CreateDataAdapter method
+# MySqlConnectorFactory.CreateDataAdapter method
 
 ```csharp
 public override DbDataAdapter CreateDataAdapter()
 ```
 
 ## See Also
 
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateParameter.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/CreateParameter.md
@@ -2,16 +2,16 @@
 title: CreateParameter
 ---
 
-# MySqlClientFactory.CreateParameter method
+# MySqlConnectorFactory.CreateParameter method
 
 ```csharp
 public override DbParameter CreateParameter()
 ```
 
 ## See Also
 
-* class [MySqlClientFactory](../../MySqlClientFactoryType/)
-* namespace [MySqlConnector](../../MySqlClientFactoryType/)
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
 * assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
 
 <!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactory/Instance.md b/docs/content/api/MySqlConnector/MySqlConnectorFactory/Instance.md
@@ -0,0 +1,17 @@
+---
+title: Instance
+---
+
+# MySqlConnectorFactory.Instance field
+
+```csharp
+public static readonly MySqlConnectorFactory Instance;
+```
+
+## See Also
+
+* class [MySqlConnectorFactory](../../MySqlConnectorFactoryType/)
+* namespace [MySqlConnector](../../MySqlConnectorFactoryType/)
+* assembly [MySqlConnector](../../../MySqlConnectorAssembly/)
+
+<!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnector/MySqlConnectorFactoryType.md b/docs/content/api/MySqlConnector/MySqlConnectorFactoryType.md
@@ -0,0 +1,31 @@
+---
+title: MySqlConnectorFactory
+---
+
+# MySqlConnectorFactory class
+
+```csharp
+public sealed class MySqlConnectorFactory : DbProviderFactory
+```
+
+## Public Members
+
+| name | description |
+| --- | --- |
+| static readonly [Instance](../MySqlConnectorFactory/Instance/) |  |
+| [CanCreateBatch](../MySqlConnectorFactory/CanCreateBatch/) { get; } |  |
+| [CreateBatch](../MySqlConnectorFactory/CreateBatch/)() |  |
+| [CreateBatchCommand](../MySqlConnectorFactory/CreateBatchCommand/)() |  |
+| override [CreateCommand](../MySqlConnectorFactory/CreateCommand/)() |  |
+| override [CreateCommandBuilder](../MySqlConnectorFactory/CreateCommandBuilder/)() |  |
+| override [CreateConnection](../MySqlConnectorFactory/CreateConnection/)() |  |
+| override [CreateConnectionStringBuilder](../MySqlConnectorFactory/CreateConnectionStringBuilder/)() |  |
+| override [CreateDataAdapter](../MySqlConnectorFactory/CreateDataAdapter/)() |  |
+| override [CreateParameter](../MySqlConnectorFactory/CreateParameter/)() |  |
+
+## See Also
+
+* namespace [MySqlConnector](../../MySqlConnectorNamespace/)
+* assembly [MySqlConnector](../../MySqlConnectorAssembly/)
+
+<!-- DO NOT EDIT: generated by xmldocmd for MySqlConnector.dll -->
diff --git a/docs/content/api/MySqlConnectorAssembly.md b/docs/content/api/MySqlConnectorAssembly.md
@@ -17,12 +17,12 @@ title: MySqlConnector
 | enum [MySqlBulkLoaderConflictOption](../MySqlConnector/MySqlBulkLoaderConflictOptionType/) |  |
 | enum [MySqlBulkLoaderPriority](../MySqlConnector/MySqlBulkLoaderPriorityType/) |  |
 | enum [MySqlCertificateStoreLocation](../MySqlConnector/MySqlCertificateStoreLocationType/) |  |
-| class [MySqlClientFactory](../MySqlConnector/MySqlClientFactoryType/) |  |
 | class [MySqlCommand](../MySqlConnector/MySqlCommandType/) | [`MySqlCommand`](../MySqlConnector/MySqlCommandType/) represents a SQL statement or stored procedure name to execute against a MySQL database. |
 | class [MySqlCommandBuilder](../MySqlConnector/MySqlCommandBuilderType/) |  |
 | class [MySqlConnection](../MySqlConnector/MySqlConnectionType/) | [`MySqlConnection`](../MySqlConnector/MySqlConnectionType/) represents a connection to a MySQL database. |
 | enum [MySqlConnectionProtocol](../MySqlConnector/MySqlConnectionProtocolType/) | Specifies the type of connection to make to the server. |
 | class [MySqlConnectionStringBuilder](../MySqlConnector/MySqlConnectionStringBuilderType/) |  |
+| class [MySqlConnectorFactory](../MySqlConnector/MySqlConnectorFactoryType/) |  |
 | class [MySqlConversionException](../MySqlConnector/MySqlConversionExceptionType/) |  |
 | class [MySqlDataAdapter](../MySqlConnector/MySqlDataAdapterType/) |  |
 | class [MySqlDataReader](../MySqlConnector/MySqlDataReaderType/) |  |
diff --git a/docs/content/api/MySqlConnectorNamespace.md b/docs/content/api/MySqlConnectorNamespace.md
@@ -15,12 +15,12 @@ title: MySqlConnector
 | enum [MySqlBulkLoaderConflictOption](../MySqlConnector/MySqlBulkLoaderConflictOptionType/) |  |
 | enum [MySqlBulkLoaderPriority](../MySqlConnector/MySqlBulkLoaderPriorityType/) |  |
 | enum [MySqlCertificateStoreLocation](../MySqlConnector/MySqlCertificateStoreLocationType/) |  |
-| class [MySqlClientFactory](../MySqlConnector/MySqlClientFactoryType/) |  |
 | class [MySqlCommand](../MySqlConnector/MySqlCommandType/) | [`MySqlCommand`](../MySqlConnector/MySqlCommandType/) represents a SQL statement or stored procedure name to execute against a MySQL database. |
 | class [MySqlCommandBuilder](../MySqlConnector/MySqlCommandBuilderType/) |  |
 | class [MySqlConnection](../MySqlConnector/MySqlConnectionType/) | [`MySqlConnection`](../MySqlConnector/MySqlConnectionType/) represents a connection to a MySQL database. |
 | enum [MySqlConnectionProtocol](../MySqlConnector/MySqlConnectionProtocolType/) | Specifies the type of connection to make to the server. |
 | class [MySqlConnectionStringBuilder](../MySqlConnector/MySqlConnectionStringBuilderType/) |  |
+| class [MySqlConnectorFactory](../MySqlConnector/MySqlConnectorFactoryType/) |  |
 | class [MySqlConversionException](../MySqlConnector/MySqlConversionExceptionType/) |  |
 | class [MySqlDataAdapter](../MySqlConnector/MySqlDataAdapterType/) |  |
 | class [MySqlDataReader](../MySqlConnector/MySqlDataReaderType/) |  |
diff --git a/src/MySqlConnector/MySqlConnection.cs b/src/MySqlConnector/MySqlConnection.cs
@@ -508,7 +508,7 @@ private static async Task ClearPoolAsync(MySqlConnection connection, IOBehavior
 		protected override DbCommand CreateDbCommand() => new MySqlCommand(this, null);
 
 #if !NETSTANDARD1_3
-		protected override DbProviderFactory DbProviderFactory => MySqlClientFactory.Instance;
+		protected override DbProviderFactory DbProviderFactory => MySqlConnectorFactory.Instance;
 
 		/// <inheritdoc cref="DbConnection.GetSchema()"/>
 		public override DataTable GetSchema() => GetSchemaProvider().GetSchemaAsync(IOBehavior.Synchronous, default).GetAwaiter().GetResult();
diff --git a/src/MySqlConnector/MySqlConnectorFactory.cs b/src/MySqlConnector/MySqlConnectorFactory.cs
@@ -2,9 +2,9 @@
 
 namespace MySqlConnector
 {
-	public sealed class MySqlClientFactory : DbProviderFactory
+	public sealed class MySqlConnectorFactory : DbProviderFactory
 	{
-		public static readonly MySqlClientFactory Instance = new();
+		public static readonly MySqlConnectorFactory Instance = new();
 
 		public override DbCommand CreateCommand() => new MySqlCommand();
 		public override DbConnection CreateConnection() => new MySqlConnection();
@@ -20,7 +20,7 @@ public sealed class MySqlClientFactory : DbProviderFactory
 		public MySqlBatchCommand CreateBatchCommand() => new MySqlBatchCommand();
 		public bool CanCreateBatch => true;
 
-		private MySqlClientFactory()
+		private MySqlConnectorFactory()
 		{
 		}
 	}
diff --git a/tests/Conformance.Tests/DbFactoryFixture.cs b/tests/Conformance.Tests/DbFactoryFixture.cs
@@ -13,6 +13,6 @@ public DbFactoryFixture()
 		}
 
 		public string ConnectionString { get; }
-		public DbProviderFactory Factory => MySqlClientFactory.Instance;
+		public DbProviderFactory Factory => MySqlConnectorFactory.Instance;
 	}
 }
diff --git a/tests/Conformance.Tests/SelectValueFixture.cs b/tests/Conformance.Tests/SelectValueFixture.cs
@@ -49,7 +49,7 @@ insert into select_value values
 
 		public string ConnectionString { get; }
 
-		public DbProviderFactory Factory => MySqlConnector.MySqlClientFactory.Instance;
+		public DbProviderFactory Factory => MySqlConnector.MySqlConnectorFactory.Instance;
 
 		public void DropSelectValueTable(IDbFactoryFixture factoryFixture) => ExecuteNonQuery("drop table if exists select_value;");
 
diff --git a/tests/MySqlConnector.Tests/DbProviderFactoryTests.cs b/tests/MySqlConnector.Tests/DbProviderFactoryTests.cs
@@ -1,5 +1,6 @@
 #if BASELINE
 using MySql.Data.MySqlClient;
+using MySqlConnectorFactory = MySql.Data.MySqlClient.MySqlClientFactory;
 #endif
 using Xunit;
 
@@ -10,17 +11,17 @@ public class DbProviderFactoryTests
 		[Fact]
 		public void CreatesExpectedTypes()
 		{
-			Assert.IsType<MySqlConnection>(MySqlClientFactory.Instance.CreateConnection());
-			Assert.IsType<MySqlConnectionStringBuilder>(MySqlClientFactory.Instance.CreateConnectionStringBuilder());
-			Assert.IsType<MySqlCommand>(MySqlClientFactory.Instance.CreateCommand());
-			Assert.IsType<MySqlParameter>(MySqlClientFactory.Instance.CreateParameter());
+			Assert.IsType<MySqlConnection>(MySqlConnectorFactory.Instance.CreateConnection());
+			Assert.IsType<MySqlConnectionStringBuilder>(MySqlConnectorFactory.Instance.CreateConnectionStringBuilder());
+			Assert.IsType<MySqlCommand>(MySqlConnectorFactory.Instance.CreateCommand());
+			Assert.IsType<MySqlParameter>(MySqlConnectorFactory.Instance.CreateParameter());
 		}
 
 		[Fact]
 		public void Singleton()
 		{
-			var factory1 = MySqlClientFactory.Instance;
-			var factory2 = MySqlClientFactory.Instance;
+			var factory1 = MySqlConnectorFactory.Instance;
+			var factory2 = MySqlConnectorFactory.Instance;
 			Assert.True(object.ReferenceEquals(factory1, factory2));
 		}
 	}
diff --git a/tests/SideBySide/ClientFactoryTests.cs b/tests/SideBySide/ClientFactoryTests.cs
diff --git a/tests/SideBySide/app.config b/tests/SideBySide/app.config
