Skip to content

Commit b0a3f79

Browse files
28810992881099
committed
1 parent 0ca4b7e commit b0a3f79

File tree

36 files changed

+44
-150
lines changed

36 files changed

+44
-150
lines changed

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!--
1212
经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
1313
<PropertyGroup>
14-
<Version>3.2.807-preview20231220</Version>
14+
<Version>3.2.807</Version>
1515
</PropertyGroup>
1616
-->
1717

‎Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
2121
<LangVersion>latest</LangVersion>
22-
<Version>3.2.807-preview20231220</Version>
22+
<Version>3.2.807</Version>
2323
<PackageReadmeFile>readme.md</PackageReadmeFile>
2424
</PropertyGroup>
2525

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.2.807-preview20231220</Version>
18+
<Version>3.2.807</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.ZoreEntity/FreeSql.Extensions.ZoreEntity.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.ZoreEntity/ZoreDbContext.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -770,11 +770,11 @@ bool LocalCanAdd(TableInfo table, T data, bool isThrow)
770770
}
771771
else
772772
{
773-
if (_states.ContainsKey(key))
774-
{
775-
if (isThrow) throw new Exception($"不可添加，已存在于状态管理：{GetEntityString(table, data)}");
776-
return false;
777-
}
773+
//if (_states.ContainsKey(key))
774+
//{
775+
// if (isThrow) throw new Exception($"不可添加，已存在于状态管理：{GetEntityString(table, data)}");
776+
// return false;
777+
//}
778778
if (_orm.Ado.DataType == DataType.ClickHouse) return true;
779779
var idcol = table.Primarys.FirstOrDefault(a => a.Attribute.IsIdentity);
780780
if (table.Primarys.Any(a => a.Attribute.IsIdentity))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
1414
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
1515
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
16-
<Version>3.2.807-preview20231220</Version>
16+
<Version>3.2.807</Version>
1717
<PackageReadmeFile>readme.md</PackageReadmeFile>
1818
</PropertyGroup>
1919

‎FreeSql.All/FreeSql.All.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.807-preview20231220</Version>
20+
<Version>3.2.807</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

‎FreeSql.DbContext/DbSet/DbSet.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -349,12 +349,13 @@ bool CanAdd(TEntity data, bool isThrow)
349349
}
350350
else
351351
{
352-
if (_states.ContainsKey(key))
353-
{
354-
if (isThrow) throw new Exception(DbContextStrings.CannotAdd_AlreadyExistsInStateManagement(_db.OrmOriginal.GetEntityString(_entityType, data)));
355-
return false;
356-
}
357-
if (_db.OrmOriginal.Ado.DataType == DataType.ClickHouse) return true;
352+
//不可添加，已存在于状态管理
353+
//if (_states.ContainsKey(key))
354+
//{
355+
// if (isThrow) throw new Exception(DbContextStrings.CannotAdd_AlreadyExistsInStateManagement(_db.OrmOriginal.GetEntityString(_entityType, data)));
356+
// return false;
357+
//}
358+
if (_db.OrmOriginal.Ado.DataType == DataType.ClickHouse) return true;
358359
var idval = _db.OrmOriginal.GetEntityIdentityValueWithPrimary(_entityType, data);
359360
if (idval > 0)
360361
{

‎FreeSql.DbContext/FreeSql.DbContext.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.807-preview20231220</Version>
20+
<Version>3.2.807</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

‎FreeSql.DbContext/FreeSql.DbContext.xml

-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FreeSql.Repository/FreeSql.Repository.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.807-preview20231220</Version>
20+
<Version>3.2.807</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

‎FreeSql/FreeSql.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.807-preview20231220</Version>
20+
<Version>3.2.807</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

‎FreeSql/FreeSql.xml

-98
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<SignAssembly>False</SignAssembly>
2020
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2121
<DelaySign>false</DelaySign>
22-
<Version>3.2.807-preview20231220</Version>
22+
<Version>3.2.807</Version>
2323
<PackageReadmeFile>readme.md</PackageReadmeFile>
2424
</PropertyGroup>
2525

‎Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.2.807-preview20231220</Version>
18+
<Version>3.2.807</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

‎Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.2.807-preview20231220</Version>
18+
<Version>3.2.807</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

‎Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.QuestDb/FreeSql.Provider.QuestDb.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.807-preview20231220</Version>
21+
<Version>3.2.807</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

0 commit comments

Comments
 (0)