diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..437cf4117 --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +################################################################################ +# æ­¤ .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/.vs +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +build/ +bld/ +[Bb]in/ +[Oo]bj/ +/packages +*.user +/Data +/Log +/NewLife.Cube/Config +/NewLife.Cube/Plugins +*.log +*.htm +*.nuspec +*.nupkg +/NewLife.Core.Core/project.lock.json +/Backup +/ConsoleApp1 +/NewLife.Cube4/Config +/NewLife.Cube4/Content +/NewLife.Cube4/Plugins +/XCode/Membership/Config +/XCode/Sharding/Config +/XCode/Demo/Config +/XCode/Membership +/Keys +/Avatars +/MySQL.Data/.vs/MySql.Data/v15 +/Tests/MySql.EntityFramework.Basic.Tests diff --git a/MySQL.Data/src/MySqlClientFactory.cs b/MySQL.Data/src/MySqlClientFactory.cs index cec980211..78e476b63 100644 --- a/MySQL.Data/src/MySqlClientFactory.cs +++ b/MySQL.Data/src/MySqlClientFactory.cs @@ -1,4 +1,4 @@ -// Copyright © 2004, 2016 Oracle and/or its affiliates. All rights reserved. +// Copyright ?2004, 2016 Oracle and/or its affiliates. All rights reserved. // // MySQL Connector/NET is licensed under the terms of the GPLv2 // , like most @@ -61,13 +61,22 @@ public override DbCommand CreateCommand() public override DbConnection CreateConnection() { return new MySqlConnection(); - } - - /// - /// Returns a strongly typed instance. - /// - /// A new strongly typed instance of DbParameter. - public override DbParameter CreateParameter() + } + + /// + /// Returns a strongly typed instance. + /// + /// A new strongly typed instance of DbDataAdapter. + public override DbDataAdapter CreateDataAdapter() + { + return new MySqlDataAdapter(); + } + + /// + /// Returns a strongly typed instance. + /// + /// A new strongly typed instance of DbParameter. + public override DbParameter CreateParameter() { return new MySqlParameter(); }