QQQ

Author: rhuijben

src/RepoDb/DataEntityDataReader.cs

@@ -691,7 +691,7 @@ private IEnumerable<ClassProperty> GetClassProperties()
     /// </summary>
     /// <param name="dictionary"></param>
     /// <returns></returns>
-    private static IEnumerable<Field> GetFields(IDictionary<string, object> dictionary)
+    private static IEnumerable<Field> GetFields(IDictionary<string, object>? dictionary)
     {
         if (dictionary != null)
         {

src/RepoDb/Mappers/PropertyHandlerMapper.cs

@@ -247,7 +247,7 @@ public static void Add<TEntity, TPropertyHandler>(string propertyName,
         bool force)
         where TEntity : class
         where TPropertyHandler : new() =>
-        Add<TEntity, TPropertyHandler>(propertyName, new TPropertyHandler(), false);
+        Add<TEntity, TPropertyHandler>(propertyName, new TPropertyHandler(), force);
 
     /// <summary>
     /// Property Level: Adds a property handler mapping into a data entity type property (via property name).
@@ -266,11 +266,7 @@ public static void Add<TEntity, TPropertyHandler>(string propertyName,
         ObjectExtension.ThrowIfNull(propertyName, nameof(propertyName));
 
         // Get the property
-        var property = TypeExtension.GetProperty<TEntity>(propertyName);
-        if (property == null)
-        {
-            throw new PropertyNotFoundException(nameof(propertyName), $"Property '{propertyName}' is not found at type '{typeof(TEntity).FullName}'.");
-        }
+        var property = TypeExtension.GetProperty<TEntity>(propertyName) ?? throw new PropertyNotFoundException(nameof(propertyName), $"Property '{propertyName}' is not found at type '{typeof(TEntity).FullName}'.");
 
         // Add to the mapping
         Add<TEntity, TPropertyHandler>(property, propertyHandler, force);
@@ -312,7 +308,7 @@ public static void Add<TEntity, TPropertyHandler>(Field field,
         bool force)
         where TEntity : class
         where TPropertyHandler : new() =>
-        Add<TEntity, TPropertyHandler>(field, new TPropertyHandler(), false);
+        Add<TEntity, TPropertyHandler>(field, new TPropertyHandler(), force);
 
     /// <summary>
     /// Property Level: Adds a property handler mapping into a data entity type property (via <see cref="Field"/> object).
@@ -331,11 +327,7 @@ public static void Add<TEntity, TPropertyHandler>(Field field,
         ObjectExtension.ThrowIfNull(field, nameof(field));
 
         // Get the property
-        var property = TypeExtension.GetProperty<TEntity>(field.FieldName);
-        if (property == null)
-        {
-            throw new PropertyNotFoundException(nameof(field), $"Property '{field.FieldName}' is not found at type '{typeof(TEntity).FullName}'.");
-        }
+        var property = TypeExtension.GetProperty<TEntity>(field.FieldName) ?? throw new PropertyNotFoundException(nameof(field), $"Property '{field.FieldName}' is not found at type '{typeof(TEntity).FullName}'.");
 
         // Add to the mapping
         Add<TEntity, TPropertyHandler>(property, propertyHandler, force);
@@ -533,11 +525,7 @@ public static void Remove<TEntity>(string propertyName)
         ObjectExtension.ThrowIfNull(propertyName, nameof(propertyName));
 
         // Get the property
-        var property = TypeExtension.GetProperty<TEntity>(propertyName);
-        if (property == null)
-        {
-            throw new PropertyNotFoundException(nameof(propertyName), $"Property '{propertyName}' is not found at type '{typeof(TEntity).FullName}'.");
-        }
+        var property = TypeExtension.GetProperty<TEntity>(propertyName) ?? throw new PropertyNotFoundException(nameof(propertyName), $"Property '{propertyName}' is not found at type '{typeof(TEntity).FullName}'.");
 
         // Add to the mapping
         Remove<TEntity>(property);
@@ -555,11 +543,7 @@ public static void Remove<TEntity>(Field field)
         ObjectExtension.ThrowIfNull(field, nameof(field));
 
         // Get the property
-        var property = TypeExtension.GetProperty<TEntity>(field.FieldName);
-        if (property == null)
-        {
-            throw new PropertyNotFoundException(nameof(field), $"Property '{field.FieldName}' is not found at type '{typeof(TEntity).FullName}'.");
-        }
+        var property = TypeExtension.GetProperty<TEntity>(field.FieldName) ?? throw new PropertyNotFoundException(nameof(field), $"Property '{field.FieldName}' is not found at type '{typeof(TEntity).FullName}'.");
 
         // Add to the mapping
         Remove<TEntity>(property);

src/RepoDb/QueryField/ParseExpression.cs

@@ -20,20 +20,9 @@ public partial class QueryField
         var properties = PropertyCache.Get<TEntity>();
 
         // Failing at some point - for base interfaces
-        var property = properties
-            .FirstOrDefault(p =>
-                string.Equals(p.FieldName, field.FieldName, StringComparison.OrdinalIgnoreCase));
-
-        // Matches to the actual class properties
-        if (property == null)
-        {
-            property = properties
-                .FirstOrDefault(p =>
-                    string.Equals(p.PropertyInfo.Name, field.FieldName, StringComparison.OrdinalIgnoreCase));
-        }
-
-        // Return the value
-        return property;
+        return
+            properties.GetByFieldName(field.FieldName)
+            ?? properties.GetByPropertyName(field.FieldName);
     }
 
     /// <summary>

src/RepoDb/QueryGroup/ParseExpression.cs

@@ -56,18 +56,7 @@ public static QueryGroup Parse<TEntity>(Expression<Func<TEntity, bool>> expressi
 #endif
 
         // Parse the expression base on type
-        var parsed = Parse<TEntity>(expression.Body);
-
-        /*
-         * In order to NOT trigger the 'Equality' comparision (via overriden GetHashCode()), do not use the '=='
-         * when comparing to NULLs, instead, use the ReferenceEquals method.
-         */
-
-        // Throw an unsupported exception if not parsed
-        if (parsed is null)
-        {
-            throw new NotSupportedException($"Expression '{expression}' is currently not supported.");
-        }
+        var parsed = Parse<TEntity>(expression.Body) ?? throw new NotSupportedException($"Expression '{expression}' is currently not supported.");
 
         // Return the parsed values
         return parsed.Fix(connection, transaction, tableName ?? ClassMappedNameCache.Get<TEntity>());
@@ -124,10 +113,7 @@ private static QueryGroup Parse<TEntity>(BinaryExpression expression)
         }
 
         // Variables
-        var leftQueryGroup = Parse<TEntity>(expression.Left);
-
-        if (leftQueryGroup is null)
-            throw new NotSupportedException($"Expression {expression.Left} is currently not supported");
+        var leftQueryGroup = Parse<TEntity>(expression.Left) ?? throw new NotSupportedException($"Expression {expression.Left} is currently not supported");
 
         // IsNot
         if (expression.NodeType is ExpressionType.Equal or ExpressionType.NotEqual
@@ -141,10 +127,7 @@ private static QueryGroup Parse<TEntity>(BinaryExpression expression)
         }
         else
         {
-            var rightQueryGroup = Parse<TEntity>(expression.Right);
-            if (rightQueryGroup is null)
-                throw new NotSupportedException($"Expression {expression.Right} is currently not supported");
-
+            var rightQueryGroup = Parse<TEntity>(expression.Right) ?? throw new NotSupportedException($"Expression {expression.Right} is currently not supported");
             return new QueryGroup([leftQueryGroup, rightQueryGroup], GetConjunction(expression));
         }
 

src/RepoDb/Reflection/Compiler.DataEntityPropertySetter.cs

@@ -16,7 +16,7 @@ partial class Compiler
         Field field)
     {
         // Get the entity property
-        var property = PropertyCache.Get(entityType)?.GetByFieldName(field.FieldName)?.PropertyInfo;
+        var property = PropertyCache.Get(entityType).GetByFieldName(field.FieldName)?.PropertyInfo;
 
         // Return the function
         return CompileDataEntityPropertySetter(entityType,
@@ -32,7 +32,7 @@ partial class Compiler
     /// <param name="targetType"></param>
     /// <returns></returns>
     private static Action<object, object?> CompileDataEntityPropertySetter(Type entityType,
-        PropertyInfo property,
+        PropertyInfo? property,
         Type targetType)
     {
         // Check the property first
@@ -64,7 +64,7 @@ partial class Compiler
         {
             var classProperty = PropertyCache.Get(entityType, property, true);
             valueExpression = ConvertExpressionToPropertyHandlerSetExpression(valueExpression,
-                null, classProperty, targetType ?? classProperty.PropertyInfo.PropertyType);
+                null, classProperty, targetType);
         }
 
         // Assign the value into DataEntity.Property

src/RepoDb/Reflection/Compiler.DataReaderToType.cs

@@ -82,7 +82,7 @@ private static Func<DbDataReader, TResult> CompileDataReaderToDataEntity<TResult
         var readerFields = GetDataReaderFields(reader, dbFields);
         var memberBindings = GetMemberBindingsForDataEntity<TResult>(readerParameterExpression, readerFields, reader.GetType());
         var memberAssignments = memberBindings.Where(item => item.MemberAssignment != null).Select(item => item.MemberAssignment!);
-        var arguments = memberBindings?.Where(item => item.Argument != null).Select(item => item.Argument!);
+        var arguments = memberBindings.Where(item => item.Argument != null).Select(item => item.Argument!);
         var typeOfResult = typeof(TResult);
 
         // Throw an error if there are no bindings

src/RepoDb/Reflection/Compiler.DbCommandToProperty.cs

@@ -1,6 +1,7 @@
 using System.Data.Common;
 using System.Globalization;
 using System.Linq.Expressions;
+using RepoDb.Exceptions;
 using RepoDb.Extensions;
 using RepoDb.Interfaces;
 
@@ -39,7 +40,7 @@ public static Action<TEntity, DbCommand> CompileDbCommandToProperty<TEntity>(Fie
 
         // Get the entity property
         var propertyName = field.FieldName.AsUnquoted(true, dbSetting).AsAlphaNumeric();
-        var property = (typeOfEntity.GetProperty(propertyName) ?? PropertyCache.Get(typeOfEntity)?.GetByFieldName(propertyName)?.PropertyInfo)?.SetMethod;
+        var property = (typeOfEntity.GetProperty(propertyName) ?? PropertyCache.Get(typeOfEntity).GetByFieldName(propertyName)?.PropertyInfo)?.SetMethod ?? throw new PropertyNotFoundException(propertyName, $"Property {propertyName} not found");
 
         // Get the command parameter
         var name = parameterName ?? propertyName;
@@ -50,7 +51,7 @@ public static Action<TEntity, DbCommand> CompileDbCommandToProperty<TEntity>(Fie
         // Assign the Parameter.Value into DataEntity.Property
         var value = Expression.Property(parameter, dbParameterValueProperty);
         var propertyAssignment = Expression.Call(entityParameterExpression, property,
-            Expression.Convert(value, TypeCache.Get(field.Type)?.GetUnderlyingType()));
+            Expression.Convert(value, TypeCache.Get(field.Type).GetUnderlyingType()));
 
         // Return function
         return Expression.Lambda<Action<TEntity, DbCommand>>(

src/RepoDb/Reflection/Compiler.DictionaryStringObjectDbParameterSetter.cs

@@ -22,7 +22,7 @@ partial class Compiler
         var dbCommandExpression = Expression.Parameter(StaticType.DbCommand, "command");
         var entityParameterExpression = Expression.Parameter(StaticType.Object, "entityParameter");
         var dbParameterCollectionExpression = Expression.Property(dbCommandExpression,
-            StaticType.DbCommand.GetProperty(nameof(DbCommand.Parameters)));
+            StaticType.DbCommand.GetProperty(nameof(DbCommand.Parameters))!);
         var dictionaryInstanceExpression = ConvertExpressionToTypeExpression(entityParameterExpression, StaticType.IDictionaryStringObject);
         var bodyExpressions = new List<Expression>
         {

src/RepoDb/Reflection/Compiler.PlainTypeToDbParameters.cs

@@ -100,10 +100,9 @@ public static Action<DbCommand, object> GetPlainTypeToDbParametersCompiledFuncti
                 }
                 else
                 {
-                    var targetType = TypeCache.Get(dbField?.Type).GetUnderlyingType() ?? valueType;
                     dbType = targetProperty.GetDbType() ??
-                        targetType?.GetDbType() ??
-                        new ClientTypeToDbTypeResolver().Resolve(targetType);
+                        valueType.GetDbType() ??
+                        new ClientTypeToDbTypeResolver().Resolve(valueType);
                 }
                 var setDbTypeExpression = GetDbParameterDbTypeAssignmentExpression(dbParameterExpression, dbType);
                 parameterCallExpressions.AddIfNotNull(setDbTypeExpression);

src/RepoDb/Reflection/Compiler.cs

@@ -1182,7 +1182,7 @@ private static Expression ConvertExpressionToClassHandlerGetExpression<TResult>(
     private static Expression ConvertExpressionToPropertyHandlerSetExpression(Expression expression,
         Expression? parameterExpression,
         ClassProperty? classProperty,
-        Type targetType) =>
+        Type? targetType) =>
         ConvertExpressionToPropertyHandlerSetExpressionTuple(expression, parameterExpression, classProperty, targetType).convertedExpression;
 
     /// <summary>
@@ -1196,7 +1196,7 @@ private static Expression ConvertExpressionToPropertyHandlerSetExpression(Expres
     private static (Expression convertedExpression, Type? handlerSetReturnType) ConvertExpressionToPropertyHandlerSetExpressionTuple(Expression expression,
         Expression? parameterExpression,
         ClassProperty? classProperty,
-        Type targetType)
+        Type? targetType)
     {
         var handlerInstance = classProperty?.GetPropertyHandler() ??
             PropertyHandlerCache.Get<object>(targetType);
@@ -1213,7 +1213,7 @@ private static (Expression convertedExpression, Type? handlerSetReturnType) Conv
 
         // Nullable
         expression = ConvertExpressionToNullableExpression(expression,
-            TypeCache.Get(setParameter.ParameterType).GetUnderlyingType() ?? targetType);
+            TypeCache.Get(setParameter.ParameterType).GetUnderlyingType());
 
         // Call
         var valueExpression = ConvertExpressionToTypeExpression(expression, setParameter.ParameterType);