Implement column name extractor

Update Core to v1.9

Author: asherber

StaTypPocoQueries.PetaPoco.Tests/QueryTests.cs

@@ -28,6 +28,8 @@ private class MyClass
         {
             public int ID { get; set; }
             public string Name { get; set; }
+            [Column("RealColumnName")]
+            public string PropWithAttribute { get; set; }
         }
 
         private Mock<IDatabase> _mockDb;
@@ -57,5 +59,12 @@ public void Delete(string name)
             _mockDb.Object.Delete<MyClass>(c => c.Name == name);
             _lastSql.Should().BeEquivalentTo(new Sql("WHERE <Name> = @0", name));
         }
+
+        [Theory, AutoData]
+        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));
+        }
     }
 }

StaTypPocoQueries.PetaPoco/DatabaseExtensions.FSharp.cs

@@ -16,6 +16,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.FSharp.Core;
@@ -27,9 +28,12 @@ namespace PetaPoco
 {
     public static partial class DatabaseExtensions
     {
+        private static readonly FSharpFunc<MemberInfo, string> FsExtractColumnName 
+            = ExpressionToSql.AsFsFunc<MemberInfo, string>(ExtractColumnName);
+
         private static Sql ToSql<T>(this FSharpExpr<FSharpFunc<T, bool>> query, IDatabase db)
         {
-            var translated = ExpressionToSql.Translate(new DatabaseQuoter(db), query);
+            var translated = ExpressionToSql.Translate(new DatabaseQuoter(db), query, true, FsExtractColumnName);
             return new Sql(translated.Item1, translated.Item2);
         }
 

StaTypPocoQueries.PetaPoco/DatabaseExtensions.cs

@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using StaTypPocoQueries.Core;
@@ -26,9 +27,14 @@ namespace PetaPoco
 {
     public static partial class DatabaseExtensions
     {
+        private static string ExtractColumnName(MemberInfo mi)
+        {
+            return mi.GetCustomAttribute<ColumnAttribute>()?.Name ?? mi.Name;
+        }
+        
         private static Sql ToSql<T>(this Expression<Func<T, bool>> query, IDatabase db)
         {
-            var translated = ExpressionToSql.Translate(new DatabaseQuoter(db), query);
+            var translated = ExpressionToSql.Translate(new DatabaseQuoter(db), query, true, ExtractColumnName);
             return new Sql(translated.Item1, translated.Item2);
         }
 

StaTypPocoQueries.PetaPoco/StaTypPocoQueries.PetaPoco.csproj

@@ -13,7 +13,7 @@
     <RepositoryType>git</RepositoryType>
     <PackageIconUrl>https://raw.githubusercontent.com/asherber/StaTypPocoQueries.PetaPoco/master/media/static-64.png</PackageIconUrl>
     <PackageTags>petapoco statyppocoqueries statically typed</PackageTags>
-    <PackageReleaseNotes>Extension methods now use IDatabase instead of Database</PackageReleaseNotes>
+    <PackageReleaseNotes>Methods will now correctly read Column attributes on properties when building SQL</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,6 +24,6 @@
 
   <ItemGroup>
     <PackageReference Include="PetaPoco.Compiled" Version="[6.0.394,7.0)" />
-    <PackageReference Include="StaTypPocoQueries.Core" Version="[1.7,2)" />
+    <PackageReference Include="StaTypPocoQueries.Core" Version="[1.9.0,2)" />
   </ItemGroup>
 </Project>