Update Peachpie.Library.PDO.MySql to use MySqlConnector

peachpiecompiler · May 23, 2018 · 762aaec · 762aaec
1 parent db752dc
commit 762aaec
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 55 deletions.
diff --git a/src/PDO/Peachpie.Library.PDO.MySQL/PDOMySQLDriver.cs b/src/PDO/Peachpie.Library.PDO.MySQL/PDOMySQLDriver.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MySql.Data.MySqlClient;
+using MySql.Data.MySqlClient;
+
 using Pchp.Core;
-using System.Data.Common;
 
 namespace Peachpie.Library.PDO.MySQL
 {
@@ -27,9 +23,11 @@ public PDOMySQLDriver() : base("mysql", MySqlClientFactory.Instance)
         protected override string BuildConnectionString(string dsn, string user, string password, PhpArray options)
         {
             //TODO mysql pdo parameters to dotnet connectionstring
-            var csb = new MySqlConnectionStringBuilder(dsn);
-            csb.UserID = user;
-            csb.Password = password;
+            var csb = new MySqlConnectionStringBuilder(dsn)
+            {
+                UserID = user,
+                Password = password
+            };
             return csb.ConnectionString;
         }
 

diff --git a/src/PDO/Peachpie.Library.PDO.MySQL/Peachpie.Library.PDO.MySQL.csproj b/src/PDO/Peachpie.Library.PDO.MySQL/Peachpie.Library.PDO.MySQL.csproj
@@ -2,7 +2,7 @@
 
   <Import Project="..\..\..\build\Targets\Settings.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard1.5;netstandard2.0;net46</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Peachpie.Library.PDO.MySQL</AssemblyName>
     <PackageId>Peachpie.Library.PDO.MySQL</PackageId>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MySql.Data" Version="7.0.6-IR31" />
+    <PackageReference Include="MySqlConnector" Version="0.40.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Peachpie.App/Peachpie.App.csproj b/src/Peachpie.App/Peachpie.App.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\Targets\Settings.props" />
   <PropertyGroup>
     <Description>Peachpie platform dependencies.</Description>
-    <TargetFrameworks>netstandard1.5;netstandard1.6;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard1.5;netstandard2.0;net46</TargetFrameworks>
     <AssemblyName>Peachpie.App</AssemblyName>
     <PackageId>Peachpie.App</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -17,19 +17,11 @@
     <ProjectReference Include="..\Peachpie.Runtime\Peachpie.Runtime.csproj" />
     <ProjectReference Include="..\Peachpie.Library\Peachpie.Library.csproj" />
     <ProjectReference Include="..\Peachpie.Library.MsSql\Peachpie.Library.MsSql.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.5' ">
     <ProjectReference Include="..\Peachpie.Library.MySql\Peachpie.Library.MySql.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net46' ">
     <ProjectReference Include="..\Peachpie.Library.XmlDom\Peachpie.Library.XmlDom.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Peachpie.Library.MySql/MySqlResultResource.cs b/src/Peachpie.Library.MySql/MySqlResultResource.cs
@@ -1,13 +1,10 @@
-using MySql.Data.MySqlClient;
-using MySql.Data.Types;
-using Pchp.Core;
-using Pchp.Library.Database;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
+using MySql.Data.MySqlClient;
+using Pchp.Core;
+using Pchp.Library.Database;
 using Pchp.Library.Resources;
 
 namespace Peachpie.Library.MySql
@@ -69,10 +66,8 @@ internal static MySqlResultResource ValidResult(PhpResource handle)
         protected override void FreeManaged()
         {
             var reader = (MySqlDataReader)this.Reader;
-            if (reader != null)
-            {
-                reader.Close(); // non virtual!!
-            }
+
+            reader?.Dispose();
 
             base.FreeManaged();
         }
@@ -176,8 +171,8 @@ private static object ConvertDbValue(string dataType, object sqlValue)
             if (sqlValue.GetType() == typeof(float))
                 return Pchp.Core.Convert.ToString((float)sqlValue);
 
-            if (sqlValue.GetType() == typeof(System.DateTime))
-                return ConvertDateTime(dataType, (System.DateTime)sqlValue);
+            if (sqlValue.GetType() == typeof(DateTime))
+                return ConvertDateTime(dataType, (DateTime)sqlValue);
 
             if (sqlValue.GetType() == typeof(long))
                 return ((long)sqlValue).ToString();
@@ -194,24 +189,12 @@ private static object ConvertDbValue(string dataType, object sqlValue)
             if (sqlValue.GetType() == typeof(byte[]))
                 return (byte[])sqlValue;
 
-            //MySqlDateTime sql_date_time = sqlValue as MySqlDateTime;
-            if (sqlValue.GetType() == typeof(MySqlDateTime))
-            {
-                MySqlDateTime sql_date_time = (MySqlDateTime)sqlValue;
-                if (sql_date_time.IsValidDateTime)
-                    return ConvertDateTime(dataType, sql_date_time.GetDateTime());
-
-                if (dataType == "DATE" || dataType == "NEWDATE")
-                    return "0000-00-00";
-                else
-                    return "0000-00-00 00:00:00";
-            }
-
+
             Debug.Fail("Unexpected DB field type " + sqlValue.GetType() + ".");
             return sqlValue.ToString();
         }
 
-        private static string ConvertDateTime(string dataType, System.DateTime value)
+        private static string ConvertDateTime(string dataType, DateTime value)
         {
             if (dataType == "DATE" || dataType == "NEWDATE")
                 return value.ToString("yyyy-MM-dd");

diff --git a/src/Peachpie.Library.MySql/Peachpie.Library.MySql.csproj b/src/Peachpie.Library.MySql/Peachpie.Library.MySql.csproj
@@ -2,7 +2,7 @@
 
   <Import Project="..\..\build\Targets\Settings.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard1.5;netstandard2.0;net46</TargetFrameworks>
     <AssemblyName>Peachpie.Library.MySql</AssemblyName>
     <PackageId>Peachpie.Library.MySql</PackageId>
     <PackageTags>peachpie;library;mysql</PackageTags>
@@ -16,11 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MySql.Data" Version="7.0.7-M61" />
+    <PackageReference Include="MySqlConnector" Version="0.40.4" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <Reference Include="System" />
-  </ItemGroup>
-
+
 </Project>