NewLife
/
XCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git.newlifex.com/NewLife/NewLife.XCode

This commit is contained in:
智能大石头 2025-01-07 23:28:08 +08:00
parent 3d6b41b1d9 bced16fa57
commit df7337be0f
5 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
XCode/Cache/FieldCache.cs
View File

@ -65,7 +65,12 @@ public class FieldCache<TEntity> : EntityCache<TEntity> where TEntity : Entity<T
}
}
private IList<TEntity> Search() => Entity<TEntity>.FindAll(Where?.GroupBy(_field), OrderBy, _Unique.Count("group_count")! & _field, 0, MaxRows);
private IList<TEntity> Search()
{
Expression? exp = Where?.GroupBy(_field);
exp ??= _field.GroupBy();
return Entity<TEntity>.FindAll(exp, OrderBy, _Unique.Count("group_count")! & _field, 0, MaxRows);
}
private IDictionary<String, String> GetAll()
{

4
XCode/Entity/Entity.cs
View File

@ -416,9 +416,9 @@ public partial class Entity<TEntity> : EntityBase, IAccessor where TEntity : Ent
if (uk == null || this[uk.Name] is String str2 && str2.Length > 50) uk = Meta.Unique;
if (uk != null)
throw new ArgumentOutOfRangeException(fi.Name, $"[{fi.Name}/{fi.DisplayName}]长度限制{fi.Length}字符[{uk.Name}={this[uk.Name]}]");
throw new ArgumentOutOfRangeException(fi.Name, $"[{fi.Name}/{fi.DisplayName}@{factory.TableName}]长度限制{fi.Length}字符[{uk.Name}={this[uk.Name]}]");
else
throw new ArgumentOutOfRangeException(fi.Name, $"[{fi.Name}/{fi.DisplayName}]长度限制{fi.Length}字符");
throw new ArgumentOutOfRangeException(fi.Name, $"[{fi.Name}/{fi.DisplayName}@{factory.TableName}]长度限制{fi.Length}字符");
}
}
}

4
XCode/Entity/EntityExtension.cs
View File

@ -810,7 +810,7 @@ public static class EntityExtension
/// 简单来说：对于一行记录，如果Insert 成功则返回1，如果需要执行的是update 则返回2
/// Oracle返回值：无论是插入还是更新返回的都始终为-1
/// </returns>
public static Int32 Upsert<T>(this IEnumerable<T> list, IDataColumn[]? columns, ICollection<String>? updateColumns = null, ICollection<String>? addColumns = null, IEntitySession? session = null) where T : IEntity
public static Int32 Upsert<T>(this IEnumerable<T> list, IDataColumn[]? columns = null, ICollection<String>? updateColumns = null, ICollection<String>? addColumns = null, IEntitySession? session = null) where T : IEntity
{
var option = new BatchOption(columns, updateColumns, addColumns);
return BatchUpsert(list, option, session);
@ -951,7 +951,7 @@ public static class EntityExtension
/// do update success =2次(insert 1次+update 1次)，
/// 简单来说：如果Insert 成功则返回1，如果需要执行的是update 则返回2，
/// </returns>
public static Int32 Upsert(this IEntity entity, IDataColumn[]? columns, ICollection<String>? updateColumns = null, ICollection<String>? addColumns = null, IEntitySession? session = null)
public static Int32 Upsert(this IEntity entity, IDataColumn[]? columns = null, ICollection<String>? updateColumns = null, ICollection<String>? addColumns = null, IEntitySession? session = null)
{
var option = new BatchOption(columns, updateColumns, addColumns);
return Upsert(entity, option, session);

44
XUnitTest.XCode/EntityTests/ShardTests.cs
View File

@ -487,7 +487,7 @@ public class ShardTests
};
var start = "2023-12-31".ToDateTime();
var end = DateTime.Today;
var end = start.AddDays(300);
var fi = policy.Field;
var where = fi >= start & fi < end;
@ -526,18 +526,48 @@ public class ShardTests
{
var policy = new TimeShardPolicy(Log2._.CreateTime, Log2.Meta.Factory)
{
TablePolicy = "{0}_{1:yyyyMM}",
Step = TimeSpan.FromDays(31),
TablePolicy = "{0}_{1:yyyyMMdd}",
Step = TimeSpan.FromDays(1),
};
// 起止都是整数日期，末尾加1天
var start = "2024/7/25 00:00:00".ToDateTime();
var start = "2024/7/30 00:00:00".ToDateTime();
var end = start.AddDays(3);
var fi = policy.Field;
var where = fi.Equal(start);
//var where = fi.Equal(start);
var where = fi.Between(start, end);
var shards = policy.Shards(where);
Assert.NotNull(shards);
Assert.Equal(1, shards.Length);
Assert.Equal("Log2_202407", shards[0].TableName);
Assert.Equal(4, shards.Length);
Assert.Equal("Log2_20240730", shards[0].TableName);
Assert.Equal("Log2_20240731", shards[1].TableName);
Assert.Equal("Log2_20240801", shards[2].TableName);
Assert.Equal("Log2_20240802", shards[3].TableName);
}
[Fact]
public void 循环天表Shards()
{
var policy = new TimeShardPolicy(Log2._.CreateTime, Log2.Meta.Factory)
{
TablePolicy = "{0}_{1:dd}",
Step = TimeSpan.FromDays(1),
};
// 起止都是整数日期，末尾加1天
var start = "2024/7/30 00:00:00".ToDateTime();
var end = start.AddDays(3);
var fi = policy.Field;
//var where = fi.Equal(start);
var where = fi.Between(start, end);
var shards = policy.Shards(where);
Assert.NotNull(shards);
Assert.Equal(4, shards.Length);
Assert.Equal("Log2_30", shards[0].TableName);
Assert.Equal("Log2_31", shards[1].TableName);
Assert.Equal("Log2_01", shards[2].TableName);
Assert.Equal("Log2_02", shards[3].TableName);
}
}

2
XUnitTest.XCode/Membership/UserTests.cs
View File

@ -50,7 +50,7 @@ public class UserTests
var user = new User { Name = Rand.NextString(64) };
var ex = Assert.Throws<ArgumentOutOfRangeException>(() => user.Insert());
Assert.Equal("Name", ex.ParamName);
Assert.Equal("[Name/名称]长度限制50字符[ID=0] (Parameter 'Name')", ex.Message);
Assert.Equal("[Name/名称@User]长度限制50字符[ID=0] (Parameter 'Name')", ex.Message);
}
[Fact]