Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 20e9c9f

Browse files
mythzmythz
committed
Upgrade MySql to 6.9.5
1 parent cf82420 commit 20e9c9f

File tree

25 files changed

+95
-47
lines changed

25 files changed

+95
-47
lines changed

‎NuGet/ServiceStack.OrmLite.MySql/servicestack.ormlite.mysql.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<language>en-US</language>
1919
<copyright>ServiceStack 2013 and contributors</copyright>
2020
<dependencies>
21-
<dependency id="MySql.Data" version="6.9.3" />
21+
<dependency id="MySql.Data" version="6.9.5" />
2222
<dependency id="ServiceStack.OrmLite" version="4.0" />
2323
</dependencies>
2424
</metadata>

‎src/ServiceStack.OrmLite.MySql.Tests/ServiceStack.OrmLite.MySql.Tests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="MySql.Data">
51-
<HintPath>..\packages\MySql.Data.6.9.3\lib\net45\MySql.Data.dll</HintPath>
50+
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\packages\MySql.Data.6.9.5\lib\net45\MySql.Data.dll</HintPath>
5253
</Reference>
5354
<Reference Include="nunit.framework">
5455
<HintPath>..\..\lib\tests\nunit.framework.dll</HintPath>

‎src/ServiceStack.OrmLite.MySql.Tests/app.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
</configSections>
55
<connectionStrings>
6-
<add name="testDb" connectionString="Server=localhost;Database=test;UID=root;Password=test" providerName="MySql.Data.MySqlClient"/>
6+
<add name="testDb" connectionString="Server=localhost;Database=test;UID=root;Password=test" providerName="MySql.Data.MySqlClient" />
77
</connectionStrings>
88

99
<appSettings>
10-
<add key="servicestack:license" value="1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBCdXNpbmVzcyxUeXBlOkJ1c2luZXNzLEhhc2g6UHVNTVRPclhvT2ZIbjQ5MG5LZE1mUTd5RUMzQnBucTFEbTE3TDczVEF4QUNMT1FhNXJMOWkzVjFGL2ZkVTE3Q2pDNENqTkQyUktRWmhvUVBhYTBiekJGUUZ3ZE5aZHFDYm9hL3lydGlwUHI5K1JsaTBYbzNsUC85cjVJNHE5QVhldDN6QkE4aTlvdldrdTgyTk1relY2eis2dFFqTThYN2lmc0JveHgycFdjPSxFeHBpcnk6MjAxMy0wMS0wMX0="/>
10+
<add key="servicestack:license" value="1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBCdXNpbmVzcyxUeXBlOkJ1c2luZXNzLEhhc2g6UHVNTVRPclhvT2ZIbjQ5MG5LZE1mUTd5RUMzQnBucTFEbTE3TDczVEF4QUNMT1FhNXJMOWkzVjFGL2ZkVTE3Q2pDNENqTkQyUktRWmhvUVBhYTBiekJGUUZ3ZE5aZHFDYm9hL3lydGlwUHI5K1JsaTBYbzNsUC85cjVJNHE5QVhldDN6QkE4aTlvdldrdTgyTk1relY2eis2dFFqTThYN2lmc0JveHgycFdjPSxFeHBpcnk6MjAxMy0wMS0wMX0=" />
1111
</appSettings>
12-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><system.data>
12+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
1313
<DbProviderFactories>
14-
<remove invariant="MySql.Data.MySqlClient"/>
15-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
14+
<remove invariant="MySql.Data.MySqlClient" />
15+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
1616
</DbProviderFactories>
1717
</system.data></configuration>

‎src/ServiceStack.OrmLite.MySql.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MySql.Data" version="6.9.3" targetFramework="net451" />
3+
<package id="MySql.Data" version="6.9.5" targetFramework="net45" />
44
</packages>

‎src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
46+
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
4747
<SpecificVersion>False</SpecificVersion>
48-
<HintPath>..\packages\MySql.Data.6.9.3\lib\net40\MySql.Data.dll</HintPath>
48+
<HintPath>..\packages\MySql.Data.6.9.5\lib\net40\MySql.Data.dll</HintPath>
4949
</Reference>
5050
<Reference Include="ServiceStack.Common, Version=3.5.5.7454, Culture=neutral, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>

‎src/ServiceStack.OrmLite.MySql/app.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33

4-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><system.data>
4+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><system.data>
55
<DbProviderFactories>
6-
<remove invariant="MySql.Data.MySqlClient"/>
7-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
6+
<remove invariant="MySql.Data.MySqlClient" />
7+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
88
</DbProviderFactories>
99
</system.data></configuration>

‎src/ServiceStack.OrmLite.MySql/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MySql.Data" version="6.9.3" targetFramework="net451" />
3+
<package id="MySql.Data" version="6.9.5" targetFramework="net40" />
44
</packages>

‎src/ServiceStack.OrmLite.MySqlV45/ServiceStack.OrmLite.MySqlV45.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="MySql.Data">
45-
<HintPath>..\packages\MySql.Data.6.9.3\lib\net45\MySql.Data.dll</HintPath>
44+
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\packages\MySql.Data.6.9.5\lib\net45\MySql.Data.dll</HintPath>
4647
</Reference>
4748
<Reference Include="ServiceStack.Common">
4849
<HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>

‎src/ServiceStack.OrmLite.MySqlV45/app.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<system.data>
3+
4+
<system.data>
45
<DbProviderFactories>
56
<remove invariant="MySql.Data.MySqlClient" />
6-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
7+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
78
</DbProviderFactories>
8-
</system.data>
9-
</configuration>
9+
</system.data></configuration>

‎src/ServiceStack.OrmLite.MySqlV45/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MySql.Data" version="6.9.3" targetFramework="net45" />
3+
<package id="MySql.Data" version="6.9.5" targetFramework="net45" />
44
</packages>

‎src/ServiceStack.OrmLite.PostgreSQL.Tests/ServiceStack.OrmLite.PostgreSQL.Tests.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50+
<Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\packages\Npgsql.2.2.3\lib\net45\Mono.Security.dll</HintPath>
53+
</Reference>
54+
<Reference Include="Npgsql, Version=2.2.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
55+
<SpecificVersion>False</SpecificVersion>
56+
<HintPath>..\packages\Npgsql.2.2.3\lib\net45\Npgsql.dll</HintPath>
57+
</Reference>
5058
<Reference Include="ServiceStack.Common">
5159
<HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>
5260
</Reference>
@@ -106,6 +114,7 @@
106114
<None Include="app.config">
107115
<SubType>Designer</SubType>
108116
</None>
117+
<None Include="packages.config" />
109118
</ItemGroup>
110119
<ItemGroup>
111120
<ProjectReference Include="..\..\tests\ServiceStack.OrmLite.Tests\ServiceStack.OrmLite.Tests.csproj">

‎src/ServiceStack.OrmLite.PostgreSQL/ServiceStack.OrmLite.PostgreSQL.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@
4343
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4444
</PropertyGroup>
4545
<ItemGroup>
46+
<Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\packages\Npgsql.2.2.3\lib\net40\Mono.Security.dll</HintPath>
49+
</Reference>
50+
<Reference Include="Npgsql, Version=2.2.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\packages\Npgsql.2.2.3\lib\net40\Npgsql.dll</HintPath>
53+
</Reference>
4654
<Reference Include="ServiceStack.Common">
4755
<HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>
4856
</Reference>
@@ -77,6 +85,9 @@
7785
<Name>ServiceStack.OrmLite</Name>
7886
</ProjectReference>
7987
</ItemGroup>
88+
<ItemGroup>
89+
<None Include="packages.config" />
90+
</ItemGroup>
8091
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
8192
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8293
<PropertyGroup>

‎src/packages/MySql.Data.6.9.3/CHANGES

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/packages/MySql.Data.6.9.3/lib/net20-cf/MySql.Data.CF.dll

-348 KB
Binary file not shown.

‎src/packages/MySql.Data.6.9.3/lib/net20/MySql.Data.dll

-431 KB
Binary file not shown.

‎src/packages/MySql.Data.6.9.3/lib/net40/MySql.Data.dll

-444 KB
Binary file not shown.

‎src/packages/MySql.Data.6.9.3/lib/net45/MySql.Data.dll

-444 KB
Binary file not shown.

‎src/packages/MySql.Data.6.9.5/CHANGES

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
6.9.5
2+
- Disabled installation on-demand in Installer (Oracle Bug #19670596).
3+
- Fix for Generated SQL requests column that doesn't exist in LINQ to Entities (MySql bug #72004, Oracle bug #19681348).
4+
- Fix for MySQL Connector/NET generates incorrect SQL for LINQ 'StartsWith' queries (MySql bug #72058, Oracle bug #19680236).
5+
- Fix for Exception when using IEnumerable.Contains(model.property) in Where predicate (MySql bug #73643, Oracle bug #19690370).
6+
- Fix for Generated Sql does not contain ORDER BY statement whose is requested by LINQ (MySql bug #73549, Oracle bug #19698010).
7+
- Fix for Web providers registration in machine.config (removed v20 suffix) (MySQL Bug #74080, Oracle Bug #19715398)
8+
- Fix for Error of "Every derived table must have an alias" in LINQ to Entities when using EF6 + DbFirst + View + Take
9+
(MySql Bug #72148, Oracle bug #19356006).
10+
- Fix for 'the method or operation is not implemented' when using linq with orderby (MySQL Bug #70722, Oracle Bug #19681723).
11+
- Fix for Exception "The given key was not present in the dictionary" when using utf16le charset in a query. (MySql #72737, Oracle Bug #19355906)
12+
- Fix for Memory leak in a loop opening a connection to the database and executing a command (MySql Bug #73122, Oracle Bug #19467233).
13+
- Fix for Multiple issues caused by trailing and leading white space character in params using MySql Membership Provider (MySql Bug #73411, Oracle Bug #19453313)
14+
- Fix for bad assumption leads to modify query adding CALL statement to the beginning of the sql query even when CommandType.Text is specified (MySql Bug #72736, Oracle Bug #19325120).
15+
16+
17+
6.9.4
18+
- Added a new plugin for MySql Fabric 1.5 support
19+
20+
21+
6.9.3
22+
- Fix for Web Parts Personalization provider
23+
- Fix for changing the PK between two int columns (MySql Bug #71418, Oracle bug #18923294).
24+
- Fix for Error when Calling MySqlConnection.GetSchema("PROCEDURES WITH PARAMETERS", ...) (Oracle bug #19285959).
25+
- Fix for EF provider reports ManifestProviderToken = 5.6 for server 5.7 (Oracle bug #19453814).
26+
- Fix for Fluent API DbModelBuilder.HasColumnType is ignored in EF6 (Oracle bug #19456229).
27+
- Fix for Setting a PK GUID identity in Code First in EF6 no longer works in Server 5.7 (Oracle bug #19456452).
28+
- Non PKs declared as Identity GUID have no GUID autogenerated (Oracle bug #19456415).
29+
30+
31+
6.9.2
32+
- Add async/await compatible methods
33+
- Fix for Unable to read geometry column when it has been set with a SRID value. (MySql Bug #71869, Oracle Bug #19137999)
34+
- Fix for Exception adding a new column to an existing model as identity and PK fails when applying the migration (MySql Bug #71418, Oracle bug #18923294).
35+
- Added SiteMap and Personalization configuration web providers to MySql.Web Nuget Package.
36+
37+
38+
6.9.1
39+
- Fix for Exception of "duplicate entry" in MySqlSessionProvider (MySql Bug #70409, Oracle bug #18657550).
40+
41+
42+
6.9.0
43+
- Added implementation of MySQLPersonalizationProvider.
44+
- Added SiteMap Web provider.
45+
- Added Simple Membership Web Provider.
46+
- Fix for open sockets connections left when connection open fails, the error happens when the client try to get a connection when the max number of connections is reached in the server. (MySql #72025, Oracle Bug #18665388).

‎src/packages/MySql.Data.6.9.3/Readme.txt renamed to ‎src/packages/MySql.Data.6.9.5/Readme.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ What's new in 6.9
99
- Simple Membership Web Provider
1010
- Site Map Web Provider
1111
- Personalization Web Provider
12+
- MySql Fabric support
1213

1314

1415
Be sure and check the documentation for more information on these new features.

‎src/packages/MySql.Data.6.9.3/content/app.config.transform renamed to ‎src/packages/MySql.Data.6.9.5/content/app.config.transform

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<system.data>
44
<DbProviderFactories>
55
<remove invariant="MySql.Data.MySqlClient" />
6-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
6+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
77
</DbProviderFactories>
88
</system.data>
99
</configuration>

‎src/packages/MySql.Data.6.9.3/content/web.config.transform renamed to ‎src/packages/MySql.Data.6.9.5/content/web.config.transform

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<system.data>
44
<DbProviderFactories>
55
<remove invariant="MySql.Data.MySqlClient" />
6-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
6+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
77
</DbProviderFactories>
88
</system.data>
99
</configuration>

‎src/packages/MySql.Data.6.9.5/lib/net20-cf/MySql.Data.CF.dll

350 KB
Binary file not shown.

‎src/packages/MySql.Data.6.9.5/lib/net20/MySql.Data.dll

434 KB
Binary file not shown.

‎src/packages/MySql.Data.6.9.5/lib/net40/MySql.Data.dll

447 KB
Binary file not shown.

‎src/packages/MySql.Data.6.9.5/lib/net45/MySql.Data.dll

447 KB
Binary file not shown.

0 commit comments

Comments
 (0)