修复数据引擎处理带值的 Sequence 字段依然生成序列号的问题。 💺

Author: PopeyeZhong

Zongsoft.Data/src/Common/DataImporterBase.cs

@@ -126,7 +126,7 @@ public object GetValue(ref object target)
 			if(CanSequence(property.Sequence))
 			{
 				//获取目标的当前属性值，如果获取失败或其值为空或数字零，则递增该字段序号
-				if(!Reflection.Reflector.TryGetValue(this.Info, ref target, out value) || value == null || Zongsoft.Common.Convert.IsZero(value))
+				if(!Reflection.Reflector.TryGetValue(this.Info, ref target, out value) || value == null || Convert.IsDBNull(value) || Zongsoft.Common.Convert.IsZero(value))
 				{
 					//递增当前属性对应的序号
 					var id = _context.DataAccess.Sequencer.Increase(property);

Zongsoft.Data/src/Common/Expressions/StatementExtension.cs

@@ -270,6 +270,13 @@ private static List<FieldIdentifier> GetSequenceFields(IStatementBase statement)
 		return result;
 	}
 
+	private static bool CanSequence(IDataMutateOptions options, object value) => options switch
+	{
+		IDataInsertOptions insertion when insertion.SequenceSuppressed => value == null || Convert.IsDBNull(value),
+		IDataUpsertOptions upsertion when upsertion.SequenceSuppressed => value == null || Convert.IsDBNull(value),
+		_ => value == null || Convert.IsDBNull(value) || Zongsoft.Common.Convert.IsZero(value),
+	};
+
 	private static void SetSequenceValue(IDataMutateContextBase context, IEnumerable<FieldIdentifier> sequenceFileds , object data)
 	{
 		if(data == null || sequenceFileds == null)
@@ -285,7 +292,7 @@ private static void SetSequenceValue(IDataMutateContextBase context, IEnumerable
 				{
 					var value = field.Token.GetValue(data);
 
-					if(value == null || Convert.IsDBNull(value) || object.Equals(value, Zongsoft.Common.TypeExtension.GetDefaultValue(field.Token.MemberType)) || (context.Options is IDataInsertOptions options && !options.SequenceSuppressed))
+					if(CanSequence(context.Options, value))
 					{
 						var id = ((DataAccess)context.DataAccess).Increase(context, sequence, data);
 						field.Token.SetValue(ref data, Convert.ChangeType(id, field.Token.MemberType));
@@ -310,7 +317,7 @@ private static async ValueTask SetSequenceValueAsync(IDataMutateContextBase cont
 				{
 					var value = field.Token.GetValue(data);
 
-					if(value == null || Convert.IsDBNull(value) || object.Equals(value, Zongsoft.Common.TypeExtension.GetDefaultValue(field.Token.MemberType)) || (context.Options is IDataInsertOptions options && !options.SequenceSuppressed))
+					if(CanSequence(context.Options, value))
 					{
 						var id = await ((DataAccess)context.DataAccess).IncreaseAsync(context, sequence, data, cancellation);
 						field.Token.SetValue(ref data, Convert.ChangeType(id, field.Token.MemberType));

Zongsoft.Data/src/Zongsoft.Data.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>7.18.1</Version>
+		<Version>7.18.2</Version>
 		<Product>Zongsoft Data Library</Product>
 		<Description>This is an Object/Relational Mapping(ORM) data engine.</Description>
 		<RootNamespace>Zongsoft.Data</RootNamespace>