重构字典类型的数据组装器，以更加类型确定性的方式获取记录字段值。

注：TDengine 时序库的数据记录的 GetValue(..) 方法在处理 VarChar 类型时，返回的是字符字节数组，所以必须通过对应的 GetString(..) 方法才能确保被正确识别。

Author: PopeyeZhong

Zongsoft.Data/src/Common/DictionaryPopulator.cs

@@ -9,7 +9,7 @@
  * Authors:
  *   钟峰(Popeye Zhong) <zongsoft@qq.com>
  *
- * Copyright (C) 2010-2020 Zongsoft Studio <http://www.zongsoft.com>
+ * Copyright (C) 2010-2026 Zongsoft Studio <http://www.zongsoft.com>
  *
  * This file is part of Zongsoft.Data library.
  *
@@ -32,41 +32,50 @@
 using System.Collections;
 using System.Collections.Generic;
 
+using Zongsoft.Data.Metadata;
+
 namespace Zongsoft.Data.Common;
 
 public class DictionaryPopulator : IDataPopulator
 {
 	#region 成员字段
-	private readonly Type _type;
-	private readonly string[] _keys;
 	private readonly Func<int, IDictionary> _creator;
+	private readonly IDataEntityProperty[] _properties;
 	#endregion
 
 	#region 构造函数
-	internal protected DictionaryPopulator(Type type, string[] keys)
+	internal protected DictionaryPopulator(Type type, IDataEntityProperty[] properties)
 	{
-		_type = type ?? throw new ArgumentNullException(nameof(type));
-		_keys = keys ?? throw new ArgumentNullException(nameof(keys));
+		_properties = properties ?? throw new ArgumentNullException(nameof(properties));
 		_creator = this.GetCreator(type);
 	}
 	#endregion
 
 	#region 公共方法
 	public T Populate<T>(IDataRecord record)
 	{
-		if(record.FieldCount != _keys.Length)
+		if(record.FieldCount != _properties.Length)
 			throw new DataException("The record of populate has failed.");
 
 		//创建一个对应的实体字典
 		var dictionary = _creator(record.FieldCount);
 
 		for(var i = 0; i < record.FieldCount; i++)
 		{
-			if(!record.IsDBNull(i))
-				dictionary[_keys[i]] = record.GetValue(i);
+			if(record.IsDBNull(i))
+				continue;
+
+			var property = _properties[i];
+			if(property == null)
+				continue;
+
+			dictionary[property.Name] = GetValue(record, property, i, false);
 		}
 
 		return dictionary.Count > 0 ? (T)dictionary : default;
+
+		static object GetValue(IDataRecord record, IDataEntityProperty property, int ordinal, bool nullable) =>
+			property.IsSimplex(out var simplex) ? record.GetValue(ordinal, simplex.Type.DbType, nullable) : null;
 	}
 	#endregion
 

Zongsoft.Data/src/Common/DictionaryPopulatorProvider.cs

@@ -43,22 +43,45 @@ private DictionaryPopulatorProvider() { }
 	#endregion
 
 	#region 公共方法
-	public bool CanPopulate(Type type)
-	{
-		return Zongsoft.Common.TypeExtension.IsDictionary(type);
-	}
-
+	public bool CanPopulate(Type type) => Zongsoft.Common.TypeExtension.IsDictionary(type);
 	public IDataPopulator GetPopulator(IDataDriver driver, Type type, IDataRecord record, Metadata.IDataEntity entity = null)
 	{
-		var keys = new string[record.FieldCount];
+		var properties = new Metadata.IDataEntityProperty[record.FieldCount];
 
 		for(int i = 0; i < record.FieldCount; i++)
 		{
 			//获取字段名对应的属性名（注意：由查询引擎确保返回的记录列名就是属性名）
-			keys[i] = record.GetName(i);
+			properties[i] = GetProperty(entity, record.GetName(i));
+		}
+
+		return new DictionaryPopulator(type, properties);
+	}
+	#endregion
+
+	#region 私有方法
+	private Metadata.IDataEntityProperty GetProperty(Metadata.IDataEntity entity, string path)
+	{
+		if(entity.Properties.TryGetValue(path, out var property))
+			return property;
+
+		var parts = path.Split('.');
+
+		if(parts.Length > 1)
+		{
+			for(int i = 0; i < parts.Length; i++)
+			{
+				if(entity == null || !entity.Properties.TryGetValue(parts[i], out property))
+					return null;
+
+				if(property is Metadata.IDataEntityComplexProperty complex)
+					entity = complex.Foreign;
+				else
+					entity = null;
+			}
 		}
 
-		return new DictionaryPopulator(type, keys);
+		//确保属性地址指向的最终属性不能是导航属性
+		return property == null || property.IsComplex ? null : property;
 	}
 	#endregion
 }