From 78c5433a092cf515f5f3981cf0877fc137e2b193 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Mon, 3 Aug 2020 11:29:17 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=A2=9E=E5=8A=A0=20FreeSql.Provider.SqlSe?= =?UTF-8?q?rverForSystem=20=E4=BD=BF=E7=94=A8=20System.Data.SqlClient.dll?= =?UTF-8?q?=20=E5=85=BC=E5=AE=B9=E6=9B=B4=E5=A4=9A=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=EF=BC=9B#401=20#398=20#395=20#392=20#391?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SqlServerAdo/SqlServerAdoTest.cs | 6 ++- FreeSql.sln | 15 ++++++ FreeSql/FreeSqlBuilder.cs | 7 +-- ...FreeSql.Provider.SqlServerForSystem.csproj | 44 ++++++++++++++++++ .../key.snk | Bin 0 -> 596 bytes 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj create mode 100644 Providers/FreeSql.Provider.SqlServerForSystem/key.snk diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs index 7dc5c181..e0a074d8 100644 --- a/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs @@ -1,6 +1,8 @@ using FreeSql.DataAnnotations; using FreeSql.Tests.DataContext.SqlServer; +using NetTaste; using System; +using System.Collections.Generic; using Xunit; namespace FreeSql.Tests.SqlServer @@ -78,8 +80,8 @@ namespace FreeSql.Tests.SqlServer var t4 = g.sqlserver.Ado.Query<(int, int, string, string DateTime)>("select * from xxx"); - var t5 = g.sqlserver.Ado.Query(System.Data.CommandType.Text, "select * from xxx where Id = @Id", - new Microsoft.Data.SqlClient.SqlParameter("Id", 1)); + var t5 = g.sqlserver.Ado.Query("select * from xxx where Id = @Id", + new Dictionary { ["id"] = 1 }); } [Fact] diff --git a/FreeSql.sln b/FreeSql.sln index c84703c1..e1c05120 100644 --- a/FreeSql.sln +++ b/FreeSql.sln @@ -84,6 +84,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.ShenTong", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite", "FreeSql.Tests\FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite\FreeSql.Tests.Provider.PostgreSQL.NetTopologySuite.csproj", "{330F15A7-5089-456B-B553-A98B14DEB764}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.SqlServerForSystem", "Providers\FreeSql.Provider.SqlServerForSystem\FreeSql.Provider.SqlServerForSystem.csproj", "{3D2BD8EC-253A-437F-B4C8-74BC0D91429B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -514,6 +516,18 @@ Global {330F15A7-5089-456B-B553-A98B14DEB764}.Release|x64.Build.0 = Release|Any CPU {330F15A7-5089-456B-B553-A98B14DEB764}.Release|x86.ActiveCfg = Release|Any CPU {330F15A7-5089-456B-B553-A98B14DEB764}.Release|x86.Build.0 = Release|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Debug|x64.ActiveCfg = Debug|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Debug|x64.Build.0 = Debug|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Debug|x86.ActiveCfg = Debug|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Debug|x86.Build.0 = Debug|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Release|Any CPU.Build.0 = Release|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Release|x64.ActiveCfg = Release|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Release|x64.Build.0 = Release|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Release|x86.ActiveCfg = Release|Any CPU + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -543,6 +557,7 @@ Global {E74D90E8-1CBC-4677-817B-1CA05AB97937} = {2A381C57-2697-427B-9F10-55DA11FD02E4} {07AB0B37-A8B1-4FB1-9259-7B804E369E36} = {94C8A78D-AA15-47B2-A348-530CD86BFC1B} {938173AF-157F-4040-AED3-171DA1809CAA} = {2A381C57-2697-427B-9F10-55DA11FD02E4} + {3D2BD8EC-253A-437F-B4C8-74BC0D91429B} = {2A381C57-2697-427B-9F10-55DA11FD02E4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98} diff --git a/FreeSql/FreeSqlBuilder.cs b/FreeSql/FreeSqlBuilder.cs index e4ff315f..58fc9ee8 100644 --- a/FreeSql/FreeSqlBuilder.cs +++ b/FreeSql/FreeSqlBuilder.cs @@ -178,12 +178,13 @@ namespace FreeSql switch (_dataType) { case DataType.MySql: - type = Type.GetType("FreeSql.MySql.MySqlProvider`1,FreeSql.Provider.MySql")?.MakeGenericType(typeof(TMark)); - if (type == null) type = Type.GetType("FreeSql.MySql.MySqlProvider`1,FreeSql.Provider.MySqlConnector")?.MakeGenericType(typeof(TMark)); + type = Type.GetType("FreeSql.MySql.MySqlProvider`1,FreeSql.Provider.MySql")?.MakeGenericType(typeof(TMark)); //MySql.Data.dll + if (type == null) type = Type.GetType("FreeSql.MySql.MySqlProvider`1,FreeSql.Provider.MySqlConnector")?.MakeGenericType(typeof(TMark)); //MySqlConnector.dll if (type == null) throwNotFind("FreeSql.Provider.MySql.dll", "FreeSql.MySql.MySqlProvider<>"); break; case DataType.SqlServer: - type = Type.GetType("FreeSql.SqlServer.SqlServerProvider`1,FreeSql.Provider.SqlServer")?.MakeGenericType(typeof(TMark)); + type = Type.GetType("FreeSql.SqlServer.SqlServerProvider`1,FreeSql.Provider.SqlServer")?.MakeGenericType(typeof(TMark)); //Microsoft.Data.SqliClient.dll + if (type == null) type = Type.GetType("FreeSql.SqlServer.SqlServerProvider`1,FreeSql.Provider.SqlServerForSystem")?.MakeGenericType(typeof(TMark)); //System.Data.SqliClient.dll if (type == null) throwNotFind("FreeSql.Provider.SqlServer.dll", "FreeSql.SqlServer.SqlServerProvider<>"); break; case DataType.PostgreSQL: diff --git a/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj b/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj new file mode 100644 index 00000000..2debe31c --- /dev/null +++ b/Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj @@ -0,0 +1,44 @@ + + + + netstandard2.0;net451;net45;net40 + 1.7.1 + true + ncc;YeXiangQin + FreeSql 数据库实现，基于 System.Data.SqlClient + SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next + https://github.com/2881099/FreeSql + https://github.com/2881099/FreeSql + git + MIT + FreeSql;ORM + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + true + key.snk + false + + + + + + + + + + + + + + + + + + + + net40 + + + diff --git a/Providers/FreeSql.Provider.SqlServerForSystem/key.snk b/Providers/FreeSql.Provider.SqlServerForSystem/key.snk new file mode 100644 index 0000000000000000000000000000000000000000..ee20b4b1a0815eac842bc01d4becaa8814ae0b14 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097nKW;Q)(l0*2_LP37mJV1_SL_wJp_%19 zz}Ioucr4R)UNZq%r-$=RryFiI8)w!j<{z)y2~@p##L$SPx^Ow#GA*zK`{`cfYL7{l+Kxddb$Rvhs&7lm@`8>uzw0+OE7j#mY{c`qYhBLw zcTGv3<(P)_%zO>@*n(qI-%i9l@ajAusufL6g2Vv#NI96{=y#u{9B_yQKTPz)Y1$HZ zD>)q$vf8;gu0YshJ#~JP;~%_{2fSYfOELVZHBw(!Q9B`pKjDnCeY`_d!%4(WhMfK$ zib<3?gsgWm`U%MfEU6k^$B1oKeoOR+6Ka49G&ay?N* zWrr4(9T)d$I0G(sI2kIll6}TqEoiT#l$9WiCiIHArG(J)@}oPH&x7=*Q#zIO2)&${ zs=8;1+&r`77n1*!D3-|5;1jS&VG_ExzZ)Nhn^BcViCiS4rX}W|LSx7qNZbgPU3FF1 zjjOa|%br?&bZxd+I~%#VD@?Y)q9}!bhgyA-Znito|8TOd$`r z#f$F8O#2i?@t)1AqE6%gl3yp72kFp8Z&aePj>(S716o zDo}MQ0!f+r8b6a|9OKhVLMi>I(pfb~lkYJ>SkhIf*VGAzeZPoUrp+NtlKmiYU*A)1 iK9<^9bbhHh%Datqpbh^L1ZmM}I29}Y1xF)Q!$<>NydEt8 literal 0 HcmV?d00001