Fixed issue in the ado.net context where the QueryBuilder was not finding properties in base/declaring type

Author: jaguzman

src/DotNetToolkit.Repository.AdoNet/Internal/ExpressionTranslator.cs

@@ -18,7 +18,7 @@ internal class ExpressionTranslator
         private readonly IComparer<ExpressionType> _comparer = new OperatorPrecedenceComparer();
         private readonly Dictionary<string, object> _parameters = new Dictionary<string, object>();
         private Func<Type, string> _getTableAlias;
-        private Func<PropertyInfo, string> _getColumnAlias;
+        private Func<PropertyInfo, Type, string> _getColumnAlias;
 
         #endregion
 
@@ -27,7 +27,7 @@ internal class ExpressionTranslator
         /// <summary>
         /// Translates the specified predicate.
         /// </summary>
-        public void Translate<T>(Expression<Func<T, bool>> predicate, Func<Type, string> getTableAlias, Func<PropertyInfo, string> getColumnAlias, out string sql, out Dictionary<string, object> parameters)
+        public void Translate<T>(Expression<Func<T, bool>> predicate, Func<Type, string> getTableAlias, Func<PropertyInfo, Type, string> getColumnAlias, out string sql, out Dictionary<string, object> parameters)
         {
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
@@ -275,7 +275,7 @@ private void TranslateVariableExpression(Expression variableExpression, out stri
             var tableType = ExpressionHelper.GetMemberExpression(variableExpression).Expression.Type;
             var tableAlias = _getTableAlias(tableType);
 
-            columnAlias = _getColumnAlias(propertyInfo);
+            columnAlias = _getColumnAlias(propertyInfo, tableType);
             column = !string.IsNullOrEmpty(columnAlias)
                 ? $"[{tableAlias}].[{columnAlias}]"
                 : null;

src/DotNetToolkit.Repository.AdoNet/Internal/QueryBuilder.cs

@@ -147,14 +147,14 @@ string GenerateTableAlias(Type tableType)
                 return tableAlias;
             }
 
-            string GenerateColumnAlias(PropertyInfo pi)
+            string GenerateColumnAlias(PropertyInfo pi, Type tableType)
             {
                 if (pi == null)
                     throw new ArgumentNullException(nameof(pi));
 
                 var columnName = conventions.GetColumnName(pi);
                 var columnAlias = columnName;
-                var tableName = conventions.GetTableName(pi.DeclaringType);
+                var tableName = conventions.GetTableName(tableType);
 
                 if (columnAliasMappingCount.TryGetValue(columnName, out int columnAliasCount))
                 {
@@ -211,13 +211,13 @@ string GetTableAliasFromName(string tableName)
             string GetTableAliasFromType(Type tableType)
                 => GetTableAliasFromName(GetTableNameFromType(tableType));
 
-            string GetColumnAliasFromProperty(PropertyInfo pi)
+            string GetColumnAliasFromProperty(PropertyInfo pi, Type tableType)
             {
                 if (pi == null)
                     throw new ArgumentNullException(nameof(pi));
 
                 var columnName = conventions.GetColumnName(pi);
-                var tableName = conventions.GetTableName(pi.DeclaringType);
+                var tableName = conventions.GetTableName(tableType);
                 var columnMapping = tableColumnAliasMapping[tableName];
 
                 if (!columnMapping.ContainsKey(columnName))
@@ -258,7 +258,7 @@ string GetColumnAliasFromProperty(PropertyInfo pi)
 
             foreach (var pi in properties.Values)
             {
-                GenerateColumnAlias(pi);
+                GenerateColumnAlias(pi, mainTableType);
             }
 
             // -----------------------------------------------------------------------------------------------------------
@@ -270,7 +270,7 @@ string GetColumnAliasFromProperty(PropertyInfo pi)
                 // Default select
                 select = string.Join($",{Environment.NewLine}\t", properties.Select(x =>
                 {
-                    var colAlias = GetColumnAliasFromProperty(x.Value);
+                    var colAlias = GetColumnAliasFromProperty(x.Value, mainTableType);
                     var colName = x.Key;
 
                     return $"[{mainTableAlias}].[{colName}] AS [{colAlias}]";
@@ -307,7 +307,7 @@ string GetColumnAliasFromProperty(PropertyInfo pi)
                                 .Where(DotNetToolkit.Repository.Extensions.Internal.PropertyInfoExtensions.IsPrimitive)
                                 .Select(x =>
                                 {
-                                    var colAlias = GenerateColumnAlias(x);
+                                    var colAlias = GenerateColumnAlias(x, joinTableType);
                                     var colName = conventions.GetColumnName(x);
 
                                     return $"[{joinTableAlias}].[{colName}] AS [{colAlias}]";
@@ -449,7 +449,7 @@ string GetColumnAliasFromProperty(PropertyInfo pi)
                         var tableName = GetTableNameFromType(tableType);
                         var tableAlias = GetTableAliasFromName(tableName);
                         var sortingPropertyInfo = ExpressionHelper.GetPropertyInfo(lambda);
-                        var columnAlias = GetColumnAliasFromProperty(sortingPropertyInfo);
+                        var columnAlias = GetColumnAliasFromProperty(sortingPropertyInfo, tableType);
 
                         sb.Append($"[{tableAlias}].[{columnAlias}] {(sortOrder == SortOrder.Descending ? "DESC" : "ASC")}, ");
                     }