Implement InvokeValueConverter

Author: asherber

StaTypPocoQueries.PetaPoco.Tests/QueryTests.cs

@@ -27,9 +27,25 @@ public class QueryTests
         private class MyClass
         {
             public int ID { get; set; }
+
             public string Name { get; set; }
+
             [Column("RealColumnName")]
             public string PropWithAttribute { get; set; }
+
+            public FoodEnum PlainFood { get; set; }
+
+            [FoodEnumConverter]
+            public FoodEnum ConvertedFood { get; set; }
+        }
+
+        public enum FoodEnum { Apple, Banana, Carrot };
+
+        private class FoodEnumConverter : ValueConverterAttribute
+        {
+            public override object ConvertFromDb(object value) => throw new NotImplementedException();            
+
+            public override object ConvertToDb(object value) => value.ToString();
         }
 
         private Mock<IDatabase> _mockDb;
@@ -66,5 +82,19 @@ public void Query_Should_Use_Column_Attribute(string value)
             _mockDb.Object.Query<MyClass>(c => c.PropWithAttribute == value);
             _lastSql.Should().BeEquivalentTo(new Sql("WHERE <RealColumnName> = @0", value));
         }
+
+        [Theory, AutoData]
+        public void Query_Should_Use_Value_Converter(FoodEnum food)
+        {
+            _mockDb.Object.Query<MyClass>(c => c.ConvertedFood == food);
+            _lastSql.Should().BeEquivalentTo(new Sql("WHERE <ConvertedFood> = @0", food.ToString()));
+        }
+
+        [Theory, AutoData]
+        public void Query_Should_Use_Plain_Value_With_No_Value_Converter(FoodEnum food)
+        {
+            _mockDb.Object.Query<MyClass>(c => c.PlainFood == food);
+            _lastSql.Should().BeEquivalentTo(new Sql("WHERE <PlainFood> = @0", (int)food));
+        }
     }
 }

StaTypPocoQueries.PetaPoco/DatabaseExtensions.FSharp.cs

@@ -31,9 +31,20 @@ public static partial class DatabaseExtensions
         private static readonly FSharpFunc<MemberInfo, string> FsExtractColumnName 
             = ExpressionToSql.AsFsFunc<MemberInfo, string>(ExtractColumnName);
 
+        // Helpful precis: https://codeblog.jonskeet.uk/2012/01/30/currying-vs-partial-function-application/
+        private static readonly FSharpFunc<PropertyInfo, FSharpFunc<object, object>> FsInvokeValueConverter
+            = ExpressionToSql.AsFsFunc<PropertyInfo, FSharpFunc<object, object>>(
+                pi => ExpressionToSql.AsFsFunc<object, object>(
+                    input => InvokeValueConverter(pi, input)
+                )
+            );
+
         private static Sql ToSql<T>(this FSharpExpr<FSharpFunc<T, bool>> query, IDatabase db)
         {
-            var translated = ExpressionToSql.Translate(new DatabaseQuoter(db), query, true, FsExtractColumnName);
+            var translated = ExpressionToSql.Translate(new DatabaseQuoter(db), query, 
+                includeWhere: true, 
+                customNameExtractor: FsExtractColumnName, 
+                customParameterValueMap: FsInvokeValueConverter);
             return new Sql(translated.Item1, translated.Item2);
         }
 

StaTypPocoQueries.PetaPoco/DatabaseExtensions.cs

@@ -31,10 +31,20 @@ private static string ExtractColumnName(MemberInfo mi)
         {
             return mi.GetCustomAttribute<ColumnAttribute>()?.Name ?? mi.Name;
         }
+
+        private static object InvokeValueConverter(PropertyInfo pi, object input)
+        {
+            var converter = pi.GetCustomAttribute<ValueConverterAttribute>(true);
+
+            return converter == null ? input : converter.ConvertToDb(input);
+        }
 
         private static Sql ToSql<T>(this Expression<Func<T, bool>> query, IDatabase db)
         {
-            var translated = ExpressionToSql.Translate(new DatabaseQuoter(db), query, true, ExtractColumnName);
+            var translated = ExpressionToSql.Translate(new DatabaseQuoter(db), query, 
+                includeWhere: true, 
+                customNameExtractor: ExtractColumnName,
+                customParameterValueMap: InvokeValueConverter);
             return new Sql(translated.Item1, translated.Item2);
         }
 

StaTypPocoQueries.PetaPoco/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning">
-      <Version>2.3.33-beta</Version>
+      <Version>3.3.37</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

StaTypPocoQueries.PetaPoco/StaTypPocoQueries.PetaPoco.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <AssemblyName>StaTypPocoQueries.PetaPoco</AssemblyName>
@@ -15,15 +14,13 @@
     <PackageTags>petapoco statyppocoqueries statically typed</PackageTags>
     <PackageReleaseNotes>Methods will now correctly read Column attributes on properties when building SQL</PackageReleaseNotes>
   </PropertyGroup>
-  
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DocumentationFile>$(AssemblyName).xml</DocumentationFile>
     <NoWarn>$(NoWarn);1591;1570;1587</NoWarn>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="PetaPoco.Compiled" Version="[6.0.394,7.0)" />
-    <PackageReference Include="StaTypPocoQueries.Core" Version="[1.9.0,2)" />
+    <PackageReference Include="StaTypPocoQueries.Core" Version="[1.13.0,2)" />
   </ItemGroup>
-</Project>
+</Project>

StaTypPocoQueries.PetaPoco/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3",
+  "version": "1.4",
   "publicReleaseRefSpec": [
     "^refs/heads/master$",
     "^refs/heads/v\\d+(?:\\.\\d+)?$"

switcher.json

@@ -0,0 +1,6 @@
+{
+  "solution": "StaTypPocoQueries.PetaPoco.sln",
+  "mappings": {
+    "StaTypPocoQueries.Core": "../statically-typed-poco-queries/StaTypPocoQueries.Core/StaTypPocoQueries.Core.fsproj"
+  }
+}