Skip to content

Commit 7e016b5

Browse files
committed
Merge 0.69.8 into 1.0.
Conflicts: docs/content/overview/version-history.md src/Directory.Build.props src/MySqlConnector/Core/SchemaProvider.cs
2 parents 5652960 + da1e39e commit 7e016b5

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

docs/content/overview/version-history.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
lastmod: 2020-07-01
2+
lastmod: 2020-07-20
33
date: 2017-03-27
44
menu:
55
main:
@@ -25,6 +25,11 @@ weight: 30
2525
* Allow rows larger than 1 MiB in `MySqlBulkCopy`: [#834](https://github.com/mysql-net/MySqlConnector/issues/834).
2626
* Reduce memory allocations when hashing passwords (during login).
2727

28+
### 0.69.8
29+
30+
* Fix `MySqlBulkLoader` with Azure Database for MySQL/MariaDB: [#853](https://github.com/mysql-net/MySqlConnector/issues/853).
31+
* Make schema collection names (for `MySqlConnection.GetSchema(collectionName)`) case-insensitive: [#852](https://github.com/mysql-net/MySqlConnector/issues/852).
32+
2833
### 0.69.7
2934

3035
* Support `ENUM` columns that use the `MYSQL_TYPE_ENUM` type in their column metadata: [#850](https://github.com/mysql-net/MySqlConnector/issues/850).

src/MySqlConnector/Core/SchemaProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal sealed class SchemaProvider
1616
public SchemaProvider(MySqlConnection connection)
1717
{
1818
m_connection = connection;
19-
m_schemaCollections = new()
19+
m_schemaCollections = new(StringComparer.OrdinalIgnoreCase)
2020
{
2121
{ "DataSourceInformation", FillDataSourceInformation},
2222
{ "MetaDataCollections", FillMetadataCollections },

src/MySqlConnector/Protocol/Payloads/HandshakeResponse41Payload.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private static ByteBufferWriter CreateCapabilitiesPayload(ProtocolCapabilities s
2020
(serverCapabilities & ProtocolCapabilities.PluginAuthLengthEncodedClientData) |
2121
ProtocolCapabilities.MultiStatements |
2222
ProtocolCapabilities.MultiResults |
23-
(cs.AllowLoadLocalInfile ? (serverCapabilities & ProtocolCapabilities.LocalFiles) : 0) |
23+
(cs.AllowLoadLocalInfile ? ProtocolCapabilities.LocalFiles : 0) |
2424
(string.IsNullOrWhiteSpace(cs.Database) ? 0 : ProtocolCapabilities.ConnectWithDatabase) |
2525
(cs.UseAffectedRows ? 0 : ProtocolCapabilities.FoundRows) |
2626
(useCompression ? ProtocolCapabilities.Compress : ProtocolCapabilities.None) |

tests/SideBySide/SchemaProviderTests.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@ public void GetDataSourceInformationSchemaCollection()
2828
Assert.Equal(m_database.Connection.ServerVersion, dataTable.Rows[0]["DataSourceProductVersion"]);
2929
}
3030

31-
[Fact]
32-
public void ReservedWordsSchema()
31+
[Theory]
32+
[InlineData("ReservedWords")]
33+
[InlineData("RESERVEDWORDS")]
34+
[InlineData("reservedwords")]
35+
public void ReservedWordsSchema(string schemaName)
3336
{
34-
var table = m_database.Connection.GetSchema("ReservedWords");
37+
var table = m_database.Connection.GetSchema(schemaName);
3538
Assert.NotNull(table);
3639
Assert.Single(table.Columns);
3740
Assert.Equal("ReservedWord", table.Columns[0].ColumnName);

0 commit comments

Comments
 (0)