Skip to content

Commit e911150

Browse files
maikebingmaikebing
committed
1.调整ORM ， 2. 调整兼容性， 3.调整EF警告信息
1 parent d27335f commit e911150

File tree

13 files changed

+172
-92
lines changed

13 files changed

+172
-92
lines changed

‎EFCore.Taos.sln‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-co
2828
EndProject
2929
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkCore.Taos.Tests", "src\EntityFrameworkCore.Taos.Tests\EntityFrameworkCore.Taos.Tests.csproj", "{7F5F12D6-CA82-4499-AF3E-6CA7E61579CB}"
3030
EndProject
31-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaosOrm", "TaosOrm\TaosOrm.csproj", "{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}"
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IoTSharp.ORM.Taos", "src\IoTSharp.ORM.Taos\IoTSharp.ORM.Taos.csproj", "{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}"
32+
EndProject
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ORMExample", "src\ORMExample\ORMExample.csproj", "{9961CED3-F482-41E7-AB0D-17EC37FD637D}"
3234
EndProject
3335
Global
3436
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -112,18 +114,30 @@ Global
112114
{7F5F12D6-CA82-4499-AF3E-6CA7E61579CB}.Release|x64.Build.0 = Release|Any CPU
113115
{7F5F12D6-CA82-4499-AF3E-6CA7E61579CB}.Release|x86.ActiveCfg = Release|Any CPU
114116
{7F5F12D6-CA82-4499-AF3E-6CA7E61579CB}.Release|x86.Build.0 = Release|Any CPU
115-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Debug|Any CPU.Build.0 = Debug|Any CPU
117-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Debug|x64.ActiveCfg = Debug|Any CPU
118-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Debug|x64.Build.0 = Debug|Any CPU
119-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Debug|x86.ActiveCfg = Debug|Any CPU
120-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Debug|x86.Build.0 = Debug|Any CPU
121-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Release|Any CPU.ActiveCfg = Release|Any CPU
122-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Release|Any CPU.Build.0 = Release|Any CPU
123-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Release|x64.ActiveCfg = Release|Any CPU
124-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Release|x64.Build.0 = Release|Any CPU
125-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Release|x86.ActiveCfg = Release|Any CPU
126-
{7F9F4104-3AFF-4D1E-8AD4-154957159ADC}.Release|x86.Build.0 = Release|Any CPU
117+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Debug|Any CPU.Build.0 = Debug|Any CPU
119+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Debug|x64.ActiveCfg = Debug|Any CPU
120+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Debug|x64.Build.0 = Debug|Any CPU
121+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Debug|x86.ActiveCfg = Debug|Any CPU
122+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Debug|x86.Build.0 = Debug|Any CPU
123+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Release|Any CPU.ActiveCfg = Release|Any CPU
124+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Release|Any CPU.Build.0 = Release|Any CPU
125+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Release|x64.ActiveCfg = Release|Any CPU
126+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Release|x64.Build.0 = Release|Any CPU
127+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Release|x86.ActiveCfg = Release|Any CPU
128+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783}.Release|x86.Build.0 = Release|Any CPU
129+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
130+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Debug|Any CPU.Build.0 = Debug|Any CPU
131+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Debug|x64.ActiveCfg = Debug|Any CPU
132+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Debug|x64.Build.0 = Debug|Any CPU
133+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Debug|x86.ActiveCfg = Debug|Any CPU
134+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Debug|x86.Build.0 = Debug|Any CPU
135+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Release|Any CPU.ActiveCfg = Release|Any CPU
136+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Release|Any CPU.Build.0 = Release|Any CPU
137+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Release|x64.ActiveCfg = Release|Any CPU
138+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Release|x64.Build.0 = Release|Any CPU
139+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Release|x86.ActiveCfg = Release|Any CPU
140+
{9961CED3-F482-41E7-AB0D-17EC37FD637D}.Release|x86.Build.0 = Release|Any CPU
127141
EndGlobalSection
128142
GlobalSection(SolutionProperties) = preSolution
129143
HideSolutionNode = FALSE
@@ -133,6 +147,8 @@ Global
133147
{9D7B7248-3ADD-4DC3-A800-18CE10FEA752} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}
134148
{D7F52FA5-1CAA-4D9F-80D8-F141D104AE64} = {B24685BC-E919-46BE-ADE8-52AC8697A1F1}
135149
{61524D14-E365-4D00-A058-479AAE4D2B49} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}
150+
{C7819FDC-BA05-42DD-88A6-97F2B0D9D783} = {CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}
151+
{9961CED3-F482-41E7-AB0D-17EC37FD637D} = {B24685BC-E919-46BE-ADE8-52AC8697A1F1}
136152
EndGlobalSection
137153
GlobalSection(ExtensibilityGlobals) = postSolution
138154
SolutionGuid = {285A5EB4-BCF4-40EB-B9E1-DF6DBCB5E705}

‎TaosOrm/Program.cs‎

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

‎TaosOrm/Test/EntityDemo.cs‎

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

‎src/EFCore.Taos.Core/Scaffolding/Internal/TaosCodeGenerator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public override MethodCallCodeFragment GenerateUseProvider(
3535
string connectionString,
3636
MethodCallCodeFragment providerOptions)
3737
=> new MethodCallCodeFragment(
38-
nameof(TaosDbContextOptionsBuilderExtensions.UseTaos),
38+
typeof(TaosDbContextOptionsBuilderExtensions).GetMethod("UseTaos", System.Reflection.BindingFlags.Static),
3939
providerOptions == null
4040
? new object[] { connectionString }
4141
: new object[] { connectionString, new NestedClosureCodeFragment("x", providerOptions) });

‎src/IoTSharp.Data.Taos/DataReaderExtensions.cs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,19 +121,27 @@ public static IntPtr ToIntPtr(this int val)
121121
Marshal.WriteInt32(lenPtr, val);
122122
return lenPtr;
123123
}
124-
public static (IntPtr ptr, int len) ToUTF8IntPtr(this string command)
124+
internal struct UTF8IntPtrStruct
125125
{
126+
public IntPtr ptr;
127+
public int len;
128+
}
126129

130+
internal static UTF8IntPtrStruct ToUTF8IntPtr(this string command)
131+
{
132+
UTF8IntPtrStruct result;
127133
#if NET5_0_OR_GREATER
128-
IntPtr commandBuffer = Marshal.StringToCoTaskMemUTF8(command);
129-
int bufferlen = Encoding.UTF8.GetByteCount(command);
134+
IntPtr commandBuffer = Marshal.StringToCoTaskMemUTF8(command);
135+
int bufferlen = Encoding.UTF8.GetByteCount(command);
130136
#else
131137
var bytes = Encoding.UTF8.GetBytes(command);
132138
int bufferlen = bytes.Length;
133139
IntPtr commandBuffer = Marshal.AllocHGlobal(bufferlen);
134140
Marshal.Copy(bytes, 0, commandBuffer, bufferlen);
135141
#endif
136-
return (commandBuffer, bufferlen);
142+
result.ptr = commandBuffer;
143+
result.len = bufferlen;
144+
return result;
137145
}
138146

139147
public static void FreeUtf8IntPtr(this IntPtr ptr)

‎src/IoTSharp.Data.Taos/Driver/TDengineDriver.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -477,11 +477,15 @@ static public string StmtErrorStr(IntPtr stmt)
477477
/// <param name="param">the parameter for callback</param>
478478
[DllImport("taos", EntryPoint = "taos_query_a", CallingConvention = CallingConvention.Cdecl)]
479479
static extern private void QueryAsync(IntPtr taos, string sql, QueryAsyncCallback fq, IntPtr param);
480-
481-
public static Task<(IntPtr taoRes, int code)> QueryAsync(IntPtr taos, string sql, IntPtr param)
480+
public struct _TaosRes
481+
{
482+
public IntPtr taoRes;
483+
public int code;
484+
}
485+
public static Task<_TaosRes> QueryAsync(IntPtr taos, string sql, IntPtr param)
482486
{
483487
Semaphore sema = new Semaphore(1, 1);
484-
(IntPtr taoRes, int code) result=new();
488+
_TaosRes result =new();
485489
QueryAsync(taos, sql, delegate (IntPtr param, IntPtr taoRes, int code)
486490
{
487491
sema.Release();
@@ -490,7 +494,7 @@ static public string StmtErrorStr(IntPtr stmt)
490494

491495
}, param);
492496
sema.WaitOne();
493-
return Task.FromResult( result);
497+
return Task.FromResult(result);
494498
}
495499

496500
/// <summary>

‎src/IoTSharp.Data.Taos/IoTSharp.Data.Taos.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
IoTSharp.Data.Taos.TaosParameter
1717
IoTSharp.Data.Taos.TaosTransaction
1818
</Description>
19-
<TargetFrameworks>net5;net6;net4.6</TargetFrameworks>
19+
<TargetFrameworks>net5;net6;net4.6;netstandard2.0</TargetFrameworks>
2020
<LangVersion>10</LangVersion>
2121
<PackageTags>Taos;Data;ADO.NET;Entity Framework,;EF; Core;Data O/RM,;entity-framework-core;TDengine;IoTSharp</PackageTags>
2222

@@ -31,8 +31,7 @@
3131
<RepositoryUrl>https://github.com/IoTSharp/EntityFrameworkCore.Taos</RepositoryUrl>
3232

3333
<PackageReleaseNotes>
34-
IoTSharp.Data.Taos 是一个基于TDengine 的RESTful Connector构建的ADO.Net 提供器。 这将允许你通过.Net Core 访问TDengine数据库。
35-
IoTSharp.EntityFrameworkCore.Taos 是一个Entity Framework Core 的提供器， 基于IoTSharp.Data.Taos构建。
34+
IoTSharp.Data.Taos 是一个TDengine 的ADO.Net 提供器。 这将允许你通过.Net Core 访问TDengine数据库。
3635
</PackageReleaseNotes>
3736

3837
<PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -64,10 +63,12 @@
6463
</ItemGroup>
6564
<ItemGroup Condition="'$(TargetFramework)' == 'net4.6'">
6665
<Reference Include="System.ComponentModel.DataAnnotations" />
67-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
6866
</ItemGroup>
69-
<ItemGroup >
67+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' ">
68+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
69+
</ItemGroup>
70+
<ItemGroup>
7071
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
71-
72+
7273
</ItemGroup>
7374
</Project>

‎src/IoTSharp.ORM.Taos/IoTSharp.ORM.Taos.csproj‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<PackageTags>Taos;Data;ADO.NET;Entity Framework,;EF; Core;Data O/RM,;entity-framework-core;TDengine;IoTSharp;ORM</PackageTags>
6+
<Authors>Yanhong Ma</Authors>
7+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8+
<PackageProjectUrl>https://github.com/IoTSharp/EntityFrameworkCore.Taos</PackageProjectUrl>
9+
10+
<PackageIconUrl></PackageIconUrl>
11+
12+
<RepositoryUrl>https://github.com/IoTSharp/EntityFrameworkCore.Taos</RepositoryUrl>
13+
14+
<PackageReleaseNotes>
15+
IoTSharp.ORM.Taos 访问TDengine数据库的便捷ORM。
16+
17+
</PackageReleaseNotes>
18+
19+
<Copyright>Copyright © 2019-2022 IoTSharp All rights reserved.</Copyright>
20+
21+
<Version>1.0.1</Version>
22+
23+
<Platforms>AnyCPU;x64;x86</Platforms>
24+
25+
<PackageIcon>48876650.jpg</PackageIcon>
26+
</PropertyGroup>
27+
28+
<ItemGroup>
29+
<None Include="..\..\docs\48876650.jpg" Link="48876650.jpg">
30+
<PackagePath></PackagePath>
31+
<Pack>True</Pack>
32+
</None>
33+
</ItemGroup>
34+
35+
<ItemGroup>
36+
<ProjectReference Include="..\IoTSharp.Data.Taos\IoTSharp.Data.Taos.csproj" />
37+
</ItemGroup>
38+
39+
</Project>

TaosOrm/TaosAttribute.cs renamed to src/IoTSharp.ORM.Taos/TaosAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Text;
55
using System.Threading.Tasks;
66

7-
namespace TaosOrm
7+
namespace IoTSharp.ORM.Taos
88
{
99
[Serializable]
1010
public class TaosAttribute : Attribute

TaosOrm/TaosDataType.cs renamed to src/IoTSharp.ORM.Taos/TaosDataType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Text;
55
using System.Threading.Tasks;
66

7-
namespace TaosOrm
7+
namespace IoTSharp.ORM.Taos
88
{
99
/// <summary>
1010
/// 涛思时序数据库10种数据类型

0 commit comments

Comments
 (0)