weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-15 04:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/2881099/FreeSql

Browse Source
This commit is contained in:
2881099
2025-02-19 17:00:23 +08:00
parent 42bfe25a50 e55e70a15b
commit d5b13402f3
37 changed files with 131 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@@ -12,7 +12,7 @@
<!--
经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
<PropertyGroup>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
</PropertyGroup>
-->

2
Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
View File

@@ -19,7 +19,7 @@
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<LangVersion>latest</LangVersion>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
View File

@@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Extensions/FreeSql.Generator/FreeSql.Generator.csproj
View File

@@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
FreeSql.All/FreeSql.All.csproj
View File

@@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
FreeSql.DbContext/FreeSql.DbContext.csproj
View File

@@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
FreeSql.Repository/FreeSql.Repository.csproj
View File

@@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
FreeSql.Tests/FreeSql.Tests.Provider.TDengine/TDengine/TDengineAdo/TDengineAdoTest.cs → FreeSql.Tests/FreeSql.Tests.Provider.TDengine/TDengine/TDengineCrud/TDengineCrudTest.cs
View File

@@ -4,7 +4,7 @@ using Xunit;
namespace FreeSql.Tests.Provider.TDengine.TDengine.TDengineAdo
{
public class TDengineAdoTest
public class TDengineCrudTest
{
IFreeSql fsql => g.tdengine;

72
FreeSql.Tests/FreeSql.Tests.Provider.TDengine/TDengine/TDengineIssue/TDengineIssueTest.cs Normal file
View File

@@ -0,0 +1,72 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using FreeSql.DataAnnotations;
using Newtonsoft.Json;
using Xunit.Abstractions;
namespace FreeSql.Tests.Provider.TDengine.TDengine.TDengineIssue
{
public class TDengineIssueTest
{
private IFreeSql _fsql;
private ITestOutputHelper _output;
public TDengineIssueTest(ITestOutputHelper output)
{
_fsql = g.tdengine;
_output = output;
}
[Fact]
void CodeFirst1977()
{
_fsql.CodeFirst.SyncStructure(typeof(TDengineProcessMetrics1977));
}
[Fact]
void SelectTest1977()
{
var data = _fsql.Select<TDengineProcessMetrics1977>()
.ToList();
_output.WriteLine(JsonConvert.SerializeObject(data));
}
[Fact]
void InsertTest1977()
{
var insertAffrows = _fsql.Insert(new TDengineProcessMetrics1977()
{
Timestamp = DateTime.Now,
HostName = "host6"
}
).ExecuteAffrows();
Assert.Equal(1, insertAffrows);
}
}
public class TDengineProcessMetrics1977
{
/// <summary>
/// 数据时间戳
/// </summary>
[Column(Name = "ts")]
public DateTime Timestamp { get; set; }
/// <summary>
/// 主机名
/// </summary>
[Column(Name = "host_name")]
public string HostName { get; set; }
/// <summary>
/// 进程启动时间
/// </summary>
[Column(Name = "start_time")]
public DateTime StartTime { get; set; }
}
}

2
FreeSql/FreeSql.csproj
View File

@@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj
View File

@@ -19,7 +19,7 @@
<SignAssembly>False</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj
View File

@@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.Duckdb/FreeSql.Provider.Duckdb.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj
View File

@@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.QuestDb/FreeSql.Provider.QuestDb.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj
View File

@@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
Providers/FreeSql.Provider.TDengine/FreeSql.Provider.TDengine.csproj
View File

@@ -18,7 +18,7 @@
<SignAssembly>true</SignAssembly>
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

26
Providers/FreeSql.Provider.TDengine/TDengineProvider.cs
View File

@@ -43,6 +43,26 @@ namespace FreeSql.TDengine
// e.ModifyResult.IsIgnore = true;
//};
//TDengine 特殊处理:
this.Aop.AuditDataReader += (_, e) =>
{
var dataTypeName = e.DataReader.GetDataTypeName(e.Index);
switch (dataTypeName)
{
case "TIMESTAMP":
try
{
if (e.DataReader.IsDBNull(e.Index)) e.Value = null;
else e.Value = e.DataReader.GetDateTime(e.Index);
}
catch
{
e.Value = DateTime.MinValue;
}
return;
}
};
//处理参数化
this.Aop.CommandBefore += (_, e) =>
{
@@ -75,7 +95,8 @@ namespace FreeSql.TDengine
public override IUpdate<T1> CreateUpdateProvider<T1>(object dywhere)
{
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
throw new NotImplementedException(
$"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
}
public override IDelete<T1> CreateDeleteProvider<T1>(object dywhere)
@@ -85,7 +106,8 @@ namespace FreeSql.TDengine
public override IInsertOrUpdate<T1> CreateInsertOrUpdateProvider<T1>()
{
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
throw new NotImplementedException(
$"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
}
~TDengineProvider() => this.Dispose();

2
Providers/FreeSql.Provider.Xugu/FreeSql.Provider.Xugu.csproj
View File

@@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.5.105</Version>
<Version>3.5.106</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>