Skip to content

Commit 1080363

Browse files
luoyunchongluoyunchong
authored
Merge branch 'dotnetcore:master' into dev
2 parents c88706b + a979f96 commit 1080363

File tree

139 files changed

+16381
-341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+16381
-341
lines changed

‎Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
5-
<Version>2.6.100</Version>
5+
<Version>3.0.100</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>BaseEntity 是一种极简单的 CodeFirst 开发方式，特别对单表或多表CRUD，利用继承节省了每个实体类的重复属性（创建时间、ID等字段），软件删除等功能，进行 crud 操作时不必时常考虑仓储的使用.</Description>

‎Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
5-
<Version>2.6.100</Version>
5+
<Version>3.0.100</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql 扩展包，可实现实体类属性为对象时，以JSON形式映射存储.</Description>

‎Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netstandard2.1;net45;net40</TargetFrameworks>
5-
<Version>2.6.100</Version>
5+
<Version>3.0.100</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql 扩展包，可实现【延时加载】属性.</Description>

‎Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
5-
<Version>2.6.100</Version>
5+
<Version>3.0.100</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql 扩展包，实现 linq queryable 和 linq to sql 语法进行开发.</Description>

‎Extensions/FreeSql.Generator/ConsoleApp.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ public ConsoleApp(string[] args, ManualResetEvent wait)
180180
case "dameng": ArgsDbType = DataType.Dameng; break;
181181
case "kingbasees": ArgsDbType = DataType.KingbaseES; break;
182182
case "shentong": ArgsDbType = DataType.ShenTong; break;
183+
case "clickhouse": ArgsDbType = DataType.ClickHouse; break;
183184
default: throw new ArgumentException($"-DB 参数错误，不支持的类型：\"{dbargs[0]}\"");
184185
}
185186
ArgsConnectionString = dbargs[1].Trim();

‎Extensions/FreeSql.Generator/FreeSql.Generator.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net50</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net60</TargetFrameworks>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<IsPackable>true</IsPackable>
88
<PackAsTool>true</PackAsTool>
@@ -12,15 +12,15 @@
1212
<Description>使用 FreeSql 快速生成数据库的实体类，安装：dotnet tool install -g FreeSql.Generator</Description>
1313
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
1414
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
15-
<Version>2.6.100</Version>
15+
<Version>3.0.100</Version>
1616
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
2020
<PackageReference Include="Colorful.Console" Version="1.2.9" />
2121
<PackageReference Include="RazorEngine.NetCore" Version="2.2.6" />
22-
<PackageReference Include="System.CodeDom" Version="5.0.0" />
23-
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
22+
<PackageReference Include="System.CodeDom" Version="6.0.0" />
23+
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎Extensions/FreeSql.Generator/RazorContentManager.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public partial class @gen.GetCsName(gen.FullTableName) {
6363
6464
@foreach (var col in gen.columns) {
6565
66-
if (string.IsNullOrEmpty(col.Coment) == false) {
66+
if (string.IsNullOrEmpty(col.Comment) == false) {
6767
@:/// <summary>
68-
@:/// @col.Coment.Replace(""\r\n"", ""\n"").Replace(""\n"", ""\r\n /// "")
68+
@:/// @col.Comment.Replace(""\r\n"", ""\n"").Replace(""\n"", ""\r\n /// "")
6969
@:/// </summary>
7070
}
7171
@:@(""[JsonProperty"" + GetAttributeString(gen.GetColumnAttribute(col, true)) + ""]"")
@@ -154,9 +154,9 @@ public partial class @gen.GetCsName(gen.FullTableName) {
154154
var findfks = fks.Where(fkaa => fkaa.Columns.Where(fkaac1 => fkaac1.Name == col.Name).Any());
155155
var csname = gen.GetCsName(col.Name);
156156
157-
if (string.IsNullOrEmpty(col.Coment) == false) {
157+
if (string.IsNullOrEmpty(col.Comment) == false) {
158158
@:/// <summary>
159-
@:/// @col.Coment.Replace(""\r\n"", ""\n"").Replace(""\n"", ""\r\n /// "")
159+
@:/// @col.Comment.Replace(""\r\n"", ""\n"").Replace(""\n"", ""\r\n /// "")
160160
@:/// </summary>
161161
}
162162
@:@(""[JsonProperty"" + GetAttributeString(gen.GetColumnAttribute(col, true)) + ""]"")

‎FreeSql.All/FreeSql.All.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
5-
<Version>2.6.100</Version>
5+
<Version>3.0.100</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql 全家桶，懒人专用</Description>

‎FreeSql.DbContext/DbContext/DbContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public DbContext AttachOnlyPrimary<TEntity>(TEntity data) where TEntity : class
217217
/// 比较实体，计算出值发生变化的属性，以及属性变化的前后值
218218
/// </summary>
219219
/// <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
220-
/// <returns></returns>
220+
/// <returns>key: 属性名, value: [旧值, 新值]</returns>
221221
public Dictionary<string, object[]> CompareState<TEntity>(TEntity newdata) where TEntity : class
222222
{
223223
CheckEntityTypeOrThrow(typeof(TEntity));

‎FreeSql.DbContext/DbSet/DbSet.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public DbSet<TEntity> AttachOnlyPrimary(TEntity data)
223223
/// 比较实体，计算出值发生变化的属性，以及属性变化的前后值
224224
/// </summary>
225225
/// <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
226-
/// <returns></returns>
226+
/// <returns>key: 属性名, value: [旧值, 新值]</returns>
227227
public Dictionary<string, object[]> CompareState(TEntity newdata)
228228
{
229229
if (newdata == null) return null;
@@ -305,6 +305,7 @@ bool CanAdd(TEntity data, bool isThrow)
305305
case DataType.KingbaseES:
306306
case DataType.OdbcKingbaseES:
307307
case DataType.ShenTong:
308+
case DataType.ClickHouse:
308309
return true;
309310
default:
310311
if (_tableIdentitys.Length == 1 && _table.Primarys.Length == 1)
@@ -320,6 +321,7 @@ bool CanAdd(TEntity data, bool isThrow)
320321
if (isThrow) throw new Exception($"不可添加，已存在于状态管理：{_db.OrmOriginal.GetEntityString(_entityType, data)}");
321322
return false;
322323
}
324+
if (_db.OrmOriginal.Ado.DataType == DataType.ClickHouse) return true;
323325
var idval = _db.OrmOriginal.GetEntityIdentityValueWithPrimary(_entityType, data);
324326
if (idval > 0)
325327
{

0 commit comments

Comments
 (0)