Merge pull request #78 from abe545/honor-optional-for-hierarchical-re…

…sults 2.3.0-pre01
abe545 · Aug 1, 2016 · 3b22f86 · 3b22f86
2 parents 31b1de3 + 7c91835
commit 3b22f86
Show file tree

Hide file tree

Showing 12 changed files with 632 additions and 115 deletions.
diff --git a/CodeOnlyStoredProcedure-NET40/CodeOnlyStoredProcedure-NET40.csproj b/CodeOnlyStoredProcedure-NET40/CodeOnlyStoredProcedure-NET40.csproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CodeContractsInstallDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\packages\DotNet.Contracts.1.10.20606.1\'))</CodeContractsInstallDir>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -197,6 +200,9 @@
     <Compile Include="..\CodeOnlyStoredProcedure\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\CodeOnlyStoredProcedure\PropertyInfoExtensions.cs">
+      <Link>PropertyInfoExtensions.cs</Link>
+    </Compile>
     <Compile Include="..\CodeOnlyStoredProcedure\RowFactory\AccessorFactoryBase.cs">
       <Link>RowFactory\AccessorFactoryBase.cs</Link>
     </Compile>
@@ -345,6 +351,7 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Condition="'$(CodeContractsImported)' != 'true' AND '$(DontImportCodeContracts)' != 'true'" Project="$(CodeContractsInstallDir)\MsBuild\v$(VisualStudioVersion)\Microsoft.CodeContracts.targets"/>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/CodeOnlyStoredProcedure-NET40/packages.config b/CodeOnlyStoredProcedure-NET40/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DotNet.Contracts" version="1.10.20606.1" targetFramework="net40-client" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net40-Client" />
 </packages>
diff --git a/CodeOnlyStoredProcedure.sln b/CodeOnlyStoredProcedure.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 2015
+VisualStudioVersion = 14.0.22823.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeOnlyStoredProcedure", "CodeOnlyStoredProcedure\CodeOnlyStoredProcedure.csproj", "{37762E7B-48CC-4001-B479-ECB1923AE2E0}"
 EndProject

diff --git a/CodeOnlyStoredProcedure/CodeOnlyStoredProcedure.csproj b/CodeOnlyStoredProcedure/CodeOnlyStoredProcedure.csproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CodeContractsInstallDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\packages\DotNet.Contracts.1.10.20606.1\'))</CodeContractsInstallDir>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -136,6 +139,7 @@
     <Compile Include="IDataTransformer.cs" />
     <Compile Include="IDbConnectionExtensions.cs" />
     <Compile Include="OptionalResultAttribute.cs" />
+    <Compile Include="PropertyInfoExtensions.cs" />
     <Compile Include="RowFactory\AccessorFactoryBase.cs" />
     <Compile Include="RowFactory\ComplexTypeRowFactory.cs" />
     <Compile Include="RowFactory\EnumAccessorFactory.cs" />
@@ -198,6 +202,7 @@
     <Compile Include="TypeExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="StoredProcedure.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>StoredProcedure.generated.cs</LastGenOutput>
@@ -223,6 +228,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Condition="'$(CodeContractsImported)' != 'true' AND '$(DontImportCodeContracts)' != 'true'" Project="$(CodeContractsInstallDir)\MsBuild\v$(VisualStudioVersion)\Microsoft.CodeContracts.targets"/>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/CodeOnlyStoredProcedure/PropertyInfoExtensions.cs b/CodeOnlyStoredProcedure/PropertyInfoExtensions.cs
@@ -0,0 +1,33 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Reflection;
+
+namespace CodeOnlyStoredProcedure
+{
+    internal static class PropertyInfoExtensions
+    {
+        public static bool IsOptional(this PropertyInfo pi)
+        {
+            return pi.GetCustomAttributes(false).OfType<OptionalResultAttribute>().Any();
+        }
+
+        public static string GetSqlColumnName(this PropertyInfo pi)
+        {
+            var col = pi.GetCustomAttributes(typeof(ColumnAttribute), false)
+                        .OfType<ColumnAttribute>()
+                        .FirstOrDefault();
+
+            if (col != null && !string.IsNullOrWhiteSpace(col.Name))
+                return col.Name;
+
+            var attr = pi.GetCustomAttributes(typeof(StoredProcedureParameterAttribute), false)
+                         .OfType<StoredProcedureParameterAttribute>()
+                         .FirstOrDefault();
+
+            if (attr != null && !string.IsNullOrWhiteSpace(attr.Name))
+                return attr.Name;
+
+            return pi.Name;
+        }
+    }
+}
diff --git a/CodeOnlyStoredProcedure/RowFactory/ComplexTypeRowFactory.cs b/CodeOnlyStoredProcedure/RowFactory/ComplexTypeRowFactory.cs
@@ -23,7 +23,7 @@ static ComplexTypeRowFactory()
 
             var props             = implType.GetResultPropertiesBySqlName();
             dbColumnNames         = props.Keys.ToArray();
-            requiredColumnNames   = props.Where(kv => !kv.Value.GetCustomAttributes(false).OfType<OptionalResultAttribute>().Any())
+            requiredColumnNames   = props.Where(kv => !kv.Value.IsOptional())
                                          .Where(kv => !kv.Value.PropertyType.IsEnumeratedType()) // child collections can't be required
                                          .Select(kv => kv.Key)
                                          .ToArray();
@@ -40,7 +40,7 @@ static ComplexTypeRowFactory()
                                                  {
                                                      Name            = kv.Key,
                                                      Property        = kv.Value,
-                                                     IsOptional      = kv.Value.GetCustomAttributes(false).OfType<OptionalResultAttribute>().Any(),
+                                                     IsOptional      = kv.Value.IsOptional(),
                                                      AccessorFactory = (AccessorFactoryBase)Activator.CreateInstance(typeof(EnumAccessorFactory<>).MakeGenericType(kv.Value.PropertyType), dataReaderExpression, indexExpression, kv.Value, kv.Key)
                                                  };
                                              }
@@ -49,7 +49,7 @@ static ComplexTypeRowFactory()
                                              {
                                                  Name            = kv.Key,
                                                  Property        = kv.Value,
-                                                 IsOptional      = kv.Value.GetCustomAttributes(false).OfType<OptionalResultAttribute>().Any(),
+                                                 IsOptional      = kv.Value.IsOptional(),
                                                  AccessorFactory = (AccessorFactoryBase)Activator.CreateInstance(typeof(ValueAccessorFactory<>).MakeGenericType(kv.Value.PropertyType), dataReaderExpression, indexExpression, kv.Value, kv.Key)
                                              };
                                          })