tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-17 19:43:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

v3.2.687 (下架 v3.2.686) #1382 #1390 #1389 #1393 #1383 #1386 #1385 #1393 #1403

Browse Source
This commit is contained in:
2881099 2023-01-24 11:15:00 +08:00
parent c6f0e4455f
commit f68f7d8277
32 changed files with 78 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

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

42
Examples/base_entity/Program.cs
View File

@ -398,6 +398,27 @@ namespace base_entity
return client;
}
class TJson01
{
public Guid id { get; set; }
[JsonMap]
public DJson02 Json02 { get; set; }
[JsonMap]
public DJson02 Json03 { get; set; }
}
class TJson02
{
public Guid id { get; set; }
[JsonMap]
public DJson02 Json02 { get; set; }
}
public class DJson02
{
public string code { get; set; }
public string parentcode { get; set; }
public string name { get; set; }
}
static void Main(string[] args)
{
var pams = new Dictionary<string, string>();
@ -452,7 +473,7 @@ namespace base_entity
.UseConnectionString(FreeSql.DataType.Firebird, @"database=localhost:D:\fbdata\EXAMPLES.fdb;user=sysdba;password=123456;max pool size=5")
.UseQuoteSqlName(false)
//.UseQuoteSqlName(false)
//.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=2")
@ -483,13 +504,30 @@ namespace base_entity
.UseMonitorCommand(cmd =>
{
Console.WriteLine(cmd.CommandText + "\r\n");
cmd.CommandText = null; //不执行
//cmd.CommandText = null; //不执行
})
.UseLazyLoading(true)
//.UseGenerateCommandParameterWithLambda(true)
.Build();
BaseEntity.Initialization(fsql, () => _asyncUow.Value);
#endregion
fsql.UseJsonMap();
fsql.Delete<TJson01>().Where(a => true).ExecuteAffrows();
fsql.Insert(new TJson01
{
Json02 = new DJson02 { code = "002", name = "name002", parentcode = "002_parent" },
Json03 = new DJson02 { code = "003", name = "name003", parentcode = "003_parent" },
}).NoneParameter(false).ExecuteAffrows();
var tjson01 = fsql.Select<TJson01>().First();
fsql.Delete<TJson02>().Where(a => true).ExecuteAffrows();
fsql.Insert(new TJson02
{
Json02 = new DJson02 { code = "0022", name = "name0022", parentcode = "0022_parent" },
}).NoneParameter(false).ExecuteAffrows();
var tjson02 = fsql.Select<TJson02>().First();
var sqlv01 = fsql.Select<BaseDataEntity>().AsType(typeof(GoodsData))
.ToSql(v => new GoodsDataDTO()

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

3
Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs
View File

@ -53,7 +53,8 @@ public static class FreeSqlJsonMapCoreExtensions
var isJsonMap = e.Property.GetCustomAttributes(typeof(JsonMapAttribute), false).Any() || _dicJsonMapFluentApi.TryGetValue(e.EntityType, out var tryjmfu) && tryjmfu.ContainsKey(e.Property.Name);
if (isJsonMap)
{
if (FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(e.Property.PropertyType))
if (_dicTypes.ContainsKey(e.Property.PropertyType) == false &&
FreeSql.Internal.Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(e.Property.PropertyType))
return; //基础类型使用 JsonMap 无效
e.ModifyResult.MapType = typeof(string);

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

4
FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/OtherTest.cs
View File

@ -166,6 +166,10 @@ namespace FreeSql.Tests.PostgreSQLExpression
var sql18 = select.Where(a => a.testFieldJArray.Count > 0).Limit(10).ToList();
var sql19 = select.First(a => a.testFieldJToken["a"]);
var sql20 = select.Where(a => a.testFieldJToken["a"].ToString().Equals("1")).ToList();
var sql21 = select.Where(a => a.testFieldJToken["a"].ToString() == "1").ToList();
var sql23 = select.Where(a => int.Parse(a.testFieldJToken["a"].ToString()) > 0).ToList();
}
[Fact]

2
FreeSql/FreeSql.csproj
View File

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

8
Providers/FreeSql.Provider.Firebird/Curd/FirebirdInsert.cs
View File

@ -21,12 +21,12 @@ namespace FreeSql.Firebird.Curd
public override int ExecuteAffrows()
{
base.NoneParameter(_source?.Count > 1);
if (_noneParameter == false) base.NoneParameter(_source?.Count > 1);
return base.SplitExecuteAffrows(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999);
}
public override long ExecuteIdentity()
{
base.NoneParameter(_source?.Count > 1);
if (_noneParameter == false) base.NoneParameter(_source?.Count > 1);
return base.SplitExecuteIdentity(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999);
}
public override List<T1> ExecuteInserted() => base.SplitExecuteInserted(1, 999);
@ -126,12 +126,12 @@ namespace FreeSql.Firebird.Curd
#else
public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default)
{
base.NoneParameter(_source?.Count > 1);
if (_noneParameter == false) base.NoneParameter(_source?.Count > 1);
return base.SplitExecuteAffrowsAsync(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999, cancellationToken);
}
public override Task<long> ExecuteIdentityAsync(CancellationToken cancellationToken = default)
{
base.NoneParameter(_source?.Count > 1);
if (_noneParameter == false) base.NoneParameter(_source?.Count > 1);
return base.SplitExecuteIdentityAsync(_batchValuesLimit > 0 ? _batchValuesLimit : 200, _batchParameterLimit > 0 ? _batchParameterLimit : 999, cancellationToken);
}
public override Task<List<T1>> ExecuteInsertedAsync(CancellationToken cancellationToken = default) => base.SplitExecuteInsertedAsync(1, 1000, cancellationToken);

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>

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.2.687-preview20230119</Version>
<Version>3.2.687</Version>
</PropertyGroup>
<ItemGroup>