From bd8a0d518c8b1faeb4f7b12c5b406d7e30887cb1 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Sun, 19 May 2019 12:41:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BE=9D=E8=B5=96=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bootstrap.Client.DataAccess.csproj        |  4 +--
 .../Bootstrap.DataAccess.csproj               |  6 ++--
 .../BootstrapDataAccessConventionMapper.cs    | 36 ++-----------------
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj b/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
index 040ed850..92b71414 100644
--- a/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
+++ b/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.0" />
+    <PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.1" />
     <PackageReference Include="Longbow.Cache" Version="2.2.9" />
-    <PackageReference Include="Longbow.Data" Version="2.3.1" />
+    <PackageReference Include="Longbow.Data" Version="2.3.2" />
     <PackageReference Include="Longbow.Web" Version="2.2.11" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.4" />
   </ItemGroup>
diff --git a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
index b511be3d..5257d8f6 100644
--- a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
+++ b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
@@ -11,15 +11,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.0" />
-    <PackageReference Include="Longbow.Data" Version="2.3.1" />
+    <PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.1" />
+    <PackageReference Include="Longbow.Data" Version="2.3.2" />
     <PackageReference Include="Longbow.Logging" Version="2.2.6" />
     <PackageReference Include="Longbow.Security.Cryptography" Version="1.3.0" />
     <PackageReference Include="Longbow.Web" Version="2.2.11" />
     <PackageReference Include="Longbow.Cache" Version="2.2.9" />
     <PackageReference Include="Longbow" Version="2.2.9" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.4" />
-    <PackageReference Include="PetaPoco.Extensions" Version="1.0.4" />
+    <PackageReference Include="PetaPoco.Extensions" Version="1.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/Bootstrap.DataAccess/BootstrapDataAccessConventionMapper.cs b/Bootstrap.DataAccess/BootstrapDataAccessConventionMapper.cs
index 6ffec01a..ec7a8820 100644
--- a/Bootstrap.DataAccess/BootstrapDataAccessConventionMapper.cs
+++ b/Bootstrap.DataAccess/BootstrapDataAccessConventionMapper.cs
@@ -1,50 +1,20 @@
 using PetaPoco;
 using System;
-using System.Reflection;
 
 namespace Bootstrap.DataAccess
 {
-    internal class BootstrapDataAccessConventionMapper : IMapper
+    internal class BootstrapDataAccessConventionMapper : ConventionMapper
     {
-        private readonly IMapper _mapper;
-
-        public BootstrapDataAccessConventionMapper()
-        {
-            _mapper = new ConventionMapper();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="pocoProperty"></param>
-        /// <returns></returns>
-        public ColumnInfo GetColumnInfo(PropertyInfo pocoProperty) => _mapper.GetColumnInfo(pocoProperty);
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="targetProperty"></param>
-        /// <param name="sourceType"></param>
-        /// <returns></returns>
-        public Func<object, object> GetFromDbConverter(PropertyInfo targetProperty, Type sourceType) => _mapper.GetFromDbConverter(targetProperty, sourceType);
-
         /// <summary>
         /// 
         /// </summary>
         /// <param name="pocoType"></param>
         /// <returns></returns>
-        public TableInfo GetTableInfo(Type pocoType)
+        public override TableInfo GetTableInfo(Type pocoType)
         {
-            var ti = _mapper.GetTableInfo(pocoType);
+            var ti = base.GetTableInfo(pocoType);
             ti.AutoIncrement = true;
             return ti;
         }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="sourceProperty"></param>
-        /// <returns></returns>
-        public Func<object, object> GetToDbConverter(PropertyInfo sourceProperty) => _mapper.GetToDbConverter(sourceProperty);
     }
 }