weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-08 09:20: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
2024-12-26 12:05:06 +08:00
parent 657caedb54 32d0916363
commit deafd57d44
35 changed files with 50 additions and 35 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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

2
FreeSql/FreeSql.csproj
View File

@@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.5.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

17
Providers/FreeSql.Provider.GBase/GBaseUtils.cs
View File

@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Data.Common;
using System.Data.Odbc;
using System.Globalization;
using System.Text.RegularExpressions;
namespace FreeSql.GBase
{
@@ -76,7 +77,21 @@ namespace FreeSql.GBase
}
public override string[] SplitTableName(string name) => name?.Split(new char[] { ':' }, 1);
public override string QuoteParamterName(string name) => $"?{(_orm.CodeFirst.IsSyncStructureToLower ? name.ToLower() : name)}";
public override string IsNull(string sql, object value) => $"nvl({sql}, {value})";
readonly static Regex _regDateTime = new Regex(@"^'(\d{4,4}\-\d{1,2}-\d{1,2} \d{1,2}:\d{1,2}:\d{1,2})(\.\d+)?'$", RegexOptions.Compiled);
public override string IsNull(string sql, object value)
{
if (value is string valueStr)
{
var match = _regDateTime.Match(valueStr);
if (match.Success)
{
if (string.IsNullOrEmpty(match.Groups[2].Value)) value = $"DATETIME({match.Groups[1].Value}) YEAR TO SECOND";
else value = $"DATETIME({match.Groups[1].Value}{match.Groups[2].Value}) YEAR TO FRACTION({(match.Groups[2].Value.Length - 1)})";
}
}
return $"nvl({sql}, {value})";
}
public override string StringConcat(string[] objs, Type[] types) => $"{string.Join(" || ", objs)}";
public override string Mod(string left, string right, Type leftType, Type rightType) => $"mod({left},{right})";
public override string Div(string left, string right, Type leftType, Type rightType) => $"trunc({left}/{right})";

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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

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.103-preview20241205</Version>
<Version>3.5.103-preview20241224</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>